[Libreoffice-commits] .: 54 commits - basebmp/CppunitTest_basebmp.mk basebmp/inc basebmp/Library_basebmp.mk basebmp/Makefile basebmp/Module_basebmp.mk basebmp/Package_inc.mk basebmp/prj basebmp/source basebmp/test basebmp/util basegfx/CppunitTest_basegfx.mk basegfx/inc basegfx/Library_basegfx.mk basegfx/Makefile basegfx/Module_basegfx.mk basegfx/Package_inc.mk basegfx/prj basegfx/source basegfx/StaticLibrary_basegfx_s.mk basegfx/test basegfx/util canvas/inc canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx5canvas.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_nullcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk canvas/Makefile canvas/Module_canvas.mk canvas/Package_inc.mk canvas/prj canvas/source comphelper/inc comphelper/JunitTest_comphelper_complex.mk comphelper/Library_comphelp.mk comphelper/qa comphelper/test cppcanvas/inc cppcanvas/Library_cppcanvas.mk cppcanvas/Ma kefile cppcanvas/Module_cppcanvas.mk cppcanvas/Package_inc.mk cppcanvas/prj cppcanvas/source cppcanvas/util i18npool/source padmin/Executable_spadmin.bin.mk padmin/Library_spa.mk regexp/inc regexp/Library_regexp.mk regexp/Makefile regexp/Module_regexp.mk regexp/Package_inc.mk regexp/prj regexp/source sax/CppunitTest_sax.mk sax/Library_expwrap.mk sax/Library_fastsax.mk sax/Library_sax.mk sax/Makefile sax/Module_sax.mk sax/Package_inc.mk sax/prj sax/qa sax/source sax/util sot/JunitTest_sot_complex.mk sot/Library_sot.mk svl/JunitTest_svl_complex.mk svl/Library_svl.mk svl/qa svl/source svtools/inc svtools/JunitTest_svtools_unoapi.mk svtools/Library_svt.mk svtools/source toolkit/JunitTest_toolkit_unoapi.mk toolkit/Library_tk.mk tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/Library_tl.mk tools/Package_reversemap.mk tools/StaticLibrary_toolshelpers.mk ucbhelper/inc ucbhelper/Library_ucbhelper.mk ucbhelper/Makefile ucbhelper/Module_ucb helper.mk ucbhelper/Package_inc.mk ucbhelper/prj ucbhelper/source ucbhelper/util ucbhelper/version.mk unotools/JunitTest_unotools_complex.mk unotools/Library_utl.mk unotools/Module_unotools.mk vcl/aqua vcl/inc vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/Package_afmhash.mk vcl/source vcl/win
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:49:47 PDT 2011
basebmp/CppunitTest_basebmp.mk | 50 +
basebmp/Library_basebmp.mk | 68 +
basebmp/Makefile | 38
basebmp/Module_basebmp.mk | 39
basebmp/Package_inc.mk | 64 +
basebmp/inc/basebmp/bitmapdevice.hxx | 19
basebmp/prj/build.lst | 5
basebmp/prj/d.lst | 9
basebmp/prj/makefile.mk | 40 +
basebmp/source/makefile.mk | 76 -
basebmp/test/basictest.cxx | 1
basebmp/test/makefile.mk | 111 --
basebmp/util/basebmp.flt | 4
basebmp/util/makefile.mk | 66 -
basegfx/CppunitTest_basegfx.mk | 61 +
basegfx/Library_basegfx.mk | 121 +++
basegfx/Makefile | 38
basegfx/Module_basegfx.mk | 40 +
basegfx/Package_inc.mk | 111 ++
basegfx/StaticLibrary_basegfx_s.mk | 126 +++
basegfx/inc/basegfx/basegfxdllapi.h | 50 +
basegfx/inc/basegfx/color/bcolor.hxx | 3
basegfx/inc/basegfx/color/bcolormodifier.hxx | 5
basegfx/inc/basegfx/color/bcolortools.hxx | 21
basegfx/inc/basegfx/curve/b2dbeziertools.hxx | 3
basegfx/inc/basegfx/curve/b2dcubicbezier.hxx | 3
basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx | 3
basegfx/inc/basegfx/matrix/b2dhommatrix.hxx | 3
basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx | 25
basegfx/inc/basegfx/matrix/b3dhommatrix.hxx | 3
basegfx/inc/basegfx/numeric/ftools.hxx | 3
basegfx/inc/basegfx/pixel/bpixel.hxx | 3
basegfx/inc/basegfx/point/b2dhompoint.hxx | 29
basegfx/inc/basegfx/point/b2dpoint.hxx | 9
basegfx/inc/basegfx/point/b2ipoint.hxx | 3
basegfx/inc/basegfx/point/b3dpoint.hxx | 5
basegfx/inc/basegfx/point/b3ipoint.hxx | 3
basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx | 5
basegfx/inc/basegfx/polygon/b2dpolygon.hxx | 3
basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx | 19
basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx | 21
basegfx/inc/basegfx/polygon/b2dpolygontools.hxx | 145 +--
basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx | 5
basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx | 3
basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx | 23
basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx | 3
basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx | 61 -
basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx | 11
basegfx/inc/basegfx/polygon/b3dpolygon.hxx | 3
basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx | 17
basegfx/inc/basegfx/polygon/b3dpolygontools.hxx | 63 -
basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx | 3
basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx | 35
basegfx/inc/basegfx/range/b1drange.hxx | 3
basegfx/inc/basegfx/range/b1ibox.hxx | 3
basegfx/inc/basegfx/range/b1irange.hxx | 3
basegfx/inc/basegfx/range/b2dpolyrange.hxx | 3
basegfx/inc/basegfx/range/b2drange.hxx | 11
basegfx/inc/basegfx/range/b2drangeclipper.hxx | 3
basegfx/inc/basegfx/range/b2ibox.hxx | 3
basegfx/inc/basegfx/range/b2irange.hxx | 5
basegfx/inc/basegfx/range/b3drange.hxx | 5
basegfx/inc/basegfx/range/b3ibox.hxx | 3
basegfx/inc/basegfx/range/b3irange.hxx | 3
basegfx/inc/basegfx/range/basicbox.hxx | 3
basegfx/inc/basegfx/raster/bpixelraster.hxx | 3
basegfx/inc/basegfx/raster/bzpixelraster.hxx | 3
basegfx/inc/basegfx/raster/rasterconvert3d.hxx | 13
basegfx/inc/basegfx/tools/b2dclipstate.hxx | 3
basegfx/inc/basegfx/tools/canvastools.hxx | 99 +-
basegfx/inc/basegfx/tools/debugplotter.hxx | 3
basegfx/inc/basegfx/tools/gradienttools.hxx | 15
basegfx/inc/basegfx/tools/keystoplerp.hxx | 3
basegfx/inc/basegfx/tools/tools.hxx | 5
basegfx/inc/basegfx/tools/unopolypolygon.hxx | 3
basegfx/inc/basegfx/tools/unotools.hxx | 4
basegfx/inc/basegfx/tuple/b2dtuple.hxx | 11
basegfx/inc/basegfx/tuple/b2i64tuple.hxx | 3
basegfx/inc/basegfx/tuple/b2ituple.hxx | 34
basegfx/inc/basegfx/tuple/b3dtuple.hxx | 5
basegfx/inc/basegfx/tuple/b3i64tuple.hxx | 3
basegfx/inc/basegfx/tuple/b3ituple.hxx | 4
basegfx/inc/basegfx/vector/b2dvector.hxx | 15
basegfx/inc/basegfx/vector/b2ivector.hxx | 13
basegfx/inc/basegfx/vector/b3dvector.hxx | 7
basegfx/inc/basegfx/vector/b3ivector.hxx | 5
basegfx/inc/makefile.mk | 47 -
basegfx/prj/build.lst | 21
basegfx/prj/d.lst | 112 --
basegfx/prj/makefile.mk | 40 +
basegfx/source/color/makefile.mk | 47 -
basegfx/source/curve/makefile.mk | 47 -
basegfx/source/matrix/makefile.mk | 45 -
basegfx/source/numeric/makefile.mk | 43 -
basegfx/source/pixel/makefile.mk | 45 -
basegfx/source/point/makefile.mk | 47 -
basegfx/source/polygon/makefile.mk | 61 -
basegfx/source/range/makefile.mk | 50 -
basegfx/source/raster/makefile.mk | 47 -
basegfx/source/tools/makefile.mk | 52 -
basegfx/source/tuple/makefile.mk | 48 -
basegfx/source/vector/makefile.mk | 46 -
basegfx/test/basegfx1d.cxx | 1
basegfx/test/export.map | 34
basegfx/test/makefile.mk | 85 --
basegfx/util/basegfx.flt | 6
basegfx/util/makefile.mk | 86 --
canvas/Library_cairocanvas.mk | 118 +++
canvas/Library_canvasfactory.mk | 53 +
canvas/Library_canvastools.mk | 111 ++
canvas/Library_directx5canvas.mk | 116 ++
canvas/Library_directx9canvas.mk | 107 ++
canvas/Library_gdipluscanvas.mk | 94 ++
canvas/Library_nullcanvas.mk | 70 +
canvas/Library_simplecanvas.mk | 63 +
canvas/Library_vclcanvas.mk | 97 ++
canvas/Makefile | 38
canvas/Module_canvas.mk | 57 +
canvas/Package_inc.mk | 63 +
canvas/inc/canvas/base/cachedprimitivebase.hxx | 3
canvas/inc/canvas/base/canvascustomspritehelper.hxx | 4
canvas/inc/canvas/base/disambiguationhelper.hxx | 8
canvas/inc/canvas/canvastools.hxx | 61 -
canvas/inc/canvas/canvastoolsdllapi.h | 40 +
canvas/inc/canvas/elapsedtime.hxx | 3
canvas/inc/canvas/parametricpolypolygon.hxx | 3
canvas/inc/canvas/prioritybooster.hxx | 5
canvas/inc/canvas/propertysethelper.hxx | 3
canvas/inc/canvas/rendering/isurfaceproxymanager.hxx | 3
canvas/inc/canvas/spriteredrawmanager.hxx | 3
canvas/inc/canvas/verifyinput.hxx | 39
canvas/inc/makefile.mk | 47 -
canvas/prj/build.lst | 11
canvas/prj/d.lst | 33
canvas/prj/makefile.mk | 40 +
canvas/source/cairo/cairo_canvashelper_texturefill.cxx | 147 ---
canvas/source/cairo/exports.dxp | 1
canvas/source/cairo/makefile.mk | 149 ---
canvas/source/directx/exports.dxp | 1
canvas/source/directx/makefile.mk | 241 ------
canvas/source/factory/makefile.mk | 63 -
canvas/source/null/exports.dxp | 1
canvas/source/null/makefile.mk | 70 -
canvas/source/simplecanvas/exports.dxp | 1
canvas/source/simplecanvas/makefile.mk | 71 -
canvas/source/tools/makefile.mk | 92 --
canvas/source/vcl/canvasbitmap.hxx | 2
canvas/source/vcl/exports.dxp | 1
canvas/source/vcl/makefile.mk | 93 --
comphelper/JunitTest_comphelper_complex.mk | 2
comphelper/Library_comphelp.mk | 3
comphelper/inc/comphelper/numberedcollection.hxx | 2
comphelper/qa/string/makefile.mk | 53 -
comphelper/qa/string/test_string.cxx | 44 -
comphelper/qa/string/test_string_noadditional.cxx | 2
comphelper/qa/weakbag/test_weakbag_noadditional.cxx | 2
comphelper/test/uno_iterators/uno_iterators.cxx | 14
cppcanvas/Library_cppcanvas.mk | 91 ++
cppcanvas/Makefile | 38
cppcanvas/Module_cppcanvas.mk | 35
cppcanvas/Package_inc.mk | 45 +
cppcanvas/inc/cppcanvas/basegfxfactory.hxx | 3
cppcanvas/inc/cppcanvas/cppcanvasdllapi.h | 39
cppcanvas/inc/cppcanvas/vclfactory.hxx | 3
cppcanvas/inc/makefile.mk | 47 -
cppcanvas/prj/build.lst | 8
cppcanvas/prj/d.lst | 19
cppcanvas/prj/makefile.mk | 40 +
cppcanvas/source/mtfrenderer/makefile.mk | 59 -
cppcanvas/source/tools/makefile.mk | 50 -
cppcanvas/source/wrapper/makefile.mk | 60 -
cppcanvas/util/cppcanvas.flt | 4
cppcanvas/util/makefile.mk | 74 -
i18npool/source/localedata/data/makefile.mk | 2
i18npool/source/search/makefile.mk | 6
padmin/Executable_spadmin.bin.mk | 4
padmin/Library_spa.mk | 3
regexp/Library_regexp.mk | 51 +
regexp/Makefile | 38
regexp/Module_regexp.mk | 35
regexp/Package_inc.mk | 31
regexp/inc/makefile.mk | 47 -
regexp/inc/pch/precompiled_regexp.cxx | 31
regexp/inc/pch/precompiled_regexp.hxx | 34
regexp/inc/regexp/reclass.hxx | 391 ++++++++++
regexp/prj/build.lst | 4
regexp/prj/d.lst | 8
regexp/prj/makefile.mk | 40 +
regexp/source/makefile.mk | 74 -
regexp/source/reclass.cxx | 7
sax/CppunitTest_sax.mk | 45 +
sax/Library_expwrap.mk | 58 +
sax/Library_fastsax.mk | 68 +
sax/Library_sax.mk | 63 +
sax/Makefile | 38
sax/Module_sax.mk | 41 +
sax/Package_inc.mk | 34
sax/prj/build.lst | 7
sax/prj/d.lst | 16
sax/prj/makefile.mk | 40 +
sax/qa/cppunit/test_converter.cxx | 1
sax/source/expatwrap/attrlistimpl.hxx | 2
sax/source/expatwrap/expwrap.component | 37
sax/source/expatwrap/makefile.mk | 91 --
sax/source/expatwrap/sax.component | 37
sax/source/fastparser/makefile.mk | 83 --
sax/source/tools/makefile.mk | 71 -
sax/util/makefile.pmk | 30
sot/JunitTest_sot_complex.mk | 2
sot/Library_sot.mk | 3
svl/JunitTest_svl_complex.mk | 2
svl/Library_svl.mk | 3
svl/qa/complex/passwordcontainer/makefile.mk | 134 ---
svl/source/numbers/zformat.cxx | 2
svl/source/passwordcontainer/syscreds.cxx | 4
svtools/JunitTest_svtools_unoapi.mk | 2
svtools/Library_svt.mk | 13
svtools/inc/svtools/langhelp.hxx | 2
svtools/source/control/ruler.cxx | 2
svtools/source/misc/langhelp.cxx | 2
toolkit/JunitTest_toolkit_unoapi.mk | 2
toolkit/Library_tk.mk | 8
tools/Executable_mkunroll.mk | 3
tools/Executable_rscdep.mk | 6
tools/Executable_so_checksum.mk | 3
tools/Library_tl.mk | 17
tools/Package_reversemap.mk | 2
tools/StaticLibrary_toolshelpers.mk | 3
ucbhelper/Library_ucbhelper.mk | 86 ++
ucbhelper/Makefile | 38
ucbhelper/Module_ucbhelper.mk | 38
ucbhelper/Package_inc.mk | 59 +
ucbhelper/inc/makefile.mk | 48 -
ucbhelper/prj/build.lst | 8
ucbhelper/prj/d.lst | 40 -
ucbhelper/prj/makefile.mk | 40 +
ucbhelper/source/client/makefile.mk | 60 -
ucbhelper/source/provider/configureucb.cxx | 242 ------
ucbhelper/source/provider/contenthelper.cxx | 2
ucbhelper/source/provider/makefile.mk | 70 -
ucbhelper/source/provider/provconf.cxx | 256 ------
ucbhelper/source/provider/provconf.hxx | 55 -
ucbhelper/source/provider/resultsethelper.cxx | 4
ucbhelper/util/makefile.mk | 76 -
ucbhelper/util/makefile.pmk | 31
ucbhelper/util/ucbhelper.flt | 181 ----
ucbhelper/util/ucbhelper.xml | 114 --
ucbhelper/version.mk | 42 -
unotools/JunitTest_unotools_complex.mk | 69 -
unotools/Library_utl.mk | 21
unotools/Module_unotools.mk | 5
vcl/Library_desktop_detector.mk | 11
vcl/Library_vcl.mk | 77 -
vcl/Library_vclplug_gen.mk | 56 -
vcl/Library_vclplug_gtk.mk | 23
vcl/Library_vclplug_kde.mk | 19
vcl/Library_vclplug_kde4.mk | 19
vcl/Library_vclplug_svp.mk | 10
vcl/Package_afmhash.mk | 2
vcl/aqua/source/app/vclnsapp.mm | 26
vcl/aqua/source/gdi/salgdi.cxx | 4
vcl/aqua/source/gdi/salprn.cxx | 79 --
vcl/aqua/source/window/salframe.cxx | 5
vcl/inc/aqua/saldata.hxx | 3
vcl/source/gdi/pdfwriter_impl.cxx | 3
vcl/source/gdi/print2.cxx | 1
vcl/source/glyphs/gcach_ftyp.cxx | 2
vcl/source/glyphs/gcach_vdev.hxx | 2
vcl/win/source/gdi/salgdi3.cxx | 4
269 files changed, 4328 insertions(+), 5342 deletions(-)
New commits:
commit e5cd127ef0411909b431140509bcbfa7df3804ff
Merge: afb5f59... 010bc6e...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:23:00 2011 +0200
Merge branch 'master' into feature/gnumake4
commit afb5f59b0015da2ef07f911723100c1b9e421b57
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:53:09 2011 +0200
remove superfluous include paths
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 97fcb79..f88cf12 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,basebmp,\
-I$(SRCDIR)/basebmp/inc/ \
-I$(SRCDIR)/basebmp/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_use_api,basebmp,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,basebmp,\
commit 3ee3f480d136d0f5bc759f04966078463e18f624
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:23:24 2011 +0200
keep gbuild calls consistent at now, even if it is a bit longer
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 6d36898..c31a0b1 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -78,7 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_textlayout \
))
-$(call gb_Library_use_external,cairocanvas,cairo)
+$(eval $(call gb_Library_use_external,cairocanvas,cairo))
ifeq ($(OS),WNT)
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 5b9bd34..f69281e 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,expwrap,expat_utf16)
+$(eval $(call gb_Library_use_external,expwrap,expat_utf16))
$(eval $(call gb_Library_add_exception_objects,expwrap,\
sax/source/expatwrap/attrlistimpl \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index f347842..d6fe471 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -47,13 +47,9 @@ $(eval $(call gb_Library_add_linked_libs,fastsax,\
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_add_defs,fastsax,\
- -DSYSTEM_ZLIB \
-))
-endif
+$(eval $(call gb_Library_use_external,fastsax,zlib))
-$(call gb_Library_use_external,fastsax,expat_utf8)
+$(eval $(call gb_Library_use_external,fastsax,expat_utf8))
# re-uses xml2utf object from sax.uno lib (see below)
$(eval $(call gb_Library_add_exception_objects,fastsax,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index ea6a568..b6569b4 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -74,10 +74,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,svt,\
+$(eval $(call gb_Library_use_externals,svt,\
icuuc \
jpeg \
-)
+))
$(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/brwbox/brwbox1 \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 439f171..c861523 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -127,7 +127,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
))
endif
-$(call gb_Library_use_external,tl,zlib)
+$(eval $(call gb_Library_use_external,tl,zlib))
ifeq ($(OS),WNT)
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 3673218..10ffd6f 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -70,10 +70,10 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,desktop_detector,\
+$(eval $(call gb_Library_use_externals,desktop_detector,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
vcl/unx/generic/desktopdetect/desktopdetector \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 08ccec9..b67e24c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -90,10 +90,10 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,vcl,\
+$(eval $(call gb_Library_use_externals,vcl,\
icule \
icuuc \
-)
+))
ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_cxxflags,vcl,\
@@ -461,7 +461,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
))
endif
-$(call gb_Library_use_external,vcl,graphite)
+$(eval $(call gb_Library_use_external,vcl,graphite))
endif
## handle Cairo
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 895afe2..9f7c771 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -62,10 +62,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,vclplug_gen,\
+$(eval $(call gb_Library_use_externals,vclplug_gen,\
icule \
icuuc \
-)
+))
ifeq ($(SYSTEM_CAIRO),YES)
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index d9674f0..b6305fc 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -91,10 +91,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,vclplug_gtk,\
+$(eval $(call gb_Library_use_externals,vclplug_gtk,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
vcl/unx/gtk/a11y/atkaction \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index e4586b8..d72ce2e 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -75,10 +75,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
ICE \
))
-$(call gb_Library_use_externals,vclplug_kde,\
+$(eval $(call gb_Library_use_externals,vclplug_kde,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
vcl/unx/kde/kdedata \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index bbc64aa..19c1b97 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -78,10 +78,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
ICE \
))
-$(call gb_Library_use_externals,vclplug_kde4,\
+$(eval $(call gb_Library_use_externals,vclplug_kde4,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
vcl/unx/kde4/KDEData \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 7616e6c..a876915 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -68,10 +68,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,vclplug_svp,\
+$(eval $(call gb_Library_use_externals,vclplug_svp,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
vcl/unx/headless/svpbmp \
commit d73b274782fc7595748b04101bc65e70b387a6f0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 02:38:41 2011 +0200
add cairocanvas and canvasfactory
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 6747bbd..6d36898 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -35,6 +35,11 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
-I$(SRCDIR)/canvas/inc/pch \
))
+$(eval $(call gb_Library_add_api,cairocanvas,\
+ offapi \
+ udkapi \
+))
+
ifneq ($(strip $(VERBOSE)$(verbose)),)
$(eval $(call gb_Library_add_defs,cairocanvas,\
-DVERBOSE \
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 41d5c72..4a2c3df 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -28,13 +28,15 @@
$(eval $(call gb_Module_Module,canvas))
$(eval $(call gb_Module_add_targets,canvas,\
+ Library_cairocanvas \
+ Library_canvasfactory \
Library_canvastools \
Library_nullcanvas \
Library_simplecanvas \
Library_vclcanvas \
- Library_canvasfactory \
Package_inc \
))
+
ifeq ($(strip $(OS)),WNT)
ifneq ($(strip $(ENABLE_DIRECTX)),)
@@ -52,10 +54,4 @@ $(eval $(call gb_Module_add_targets,canvas,\
endif
endif
-ifeq ($(strip $(ENABLE_CAIRO_CANVAS)),TRUE)
-$(eval $(call gb_Module_add_targets,canvas,\
- Library_cairocanvas \
-))
-endif
-
# vim: set noet sw=4 ts=4:
commit 2afc074f25d71956a645fa2855e27b97f763fd5f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 21:07:24 2011 +0200
postmerge fixes for gnumake4
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 51cdcc6..fdac0a4 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -53,4 +53,9 @@ $(eval $(call gb_CppunitTest_set_include,basegfx_test,\
-I$(OUTDIR)/inc/offuh \
))
+$(eval $(call gb_CppunitTest_add_api,basegfx_test,\
+ offapi \
+ udkapi \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index c510b5f..7390583 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -36,13 +36,17 @@ $(eval $(call gb_Library_set_include,basegfx,\
-I$(SRCDIR)/basegfx/source/inc \
-I$(SRCDIR)/basegfx/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,basegfx,\
-DBASEGFX_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,basegfx,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,basegfx,\
cppu \
cppuhelper \
@@ -51,14 +55,15 @@ $(eval $(call gb_Library_add_linked_libs,basegfx,\
))
$(eval $(call gb_Library_add_exception_objects,basegfx,\
- basegfx/source/tools/liangbarsky \
- basegfx/source/tools/debugplotter \
+ basegfx/source/tools/b2dclipstate \
basegfx/source/tools/canvastools \
+ basegfx/source/tools/debugplotter \
basegfx/source/tools/gradienttools \
basegfx/source/tools/keystoplerp \
- basegfx/source/tools/unopolypolygon \
+ basegfx/source/tools/liangbarsky \
basegfx/source/tools/tools \
- basegfx/source/tools/b2dclipstate \
+ basegfx/source/tools/unopolypolygon \
+ basegfx/source/tools/unotools \
basegfx/source/numeric/ftools \
basegfx/source/tuple/b3ituple \
basegfx/source/tuple/b3dtuple \
@@ -98,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/matrix/b3dhommatrix \
basegfx/source/matrix/b2dhommatrix \
basegfx/source/point/b3ipoint \
- basegfx/source/point/b3dhompoint \
basegfx/source/point/b2dpoint \
basegfx/source/point/b3dpoint \
basegfx/source/point/b2dhompoint \
diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk
index 1f8fbd6..e8d07ff 100644
--- a/basegfx/Package_inc.mk
+++ b/basegfx/Package_inc.mk
@@ -92,7 +92,6 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/pixel/bpixel.hxx,baseg
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrix.hxx,basegfx/matrix/b2dhommatrix.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b3dhommatrix.hxx,basegfx/matrix/b3dhommatrix.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrixtools.hxx,basegfx/matrix/b2dhommatrixtools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dhompoint.hxx,basegfx/point/b3dhompoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3ipoint.hxx,basegfx/point/b3ipoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dpoint.hxx,basegfx/point/b3dpoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dpoint.hxx,basegfx/point/b2dpoint.hxx))
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 36f6117..940af85 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -36,7 +36,12 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
-I$(SRCDIR)/basegfx/source/inc \
$$(INCLUDE) \
-I$(SRCDIR)/basegfx/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_StaticLibrary_add_api,basegfx_s,\
+ offapi \
+ udkapi \
))
# the whole library is a hack
@@ -103,7 +108,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
CustomTarget/basegfx/source/matrix/b3dhommatrix \
CustomTarget/basegfx/source/matrix/b2dhommatrix \
CustomTarget/basegfx/source/point/b3ipoint \
- CustomTarget/basegfx/source/point/b3dhompoint \
CustomTarget/basegfx/source/point/b2dpoint \
CustomTarget/basegfx/source/point/b3dpoint \
CustomTarget/basegfx/source/point/b2dhompoint \
diff --git a/basegfx/inc/basegfx/tools/unotools.hxx b/basegfx/inc/basegfx/tools/unotools.hxx
index e7bcc27..52e2069 100644
--- a/basegfx/inc/basegfx/tools/unotools.hxx
+++ b/basegfx/inc/basegfx/tools/unotools.hxx
@@ -44,10 +44,10 @@ class B2DPolyPolygon;
namespace unotools
{
- B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const ::com::sun::star::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
+ BASEGFX_DLLPUBLIC B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const ::com::sun::star::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
throw( ::com::sun::star::lang::IllegalArgumentException );
- void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
+ BASEGFX_DLLPUBLIC void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
::com::sun::star::drawing::PolyPolygonBezierCoords& rRetval );
}
}
diff --git a/basegfx/prj/build.lst b/basegfx/prj/build.lst
index ab5cf9b..fd4a0ce 100644
--- a/basegfx/prj/build.lst
+++ b/basegfx/prj/build.lst
@@ -1,3 +1,3 @@
-fx basegfx : o3tl sal offapi comphelper cppuhelper cppu CPPUNIT:cppunit NULL
+fx basegfx : o3tl sal offapi udkapi comphelper cppuhelper cppu CPPUNIT:cppunit NULL
fx basegfx\prj nmake - all fx_prj NULL
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 9fc2db0..6747bbd 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index ce02c19..fb7499c 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -33,9 +33,12 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
+$(eval $(call gb_Library_add_api,canvasfactory,\
+ offapi \
+ udkapi \
+))
$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
cppu \
cppuhelper \
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index dc424ed..9fb6308 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,canvastools,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,canvastools,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,canvastools,\
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index 4413909..53205db 100644
--- a/canvas/Library_directx5canvas.mk
+++ b/canvas/Library_directx5canvas.mk
@@ -34,9 +34,12 @@ $(eval $(call gb_Library_set_include,directx5canvas,\
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(SRCDIR)/canvas/source/directx \
- -I$(OUTDIR)/inc/offuh \
))
+$(eval $(call gb_Library_add_api,directx5canvas,\
+ offapi \
+ udkapi \
+))
$(eval $(call gb_Library_add_defs,directx5canvas,\
-DDIRECTX_VERSION=0x0500 \
))
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index cb8264d..a1a08c0 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index f5b2bc3..c188059 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,gdipluscanvas,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,gdipluscanvas,\
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index e179804..4dc5994 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -31,7 +31,11 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,nullcanvas,\
+ offapi \
+ udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 5f1f2d7..b031a0a 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,simplecanvas,\
+ offapi \
+ udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 9cc7405..7141552 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,vclcanvas,\
+ offapi \
+ udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index bf1e794..87bf679 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_set_include,cppcanvas,\
-I$(SRCDIR)/cppcanvas/inc/pch \
-I$(SRCDIR)/cppcanvas/source/inc \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
+$(eval $(call gb_Library_add_api,cppcanvas,\
+ offapi \
+ udkapi \
+))
$(eval $(call gb_Library_add_defs,cppcanvas,\
-DCPPCANVAS_DLLIMPLEMENTATION \
))
diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk
index 463892d..1fa02bb 100644
--- a/regexp/Library_regexp.mk
+++ b/regexp/Library_regexp.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,i18nregexp))
$(eval $(call gb_Library_add_package_headers,i18nregexp,regexp_inc))
-$(eval $(call gb_Library_set_include,i18nregexp,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+$(eval $(call gb_Library_add_api,i18nregexp,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,i18nregexp,\
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index d29632d..9a292c4 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -38,9 +38,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,sax_cppunit,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+$(eval $(call gb_CppunitTest_add_api,sax_cppunit,\
+ offapi \
+ udkapi \
))
-
# vim: set noet sw=4 ts=4:
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 05bddd0..5b9bd34 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -31,10 +31,14 @@ $(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap)
$(eval $(call gb_Library_set_include,expwrap,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
+$(eval $(call gb_Library_add_api,expwrap,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,expwrap,\
cppu \
cppuhelper \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 2dd9dcc..f347842 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -31,10 +31,14 @@ $(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax
$(eval $(call gb_Library_set_include,fastsax,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
+$(eval $(call gb_Library_add_api,fastsax,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,fastsax,\
cppu \
cppuhelper \
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index f3e089e..4ac6c56 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_add_package_headers,sax,\
$(eval $(call gb_Library_set_include,sax,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
+$(eval $(call gb_Library_add_api,sax,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_defs,sax,\
-DSAX_DLLIMPLEMENTATION \
))
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index f1df847..14bf74d 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,ucbhelper,\
$$(INCLUDE) \
-I$(SRCDIR)/ucbhelper/inc \
-I$(SRCDIR)/ucbhelper/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,ucbhelper,\
-DUCBHELPER_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,ucbhelper,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,ucbhelper,\
cppu \
cppuhelper \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7ca41ba..08ccec9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -56,8 +56,7 @@ $(eval $(call gb_Library_set_include,vcl,\
-I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
))
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_include,vcl,\
- $$(INCLUDE) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
@@ -200,8 +199,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
endif
ifeq ($(GUIBASE),android)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
@@ -473,8 +471,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/components/rasterizer_rsvg \
))
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_LIBRSVG \
))
ifeq ($(SYSTEM_CAIRO),YES)
@@ -490,8 +487,7 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\
# that point as they occur on the command line, it is pointless to
# search the cairo library at that point as no references to cairo
# entries have been read from object files yet.
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
$$(CAIRO_LIBS) \
))
@@ -515,8 +511,7 @@ endif
endif
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
$$(FONTCONFIG_LIBS) \
$$(FREETYPE_LIBS) \
))
@@ -561,7 +556,7 @@ $(eval $(call gb_Library_add_ldflags,vcl,\
))
endif
ifeq ($(COM),GCC)
-$(eval $(call gb_Library_set_ldflags,vcl,\
+$(eval $(call gb_Library_add_ldflags,vcl,\
$$(LDFLAGS) \
))
endif
@@ -585,8 +580,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
endif
ifeq ($(GUIBASE),cocoatouch)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-framework UIKit \
-framework CoreFoundation \
))
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 819d9ce..895afe2 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -67,17 +67,17 @@ $(call gb_Library_use_externals,vclplug_gen,\
icuuc \
)
-))
+ifeq ($(SYSTEM_CAIRO),YES)
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
$$(LDFLAGS) \
$$(CAIRO_LIBS) \
))
else
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vclplug_gen,\
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
+
$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
cairo \
))
commit bc5dd970bf3cffc97e28b6c966083617f1b2d805
Merge: 4001f42... ee748b2...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:56:16 2011 +0200
resyncing to master
diff --cc basebmp/inc/basebmp/bitmapdevice.hxx
index 2502b67,addecb1..0fc0933
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.hxx
@@@ -646,9 -647,10 +654,10 @@@ private
/** Factory method to create a BitmapDevice for given scanline format
*/
-BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
+BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
bool bTopDown,
- sal_Int32 nScanlineFormat );
+ sal_Int32 nScanlineFormat,
+ BitmapDeviceDamageTracker* pDamage = NULL );
/** Factory method to create a BitmapDevice for given scanline format
with the given palette
diff --cc basegfx/prj/build.lst
index ed12d71,8d55325..ab5cf9b
--- a/basegfx/prj/build.lst
+++ b/basegfx/prj/build.lst
@@@ -1,3 -1,18 +1,3 @@@
- fx basegfx : o3tl sal offuh cppuhelper cppu CPPUNIT:cppunit NULL
+ fx basegfx : o3tl sal offapi comphelper 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
-fx basegfx\source\curve nmake - all fx_curve fx_inc NULL
-fx basegfx\source\matrix nmake - all fx_matrix fx_inc NULL
-fx basegfx\source\numeric nmake - all fx_numeric fx_inc NULL
-fx basegfx\source\point nmake - all fx_point fx_inc NULL
-fx basegfx\source\polygon nmake - all fx_polygon fx_inc NULL
-fx basegfx\source\range nmake - all fx_range fx_inc NULL
-fx basegfx\source\tuple nmake - all fx_tuple fx_inc NULL
-fx basegfx\source\tools nmake - all fx_tools fx_inc NULL
-fx basegfx\source\vector nmake - all fx_vector fx_inc NULL
-fx basegfx\source\color nmake - all fx_color fx_inc NULL
-fx basegfx\source\pixel nmake - all fx_pixel fx_inc NULL
-fx basegfx\source\raster nmake - all fx_raster fx_inc NULL
-fx basegfx\util nmake - all fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector fx_color fx_pixel fx_raster NULL
-fx basegfx\test nmake - all fx_tests fx_util NULL
+fx basegfx\prj nmake - all fx_prj NULL
+
diff --cc basegfx/prj/d.lst
index e69de29,4c71015..997a233
--- a/basegfx/prj/d.lst
+++ b/basegfx/prj/d.lst
@@@ -1,0 -1,113 +1,1 @@@
+ ..\inc\basegfx\tools\unotools.hxx %_DEST%\inc\basegfx\tools\unotools.hxx
-..\%__SRC%\lib\ibasegfx.lib %_DEST%\lib\ibasegfx.lib
-..\%__SRC%\lib\basegfx_s.lib %_DEST%\lib\basegfx_s.lib
-
-..\%__SRC%\bin\basegfx?????.dll %_DEST%\bin\basegfx?????.dll
-..\%__SRC%\bin\bgfx*.dll %_DEST%\bin\bgfx*.dll
-
-..\%__SRC%\lib\libbasegfx*.* %_DEST%\lib\libbasegfx*.*
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-
-mkdir: %_DEST%\inc\basegfx
-
-mkdir: %_DEST%\inc\basegfx\matrix
-..\inc\basegfx\matrix\b2dhommatrix.hxx %_DEST%\inc\basegfx\matrix\b2dhommatrix.hxx
-..\inc\basegfx\matrix\b2dhommatrixtools.hxx %_DEST%\inc\basegfx\matrix\b2dhommatrixtools.hxx
-..\inc\basegfx\matrix\b3dhommatrix.hxx %_DEST%\inc\basegfx\matrix\b3dhommatrix.hxx
-
-mkdir: %_DEST%\inc\basegfx\point
-..\inc\basegfx\point\b2dpoint.hxx %_DEST%\inc\basegfx\point\b2dpoint.hxx
-..\inc\basegfx\point\b3dpoint.hxx %_DEST%\inc\basegfx\point\b3dpoint.hxx
-..\inc\basegfx\point\b2ipoint.hxx %_DEST%\inc\basegfx\point\b2ipoint.hxx
-..\inc\basegfx\point\b3ipoint.hxx %_DEST%\inc\basegfx\point\b3ipoint.hxx
-..\inc\basegfx\point\b2dhompoint.hxx %_DEST%\inc\basegfx\point\b2dhompoint.hxx
-
-mkdir: %_DEST%\inc\basegfx\range
-..\inc\basegfx\range\rangeexpander.hxx %_DEST%\inc\basegfx\range\rangeexpander.hxx
-..\inc\basegfx\range\basicrange.hxx %_DEST%\inc\basegfx\range\basicrange.hxx
-..\inc\basegfx\range\basicbox.hxx %_DEST%\inc\basegfx\range\basicbox.hxx
-..\inc\basegfx\range\b1drange.hxx %_DEST%\inc\basegfx\range\b1drange.hxx
-..\inc\basegfx\range\b2dpolyrange.hxx %_DEST%\inc\basegfx\range\b2dpolyrange.hxx
-..\inc\basegfx\range\b2drange.hxx %_DEST%\inc\basegfx\range\b2drange.hxx
-..\inc\basegfx\range\b2drectangle.hxx %_DEST%\inc\basegfx\range\b2drectangle.hxx
-..\inc\basegfx\range\b2dconnectedranges.hxx %_DEST%\inc\basegfx\range\b2dconnectedranges.hxx
-..\inc\basegfx\range\b3drange.hxx %_DEST%\inc\basegfx\range\b3drange.hxx
-..\inc\basegfx\range\b3dvolume.hxx %_DEST%\inc\basegfx\range\b3dvolume.hxx
-..\inc\basegfx\range\b1irange.hxx %_DEST%\inc\basegfx\range\b1irange.hxx
-..\inc\basegfx\range\b2irange.hxx %_DEST%\inc\basegfx\range\b2irange.hxx
-..\inc\basegfx\range\b2irectangle.hxx %_DEST%\inc\basegfx\range\b2irectangle.hxx
-..\inc\basegfx\range\b3irange.hxx %_DEST%\inc\basegfx\range\b3irange.hxx
-..\inc\basegfx\range\b3ivolume.hxx %_DEST%\inc\basegfx\range\b3ivolume.hxx
-..\inc\basegfx\range\b1ibox.hxx %_DEST%\inc\basegfx\range\b1ibox.hxx
-..\inc\basegfx\range\b2ibox.hxx %_DEST%\inc\basegfx\range\b2ibox.hxx
-..\inc\basegfx\range\b3ibox.hxx %_DEST%\inc\basegfx\range\b3ibox.hxx
-
-mkdir: %_DEST%\inc\basegfx\vector
-..\inc\basegfx\vector\b2dvector.hxx %_DEST%\inc\basegfx\vector\b2dvector.hxx
-..\inc\basegfx\vector\b2enums.hxx %_DEST%\inc\basegfx\vector\b2enums.hxx
-..\inc\basegfx\vector\b2dsize.hxx %_DEST%\inc\basegfx\vector\b2dsize.hxx
-..\inc\basegfx\vector\b3dvector.hxx %_DEST%\inc\basegfx\vector\b3dvector.hxx
-..\inc\basegfx\vector\b3dsize.hxx %_DEST%\inc\basegfx\vector\b3dsize.hxx
-..\inc\basegfx\vector\b2ivector.hxx %_DEST%\inc\basegfx\vector\b2ivector.hxx
-..\inc\basegfx\vector\b2isize.hxx %_DEST%\inc\basegfx\vector\b2isize.hxx
-..\inc\basegfx\vector\b3ivector.hxx %_DEST%\inc\basegfx\vector\b3ivector.hxx
-..\inc\basegfx\vector\b3isize.hxx %_DEST%\inc\basegfx\vector\b3isize.hxx
-
-mkdir: %_DEST%\inc\basegfx\curve
-..\inc\basegfx\curve\b2dcubicbezier.hxx %_DEST%\inc\basegfx\curve\b2dcubicbezier.hxx
-..\inc\basegfx\curve\b2dquadraticbezier.hxx %_DEST%\inc\basegfx\curve\b2dquadraticbezier.hxx
-..\inc\basegfx\curve\b2dbeziertools.hxx %_DEST%\inc\basegfx\curve\b2dbeziertools.hxx
-
-mkdir: %_DEST%\inc\basegfx\numeric
-..\inc\basegfx\numeric\ftools.hxx %_DEST%\inc\basegfx\numeric\ftools.hxx
-
-mkdir: %_DEST%\inc\basegfx\polygon
-..\inc\basegfx\polygon\b2dpolygon.hxx %_DEST%\inc\basegfx\polygon\b2dpolygon.hxx
-..\inc\basegfx\polygon\b2dpolypolygon.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygon.hxx
-..\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx
-..\inc\basegfx\polygon\b2dpolygontools.hxx %_DEST%\inc\basegfx\polygon\b2dpolygontools.hxx
-..\inc\basegfx\polygon\b2dpolypolygontools.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygontools.hxx
-..\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx
-..\inc\basegfx\polygon\b2dlinegeometry.hxx %_DEST%\inc\basegfx\polygon\b2dlinegeometry.hxx
-..\inc\basegfx\polygon\b2dpolygonclipper.hxx %_DEST%\inc\basegfx\polygon\b2dpolygonclipper.hxx
-..\inc\basegfx\polygon\b2dpolygontriangulator.hxx %_DEST%\inc\basegfx\polygon\b2dpolygontriangulator.hxx
-..\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx %_DEST%\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx
-..\inc\basegfx\polygon\b2dpolypolygoncutter.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygoncutter.hxx
-..\inc\basegfx\polygon\b2dtrapezoid.hxx %_DEST%\inc\basegfx\polygon\b2dtrapezoid.hxx
-..\inc\basegfx\polygon\b3dpolygon.hxx %_DEST%\inc\basegfx\polygon\b3dpolygon.hxx
-..\inc\basegfx\polygon\b3dpolypolygon.hxx %_DEST%\inc\basegfx\polygon\b3dpolypolygon.hxx
-..\inc\basegfx\polygon\b3dpolygontools.hxx %_DEST%\inc\basegfx\polygon\b3dpolygontools.hxx
-..\inc\basegfx\polygon\b3dpolypolygontools.hxx %_DEST%\inc\basegfx\polygon\b3dpolypolygontools.hxx
-..\inc\basegfx\polygon\b3dpolygonclipper.hxx %_DEST%\inc\basegfx\polygon\b3dpolygonclipper.hxx
-
-mkdir: %_DEST%\inc\basegfx\tuple
-..\inc\basegfx\tuple\b2dtuple.hxx %_DEST%\inc\basegfx\tuple\b2dtuple.hxx
-..\inc\basegfx\tuple\b3dtuple.hxx %_DEST%\inc\basegfx\tuple\b3dtuple.hxx
-..\inc\basegfx\tuple\b2ituple.hxx %_DEST%\inc\basegfx\tuple\b2ituple.hxx
-..\inc\basegfx\tuple\b3ituple.hxx %_DEST%\inc\basegfx\tuple\b3ituple.hxx
-..\inc\basegfx\tuple\b2i64tuple.hxx %_DEST%\inc\basegfx\tuple\b2i64tuple.hxx
-..\inc\basegfx\tuple\b3i64tuple.hxx %_DEST%\inc\basegfx\tuple\b3i64tuple.hxx
-
-mkdir: %_DEST%\inc\basegfx\tools
-..\inc\basegfx\tools\canvastools.hxx %_DEST%\inc\basegfx\tools\canvastools.hxx
-..\inc\basegfx\tools\keystoplerp.hxx %_DEST%\inc\basegfx\tools\keystoplerp.hxx
-..\inc\basegfx\tools\lerp.hxx %_DEST%\inc\basegfx\tools\lerp.hxx
-..\inc\basegfx\tools\unopolypolygon.hxx %_DEST%\inc\basegfx\tools\unopolypolygon.hxx
-..\inc\basegfx\tools\b2dclipstate.hxx %_DEST%\inc\basegfx\tools\b2dclipstate.hxx
-..\inc\basegfx\tools\rectcliptools.hxx %_DEST%\inc\basegfx\tools\rectcliptools.hxx
-..\inc\basegfx\tools\tools.hxx %_DEST%\inc\basegfx\tools\tools.hxx
-..\inc\basegfx\tools\gradienttools.hxx %_DEST%\inc\basegfx\tools\gradienttools.hxx
-
-mkdir: %_DEST%\inc\basegfx\color
-..\inc\basegfx\color\bcolor.hxx %_DEST%\inc\basegfx\color\bcolor.hxx
-..\inc\basegfx\color\bcolortools.hxx %_DEST%\inc\basegfx\color\bcolortools.hxx
-..\inc\basegfx\color\bcolormodifier.hxx %_DEST%\inc\basegfx\color\bcolormodifier.hxx
-
-mkdir: %_DEST%\inc\basegfx\pixel
-..\inc\basegfx\pixel\bpixel.hxx %_DEST%\inc\basegfx\pixel\bpixel.hxx
-..\inc\basegfx\pixel\bzpixel.hxx %_DEST%\inc\basegfx\pixel\bzpixel.hxx
-
-mkdir: %_DEST%\inc\basegfx\raster
-..\inc\basegfx\raster\bpixelraster.hxx %_DEST%\inc\basegfx\raster\bpixelraster.hxx
-..\inc\basegfx\raster\bzpixelraster.hxx %_DEST%\inc\basegfx\raster\bzpixelraster.hxx
-..\inc\basegfx\raster\rasterconvert3d.hxx %_DEST%\inc\basegfx\raster\rasterconvert3d.hxx
diff --cc canvas/prj/build.lst
index 79acfc9,dad6e28..7d6a51b
--- a/canvas/prj/build.lst
+++ b/canvas/prj/build.lst
@@@ -1,3 -1,10 +1,3 @@@
- cv canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
+ cv canvas : javaunohelper comphelper cppuhelper offapi unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
-cv canvas usr1 - all cv_mkout NULL
-cv canvas\inc nmake - all cv_inc NULL
-cv canvas\source\tools nmake - all cv_tools cv_inc NULL
-cv canvas\source\vcl nmake - all cv_vcl cv_tools cv_inc NULL
-cv canvas\source\simplecanvas nmake - all cv_simplecanvas cv_tools cv_inc NULL
-cv canvas\source\cairo nmake - all cv_cairo cv_tools cv_inc NULL
-cv canvas\source\directx nmake - w cv_directx cv_tools cv_inc NULL
-cv canvas\source\null nmake - all cv_null cv_tools cv_inc NULL
-cv canvas\source\factory nmake - all cv_factory cv_inc NULL
+cv canvas\prj nmake - all cv_prj NULL
+
diff --cc canvas/prj/d.lst
index e69de29,933e114..cde5ebe
--- a/canvas/prj/d.lst
+++ b/canvas/prj/d.lst
@@@ -1,0 -1,34 +1,1 @@@
+ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\bin\canvasto*.dll %_DEST%\bin\canvasto*.dll
-..\%__SRC%\bin\cairocan*.dll %_DEST%\bin\cairocan*.dll
-..\%__SRC%\bin\directx*.dll %_DEST%\bin\directx*.dll
-..\%__SRC%\bin\gdiplus*.dll %_DEST%\bin\gdiplus*.dll
-..\%__SRC%\bin\vclcanva*.dll %_DEST%\bin\vclcanva*.dll
-..\%__SRC%\bin\nullcanv*.dll %_DEST%\bin\nullcanv*.dll
-..\%__SRC%\bin\simpleca*.dll %_DEST%\bin\simpleca*.dll
-..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin\canvasfa*.dll
-..\%__SRC%\lib\icanvastools.lib %_DEST%\lib\icanvastools.lib
-..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib\
-..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib\cairocanvas.uno.so
-..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib\vclcanvas.uno.so
-..\%__SRC%\lib\nullcanvas.uno.so %_DEST%\lib\nullcanvas.uno.so
-..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib\simplecanvas.uno.so
-..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib\canvasfactory.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin\javacanvas.uno.jar
-..\%__SRC%\misc\cairocanvas.component %_DEST%\xml\cairocanvas.component
-
-mkdir: %_DEST%\inc\canvas\base
-..\inc\canvas\base\*.hxx %_DEST%\inc\canvas\base\*.hxx
-
-mkdir: %_DEST%\inc\canvas\rendering
-..\inc\canvas\rendering\*.hxx %_DEST%\inc\canvas\rendering\*.hxx
-
-mkdir: %_DEST%\inc\canvas
-..\inc\canvas\*.hxx %_DEST%\inc\canvas\*.hxx
-..\%__SRC%\misc\canvasfactory.component %_DEST%\xml\canvasfactory.component
-..\%__SRC%\misc\directx5canvas.component %_DEST%\xml\directx5canvas.component
-..\%__SRC%\misc\directx9canvas.component %_DEST%\xml\directx9canvas.component
-..\%__SRC%\misc\gdipluscanvas.component %_DEST%\xml\gdipluscanvas.component
-..\%__SRC%\misc\simplecanvas.component %_DEST%\xml\simplecanvas.component
-..\%__SRC%\misc\vclcanvas.component %_DEST%\xml\vclcanvas.component
diff --cc comphelper/Library_comphelp.mk
index d000788,64c58cc..acacafc
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@@ -37,10 -37,10 +37,9 @@@ $(eval $(call gb_Library_set_include,co
-I$(realpath $(SRCDIR)/comphelper/inc/pch) \
-I$(realpath $(SRCDIR)/comphelper/source/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,comphelper,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,comphelper,\
-DCOMPHELPER_DLLIMPLEMENTATION \
))
diff --cc cppcanvas/prj/build.lst
index 2e42309,143af13..bab151c
--- a/cppcanvas/prj/build.lst
+++ b/cppcanvas/prj/build.lst
@@@ -1,2 -1,8 +1,2 @@@
- cx cppcanvas : comphelper cppuhelper offuh tools vcl basegfx canvas NULL
+ cx cppcanvas : comphelper cppuhelper offapi tools vcl basegfx canvas NULL
-cx cppcanvas usr1 - all cx_mkout NULL
-cx cppcanvas\inc nmake - all cx_inc NULL
-cx cppcanvas\source\tools nmake - all cx_tools cx_inc NULL
-cx cppcanvas\source\wrapper nmake - all cx_wrapper cx_inc NULL
-cx cppcanvas\source\mtfrenderer nmake - all cx_mtfrenderer cx_inc NULL
-cx cppcanvas\util nmake - all cx_util cx_tools cx_wrapper cx_mtfrenderer NULL
-cx cppcanvas\source\uno nmake - all cx_uno cx_tools cx_wrapper cx_mtfrenderer cx_util NULL
+cx cppcanvas\prj nmake - all cx_prj NULL
diff --cc padmin/Executable_spadmin.bin.mk
index eef72e1,4ec56f2..6b44b64
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@@ -30,9 -30,12 +30,8 @@@ $(eval $(call gb_Executable_Executable,
$(eval $(call gb_Executable_set_include,spadmin.bin,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
- $$(CXXFLAGS) \
-))
-
$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
vclmain \
))
diff --cc padmin/Library_spa.mk
index 8d19fe4,e72c676..87b08ac
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@@ -27,12 -27,8 +27,7 @@@
$(eval $(call gb_Library_Library,spa))
- $(eval $(call gb_Library_set_include,spa,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
- ))
-
-$(eval $(call gb_Library_set_defs,spa,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,spa,\
-DSPA_DLLIMPLEMENTATION \
))
diff --cc regexp/prj/d.lst
index e69de29,0408e36..3f38fbe
--- a/regexp/prj/d.lst
+++ b/regexp/prj/d.lst
@@@ -1,0 -1,9 +1,1 @@@
+ ..\%__SRC%\lib\libi18nregexp*.dll.a %_DEST%\lib\libi18nregexp*.dll.a
-mkdir: %_DEST%\inc\external\regexp
-
-..\source\reclass.hxx %_DEST%\inc\external\regexp\reclass.hxx
-
-..\%__SRC%\bin\i18nrege*.dll %_DEST%\bin\i18nrege*.dll
-..\%__SRC%\lib\libi18nregexp*.so %_DEST%\lib\libi18nregexp*.so
-..\%__SRC%\lib\libi18nregexp*.dylib %_DEST%\lib\libi18nregexp*.dylib
-..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib\ii18nregexp.lib
diff --cc sax/prj/build.lst
index 0a8a378,658ec97..940ef70
--- a/sax/prj/build.lst
+++ b/sax/prj/build.lst
@@@ -1,3 -1,7 +1,4 @@@
ax sax : offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL
-ax sax usr1 - all ax_mkout NULL
-ax sax\source\expatwrap nmake - all ax_expatwrap NULL
-ax sax\source\tools nmake - all ax_tools NULL
-ax sax\source\fastparser nmake - all ax_fastparser ax_expatwrap ax_tools NULL
-ax sax\qa\cppunit nmake - all ax_qa_cppunit ax_tools NULL
+ax sax\prj nmake - all ax_prj NULL
+
+ ax sax\test nmake - all ax_test NULL
diff --cc sax/prj/d.lst
index 7416200,12cd6cd..54fab39
--- a/sax/prj/d.lst
+++ b/sax/prj/d.lst
@@@ -1,1 -1,18 +1,2 @@@
+ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\*.so %_DEST%\lib\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\misc\fastsax.component %_DEST%\xml\fastsax.component
-..\%__SRC%\misc\sax.component %_DEST%\xml\sax.component
-..\%__SRC%\misc\sax.inbuild.component %_DEST%\xml\sax.inbuild.component
-
-mkdir: %_DEST%\inc\sax
-mkdir: %_DEST%\inc\sax\tools
-..\inc\sax\dllapi.h %_DEST%\inc\sax\dllapi.h
-..\inc\sax\fshelper.hxx %_DEST%\inc\sax\fshelper.hxx
-..\inc\sax\fastattribs.hxx %_DEST%\inc\sax\fastattribs.hxx
-..\inc\sax\tools\converter.hxx %_DEST%\inc\sax\tools\converter.hxx
..\inc\sax\tools\documenthandleradapter.hxx %_DEST%\inc\sax\tools\documenthandleradapter.hxx
-
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib\*.dylib; fi"
diff --cc sot/Library_sot.mk
index 79f9485,927fdc0..dc4d191
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@@ -36,10 -36,15 +36,14 @@@ $(eval $(call gb_Library_set_componentf
$(eval $(call gb_Library_set_include,sot,\
-I$(realpath $(SRCDIR)/sot/inc/pch) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+ ))
+
+ $(eval $(call gb_Library_add_api,sot,\
+ udkapi \
+ offapi \
))
-$(eval $(call gb_Library_set_defs,sot,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sot,\
-DSOT_DLLIMPLEMENTATION \
))
diff --cc svl/Library_svl.mk
index d1996dc,638ab9c..08988c4
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@@ -37,10 -37,16 +37,15 @@@ $(eval $(call gb_Library_set_include,sv
$$(SOLARINC) \
-I$(realpath $(SRCDIR)/svl/source/inc) \
-I$(realpath $(SRCDIR)/svl/inc/pch) \
- -I$(OUTDIR)/inc/offuh \
+ -I$(SRCDIR)/svl/inc/pch \
+ ))
+
+ $(eval $(call gb_Library_add_api,svl,\
+ udkapi \
+ offapi \
))
-$(eval $(call gb_Library_set_defs,svl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svl,\
-DSVL_DLLIMPLEMENTATION \
))
diff --cc svtools/Library_svt.mk
index 98f1128,c3dac5e..ea6a568
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@@ -42,11 -47,11 +47,10 @@@ $(eval $(call gb_Library_set_include,sv
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
-I$(realpath $(SRCDIR)/svtools/source/inc) \
-I$(realpath $(SRCDIR)/svtools/inc/pch) \
- -I$(OUTDIR)/inc/offuh \
+ -I$(realpath $(SRCDIR)/svtools/inc) \
))
-$(eval $(call gb_Library_set_defs,svt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svt,\
-DSVT_DLLIMPLEMENTATION \
))
diff --cc toolkit/Library_tk.mk
index 6cae730,e07878f..c663330
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@@ -38,10 -38,10 +38,9 @@@ $(eval $(call gb_Library_set_include,tk
-I$(realpath $(SRCDIR)/toolkit/inc) \
-I$(realpath $(SRCDIR)/toolkit/inc/pch) \
-I$(realpath $(SRCDIR)/toolkit/source) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,tk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,tk,\
-DTOOLKIT_DLLIMPLEMENTATION \
))
@@@ -158,11 -163,15 +162,16 @@@ $(eval $(call gb_Library_add_exception_
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,tk,\
- $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+$(eval $(call gb_Library_add_cxxflags,tk,\
+ $(gb_OBJCXXFLAGS) \
+))
endif
+ ifeq ($(GUIBASE),cocoatouch)
+ $(eval $(call gb_Library_set_cxxflags,tk,\
+ $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+ endif
+
ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
$(eval $(call gb_Library_add_linked_libs,tk,\
X11 \
diff --cc ucbhelper/prj/build.lst
index 2bc7d16,f971733..07a598c
--- a/ucbhelper/prj/build.lst
+++ b/ucbhelper/prj/build.lst
@@@ -1,3 -1,7 +1,3 @@@
- uh ucbhelper : offuh sal cppu cppuhelper salhelper NULL
+ uh ucbhelper : offapi sal cppu cppuhelper salhelper NULL
-uh ucbhelper usr1 - all uh_mkout NULL
-uh ucbhelper\inc nmake - all uh_inc NULL
-uh ucbhelper\source\client nmake - all uh_client uh_inc NULL
-uh ucbhelper\source\provider nmake - all uh_provider uh_inc NULL
-uh ucbhelper\util nmake - all uh_util uh_client uh_provider NULL
-uh ucbhelper\workben\myucp nmake - all uh_wb_myucp uh_util NULL
+uh ucbhelper\prj nmake - all uh_prj NULL
+
diff --cc unotools/Library_utl.mk
index 70647da,b77a8eb..75c5ab1
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@@ -45,17 -35,18 +45,21 @@@ $(eval $(call gb_Library_set_include,ut
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/unotools/inc/pch) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,utl,\
- $$(DEFS) \
+# add any additional definitions to be set for compilation here
+# (e.g. -DLIB_DLLIMPLEMENTATION)
+$(eval $(call gb_Library_add_defs,utl,\
-DUNOTOOLS_DLLIMPLEMENTATION \
))
+ $(eval $(call gb_Library_add_api,utl,\
+ offapi \
+ udkapi \
+ ))
+
+# add libraries to be linked to utl; again these names need to be given as
+# specified in Repository.mk
$(eval $(call gb_Library_add_linked_libs,utl,\
comphelper \
cppu \
diff --cc vcl/Library_vcl.mk
index fb7ab96,19c1c9e..7ca41ba
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@@ -28,11 -28,15 +28,15 @@@
$(eval $(call gb_Library_Library,vcl))
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
else ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
+ else ifeq ($(GUIBASE),android)
+ $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android,vcl/vcl))
+ else ifeq ($(OS),IOS)
+ $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios,vcl/vcl))
else
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
endif
$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
@@@ -48,8 -56,9 +56,9 @@@ $(eval $(call gb_Library_set_include,vc
-I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
))
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ $$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
endif
@@@ -77,26 -94,11 +91,15 @@@ $(eval $(call gb_Library_add_linked_lib
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vcl,\
+ icule \
+ icuuc \
+)
+
- ifeq ($(GUIBASE),unx)
- $(eval $(call gb_Library_add_linked_libs,vcl,\
- freetype \
- ))
- endif
-
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
- $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+ $(gb_OBJCXXFLAGS) \
))
- ifeq ($(ENABLE_CAIRO),TRUE)
- $(eval $(call gb_Library_add_defs,vcl,\
- -DCAIRO \
- ))
- endif
$(eval $(call gb_Library_add_objcxxobjects,vcl,\
vcl/aqua/source/a11y/aqua11yactionwrapper \
vcl/aqua/source/a11y/aqua11ycomponentwrapper \
@@@ -172,14 -175,10 +175,9 @@@ $(eval $(call gb_Library_add_defs,vcl,
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
))
- ## handle fontconfig
- ifneq ($(ENABLE_FONTCONFIG),)
- $(eval $(call gb_Library_add_defs,vcl,\
- -DENABLE_FONTCONFIG \
- ))
## handle CUPS
ifneq ($(ENABLE_CUPS),)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_CUPS \
))
endif
@@@ -411,11 -436,15 +435,15 @@@ $(eval $(call gb_Library_add_exception_
vcl/source/window/wpropset \
vcl/source/window/wrkwin \
))
-
+ ifneq ($(OS),IOS)
+ $(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/salmain/salmain \
+ ))
+ endif
## handle Graphite
ifneq ($(ENABLE_GRAPHITE),)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+# add defines, graphite sources for all platforms
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_GRAPHITE \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
@@@ -434,10 -471,64 +462,66 @@@ $(eval $(call gb_Library_add_linked_lib
version \
))
endif
+
+$(call gb_Library_use_external,vcl,graphite)
endif
+ ## handle Cairo
+ ifneq ($(ENABLE_LIBRSVG),NO)
+
+ $(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/components/rasterizer_rsvg \
+ ))
+
+ $(eval $(call gb_Library_set_defs,vcl,\
+ $$(DEFS) \
+ -DENABLE_LIBRSVG \
+ ))
+ ifeq ($(SYSTEM_CAIRO),YES)
+ $(eval $(call gb_Library_set_cxxflags,vcl,\
+ $$(CXXFLAGS) \
+ $$(CAIRO_CFLAGS) \
+ -DSYSTEM_CAIRO \
+ ))
+
+ # CAIRO_LIBS contains both -L and -l options. Thes sets LDFLAGS which
+ # goes early into the linking command line before the object files. So
+ # on platforms where libraries are searched for symbols undefined at
+ # that point as they occur on the command line, it is pointless to
+ # search the cairo library at that point as no references to cairo
+ # entries have been read from object files yet.
+ $(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ $$(CAIRO_LIBS) \
+ ))
+
+ # Thus we also need to add cairo to the list of linked libs. These go
+ # after the object files on the linking command line.
+ $(eval $(call gb_Library_add_linked_libs,vcl,\
+ cairo \
+ ))
+
+ else
+ $(eval $(call gb_Library_add_linked_libs,vcl,\
+ cairo \
+ ))
+ ifeq ($(OS),LINUX)
+ $(eval $(call gb_Library_add_linked_libs,vcl,\
+ freetype \
+ fontconfig \
+ ))
+ endif
+ endif
+ endif
+
+ ifeq ($(GUIBASE),unx)
+ $(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ $$(FONTCONFIG_LIBS) \
+ $$(FREETYPE_LIBS) \
+ ))
+ endif
+
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vcl,\
dl \
@@@ -471,9 -565,17 +555,16 @@@ $(eval $(call gb_Library_add_libs,vcl,
endif
ifeq ($(OS),WNT)
+ ifeq ($(COM),MSC)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain at 12 \
))
+ endif
+ ifeq ($(COM),GCC)
+ $(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ ))
+ endif
$(eval $(call gb_Library_add_linked_libs,vcl,\
advapi32 \
gdi32 \
diff --cc vcl/Library_vclplug_gen.mk
index 95428ae,d195400..819d9ce
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@@ -58,11 -64,27 +62,27 @@@ $(eval $(call gb_Library_add_linked_lib
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_CAIRO),YES)
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
- $$(CAIRO_CFLAGS) \
- -DSYSTEM_CAIRO \
+$(call gb_Library_use_externals,vclplug_gen,\
+ icule \
+ icuuc \
+)
+
+ ))
+ $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ $$(CAIRO_LIBS) \
+ ))
+ else
+ $(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+ $$(CXXFLAGS) \
+ $$(FONTCONFIG_CFLAGS) \
+ $$(FREETYPE_CFLAGS) \
+ ))
+ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+ cairo \
+ ))
+ endif
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/app/i18n_cb \
vcl/unx/generic/app/i18n_ic \
@@@ -117,10 -140,10 +137,9 @@@ $(eval $(call gb_Library_add_defs,vclpl
-DVCLPLUG_GEN_IMPLEMENTATION \
))
-
## handle RandR
ifneq ($(ENABLE_RANDR),)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DUSE_RANDR \
))
ifeq ($(XRANDR_DLOPEN),FALSE)
diff --cc vcl/Library_vclplug_gtk.mk
index cf4ac76,da001a2..d9674f0
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@@ -59,7 -61,13 +58,12 @@@ $(eval $(call gb_Library_add_libs,vclpl
))
endif
+ $(eval $(call gb_Library_add_api,vclplug_gtk,\
+ offapi \
+ udkapi \
+ ))
+
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
$$(GTK_LIBS) \
$$(GTHREAD_LIBS) \
))
diff --cc vcl/Library_vclplug_kde.mk
index ddc4291,bcec467..e4586b8
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@@ -45,8 -45,14 +44,13 @@@ $(eval $(call gb_Library_add_defs,vclpl
-DVCLPLUG_KDE_IMPLEMENTATION \
))
+ $(eval $(call gb_Library_add_api,vclplug_kde,\
+ offapi \
+ udkapi \
+ ))
+
-$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
- $$(KDE_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+ $$(KDE_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
diff --cc vcl/Library_vclplug_kde4.mk
index 25695d9,c075ca3..bbc64aa
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@@ -48,8 -48,14 +47,13 @@@ $(eval $(call gb_Library_add_defs,vclpl
-DVCLPLUG_KDE4_IMPLEMENTATION \
))
+ $(eval $(call gb_Library_add_api,vclplug_kde4,\
+ offapi \
+ udkapi \
+ ))
+
-$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
- $$(KDE4_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+ $$(KDE4_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
diff --cc vcl/aqua/source/app/vclnsapp.mm
index fc4945e,e103a6b..2424d37
mode 100755,100644..100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
commit 4001f42583b6aa49f1a5c95ae8d46d015187ae29
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 11:33:44 2011 +0200
not link cairocanvas against stl anymore
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index e1b7182..9fc2db0 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -44,7 +44,6 @@ endif
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
sal \
- stl \
cppu \
basegfx \
cppuhelper \
commit f09ffc3598e23e485289d837690aa830e7b6a3b5
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 13:24:14 2011 +0200
gnumake4: fix buildbreakers from merge
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index 719b97b..eb39b98 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -41,10 +41,9 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \
$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
basebmp \
- sal \
- stl \
basegfx \
cppunit \
+ sal \
$(gb_STDLIBS) \
))
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 0a2dffd..97fcb79 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -41,9 +41,8 @@ $(eval $(call gb_Library_add_defs,basebmp,\
))
$(eval $(call gb_Library_add_linked_libs,basebmp,\
- sal \
basegfx \
- stl \
+ sal \
$(gb_STDLIBS) \
))
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index d8eeff5..51cdcc6 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -40,11 +40,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \
$(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
basegfx \
- sal \
- stl \
+ cppu \
cppuhelper \
cppunit \
- cppu \
+ sal \
$(gb_STDLIBS) \
))
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 7fc527f..c510b5f 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -44,10 +44,9 @@ $(eval $(call gb_Library_add_defs,basegfx,\
))
$(eval $(call gb_Library_add_linked_libs,basegfx,\
- sal \
- stl \
cppu \
cppuhelper \
+ sal \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 8078e48..ce02c19 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
))
$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
- sal \
- stl \
cppu \
cppuhelper \
+ sal \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 32f6ff5..dc424ed 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -55,15 +55,14 @@ $(eval $(call gb_Library_add_defs,canvastools,\
endif
$(eval $(call gb_Library_add_linked_libs,canvastools,\
- sal \
- stl \
- cppu \
basegfx \
- cppuhelper \
comphelper \
- vcl \
+ cppu \
+ cppuhelper \
+ sal \
tk \
tl \
+ vcl \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index ecd7b86..e179804 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -41,13 +41,12 @@ $(eval $(call gb_Library_add_defs,nullcanvas,\
endif
$(eval $(call gb_Library_add_linked_libs,nullcanvas,\
- cppu \
- sal \
- comphelper \
- cppuhelper \
- stl \
basegfx \
canvastools \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
vcl \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 831177f..5f1f2d7 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -43,13 +43,12 @@ $(eval $(call gb_Library_add_defs,simplecanvas,\
endif
$(eval $(call gb_Library_add_linked_libs,simplecanvas,\
- sal \
- stl \
- cppu \
basegfx \
- cppuhelper \
- comphelper \
canvastools \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 5d5cf78..9cc7405 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -43,18 +43,17 @@ $(eval $(call gb_Library_add_defs,vclcanvas,\
endif
$(eval $(call gb_Library_add_linked_libs,vclcanvas,\
- sal \
- stl \
- cppu \
basegfx \
- cppuhelper \
+ canvastools \
comphelper \
- vcl \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ sal \
+ svt \
tk \
tl \
- svt \
- i18nisolang1 \
- canvastools \
+ vcl \
$(gb_STDLIBS) \
))
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 81aeb98..bf1e794 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -44,44 +44,45 @@ $(eval $(call gb_Library_add_defs,cppcanvas,\
))
$(eval $(call gb_Library_add_linked_libs,cppcanvas,\
- tl \
- cppu \
- sal \
- vcl \
- stl \
- comphelper \
+ basegfx \
canvastools \
+ comphelper \
+ cppu \
cppuhelper \
- basegfx \
i18nisolang1 \
+ sal \
+ svt \
+ tl \
+ vcl \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,cppcanvas,\
- cppcanvas/source/wrapper/vclfactory \
- cppcanvas/source/wrapper/implcolor \
- cppcanvas/source/wrapper/basegfxfactory \
- cppcanvas/source/wrapper/implcustomsprite \
- cppcanvas/source/wrapper/implspritecanvas \
- cppcanvas/source/wrapper/implsprite \
- cppcanvas/source/wrapper/implpolypolygon \
- cppcanvas/source/wrapper/implcanvas \
- cppcanvas/source/wrapper/implbitmap \
- cppcanvas/source/wrapper/implfont \
- cppcanvas/source/wrapper/impltext \
- cppcanvas/source/wrapper/implbitmapcanvas \
- cppcanvas/source/tools/tools \
- cppcanvas/source/tools/canvasgraphichelper \
- cppcanvas/source/mtfrenderer/transparencygroupaction \
+ cppcanvas/source/mtfrenderer/bitmapaction \
cppcanvas/source/mtfrenderer/cachedprimitivebase \
+ cppcanvas/source/mtfrenderer/emfplus \
+ cppcanvas/source/mtfrenderer/implrenderer \
cppcanvas/source/mtfrenderer/lineaction \
+ cppcanvas/source/mtfrenderer/mtftools \
cppcanvas/source/mtfrenderer/pointaction \
cppcanvas/source/mtfrenderer/polypolyaction \
cppcanvas/source/mtfrenderer/rendergraphicaction \
cppcanvas/source/mtfrenderer/textaction \
- cppcanvas/source/mtfrenderer/implrenderer \
- cppcanvas/source/mtfrenderer/mtftools \
- cppcanvas/source/mtfrenderer/bitmapaction \
+ cppcanvas/source/mtfrenderer/transparencygroupaction \
+ cppcanvas/source/tools/canvasgraphichelper \
+ cppcanvas/source/tools/tools \
+ cppcanvas/source/wrapper/basegfxfactory \
+ cppcanvas/source/wrapper/implbitmap \
+ cppcanvas/source/wrapper/implbitmapcanvas \
+ cppcanvas/source/wrapper/implcanvas \
+ cppcanvas/source/wrapper/implcolor \
+ cppcanvas/source/wrapper/implcustomsprite \
+ cppcanvas/source/wrapper/implfont \
+ cppcanvas/source/wrapper/implpolypolygon \
+ cppcanvas/source/wrapper/implsprite \
+ cppcanvas/source/wrapper/implspritecanvas \
+ cppcanvas/source/wrapper/impltext \
+ cppcanvas/source/wrapper/vclfactory \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/prj/build.lst b/cppcanvas/prj/build.lst
index 2dfe3a2..2e42309 100644
--- a/cppcanvas/prj/build.lst
+++ b/cppcanvas/prj/build.lst
@@ -1,4 +1,2 @@
cx cppcanvas : comphelper cppuhelper offuh tools vcl basegfx canvas NULL
cx cppcanvas\prj nmake - all cx_prj NULL
-
-cx cppcanvas\source\uno nmake - all cx_uno cx_tools cx_wrapper cx_mtfrenderer cx_util NULL
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index b870f40..d29632d 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \
cppunit \
sax \
sal \
- stl \
$(gb_STDLIBS) \
))
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 174d222..05bddd0 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -36,10 +36,9 @@ $(eval $(call gb_Library_set_include,expwrap,\
))
$(eval $(call gb_Library_add_linked_libs,expwrap,\
- sal \
cppu \
cppuhelper \
- stl \
+ sal \
$(gb_STDLIBS) \
))
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 62e4570..2dd9dcc 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -36,11 +36,10 @@ $(eval $(call gb_Library_set_include,fastsax,\
))
$(eval $(call gb_Library_add_linked_libs,fastsax,\
- sal \
cppu \
cppuhelper \
+ sal \
sax \
- stl \
$(gb_STDLIBS) \
))
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index d43c7f8..f3e089e 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -42,11 +42,10 @@ $(eval $(call gb_Library_add_defs,sax,\
))
$(eval $(call gb_Library_add_linked_libs,sax,\
- sal \
+ comphelper \
cppu \
cppuhelper \
- comphelper \
- stl \
+ sal \
$(gb_STDLIBS) \
))
diff --git a/sax/source/expatwrap/expwrap.component b/sax/source/expatwrap/expwrap.component
new file mode 100644
index 0000000..5e6699d
--- /dev/null
+++ b/sax/source/expatwrap/expwrap.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.extensions.xml.sax.ParserExpat">
+ <service name="com.sun.star.xml.sax.Parser"/>
+ </implementation>
+ <implementation name="com.sun.star.extensions.xml.sax.Writer">
+ <service name="com.sun.star.xml.sax.Writer"/>
+ </implementation>
+</component>
diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk
index ae739de..9abc71b 100644
--- a/tools/Package_reversemap.mk
+++ b/tools/Package_reversemap.mk
@@ -24,7 +24,7 @@
# instead of those above.
$(eval $(call gb_Package_Package,tools_reversemap,$(WORKDIR)/CustomTarget/tools/source/reversemap))
-$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap))
+$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap,SRCDIR))
$(eval $(call gb_CustomTarget_add_outdir_dependencies,tools/source/reversemap,\
$(call gb_Executable_get_target_for_build,bestreversemap) \
diff --git a/tools/StaticLibrary_toolshelpers.mk b/tools/StaticLibrary_toolshelpers.mk
index a63ac47..f8e306a 100644
--- a/tools/StaticLibrary_toolshelpers.mk
+++ b/tools/StaticLibrary_toolshelpers.mk
@@ -34,8 +34,7 @@ $(eval $(call gb_StaticLibrary_set_include,toolshelpers,\
-I$(realpath $(SRCDIR)/tools/bootstrp) \
))
-$(eval $(call gb_StaticLibrary_set_cxxflags,toolshelpers,\
- $$(CXXFLAGS) \
+$(eval $(call gb_StaticLibrary_add_cxxflags,toolshelpers,\
-D_TOOLS_STRINGLIST \
))
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index 754c1e7..f1df847 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -43,10 +43,9 @@ $(eval $(call gb_Library_add_defs,ucbhelper,\
))
$(eval $(call gb_Library_add_linked_libs,ucbhelper,\
- stl \
- sal \
cppu \
cppuhelper \
+ sal \
salhelper \
$(gb_STDLIBS) \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index db96844..fb7ab96 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -28,11 +28,11 @@
$(eval $(call gb_Library_Library,vcl))
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
else ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
else
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
endif
$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
diff --git a/vcl/Package_afmhash.mk b/vcl/Package_afmhash.mk
index d3de835..38b9f0d 100644
--- a/vcl/Package_afmhash.mk
+++ b/vcl/Package_afmhash.mk
@@ -24,6 +24,6 @@
# instead of those above.
$(eval $(call gb_Package_Package,vcl_afmhash,$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager))
-$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager))
+$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager,SRCDIR))
# vim: set noet sw=4:
commit 74bde30a20a7673d8a17dea330e752f8e355bbe9
Merge: 036733e... 08cdcb7...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jun 19 12:47:44 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
basebmp/prj/d.lst
basebmp/test/basictest.cxx
basebmp/test/makefile.mk
basegfx/inc/basegfx/basegfxdllapi.h
basegfx/inc/basegfx/tools/debugplotter.hxx
basegfx/inc/basegfx/tuple/b2ituple.hxx
basegfx/prj/d.lst
basegfx/source/numeric/makefile.mk
basegfx/source/polygon/makefile.mk
basegfx/source/range/makefile.mk
basegfx/source/raster/makefile.mk
basegfx/source/tuple/makefile.mk
basegfx/source/vector/makefile.mk
basegfx/test/basegfx1d.cxx
basegfx/test/makefile.mk
basegfx/util/makefile.mk
canvas/Library_canvasfactory.mk
canvas/Module_canvas.mk
canvas/prj/build.lst
canvas/prj/d.lst
canvas/source/cairo/cairo_canvashelper_texturefill.cxx
canvas/source/cairo/makefile.mk
canvas/source/tools/makefile.mk
comphelper/qa/string/makefile.mk
cppcanvas/Module_cppcanvas.mk
cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
cppcanvas/prj/build.lst
cppcanvas/prj/d.lst
cppcanvas/source/mtfrenderer/makefile.mk
cppcanvas/util/makefile.mk
i18npool/source/search/makefile.mk
regexp/Library_regexp.mk
regexp/prj/d.lst
sax/CppunitTest_sax.mk
sax/Library_sax.mk
sax/prj/d.lst
sax/qa/cppunit/test_converter.cxx
sax/source/expatwrap/attrlistimpl.hxx
sax/util/makefile.mk
svtools/Library_svt.mk
tools/Executable_sspretty.mk
ucbhelper/prj/d.lst
ucbhelper/source/provider/configureucb.cxx
ucbhelper/source/provider/provconf.cxx
ucbhelper/util/makefile.mk
unotools/Library_utl.mk
unotools/Module_unotools.mk
unotools/Package_inc.mk
unotools/prj/build.lst
vcl/Library_desktop_detector.mk
vcl/Library_vcl.mk
vcl/Library_vclplug_gtk.mk
vcl/aqua/source/gdi/salprn.cxx
vcl/inc/aqua/saldata.hxx
vcl/unx/generic/gdi/salgdi3.cxx
diff --cc basebmp/test/basictest.cxx
index a158cae,491427d..da5de5a
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@@ -27,8 -28,6 +28,7 @@@
// autogenerated file with codegen.pl
- #include "preextstl.h"
+#include <sal/cppunit.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
diff --cc basegfx/inc/basegfx/basegfxdllapi.h
index ae0da23,0000000..18ad22b
mode 100644,000000..100644
--- a/basegfx/inc/basegfx/basegfxdllapi.h
+++ b/basegfx/inc/basegfx/basegfxdllapi.h
@@@ -1,47 -1,0 +1,50 @@@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef INCLUDED_BASEGFXDLLAPI_H
+#define INCLUDED_BASEGFXDLLAPI_H
+
+#if defined BASEGFX_STATICLIBRARY
+
+#define BASEGFX_DLLPUBLIC
+#define BASEGFX_DLLPRIVATE
+
+#else /*BASEGFX_STATICLIBRARY*/
+
+#if defined BASEGFX_DLLIMPLEMENTATION
+#define BASEGFX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define BASEGFX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define BASEGFX_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /*BASEGFX_STATICLIBRARY*/
+
+#endif
+
++
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc basegfx/inc/basegfx/tools/canvastools.hxx
index 60b0111c,1841d1f..c3458c4
mode 100755,100644..100644
--- a/basegfx/inc/basegfx/tools/canvastools.hxx
+++ b/basegfx/inc/basegfx/tools/canvastools.hxx
diff --cc basegfx/inc/basegfx/tools/debugplotter.hxx
index 8c068bb,c1718f9..9ce9d0f
--- a/basegfx/inc/basegfx/tools/debugplotter.hxx
+++ b/basegfx/inc/basegfx/tools/debugplotter.hxx
@@@ -37,8 -38,7 +38,8 @@@
#include <boost/utility.hpp> // for noncopyable
#include <vector>
#include <utility>
- #include <iostream>
+ #include <iosfwd>
+#include <basegfx/basegfxdllapi.h>
namespace basegfx
diff --cc basegfx/inc/basegfx/tools/unopolypolygon.hxx
index 7f276f8,95282f5..ec0f3e6
mode 100755,100644..100644
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
diff --cc basegfx/inc/basegfx/tuple/b2ituple.hxx
index b7a037c,4f91270..aac4317
--- a/basegfx/inc/basegfx/tuple/b2ituple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2ituple.hxx
@@@ -201,37 -202,23 +202,23 @@@ namespace basegf
// external operators
//////////////////////////////////////////////////////////////////////////
-
class B2DTuple;
- B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB);
- B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB);
- B2ITuple absolute(const B2ITuple& rTup);
- B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t);
- B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2);
- B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2, const B2ITuple& rOld3);
-
- B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB);
- B2ITuple operator-(const B2ITuple& rTupA, const B2ITuple& rTupB);
- B2ITuple operator/(const B2ITuple& rTupA, const B2ITuple& rTupB);
- B2ITuple operator*(const B2ITuple& rTupA, const B2ITuple& rTupB);
- B2ITuple operator*(const B2ITuple& rTup, sal_Int32 t);
- B2ITuple operator*(sal_Int32 t, const B2ITuple& rTup);
- B2ITuple operator/(const B2ITuple& rTup, sal_Int32 t);
- B2ITuple operator/(sal_Int32 t, const B2ITuple& rTup);
+ BASEGFX_DLLPUBLIC B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
+ BASEGFX_DLLPUBLIC B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
+ BASEGFX_DLLPUBLIC B2ITuple absolute(const B2ITuple& rTup);
-
+ BASEGFX_DLLPUBLIC B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t);
-
+ BASEGFX_DLLPUBLIC B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2);
-
+ BASEGFX_DLLPUBLIC B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2, const B2ITuple& rOld3);
+
+ BASEGFX_DLLPUBLIC B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
+ BASEGFX_DLLPUBLIC B2ITuple operator-(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
+ BASEGFX_DLLPUBLIC B2ITuple operator/(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
+ BASEGFX_DLLPUBLIC B2ITuple operator*(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
+ BASEGFX_DLLPUBLIC B2ITuple operator*(const B2ITuple& rTup, sal_Int32 t);
-
+ BASEGFX_DLLPUBLIC B2ITuple operator*(sal_Int32 t, const B2ITuple& rTup);
-
+ BASEGFX_DLLPUBLIC B2ITuple operator/(const B2ITuple& rTup, sal_Int32 t);
-
+ BASEGFX_DLLPUBLIC B2ITuple operator/(sal_Int32 t, const B2ITuple& rTup);
-
} // end of namespace basegfx
#endif /* _BGFX_TUPLE_B2ITUPLE_HXX */
diff --cc basegfx/test/basegfx1d.cxx
index 127e46e,0a71d25..7a0b1f0
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@@ -30,8 -31,6 +31,7 @@@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
- #include "preextstl.h"
+#include <sal/cppunit.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
diff --cc canvas/Module_canvas.mk
index 07a4ee3,0000000..41d5c72
mode 100644,000000..100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@@ -1,62 -1,0 +1,61 @@@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,canvas))
+
+$(eval $(call gb_Module_add_targets,canvas,\
+ Library_canvastools \
+ Library_nullcanvas \
+ Library_simplecanvas \
+ Library_vclcanvas \
+ Library_canvasfactory \
+ Package_inc \
+))
-
+ifeq ($(strip $(OS)),WNT)
+ifneq ($(strip $(ENABLE_DIRECTX)),)
+
+ifneq ($(strip $(USE_DIRECTX5)),)
+$(eval $(call gb_Module_add_targets,canvas,\
+ Library_directx5canvas \
+))
+endif
+
+$(eval $(call gb_Module_add_targets,canvas,\
+ Library_directx9canvas \
+ Library_gdipluscanvas \
+))
+
+endif
+endif
+
+ifeq ($(strip $(ENABLE_CAIRO_CANVAS)),TRUE)
+$(eval $(call gb_Module_add_targets,canvas,\
+ Library_cairocanvas \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --cc canvas/inc/canvas/base/disambiguationhelper.hxx
index 0000000,15be49a..b58ed29
mode 000000,100644..100644
--- a/canvas/inc/canvas/base/disambiguationhelper.hxx
+++ b/canvas/inc/canvas/base/disambiguationhelper.hxx
@@@ -1,0 -1,90 +1,90 @@@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+ #ifndef INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX
+ #define INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX
+
+ #include <osl/mutex.hxx>
+
+
+ /* Definition of the DisambiguationHelper class */
+
+ namespace canvas
+ {
+ /** Base class, initializing its own baseclass with m_aMutex.
+
+ This is necessary to make the CanvasBase, GraphicDeviceBase,
+ etc. classes freely combinable - letting them perform this
+ initialization would prohibit deriving e.g. CanvasBase from
+ GraphicDeviceBase.
+
+ On top of that, disambiguates XEventListener::disposing and
+ WeakComponentImplHelper::disposing.
+
+ Having two virtual methods with the same name, and not
+ overriding them in every derived class, will hide one of
+ them. Later trying to override the same method, will generate
+ a new vtable slot, and lead to very hard to spot errors.
+ */
+ template< class Base > class DisambiguationHelper : public Base
+ {
+ public:
+ typedef Base BaseType;
+
+ /** Construct DisambiguationHelper
+
+ This method is the whole purpose of this template:
+ initializing a base class with the provided m_aMutex
+ member (the WeakComponentImplHelper templates need that,
+ as they require the lifetime of the mutex to extend
+ theirs).
+ */
+ DisambiguationHelper() :
+ BaseType( m_aMutex )
+ {
+ }
+
- virtual void SAL_CALL disposing()
++ virtual void SAL_CALL disposing()
+ { disposeThis(); }
+
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException)
+ { disposeEventSource(Source); }
-
++
+ virtual void disposeThis()
+ {}
+ virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
+ {}
+
+ protected:
- mutable ::osl::Mutex m_aMutex;
++ mutable ::osl::Mutex m_aMutex;
+ };
+ }
+
+ #endif /* INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX */
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc canvas/inc/canvas/canvastools.hxx
index c2c26c1,5ddbfcb..6e67b79
mode 100755,100644..100644
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.hxx
diff --cc canvas/inc/canvas/canvastoolsdllapi.h
index 3e50191,0000000..4cc32ec
mode 100644,000000..100644
--- a/canvas/inc/canvas/canvastoolsdllapi.h
+++ b/canvas/inc/canvas/canvastoolsdllapi.h
@@@ -1,38 -1,0 +1,40 @@@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef INCLUDED_CANVASTOOLSDLLAPI_H
+#define INCLUDED_CANVASTOOLSDLLAPI_H
+
+#if defined CANVASTOOLS_DLLIMPLEMENTATION
+#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define CANVASTOOLS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc canvas/prj/build.lst
index 978e8a4,121be38..79acfc9
--- a/canvas/prj/build.lst
+++ b/canvas/prj/build.lst
@@@ -1,3 -1,10 +1,3 @@@
- cv canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo LIBXSLT:libxslt NULL
+ cv canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
-cv canvas usr1 - all cv_mkout NULL
-cv canvas\inc nmake - all cv_inc NULL
-cv canvas\source\tools nmake - all cv_tools cv_inc NULL
-cv canvas\source\vcl nmake - all cv_vcl cv_tools cv_inc NULL
-cv canvas\source\simplecanvas nmake - all cv_simplecanvas cv_tools cv_inc NULL
-cv canvas\source\cairo nmake - all cv_cairo cv_tools cv_inc NULL
-cv canvas\source\directx nmake - w cv_directx cv_tools cv_inc NULL
-cv canvas\source\null nmake - all cv_null cv_tools cv_inc NULL
-cv canvas\source\factory nmake - all cv_factory cv_inc NULL
+cv canvas\prj nmake - all cv_prj NULL
+
diff --cc canvas/source/vcl/canvasbitmap.hxx
index c5a008a,a7e9b5a..633d683
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@@ -56,7 -57,7 +57,7 @@@ namespace vclcanva
::com::sun::star::rendering::XIntegerBitmap,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base;
- typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >,
- typedef ::canvas::IntegerBitmapBase< ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >,
++ typedef ::canvas::IntegerBitmapBase< ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >,
CanvasBitmapHelper,
tools::LocalGuard,
::cppu::OWeakObject > CanvasBitmap_Base;
diff --cc comphelper/inc/comphelper/numberedcollection.hxx
index 3e98ba8,d4adccb..b9c7176
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@@ -80,10 -81,10 +81,10 @@@ class COMPHELPER_DLLPUBLIC NumberedColl
::sal_Int32 nNumber;
};
- typedef ::std::hash_map<
- typedef ::boost::unordered_map<
++ typedef ::boost::unordered_map<
long ,
TNumberedItem ,
- ::std::hash< long > ,
+ ::boost::hash< long > ,
::std::equal_to< long > > TNumberedItemHash;
typedef ::std::vector< long > TDeadItemList;
diff --cc comphelper/qa/string/test_string.cxx
index 0000000,6b3f5c5..c448ebb
mode 000000,100644..100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@@ -1,0 -1,301 +1,301 @@@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+ #include "precompiled_comphelper.hxx"
+ #include "sal/config.h"
+
+ #include "comphelper/string.hxx"
+ #include <cppuhelper/implbase1.hxx>
+ #include <com/sun/star/i18n/CharType.hpp>
+
+ #include <cppunit/TestFixture.h>
+ #include <cppunit/extensions/HelperMacros.h>
+ #include <cppunit/plugin/TestPlugIn.h>
+
+ #include "rtl/string.h"
+ #include "rtl/ustring.h"
+ #include "rtl/ustring.hxx"
+ #include "sal/types.h"
+
+ namespace {
+
+ class TestString: public CppUnit::TestFixture
+ {
+ public:
+ void test();
+ void testNatural();
+ void testDecimalStringToNumber();
+
+ CPPUNIT_TEST_SUITE(TestString);
+ CPPUNIT_TEST(test);
+ CPPUNIT_TEST(testNatural);
+ CPPUNIT_TEST(testDecimalStringToNumber);
+ CPPUNIT_TEST_SUITE_END();
+ };
+
+ void TestString::test()
+ {
+ rtl::OUString s1(RTL_CONSTASCII_USTRINGPARAM("foobarbar"));
+ sal_Int32 n1;
+ rtl::OUString s2(
+ comphelper::string::searchAndReplaceAsciiL(
+ s1, RTL_CONSTASCII_STRINGPARAM("bar"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baaz")), 0, &n1));
+ CPPUNIT_ASSERT(
+ s2 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbar")));
+ CPPUNIT_ASSERT(n1 == 3);
+ sal_Int32 n2;
+ rtl::OUString s3(
+ comphelper::string::searchAndReplaceAsciiL(
+ s2, RTL_CONSTASCII_STRINGPARAM("bar"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bz")),
+ n1 + RTL_CONSTASCII_LENGTH("baaz"), &n2));
+ CPPUNIT_ASSERT(
+ s3 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbz")));
+ CPPUNIT_ASSERT(n2 == 7);
+ sal_Int32 n3;
+ rtl::OUString s4(
+ comphelper::string::searchAndReplaceAsciiL(
+ s3, RTL_CONSTASCII_STRINGPARAM("bar"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baz")),
+ n2 + RTL_CONSTASCII_LENGTH("bz"), &n3));
+ CPPUNIT_ASSERT(s4 == s3);
+ CPPUNIT_ASSERT(n3 == -1);
+ }
+
+ void TestString::testDecimalStringToNumber()
+ {
+ rtl::OUString s1(RTL_CONSTASCII_USTRINGPARAM("1234"));
+ CPPUNIT_ASSERT_EQUAL((sal_uInt32)1234, comphelper::string::decimalStringToNumber(s1));
+ s1 += rtl::OUString(static_cast<sal_Unicode>(0x07C6));
+ CPPUNIT_ASSERT_EQUAL((sal_uInt32)12346, comphelper::string::decimalStringToNumber(s1));
+ // Codepoints on 2 16bits words
+ sal_uInt32 utf16String[] = { 0x1D7FE /* 8 */, 0x1D7F7 /* 1 */};
+ s1 = rtl::OUString(utf16String, 2);
+ CPPUNIT_ASSERT_EQUAL((sal_uInt32)81, comphelper::string::decimalStringToNumber(s1));
+ }
+
+ using namespace ::com::sun::star;
+
+ class testCollator : public cppu::WeakImplHelper1< i18n::XCollator >
+ {
+ public:
+ virtual sal_Int32 SAL_CALL compareSubstring(
+ const rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1,
+ const rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException)
+ {
+ return str1.copy(off1, len1).compareTo(str2.copy(off2, len2));
+ }
+ virtual sal_Int32 SAL_CALL compareString(
+ const rtl::OUString& str1,
+ const rtl::OUString& str2) throw(uno::RuntimeException)
+ {
+ return str1.compareTo(str2);
+ }
+ virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32)
+ throw(uno::RuntimeException) {return 0;}
+ virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const rtl::OUString&,
+ const lang::Locale&, sal_Int32) throw(uno::RuntimeException) {return 0;}
+ virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const rtl::OUString&,
+ const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException) {}
+ virtual uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&)
+ throw(uno::RuntimeException)
+ {
+ return uno::Sequence< rtl::OUString >();
+ }
+ virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const rtl::OUString&)
+ throw(uno::RuntimeException)
+ {
+ return uno::Sequence< sal_Int32 >();
+ }
+ };
+
+ #define IS_DIGIT(CHAR) (((CHAR) >= 48) && ((CHAR <= 57)))
+
+ class testBreakIterator : public cppu::WeakImplHelper1< i18n::XBreakIterator >
+ {
+ public:
- virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString&, sal_Int32,
++ virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
+ throw(uno::RuntimeException) {return -1;}
- virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString&, sal_Int32,
++ virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
+ throw(uno::RuntimeException) {return -1;}
+
- virtual i18n::Boundary SAL_CALL previousWord( const rtl::OUString&, sal_Int32,
++ virtual i18n::Boundary SAL_CALL previousWord( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
+ { return i18n::Boundary(); }
- virtual i18n::Boundary SAL_CALL nextWord( const rtl::OUString&, sal_Int32,
++ virtual i18n::Boundary SAL_CALL nextWord( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
+ { return i18n::Boundary(); }
- virtual i18n::Boundary SAL_CALL getWordBoundary( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16, sal_Bool )
++ virtual i18n::Boundary SAL_CALL getWordBoundary( const rtl::OUString&, sal_Int32,
++ const lang::Locale&, sal_Int16, sal_Bool )
+ throw(uno::RuntimeException)
+ { return i18n::Boundary(); }
+
- virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString&, sal_Int32,
++ virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException)
+ { return false; }
- virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString&, sal_Int32,
++ virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString&, sal_Int32,
+ const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException)
+ { return false; }
- virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString&, sal_Int32,
++ virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString&, sal_Int32,
+ const lang::Locale& ) throw(uno::RuntimeException)
+ { return 0; }
+
+ virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString&, sal_Int32,
+ const lang::Locale& ) throw(uno::RuntimeException)
+ { return 0; }
- virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& rText, sal_Int32,
++ virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& rText, sal_Int32,
+ const lang::Locale& ) throw(uno::RuntimeException)
+ { return rText.getLength(); }
+
- virtual i18n::LineBreakResults SAL_CALL getLineBreak( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int32,
++ virtual i18n::LineBreakResults SAL_CALL getLineBreak( const rtl::OUString&, sal_Int32,
++ const lang::Locale&, sal_Int32,
+ const i18n::LineBreakHyphenationOptions&,
- const i18n::LineBreakUserOptions&)
++ const i18n::LineBreakUserOptions&)
+ throw(uno::RuntimeException)
+ {
+ return i18n::LineBreakResults();
+ }
+
- virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString&, sal_Int32 )
++ virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString&, sal_Int32 )
+ throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString&, sal_Int32,
++ virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString&, sal_Int32,
+ sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString&, sal_Int32,
++ virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString&, sal_Int32,
+ sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString&, sal_Int32,
++ virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString&, sal_Int32,
+ sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString&, sal_Int32,
++ virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString&, sal_Int32,
+ sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+
- virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString&, sal_Int32,
++ virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
++ virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
+ const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
+ {
+ const sal_Unicode *pStr = rText.getStr()+nStartPos;
+ for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI)
+ {
+ if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr))
+ return nI;
+ else if (CharType != i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr))
+ return nI;
+ ++pStr;
+ }
+ return -1;
+ }
- virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString&, sal_Int32,
++ virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
++ virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
+ const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
+ {
+ const sal_Unicode *pStr = rText.getStr()+nStartPos;
+ for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI)
+ {
+ if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr))
+ return nI;
+ else if (CharType != i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr))
+ return nI;
+ ++pStr;
+ }
+ return -1;
+ }
+ };
+
+ void TestString::testNatural()
+ {
+ using namespace comphelper::string;
+
+ uno::Reference< i18n::XCollator > xCollator(new testCollator);
+ uno::Reference< i18n::XBreakIterator > xBI(new testBreakIterator);
+
+ // --- Some generic tests to ensure we do not alter original behavior
+ // outside what we want
+ CPPUNIT_ASSERT(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list