mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS sb118

Browse Source
This commit is contained in:
Jens-Heiner Rechtien 2010-04-16 10:09:51 +02:00
commit a3ed338f81
96 changed files with 448 additions and 646 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
basebmp/test/basictest.cxx
View File

@ -27,7 +27,10 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
@ -291,13 +294,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BasicTest, "BasicTest");
CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest);
}
// -----------------------------------------------------------------------------
// this macro creates an empty function, which will called by the RegisterAllFunctions()
// to let the user the possibility to also register some functions by hand.
NOADDITIONAL;
CPPUNIT_PLUGIN_IMPLEMENT();

6
basebmp/test/bmpmasktest.cxx
View File

@ -27,7 +27,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
@ -177,7 +179,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BmpMaskTest, "BmpMaskTest");
CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest);
}

6
basebmp/test/bmptest.cxx
View File

@ -27,7 +27,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
@ -204,7 +206,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BmpTest, "BmpTest");
CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest);
}

6
basebmp/test/cliptest.cxx
View File

@ -27,7 +27,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
@ -271,7 +273,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ClipTest, "ClipTest");
CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest);
}

4
basebmp/test/export.map
View File

@ -25,9 +25,9 @@
#
#*************************************************************************
UDK_3.1 {
UDK_3_0_0 {
global:
registerAllTestFunction;
cppunitTestPlugIn;
local:
*;

6
basebmp/test/filltest.cxx
View File

@ -27,7 +27,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2drange.hxx>
@ -265,7 +267,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(FillTest, "FillTest");
CPPUNIT_TEST_SUITE_REGISTRATION(FillTest);
}

6
basebmp/test/linetest.cxx
View File

@ -27,7 +27,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
@ -213,7 +215,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(LineTest, "LineTest");
CPPUNIT_TEST_SUITE_REGISTRATION(LineTest);
}

27
basebmp/test/makefile.mk
View File

@ -60,6 +60,8 @@ CDEFS+=-xalias_level=compatible
.ENDIF
.ENDIF
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------
.IF "$(L10N_framework)"==""
@ -74,17 +76,10 @@ SHL1OBJS= \
$(SLO)$/linetest.obj \
$(SLO)$/masktest.obj \
$(SLO)$/polytest.obj \
$(SLO)$/tools.obj \
$(SLO)$/bitmapdevice.obj \
$(SLO)$/debug.obj \
$(SLO)$/polypolygonrenderer.obj
# last three objs are a bit of a hack: cannot link against LIBBASEBMP
# here, because not yet delivered. Need the functionality to test, so
# we're linking it in statically. Need to keep this in sync with
# source/makefile.mk
$(SLO)$/tools.obj
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
$(TESTSHL2LIB)\
SHL1STDLIBS= $(BASEBMPLIB) \
$(SALLIB) \
$(CPPUNITLIB) \
$(BASEGFXLIB)
@ -92,6 +87,8 @@ SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
SHL1VERSIONMAP = export.map
SHL1RPATH = NONE
.ENDIF
# END ------------------------------------------------------------------
@ -121,16 +118,8 @@ SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.INCLUDE : _cppunit.mk
# --- Enable test execution in normal build ------------------------
.IF "$(L10N_framework)"==""
unittest : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
$(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
ALLTAR : unittest
.INCLUDE : _cppunit.mk
.ENDIF

6
basebmp/test/masktest.cxx
View File

@ -27,7 +27,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
@ -165,7 +167,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(MaskTest, "MaskTest");
CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest);
}

6
basebmp/test/polytest.cxx
View File

@ -27,7 +27,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
@ -285,7 +287,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PolyTest, "PolyTest");
CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest);
}

2
basegfx/prj/build.lst
View File

@ -1,4 +1,4 @@
fx basegfx : o3tl sal offuh cppuhelper cppu testshl2 NULL
fx basegfx : o3tl sal offuh cppuhelper cppu CPPUNIT:cppunit NULL
fx basegfx usr1 - all fx_mkout NULL
fx basegfx\inc nmake - all fx_inc NULL
fx basegfx\prj get - all fx_prj NULL

16
basegfx/test/basegfx1d.cxx
View File

@ -30,7 +30,10 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
namespace basegfx1d
{
@ -52,7 +55,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -65,13 +67,7 @@ public:
}; // class b1drange
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx1d::b1drange, "basegfx1d");
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx1d::b1drange);
} // namespace basegfx1d
// -----------------------------------------------------------------------------
// this macro creates an empty function, which will called by the RegisterAllFunctions()
// to let the user the possibility to also register some functions by hand.
NOADDITIONAL;
CPPUNIT_PLUGIN_IMPLEMENT();

41
basegfx/test/basegfx2d.cxx
View File

@ -30,7 +30,9 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
@ -564,7 +566,6 @@ public:
{
// this is demonstration code
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -916,7 +917,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -946,7 +946,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1138,7 +1137,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1168,7 +1166,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1196,7 +1193,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1226,7 +1222,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1254,7 +1249,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1442,21 +1436,20 @@ public:
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dsvgdimpex, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolyrange, "basegfx2d");
//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dbeziertools, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dcubicbezier, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dhommatrix, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dhompoint, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpoint, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolygon, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolygontools, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolypolygon, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dquadraticbezier, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2drange, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dtuple, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dvector, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::bcolor, "basegfx2d");
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dsvgdimpex);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolyrange);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dcubicbezier);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhommatrix);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhompoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygon);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygontools);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolypolygon);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dquadraticbezier);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2drange);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dtuple);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dvector);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::bcolor);
} // namespace basegfx2d

22
basegfx/test/basegfx3d.cxx
View File

@ -30,7 +30,9 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
namespace basegfx3d
{
@ -52,7 +54,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -80,7 +81,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -110,7 +110,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -138,7 +137,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -168,7 +166,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -196,7 +193,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -209,12 +205,12 @@ public:
}; // class b3dvector
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dhommatrix, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dhompoint, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dpoint, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3drange, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dtuple, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dvector, "basegfx3d");
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dhommatrix);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dhompoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dpoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3drange);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dtuple);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dvector);
} // namespace basegfx3d

4
basegfx/test/export.map
View File

@ -25,9 +25,9 @@
#
#*************************************************************************
UDK_3.1 {
UDK_3_0_0 {
global:
registerAllTestFunction;
cppunitTestPlugIn;
local:
*;

29
basegfx/test/makefile.mk
View File

@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------
SHL1OBJS= \
@ -48,31 +50,19 @@ SHL1OBJS= \
$(SLO)$/genericclipper.obj \
$(SLO)$/testtools.obj
# linking statically against basegfx parts
SHL1LIBS=\
$(SLB)$/curve.lib \
$(SLB)$/matrix.lib \
$(SLB)$/numeric.lib \
$(SLB)$/point.lib \
$(SLB)$/polygon.lib \
$(SLB)$/range.lib \
$(SLB)$/tuple.lib \
$(SLB)$/tools.lib \
$(SLB)$/color.lib \
$(SLB)$/vector.lib
SHL1TARGET= basegfx_tests
SHL1STDLIBS= \
$(BASEGFXLIB) \
$(SALLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(TESTSHL2LIB) \
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
SHL1VERSIONMAP = export.map
SHL1RPATH = NONE
# END ------------------------------------------------------------------
@ -88,14 +78,3 @@ SLOFILES=$(SHL1OBJS)
.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
CDEFS+= -DVERBOSE
.ENDIF
# --- Enable testshl2 execution in normal build ------------------------
$(MISC)$/unittest_succeeded : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
$(TESTSHL2) -sf $(mktmp ) -forward $(BIN)$/ $(SHL1TARGETN)
$(TOUCH) $@
ALLTAR : $(MISC)$/unittest_succeeded

20
basegfx/test/tests.txt
View File

@ -1,20 +0,0 @@
# Jobfile
basegfx1d.b1drange
basegfx2d.b2dcubicbezier
basegfx2d.b2dhommatrix
basegfx2d.b2dhompoint
basegfx2d.b2dpoint
basegfx2d.b2dpolygon
basegfx2d.b2dpolygontools
basegfx2d.b2dpolypolygon
basegfx2d.b2dquadraticbezier
basegfx2d.b2drange
basegfx2d.b2dtuple
basegfx2d.b2dvector
basegfx3d.b3dhommatrix
basegfx3d.b3dhompoint
basegfx3d.b3dhompoint
basegfx3d.b3dpoint
basegfx3d.b3drange
basegfx3d.b3dtuple
basegfx3d.b3dvector

8
canvas/source/cairo/exports.map
View File

@ -1,8 +0,0 @@
CAN_1_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
canvas/source/cairo/makefile.mk
View File

@ -121,7 +121,7 @@ SHL1IMPLIB=i$(TARGET)
SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp

8
canvas/source/factory/canvasfactory.map
View File

@ -1,8 +0,0 @@
CAN_1_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
canvas/source/factory/makefile.mk
View File

@ -43,7 +43,7 @@ SHL1STDLIBS = \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB)
SHL1VERSIONMAP = canvasfactory.map
SHL1VERSIONMAP = $(SOLARENV)/src/component.map
SHL1DEPN =
SHL1IMPLIB = i$(TARGET)

8
canvas/source/null/exports.map
View File

@ -1,8 +0,0 @@
CAN_1_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
canvas/source/null/makefile.mk
View File

@ -60,7 +60,7 @@ SHL1IMPLIB=i$(TARGET)
SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp

8
canvas/source/simplecanvas/exports.map
View File

@ -1,8 +0,0 @@
CAN_1_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
canvas/source/simplecanvas/makefile.mk
View File

@ -52,7 +52,7 @@ SHL1IMPLIB=i$(TARGET)
SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp

8
canvas/source/vcl/exports.map
View File

@ -1,8 +0,0 @@
CAN_1_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
canvas/source/vcl/makefile.mk
View File

@ -75,7 +75,7 @@ SHL1IMPLIB=i$(TARGET)
SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp

2
comphelper/qa/makefile.mk
View File

@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
INCPRE += $(MISC)$/$(TARGET)$/inc

9
dtrans/source/generic/exports.map
View File

@ -1,9 +0,0 @@
DTRANS_1_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
dtrans/source/generic/makefile.mk
View File

@ -46,7 +46,7 @@ SLOFILES= \
SHL1TARGET= dtrans
SHL1VERSIONMAP= exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1STDLIBS= \
$(SALLIB) \

10
dtrans/util/exports.map
View File

@ -1,10 +0,0 @@
UDK_3_0_0 {
global:
GetVersionInfo;
component_getImplementationEnvironment;
component_getFactory;
component_writeInfo;
local:
*;
};

2
dtrans/util/makefile.mk
View File

@ -64,7 +64,7 @@ SHL1IMPLIB=i$(SHL1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
DEF1EXPORTFILE= exports.dxp
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
.IF "$(GUI)"=="WNT"

2
i18npool/source/breakiterator/data/dict.map
View File

@ -1,4 +1,4 @@
OOO_1.1 {
UDK_3_0_0 {
global:
GetVersionInfo;
getDataArea;

2
i18npool/source/collator/data/collator_data.map
View File

@ -1,4 +1,4 @@
OOO_1.1 {
UDK_3_0_0 {
global:
GetVersionInfo;
get_zh_charset;

2
i18npool/source/indexentry/data/index_data.map
View File

@ -1,4 +1,4 @@
OOO_1.1 {
UDK_3_0_0 {
global:
GetVersionInfo;
get_indexdata_ko_dict;

2
i18npool/source/localedata/data/localedata_en.map
View File

@ -1,4 +1,4 @@
OOO_1.1 {
UDK_3_0_0 {
global:
GetVersionInfo;
getAllCalendars_en_AU;

2
i18npool/source/localedata/data/localedata_es.map
View File

@ -1,4 +1,4 @@
OOO_1.1 {
UDK_3_0_0 {
global:
GetVersionInfo;
getAllCalendars_es_AR;

2
i18npool/source/localedata/data/localedata_euro.map
View File

@ -1,4 +1,4 @@
OOO_1.1 {
UDK_3_0_0 {
global:
GetVersionInfo;
getAllCalendars_ast_ES;

2
i18npool/source/localedata/data/localedata_others.map
View File

@ -1,4 +1,4 @@
OOO_1.1 {
UDK_3_0_0 {
global:
getAllCalendars_af_NA;
getAllCalendars_af_ZA;

10
i18npool/source/search/i18nsearch.map
View File

@ -1,10 +0,0 @@
UDK_3_0_0 {
global:
GetVersionInfo;
component_getImplementationEnvironment;
component_getFactory;
component_writeInfo;
local:
*;
};

2
i18npool/source/search/makefile.mk
View File

@ -68,7 +68,7 @@ SHL1STDLIBS= \
$(I18NREGEXPLIB)
SHL1DEPN= makefile.mk
SHL1VERSIONMAP= i18nsearch.map
SHL1VERSIONMAP= $(SOLARENV)/src/component.map
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)

2
i18npool/source/textconversion/data/textconv_dict.map
View File

@ -1,4 +1,4 @@
OOO_1.1 {
UDK_3_0_0 {
global:
GetVersionInfo;
getHangul2HanjaData;

10
i18npool/util/i18npool.map
View File

@ -1,10 +0,0 @@
UDK_3_0_0 {
global:
GetVersionInfo;
component_getImplementationEnvironment;
component_getFactory;
component_writeInfo;
local:
*;
};

2
i18npool/util/makefile.mk
View File

@ -60,7 +60,7 @@ SHL1IMPLIB= i$(SHL1TARGET)
SHL1DEPN= makefile.mk \
$(SLB)/i18nisolang$(ISOLANG_MAJOR)$(COMID).lib
SHL1VERSIONMAP=$(PRJNAME).map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)

25
l10ntools/java/receditor/java/transex3/model/SdfString.java
View File

@ -97,32 +97,7 @@ public class SdfString {
public void setModuleName(String modulename) {
this.modulename = modulename;
}
/*
public String getRealFileName(){
//String srcroot = "U:\\cws01\\l10ncleanup\\SRC680\\src.m213";//java.lang.System.getProperty( "SOLARSRC");
//String isWindows = "4nt";//java.lang.System.getProperty( "USE_SHELL");
String srcroot = java.lang.System.getProperty( "SOLARSRC" );
String isWindows = java.lang.System.getProperty( "USE_SHELL" );
//System.out.println("srcroot="+srcroot+" isWindows="+isWindows );
//if( true ) return;
//String relpath = sourceString.getFileId().substring( sourceString.getFileId().lastIndexOf("\\")
// , sourceString.getFileId().length() );
String filename;
if( isWindows != null && isWindows.compareTo( "4nt") == 0 )
{
filename = srcroot + "\\" + //sourceString.getProject() + "\\" +
sourceString.getFileId() +".recommand";
}
else
{
String filepart = sourceString.getFileId();
filepart = filepart.replaceAll( "\\\\" , "/" );
filename = srcroot + "/" + //sourceString.getProject() + "//" +
filepart +".recommand";
}
return filename;
}*/
public String getRealFileName(){
String filepart = sourceString.getFileId();
filepart = filepart.replaceAll( "\\\\" , "_" );

10
l10ntools/scripts/fast_merge.pl
View File

@ -45,12 +45,8 @@ my $last_localize_file;
my $first_run = "1";
my $sdf_filename;
my $merge_dir;
my $WIN;
my $state = "none";
if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) { $WIN = 'TRUE'; }
else { $WIN = ''; }
$SIG{INT} = 'inthandler';
$SIG{QUIT} = 'quithandler';
@ -67,7 +63,6 @@ struct ( sdf_obj =>
parse_options();
my $lock_file = $merge_dir."/lock.mk";
$lock_file =~ s/\//\\/g , if ( $WIN ) ;
acquire_lock();
read_sdf_file_names();
init();
@ -247,10 +242,9 @@ sub make_paths
{
my $localizeFile = $merge_dir."\\".$current[ 0 ]->module."\\".$current[ 0 ]->file;
my $path = getDir( $localizeFile );
if ( !$WIN ) { $path =~ s/\\/\//g; }
$path =~ s/\\/\//g;
$localizeFile = $path."\\localize.sdf";
if ( !$WIN ) { $localizeFile =~ s/\\/\//g; }
$localizeFile = $path."/localize.sdf";
return ( $path , $localizeFile );
}

38
l10ntools/scripts/localize.pl
View File

@ -70,14 +70,12 @@ my $no_gsicheck = '';
my $mode = '';
my $bVerbose = "0";
my $srcpath = '';
my $WIN;
my $languages;
#my %sl_modules; # Contains all modules where en-US and de is source language
my $use_default_date = '0';
my $force_ooo_module = '0';
my %is_ooo_module;
my %is_so_module;
my $DELIMITER;
# ( leftpart ) ( rightpart )
# prj file dummy type gid lid helpid pform width lang text helptext qhelptext title timestamp
@ -91,23 +89,14 @@ my @sdfparticles;
parse_options();
check_modules_scm();
if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) {
$WIN = 'TRUE';
$DELIMITER = "\\";
}
else {
$WIN = '';
$DELIMITER = "/";
}
my $binpath = '';
if( defined $ENV{UPDMINOREXT} )
{
$binpath = $ENV{SOLARVER}.$DELIMITER.$ENV{INPATH}.$DELIMITER."bin".$ENV{UPDMINOREXT}.$DELIMITER ;
$binpath = $ENV{SOLARVER}."/".$ENV{INPATH}."/bin".$ENV{UPDMINOREXT}."/" ;
}
else
{
$binpath = $ENV{SOLARVER}.$DELIMITER.$ENV{INPATH}.$DELIMITER."bin".$DELIMITER ;
$binpath = $ENV{SOLARVER}."/".$ENV{INPATH}."/bin/" ;
}
#%sl_modules = fetch_sourcelanguage_dirlist();
@ -187,9 +176,8 @@ sub splitfile{
exit( -1 );
}
my $src_root = $ENV{SRC_ROOT};
#print $WIN eq "TRUE" ? $src_root."\\l10n_so\n" : $src_root."/l10n_so\n";
my $so_l10n_path = $WIN eq "TRUE" ? $src_root."\\l10n_so\\source" : $src_root."/l10n_so/source";
my $ooo_l10n_path = $WIN eq "TRUE" ? $src_root."\\l10n\\source" : $src_root."/l10n/source";
my $so_l10n_path = $src_root."/l10n_so/source";
my $ooo_l10n_path = $src_root."/l10n/source";
#print "$so_l10n_path\n";
#print "$ooo_l10n_path\n";
@ -286,7 +274,7 @@ sub write_sdf
my @sdf_file;
# mkdir!!!!
my $current_l10n_file = $WIN eq "TRUE" ? $l10n_file."\\$lang\\localize.sdf" : $l10n_file."/$lang/localize.sdf";
my $current_l10n_file = $l10n_file."/$lang/localize.sdf";
print "Writing '$current_l10n_file'\n";
if( open DESTFILE , "< $current_l10n_file" ){
@ -430,17 +418,17 @@ sub add_paths
{
my $langhash_ref = shift;
my $root_dir = $ENV{ SRC_ROOT };
my $ooo_l10n_dir = "$root_dir"."$DELIMITER"."l10n"."$DELIMITER"."source";
my $so_l10n_dir = "$root_dir"."$DELIMITER"."l10n_so"."$DELIMITER"."source";
my $ooo_l10n_dir = "$root_dir/l10n/source";
my $so_l10n_dir = "$root_dir/l10n_so/source";
if( -e $ooo_l10n_dir )
{
foreach my $lang ( keys( %{ $langhash_ref } ) )
{
my $loc_file = "$ooo_l10n_dir"."$DELIMITER"."$lang"."$DELIMITER"."localize.sdf";
my $loc_file = "$ooo_l10n_dir/$lang/localize.sdf";
if( -e $loc_file )
{
push @sdfparticles , "$ooo_l10n_dir"."$DELIMITER"."$lang"."$DELIMITER"."localize.sdf";
push @sdfparticles , "$ooo_l10n_dir/$lang/localize.sdf";
}
else { print "WARNING: $loc_file not found ....\n"; }
}
@ -450,10 +438,10 @@ sub add_paths
{
foreach my $lang ( keys( %{ $langhash_ref } ) )
{
my $loc_file = "$so_l10n_dir"."$DELIMITER"."$lang"."$DELIMITER"."localize.sdf";
my $loc_file = "$so_l10n_dir/$lang/localize.sdf";
if( -e $loc_file )
{
push @sdfparticles , "$ooo_l10n_dir"."$DELIMITER"."$lang"."$DELIMITER"."localize.sdf";
push @sdfparticles , "$ooo_l10n_dir/$lang/localize.sdf";
}
else { #print "WARNING: $loc_file not found ....\n";
}
@ -530,10 +518,6 @@ sub collectfiles{
} #foreach
} # if
} # if
# if ( !$bVerbose ){
# if ( $WIN eq "TRUE" ) { $args .= " > $my_localize_log"; }
# else { $args .= " >& $my_localize_log"; }
# }
if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
my $rc = system( $command.$args );

56
l10ntools/scripts/localize_old.pl
View File

@ -63,7 +63,6 @@ my $outputfile = '';
my $mode = '';
my $bVerbose="0";
my $srcpath = '';
my $WIN;
my $languages;
#my %sl_modules; # Contains all modules where en-US and de is source language
my $use_default_date = '0';
@ -78,13 +77,6 @@ my $default_date = "2002-02-02 02:02:02";
#### main ####
parse_options();
if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) {
$WIN = 'TRUE';
}
else {
$WIN = '';
}
#%sl_modules = fetch_sourcelanguage_dirlist();
@ -136,13 +128,11 @@ sub splitfile{
next if( $prj eq "binfilter" ); # Don't merge strings into binfilter module
chomp( $line );
$currentFile = $srcpath . '\\' . $prj . '\\' . $file;
if ( $WIN ) { $currentFile =~ s/\//\\/g; }
else { $currentFile =~ s/\\/\//g; }
$currentFile =~ s/\\/\//g;
$cur_sdffile = $currentFile;
#if( $cur_sdffile =~ /\.$file_types[\s]*$/ ){
if( $WIN ) { $cur_sdffile =~ s/\\[^\\]*\.$file_types[\s]*$/\\localize.sdf/; }
else { $cur_sdffile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/; }
$cur_sdffile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/;
#}
# Set default date
@ -182,41 +172,6 @@ sub splitfile{
}
#########################################################
#sub fetch_sourcelanguage_dirlist
#{
#
# my $working_path = getcwd();
# my %sl_dirlist;
#
# chdir $srcpath;
# my @all_dirs = csh_glob( "*" );
#
# foreach my $file ( @all_dirs )
# {
# if( -d $file )
# {
# my $module = $file;
# $file .= "/prj/l10n";
# $file =~ s/\//\\/ , if( $WIN ) ;
#
# if( -f $file ) # Test file <module>/prj/l10n
# {
# $sl_dirlist{ $module } = 1;
# if( $bVerbose eq "1" ) { print STDOUT "$module: de and en-US source language detected\n"; }
# }
# }
# }
#
# chdir $working_path;
#
# return %sl_dirlist;
#}
#sub has_two_sourcelanguages
#{
# my $module = shift;
# return defined $sl_modules{ $module } ;
#}
sub writesdf{
my $lastFile = shift;
@ -225,8 +180,7 @@ sub writesdf{
my %index=();
if( $localizeFile =~ /\.$file_types[\s]*$/ ){
if( $WIN ) { $localizeFile =~ s/\\[^\\]*\.$file_types[\s]*$/\\localize.sdf/; }
else { $localizeFile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/; }
$localizeFile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/;
}else {
print STDERR "Strange filetype found '$localizeFile'\n";
return;
@ -471,10 +425,6 @@ sub collectfiles{
} #foreach
} # if
} # if
# if ( !$bVerbose ){
# if ( $WIN eq "TRUE" ) { $args .= " > $my_localize_log"; }
# else { $args .= " >& $my_localize_log"; }
# }
if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
my $rc = system( $command.$args );

2
l10ntools/source/help/makefile.mk
View File

@ -101,7 +101,7 @@ JAVACLASSFILES = \
$(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
.IF "$(SYSTEM_LUCENE)" == "YES"
CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
EXTRAJARFILES += $(LUCENE_CORE_JAR) $(LUCENE_ANALYZERS_JAR)
.ELSE
JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
.ENDIF

2
o3tl/prj/build.lst
View File

@ -1,4 +1,4 @@
ot o3tl : sal testshl2 BOOST:boost NULL
ot o3tl : sal CPPUNIT:cppunit BOOST:boost NULL
ot o3tl usr1 - all ot_mkout NULL
ot o3tl\inc get - all ot_inc NULL
ot o3tl\prj get - all ot_prj NULL

4
o3tl/qa/export.map
View File

@ -25,9 +25,9 @@
#
#*************************************************************************
UDK_3.1 {
UDK_3_0_0 {
global:
registerAllTestFunction;
cppunitTestPlugIn;
local:
*;

14
o3tl/qa/makefile.mk
View File

@ -35,6 +35,9 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
.IF "$(L10N_framework)"==""
# --- Common ----------------------------------------------------------
@ -48,13 +51,13 @@ SHL1OBJS= \
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
$(TESTSHL2LIB)\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
SHL1VERSIONMAP = export.map
SHL1RPATH = NONE
# END ------------------------------------------------------------------
@ -66,16 +69,9 @@ SLOFILES=$(SHL1OBJS)
.ENDIF # L10N_framework
.INCLUDE : target.mk
.INCLUDE : _cppunit.mk
# --- Enable test execution in normal build ------------------------
.IF "$(L10N_framework)"==""
unittest : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
$(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
ALLTAR : unittest
.INCLUDE : _cppunit.mk
.ENDIF # L10N_framework

18
o3tl/qa/test-cow_wrapper.cxx
View File

@ -1,6 +1,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "cow_wrapper_clients.hxx"
@ -119,15 +122,6 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(cow_wrapper_test, "cow_wrapper_test");
// -----------------------------------------------------------------------------
// this macro creates an empty function, which will called by the RegisterAllFunctions()
// to let the user the possibility to also register some functions by hand.
void RegisterAdditionalFunctions(FktRegFuncPtr )
{
}
// NOADDITIONAL;
CPPUNIT_TEST_SUITE_REGISTRATION(cow_wrapper_test);
CPPUNIT_PLUGIN_IMPLEMENT();

6
o3tl/qa/test-heap_ptr.cxx
View File

@ -25,7 +25,9 @@
*
************************************************************************/
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <o3tl/heap_ptr.hxx>
@ -160,4 +162,4 @@ class heap_ptr_test : public CppUnit::TestFixture
}; // class heap_ptr_test
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(heap_ptr_test, "o3tltests");
CPPUNIT_TEST_SUITE_REGISTRATION(heap_ptr_test);

7
o3tl/qa/test-range.cxx
View File

@ -25,8 +25,9 @@
*
************************************************************************/
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <o3tl/range.hxx>
#include <vector>
@ -230,4 +231,4 @@ public:
}; // class range_test
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(range_test, "o3tltests");
CPPUNIT_TEST_SUITE_REGISTRATION(range_test);

11
rsc/source/prj/gui.cxx
View File

@ -30,6 +30,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <sal/main.h>
#include <rscrsc.hxx>
#include <rscdb.hxx>
@ -68,15 +69,7 @@ RscVerbosity lcl_determineVerbosity( int argc, char ** argv )
return RscVerbosityNormal;
}
#if defined( UNX ) || ( defined( OS2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) || defined(__MINGW32__)
int main ( int argc, char ** argv) {
#else
#if defined( MTW )
int main ( int argc, char const ** argv) {
#else
int cdecl main ( int argc, char ** argv) {
#endif
#endif
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
#ifndef UNX
#ifdef CSET
atexit( ExitProgram );

9
rsc/source/prj/start.cxx
View File

@ -54,6 +54,7 @@
#endif // UNX
#include <rsctools.hxx>
#include <rscerror.h>
#include <sal/main.h>
#include <tools/fsys.hxx>
/*************** C O D E ************************************************/
@ -322,14 +323,8 @@ static BOOL CallRsc2( ByteString aRsc2Name,
|* Letzte Aenderung MM 05.09.91
|*
*************************************************************************/
#if defined UNX || (defined OS2 && (defined CSET || defined GCC )) || defined WTC || defined MTW || defined ICC || defined(__MINGW32__)
int main ( int argc, char ** argv)
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{
#else
int cdecl main ( int argc, char ** argv)
{
#endif
BOOL bPrePro = TRUE;
BOOL bResFile = TRUE;
BOOL bHelp = FALSE;

10
svl/qa/complex/ConfigItems/helper/exports.map
View File

@ -1,10 +0,0 @@
UDK_3_0_0 {
global:
GetVersionInfo;
component_getImplementationEnvironment;
component_getFactory;
component_writeInfo;
local:
*;
};

2
svl/qa/complex/ConfigItems/helper/makefile.mk
View File

@ -65,7 +65,7 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
SHL1VERSIONMAP= exports.map
SHL1VERSIONMAP= $(SOLARENV)/src/component.map
# --- Targets ------------------------------------------------------

2
svl/qa/makefile.mk
View File

@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS = true
.INCLUDE : settings.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# BEGIN ----------------------------------------------------------------
# auto generated Target:job by codegen.pl
SHL1OBJS= \

8
svl/source/fsstor/exports.map
View File

@ -1,8 +0,0 @@
UDK_3_0_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
svl/source/fsstor/makefile.mk
View File

@ -56,7 +56,7 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(SALLIB)
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)

8
svl/source/passwordcontainer/exports.map
View File

@ -1,8 +0,0 @@
UDK_3_0_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
svl/source/passwordcontainer/makefile.mk
View File

@ -52,7 +52,7 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(SALLIB)
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)

1
svtools/prj/build.lst
View File

@ -27,3 +27,4 @@ st svtools\util nmake - all st_util st_svtgraphic st
st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL
st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL
st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL
st svtools\qa\unoapi nmake - all st_qa_unoapi NULL

51
svtools/qa/unoapi/Test.java Normal file
View File

@ -0,0 +1,51 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
************************************************************************/
package org.openoffice.svtools.qa.unoapi;
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
import static org.junit.Assert.*;
public final class Test {
@org.junit.Before public void setUp() throws Exception {
connection.setUp();
}
@org.junit.After public void tearDown()
throws InterruptedException, com.sun.star.uno.Exception
{
connection.tearDown();
}
@org.junit.Test public void test() {
assertTrue(
Runner.run(
"-sce", "svtools.sce", "-xcl", "knownissues.xcl", "-cs",
connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();
}

30
svtools/qa/unoapi/makefile.mk
View File

@ -1,7 +1,6 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@ -22,19 +21,28 @@
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
#***********************************************************************/
PRJ=..$/..
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
nothing .PHONY:
.ELSE
PRJNAME=svtools
TARGET=qa_unoapi
PRJ = ../..
PRJNAME = svtools
TARGET = qa_unoapi
.IF "$(OOO_JUNIT_JAR)" != ""
PACKAGE = org/openoffice/svtools/qa/unoapi
JAVATESTFILES = Test.java
JAVAFILES = $(JAVATESTFILES)
JARFILES = OOoRunner.jar ridl.jar test.jar
EXTRAJARFILES = $(OOO_JUNIT_JAR)
.END
.INCLUDE: settings.mk
.INCLUDE: target.mk
.INCLUDE: installationtest.mk
ALLTAR : UNOAPI_TEST
ALLTAR : javatest
UNOAPI_TEST:
+$(SOLARENV)$/bin$/checkapi -sce svtools.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments
.END

8
svtools/source/hatchwindow/exports.map
View File

@ -1,8 +0,0 @@
UDK_3_0_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
svtools/source/hatchwindow/makefile.mk
View File

@ -55,7 +55,7 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(SALLIB)
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)

8
svtools/source/productregistration/exports.map
View File

@ -1,8 +0,0 @@
UDK_3_0_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
svtools/source/productregistration/makefile.mk
View File

@ -59,7 +59,7 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(SALLIB)
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)

2
svtools/workben/unodialog/makefile.mk
View File

@ -56,7 +56,7 @@ SLOFILES= $(SLO)$/unodialogsample.obj \
# --- library -----------------------------------
SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
SHL1VERSIONMAP=$(TARGET).map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1STDLIBS= \
$(CPPULIB) \

8
svtools/workben/unodialog/udlg.map
View File

@ -1,8 +0,0 @@
UDLG_1_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

1
toolkit/prj/build.lst
View File

@ -11,3 +11,4 @@ ti toolkit\source\controls\grid nmake - all ti_grid NULL
ti toolkit\source\layout\core nmake - all ti_layout_core NULL
ti toolkit\source\layout\vcl nmake - all ti_layout_vcl NULL
ti toolkit\util nmake - all ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_grid ti_layout_vcl NULL
ti toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL

51
toolkit/qa/unoapi/Test.java Normal file
View File

@ -0,0 +1,51 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
************************************************************************/
package org.openoffice.toolkit.qa.unoapi;
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
import static org.junit.Assert.*;
public final class Test {
@org.junit.Before public void setUp() throws Exception {
connection.setUp();
}
@org.junit.After public void tearDown()
throws InterruptedException, com.sun.star.uno.Exception
{
connection.tearDown();
}
@org.junit.Test public void test() {
assertTrue(
Runner.run(
"-sce", "toolkit.sce", "-xcl", "knownissues.xcl", "-tdoc",
"testdocuments", "-cs", connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();
}

12
toolkit/qa/unoapi/knownissues.xcl
View File

@ -90,11 +90,6 @@ toolkit.AccessibleRadioButton
toolkit.AccessibleToolBox
# -> disabled in toolkit.sce
### i80788 ###
toolkit.Toolkit
toolkit.UnoControlDialog
# -> disabled in toolkit.sce
### i86011 ###
toolkit.UnoControlFileControl
# -> disabled in toolkit.sce
@ -239,4 +234,9 @@ toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleComponent
toolkit.UnoScrollBarControl::com::sun::star::awt::XScrollBar
### i94344 ###
toolkit.AccessibleTabPage::com::sun::star::accessibility::XAccessibleText
toolkit.AccessibleTabPage::com::sun::star::accessibility::XAccessibleText
### i109643 ###
toolkit.AccessibleMenu::com::sun::star::accessibility::XAccessibleValue
toolkit.AccessibleMenuBar::com::sun::star::accessibility::XAccessibleEventBroadcaster
toolkit.AccessibleMenuBar::com::sun::star::accessibility::XAccessibleSelection

33
toolkit/qa/unoapi/makefile.mk
View File

@ -1,7 +1,6 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@ -22,22 +21,28 @@
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
#***********************************************************************/
PRJ=..$/..
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
nothing .PHONY:
.ELSE
PRJNAME=toolkit
TARGET=qa_unoapi
PRJ = ../..
PRJNAME = toolkit
TARGET = qa_unoapi
.IF "$(OOO_JUNIT_JAR)" != ""
PACKAGE = org/openoffice/toolkit/qa/unoapi
JAVATESTFILES = Test.java
JAVAFILES = $(JAVATESTFILES)
JARFILES = OOoRunner.jar ridl.jar test.jar
EXTRAJARFILES = $(OOO_JUNIT_JAR)
.END
.INCLUDE: settings.mk
.INCLUDE: target.mk
.INCLUDE: installationtest.mk
ALLTAR : UNOAPI_TEST
ALLTAR : javatest
UNOAPI_TEST:
+$(SOLARENV)$/bin$/checkapi -sce toolkit.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments
@echo =======================================================================
@echo In case you noticed a failures of toolkit.AccessibleToolBoxItem make sure that the object bar is configured as text and not as icons
@echo =======================================================================
.END

8
toolkit/qa/unoapi/toolkit.sce
View File

@ -17,8 +17,8 @@
-o toolkit.AccessibleScrollBar
-o toolkit.AccessibleStatusBar
-o toolkit.AccessibleStatusBarItem
-o toolkit.AccessibleTabControl
-o toolkit.AccessibleTabPage
#i109643 -o toolkit.AccessibleTabControl
#i109643 -o toolkit.AccessibleTabPage
#i86287 -o toolkit.AccessibleToolBox
#i88605 -o toolkit.AccessibleToolBoxItem
-o toolkit.AccessibleWindow
@ -26,7 +26,7 @@
-o toolkit.MutableTreeNode
-o toolkit.TabController
-o toolkit.TabControllerModel
#i80788 -o toolkit.Toolkit
-o toolkit.Toolkit
-o toolkit.UnoControlButton
-o toolkit.UnoControlButtonModel
-o toolkit.UnoControlCheckBox
@ -39,7 +39,7 @@
-o toolkit.UnoControlCurrencyFieldModel
-o toolkit.UnoControlDateField
-o toolkit.UnoControlDateFieldModel
#i80788 -o toolkit.UnoControlDialog
#allegedly was i80788, but still broken: -o toolkit.UnoControlDialog
-o toolkit.UnoControlDialogModel
-o toolkit.UnoControlEdit
-o toolkit.UnoControlEditModel

8
tools/bootstrp/command.cxx
View File

@ -355,7 +355,7 @@ CCommand::CCommand( ByteString &rString )
{
rString.SearchAndReplace( '\t', ' ' );
aCommand = rString.GetToken( 0, ' ' );
aCommandLine = Search();
aCommandLine = Search( "PATH" );
#ifndef UNX
aCommandLine += " /c ";
#else
@ -365,7 +365,7 @@ CCommand::CCommand( ByteString &rString )
ByteString sCmd( rString.GetToken( 0, ' ' ));
ByteString sParam( rString.Copy( sCmd.Len()));
aCommandLine += Search( thePath, sCmd );
aCommandLine += Search( "PATH", sCmd );
aCommandLine += sParam;
ImplInit();
@ -379,7 +379,7 @@ CCommand::CCommand( const char *pChar )
aString.SearchAndReplace( '\t', ' ' );
aCommand = aString.GetToken( 0, ' ' );
aCommandLine = Search();
aCommandLine = Search( "PATH" );
#ifndef UNX
aCommandLine += " /c ";
#else
@ -390,7 +390,7 @@ CCommand::CCommand( const char *pChar )
ByteString sCmd( rString.GetToken( 0, ' ' ));
ByteString sParam( rString.Copy( sCmd.Len()));
aCommandLine += Search( thePath, sCmd );
aCommandLine += Search( "PATH", sCmd );
aCommandLine += sParam;
ImplInit();

8
tools/bootstrp/rscdep.cxx
View File

@ -36,6 +36,7 @@
#include <string.h>
#include "bootstrp/prj.hxx"
#include "sal/main.h"
#include <tools/string.hxx>
#include <tools/list.hxx>
@ -78,12 +79,7 @@ static int optopt = 0;
static int opterr = 0;
#endif
int
#ifdef WNT
_cdecl
#endif
main( int argc, char **argv )
SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
{
int c;
char aBuf[255];

4
tools/inc/bootstrp/command.hxx
View File

@ -92,8 +92,6 @@ public:
void Print();
};
static ByteString thePath( "PATH" );
/** Declares and spawns a child process.
The spawned programm could be a native executable or a schell script.
*/
@ -127,7 +125,7 @@ public:
@param sItem specifies the system shell
@return the Location (when programm was found)
*/
static ByteString Search( ByteString sEnv = thePath,
static ByteString Search( ByteString sEnv,
ByteString sItem = COMMAND_SHELL );
/** Spawns the Process

31
tools/inc/tools/debug.hxx
View File

@ -125,19 +125,18 @@ struct DbgDataType
#define DBG_FUNC_SAVEDATA 5
#define DBG_FUNC_SETPRINTMSGBOX 6
#define DBG_FUNC_SETPRINTWINDOW 7
#define DBG_FUNC_SETPRINTSHELL 8
#define DBG_FUNC_SETPRINTTESTTOOL 9
#define DBG_FUNC_MEMTEST 10
#define DBG_FUNC_XTORINFO 11
#define DBG_FUNC_MEMINFO 12
#define DBG_FUNC_COREDUMP 13
#define DBG_FUNC_ALLERROROUT 14
#define DBG_FUNC_SETTESTSOLARMUTEX 15
#define DBG_FUNC_TESTSOLARMUTEX 16
#define DBG_FUNC_PRINTFILE 17
#define DBG_FUNC_GETPRINTMSGBOX 18
#define DBG_FUNC_FILTERMESSAGE 19 // new for #i38967
#define DBG_FUNC_UPDATEOSLHOOK 20
#define DBG_FUNC_SETPRINTTESTTOOL 8
#define DBG_FUNC_MEMTEST 9
#define DBG_FUNC_XTORINFO 10
#define DBG_FUNC_MEMINFO 11
#define DBG_FUNC_COREDUMP 12
#define DBG_FUNC_ALLERROROUT 13
#define DBG_FUNC_SETTESTSOLARMUTEX 14
#define DBG_FUNC_TESTSOLARMUTEX 15
#define DBG_FUNC_PRINTFILE 16
#define DBG_FUNC_GETPRINTMSGBOX 17
#define DBG_FUNC_FILTERMESSAGE 18 // new for #i38967
#define DBG_FUNC_UPDATEOSLHOOK 19
TOOLS_DLLPUBLIC void* DbgFunc( USHORT nAction, void* pData = NULL );
@ -176,11 +175,6 @@ inline void DbgSetPrintWindow( DbgPrintLine pProc )
DbgFunc( DBG_FUNC_SETPRINTWINDOW, (void*)(long)pProc );
}
inline void DbgSetPrintShell( DbgPrintLine pProc )
{
DbgFunc( DBG_FUNC_SETPRINTSHELL, (void*)(long)pProc );
}
inline void DbgSetPrintTestTool( DbgPrintLine pProc )
{
DbgFunc( DBG_FUNC_SETPRINTTESTTOOL, (void*)(long)pProc );
@ -344,6 +338,7 @@ void DbgPrintStackTree( void* p );
TOOLS_DLLPUBLIC void DbgOut( const sal_Char* pMsg, USHORT nOutType = DBG_OUT_TRACE,
const sal_Char* pFile = NULL, USHORT nLine = 0 );
TOOLS_DLLPUBLIC void DbgPrintShell(char const * message);
TOOLS_DLLPUBLIC void DbgOutTypef( USHORT nOutType, const sal_Char* pFStr, ... );
TOOLS_DLLPUBLIC void DbgOutf( const sal_Char* pFStr, ... );
TOOLS_DLLPUBLIC void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... );

1
tools/qa/makefile.mk
View File

@ -32,6 +32,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
SHL1TARGET = test_pathutils

32
tools/source/debug/debug.cxx
View File

@ -151,7 +151,6 @@ struct DebugData
USHORT bInit;
DbgPrintLine pDbgPrintMsgBox;
DbgPrintLine pDbgPrintWindow;
DbgPrintLine pDbgPrintShell;
DbgPrintLine pDbgPrintTestTool;
::std::vector< DbgPrintLine >
aDbgPrintUserChannels;
@ -166,7 +165,6 @@ struct DebugData
:bInit( FALSE )
,pDbgPrintMsgBox( FALSE )
,pDbgPrintWindow( NULL )
,pDbgPrintShell( NULL )
,pDbgPrintTestTool( NULL )
,pProfList( NULL )
,pXtorList( NULL )
@ -1037,9 +1035,7 @@ static void DebugDeInit()
pData->aDbgData.nTestFlags &= (DBG_TEST_MEM | DBG_TEST_PROFILING);
pData->aDbgPrintUserChannels.clear();
pData->pDbgPrintTestTool = NULL;
pData->pDbgPrintShell = NULL;
pData->pDbgPrintWindow = NULL;
pData->pDbgPrintShell = NULL;
pData->pOldDebugMessageFunc = NULL;
ImplDbgDeInitLock();
}
@ -1199,10 +1195,6 @@ void* DbgFunc( USHORT nAction, void* pParam )
pDebugData->pDbgPrintWindow = (DbgPrintLine)(long)pParam;
break;
case DBG_FUNC_SETPRINTSHELL:
pDebugData->pDbgPrintShell = (DbgPrintLine)(long)pParam;
break;
case DBG_FUNC_SETPRINTTESTTOOL:
pDebugData->pDbgPrintTestTool = (DbgPrintLine)(long)pParam;
break;
@ -1738,14 +1730,6 @@ void DbgOut( const sal_Char* pMsg, USHORT nDbgOut, const sal_Char* pFile, USHORT
{
if ( pData->pDbgPrintMsgBox )
pData->pDbgPrintMsgBox( aBufOut );
else
nOut = DBG_OUT_SHELL;
}
if ( nOut == DBG_OUT_SHELL )
{
if ( pData->pDbgPrintShell )
pData->pDbgPrintShell( aBufOut );
else
nOut = DBG_OUT_WINDOW;
}
@ -1758,14 +1742,28 @@ void DbgOut( const sal_Char* pMsg, USHORT nDbgOut, const sal_Char* pFile, USHORT
nOut = DBG_OUT_FILE;
}
if ( nOut == DBG_OUT_FILE )
switch ( nOut )
{
case DBG_OUT_SHELL:
DbgPrintShell( aBufOut );
break;
case DBG_OUT_FILE:
ImplDbgPrintFile( aBufOut );
break;
}
ImplDbgUnlock();
bIn = FALSE;
}
void DbgPrintShell(char const * message) {
fprintf(stderr, "%s\n", message);
#if defined WNT
OutputDebugStringA(message);
#endif
}
// -----------------------------------------------------------------------
void DbgOutTypef( USHORT nDbgOut, const sal_Char* pFStr, ... )

2
tools/test/export.map
View File

@ -25,7 +25,7 @@
#
#*************************************************************************
UDK_3.1 {
UDK_3_0_0 {
global:
registerAllTestFunction;

2
tools/test/makefile.mk
View File

@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------
SHL1OBJS= \

8
ucbhelper/workben/myucp/exports.map
View File

@ -1,8 +0,0 @@
UDK_3_0_0 {
global:
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
};

2
ucbhelper/workben/myucp/makefile.mk
View File

@ -68,7 +68,7 @@ LIB1OBJFILES=$(SLOFILES)
SHL1TARGET=$(TARGET)
SHL1IMPLIB=i$(TARGET)
SHL1VERSIONMAP=exports.map
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
# @@@ Add additional libs here.
SHL1STDLIBS=\

6
unotools/source/misc/desktopterminationobserver.cxx
View File

@ -211,12 +211,6 @@ namespace utl
void DesktopTerminationObserver::revokeTerminationListener( ITerminationListener* _pListener )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( getListenerAdminData().bAlreadyTerminated )
{
_pListener->notifyTermination();
return;
}
Listeners& rListeners = getListenerAdminData().aListeners;
for ( Listeners::iterator lookup = rListeners.begin();
lookup != rListeners.end();

13
vcl/aqua/source/dtrans/aqua_clipboard.cxx
View File

@ -189,6 +189,10 @@ void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransf
const Reference<XClipboardOwner>& xClipboardOwner)
throw( RuntimeException )
{
NSArray* types = xTransferable.is() ?
mpDataFlavorMapper->flavorSequenceToTypesArray(xTransferable->getTransferDataFlavors()) :
[NSArray array];
ClearableMutexGuard aGuard(m_aMutex);
Reference<XClipboardOwner> oldOwner(mXClipboardOwner);
@ -197,11 +201,10 @@ void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransf
Reference<XTransferable> oldContent(mXClipboardContent);
mXClipboardContent = xTransferable;
NSArray* types = mXClipboardContent.is() ?
mpDataFlavorMapper->flavorSequenceToTypesArray(mXClipboardContent->getTransferDataFlavors()) :
[NSArray array];
mPasteboardChangeCount = [mPasteboard declareTypes: types owner: mEventListener];
aGuard.clear();
// if we are already the owner of the clipboard
// then fire lost ownership event
if (oldOwner.is())
@ -253,7 +256,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard
void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification)
{
MutexGuard aGuard(m_aMutex);
ClearableMutexGuard aGuard(m_aMutex);
int currentPboardChgCount = [mPasteboard changeCount];
@ -270,6 +273,8 @@ void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification)
Reference<XTransferable> oldContent(mXClipboardContent);
mXClipboardContent = Reference<XTransferable>();
aGuard.clear();
if (oldOwner.is())
{
fireLostClipboardOwnershipEvent(oldOwner, oldContent);

30
vcl/inc/vcl/ppdparser.hxx
View File

@ -221,7 +221,7 @@ public:
bool isType42Capable() const { return m_bType42Capable; }
ULONG getLanguageLevel() const { return m_nLanguageLevel; }
const String& getDefaultPaperDimension() const;
String getDefaultPaperDimension() const;
void getDefaultPaperDimension( int& rWidth, int& rHeight ) const
{ getPaperDimension( getDefaultPaperDimension(), rWidth, rHeight ); }
bool getPaperDimension( const String& rPaperName,
@ -230,12 +230,12 @@ public:
// returns false if paper not found
int getPaperDimensions() const
{ return m_pPaperDimensions ? m_pPaperDimensions->countValues() : 0; }
const String& getPaperDimension( int ) const;
const String& getPaperDimensionCommand( int ) const;
const String& getPaperDimensionCommand( const String & ) const;
String getPaperDimension( int ) const;
String getPaperDimensionCommand( int ) const;
String getPaperDimensionCommand( const String & ) const;
// match the best paper for width and height
const String& matchPaper( int nWidth, int nHeight ) const;
String matchPaper( int nWidth, int nHeight ) const;
bool getMargins( const String& rPaperName,
int &rLeft, int& rRight,
@ -245,27 +245,27 @@ public:
// values int pt
const String& getDefaultInputSlot() const;
String getDefaultInputSlot() const;
int getInputSlots() const
{ return m_pInputSlots ? m_pInputSlots->countValues() : 0; }
const String& getSlot( int ) const;
const String& getSlotCommand( int ) const;
const String& getSlotCommand( const String& ) const;
String getSlot( int ) const;
String getSlotCommand( int ) const;
String getSlotCommand( const String& ) const;
void getDefaultResolution( int& rXRes, int& rYRes ) const;
int getResolutions() const;
void getResolution( int, int& rXRes, int& rYRes ) const;
const String& getResolutionCommand( int nXRes, int nYRes ) const;
String getResolutionCommand( int nXRes, int nYRes ) const;
// values in dpi
void getResolutionFromString( const String&, int&, int& ) const;
// helper function
const String& getDefaultDuplexType() const;
String getDefaultDuplexType() const;
int getDuplexTypes() const
{ return m_pDuplexTypes ? m_pDuplexTypes->countValues() : 0; }
const String& getDuplex( int ) const;
const String& getDuplexCommand( int ) const;
const String& getDuplexCommand( const String& ) const;
String getDuplex( int ) const;
String getDuplexCommand( int ) const;
String getDuplexCommand( const String& ) const;
int getFonts() const
{ return m_pFontList ? m_pFontList->countValues() : 0; }
@ -275,7 +275,7 @@ public:
void getFontAttributes( const String&,
String& rEncoding,
String& rCharset ) const;
const String& getFont( int ) const;
String getFont( int ) const;
rtl::OUString translateKey( const rtl::OUString& i_rKey,

25
vcl/source/app/dbggui.cxx
View File

@ -1783,8 +1783,6 @@ void DbgDialogTest( Window* pWindow )
}
// =======================================================================
void DbgPrintShell( const char* pLine );
#ifndef WNT
#define USE_VCL_MSGBOX
#define COPY_BUTTON_ID 25
@ -1963,27 +1961,6 @@ void DbgPrintWindow( const char* pLine )
bIn = FALSE;
}
// -----------------------------------------------------------------------
void DbgPrintShell( const char* pLine )
{
#if defined( WNT )
// TODO: Shouldn't this be a IsDebuggerPresent()?
if ( GetSystemMetrics( SM_DEBUG ) )
{
strcpy( aDbgOutBuf, pLine );
strcat( aDbgOutBuf, "\r\n" );
OutputDebugString( aDbgOutBuf );
return;
}
DbgPrintWindow( pLine );
#endif
#ifdef UNX
fprintf( stderr, "%s\n", pLine );
#endif
}
// =======================================================================
#ifdef WNT
@ -1996,7 +1973,6 @@ void DbgGUIInit()
{
DbgSetPrintMsgBox( DbgPrintMsgBox );
DbgSetPrintWindow( DbgPrintWindow );
DbgSetPrintShell( DbgPrintShell );
#ifdef WNT
DbgSetTestSolarMutex( ImplDbgTestSolarMutex );
#endif
@ -2008,7 +1984,6 @@ void DbgGUIDeInit()
{
DbgSetPrintMsgBox( NULL );
DbgSetPrintWindow( NULL );
DbgSetPrintShell( NULL );
#ifdef WNT
DbgSetTestSolarMutex( NULL );
#endif

16
vcl/source/helper/xconnection.cxx
View File

@ -141,12 +141,16 @@ bool DisplayConnection::dispatchEvent( void* pThis, void* pData, int nBytes )
SolarMutexReleaser aRel;
DisplayConnection* This = (DisplayConnection*)pThis;
MutexGuard aGuard( This->m_aMutex );
Sequence< sal_Int8 > aSeq( (sal_Int8*)pData, nBytes );
Any aEvent;
aEvent <<= aSeq;
for( ::std::list< Reference< XEventHandler > >::const_iterator it = This->m_aHandlers.begin(); it != This->m_aHandlers.end(); ++it )
::std::list< Reference< XEventHandler > > handlers;
{
MutexGuard aGuard( This->m_aMutex );
handlers = This->m_aHandlers;
}
for( ::std::list< Reference< XEventHandler > >::const_iterator it = handlers.begin(); it != handlers.end(); ++it )
if( (*it)->handleEvent( aEvent ) )
return true;
return false;
@ -157,12 +161,16 @@ bool DisplayConnection::dispatchErrorEvent( void* pThis, void* pData, int nBytes
SolarMutexReleaser aRel;
DisplayConnection* This = (DisplayConnection*)pThis;
MutexGuard aGuard( This->m_aMutex );
Sequence< sal_Int8 > aSeq( (sal_Int8*)pData, nBytes );
Any aEvent;
aEvent <<= aSeq;
for( ::std::list< Reference< XEventHandler > >::const_iterator it = This->m_aErrorHandlers.begin(); it != This->m_aErrorHandlers.end(); ++it )
::std::list< Reference< XEventHandler > > handlers;
{
MutexGuard aGuard( This->m_aMutex );
handlers = This->m_aErrorHandlers;
}
for( ::std::list< Reference< XEventHandler > >::const_iterator it = handlers.begin(); it != handlers.end(); ++it )
if( (*it)->handleEvent( aEvent ) )
return true;

26
vcl/unx/headless/svpinst.cxx
View File

@ -55,6 +55,19 @@ extern "C"
}
}
bool SvpSalInstance::isFrameAlive( const SalFrame* pFrame ) const
{
for( std::list< SalFrame* >::const_iterator it = m_aFrames.begin();
it != m_aFrames.end(); ++it )
{
if( *it == pFrame )
{
return true;
}
}
return false;
}
SvpSalInstance* SvpSalInstance::s_pDefaultInstance = NULL;
SvpSalInstance::SvpSalInstance()
@ -346,12 +359,15 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
{
for( std::list<SalUserEvent>::const_iterator it = aEvents.begin(); it != aEvents.end(); ++it )
{
it->m_pFrame->CallCallback( it->m_nEvent, it->m_pData );
if( it->m_nEvent == SALEVENT_RESIZE )
if ( isFrameAlive( it->m_pFrame ) )
{
// this would be a good time to post a paint
const SvpSalFrame* pSvpFrame = static_cast<const SvpSalFrame*>(it->m_pFrame);
pSvpFrame->PostPaint();
it->m_pFrame->CallCallback( it->m_nEvent, it->m_pData );
if( it->m_nEvent == SALEVENT_RESIZE )
{
// this would be a good time to post a paint
const SvpSalFrame* pSvpFrame = static_cast<const SvpSalFrame*>(it->m_pFrame);
pSvpFrame->PostPaint();
}
}
}
}

3
vcl/unx/headless/svpinst.hxx
View File

@ -108,6 +108,9 @@ class SvpSalInstance : public SalInstance
std::list< SalUserEvent > m_aUserEvents;
std::list< SalFrame* > m_aFrames;
bool isFrameAlive( const SalFrame* pFrame ) const;
public:
static SvpSalInstance* s_pDefaultInstance;

87
vcl/unx/source/printer/ppdparser.cxx
View File

@ -258,7 +258,6 @@ using namespace rtl;
std::list< PPDParser* > PPDParser::aAllParsers;
std::hash_map< OUString, OUString, OUStringHash >* PPDParser::pAllPPDFiles = NULL;
static String aEmptyString;
class PPDDecompressStream
{
@ -1284,12 +1283,12 @@ void PPDParser::parseConstraint( const ByteString& rLine )
m_aConstraints.push_back( aConstraint );
}
const String& PPDParser::getDefaultPaperDimension() const
String PPDParser::getDefaultPaperDimension() const
{
if( m_pDefaultPaperDimension )
return m_pDefaultPaperDimension->m_aOption;
return aEmptyString;
return String();
}
bool PPDParser::getMargins(
@ -1356,10 +1355,10 @@ bool PPDParser::getPaperDimension(
return true;
}
const String& PPDParser::matchPaper( int nWidth, int nHeight ) const
String PPDParser::matchPaper( int nWidth, int nHeight ) const
{
if( ! m_pPaperDimensions )
return aEmptyString;
return String();
int nPDim = -1;
double PDWidth, PDHeight;
@ -1393,51 +1392,51 @@ const String& PPDParser::matchPaper( int nWidth, int nHeight ) const
{
// swap portrait/landscape and try again
bDontSwap = true;
const String& rRet = matchPaper( nHeight, nWidth );
String rRet = matchPaper( nHeight, nWidth );
bDontSwap = false;
return rRet;
}
return nPDim != -1 ? m_pPaperDimensions->getValue( nPDim )->m_aOption : aEmptyString;
return nPDim != -1 ? m_pPaperDimensions->getValue( nPDim )->m_aOption : String();
}
const String& PPDParser::getDefaultInputSlot() const
String PPDParser::getDefaultInputSlot() const
{
if( m_pDefaultInputSlot )
return m_pDefaultInputSlot->m_aValue;
return aEmptyString;
return String();
}
const String& PPDParser::getSlot( int nSlot ) const
String PPDParser::getSlot( int nSlot ) const
{
if( ! m_pInputSlots )
return aEmptyString;
return String();
if( nSlot > 0 && nSlot < m_pInputSlots->countValues() )
return m_pInputSlots->getValue( nSlot )->m_aOption;
else if( m_pInputSlots->countValues() > 0 )
return m_pInputSlots->getValue( (ULONG)0 )->m_aOption;
return aEmptyString;
return String();
}
const String& PPDParser::getSlotCommand( int nSlot ) const
String PPDParser::getSlotCommand( int nSlot ) const
{
if( ! m_pInputSlots )
return aEmptyString;
return String();
if( nSlot > 0 && nSlot < m_pInputSlots->countValues() )
return m_pInputSlots->getValue( nSlot )->m_aValue;
else if( m_pInputSlots->countValues() > 0 )
return m_pInputSlots->getValue( (ULONG)0 )->m_aValue;
return aEmptyString;
return String();
}
const String& PPDParser::getSlotCommand( const String& rSlot ) const
String PPDParser::getSlotCommand( const String& rSlot ) const
{
if( ! m_pInputSlots )
return aEmptyString;
return String();
for( int i=0; i < m_pInputSlots->countValues(); i++ )
{
@ -1445,39 +1444,39 @@ const String& PPDParser::getSlotCommand( const String& rSlot ) const
if( pValue->m_aOption == rSlot )
return pValue->m_aValue;
}
return aEmptyString;
return String();
}
const String& PPDParser::getPaperDimension( int nPaperDimension ) const
String PPDParser::getPaperDimension( int nPaperDimension ) const
{
if( ! m_pPaperDimensions )
return aEmptyString;
return String();
if( nPaperDimension > 0 && nPaperDimension < m_pPaperDimensions->countValues() )
return m_pPaperDimensions->getValue( nPaperDimension )->m_aOption;
else if( m_pPaperDimensions->countValues() > 0 )
return m_pPaperDimensions->getValue( (ULONG)0 )->m_aOption;
return aEmptyString;
return String();
}
const String& PPDParser::getPaperDimensionCommand( int nPaperDimension ) const
String PPDParser::getPaperDimensionCommand( int nPaperDimension ) const
{
if( ! m_pPaperDimensions )
return aEmptyString;
return String();
if( nPaperDimension > 0 && nPaperDimension < m_pPaperDimensions->countValues() )
return m_pPaperDimensions->getValue( nPaperDimension )->m_aValue;
else if( m_pPaperDimensions->countValues() > 0 )
return m_pPaperDimensions->getValue( (ULONG)0 )->m_aValue;
return aEmptyString;
return String();
}
const String& PPDParser::getPaperDimensionCommand( const String& rPaperDimension ) const
String PPDParser::getPaperDimensionCommand( const String& rPaperDimension ) const
{
if( ! m_pPaperDimensions )
return aEmptyString;
return String();
for( int i=0; i < m_pPaperDimensions->countValues(); i++ )
{
@ -1485,7 +1484,7 @@ const String& PPDParser::getPaperDimensionCommand( const String& rPaperDimension
if( pValue->m_aOption == rPaperDimension )
return pValue->m_aValue;
}
return aEmptyString;
return String();
}
void PPDParser::getResolutionFromString(
@ -1543,13 +1542,13 @@ void PPDParser::getResolution( int nNr, int& rXRes, int& rYRes ) const
rXRes, rYRes );
}
const String& PPDParser::getResolutionCommand( int nXRes, int nYRes ) const
String PPDParser::getResolutionCommand( int nXRes, int nYRes ) const
{
if( ( ! m_pResolutions || m_pResolutions->countValues() == 0 ) && m_pDefaultResolution )
return m_pDefaultResolution->m_aValue;
if( ! m_pResolutions )
return aEmptyString;
return String();
int nX, nY;
for( int i = 0; i < m_pResolutions->countValues(); i++ )
@ -1559,46 +1558,46 @@ const String& PPDParser::getResolutionCommand( int nXRes, int nYRes ) const
if( nX == nXRes && nY == nYRes )
return m_pResolutions->getValue( i )->m_aValue;
}
return aEmptyString;
return String();
}
const String& PPDParser::getDefaultDuplexType() const
String PPDParser::getDefaultDuplexType() const
{
if( m_pDefaultDuplexType )
return m_pDefaultDuplexType->m_aValue;
return aEmptyString;
return String();
}
const String& PPDParser::getDuplex( int nDuplex ) const
String PPDParser::getDuplex( int nDuplex ) const
{
if( ! m_pDuplexTypes )
return aEmptyString;
return String();
if( nDuplex > 0 && nDuplex < m_pDuplexTypes->countValues() )
return m_pDuplexTypes->getValue( nDuplex )->m_aOption;
else if( m_pDuplexTypes->countValues() > 0 )
return m_pDuplexTypes->getValue( (ULONG)0 )->m_aOption;
return aEmptyString;
return String();
}
const String& PPDParser::getDuplexCommand( int nDuplex ) const
String PPDParser::getDuplexCommand( int nDuplex ) const
{
if( ! m_pDuplexTypes )
return aEmptyString;
return String();
if( nDuplex > 0 && nDuplex < m_pDuplexTypes->countValues() )
return m_pDuplexTypes->getValue( nDuplex )->m_aValue;
else if( m_pDuplexTypes->countValues() > 0 )
return m_pDuplexTypes->getValue( (ULONG)0 )->m_aValue;
return aEmptyString;
return String();
}
const String& PPDParser::getDuplexCommand( const String& rDuplex ) const
String PPDParser::getDuplexCommand( const String& rDuplex ) const
{
if( ! m_pDuplexTypes )
return aEmptyString;
return String();
for( int i=0; i < m_pDuplexTypes->countValues(); i++ )
{
@ -1606,7 +1605,7 @@ const String& PPDParser::getDuplexCommand( const String& rDuplex ) const
if( pValue->m_aOption == rDuplex )
return pValue->m_aValue;
}
return aEmptyString;
return String();
}
void PPDParser::getFontAttributes(
@ -1636,14 +1635,14 @@ void PPDParser::getFontAttributes(
}
}
const String& PPDParser::getFont( int nFont ) const
String PPDParser::getFont( int nFont ) const
{
if( ! m_pFontList )
return aEmptyString;
return String();
if( nFont >=0 && nFont < m_pFontList->countValues() )
return m_pFontList->getValue( nFont )->m_aOption;
return aEmptyString;
return String();
}
rtl::OUString PPDParser::translateKey( const rtl::OUString& i_rKey,