diff options
237 files changed, 3783 insertions, 4846 deletions
diff --git a/basegfx/inc/makefile.mk b/basebmp/CppunitTest_basebmp.mk index aa8007b7e507..eb39b981c858 100644 --- a/basegfx/inc/makefile.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -24,24 +24,27 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. -PRJNAME=basegfx -TARGET=inc +$(eval $(call gb_CppunitTest_CppunitTest,basebmp_test)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \ + basebmp/test/basictest \ + basebmp/test/bmpmasktest \ + basebmp/test/bmptest \ + basebmp/test/cliptest \ + basebmp/test/filltest \ + basebmp/test/linetest \ + basebmp/test/masktest \ + basebmp/test/polytest \ + basebmp/test/tools \ +)) -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \ + basebmp \ + basegfx \ + cppunit \ + sal \ + $(gb_STDLIBS) \ +)) +# vim: set noet sw=4 ts=4: diff --git a/basebmp/util/makefile.mk b/basebmp/Library_basebmp.mk index bc86ebd6bac4..97fcb79329ea 100644 --- a/basebmp/util/makefile.mk +++ b/basebmp/Library_basebmp.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,42 +25,40 @@ # #************************************************************************* -PRJ=.. +$(eval $(call gb_Library_Library,basebmp)) -PRJNAME=basebmp -TARGET=basebmp +$(eval $(call gb_Library_add_package_headers,basebmp,basebmp_inc)) -# --- Settings --------------------------------------------------- +$(eval $(call gb_Library_set_include,basebmp,\ + -I$(SRCDIR)/basebmp/inc/ \ + -I$(SRCDIR)/basebmp/inc/pch \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) -.INCLUDE : settings.mk +$(eval $(call gb_Library_add_defs,basebmp,\ + -DBASEBMP_DLLIMPLEMENTATION \ +)) -# --- Allgemein --------------------------------------------------- +$(eval $(call gb_Library_add_linked_libs,basebmp,\ + basegfx \ + sal \ + $(gb_STDLIBS) \ +)) -LIB1TARGET=$(SLB)$/basebmp.lib -LIB1FILES=\ - $(SLB)$/wrapper.lib - -SHL1TARGET= basebmp$(DLLPOSTFIX) -SHL1IMPLIB= ibasebmp - -SHL1STDLIBS=\ - $(SALLIB) \ - $(BASEGFXLIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1LIBS= $(SLB)$/basebmp.lib - -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(LIB1TARGET) - -DEF1DES =BaseBMP -DEFLIB1NAME =basebmp - -# --- Targets ----------------------------------------------------------- - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt : makefile.mk - @$(TYPE) $(TARGET).flt > $@ +ifeq ($(OS),SOLARIS) +$(eval $(call gb_Library_add_cxxobjects,basebmp, \ + basebmp/source/bitmapdevice \ + basebmp/source/debug \ + basebmp/source/polypolygonrenderer \ + , $(gb_COMPILEROPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) -xalias_level=compatible \ +)) +else +$(eval $(call gb_Library_add_exception_objects,basebmp,\ + basebmp/source/bitmapdevice \ + basebmp/source/debug \ + basebmp/source/polypolygonrenderer \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/basebmp/Makefile b/basebmp/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/basebmp/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk new file mode 100644 index 000000000000..7ac5d945ffdd --- /dev/null +++ b/basebmp/Module_basebmp.mk @@ -0,0 +1,39 @@ +#************************************************************************* +# +# 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,basebmp)) + +$(eval $(call gb_Module_add_targets,basebmp,\ + Library_basebmp \ + Package_inc \ +)) + +$(eval $(call gb_Module_add_check_targets,basebmp,\ + CppunitTest_basebmp \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk new file mode 100644 index 000000000000..d38f58ca8ef6 --- /dev/null +++ b/basebmp/Package_inc.mk @@ -0,0 +1,64 @@ +#************************************************************************* +# +# 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_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessor.hxx,basebmp/accessor.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessoradapters.hxx,basebmp/accessoradapters.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessorfunctors.hxx,basebmp/accessorfunctors.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessortraits.hxx,basebmp/accessortraits.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/clippedlinerenderer.hxx,basebmp/clippedlinerenderer.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colorblendaccessoradapter.hxx,basebmp/colorblendaccessoradapter.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colormisc.hxx,basebmp/colormisc.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colortraits.hxx,basebmp/colortraits.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/compositeiterator.hxx,basebmp/compositeiterator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/endian.hxx,basebmp/endian.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/fillimage.hxx,basebmp/fillimage.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/genericcolorimageaccessor.hxx,basebmp/genericcolorimageaccessor.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/greylevelformats.hxx,basebmp/greylevelformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/iteratortraits.hxx,basebmp/iteratortraits.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/linerenderer.hxx,basebmp/linerenderer.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/metafunctions.hxx,basebmp/metafunctions.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/nonstandarditerator.hxx,basebmp/nonstandarditerator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/packedpixeliterator.hxx,basebmp/packedpixeliterator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteformats.hxx,basebmp/paletteformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteimageaccessor.hxx,basebmp/paletteimageaccessor.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixelformatadapters.hxx,basebmp/pixelformatadapters.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixeliterator.hxx,basebmp/pixeliterator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/polypolygonrenderer.hxx,basebmp/polypolygonrenderer.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/rgb24pixelformats.hxx,basebmp/rgb24pixelformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/rgbmaskpixelformats.hxx,basebmp/rgbmaskpixelformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scaleimage.hxx,basebmp/scaleimage.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scanlineformats.hxx,basebmp/scanlineformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/stridedarrayiterator.hxx,basebmp/stridedarrayiterator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/tools.hxx,basebmp/tools.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/truecolormaskaccessor.hxx,basebmp/truecolormaskaccessor.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx index 5a5436432169..0db4099213f4 100644 --- a/basebmp/inc/basebmp/bitmapdevice.hxx +++ b/basebmp/inc/basebmp/bitmapdevice.hxx @@ -39,6 +39,13 @@ #include <boost/noncopyable.hpp> #include <vector> +#if defined BASEBMP_DLLIMPLEMENTATION +#define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define BASEBMP_DLLPRIVATE SAL_DLLPRIVATE + namespace basegfx { class B2IPoint; @@ -77,7 +84,7 @@ class BitmapDeviceDamageTracker { works best when given as an eight bit grey bitmap. Everything else is accepted, but potentially slow. */ -class BitmapDevice : public boost::enable_shared_from_this<BitmapDevice>, +class BASEBMP_DLLPUBLIC BitmapDevice : public boost::enable_shared_from_this<BitmapDevice>, private boost::noncopyable { public: @@ -647,7 +654,7 @@ 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, BitmapDeviceDamageTracker* pDamage = NULL ); @@ -659,7 +666,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, lookups for the whole range of pixel values from the specified format. */ -BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, +BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, bool bTopDown, sal_Int32 nScanlineFormat, const PaletteMemorySharedVector& rPalette ); @@ -670,7 +677,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize Note: the provided memory must have sufficient size, to store the image of the specified area and format. */ -BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, +BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, bool bTopDown, sal_Int32 nScanlineFormat, const RawMemorySharedArray& rMem, @@ -685,7 +692,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize area. Useful to implement rectangular clips (usually faster than setting up a 1bpp clip mask). */ -BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr& rProto, +BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr& rProto, const basegfx::B2IRange& rSubset ); /** Factory method to clone a BitmapDevice from a given prototype. @@ -694,7 +701,7 @@ BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr& rProt copied, only the size can be varied. Note that the prototype's bitmap content is <em>not</em> copied, only a palette (if any). */ -BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize, +BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize, const BitmapDeviceSharedPtr& rProto ); } diff --git a/basebmp/prj/build.lst b/basebmp/prj/build.lst index b68e8f2eb6fd..2b0fa1e0f72a 100644 --- a/basebmp/prj/build.lst +++ b/basebmp/prj/build.lst @@ -1,5 +1,2 @@ bx basebmp : sal VIGRA:vigra basegfx BOOST:boost NULL -bx basebmp usr1 - all bx_mkout NULL -bx basebmp\source nmake - all bx_source NULL -bx basebmp\util nmake - all bx_util bx_source NULL -bx basebmp\test nmake - all bx_test bx_util NULL +bx basebmp\prj nmake - all bx_prj NULL diff --git a/basebmp/prj/d.lst b/basebmp/prj/d.lst index 2dd75fa5b1c5..e69de29bb2d1 100644 --- a/basebmp/prj/d.lst +++ b/basebmp/prj/d.lst @@ -1,9 +0,0 @@ -..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib\ibasebmp.lib - -..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin\basebmp?????.dll - -..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib\libbasebmp*.* -..\%__SRC%\lib\*.a %_DEST%\lib\*.a - -mkdir: %_DEST%\inc\basebmp -..\inc\basebmp\*.hxx %_DEST%\inc\basebmp\*.hxx diff --git a/basegfx/test/export.map b/basebmp/prj/makefile.mk index 3308588ef6f8..88cd9dfe08b8 100644 --- a/basegfx/test/export.map +++ b/basebmp/prj/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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 @@ -25,10 +25,16 @@ # #************************************************************************* -UDK_3_0_0 { - global: - cppunitTestPlugIn; +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF - local: - *; -}; +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk deleted file mode 100644 index 55b27cfa7565..000000000000 --- a/basebmp/source/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/ - -PRJNAME=basebmp -TARGET=wrapper -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - - -# TODO(F3) unify BASEBMP_NO_NESTED_TEMPLATE_PARAMETER and -# VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS -# -# - VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS avoids template parameters -# to templates - the template keyword is broken for SunCC -# - VIGRA_HAS_LONG_LONG enables long long overloads (but appears to not work -# reliably in some environments, and is thus not enabled) -# - VIGRA_HAS_LONG_DOUBLE enables long double overloads - -.IF "$(OS)"!="WNT" -CDEFS+= -DVIGRA_HAS_LONG_DOUBLE -.ENDIF - -.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" -CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER -DVIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS -.ENDIF - -# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail -# if compiled with default -xalias_level (and optimization level -xO3) -.IF "$(OS)"=="SOLARIS" -# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx -.IF "$(CCNUMVER)"!="00050005" -CDEFS+=-xalias_level=compatible -.ENDIF -.ENDIF - -# --- Common ---------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/bitmapdevice.obj \ - $(SLO)$/debug.obj \ - $(SLO)$/polypolygonrenderer.obj - -# $(SLO)$/genericintegerimageaccessor.obj \ - -# ========================================================================== - -.INCLUDE : target.mk diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index d953095585fa..1b409921d046 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -28,6 +28,7 @@ // autogenerated file with codegen.pl +#include <sal/cppunit.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk deleted file mode 100644 index 6941ed963b75..000000000000 --- a/basebmp/test/makefile.mk +++ /dev/null @@ -1,111 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=basebmp -TARGET=tests -TARGETTYPE=GUI - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - -.IF "$(debug)"!="" || "$(DEBUG)"!="" - -.IF "$(COM)"=="MSC" -# disable inlining for MSVC -CFLAGS += -Ob0 -.ENDIF - -.IF "$(COM)"=="GCC" -# disable inlining for gcc -CFLAGS += -fno-inline -.ENDIF - -.ENDIF - -# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail -# if compiled with default -xalias_level (and optimization level -xO3) -.IF "$(OS)"=="SOLARIS" -# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx -.IF "$(CCNUMVER)"!="00050005" -CDEFS+=-xalias_level=compatible -.ENDIF -.ENDIF - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -# --- Common ---------------------------------------------------------- -.IF "$(L10N_framework)"=="" - -# BEGIN ---------------------------------------------------------------- -# auto generated Target:tests by codegen.pl -SHL1OBJS= \ - $(SLO)$/basictest.obj \ - $(SLO)$/bmpmasktest.obj \ - $(SLO)$/bmptest.obj \ - $(SLO)$/cliptest.obj \ - $(SLO)$/filltest.obj \ - $(SLO)$/linetest.obj \ - $(SLO)$/masktest.obj \ - $(SLO)$/polytest.obj \ - $(SLO)$/tools.obj -SHL1TARGET= tests -SHL1STDLIBS= $(BASEBMPLIB) \ - $(SALLIB) \ - $(CPPUNITLIB) \ - $(BASEGFXLIB) - -SHL1IMPLIB= i$(SHL1TARGET) - -DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = export.map -SHL1RPATH = NONE - -.ENDIF -# END ------------------------------------------------------------------ - -#------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -# --- Enable test execution in normal build ------------------------ -.IF "$(L10N_framework)"=="" -.INCLUDE : _cppunit.mk -.ENDIF diff --git a/basebmp/util/basebmp.flt b/basebmp/util/basebmp.flt deleted file mode 100644 index 28a1dd1b65c6..000000000000 --- a/basebmp/util/basebmp.flt +++ /dev/null @@ -1,4 +0,0 @@ -__CT -Impl -IMP -internal
\ No newline at end of file diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk new file mode 100644 index 000000000000..51cdcc699ae0 --- /dev/null +++ b/basegfx/CppunitTest_basegfx.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# +# 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_CppunitTest_CppunitTest,basegfx_test)) + +$(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \ + basegfx/test/basegfx1d \ + basegfx/test/basegfx2d \ + basegfx/test/basegfx3d \ + basegfx/test/boxclipper \ + basegfx/test/basegfxtools \ + basegfx/test/clipstate \ + basegfx/test/genericclipper \ + basegfx/test/testtools \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \ + basegfx \ + cppu \ + cppuhelper \ + cppunit \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_set_include,basegfx_test,\ + $$(INCLUDE) \ + -I$(SRCDIR)/basegfx/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk new file mode 100644 index 000000000000..c510b5f52571 --- /dev/null +++ b/basegfx/Library_basegfx.mk @@ -0,0 +1,117 @@ +#************************************************************************* +# +# 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_Library_Library,basegfx)) + +$(eval $(call gb_Library_add_package_headers,basegfx,basegfx_inc)) + +$(eval $(call gb_Library_add_precompiled_header,basegfx,$(SRCDIR)/basegfx/inc/pch/precompiled_basegfx)) + +$(eval $(call gb_Library_set_include,basegfx,\ + -I$(SRCDIR)/basegfx/inc \ + -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_linked_libs,basegfx,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,basegfx,\ + basegfx/source/tools/liangbarsky \ + basegfx/source/tools/debugplotter \ + basegfx/source/tools/canvastools \ + basegfx/source/tools/gradienttools \ + basegfx/source/tools/keystoplerp \ + basegfx/source/tools/unopolypolygon \ + basegfx/source/tools/tools \ + basegfx/source/tools/b2dclipstate \ + basegfx/source/numeric/ftools \ + basegfx/source/tuple/b3ituple \ + basegfx/source/tuple/b3dtuple \ + basegfx/source/tuple/b2ituple \ + basegfx/source/tuple/b2dtuple \ + basegfx/source/tuple/b3i64tuple \ + basegfx/source/tuple/b2i64tuple \ + basegfx/source/range/b1drange \ + basegfx/source/range/b2dpolyrange \ + basegfx/source/range/b2xrange \ + basegfx/source/range/b3drange \ + basegfx/source/range/b2drangeclipper \ + basegfx/source/range/b2drange \ + basegfx/source/vector/b3ivector \ + basegfx/source/vector/b2ivector \ + basegfx/source/vector/b2dvector \ + basegfx/source/vector/b3dvector \ + basegfx/source/polygon/b3dpolygon \ + basegfx/source/polygon/b2dtrapezoid \ + basegfx/source/polygon/b3dpolygontools \ + basegfx/source/polygon/b2dlinegeometry \ + basegfx/source/polygon/b3dpolypolygontools \ + basegfx/source/polygon/b3dpolygonclipper \ + basegfx/source/polygon/b2dpolygonclipper \ + basegfx/source/polygon/b2dpolypolygoncutter \ + basegfx/source/polygon/b2dpolypolygonrasterconverter \ + basegfx/source/polygon/b2dpolygon \ + basegfx/source/polygon/b2dpolygontriangulator \ + basegfx/source/polygon/b2dpolypolygon \ + basegfx/source/polygon/b3dpolypolygon \ + basegfx/source/polygon/b2dsvgpolypolygon \ + basegfx/source/polygon/b2dpolygoncutandtouch \ + basegfx/source/polygon/b2dpolypolygontools \ + basegfx/source/polygon/b2dpolygontools \ + basegfx/source/pixel/bpixel \ + basegfx/source/matrix/b2dhommatrixtools \ + 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 \ + basegfx/source/point/b2ipoint \ + basegfx/source/curve/b2dbeziertools \ + basegfx/source/curve/b2dcubicbezier \ + basegfx/source/curve/b2dquadraticbezier \ + basegfx/source/color/bcolormodifier \ + basegfx/source/color/bcolor \ + basegfx/source/color/bcolortools \ + basegfx/source/raster/bpixelraster \ + basegfx/source/raster/bzpixelraster \ + basegfx/source/raster/rasterconvert3d \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/basegfx/Makefile b/basegfx/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/basegfx/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/basegfx/Module_basegfx.mk b/basegfx/Module_basegfx.mk new file mode 100644 index 000000000000..ba276e021d85 --- /dev/null +++ b/basegfx/Module_basegfx.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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,basegfx)) + +$(eval $(call gb_Module_add_targets,basegfx,\ + Library_basegfx \ + Package_inc \ + StaticLibrary_basegfx_s \ +)) + +$(eval $(call gb_Module_add_check_targets,basegfx,\ + CppunitTest_basegfx \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk new file mode 100644 index 000000000000..1f8fbd63542d --- /dev/null +++ b/basegfx/Package_inc.mk @@ -0,0 +1,112 @@ +#************************************************************************* +# +# 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_Package_Package,basegfx_inc,$(SRCDIR)/basegfx/inc)) + +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/lerp.hxx,basegfx/tools/lerp.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/keystoplerp.hxx,basegfx/tools/keystoplerp.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/debugplotter.hxx,basegfx/tools/debugplotter.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/canvastools.hxx,basegfx/tools/canvastools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/rectcliptools.hxx,basegfx/tools/rectcliptools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/b2dclipstate.hxx,basegfx/tools/b2dclipstate.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unopolypolygon.hxx,basegfx/tools/unopolypolygon.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/tools.hxx,basegfx/tools/tools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/gradienttools.hxx,basegfx/tools/gradienttools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/numeric/ftools.hxx,basegfx/numeric/ftools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3i64tuple.hxx,basegfx/tuple/b3i64tuple.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3dtuple.hxx,basegfx/tuple/b3dtuple.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3ituple.hxx,basegfx/tuple/b3ituple.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b2i64tuple.hxx,basegfx/tuple/b2i64tuple.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b2ituple.hxx,basegfx/tuple/b2ituple.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b2dtuple.hxx,basegfx/tuple/b2dtuple.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2drangeclipper.hxx,basegfx/range/b2drangeclipper.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b3irange.hxx,basegfx/range/b3irange.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b3dvolume.hxx,basegfx/range/b3dvolume.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/basicbox.hxx,basegfx/range/basicbox.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2dconnectedranges.hxx,basegfx/range/b2dconnectedranges.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b3drange.hxx,basegfx/range/b3drange.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2drange.hxx,basegfx/range/b2drange.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/rangeexpander.hxx,basegfx/range/rangeexpander.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2irange.hxx,basegfx/range/b2irange.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b1ibox.hxx,basegfx/range/b1ibox.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2dpolyrange.hxx,basegfx/range/b2dpolyrange.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b3ivolume.hxx,basegfx/range/b3ivolume.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b1irange.hxx,basegfx/range/b1irange.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2drectangle.hxx,basegfx/range/b2drectangle.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2irectangle.hxx,basegfx/range/b2irectangle.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b1drange.hxx,basegfx/range/b1drange.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2ibox.hxx,basegfx/range/b2ibox.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b3ibox.hxx,basegfx/range/b3ibox.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/basicrange.hxx,basegfx/range/basicrange.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b3dsize.hxx,basegfx/vector/b3dsize.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2ivector.hxx,basegfx/vector/b2ivector.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2dvector.hxx,basegfx/vector/b2dvector.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b3dvector.hxx,basegfx/vector/b3dvector.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2dsize.hxx,basegfx/vector/b2dsize.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2isize.hxx,basegfx/vector/b2isize.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2enums.hxx,basegfx/vector/b2enums.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b3ivector.hxx,basegfx/vector/b3ivector.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b3isize.hxx,basegfx/vector/b3isize.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dtrapezoid.hxx,basegfx/polygon/b2dtrapezoid.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygoncutter.hxx,basegfx/polygon/b2dpolypolygoncutter.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygon.hxx,basegfx/polygon/b2dpolypolygon.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygontools.hxx,basegfx/polygon/b2dpolypolygontools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygon.hxx,basegfx/polygon/b2dpolygon.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygonclipper.hxx,basegfx/polygon/b2dpolygonclipper.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygonfillrule.hxx,basegfx/polygon/b2dpolypolygonfillrule.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygontriangulator.hxx,basegfx/polygon/b2dpolygontriangulator.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygontools.hxx,basegfx/polygon/b3dpolygontools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygontools.hxx,basegfx/polygon/b2dpolygontools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolypolygon.hxx,basegfx/polygon/b3dpolypolygon.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygoncutandtouch.hxx,basegfx/polygon/b2dpolygoncutandtouch.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dlinegeometry.hxx,basegfx/polygon/b2dlinegeometry.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolypolygontools.hxx,basegfx/polygon/b3dpolypolygontools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx,basegfx/polygon/b2dpolypolygonrasterconverter.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygon.hxx,basegfx/polygon/b3dpolygon.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygonclipper.hxx,basegfx/polygon/b3dpolygonclipper.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/pixel/bpixel.hxx,basegfx/pixel/bpixel.hxx)) +$(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)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dhompoint.hxx,basegfx/point/b2dhompoint.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2ipoint.hxx,basegfx/point/b2ipoint.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dcubicbezier.hxx,basegfx/curve/b2dcubicbezier.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dquadraticbezier.hxx,basegfx/curve/b2dquadraticbezier.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dbeziertools.hxx,basegfx/curve/b2dbeziertools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/color/bcolor.hxx,basegfx/color/bcolor.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/color/bcolortools.hxx,basegfx/color/bcolortools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/color/bcolormodifier.hxx,basegfx/color/bcolormodifier.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/raster/bpixelraster.hxx,basegfx/raster/bpixelraster.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/raster/rasterconvert3d.hxx,basegfx/raster/rasterconvert3d.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/raster/bzpixelraster.hxx,basegfx/raster/bzpixelraster.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/basegfxdllapi.h,basegfx/basegfxdllapi.h)) + +# vim: set noet sw=4 ts=4: diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk new file mode 100644 index 000000000000..36f6117a1171 --- /dev/null +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -0,0 +1,122 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_StaticLibrary_StaticLibrary,basegfx_s)) + +$(eval $(call gb_StaticLibrary_add_package_headers,basegfx_s,basegfx_inc)) + +$(eval $(call gb_StaticLibrary_add_precompiled_header,basegfx_s,$(SRCDIR)/basegfx/inc/pch/precompiled_basegfx)) + +$(eval $(call gb_StaticLibrary_set_include,basegfx_s,\ + -I$(SRCDIR)/basegfx/inc \ + -I$(SRCDIR)/basegfx/source/inc \ + $$(INCLUDE) \ + -I$(SRCDIR)/basegfx/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +# the whole library is a hack +# we only build it to prevent the pdfimporter shared lib from linking to the basegfx shared lib +# this means that all code of this static library will end in a dll +# thus the _DLL define must be set to avoid link problems with stlport symbols +# the BASEGFX_STATICLIBRARY define will expand all BASEGFX_DLLPRIVATE/PUBLIC macros to nothing +$(eval $(call gb_StaticLibrary_add_defs,basegfx_s,\ + -DBASEGFX_STATICLIBRARY \ + -D_DLL \ +)) + +# as we have to build all sources a second time, we must copy them to the workdir and build from there +$(WORKDIR)/CustomTarget/basegfx/source/%.cxx : $(SRCDIR)/basegfx/source/%.cxx + mkdir -p $(dir $@) && \ + cp $< $@ + +# copied sources are generated cxx sources +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\ + CustomTarget/basegfx/source/tools/liangbarsky \ + CustomTarget/basegfx/source/tools/debugplotter \ + CustomTarget/basegfx/source/tools/canvastools \ + CustomTarget/basegfx/source/tools/gradienttools \ + CustomTarget/basegfx/source/tools/keystoplerp \ + CustomTarget/basegfx/source/tools/unopolypolygon \ + CustomTarget/basegfx/source/tools/tools \ + CustomTarget/basegfx/source/tools/b2dclipstate \ + CustomTarget/basegfx/source/numeric/ftools \ + CustomTarget/basegfx/source/tuple/b3ituple \ + CustomTarget/basegfx/source/tuple/b3dtuple \ + CustomTarget/basegfx/source/tuple/b2ituple \ + CustomTarget/basegfx/source/tuple/b2dtuple \ + CustomTarget/basegfx/source/tuple/b3i64tuple \ + CustomTarget/basegfx/source/tuple/b2i64tuple \ + CustomTarget/basegfx/source/range/b1drange \ + CustomTarget/basegfx/source/range/b2dpolyrange \ + CustomTarget/basegfx/source/range/b2xrange \ + CustomTarget/basegfx/source/range/b3drange \ + CustomTarget/basegfx/source/range/b2drangeclipper \ + CustomTarget/basegfx/source/range/b2drange \ + CustomTarget/basegfx/source/vector/b3ivector \ + CustomTarget/basegfx/source/vector/b2ivector \ + CustomTarget/basegfx/source/vector/b2dvector \ + CustomTarget/basegfx/source/vector/b3dvector \ + CustomTarget/basegfx/source/polygon/b3dpolygon \ + CustomTarget/basegfx/source/polygon/b2dtrapezoid \ + CustomTarget/basegfx/source/polygon/b3dpolygontools \ + CustomTarget/basegfx/source/polygon/b2dlinegeometry \ + CustomTarget/basegfx/source/polygon/b3dpolypolygontools \ + CustomTarget/basegfx/source/polygon/b3dpolygonclipper \ + CustomTarget/basegfx/source/polygon/b2dpolygonclipper \ + CustomTarget/basegfx/source/polygon/b2dpolypolygoncutter \ + CustomTarget/basegfx/source/polygon/b2dpolypolygonrasterconverter \ + CustomTarget/basegfx/source/polygon/b2dpolygon \ + CustomTarget/basegfx/source/polygon/b2dpolygontriangulator \ + CustomTarget/basegfx/source/polygon/b2dpolypolygon \ + CustomTarget/basegfx/source/polygon/b3dpolypolygon \ + CustomTarget/basegfx/source/polygon/b2dsvgpolypolygon \ + CustomTarget/basegfx/source/polygon/b2dpolygoncutandtouch \ + CustomTarget/basegfx/source/polygon/b2dpolypolygontools \ + CustomTarget/basegfx/source/polygon/b2dpolygontools \ + CustomTarget/basegfx/source/pixel/bpixel \ + CustomTarget/basegfx/source/matrix/b2dhommatrixtools \ + 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 \ + CustomTarget/basegfx/source/point/b2ipoint \ + CustomTarget/basegfx/source/curve/b2dbeziertools \ + CustomTarget/basegfx/source/curve/b2dcubicbezier \ + CustomTarget/basegfx/source/curve/b2dquadraticbezier \ + CustomTarget/basegfx/source/color/bcolormodifier \ + CustomTarget/basegfx/source/color/bcolor \ + CustomTarget/basegfx/source/color/bcolortools \ + CustomTarget/basegfx/source/raster/bpixelraster \ + CustomTarget/basegfx/source/raster/bzpixelraster \ + CustomTarget/basegfx/source/raster/rasterconvert3d \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/source/provider/provconf.hxx b/basegfx/inc/basegfx/basegfxdllapi.h index e21a619114ce..18ad22b447a9 100644 --- a/ucbhelper/source/provider/provconf.hxx +++ b/basegfx/inc/basegfx/basegfxdllapi.h @@ -25,31 +25,26 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#ifndef INCLUDED_BASEGFXDLLAPI_H +#define INCLUDED_BASEGFXDLLAPI_H -#ifndef _UCBHELPER_PROVCONF_HXX_ -#define _UCBHELPER_PROFCONF_HXX_ +#if defined BASEGFX_STATICLIBRARY -#include <rtl/ustring.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <ucbhelper/configureucb.hxx> +#define BASEGFX_DLLPUBLIC +#define BASEGFX_DLLPRIVATE -namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; -} } } } +#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 -namespace ucbhelper { +#endif /*BASEGFX_STATICLIBRARY*/ -bool getContentProviderData( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > - & rServiceMgr, - const rtl::OUString & rKey1, - const rtl::OUString & rKey2, - ContentProviderDataList & rListToFill ); +#endif -} - -#endif /* !_UCBHELPER_PROVCONF_HXX_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/inc/basegfx/color/bcolor.hxx b/basegfx/inc/basegfx/color/bcolor.hxx index ba39c1dd4ab4..1a1c6eaf8ffd 100644 --- a/basegfx/inc/basegfx/color/bcolor.hxx +++ b/basegfx/inc/basegfx/color/bcolor.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -53,7 +54,7 @@ namespace basegfx @see B3DTuple */ - class BColor : public B3DTuple + class BASEGFX_DLLPUBLIC BColor : public B3DTuple { public: /** Create a Color with red, green and blue components from [0.0 to 1.0] diff --git a/basegfx/inc/basegfx/color/bcolormodifier.hxx b/basegfx/inc/basegfx/color/bcolormodifier.hxx index b109f05c7e11..368216be0fb7 100644 --- a/basegfx/inc/basegfx/color/bcolormodifier.hxx +++ b/basegfx/inc/basegfx/color/bcolormodifier.hxx @@ -31,6 +31,7 @@ #include <basegfx/color/bcolor.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -49,7 +50,7 @@ namespace basegfx /** Class to hold a color, value and mode for a color modification. Color modification is done calling the getModifiedColor() method */ - class BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier { protected: ::basegfx::BColor maBColor; @@ -89,7 +90,7 @@ namespace basegfx /** Class to hold a stack of BColorModifiers and to get the modified color with applying all existing entry changes */ - class BColorModifierStack + class BASEGFX_DLLPUBLIC BColorModifierStack { protected: ::std::vector< BColorModifier > maBColorModifiers; diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx index 0502c77f3236..5841f045b442 100644 --- a/basegfx/inc/basegfx/color/bcolortools.hxx +++ b/basegfx/inc/basegfx/color/bcolortools.hxx @@ -30,6 +30,7 @@ #define _BGFX_COLOR_BCOLORTOOLS_HXX #include <sal/types.h> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -40,29 +41,29 @@ namespace basegfx namespace tools { /// Transform from RGB to HSL - BColor rgb2hsl(const BColor& rRGBColor); + BASEGFX_DLLPUBLIC BColor rgb2hsl(const BColor& rRGBColor); /// Transform from HSL to RGB - BColor hsl2rgb(const BColor& rHSLColor); + BASEGFX_DLLPUBLIC BColor hsl2rgb(const BColor& rHSLColor); /// Transform from RGB to HSV - BColor rgb2hsv(const BColor& rRGBColor); + BASEGFX_DLLPUBLIC BColor rgb2hsv(const BColor& rRGBColor); /// Transform from HSV to RGB - BColor hsv2rgb(const BColor& rHSVColor); + BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor& rHSVColor); /// Transform from R'G'B' to YIQ (NTSC color model - Y is used in monochrome mode) - BColor rgb2yiq(const BColor& rRGBColor); + BASEGFX_DLLPUBLIC BColor rgb2yiq(const BColor& rRGBColor); /// Transform from YIQ to R'G'B' (NTSC color model - Y is used in monochrome mode) - BColor yiq2rgb(const BColor& rYIQColor); + BASEGFX_DLLPUBLIC BColor yiq2rgb(const BColor& rYIQColor); /// Transform from R'G'B' to Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) - BColor rgb2ypbpr(const BColor& rRGBColor); + BASEGFX_DLLPUBLIC BColor rgb2ypbpr(const BColor& rRGBColor); /// Transform from Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) into R'G'B' - BColor ypbpr2rgb(const BColor& rYPbPrColor); + BASEGFX_DLLPUBLIC BColor ypbpr2rgb(const BColor& rYPbPrColor); /// Transform from CIE XYZ into Rec. 709 RGB (D65 white point) - BColor ciexyz2rgb( const BColor& rXYZColor ); + BASEGFX_DLLPUBLIC BColor ciexyz2rgb( const BColor& rXYZColor ); /// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ - BColor rgb2ciexyz( const BColor& rRGBColor ); + BASEGFX_DLLPUBLIC BColor rgb2ciexyz( const BColor& rRGBColor ); } } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx index 875ab5a1acec..abadf4958c90 100644 --- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx +++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -44,7 +45,7 @@ namespace basegfx namespace basegfx { - class B2DCubicBezierHelper + class BASEGFX_DLLPUBLIC B2DCubicBezierHelper { private: ::std::vector< double > maLengthArray; diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx index bcc657110521..6da55027b92f 100644 --- a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx +++ b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx @@ -31,6 +31,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/range/b2drange.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -44,7 +45,7 @@ namespace basegfx namespace basegfx { - class B2DCubicBezier + class BASEGFX_DLLPUBLIC B2DCubicBezier { B2DPoint maStartPoint; B2DPoint maEndPoint; diff --git a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx index 6680acdc45ca..10f57670ecb4 100644 --- a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx +++ b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx @@ -30,12 +30,13 @@ #define _BGFX_CURVE_B2DQUADRATICBEZIER_HXX #include <basegfx/point/b2dpoint.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// namespace basegfx { - class B2DQuadraticBezier + class BASEGFX_DLLPUBLIC B2DQuadraticBezier { ::basegfx::B2DPoint maStartPoint; ::basegfx::B2DPoint maEndPoint; diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx index 04d9a2aaf734..08555821af40 100644 --- a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx +++ b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx @@ -31,13 +31,14 @@ #include <sal/types.h> #include <o3tl/cow_wrapper.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { class B2DTuple; class Impl2DHomMatrix; - class B2DHomMatrix + class BASEGFX_DLLPUBLIC B2DHomMatrix { public: typedef o3tl::cow_wrapper< Impl2DHomMatrix > ImplType; diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx index a737719e4a30..3d0d22da4cad 100644 --- a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx +++ b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx @@ -32,6 +32,7 @@ #include <sal/types.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/vector/b2dvector.hxx> +#include <basegfx/basegfxdllapi.h> namespace rtl { class OUString; } @@ -49,16 +50,16 @@ namespace basegfx would introduce slight roundoff errors, instead of exactly mirroring the coordinate system) */ - void createSinCosOrthogonal(double& o_rSin, double& rCos, double fRadiant); + BASEGFX_DLLPUBLIC void createSinCosOrthogonal(double& o_rSin, double& rCos, double fRadiant); /** Tooling methods for on-the-fly matrix generation e.g. for inline multiplications */ - B2DHomMatrix createScaleB2DHomMatrix(double fScaleX, double fScaleY); - B2DHomMatrix createShearXB2DHomMatrix(double fShearX); - B2DHomMatrix createShearYB2DHomMatrix(double fShearY); - B2DHomMatrix createRotateB2DHomMatrix(double fRadiant); - B2DHomMatrix createTranslateB2DHomMatrix(double fTranslateX, double fTranslateY); + BASEGFX_DLLPUBLIC B2DHomMatrix createScaleB2DHomMatrix(double fScaleX, double fScaleY); + BASEGFX_DLLPUBLIC B2DHomMatrix createShearXB2DHomMatrix(double fShearX); + BASEGFX_DLLPUBLIC B2DHomMatrix createShearYB2DHomMatrix(double fShearY); + BASEGFX_DLLPUBLIC B2DHomMatrix createRotateB2DHomMatrix(double fRadiant); + BASEGFX_DLLPUBLIC B2DHomMatrix createTranslateB2DHomMatrix(double fTranslateX, double fTranslateY); /// inline versions for parameters as tuples inline B2DHomMatrix createScaleB2DHomMatrix(const B2DTuple& rScale) @@ -78,7 +79,7 @@ namespace basegfx matrix multiplications. Inline versions for parameters as tuples added, too. */ - B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix( + BASEGFX_DLLPUBLIC B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix( double fScaleX, double fScaleY, double fShearX, double fRadiant, @@ -96,7 +97,7 @@ namespace basegfx rTranslate.getX(), rTranslate.getY()); } - B2DHomMatrix createShearXRotateTranslateB2DHomMatrix( + BASEGFX_DLLPUBLIC B2DHomMatrix createShearXRotateTranslateB2DHomMatrix( double fShearX, double fRadiant, double fTranslateX, double fTranslateY); @@ -111,7 +112,7 @@ namespace basegfx rTranslate.getX(), rTranslate.getY()); } - B2DHomMatrix createScaleTranslateB2DHomMatrix( + BASEGFX_DLLPUBLIC B2DHomMatrix createScaleTranslateB2DHomMatrix( double fScaleX, double fScaleY, double fTranslateX, double fTranslateY); inline B2DHomMatrix createScaleTranslateB2DHomMatrix( @@ -124,7 +125,7 @@ namespace basegfx } /// special for the often used case of rotation around a point - B2DHomMatrix createRotateAroundPoint( + BASEGFX_DLLPUBLIC B2DHomMatrix createRotateAroundPoint( double fPointX, double fPointY, double fRadiant); inline B2DHomMatrix createRotateAroundPoint( @@ -145,7 +146,7 @@ namespace basegfx { namespace tools { - class B2DHomMatrixBufferedDecompose + class BASEGFX_DLLPUBLIC B2DHomMatrixBufferedDecompose { private: B2DVector maScale; @@ -184,7 +185,7 @@ namespace basegfx { namespace tools { - class B2DHomMatrixBufferedOnDemandDecompose + class BASEGFX_DLLPUBLIC B2DHomMatrixBufferedOnDemandDecompose { private: B2DHomMatrix maB2DHomMatrix; diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx index 27a94d374256..a3eb8d311ec4 100644 --- a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx +++ b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx @@ -33,13 +33,14 @@ #include <basegfx/point/b3dpoint.hxx> #include <basegfx/vector/b3dvector.hxx> #include <o3tl/cow_wrapper.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { class B3DTuple; class Impl3DHomMatrix; - class B3DHomMatrix + class BASEGFX_DLLPUBLIC B3DHomMatrix { public: typedef o3tl::cow_wrapper< Impl3DHomMatrix > ImplType; diff --git a/basegfx/inc/basegfx/numeric/ftools.hxx b/basegfx/inc/basegfx/numeric/ftools.hxx index bc9a1c554187..59b9d737613d 100644 --- a/basegfx/inc/basegfx/numeric/ftools.hxx +++ b/basegfx/inc/basegfx/numeric/ftools.hxx @@ -30,6 +30,7 @@ #define _BGFX_NUMERIC_FTOOLS_HXX #include <rtl/math.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // standard PI defines from solar.h, but we do not want to link against tools @@ -145,7 +146,7 @@ namespace basegfx } - class fTools + class BASEGFX_DLLPUBLIC fTools { /// Threshold value for equalZero() static double mfSmallValue; diff --git a/basegfx/inc/basegfx/pixel/bpixel.hxx b/basegfx/inc/basegfx/pixel/bpixel.hxx index fcc2fdfba2a4..594263cbde1e 100644 --- a/basegfx/inc/basegfx/pixel/bpixel.hxx +++ b/basegfx/inc/basegfx/pixel/bpixel.hxx @@ -32,6 +32,7 @@ #include <sal/types.h> #include <basegfx/numeric/ftools.hxx> #include <basegfx/color/bcolor.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -40,7 +41,7 @@ namespace basegfx { - class BPixel + class BASEGFX_DLLPUBLIC BPixel { protected: union diff --git a/basegfx/inc/basegfx/point/b2dhompoint.hxx b/basegfx/inc/basegfx/point/b2dhompoint.hxx index 2736edaedde8..7f11827c6179 100644 --- a/basegfx/inc/basegfx/point/b2dhompoint.hxx +++ b/basegfx/inc/basegfx/point/b2dhompoint.hxx @@ -30,6 +30,7 @@ #define _BGFX_POINT_B2DHOMPOINT_HXX #include <basegfx/point/b2dpoint.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -46,7 +47,7 @@ namespace basegfx @see B2DTuple */ - class B2DHomPoint + class BASEGFX_DLLPUBLIC B2DHomPoint { protected: /// This member contains the coordinate part of the point @@ -206,31 +207,31 @@ namespace basegfx // external operators ////////////////////////////////////////////////////////////////////////// - B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); + BASEGFX_DLLPUBLIC B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); - B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); + BASEGFX_DLLPUBLIC B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); - B2DHomPoint absolute(const B2DHomPoint& rVec); + BASEGFX_DLLPUBLIC B2DHomPoint absolute(const B2DHomPoint& rVec); - B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t); + BASEGFX_DLLPUBLIC B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t); - B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2); + BASEGFX_DLLPUBLIC B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2); - B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2, B2DHomPoint& rOld3); + BASEGFX_DLLPUBLIC B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2, B2DHomPoint& rOld3); - B2DHomPoint operator+(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); + BASEGFX_DLLPUBLIC B2DHomPoint operator+(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); - B2DHomPoint operator-(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); + BASEGFX_DLLPUBLIC B2DHomPoint operator-(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); - B2DHomPoint operator*(const B2DHomPoint& rVec, double t); + BASEGFX_DLLPUBLIC B2DHomPoint operator*(const B2DHomPoint& rVec, double t); - B2DHomPoint operator*(double t, const B2DHomPoint& rVec); + BASEGFX_DLLPUBLIC B2DHomPoint operator*(double t, const B2DHomPoint& rVec); - B2DHomPoint operator*( const B2DHomMatrix& rMat, const B2DHomPoint& rPoint ); + BASEGFX_DLLPUBLIC B2DHomPoint operator*( const B2DHomMatrix& rMat, const B2DHomPoint& rPoint ); - B2DHomPoint operator/(const B2DHomPoint& rVec, double t); + BASEGFX_DLLPUBLIC B2DHomPoint operator/(const B2DHomPoint& rVec, double t); - B2DHomPoint operator/(double t, const B2DHomPoint& rVec); + BASEGFX_DLLPUBLIC B2DHomPoint operator/(double t, const B2DHomPoint& rVec); } // end of namespace basegfx #endif /* _BGFX_POINT_B2DHOMPOINT_HXX */ diff --git a/basegfx/inc/basegfx/point/b2dpoint.hxx b/basegfx/inc/basegfx/point/b2dpoint.hxx index 2b652d64afb8..c5b69b8c01d3 100644 --- a/basegfx/inc/basegfx/point/b2dpoint.hxx +++ b/basegfx/inc/basegfx/point/b2dpoint.hxx @@ -31,6 +31,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/point/b2ipoint.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -121,14 +122,14 @@ namespace basegfx /** assignment operator to allow assigning the results of B2DTuple calculations */ - B2DPoint& operator=( const ::basegfx::B2DTuple& rPoint ); + BASEGFX_DLLPUBLIC B2DPoint& operator=( const ::basegfx::B2DTuple& rPoint ); /** Transform point by given transformation matrix. The translational components of the matrix are, in contrast to B2DVector, applied. */ - B2DPoint& operator*=( const ::basegfx::B2DHomMatrix& rMat ); + BASEGFX_DLLPUBLIC B2DPoint& operator*=( const ::basegfx::B2DHomMatrix& rMat ); static const B2DPoint& getEmptyPoint() { @@ -144,7 +145,7 @@ namespace basegfx Since this is a Point, translational components of the matrix are used. */ - B2DPoint operator*( const B2DHomMatrix& rMat, const B2DPoint& rPoint ); + BASEGFX_DLLPUBLIC B2DPoint operator*( const B2DHomMatrix& rMat, const B2DPoint& rPoint ); } // end of namespace basegfx ////////////////////////////////////////////////////////////////////////////// diff --git a/basegfx/inc/basegfx/point/b2ipoint.hxx b/basegfx/inc/basegfx/point/b2ipoint.hxx index c9ec03108b22..b74b559d898b 100644 --- a/basegfx/inc/basegfx/point/b2ipoint.hxx +++ b/basegfx/inc/basegfx/point/b2ipoint.hxx @@ -30,6 +30,7 @@ #define _BGFX_POINT_B2IPOINT_HXX #include <basegfx/tuple/b2ituple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -44,7 +45,7 @@ namespace basegfx @see B2ITuple */ - class B2IPoint : public ::basegfx::B2ITuple + class BASEGFX_DLLPUBLIC B2IPoint : public ::basegfx::B2ITuple { public: /** Create a 2D Point diff --git a/basegfx/inc/basegfx/point/b3dpoint.hxx b/basegfx/inc/basegfx/point/b3dpoint.hxx index 96686efaf450..569bf2d7dab0 100644 --- a/basegfx/inc/basegfx/point/b3dpoint.hxx +++ b/basegfx/inc/basegfx/point/b3dpoint.hxx @@ -30,6 +30,7 @@ #define _BGFX_POINT_B3DPOINT_HXX #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -44,7 +45,7 @@ namespace basegfx @see B3DTuple */ - class B3DPoint : public ::basegfx::B3DTuple + class BASEGFX_DLLPUBLIC B3DPoint : public ::basegfx::B3DTuple { public: /** Create a 3D Point @@ -144,7 +145,7 @@ namespace basegfx Since this is a Point, translational components of the matrix are used. */ - B3DPoint operator*( const B3DHomMatrix& rMat, const B3DPoint& rPoint ); + BASEGFX_DLLPUBLIC B3DPoint operator*( const B3DHomMatrix& rMat, const B3DPoint& rPoint ); } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/point/b3ipoint.hxx b/basegfx/inc/basegfx/point/b3ipoint.hxx index 17e63a00040c..334ff33a7b50 100644 --- a/basegfx/inc/basegfx/point/b3ipoint.hxx +++ b/basegfx/inc/basegfx/point/b3ipoint.hxx @@ -30,6 +30,7 @@ #define _BGFX_POINT_B3IPOINT_HXX #include <basegfx/tuple/b3ituple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -44,7 +45,7 @@ namespace basegfx @see B3ITuple */ - class B3IPoint : public ::basegfx::B3ITuple + class BASEGFX_DLLPUBLIC B3IPoint : public ::basegfx::B3ITuple { public: /** Create a 3D Point diff --git a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx index 87e44787c5b6..f8c24fbb86cb 100644 --- a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx +++ b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx @@ -33,6 +33,7 @@ #include <basegfx/numeric/ftools.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -73,7 +74,7 @@ namespace basegfx @return The Line start and end polygon, correctly rotated and scaled */ - B2DPolyPolygon createAreaGeometryForLineStartEnd( + BASEGFX_DLLPUBLIC B2DPolyPolygon createAreaGeometryForLineStartEnd( const B2DPolygon& rCandidate, const B2DPolyPolygon& rArrow, bool bStart, @@ -129,7 +130,7 @@ namespace basegfx it's line width. Contains bezier segments and edge roundings as needed and defined. */ - B2DPolyPolygon createAreaGeometry( + BASEGFX_DLLPUBLIC B2DPolyPolygon createAreaGeometry( const B2DPolygon& rCandidate, double fHalfLineWidth, B2DLineJoin eJoin = B2DLINEJOIN_ROUND, diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx index 60d6c7a18d70..694531ca3a64 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx @@ -33,6 +33,7 @@ #include <o3tl/cow_wrapper.hxx> #include <basegfx/vector/b2enums.hxx> #include <basegfx/range/b2drange.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -51,7 +52,7 @@ namespace basegfx namespace basegfx { - class B2DPolygon + class BASEGFX_DLLPUBLIC B2DPolygon { public: typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType; diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx index 9915ddf4be87..172996aba49b 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx @@ -31,6 +31,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -47,21 +48,21 @@ namespace basegfx // a clip axis parallel to X.Axis and 100 above it, use bParallelToXAxis = true and fValueOnOtherAxis = 100. // The value bAboveAxis defines on which side the return value will be (true -> above X, right of Y). // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). - B2DPolyPolygon clipPolyPolygonOnParallelAxis(const B2DPolyPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke); - B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke); + BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnParallelAxis(const B2DPolyPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke); + BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke); // Clip the given PolyPolygon against the given range. bInside defines if the result will contain the // parts which are contained in the range or vice versa. // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). - B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); - B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); + BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); + BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); // Clip given PolyPolygon against the endless edge (ray) defined by the given two points. bAbove defines on which side // of the edge the result will be together with the definition of the edge. If the edge is seen as a vector // from A to B and bAbove is true, the result will contain the geometry left of the vector. // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). - B2DPolyPolygon clipPolyPolygonOnEdge(const B2DPolyPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke); - B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke); + BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnEdge(const B2DPolyPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke); + BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke); // Clip given PolyPolygon against given clipping polygon. // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). @@ -69,13 +70,13 @@ namespace basegfx // With filled polygons, You get all PolyPolygon parts which were inside rClip. // The switch bInside decides if the parts inside the clip polygon or outside shall be created. // The clip polygon is always assumed closed, even when it's isClosed() is false. - B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke); - B2DPolyPolygon clipPolygonOnPolyPolygon(const B2DPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke); + BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke); + BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnPolyPolygon(const B2DPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke); // clip the given polygon against the given range. the resulting polygon will always contain // the inside parts which will always be interpreted as areas. the incoming polygon is expected // to be a simple triangle list. the result is also a simple triangle list. - B2DPolygon clipTriangleListOnRange( const B2DPolygon& rCandidate, const B2DRange& rRange ); + BASEGFX_DLLPUBLIC B2DPolygon clipTriangleListOnRange( const B2DPolygon& rCandidate, const B2DRange& rRange ); } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx index 6a6a8ba650e3..af188cb369c8 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx @@ -31,6 +31,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -40,39 +41,39 @@ namespace basegfx { // look for self-intersections and self-touches (points on an edge) in given polygon and add // extra points there. Result will have no touches or intersections on an edge, only on points - B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate); // look for polypolygon-intersections and polypolygon-touches (point of poly A on an edge of poly B) in given PolyPolygon and add // extra points there. Result will have no touches or intersections between contained polygons on an edge, only on points. For // convenience, the correction for self-intersections for each member polygon will be used, too. // Changed: Self intersections are searched by default, but may be switched off by 2nd parameter. - B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rCandidate, bool bSelfIntersections = true); + BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rCandidate, bool bSelfIntersections = true); // look for intersections of rCandidate with all polygons from rMask and add extra points there. Do // not change or add points to rMask. - B2DPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolygon& rCandidate); // look for intersections of rCandidate with all polygons from rMask and add extra points there. Do // not change or add points to rMask. - B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolyPolygon& rCandidate); // look for intersections of rCandidate with the edge from rStart to rEnd and add extra points there. // Points are only added in the range of the edge, not on the endless vector. - B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd); - B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd); + BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd); + BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd); // look for intersections of rCandidate with the mask Polygon and add extra points there. // The mask polygon is assumed to be closed, even when it's not explicitely. - B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rMask); - B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rMask); + BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rMask); + BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rMask); // look for self-intersections in given polygon and add extra points there. Result will have no // intersections on an edge - B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate); // add points at all self-intersections of single polygons (depends on bSelfIntersections) // and at polygon-polygon intersections - B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, bool bSelfIntersections = true); + BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, bool bSelfIntersections = true); } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx index 1ac4fd9d2af5..d86abb31f525 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx @@ -35,6 +35,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -49,8 +50,8 @@ namespace basegfx // B2DPolygon tools // open/close with point add/remove and control point corrections - void openWithGeometryChange(B2DPolygon& rCandidate); - void closeWithGeometryChange(B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC void openWithGeometryChange(B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC void closeWithGeometryChange(B2DPolygon& rCandidate); /** Check if given polygon is closed. @@ -61,20 +62,20 @@ namespace basegfx start/end points) and sets the Closed()-state of the polygon correctly. */ - void checkClosed(B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC void checkClosed(B2DPolygon& rCandidate); // Get successor and predecessor indices. Returning the same index means there // is none. Same for successor. - sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B2DPolygon& rCandidate); - sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B2DPolygon& rCandidate); // Get orientation of Polygon - B2VectorOrientation getOrientation(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2VectorOrientation getOrientation(const B2DPolygon& rCandidate); // isInside tests for B2dPoint and other B2dPolygon. On border is not inside as long as // not true is given in bWithBorder flag. - bool isInside(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false); - bool isInside(const B2DPolygon& rCandidate, const B2DPolygon& rPolygon, bool bWithBorder = false); + BASEGFX_DLLPUBLIC bool isInside(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false); + BASEGFX_DLLPUBLIC bool isInside(const B2DPolygon& rCandidate, const B2DPolygon& rPolygon, bool bWithBorder = false); /** Get the range of a polygon including bezier control points @@ -86,7 +87,7 @@ namespace basegfx @return The outer range of the bezier curve containing bezier control points */ - B2DRange getRangeWithControlPoints(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DRange getRangeWithControlPoints(const B2DPolygon& rCandidate); /** Get the range of a polygon @@ -99,53 +100,53 @@ namespace basegfx @return The outer range of the bezier curve */ - B2DRange getRange(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DRange getRange(const B2DPolygon& rCandidate); // get signed area of polygon - double getSignedArea(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC double getSignedArea(const B2DPolygon& rCandidate); // get area of polygon - double getArea(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC double getArea(const B2DPolygon& rCandidate); /** get length of polygon edge from point nIndex to nIndex + 1 */ - double getEdgeLength(const B2DPolygon& rCandidate, sal_uInt32 nIndex); + BASEGFX_DLLPUBLIC double getEdgeLength(const B2DPolygon& rCandidate, sal_uInt32 nIndex); /** get length of polygon */ - double getLength(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC double getLength(const B2DPolygon& rCandidate); // get position on polygon for absolute given distance. If // length is given, it is assumed the correct polygon length, if 0.0 it is calculated // using getLength(...) - B2DPoint getPositionAbsolute(const B2DPolygon& rCandidate, double fDistance, double fLength = 0.0); + BASEGFX_DLLPUBLIC B2DPoint getPositionAbsolute(const B2DPolygon& rCandidate, double fDistance, double fLength = 0.0); // get position on polygon for relative given distance in range [0.0 .. 1.0]. If // length is given, it is assumed the correct polygon length, if 0.0 it is calculated // using getLength(...) - B2DPoint getPositionRelative(const B2DPolygon& rCandidate, double fDistance, double fLength = 0.0); + BASEGFX_DLLPUBLIC B2DPoint getPositionRelative(const B2DPolygon& rCandidate, double fDistance, double fLength = 0.0); // get a snippet from given polygon for absolute distances. The polygon is assumed // to be opened (not closed). fFrom and fTo need to be in range [0.0 .. fLength], where // fTo >= fFrom. If length is given, it is assumed the correct polygon length, // if 0.0 it is calculated using getLength(...) - B2DPolygon getSnippetAbsolute(const B2DPolygon& rCandidate, double fFrom, double fTo, double fLength = 0.0); + BASEGFX_DLLPUBLIC B2DPolygon getSnippetAbsolute(const B2DPolygon& rCandidate, double fFrom, double fTo, double fLength = 0.0); // get a snippet from given polygon for relative distances. The polygon is assumed // to be opened (not closed). fFrom and fTo need to be in range [0.0 .. 1.0], where // fTo >= fFrom. If length is given, it is assumed the correct polygon length, // if 0.0 it is calculated using getLength(...) - B2DPolygon getSnippetRelative(const B2DPolygon& rCandidate, double fFrom = 0.0, double fTo = 1.0, double fLength = 0.0); + BASEGFX_DLLPUBLIC B2DPolygon getSnippetRelative(const B2DPolygon& rCandidate, double fFrom = 0.0, double fTo = 1.0, double fLength = 0.0); // Continuity check for point with given index - B2VectorContinuity getContinuityInPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndex); + BASEGFX_DLLPUBLIC B2VectorContinuity getContinuityInPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndex); // Subdivide all contained curves. Use distanceBound value if given. - B2DPolygon adaptiveSubdivideByDistance(const B2DPolygon& rCandidate, double fDistanceBound = 0.0); + BASEGFX_DLLPUBLIC B2DPolygon adaptiveSubdivideByDistance(const B2DPolygon& rCandidate, double fDistanceBound = 0.0); // Subdivide all contained curves. Use angleBound value if given. - B2DPolygon adaptiveSubdivideByAngle(const B2DPolygon& rCandidate, double fAngleBound = 0.0); + BASEGFX_DLLPUBLIC B2DPolygon adaptiveSubdivideByAngle(const B2DPolygon& rCandidate, double fAngleBound = 0.0); // #i37443# Subdivide all contained curves. - B2DPolygon adaptiveSubdivideByCount(const B2DPolygon& rCandidate, sal_uInt32 nCount = 0L); + BASEGFX_DLLPUBLIC B2DPolygon adaptiveSubdivideByCount(const B2DPolygon& rCandidate, sal_uInt32 nCount = 0L); // Definitions for the cut flags used from the findCut methods typedef sal_uInt16 CutFlagValue; @@ -162,7 +163,7 @@ namespace basegfx // Calculate cut between the points given by the two indices. pCut1 // and pCut2 will contain the cut coordinate on each edge in ]0.0, 1.0] // (if given) and the return value will contain a cut description. - CutFlagValue findCut( + BASEGFX_DLLPUBLIC CutFlagValue findCut( const B2DPolygon& rCandidate, sal_uInt32 nIndex1, sal_uInt32 nIndex2, CutFlagValue aCutFlags = CUTFLAG_DEFAULT, @@ -170,7 +171,7 @@ namespace basegfx // This version is working with two indexed edges from different // polygons. - CutFlagValue findCut( + BASEGFX_DLLPUBLIC CutFlagValue findCut( const B2DPolygon& rCandidate1, sal_uInt32 nIndex1, const B2DPolygon& rCandidate2, sal_uInt32 nIndex2, CutFlagValue aCutFlags = CUTFLAG_DEFAULT, @@ -178,7 +179,7 @@ namespace basegfx // This version works with two points and vectors to define the // edges for the cut test. - CutFlagValue findCut( + BASEGFX_DLLPUBLIC CutFlagValue findCut( const B2DPoint& rEdge1Start, const B2DVector& rEdge1Delta, const B2DPoint& rEdge2Start, const B2DVector& rEdge2Delta, CutFlagValue aCutFlags = CUTFLAG_DEFAULT, @@ -187,7 +188,7 @@ namespace basegfx // test if point is on the given edge in range ]0.0..1.0[ without // the start/end points. If so, return true and put the parameter // value in pCut (if provided) - bool isPointOnEdge( + BASEGFX_DLLPUBLIC bool isPointOnEdge( const B2DPoint& rPoint, const B2DPoint& rEdgeStart, const B2DVector& rEdgeDelta, @@ -226,7 +227,7 @@ namespace basegfx The sumed-up length of the rDotDashArray. If zero, it will be calculated internally. */ - void applyLineDashing( + BASEGFX_DLLPUBLIC void applyLineDashing( const B2DPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, @@ -237,13 +238,13 @@ namespace basegfx // by the two given points. Can be used for HitTesting. The epsilon-range // is defined to be the rectangle centered to the given edge, using height // 2 x fDistance, and the circle around both points with radius fDistance. - bool isInEpsilonRange(const B2DPoint& rEdgeStart, const B2DPoint& rEdgeEnd, const B2DPoint& rTestPosition, double fDistance); + BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B2DPoint& rEdgeStart, const B2DPoint& rEdgeEnd, const B2DPoint& rTestPosition, double fDistance); // test if point is inside epsilon-range around the given Polygon. Can be used // for HitTesting. The epsilon-range is defined to be the rectangle centered // to the given edge, using height 2 x fDistance, and the circle around both points // with radius fDistance. - bool isInEpsilonRange(const B2DPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance); + BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B2DPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance); /** Create a polygon from a rectangle. @@ -254,7 +255,7 @@ namespace basegfx Radius of the edge rounding, relative to the rectangle size. 0.0 means no rounding, 1.0 will lead to an ellipse */ - B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double fRadius ); + BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double fRadius ); /** Create a polygon from a rectangle. @@ -266,15 +267,15 @@ namespace basegfx Radius of the edge rounding, relative to the rectangle size. 0.0 means no rounding, 1.0 will lead to an ellipse */ - B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double fRadiusX, double fRadiusY ); + BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double fRadiusX, double fRadiusY ); /** Create a polygon from a rectangle. */ - B2DPolygon createPolygonFromRect( const B2DRectangle& rRect ); + BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromRect( const B2DRectangle& rRect ); /** Create the unit polygon */ - B2DPolygon createUnitPolygon(); + BASEGFX_DLLPUBLIC B2DPolygon createUnitPolygon(); /** Create a circle polygon with given radius. @@ -288,7 +289,7 @@ namespace basegfx @param fRadius Radius of the circle */ - B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double fRadius ); + BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double fRadius ); /** create a polygon which describes the unit circle and close it @@ -300,7 +301,7 @@ namespace basegfx this is the lowest one). This is needed since when lines are dashed, toe old geometry started at bottom point, else it would look different. */ - B2DPolygon createPolygonFromUnitCircle(sal_uInt32 nStartQuadrant = 0); + BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromUnitCircle(sal_uInt32 nStartQuadrant = 0); /** Create an ellipse polygon with given radii. @@ -317,13 +318,13 @@ namespace basegfx @param fRadiusY Radius of the ellipse in Y direction */ - B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double fRadiusX, double fRadiusY ); + BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double fRadiusX, double fRadiusY ); /** Create an unit ellipse polygon with the given angles, from start to end */ - B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter, double fRadiusX, double fRadiusY, double fStart, double fEnd ); + BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter, double fRadiusX, double fRadiusY, double fStart, double fEnd ); - B2DPolygon createPolygonFromUnitEllipseSegment( double fStart, double fEnd ); + BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromUnitEllipseSegment( double fStart, double fEnd ); /** Predicate whether a given polygon is a rectangle. @@ -335,111 +336,111 @@ namespace basegfx enumerations of a rectangle's vertices). Note that intermediate points and duplicate points are ignored. */ - bool isRectangle( const B2DPolygon& rPoly ); + BASEGFX_DLLPUBLIC bool isRectangle( const B2DPolygon& rPoly ); // create 3d polygon from given 2d polygon. The given fZCoordinate is used to expand the // third coordinate. - B3DPolygon createB3DPolygonFromB2DPolygon(const B2DPolygon& rCandidate, double fZCoordinate = 0.0); + BASEGFX_DLLPUBLIC B3DPolygon createB3DPolygonFromB2DPolygon(const B2DPolygon& rCandidate, double fZCoordinate = 0.0); // create 2d PolyPolygon from given 3d PolyPolygon. All coordinates are transformed using the given // matrix and the resulting x,y is used to form the new polygon. - B2DPolygon createB2DPolygonFromB3DPolygon(const B3DPolygon& rCandidate, const B3DHomMatrix& rMat); + BASEGFX_DLLPUBLIC B2DPolygon createB2DPolygonFromB3DPolygon(const B3DPolygon& rCandidate, const B3DHomMatrix& rMat); // create simplified version of the original polygon by // replacing segments with spikes/loops and self intersections // by several trivial sub-segments - B2DPolygon createSimplifiedPolygon(const B2DPolygon&); + BASEGFX_DLLPUBLIC B2DPolygon createSimplifiedPolygon(const B2DPolygon&); // calculate the distance to the given endless ray and return. The relative position on the edge is returned in Cut. // That position may be less than 0.0 or more than 1.0 - double getDistancePointToEndlessRay(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut); + BASEGFX_DLLPUBLIC double getDistancePointToEndlessRay(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut); // calculate the smallest distance to given edge and return. The relative position on the edge is returned in Cut. // That position is in the range [0.0 .. 1.0] and the returned distance is adapted accordingly to the start or end // point of the edge - double getSmallestDistancePointToEdge(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut); + BASEGFX_DLLPUBLIC double getSmallestDistancePointToEdge(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut); // for each contained edge calculate the smallest distance. Return the index to the smallest // edge in rEdgeIndex. The relative position on the edge is returned in rCut. // If nothing was found (e.g. empty input plygon), DBL_MAX is returned. - double getSmallestDistancePointToPolygon(const B2DPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rEdgeIndex, double& rCut); + BASEGFX_DLLPUBLIC double getSmallestDistancePointToPolygon(const B2DPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rEdgeIndex, double& rCut); // distort single point. rOriginal describes the original range, where the given points describe the distorted corresponding points. - B2DPoint distort(const B2DPoint& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight); + BASEGFX_DLLPUBLIC B2DPoint distort(const B2DPoint& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight); // distort polygon. rOriginal describes the original range, where the given points describe the distorted corresponding points. - B2DPolygon distort(const B2DPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight); + BASEGFX_DLLPUBLIC B2DPolygon distort(const B2DPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight); // rotate polygon around given point with given angle. - B2DPolygon rotateAroundPoint(const B2DPolygon& rCandidate, const B2DPoint& rCenter, double fAngle); + BASEGFX_DLLPUBLIC B2DPolygon rotateAroundPoint(const B2DPolygon& rCandidate, const B2DPoint& rCenter, double fAngle); // expand all segments (which are not yet) to curve segments. This is done with setting the control // vectors on the 1/3 resp. 2/3 distances on each segment. - B2DPolygon expandToCurve(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolygon expandToCurve(const B2DPolygon& rCandidate); // expand given segment to curve segment. This is done with setting the control // vectors on the 1/3 resp. 2/3 distances. The return value describes if a change took place. - bool expandToCurveInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex); + BASEGFX_DLLPUBLIC bool expandToCurveInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex); // set continuity for the whole curve. If not a curve, nothing will change. Non-curve points are not changed, too. B2DPolygon setContinuity(const B2DPolygon& rCandidate, B2VectorContinuity eContinuity); // set continuity for given index. If not a curve, nothing will change. Non-curve points are not changed, too. // The return value describes if a change took place. - bool setContinuityInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex, B2VectorContinuity eContinuity); + BASEGFX_DLLPUBLIC bool setContinuityInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex, B2VectorContinuity eContinuity); // test if polygon contains neutral points. A neutral point is one whos orientation is neutral // e.g. positioned on the edge of it's predecessor and successor - bool hasNeutralPoints(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC bool hasNeutralPoints(const B2DPolygon& rCandidate); // remove neutral points. A neutral point is one whos orientation is neutral // e.g. positioned on the edge of it's predecessor and successor - B2DPolygon removeNeutralPoints(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolygon removeNeutralPoints(const B2DPolygon& rCandidate); // tests if polygon is convex - bool isConvex(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC bool isConvex(const B2DPolygon& rCandidate); // calculates the orientation at edge nIndex - B2VectorOrientation getOrientationForIndex(const B2DPolygon& rCandidate, sal_uInt32 nIndex); + BASEGFX_DLLPUBLIC B2VectorOrientation getOrientationForIndex(const B2DPolygon& rCandidate, sal_uInt32 nIndex); // calculates if given point is on given line, taking care of the numerical epsilon - bool isPointOnLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidate, bool bWithPoints = false); + BASEGFX_DLLPUBLIC bool isPointOnLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidate, bool bWithPoints = false); // calculates if given point is on given polygon, taking care of the numerical epsilon. Uses // isPointOnLine internally - bool isPointOnPolygon(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithPoints = true); + BASEGFX_DLLPUBLIC bool isPointOnPolygon(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithPoints = true); // test if candidate is inside triangle - bool isPointInTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC, const B2DPoint& rCandidate, bool bWithBorder = false); + BASEGFX_DLLPUBLIC bool isPointInTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC, const B2DPoint& rCandidate, bool bWithBorder = false); // test if candidateA and candidateB are on the same side of the given line - bool arePointsOnSameSideOfLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidateA, const B2DPoint& rCandidateB, bool bWithLine = false); + BASEGFX_DLLPUBLIC bool arePointsOnSameSideOfLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidateA, const B2DPoint& rCandidateB, bool bWithLine = false); // add triangles for given rCandidate to rTarget. For each triangle, 3 points will be added to rCandidate. // All triangles will go from the start point of rCandidate to two consecutive points, building (rCandidate.count() - 2) // triangles. - void addTriangleFan(const B2DPolygon& rCandidate, B2DPolygon& rTarget); + BASEGFX_DLLPUBLIC void addTriangleFan(const B2DPolygon& rCandidate, B2DPolygon& rTarget); // grow for polygon. Move all geometry in each point in the direction of the normal in that point // with the given amount. Value may be negative. - B2DPolygon growInNormalDirection(const B2DPolygon& rCandidate, double fValue); + BASEGFX_DLLPUBLIC B2DPolygon growInNormalDirection(const B2DPolygon& rCandidate, double fValue); // force all sub-polygons to a point count of nSegments - B2DPolygon reSegmentPolygon(const B2DPolygon& rCandidate, sal_uInt32 nSegments); + BASEGFX_DLLPUBLIC B2DPolygon reSegmentPolygon(const B2DPolygon& rCandidate, sal_uInt32 nSegments); // create polygon state at t from 0.0 to 1.0 between the two polygons. Both polygons must have the same // organisation, e.g. same amount of points - B2DPolygon interpolate(const B2DPolygon& rOld1, const B2DPolygon& rOld2, double t); + BASEGFX_DLLPUBLIC B2DPolygon interpolate(const B2DPolygon& rOld1, const B2DPolygon& rOld2, double t); - bool isPolyPolygonEqualRectangle( const B2DPolyPolygon& rPolyPoly, const B2DRange& rRect ); + BASEGFX_DLLPUBLIC bool isPolyPolygonEqualRectangle( const B2DPolyPolygon& rPolyPoly, const B2DRange& rRect ); // #i76891# Try to remove existing curve segments if they are simply edges - B2DPolygon simplifyCurveSegments(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolygon simplifyCurveSegments(const B2DPolygon& rCandidate); // makes the given indexed point the new polygon start point. To do that, the points in the // polygon will be rotated. This is only valid for closed polygons, for non-closed ones // an assertion will be triggered - B2DPolygon makeStartPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndexOfNewStatPoint); + BASEGFX_DLLPUBLIC B2DPolygon makeStartPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndexOfNewStatPoint); /** create edges of given length along given B2DPolygon @@ -469,7 +470,7 @@ namespace basegfx @return The newly created polygon */ - B2DPolygon createEdgesOfGivenLength(const B2DPolygon& rCandidate, double fLength, double fStart = 0.0, double fEnd = 0.0); + BASEGFX_DLLPUBLIC B2DPolygon createEdgesOfGivenLength(const B2DPolygon& rCandidate, double fLength, double fStart = 0.0, double fEnd = 0.0); /** Create Waveline along given polygon The implementation is based on createEdgesOfGivenLength and creates a curve @@ -486,7 +487,7 @@ namespace basegfx @param fgWaveHeight The height of the waveline (amplitude) */ - B2DPolygon createWaveline(const B2DPolygon& rCandidate, double fWaveWidth, double fWaveHeight); + BASEGFX_DLLPUBLIC B2DPolygon createWaveline(const B2DPolygon& rCandidate, double fWaveWidth, double fWaveHeight); /** split each edge of a polygon in exactly nSubEdges equidistant edges @@ -508,12 +509,12 @@ namespace basegfx into nSubEdges part curved edges of equidistant length. If not, straight edges will just be copied. */ - B2DPolygon reSegmentPolygonEdges(const B2DPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges); + BASEGFX_DLLPUBLIC B2DPolygon reSegmentPolygonEdges(const B2DPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges); ////////////////////////////////////////////////////////////////////// // comparators with tolerance for 2D Polygons - bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, const double& rfSmallValue); - bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB); + BASEGFX_DLLPUBLIC bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, const double& rfSmallValue); + BASEGFX_DLLPUBLIC bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB); /** snap some polygon coordinates to discrete coordinates @@ -527,7 +528,7 @@ namespace basegfx @return The modified version of the source polygon */ - B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon& rCandidate); } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx index 05bd230031a0..2bcf674059d6 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx @@ -31,6 +31,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -39,10 +40,10 @@ namespace basegfx namespace triangulator { // triangulate given polygon - ::basegfx::B2DPolygon triangulate(const ::basegfx::B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon triangulate(const ::basegfx::B2DPolygon& rCandidate); // triangulate given PolyPolygon - ::basegfx::B2DPolygon triangulate(const ::basegfx::B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon triangulate(const ::basegfx::B2DPolyPolygon& rCandidate); } // end of namespace triangulator } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx index 80664d065dc6..931f83bcb158 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx @@ -32,6 +32,7 @@ #include <sal/types.h> #include <o3tl/cow_wrapper.hxx> #include <basegfx/range/b2drange.hxx> +#include <basegfx/basegfxdllapi.h> // predeclarations class ImplB2DPolyPolygon; @@ -46,7 +47,7 @@ namespace basegfx namespace basegfx { - class B2DPolyPolygon + class BASEGFX_DLLPUBLIC B2DPolyPolygon { public: typedef o3tl::cow_wrapper< ImplB2DPolyPolygon > ImplType; diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx index 3f00b3093f06..53fa1ac4c48f 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx @@ -30,6 +30,7 @@ #define _BGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -44,18 +45,18 @@ namespace basegfx // Self crossovers of the contained sub-polygons are implicitely handled, but to not lose // the topological information, it may be necessary to remove self-intersections of the // contained sub-polygons in a preparing step and to explicitely correct their orientations. - B2DPolyPolygon solveCrossovers(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon solveCrossovers(const B2DPolyPolygon& rCandidate); // Version for single polygons. This is for solving self-intersections. Result will be free of // crossovers. When result contains multiple polygons, it may be necessary to rearrange their // orientations since holes may have been created (use correctOrientations eventually). - B2DPolyPolygon solveCrossovers(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon solveCrossovers(const B2DPolygon& rCandidate); // Neutral polygons will be stripped. Neutral polygons are ones who's orientation is // neutral, so normally they have no volume -> just closed paths. A polygon with the same // positive and negative oriented volume is also neutral, so this may not be wanted. It is // safe to call with crossover-free polygons, though (that's where it's mostly used). - B2DPolyPolygon stripNeutralPolygons(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon stripNeutralPolygons(const B2DPolyPolygon& rCandidate); // Remove not necessary polygons. Works only correct with crossover-free polygons. For each // polygon, the depth for the PolyPolygon is calculated. The orientation is used to identify holes. @@ -68,7 +69,7 @@ namespace basegfx // one polygon to another and use this mode -> only parts where two polygons overlapped will be kept. // In combination with correct orientation of the input orientations and the SolveCrossover calls this // can be combined for logical polygon operations or polygon clipping. - B2DPolyPolygon stripDispensablePolygons(const B2DPolyPolygon& rCandidate, bool bKeepAboveZero = false); + BASEGFX_DLLPUBLIC B2DPolyPolygon stripDispensablePolygons(const B2DPolyPolygon& rCandidate, bool bKeepAboveZero = false); // For convenience: The four basic operations OR, XOR, AND and DIFF for // two PolyPolygons. These are combinations of the above methods. To not be forced @@ -87,20 +88,20 @@ namespace basegfx // Preparations: solve self-intersections and intersections, remove neutral // parts and correct orientations. - B2DPolyPolygon prepareForPolygonOperation(const B2DPolygon& rCandidate); - B2DPolyPolygon prepareForPolygonOperation(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon prepareForPolygonOperation(const B2DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon prepareForPolygonOperation(const B2DPolyPolygon& rCandidate); // OR: Return all areas where CandidateA or CandidateB exist - B2DPolyPolygon solvePolygonOperationOr(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); + BASEGFX_DLLPUBLIC B2DPolyPolygon solvePolygonOperationOr(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); // XOR: Return all areas where CandidateA or CandidateB exist, but not both - B2DPolyPolygon solvePolygonOperationXor(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); + BASEGFX_DLLPUBLIC B2DPolyPolygon solvePolygonOperationXor(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); // AND: Return all areas where CandidateA and CandidateB exist - B2DPolyPolygon solvePolygonOperationAnd(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); + BASEGFX_DLLPUBLIC B2DPolyPolygon solvePolygonOperationAnd(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); // DIFF: Return all areas where CandidateA is not covered by CandidateB (cut B out of A) - B2DPolyPolygon solvePolygonOperationDiff(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); + BASEGFX_DLLPUBLIC B2DPolyPolygon solvePolygonOperationDiff(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); /** merge all single PolyPolygons to a single, OR-ed PolyPolygon @@ -109,7 +110,7 @@ namespace basegfx @return A single PolyPolygon containing the Or-merged result */ - B2DPolyPolygon mergeToSinglePolyPolygon(const std::vector< basegfx::B2DPolyPolygon >& rInput); + BASEGFX_DLLPUBLIC B2DPolyPolygon mergeToSinglePolyPolygon(const std::vector< basegfx::B2DPolyPolygon >& rInput); } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx index 1f56a14c1842..36a4793f4c56 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx @@ -35,6 +35,7 @@ #include <basegfx/polygon/b2dpolypolygonfillrule.hxx> #include <vector> #include <utility> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -49,7 +50,7 @@ namespace basegfx @derive Overwrite span() with the render output method of your choice. */ - class B2DPolyPolygonRasterConverter + class BASEGFX_DLLPUBLIC B2DPolyPolygonRasterConverter { public: /** Create raster-converter for given poly-polygon diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx index 8b025bcff99e..03024414cb0c 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx @@ -34,6 +34,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b3dpolypolygon.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> namespace rtl { @@ -55,27 +56,27 @@ namespace basegfx // Check and evtl. correct orientations of all contained Polygons so that // the orientations of contained polygons will variate to express areas and // holes - B2DPolyPolygon correctOrientations(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon correctOrientations(const B2DPolyPolygon& rCandidate); // make sure polygon with index 0L is not a hole. This may evtl. change the // sequence of polygons, but allows to use polygon with index 0L to // get the correct normal for the whole polyPolygon - B2DPolyPolygon correctOutmostPolygon(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon correctOutmostPolygon(const B2DPolyPolygon& rCandidate); // Subdivide all contained curves. Use distanceBound value if given. - B2DPolyPolygon adaptiveSubdivideByDistance(const B2DPolyPolygon& rCandidate, double fDistanceBound = 0.0); + BASEGFX_DLLPUBLIC B2DPolyPolygon adaptiveSubdivideByDistance(const B2DPolyPolygon& rCandidate, double fDistanceBound = 0.0); // Subdivide all contained curves. Use distanceBound value if given. Else, a convenient one // is created. - B2DPolyPolygon adaptiveSubdivideByAngle(const B2DPolyPolygon& rCandidate, double fAngleBound = 0.0); + BASEGFX_DLLPUBLIC B2DPolyPolygon adaptiveSubdivideByAngle(const B2DPolyPolygon& rCandidate, double fAngleBound = 0.0); // Subdivide all contained curves. Use nCount divisions if given. Else, a convenient one // is created. - B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount = 0L); + BASEGFX_DLLPUBLIC B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount = 0L); // isInside test for B2dPoint. On border is not inside as long as not true is given // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct. - bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false); + BASEGFX_DLLPUBLIC bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false); /** get range of PolyPolygon. Control points are included. @@ -88,7 +89,7 @@ namespace basegfx @return The outer range including control points */ - B2DRange getRangeWithControlPoints(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DRange getRangeWithControlPoints(const B2DPolyPolygon& rCandidate); /** Get the range of a polyPolygon @@ -101,13 +102,13 @@ namespace basegfx @return The outer range of the polygon */ - B2DRange getRange(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DRange getRange(const B2DPolyPolygon& rCandidate); /** Apply given LineDashing to given polyPolygon For a description see applyLineDashing in b2dpolygontoos.hxx */ - void applyLineDashing( + BASEGFX_DLLPUBLIC void applyLineDashing( const B2DPolyPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, @@ -117,7 +118,7 @@ namespace basegfx // test if point is inside epsilon-range around the given PolyPolygon. Can be used // for HitTesting. The epsilon-range is defined to be the tube around the PolyPolygon // with distance fDistance and rounded edges (start and end point). - bool isInEpsilonRange(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance); + BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance); /** Read poly-polygon from SVG. @@ -133,7 +134,7 @@ namespace basegfx @return true, if the string was successfully parsed */ - bool importFromSvgD( B2DPolyPolygon& o_rPolyPoly, + BASEGFX_DLLPUBLIC bool importFromSvgD( B2DPolyPolygon& o_rPolyPoly, const ::rtl::OUString& rSvgDAttribute ); /** Read poly-polygon from SVG. @@ -150,53 +151,53 @@ namespace basegfx @return true, if the string was successfully parsed */ - bool importFromSvgPoints( B2DPolygon& o_rPoly, + BASEGFX_DLLPUBLIC bool importFromSvgPoints( B2DPolygon& o_rPoly, const ::rtl::OUString& rSvgPointsAttribute ); // grow for polyPolygon. Move all geometry in each point in the direction of the normal in that point // with the given amount. Value may be negative. - B2DPolyPolygon growInNormalDirection(const B2DPolyPolygon& rCandidate, double fValue); + BASEGFX_DLLPUBLIC B2DPolyPolygon growInNormalDirection(const B2DPolyPolygon& rCandidate, double fValue); // This method will correct a pair of polyPolygons where the goal is to keep same point count // to allow direct point association and also to remove self-intersections produced by shrinks. // This method will eventually change both polyPolygons to reach that goal because there are cases // where it is necessary to add new cut points to the original - void correctGrowShrinkPolygonPair(B2DPolyPolygon& rOriginal, B2DPolyPolygon& rGrown); + BASEGFX_DLLPUBLIC void correctGrowShrinkPolygonPair(B2DPolyPolygon& rOriginal, B2DPolyPolygon& rGrown); // force all sub-polygons to a point count of nSegments - B2DPolyPolygon reSegmentPolyPolygon(const B2DPolyPolygon& rCandidate, sal_uInt32 nSegments); + BASEGFX_DLLPUBLIC B2DPolyPolygon reSegmentPolyPolygon(const B2DPolyPolygon& rCandidate, sal_uInt32 nSegments); // create polygon state at t from 0.0 to 1.0 between the two polygons. Both polygons must have the same // organisation, e.g. same amount of polygons - B2DPolyPolygon interpolate(const B2DPolyPolygon& rOld1, const B2DPolyPolygon& rOld2, double t); + BASEGFX_DLLPUBLIC B2DPolyPolygon interpolate(const B2DPolyPolygon& rOld1, const B2DPolyPolygon& rOld2, double t); // create 3d PolyPolygon from given 2d PolyPolygon. The given fZCoordinate is used to expand the // third coordinate. - B3DPolyPolygon createB3DPolyPolygonFromB2DPolyPolygon(const B2DPolyPolygon& rCandidate, double fZCoordinate = 0.0); + BASEGFX_DLLPUBLIC B3DPolyPolygon createB3DPolyPolygonFromB2DPolyPolygon(const B2DPolyPolygon& rCandidate, double fZCoordinate = 0.0); // create 2d PolyPolygon from given 3d PolyPolygon. All coordinates are transformed using the given // matrix and the resulting x,y is used to form the new polygon. - B2DPolyPolygon createB2DPolyPolygonFromB3DPolyPolygon(const B3DPolyPolygon& rCandidate, const B3DHomMatrix& rMat); + BASEGFX_DLLPUBLIC B2DPolyPolygon createB2DPolyPolygonFromB3DPolyPolygon(const B3DPolyPolygon& rCandidate, const B3DHomMatrix& rMat); // for each contained edge in each contained polygon calculate the smallest distance. Return the index to the smallest // edge in rEdgeIndex and the index to the polygon in rPolygonIndex. The relative position on the edge is returned in rCut. // If nothing was found (e.g. empty input plygon), DBL_MAX is returned. - double getSmallestDistancePointToPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rPolygonIndex, sal_uInt32& rEdgeIndex, double& rCut); + BASEGFX_DLLPUBLIC double getSmallestDistancePointToPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rPolygonIndex, sal_uInt32& rEdgeIndex, double& rCut); // distort PolyPolygon. rOriginal describes the original range, where the given points describe the distorted // corresponding points. - B2DPolyPolygon distort(const B2DPolyPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight); + BASEGFX_DLLPUBLIC B2DPolyPolygon distort(const B2DPolyPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight); // rotate PolyPolygon around given point with given angle. - B2DPolyPolygon rotateAroundPoint(const B2DPolyPolygon& rCandidate, const B2DPoint& rCenter, double fAngle); + BASEGFX_DLLPUBLIC B2DPolyPolygon rotateAroundPoint(const B2DPolyPolygon& rCandidate, const B2DPoint& rCenter, double fAngle); // expand all segments (which are not yet) to curve segments. This is done with setting the control // vectors on the 1/3 resp. 2/3 distances on each segment. - B2DPolyPolygon expandToCurve(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon expandToCurve(const B2DPolyPolygon& rCandidate); // set continuity for the whole curve. If not a curve, nothing will change. Non-curve points are not changed, too. - B2DPolyPolygon setContinuity(const B2DPolyPolygon& rCandidate, B2VectorContinuity eContinuity); + BASEGFX_DLLPUBLIC B2DPolyPolygon setContinuity(const B2DPolyPolygon& rCandidate, B2VectorContinuity eContinuity); /** Predicate whether a given poly-polygon is a rectangle. @@ -209,7 +210,7 @@ namespace basegfx vertices). Note that intermediate points and duplicate points are ignored. */ - bool isRectangle( const B2DPolyPolygon& rPoly ); + BASEGFX_DLLPUBLIC bool isRectangle( const B2DPolyPolygon& rPoly ); /** Export poly-polygon to SVG. @@ -234,12 +235,12 @@ namespace basegfx @return the generated SVG-D statement (the XML d attribute value alone, without any "<path ...>" or "d="...") */ - ::rtl::OUString exportToSvgD( const B2DPolyPolygon& rPolyPoly, + BASEGFX_DLLPUBLIC ::rtl::OUString exportToSvgD( const B2DPolyPolygon& rPolyPoly, bool bUseRelativeCoordinates=true, bool bDetectQuadraticBeziers=true ); // #i76891# Try to remove existing curve segments if they are simply edges - B2DPolyPolygon simplifyCurveSegments(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon simplifyCurveSegments(const B2DPolyPolygon& rCandidate); /** split each edge of a polyPolygon in exactly nSubEdges equidistant edges @@ -253,12 +254,12 @@ namespace basegfx @param bHandleStraightEdges Please take a look at reSegmentPolygonEdges description, these are the same. */ - B2DPolyPolygon reSegmentPolyPolygonEdges(const B2DPolyPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges); + BASEGFX_DLLPUBLIC B2DPolyPolygon reSegmentPolyPolygonEdges(const B2DPolyPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges); ////////////////////////////////////////////////////////////////////// // comparators with tolerance for 2D PolyPolygons - bool equal(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB, const double& rfSmallValue); - bool equal(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); + BASEGFX_DLLPUBLIC bool equal(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB, const double& rfSmallValue); + BASEGFX_DLLPUBLIC bool equal(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB); /** snap some polygon coordinates to discrete coordinates @@ -272,7 +273,7 @@ namespace basegfx @return The modified version of the source polygon */ - B2DPolyPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2DPolyPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolyPolygon& rCandidate); } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx b/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx index 80221caeaac8..ac4c69cc08f5 100644 --- a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx +++ b/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx @@ -32,13 +32,14 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// namespace basegfx { // class to hold a single trapezoid - class B2DTrapezoid + class BASEGFX_DLLPUBLIC B2DTrapezoid { private: // Geometry data. YValues are down-oriented, this means bottom should @@ -94,13 +95,13 @@ namespace basegfx // lines have to be parallel to the X-Axis, thus this subdivision is NOT simply usable // for primitive decompositions. To use it, the shear and rotate parts of the // involved transformations HAVE to be taken into account. - void trapezoidSubdivide( + BASEGFX_DLLPUBLIC void trapezoidSubdivide( B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rSourcePolyPolygon); // directly create trapezoids from given edge. Depending on the given geometry, // none up to three trapezoids will be created - void createLineTrapezoidFromEdge( + BASEGFX_DLLPUBLIC void createLineTrapezoidFromEdge( B2DTrapezoidVector& ro_Result, const B2DPoint& rPointA, const B2DPoint& rPointB, @@ -109,7 +110,7 @@ namespace basegfx // create trapezoids for all edges of the given polygon. The closed state of // the polygon is taken into account. If curves are contaned, the default // AdaptiveSubdivision will be used. - void createLineTrapezoidFromB2DPolygon( + BASEGFX_DLLPUBLIC void createLineTrapezoidFromB2DPolygon( B2DTrapezoidVector& ro_Result, const B2DPolygon& rPolygon, double fLineWidth = 1.0); @@ -117,7 +118,7 @@ namespace basegfx // create trapezoids for all edges of the given polyPolygon. The closed state of // the PolyPolygon is taken into account. If curves are contaned, the default // AdaptiveSubdivision will be used. - void createLineTrapezoidFromB2DPolyPolygon( + BASEGFX_DLLPUBLIC void createLineTrapezoidFromB2DPolyPolygon( B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rPolyPolygon, double fLineWidth = 1.0); diff --git a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx index 5f1613845915..34181dd44364 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <o3tl/cow_wrapper.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -51,7 +52,7 @@ namespace basegfx namespace basegfx { - class B3DPolygon + class BASEGFX_DLLPUBLIC B3DPolygon { public: typedef o3tl::cow_wrapper< ImplB3DPolygon > ImplType; diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx index 3166c39012c1..0c66967fc2e6 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx @@ -31,6 +31,7 @@ #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/polygon/b3dpolygon.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -56,30 +57,30 @@ namespace basegfx // of the plane from the center (0.0). // The value bClipPositive defines on which side the return value will be (true -> on positive side of plane). // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). - B3DPolyPolygon clipPolyPolygonOnOrthogonalPlane(const B3DPolyPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke); + BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnOrthogonalPlane(const B3DPolyPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke); // version for Polygons - B3DPolyPolygon clipPolygonOnOrthogonalPlane(const B3DPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke); + BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnOrthogonalPlane(const B3DPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke); // Clip the given PolyPolygon against the given range. bInside defines if the result will contain the // parts which are contained in the range or vice versa. // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). - B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke); + BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke); // version for Polygons - B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke); + BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke); // versions for B2DRange, clips only against X,Y - B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); - B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); + BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); + BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); // Clip the given PolyPolygon against given plane in 3D. The plane is defined by a plane normal and a point on the plane. // The value bClipPositive defines on which side the return value will be (true -> on positive side of plane). // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). - B3DPolyPolygon clipPolyPolygonOnPlane(const B3DPolyPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke); + BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnPlane(const B3DPolyPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke); // version for Polygons - B3DPolyPolygon clipPolygonOnPlane(const B3DPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke); + BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnPlane(const B3DPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke); } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx index 00caf76823e1..2cd8ec93834f 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx @@ -34,6 +34,7 @@ #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/vector/b2enums.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -54,58 +55,58 @@ namespace basegfx method corrects this (removes double start/end points) and sets the Closed()-state of the polygon correctly. */ - void checkClosed(B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC void checkClosed(B3DPolygon& rCandidate); // Get successor and predecessor indices. Returning the same index means there // is none. Same for successor. - sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B3DPolygon& rCandidate); - sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B3DPolygon& rCandidate); // Get orientation of Polygon - B2VectorOrientation getOrientation(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B2VectorOrientation getOrientation(const B3DPolygon& rCandidate); // get size of polygon. Control vectors are included in that ranges. - B3DRange getRange(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B3DRange getRange(const B3DPolygon& rCandidate); // get normal vector of polygon - B3DVector getNormal(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B3DVector getNormal(const B3DPolygon& rCandidate); // get normal vector of positive oriented polygon - B3DVector getPositiveOrientedNormal(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B3DVector getPositiveOrientedNormal(const B3DPolygon& rCandidate); // get signed area of polygon - double getSignedArea(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC double getSignedArea(const B3DPolygon& rCandidate); // get area of polygon - double getArea(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC double getArea(const B3DPolygon& rCandidate); // get signed area of polygon - double getSignedArea(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC double getSignedArea(const B3DPolygon& rCandidate); // get area of polygon - double getArea(const ::basegfx::B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC double getArea(const ::basegfx::B3DPolygon& rCandidate); // get length of polygon edge from point nIndex to nIndex + 1 - double getEdgeLength(const B3DPolygon& rCandidate, sal_uInt32 nIndex); + BASEGFX_DLLPUBLIC double getEdgeLength(const B3DPolygon& rCandidate, sal_uInt32 nIndex); // get length of polygon - double getLength(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC double getLength(const B3DPolygon& rCandidate); // get position on polygon for absolute given distance. If // length is given, it is assumed the correct polygon length, if 0.0 it is calculated // using getLength(...) - B3DPoint getPositionAbsolute(const B3DPolygon& rCandidate, double fDistance, double fLength = 0.0); + BASEGFX_DLLPUBLIC B3DPoint getPositionAbsolute(const B3DPolygon& rCandidate, double fDistance, double fLength = 0.0); // get position on polygon for relative given distance in range [0.0 .. 1.0]. If // length is given, it is assumed the correct polygon length, if 0.0 it is calculated // using getLength(...) - B3DPoint getPositionRelative(const B3DPolygon& rCandidate, double fDistance, double fLength = 0.0); + BASEGFX_DLLPUBLIC B3DPoint getPositionRelative(const B3DPolygon& rCandidate, double fDistance, double fLength = 0.0); /** Apply given LineDashing to given polygon For a description see applyLineDashing in b2dpolygontoos.hxx */ - void applyLineDashing( + BASEGFX_DLLPUBLIC void applyLineDashing( const B3DPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B3DPolyPolygon* pLineTarget, @@ -116,61 +117,61 @@ namespace basegfx rCandidate: the 3d geometry to change rCenter: the center of the 3d geometry */ - B3DPolygon applyDefaultNormalsSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter); + BASEGFX_DLLPUBLIC B3DPolygon applyDefaultNormalsSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter); /** invert normals for given 3d geometry. */ - B3DPolygon invertNormals( const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B3DPolygon invertNormals( const B3DPolygon& rCandidate); /** Create/replace texture coordinates for given 3d geometry with parallel projected one rRange: the full range of the 3d geometry If bChangeX, x texture coordinate will be recalculated. If bChangeY, y texture coordinate will be recalculated. */ - B3DPolygon applyDefaultTextureCoordinatesParallel( const B3DPolygon& rCandidate, const B3DRange& rRange, bool bChangeX = true, bool bChangeY = true); + BASEGFX_DLLPUBLIC B3DPolygon applyDefaultTextureCoordinatesParallel( const B3DPolygon& rCandidate, const B3DRange& rRange, bool bChangeX = true, bool bChangeY = true); /** Create/replace texture coordinates for given 3d geometry with spherical one rCenter: the centre of the used 3d geometry If bChangeX, x texture coordinate will be recalculated. If bChangeY, y texture coordinate will be recalculated. */ - B3DPolygon applyDefaultTextureCoordinatesSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX = true, bool bChangeY = true); + BASEGFX_DLLPUBLIC B3DPolygon applyDefaultTextureCoordinatesSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX = true, bool bChangeY = true); // test if point is inside epsilon-range around an edge defined // by the two given points. Can be used for HitTesting. The epsilon-range // is defined to be the cylinder centered to the given edge, using radius // fDistance, and the sphere around both points with radius fDistance. - bool isInEpsilonRange(const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, const B3DPoint& rTestPosition, double fDistance); + BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, const B3DPoint& rTestPosition, double fDistance); // test if point is inside epsilon-range around the given Polygon. Can be used // for HitTesting. The epsilon-range is defined to be the cylinder centered to // the given edge, using radius fDistance, and the sphere around both points with radius fDistance. - bool isInEpsilonRange(const B3DPolygon& rCandidate, const B3DPoint& rTestPosition, double fDistance); + BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B3DPolygon& rCandidate, const B3DPoint& rTestPosition, double fDistance); // isInside tests for B3DPoint and other B3DPolygon. On border is not inside as long as // not true is given in bWithBorder flag. - bool isInside(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false); - bool isInside(const B3DPolygon& rCandidate, const B3DPolygon& rPolygon, bool bWithBorder = false); + BASEGFX_DLLPUBLIC bool isInside(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false); + BASEGFX_DLLPUBLIC bool isInside(const B3DPolygon& rCandidate, const B3DPolygon& rPolygon, bool bWithBorder = false); // calculates if given point is on given line, taking care of the numerical epsilon - bool isPointOnLine(const B3DPoint& rStart, const B3DPoint& rEnd, const B3DPoint& rCandidate, bool bWithPoints = false); + BASEGFX_DLLPUBLIC bool isPointOnLine(const B3DPoint& rStart, const B3DPoint& rEnd, const B3DPoint& rCandidate, bool bWithPoints = false); // calculates if given point is on given polygon, taking care of the numerical epsilon. Uses // isPointOnLine internally - bool isPointOnPolygon(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithPoints = true); + BASEGFX_DLLPUBLIC bool isPointOnPolygon(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithPoints = true); // helper to get a fCut position between a plane (given with normal and a point) // and a line given by start and end point - bool getCutBetweenLineAndPlane(const B3DVector& rPlaneNormal, const B3DPoint& rPlanePoint, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut); + BASEGFX_DLLPUBLIC bool getCutBetweenLineAndPlane(const B3DVector& rPlaneNormal, const B3DPoint& rPlanePoint, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut); // helper to get a fCut position between a 3d Polygon // and a line given by start and end point - bool getCutBetweenLineAndPolygon(const B3DPolygon& rCandidate, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut); + BASEGFX_DLLPUBLIC bool getCutBetweenLineAndPolygon(const B3DPolygon& rCandidate, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut); ////////////////////////////////////////////////////////////////////// // comparators with tolerance for 3D Polygons - bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB, const double& rfSmallValue); - bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB); + BASEGFX_DLLPUBLIC bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB, const double& rfSmallValue); + BASEGFX_DLLPUBLIC bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB); /** snap some polygon coordinates to discrete coordinates @@ -184,7 +185,7 @@ namespace basegfx @return The modified version of the source polygon */ - B3DPolygon snapPointsOfHorizontalOrVerticalEdges(const B3DPolygon& rCandidate); + BASEGFX_DLLPUBLIC B3DPolygon snapPointsOfHorizontalOrVerticalEdges(const B3DPolygon& rCandidate); } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx index 472b39bab267..ffcc4f262e81 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <o3tl/cow_wrapper.hxx> +#include <basegfx/basegfxdllapi.h> // predeclarations class ImplB3DPolyPolygon; @@ -46,7 +47,7 @@ namespace basegfx namespace basegfx { - class B3DPolyPolygon + class BASEGFX_DLLPUBLIC B3DPolyPolygon { public: typedef o3tl::cow_wrapper< ImplB3DPolyPolygon > ImplType; diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx index 10083f57dd60..1ff1b4b094c4 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx @@ -34,6 +34,7 @@ #include <vector> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b3dpoint.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -48,13 +49,13 @@ namespace basegfx // B3DPolyPolygon tools // get size of PolyPolygon. Control vectors are included in that ranges. - B3DRange getRange(const B3DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B3DRange getRange(const B3DPolyPolygon& rCandidate); /** Apply given LineDashing to given polyPolygon For a description see applyLineDashing in b2dpolygontoos.hxx */ - void applyLineDashing( + BASEGFX_DLLPUBLIC void applyLineDashing( const B3DPolyPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B3DPolyPolygon* pLineTarget, @@ -63,26 +64,26 @@ namespace basegfx /** Create a unit 3D line polyPolygon which defines a cube. */ - B3DPolyPolygon createUnitCubePolyPolygon(); + BASEGFX_DLLPUBLIC B3DPolyPolygon createUnitCubePolyPolygon(); /** Create a unit 3D fill polyPolygon which defines a cube. */ - B3DPolyPolygon createUnitCubeFillPolyPolygon(); + BASEGFX_DLLPUBLIC B3DPolyPolygon createUnitCubeFillPolyPolygon(); /** Create a 3D line polyPolygon from a B3DRange which defines a cube. */ - B3DPolyPolygon createCubePolyPolygonFromB3DRange( const B3DRange& rRange); + BASEGFX_DLLPUBLIC B3DPolyPolygon createCubePolyPolygonFromB3DRange( const B3DRange& rRange); /** Create a 3D fill polyPolygon from a B3DRange which defines a cube. */ - B3DPolyPolygon createCubeFillPolyPolygonFromB3DRange( const B3DRange& rRange); + BASEGFX_DLLPUBLIC B3DPolyPolygon createCubeFillPolyPolygonFromB3DRange( const B3DRange& rRange); /** Create a unit 3D line polyPolygon which defines a sphere with the given count of hor and ver segments. Result will be centered at (0.0, 0.0, 0.0) and sized [-1.0 .. 1.0] in all dimensions. If nHorSeg == 0 and/or nVerSeg == 0, a default will be calculated to have a step at least each 15 degrees. With VerStart, VerStop and hor range in cartesian may be specified to create a partial sphere only. */ - B3DPolyPolygon createUnitSpherePolyPolygon( + BASEGFX_DLLPUBLIC B3DPolyPolygon createUnitSpherePolyPolygon( sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L, double fVerStart = F_PI2, double fVerStop = -F_PI2, double fHorStart = 0.0, double fHorStop = F_2PI); @@ -91,7 +92,7 @@ namespace basegfx If nHorSeg == 0 and/or nVerSeg == 0, a default will be calculated to have a step at least each 15 degrees. With VerStart, VerStop and hor range in cartesian may be specified to create a partial sphere only. */ - B3DPolyPolygon createSpherePolyPolygonFromB3DRange( + BASEGFX_DLLPUBLIC B3DPolyPolygon createSpherePolyPolygonFromB3DRange( const B3DRange& rRange, sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L, double fVerStart = F_PI2, double fVerStop = -F_PI2, @@ -100,7 +101,7 @@ namespace basegfx /** same as createUnitSpherePolyPolygon, but creates filled polygons (closed and oriented) There is one extra, the bool bNormals defines if normals will be set, default is false */ - B3DPolyPolygon createUnitSphereFillPolyPolygon( + BASEGFX_DLLPUBLIC B3DPolyPolygon createUnitSphereFillPolyPolygon( sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L, bool bNormals = false, double fVerStart = F_PI2, double fVerStop = -F_PI2, @@ -109,7 +110,7 @@ namespace basegfx /** same as createSpherePolyPolygonFromB3DRange, but creates filled polygons (closed and oriented) There is one extra, the bool bNormals defines if normals will be set, default is false */ - B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange( + BASEGFX_DLLPUBLIC B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange( const B3DRange& rRange, sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L, bool bNormals = false, @@ -120,34 +121,34 @@ namespace basegfx rCandidate: the 3d geometry to change rCenter: the center of the 3d geometry */ - B3DPolyPolygon applyDefaultNormalsSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter); + BASEGFX_DLLPUBLIC B3DPolyPolygon applyDefaultNormalsSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter); /** invert normals for given 3d geometry. */ - B3DPolyPolygon invertNormals( const B3DPolyPolygon& rCandidate); + BASEGFX_DLLPUBLIC B3DPolyPolygon invertNormals( const B3DPolyPolygon& rCandidate); /** Create/replace texture coordinates for given 3d geometry with parallel projected one rRange: the full range of the 3d geometry If bChangeX, x texture coordinate will be recalculated. If bChangeY, y texture coordinate will be recalculated. */ - B3DPolyPolygon applyDefaultTextureCoordinatesParallel( const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bChangeX = true, bool bChangeY = true); + BASEGFX_DLLPUBLIC B3DPolyPolygon applyDefaultTextureCoordinatesParallel( const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bChangeX = true, bool bChangeY = true); /** Create/replace texture coordinates for given 3d geometry with spherical one rCenter: the centre of the used 3d geometry If bChangeX, x texture coordinate will be recalculated. If bChangeY, y texture coordinate will be recalculated. */ - B3DPolyPolygon applyDefaultTextureCoordinatesSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX = true, bool bChangeY = true); + BASEGFX_DLLPUBLIC B3DPolyPolygon applyDefaultTextureCoordinatesSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX = true, bool bChangeY = true); // isInside test for B3DPoint. On border is not inside as long as not true is given // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct. - bool isInside(const B3DPolyPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false); + BASEGFX_DLLPUBLIC bool isInside(const B3DPolyPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false); ////////////////////////////////////////////////////////////////////// // comparators with tolerance for 3D PolyPolygons - bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB, const double& rfSmallValue); - bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB); + BASEGFX_DLLPUBLIC bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB, const double& rfSmallValue); + BASEGFX_DLLPUBLIC bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB); } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/basegfx/inc/basegfx/range/b1drange.hxx index feb48d336e9a..83bca953734e 100644 --- a/basegfx/inc/basegfx/range/b1drange.hxx +++ b/basegfx/inc/basegfx/range/b1drange.hxx @@ -30,13 +30,14 @@ #define _BGFX_RANGE_B1DRANGE_HXX #include <basegfx/range/basicrange.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { class B1IRange; - class B1DRange + class BASEGFX_DLLPUBLIC B1DRange { ::basegfx::BasicRange< double, DoubleTraits > maRange; diff --git a/basegfx/inc/basegfx/range/b1ibox.hxx b/basegfx/inc/basegfx/range/b1ibox.hxx index d2ef68b86e7a..f40c7637fa8f 100644 --- a/basegfx/inc/basegfx/range/b1ibox.hxx +++ b/basegfx/inc/basegfx/range/b1ibox.hxx @@ -30,11 +30,12 @@ #define _BGFX_RANGE_B1IBOX_HXX #include <basegfx/range/basicbox.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { - class B1IBox + class BASEGFX_DLLPUBLIC B1IBox { ::basegfx::BasicBox maRange; diff --git a/basegfx/inc/basegfx/range/b1irange.hxx b/basegfx/inc/basegfx/range/b1irange.hxx index a503133f4b0f..90e5ba23d01c 100644 --- a/basegfx/inc/basegfx/range/b1irange.hxx +++ b/basegfx/inc/basegfx/range/b1irange.hxx @@ -30,11 +30,12 @@ #define _BGFX_RANGE_B1IRANGE_HXX #include <basegfx/range/basicrange.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { - class B1IRange + class BASEGFX_DLLPUBLIC B1IRange { ::basegfx::BasicRange< sal_Int32, Int32Traits > maRange; diff --git a/basegfx/inc/basegfx/range/b2dpolyrange.hxx b/basegfx/inc/basegfx/range/b2dpolyrange.hxx index fbc01d9b736e..03fc7902a9c7 100644 --- a/basegfx/inc/basegfx/range/b2dpolyrange.hxx +++ b/basegfx/inc/basegfx/range/b2dpolyrange.hxx @@ -32,6 +32,7 @@ #include <o3tl/cow_wrapper.hxx> #include <boost/tuple/tuple.hpp> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -56,7 +57,7 @@ namespace basegfx contain 'holes' - this is encoded via polygon orientation at the poly-polygon, and via explicit flags for the poly-range. */ - class B2DPolyRange + class BASEGFX_DLLPUBLIC B2DPolyRange { public: typedef boost::tuple<B2DRange,B2VectorOrientation> ElementType ; diff --git a/basegfx/inc/basegfx/range/b2drange.hxx b/basegfx/inc/basegfx/range/b2drange.hxx index 8d78f1141298..0631f5e2cb70 100644 --- a/basegfx/inc/basegfx/range/b2drange.hxx +++ b/basegfx/inc/basegfx/range/b2drange.hxx @@ -34,6 +34,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/range/basicrange.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -83,7 +84,7 @@ namespace basegfx { } - explicit B2DRange(const B2IRange& rRange); + BASEGFX_DLLPUBLIC explicit B2DRange(const B2IRange& rRange); bool isEmpty() const { @@ -252,7 +253,7 @@ namespace basegfx maRangeY.grow(fValue); } - void transform(const B2DHomMatrix& rMatrix); + BASEGFX_DLLPUBLIC void transform(const B2DHomMatrix& rMatrix); private: typedef ::basegfx::BasicRange< ValueType, TraitsType > MyBasicRange; @@ -265,7 +266,7 @@ namespace basegfx @return the nearest integer for this range */ - B2IRange fround(const B2DRange& rRange); + BASEGFX_DLLPUBLIC B2IRange fround(const B2DRange& rRange); /** Compute the set difference of the two given ranges @@ -286,7 +287,7 @@ namespace basegfx @return the input vector */ - ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >& o_rResult, + BASEGFX_DLLPUBLIC ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >& o_rResult, const B2DRange& rFirst, const B2DRange& rSecond ); diff --git a/basegfx/inc/basegfx/range/b2drangeclipper.hxx b/basegfx/inc/basegfx/range/b2drangeclipper.hxx index 9a3dc7c46083..5f96ef307c60 100644 --- a/basegfx/inc/basegfx/range/b2drangeclipper.hxx +++ b/basegfx/inc/basegfx/range/b2drangeclipper.hxx @@ -31,6 +31,7 @@ #include <basegfx/range/b2dpolyrange.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -43,7 +44,7 @@ namespace basegfx poly-polygon with the same topology, and encoding inside/outsidedness via polygon orientation and layering. */ - B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges, + BASEGFX_DLLPUBLIC B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges, const std::vector<B2VectorOrientation>& rOrientations); } } diff --git a/basegfx/inc/basegfx/range/b2ibox.hxx b/basegfx/inc/basegfx/range/b2ibox.hxx index 1e2c790dc51d..0a123018f090 100644 --- a/basegfx/inc/basegfx/range/b2ibox.hxx +++ b/basegfx/inc/basegfx/range/b2ibox.hxx @@ -35,11 +35,12 @@ #include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/range/basicbox.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> namespace basegfx { - class B2IBox + class BASEGFX_DLLPUBLIC B2IBox { public: typedef sal_Int32 ValueType; diff --git a/basegfx/inc/basegfx/range/b2irange.hxx b/basegfx/inc/basegfx/range/b2irange.hxx index 5378e487ba95..b899b0e04f6f 100644 --- a/basegfx/inc/basegfx/range/b2irange.hxx +++ b/basegfx/inc/basegfx/range/b2irange.hxx @@ -35,11 +35,12 @@ #include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/range/basicrange.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> namespace basegfx { - class B2IRange + class BASEGFX_DLLPUBLIC B2IRange { public: typedef sal_Int32 ValueType; @@ -246,7 +247,7 @@ namespace basegfx @return the input vector */ - ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >& o_rResult, + BASEGFX_DLLPUBLIC ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >& o_rResult, const B2IRange& rFirst, const B2IRange& rSecond ); diff --git a/basegfx/inc/basegfx/range/b3drange.hxx b/basegfx/inc/basegfx/range/b3drange.hxx index 8e1cf8aa9f02..ca51b4f04a35 100644 --- a/basegfx/inc/basegfx/range/b3drange.hxx +++ b/basegfx/inc/basegfx/range/b3drange.hxx @@ -33,6 +33,7 @@ #include <basegfx/point/b3dpoint.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -40,7 +41,7 @@ namespace basegfx class B3IRange; class B3DHomMatrix; - class B3DRange + class BASEGFX_DLLPUBLIC B3DRange { typedef ::basegfx::BasicRange< double, DoubleTraits > MyBasicRange; @@ -296,7 +297,7 @@ namespace basegfx @return the nearest integer for this range */ - B3IRange fround(const B3DRange& rRange); + BASEGFX_DLLPUBLIC B3IRange fround(const B3DRange& rRange); } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/range/b3ibox.hxx b/basegfx/inc/basegfx/range/b3ibox.hxx index 7c349becd43c..4ee65cd922f4 100644 --- a/basegfx/inc/basegfx/range/b3ibox.hxx +++ b/basegfx/inc/basegfx/range/b3ibox.hxx @@ -34,10 +34,11 @@ #include <basegfx/tuple/b3ituple.hxx> #include <basegfx/tuple/b3i64tuple.hxx> #include <basegfx/range/basicbox.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { - class B3IBox + class BASEGFX_DLLPUBLIC B3IBox { BasicBox maRangeX; BasicBox maRangeY; diff --git a/basegfx/inc/basegfx/range/b3irange.hxx b/basegfx/inc/basegfx/range/b3irange.hxx index 32d48812d2cd..c3220d03234a 100644 --- a/basegfx/inc/basegfx/range/b3irange.hxx +++ b/basegfx/inc/basegfx/range/b3irange.hxx @@ -34,10 +34,11 @@ #include <basegfx/tuple/b3ituple.hxx> #include <basegfx/tuple/b3i64tuple.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { - class B3IRange + class BASEGFX_DLLPUBLIC B3IRange { typedef ::basegfx::BasicRange< sal_Int32, Int32Traits > MyBasicRange; diff --git a/basegfx/inc/basegfx/range/basicbox.hxx b/basegfx/inc/basegfx/range/basicbox.hxx index 0159acc9e8e0..6c7606748420 100644 --- a/basegfx/inc/basegfx/range/basicbox.hxx +++ b/basegfx/inc/basegfx/range/basicbox.hxx @@ -30,6 +30,7 @@ #define _BGFX_RANGE_BASICBOX_HXX #include <basegfx/range/basicrange.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -41,7 +42,7 @@ namespace basegfx <em>outside</em> of the range, in contrast to BasicRange, which considers them inside. */ - class BasicBox : public BasicRange< sal_Int32, Int32Traits > + class BASEGFX_DLLPUBLIC BasicBox : public BasicRange< sal_Int32, Int32Traits > { typedef BasicRange< sal_Int32, Int32Traits > Base; public: diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx index e5615325cf0d..781bac18fc88 100644 --- a/basegfx/inc/basegfx/raster/bpixelraster.hxx +++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx @@ -33,6 +33,7 @@ #include <sal/types.h> #include <basegfx/pixel/bpixel.hxx> #include <rtl/memory.h> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -41,7 +42,7 @@ namespace basegfx { - class BPixelRaster + class BASEGFX_DLLPUBLIC BPixelRaster { private: // do not allow copy constructor and assignment operator diff --git a/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/basegfx/inc/basegfx/raster/bzpixelraster.hxx index b849f2491289..fa7525e5d7e8 100644 --- a/basegfx/inc/basegfx/raster/bzpixelraster.hxx +++ b/basegfx/inc/basegfx/raster/bzpixelraster.hxx @@ -31,6 +31,7 @@ #include <basegfx/raster/bpixelraster.hxx> #include <rtl/memory.h> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -39,7 +40,7 @@ namespace basegfx { - class BZPixelRaster : public BPixelRaster + class BASEGFX_DLLPUBLIC BZPixelRaster : public BPixelRaster { protected: // additionally, host a ZBuffer diff --git a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx b/basegfx/inc/basegfx/raster/rasterconvert3d.hxx index 0644fd1923d8..32c82f65bcbc 100644 --- a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx +++ b/basegfx/inc/basegfx/raster/rasterconvert3d.hxx @@ -35,6 +35,7 @@ #include <basegfx/vector/b3dvector.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -50,7 +51,7 @@ namespace basegfx namespace basegfx { - class ip_single + class BASEGFX_DLLPUBLIC ip_single { private: double mfVal; @@ -76,7 +77,7 @@ namespace basegfx namespace basegfx { - class ip_double + class BASEGFX_DLLPUBLIC ip_double { private: ip_single maX; @@ -102,7 +103,7 @@ namespace basegfx namespace basegfx { - class ip_triple + class BASEGFX_DLLPUBLIC ip_triple { private: ip_single maX; @@ -138,7 +139,7 @@ namespace basegfx { #define SCANLINE_EMPTY_INDEX (0xffffffff) - class InterpolatorProvider3D + class BASEGFX_DLLPUBLIC InterpolatorProvider3D { private: ::std::vector< ip_triple > maColorInterpolators; @@ -210,7 +211,7 @@ namespace basegfx namespace basegfx { - class RasterConversionLineEntry3D + class BASEGFX_DLLPUBLIC RasterConversionLineEntry3D { private: ip_single maX; @@ -308,7 +309,7 @@ namespace basegfx namespace basegfx { - class RasterConverter3D : public InterpolatorProvider3D + class BASEGFX_DLLPUBLIC RasterConverter3D : public InterpolatorProvider3D { private: // the line entries for an area conversion run diff --git a/basegfx/inc/basegfx/tools/b2dclipstate.hxx b/basegfx/inc/basegfx/tools/b2dclipstate.hxx index a835eec82cbd..67d6705bb914 100644 --- a/basegfx/inc/basegfx/tools/b2dclipstate.hxx +++ b/basegfx/inc/basegfx/tools/b2dclipstate.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <o3tl/cow_wrapper.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -55,7 +56,7 @@ namespace basegfx a clip representation is requested, and using faster code paths for common special cases (like all-rectangle clips) */ - class B2DClipState + class BASEGFX_DLLPUBLIC B2DClipState { public: typedef o3tl::cow_wrapper< ImplB2DClipState > ImplType; diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx index 1dae369e80c8..d16539f651b7 100644 --- a/basegfx/inc/basegfx/tools/canvastools.hxx +++ b/basegfx/inc/basegfx/tools/canvastools.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <basegfx/basegfxdllapi.h> namespace com { namespace sun { namespace star { namespace geometry @@ -80,118 +81,118 @@ namespace basegfx // Polygon conversions // =================================================================== - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, const ::basegfx::B2DPolygon& rPoly ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, const ::basegfx::B2DPolyPolygon& rPolyPoly ); - ::com::sun::star::uno::Sequence< + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > > bezierSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly ); - ::com::sun::star::uno::Sequence< + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > > pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly ); - ::basegfx::B2DPolygon polygonFromPoint2DSequence( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon polygonFromPoint2DSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D >& rPoints ); - ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& rPoints ); - ::basegfx::B2DPolygon polygonFromBezier2DSequence( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon polygonFromBezier2DSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D >& rPoints ); - ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& rPoints ); - ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& rPoly ); // Matrix conversions // =================================================================== - ::com::sun::star::geometry::AffineMatrix2D& + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& affineMatrixFromHomMatrix( ::com::sun::star::geometry::AffineMatrix2D& matrix, const ::basegfx::B2DHomMatrix& transform); - ::com::sun::star::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D( + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D( ::com::sun::star::geometry::AffineMatrix3D& matrix, const ::basegfx::B3DHomMatrix& transform); - ::basegfx::B2DHomMatrix& + BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix& homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::geometry::AffineMatrix2D& matrix ); - ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix ); - ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix ); + BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix ); + BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix ); - ::com::sun::star::geometry::Matrix2D& + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& matrixFromHomMatrix( ::com::sun::star::geometry::Matrix2D& matrix, const ::basegfx::B2DHomMatrix& transform); - ::basegfx::B2DHomMatrix& + BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix& homMatrixFromMatrix( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::geometry::Matrix2D& matrix ); // Geometry conversions // =================================================================== - ::com::sun::star::geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& ); - ::com::sun::star::geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& ); - ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& ); - ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& ); - ::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); - ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); - ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); - ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& ); - ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& ); - ::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& ); - ::com::sun::star::geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& ); - ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); - ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); - ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); - ::com::sun::star::awt::Size awtSizeFromB2ISize( const ::basegfx::B2IVector& ); - ::com::sun::star::awt::Point awtPointFromB2IPoint( const ::basegfx::B2IPoint& ); - ::com::sun::star::awt::Rectangle awtRectangleFromB2IRectangle( const ::basegfx::B2IRange& ); + BASEGFX_DLLPUBLIC ::com::sun::star::awt::Size awtSizeFromB2ISize( const ::basegfx::B2IVector& ); + BASEGFX_DLLPUBLIC ::com::sun::star::awt::Point awtPointFromB2IPoint( const ::basegfx::B2IPoint& ); + BASEGFX_DLLPUBLIC ::com::sun::star::awt::Rectangle awtRectangleFromB2IRectangle( const ::basegfx::B2IRange& ); - ::basegfx::B2IVector b2ISizeFromAwtSize( const ::com::sun::star::awt::Size& ); - ::basegfx::B2IPoint b2IPointFromAwtPoint( const ::com::sun::star::awt::Point& ); - ::basegfx::B2IRange b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromAwtSize( const ::com::sun::star::awt::Size& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IPoint b2IPointFromAwtPoint( const ::com::sun::star::awt::Point& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& ); // Geometry comparisons // =================================================================== - bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB ); - bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB ); - bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB ); - bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB ); - bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB ); + BASEGFX_DLLPUBLIC bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB ); + BASEGFX_DLLPUBLIC bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB ); + BASEGFX_DLLPUBLIC bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB ); + BASEGFX_DLLPUBLIC bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB ); + BASEGFX_DLLPUBLIC bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB ); - bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB ); - bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB ); - bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB ); + BASEGFX_DLLPUBLIC bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB ); + BASEGFX_DLLPUBLIC bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB ); + BASEGFX_DLLPUBLIC bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB ); - bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB ); - bool awtPointAreEqual( const ::com::sun::star::awt::Point& rA, const ::com::sun::star::awt::Point& rB ); - bool awtRectangleAreEqual( const ::com::sun::star::awt::Rectangle& rA, const ::com::sun::star::awt::Rectangle& rB ); + BASEGFX_DLLPUBLIC bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB ); + BASEGFX_DLLPUBLIC bool awtPointAreEqual( const ::com::sun::star::awt::Point& rA, const ::com::sun::star::awt::Point& rB ); + BASEGFX_DLLPUBLIC bool awtRectangleAreEqual( const ::com::sun::star::awt::Rectangle& rA, const ::com::sun::star::awt::Rectangle& rB ); /** Return smalltest integer range, which completely contains given floating point range. @@ -203,7 +204,7 @@ namespace basegfx @return the closest integer range, which completely contains rRange. */ - ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); + BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); /** Return smalltest B2DRange with integer values, which completely contains given floating point range. @@ -214,7 +215,7 @@ namespace basegfx @return the closest B2DRange with integer coordinates, which completely contains rRange. */ - ::basegfx::B2DRange b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); + BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); } } diff --git a/basegfx/inc/basegfx/tools/debugplotter.hxx b/basegfx/inc/basegfx/tools/debugplotter.hxx index 0a0f4d5bafa4..a588d0f5f405 100644 --- a/basegfx/inc/basegfx/tools/debugplotter.hxx +++ b/basegfx/inc/basegfx/tools/debugplotter.hxx @@ -39,6 +39,7 @@ #include <vector> #include <utility> #include <iosfwd> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -55,7 +56,7 @@ namespace basegfx To be able to generate one coherent block of output, this class delays actual writing to its destructor */ - class DebugPlotter : private ::boost::noncopyable + class BASEGFX_DLLPUBLIC DebugPlotter : private ::boost::noncopyable { public: /** Create new debug output object diff --git a/basegfx/inc/basegfx/tools/gradienttools.hxx b/basegfx/inc/basegfx/tools/gradienttools.hxx index dea18fe67565..bebf79e743b5 100644 --- a/basegfx/inc/basegfx/tools/gradienttools.hxx +++ b/basegfx/inc/basegfx/tools/gradienttools.hxx @@ -34,6 +34,7 @@ #include <basegfx/vector/b2dvector.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/basegfxdllapi.h> #include <vector> #include <algorithm> @@ -46,7 +47,7 @@ namespace basegfx 1.2-compatible gradients. Use the createXXXODFGradientInfo() methods below for initializing from ODF attributes. */ - struct ODFGradientInfo + struct BASEGFX_DLLPUBLIC ODFGradientInfo { /** transformation mapping from [0,1]^2 texture coordinate space to [0,1]^2 shape coordinate space @@ -98,7 +99,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo& createLinearODFGradientInfo(ODFGradientInfo& o_rGradientInfo, + BASEGFX_DLLPUBLIC ODFGradientInfo& createLinearODFGradientInfo(ODFGradientInfo& o_rGradientInfo, const B2DRange& rTargetArea, sal_uInt32 nSteps, double fBorder, @@ -157,7 +158,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo& createAxialODFGradientInfo(ODFGradientInfo& o_rGradientInfo, + BASEGFX_DLLPUBLIC ODFGradientInfo& createAxialODFGradientInfo(ODFGradientInfo& o_rGradientInfo, const B2DRange& rTargetArea, sal_uInt32 nSteps, double fBorder, @@ -212,7 +213,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo& createRadialODFGradientInfo(ODFGradientInfo& o_rGradientInfo, + BASEGFX_DLLPUBLIC ODFGradientInfo& createRadialODFGradientInfo(ODFGradientInfo& o_rGradientInfo, const B2DRange& rTargetArea, const B2DVector& rOffset, sal_uInt32 nSteps, @@ -271,7 +272,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo& createEllipticalODFGradientInfo(ODFGradientInfo& o_rGradientInfo, + BASEGFX_DLLPUBLIC ODFGradientInfo& createEllipticalODFGradientInfo(ODFGradientInfo& o_rGradientInfo, const B2DRange& rTargetArea, const B2DVector& rOffset, sal_uInt32 nSteps, @@ -319,7 +320,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo& createSquareODFGradientInfo(ODFGradientInfo& o_rGradientInfo, + BASEGFX_DLLPUBLIC ODFGradientInfo& createSquareODFGradientInfo(ODFGradientInfo& o_rGradientInfo, const B2DRange& rTargetArea, const B2DVector& rOffset, sal_uInt32 nSteps, @@ -380,7 +381,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo& createRectangularODFGradientInfo(ODFGradientInfo& o_rGradientInfo, + BASEGFX_DLLPUBLIC ODFGradientInfo& createRectangularODFGradientInfo(ODFGradientInfo& o_rGradientInfo, const B2DRange& rTargetArea, const B2DVector& rOffset, sal_uInt32 nSteps, diff --git a/basegfx/inc/basegfx/tools/keystoplerp.hxx b/basegfx/inc/basegfx/tools/keystoplerp.hxx index 9e510fac9189..b0791c588151 100644 --- a/basegfx/inc/basegfx/tools/keystoplerp.hxx +++ b/basegfx/inc/basegfx/tools/keystoplerp.hxx @@ -31,6 +31,7 @@ #include <basegfx/numeric/ftools.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> namespace com{ namespace sun{ namespace star{ namespace uno { template<typename T> class Sequence; @@ -51,7 +52,7 @@ namespace basegfx then calculate the relative alpha between the two buckets found. */ - class KeyStopLerp + class BASEGFX_DLLPUBLIC KeyStopLerp { public: typedef std::pair<std::ptrdiff_t,double> ResultType; diff --git a/basegfx/inc/basegfx/tools/tools.hxx b/basegfx/inc/basegfx/tools/tools.hxx index 8b519e0b1371..c6abc5780ad8 100644 --- a/basegfx/inc/basegfx/tools/tools.hxx +++ b/basegfx/inc/basegfx/tools/tools.hxx @@ -30,6 +30,7 @@ #define _BGFX_TOOLS_TOOLS_HXX #include <sal/types.h> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -58,7 +59,7 @@ namespace basegfx @return true, when at least part of the line is visible after the clip, false otherwise */ - bool liangBarskyClip2D( ::basegfx::B2DPoint& io_rStart, + BASEGFX_DLLPUBLIC bool liangBarskyClip2D( ::basegfx::B2DPoint& io_rStart, ::basegfx::B2DPoint& io_rEnd, const ::basegfx::B2DRange& rClipRect ); @@ -120,7 +121,7 @@ namespace basegfx @param rFitTarget The rectangle to fit the parallelogram into. */ - void infiniteLineFromParallelogram( ::basegfx::B2DPoint& io_rLeftTop, + BASEGFX_DLLPUBLIC void infiniteLineFromParallelogram( ::basegfx::B2DPoint& io_rLeftTop, ::basegfx::B2DPoint& io_rLeftBottom, ::basegfx::B2DPoint& io_rRightTop, ::basegfx::B2DPoint& io_rRightBottom, diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx index a5bc22b2d5bb..ca04b7a5f776 100644 --- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx +++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/rendering/XLinePolyPolygon2D.hpp> #include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -47,7 +48,7 @@ namespace unotools ::com::sun::star::rendering::XBezierPolyPolygon2D, ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase; - class UnoPolyPolygon : private cppu::BaseMutex, + class BASEGFX_DLLPUBLIC UnoPolyPolygon : private cppu::BaseMutex, public UnoPolyPolygonBase { public: diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/basegfx/inc/basegfx/tuple/b2dtuple.hxx index 6a4ab1e32f9d..4706cf92158e 100644 --- a/basegfx/inc/basegfx/tuple/b2dtuple.hxx +++ b/basegfx/inc/basegfx/tuple/b2dtuple.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -91,7 +92,7 @@ namespace basegfx @param rTup The 2D Tuple which will be copied. */ - explicit B2DTuple(const B2ITuple& rTup); + BASEGFX_DLLPUBLIC explicit B2DTuple(const B2ITuple& rTup); ~B2DTuple() {} @@ -237,9 +238,9 @@ namespace basegfx return *this; } - void correctValues(const double fCompareValue = 0.0); + BASEGFX_DLLPUBLIC void correctValues(const double fCompareValue = 0.0); - static const B2DTuple& getEmptyTuple(); + BASEGFX_DLLPUBLIC static const B2DTuple& getEmptyTuple(); }; // external operators @@ -354,7 +355,7 @@ namespace basegfx @return the nearest integer for this tuple */ - B2ITuple fround(const B2DTuple& rTup); + BASEGFX_DLLPUBLIC B2ITuple fround(const B2DTuple& rTup); } // end of namespace basegfx #endif /* _BGFX_TUPLE_B2DTUPLE_HXX */ diff --git a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx index a75e13755820..bbea7a532296 100644 --- a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx +++ b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <basegfx/tuple/b2dtuple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -43,7 +44,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on two sal_Int64 values */ - class B2I64Tuple + class BASEGFX_DLLPUBLIC B2I64Tuple { protected: sal_Int64 mnX; diff --git a/basegfx/inc/basegfx/tuple/b2ituple.hxx b/basegfx/inc/basegfx/tuple/b2ituple.hxx index fe15326a8618..f376bb782c59 100644 --- a/basegfx/inc/basegfx/tuple/b2ituple.hxx +++ b/basegfx/inc/basegfx/tuple/b2ituple.hxx @@ -30,7 +30,7 @@ #define _BGFX_TUPLE_B2ITUPLE_HXX #include <sal/types.h> - +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -42,7 +42,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on two sal_Int32 values */ - class B2ITuple + class BASEGFX_DLLPUBLIC B2ITuple { protected: sal_Int32 mnX; @@ -204,21 +204,21 @@ namespace basegfx ////////////////////////////////////////////////////////////////////////// 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 --git a/basegfx/inc/basegfx/tuple/b3dtuple.hxx b/basegfx/inc/basegfx/tuple/b3dtuple.hxx index dd2329f1c4bd..a202b3452365 100644 --- a/basegfx/inc/basegfx/tuple/b3dtuple.hxx +++ b/basegfx/inc/basegfx/tuple/b3dtuple.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -45,7 +46,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on three double values */ - class B3DTuple + class BASEGFX_DLLPUBLIC B3DTuple { protected: double mfX; @@ -428,7 +429,7 @@ namespace basegfx @return the nearest integer for this tuple */ - B3ITuple fround(const B3DTuple& rTup); + BASEGFX_DLLPUBLIC B3ITuple fround(const B3DTuple& rTup); } // end of namespace basegfx #endif /* _BGFX_TUPLE_B3DTUPLE_HXX */ diff --git a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx index b4b3416ce887..598a1d9f3b36 100644 --- a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx +++ b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -43,7 +44,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on three sal_Int64 values */ - class B3I64Tuple + class BASEGFX_DLLPUBLIC B3I64Tuple { protected: sal_Int64 mnX; diff --git a/basegfx/inc/basegfx/tuple/b3ituple.hxx b/basegfx/inc/basegfx/tuple/b3ituple.hxx index 619ce145b6b9..a822702ce87f 100644 --- a/basegfx/inc/basegfx/tuple/b3ituple.hxx +++ b/basegfx/inc/basegfx/tuple/b3ituple.hxx @@ -31,7 +31,7 @@ #include <sal/types.h> #include <basegfx/tuple/b3dtuple.hxx> - +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -43,7 +43,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on three sal_Int32 values */ - class B3ITuple + class BASEGFX_DLLPUBLIC B3ITuple { protected: sal_Int32 mnX; diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/basegfx/inc/basegfx/vector/b2dvector.hxx index b2efaa52f5f2..174dd5aac7e3 100644 --- a/basegfx/inc/basegfx/vector/b2dvector.hxx +++ b/basegfx/inc/basegfx/vector/b2dvector.hxx @@ -32,6 +32,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -46,7 +47,7 @@ namespace basegfx @see B2DTuple */ - class B2DVector : public ::basegfx::B2DTuple + class BASEGFX_DLLPUBLIC B2DVector : public ::basegfx::B2DTuple { public: /** Create a 2D Vector @@ -210,7 +211,7 @@ namespace basegfx @return The mathematical Orientation of the two involved 2D Vectors */ - B2VectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB ); + BASEGFX_DLLPUBLIC B2VectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB ); /** Calculate a perpendicular 2D Vector to the given one @@ -222,7 +223,7 @@ namespace basegfx @return A 2D Vector perpendicular to the one given in parameter rVec */ - B2DVector getPerpendicular( const B2DVector& rNormalizedVec ); + BASEGFX_DLLPUBLIC B2DVector getPerpendicular( const B2DVector& rNormalizedVec ); /** Calculate a perpendicular 2D Vector to the given one, normalize the given one as preparation @@ -233,7 +234,7 @@ namespace basegfx @return A normalized 2D Vector perpendicular to the one given in parameter rVec */ - B2DVector getNormalizedPerpendicular( const B2DVector& rVec ); + BASEGFX_DLLPUBLIC B2DVector getNormalizedPerpendicular( const B2DVector& rVec ); /** Test two vectors which need not to be normalized for parallelism @@ -247,21 +248,21 @@ namespace basegfx bool if the two values are parallel. Also true if one of the vectors is empty. */ - bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB ); + BASEGFX_DLLPUBLIC bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB ); /** Transform vector by given transformation matrix. Since this is a vector, translational components of the matrix are disregarded. */ - B2DVector operator*( const B2DHomMatrix& rMat, const B2DVector& rVec ); + BASEGFX_DLLPUBLIC B2DVector operator*( const B2DHomMatrix& rMat, const B2DVector& rVec ); /** Test continuity between given vectors. The two given vectors are assumed to describe control points on a common point. Calculate if there is a continuity between them. */ - B2VectorContinuity getContinuity( const B2DVector& rBackVector, const B2DVector& rForwardVector ); + BASEGFX_DLLPUBLIC B2VectorContinuity getContinuity( const B2DVector& rBackVector, const B2DVector& rForwardVector ); } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/vector/b2ivector.hxx b/basegfx/inc/basegfx/vector/b2ivector.hxx index 8327f9236d96..1e3be7810e59 100644 --- a/basegfx/inc/basegfx/vector/b2ivector.hxx +++ b/basegfx/inc/basegfx/vector/b2ivector.hxx @@ -31,6 +31,7 @@ #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -45,7 +46,7 @@ namespace basegfx @see B2ITuple */ - class B2IVector : public ::basegfx::B2ITuple + class BASEGFX_DLLPUBLIC B2IVector : public ::basegfx::B2ITuple { public: /** Create a 2D Vector @@ -186,7 +187,7 @@ namespace basegfx @return The mathematical Orientation of the two involved 2D Vectors */ - B2VectorOrientation getOrientation( const B2IVector& rVecA, const B2IVector& rVecB ); + BASEGFX_DLLPUBLIC B2VectorOrientation getOrientation( const B2IVector& rVecA, const B2IVector& rVecB ); /** Calculate a perpendicular 2D Vector to the given one @@ -196,7 +197,7 @@ namespace basegfx @return A 2D Vector perpendicular to the one given in parameter rVec */ - B2IVector getPerpendicular( const B2IVector& rVec ); + BASEGFX_DLLPUBLIC B2IVector getPerpendicular( const B2IVector& rVec ); /** Test two vectors which need not to be normalized for parallelism @@ -210,21 +211,21 @@ namespace basegfx bool if the two values are parallel. Also true if one of the vectors is empty. */ - bool areParallel( const B2IVector& rVecA, const B2IVector& rVecB ); + BASEGFX_DLLPUBLIC bool areParallel( const B2IVector& rVecA, const B2IVector& rVecB ); /** Transform vector by given transformation matrix. Since this is a vector, translational components of the matrix are disregarded. */ - B2IVector operator*( const B2DHomMatrix& rMat, const B2IVector& rVec ); + BASEGFX_DLLPUBLIC B2IVector operator*( const B2DHomMatrix& rMat, const B2IVector& rVec ); /** Test continuity between given vectors. The two given vectors are assumed to describe control points on a common point. Calculate if there is a continuity between them. */ - B2VectorContinuity getContinuity( const B2IVector& rBackVector, const B2IVector& rForwardVector ); + BASEGFX_DLLPUBLIC B2VectorContinuity getContinuity( const B2IVector& rBackVector, const B2IVector& rForwardVector ); } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/vector/b3dvector.hxx b/basegfx/inc/basegfx/vector/b3dvector.hxx index 17c61b0437e2..dd6269186bd5 100644 --- a/basegfx/inc/basegfx/vector/b3dvector.hxx +++ b/basegfx/inc/basegfx/vector/b3dvector.hxx @@ -30,6 +30,7 @@ #define _BGFX_VECTOR_B3DVECTOR_HXX #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -46,7 +47,7 @@ namespace basegfx @see B3DTuple */ - class B3DVector : public ::basegfx::B3DTuple + class BASEGFX_DLLPUBLIC B3DVector : public ::basegfx::B3DTuple { public: /** Create a 3D Vector @@ -306,14 +307,14 @@ namespace basegfx bool if the two values are parallel. Also true if one of the vectors is empty. */ - bool areParallel( const B3DVector& rVecA, const B3DVector& rVecB ); + BASEGFX_DLLPUBLIC bool areParallel( const B3DVector& rVecA, const B3DVector& rVecB ); /** Transform vector by given transformation matrix. Since this is a vector, translational components of the matrix are disregarded. */ - B3DVector operator*( const B3DHomMatrix& rMat, const B3DVector& rVec ); + BASEGFX_DLLPUBLIC B3DVector operator*( const B3DHomMatrix& rMat, const B3DVector& rVec ); /** Calculate the Cross Product of two 3D Vectors diff --git a/basegfx/inc/basegfx/vector/b3ivector.hxx b/basegfx/inc/basegfx/vector/b3ivector.hxx index 5cbd869cad5f..4dea54bc747c 100644 --- a/basegfx/inc/basegfx/vector/b3ivector.hxx +++ b/basegfx/inc/basegfx/vector/b3ivector.hxx @@ -30,6 +30,7 @@ #define _BGFX_VECTOR_B3IVECTOR_HXX #include <basegfx/tuple/b3ituple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -44,7 +45,7 @@ namespace basegfx @see B3ITuple */ - class B3IVector : public ::basegfx::B3ITuple + class BASEGFX_DLLPUBLIC B3IVector : public ::basegfx::B3ITuple { public: /** Create a 3D Vector @@ -234,7 +235,7 @@ namespace basegfx Since this is a vector, translational components of the matrix are disregarded. */ - B3IVector operator*( const B3DHomMatrix& rMat, const B3IVector& rVec ); + BASEGFX_DLLPUBLIC B3IVector operator*( const B3DHomMatrix& rMat, const B3IVector& rVec ); /** Calculate the Cross Product of two 3D Vectors diff --git a/basegfx/prj/build.lst b/basegfx/prj/build.lst index 8d55325d4f93..ab5cf9bda8e4 100644 --- a/basegfx/prj/build.lst +++ b/basegfx/prj/build.lst @@ -1,18 +1,3 @@ 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 --git a/basegfx/prj/d.lst b/basegfx/prj/d.lst index 4c710155cbf0..997a23399ff6 100644 --- a/basegfx/prj/d.lst +++ b/basegfx/prj/d.lst @@ -1,113 +1 @@ -..\%__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\unotools.hxx %_DEST%\inc\basegfx\tools\unotools.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 --git a/basegfx/source/numeric/makefile.mk b/basegfx/prj/makefile.mk index 5115fecc079a..88cd9dfe08b8 100644 --- a/basegfx/source/numeric/makefile.mk +++ b/basegfx/prj/makefile.mk @@ -25,19 +25,16 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=basegfx -TARGET=numeric +PRJ=.. +TARGET=prj -# --- Settings ---------------------------------- +.INCLUDE : settings.mk -.INCLUDE : settings.mk +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/ftools.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/basegfx/source/point/makefile.mk b/basegfx/source/point/makefile.mk deleted file mode 100644 index 09c3457dab1c..000000000000 --- a/basegfx/source/point/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=basegfx -TARGET=point - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/b2dpoint.obj \ - $(SLO)$/b2dhompoint.obj \ - $(SLO)$/b3dpoint.obj \ - $(SLO)$/b2ipoint.obj \ - $(SLO)$/b3ipoint.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/basegfx/source/polygon/makefile.mk b/basegfx/source/polygon/makefile.mk deleted file mode 100644 index f9d27918ffb0..000000000000 --- a/basegfx/source/polygon/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=basegfx -TARGET=polygon - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/b2dpolygon.obj \ - $(SLO)$/b2dpolygontools.obj \ - $(SLO)$/b2dpolypolygon.obj \ - $(SLO)$/b2dpolypolygontools.obj \ - $(SLO)$/b2dsvgpolypolygon.obj \ - $(SLO)$/b2dlinegeometry.obj \ - $(SLO)$/b2dpolypolygoncutter.obj \ - $(SLO)$/b2dpolypolygonrasterconverter.obj \ - $(SLO)$/b2dpolygonclipper.obj \ - $(SLO)$/b2dpolygontriangulator.obj \ - $(SLO)$/b2dpolygoncutandtouch.obj \ - $(SLO)$/b2dtrapezoid.obj \ - $(SLO)$/b3dpolygon.obj \ - $(SLO)$/b3dpolygontools.obj \ - $(SLO)$/b3dpolypolygon.obj \ - $(SLO)$/b3dpolypolygontools.obj \ - $(SLO)$/b3dpolygonclipper.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/basegfx/source/range/makefile.mk b/basegfx/source/range/makefile.mk deleted file mode 100644 index 9cc5893fcc44..000000000000 --- a/basegfx/source/range/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=basegfx -TARGET=range - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/b1drange.obj \ - $(SLO)$/b2drange.obj \ - $(SLO)$/b2xrange.obj \ - $(SLO)$/b2dpolyrange.obj \ - $(SLO)$/b2drangeclipper.obj \ - $(SLO)$/b3drange.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/basegfx/source/raster/makefile.mk b/basegfx/source/raster/makefile.mk deleted file mode 100644 index 5493083d53b1..000000000000 --- a/basegfx/source/raster/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=basegfx -TARGET=raster - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/bpixelraster.obj \ - $(SLO)$/bzpixelraster.obj \ - $(SLO)$/rasterconvert3d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/basegfx/source/tools/makefile.mk b/basegfx/source/tools/makefile.mk deleted file mode 100755 index 6023a327a66f..000000000000 --- a/basegfx/source/tools/makefile.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=basegfx -TARGET=tools - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= $(SLO)$/b2dclipstate.obj \ - $(SLO)$/canvastools.obj \ - $(SLO)$/gradienttools.obj \ - $(SLO)$/debugplotter.obj \ - $(SLO)$/keystoplerp.obj \ - $(SLO)$/liangbarsky.obj \ - $(SLO)$/tools.obj \ - $(SLO)$/unopolypolygon.obj\ - $(SLO)$/unotools.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/basegfx/source/tuple/makefile.mk b/basegfx/source/tuple/makefile.mk deleted file mode 100644 index dfddeff24a5b..000000000000 --- a/basegfx/source/tuple/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=basegfx -TARGET=tuple - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/b2dtuple.obj \ - $(SLO)$/b3dtuple.obj \ - $(SLO)$/b2ituple.obj \ - $(SLO)$/b3ituple.obj \ - $(SLO)$/b2i64tuple.obj \ - $(SLO)$/b3i64tuple.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/basegfx/source/vector/makefile.mk b/basegfx/source/vector/makefile.mk deleted file mode 100644 index 2393e3e35ee2..000000000000 --- a/basegfx/source/vector/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=basegfx -TARGET=vector - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/b2dvector.obj \ - $(SLO)$/b3dvector.obj \ - $(SLO)$/b2ivector.obj \ - $(SLO)$/b3ivector.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx index 20cb6846f548..68a24f87d66a 100644 --- a/basegfx/test/basegfx1d.cxx +++ b/basegfx/test/basegfx1d.cxx @@ -31,6 +31,7 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl +#include <sal/cppunit.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk deleted file mode 100644 index cd29bc742821..000000000000 --- a/basegfx/test/makefile.mk +++ /dev/null @@ -1,85 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=basegfx -TARGET=tests - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -# --- Common ---------------------------------------------------------- - -SHL1OBJS= \ - $(SLO)$/basegfx1d.obj \ - $(SLO)$/basegfx2d.obj \ - $(SLO)$/basegfx3d.obj \ - $(SLO)$/boxclipper.obj \ - $(SLO)$/basegfxtools.obj \ - $(SLO)$/clipstate.obj \ - $(SLO)$/genericclipper.obj \ - $(SLO)$/testtools.obj - -SHL1TARGET= basegfx_tests -SHL1STDLIBS= \ - $(BASEGFXLIB) \ - $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(CPPUNITLIB) - -SHL1IMPLIB= i$(SHL1TARGET) - -DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = export.map -SHL1RPATH = NONE - -# END ------------------------------------------------------------------ - -#------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : _cppunit.mk - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF diff --git a/basegfx/util/basegfx.flt b/basegfx/util/basegfx.flt deleted file mode 100644 index 57bb2e2ff324..000000000000 --- a/basegfx/util/basegfx.flt +++ /dev/null @@ -1,6 +0,0 @@ -__CT -__real -+getImplementation -Impl -IMP -internal
\ No newline at end of file diff --git a/basegfx/util/makefile.mk b/basegfx/util/makefile.mk deleted file mode 100644 index cf82c01aa3d3..000000000000 --- a/basegfx/util/makefile.mk +++ /dev/null @@ -1,86 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=basegfx -TARGET=basegfx - -# --- Settings --------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein --------------------------------------------------- - -LIB1TARGET=$(SLB)$/basegfx.lib -LIB1FILES=\ - $(SLB)$/curve.lib \ - $(SLB)$/matrix.lib \ - $(SLB)$/numeric.lib \ - $(SLB)$/point.lib \ - $(SLB)$/polygon.lib \ - $(SLB)$/range.lib \ - $(SLB)$/tuple.lib \ - $(SLB)$/tools.lib \ - $(SLB)$/vector.lib \ - $(SLB)$/color.lib \ - $(SLB)$/pixel.lib \ - $(SLB)$/raster.lib - -SHL1TARGET= basegfx$(DLLPOSTFIX) -.IF "$(COM)" == "MSC" -SHL1IMPLIB= ibasegfx -.ELSE -SHL1IMPLIB= $(SHL1TARGET) -.ENDIF - -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1LIBS= $(SLB)$/basegfx.lib - -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(LIB1TARGET) - -DEF1DES =BaseGFX -DEFLIB1NAME =basegfx - -LIB2TARGET=$(LB)$/$(TARGET)_s.lib -LIB2ARCHIV=$(LB)$/lib$(TARGET)_s.a -LIB2FILES=$(LIB1FILES) - -# --- Targets ----------------------------------------------------------- - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt : makefile.mk - @$(TYPE) $(TARGET).flt > $@ - diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk new file mode 100644 index 000000000000..9fc2db07a1ae --- /dev/null +++ b/canvas/Library_cairocanvas.mk @@ -0,0 +1,114 @@ +#************************************************************************* +# +# 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_Library_Library,cairocanvas)) + +$(eval $(call gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairocanvas)) + +$(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)),) +$(eval $(call gb_Library_add_defs,cairocanvas,\ + -DVERBOSE \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ + sal \ + cppu \ + basegfx \ + cppuhelper \ + comphelper \ + vcl \ + tk \ + tl \ + i18nisolang1 \ + canvastools \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,cairocanvas,\ + canvas/source/cairo/cairo_cachedbitmap \ + canvas/source/cairo/cairo_cairo \ + canvas/source/cairo/cairo_canvas \ + canvas/source/cairo/cairo_canvasbitmap \ + canvas/source/cairo/cairo_canvascustomsprite \ + canvas/source/cairo/cairo_canvasfont \ + canvas/source/cairo/cairo_canvashelper \ + canvas/source/cairo/cairo_canvashelper_text \ + canvas/source/cairo/cairo_devicehelper \ + canvas/source/cairo/cairo_services \ + canvas/source/cairo/cairo_spritecanvas \ + canvas/source/cairo/cairo_spritecanvashelper \ + canvas/source/cairo/cairo_spritedevicehelper \ + canvas/source/cairo/cairo_spritehelper \ + canvas/source/cairo/cairo_textlayout \ +)) + +$(call gb_Library_use_external,cairocanvas,cairo) + +ifeq ($(OS),WNT) + +$(eval $(call gb_Library_add_exception_objects,cairocanvas,\ + canvas/source/cairo/cairo_win32_cairo \ +)) +$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ + gdi32 \ + user32 \ +)) + +else + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_exception_objects,cairocanvas,\ + canvas/source/cairo/cairo_quartz_cairo \ +)) + +#CFLAGSCXX+=$(OBJCXXFLAGS) + +else + +$(eval $(call gb_Library_add_exception_objects,cairocanvas,\ + canvas/source/cairo/cairo_xlib_cairo \ +)) + +# freetype? fontconfig? -> test on Solaris +$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ + X11 \ + Xrender \ +)) + +endif + +endif + +# vim: set noet sw=4 ts=4: diff --git a/basegfx/source/matrix/makefile.mk b/canvas/Library_canvasfactory.mk index 1f22f928bf8e..ce02c19bee28 100644 --- a/basegfx/source/matrix/makefile.mk +++ b/canvas/Library_canvasfactory.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,21 +25,26 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=basegfx -TARGET=matrix +$(eval $(call gb_Library_Library,canvasfactory)) -# --- Settings ---------------------------------- +$(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory)) -.INCLUDE : settings.mk +$(eval $(call gb_Library_set_include,canvasfactory,\ + $$(INCLUDE) \ + -I$(SRCDIR)/canvas/inc \ + -I$(SRCDIR)/canvas/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) -# --- Files ------------------------------------- +$(eval $(call gb_Library_add_linked_libs,canvasfactory,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) -SLOFILES= \ - $(SLO)$/b2dhommatrix.obj \ - $(SLO)$/b2dhommatrixtools.obj \ - $(SLO)$/b3dhommatrix.obj - -# --- Targets ---------------------------------- +$(eval $(call gb_Library_add_exception_objects,canvasfactory,\ + canvas/source/factory/cf_service \ +)) -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk new file mode 100644 index 000000000000..dc424edde0e0 --- /dev/null +++ b/canvas/Library_canvastools.mk @@ -0,0 +1,107 @@ +#************************************************************************* +# +# 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_Library_Library,canvastools)) + +$(eval $(call gb_Library_add_package_headers,canvastools,canvas_inc)) + +$(eval $(call gb_Library_add_precompiled_header,canvastools,$(SRCDIR)/canvas/inc/pch/precompiled_canvas)) + +$(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_defs,canvastools,\ + -DCANVASTOOLS_DLLIMPLEMENTATION \ +)) + +ifneq ($(strip $(VERBOSE)$(verbose)),) +$(eval $(call gb_Library_add_defs,canvastools,\ + -DVERBOSE \ +)) +endif + +ifneq ($(strip $(PROFILER)$(profiler)),) +$(eval $(call gb_Library_add_defs,canvastools,\ + -DPROFILER \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,canvastools,\ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + tk \ + tl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,canvastools,\ + canvas/source/tools/cachedprimitivebase \ + canvas/source/tools/canvascustomspritehelper \ + canvas/source/tools/canvastools \ + canvas/source/tools/elapsedtime \ + canvas/source/tools/page \ + canvas/source/tools/pagemanager \ + canvas/source/tools/parametricpolypolygon \ + canvas/source/tools/prioritybooster \ + canvas/source/tools/propertysethelper \ + canvas/source/tools/spriteredrawmanager \ + canvas/source/tools/surface \ + canvas/source/tools/surfaceproxy \ + canvas/source/tools/surfaceproxymanager \ + canvas/source/tools/verifyinput \ +)) + +ifeq ($(strip $(ENABLE_AGG)),YES) +$(eval $(call gb_Library_add_exception_objects,canvastools,\ + canvas/source/tools/bitmap \ + canvas/source/tools/image \ +)) +$(eval $(call gb_Library_add_linked_libs,canvastools,\ + agg \ +)) +ifneq ($(strip $(AGG_VERSION)),) +$(eval $(call gb_Library_add_defs,canvastools,\ + -DAGG_VERSION=$(AGG_VERSION) \ +)) +endif +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,canvastools,\ + winmm \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk new file mode 100644 index 000000000000..44139093817f --- /dev/null +++ b/canvas/Library_directx5canvas.mk @@ -0,0 +1,113 @@ +#************************************************************************* +# +# 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_Library_Library,directx5canvas)) + +$(eval $(call gb_Library_set_componentfile,directx5canvas,canvas/source/directx/directx5canvas)) + +$(eval $(call gb_Library_set_include,directx5canvas,\ + $$(INCLUDE) \ + -I$(SRCDIR)/canvas/inc \ + -I$(SRCDIR)/canvas/inc/pch \ + -I$(SRCDIR)/canvas/source/directx \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_defs,directx5canvas,\ + -DDIRECTX_VERSION=0x0500 \ +)) + +ifneq ($(strip $(VERBOSE)$(verbose)),) +$(eval $(call gb_Library_add_defs,directx5canvas,\ + -DVERBOSE \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,directx5canvas,\ + cppu \ + tk \ + sal \ + comphelper \ + cppuhelper \ + stl \ + basegfx \ + canvastools \ + vcl \ + tl \ + utl \ + i18nisolang1 \ + $(gb_STDLIBS) \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,directx5canvas,\ + user32 \ + gdi32 \ + gdiplus \ + ddraw \ +)) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,directx5canvas,\ +what is $(DIRECTXSDK_LIB)/d3dx.lib now? \ +)) +else +$(eval $(call gb_Library_add_linked_libs,directx5canvas,\ + d3dx \ +)) +endif +endif + +$(WORKDIR)/CustomTarget/canvas/source/directx/%.cxx : $(SRCDIR)/canvas/source/directx/%.cxx + mkdir -p $(dir $@) && \ + cp $< $@ + +$(eval $(call gb_Library_add_generated_exception_objects,directx5canvas,\ + CustomTarget/canvas/source/directx/dx_5rm \ + CustomTarget/canvas/source/directx/dx_bitmap \ + CustomTarget/canvas/source/directx/dx_bitmapcanvashelper \ + CustomTarget/canvas/source/directx/dx_canvasbitmap \ + CustomTarget/canvas/source/directx/dx_canvascustomsprite \ + CustomTarget/canvas/source/directx/dx_canvasfont \ + CustomTarget/canvas/source/directx/dx_canvashelper \ + CustomTarget/canvas/source/directx/dx_canvashelper_texturefill \ + CustomTarget/canvas/source/directx/dx_config \ + CustomTarget/canvas/source/directx/dx_devicehelper \ + CustomTarget/canvas/source/directx/dx_gdiplususer \ + CustomTarget/canvas/source/directx/dx_impltools \ + CustomTarget/canvas/source/directx/dx_linepolypolygon \ + CustomTarget/canvas/source/directx/dx_spritecanvas \ + CustomTarget/canvas/source/directx/dx_spritecanvashelper \ + CustomTarget/canvas/source/directx/dx_spritedevicehelper \ + CustomTarget/canvas/source/directx/dx_spritehelper \ + CustomTarget/canvas/source/directx/dx_surfacebitmap \ + CustomTarget/canvas/source/directx/dx_surfacegraphics \ + CustomTarget/canvas/source/directx/dx_textlayout \ + CustomTarget/canvas/source/directx/dx_textlayout_drawhelper \ + CustomTarget/canvas/source/directx/dx_vcltools \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk new file mode 100644 index 000000000000..cb8264d01c8d --- /dev/null +++ b/canvas/Library_directx9canvas.mk @@ -0,0 +1,108 @@ +#************************************************************************* +# +# 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_Library_Library,directx9canvas)) + +$(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/directx9canvas)) + +$(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,\ + -DDIRECTX_VERSION=0x0900 \ +)) + +ifneq ($(strip $(VERBOSE)$(verbose)),) +$(eval $(call gb_Library_add_defs,directx9canvas,\ + -DVERBOSE \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ + cppu \ + tk \ + sal \ + comphelper \ + cppuhelper \ + stl \ + basegfx \ + canvastools \ + vcl \ + tl \ + utl \ + i18nisolang1 \ + $(gb_STDLIBS) \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ + user32 \ + gdi32 \ + gdiplus \ + ddraw \ +)) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ +what is $(DIRECTXSDK_LIB)/d3d9.lib now? \ +)) +else +$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ + d3d9 \ +)) +endif +endif + +$(eval $(call gb_Library_add_exception_objects,directx9canvas,\ + canvas/source/directx/dx_9rm \ + canvas/source/directx/dx_bitmap \ + canvas/source/directx/dx_bitmapcanvashelper \ + canvas/source/directx/dx_canvasbitmap \ + canvas/source/directx/dx_canvascustomsprite \ + canvas/source/directx/dx_canvasfont \ + canvas/source/directx/dx_canvashelper \ + canvas/source/directx/dx_canvashelper_texturefill \ + canvas/source/directx/dx_config \ + canvas/source/directx/dx_devicehelper \ + canvas/source/directx/dx_gdiplususer \ + canvas/source/directx/dx_impltools \ + canvas/source/directx/dx_linepolypolygon \ + canvas/source/directx/dx_spritecanvas \ + canvas/source/directx/dx_spritecanvashelper \ + canvas/source/directx/dx_spritedevicehelper \ + canvas/source/directx/dx_spritehelper \ + canvas/source/directx/dx_surfacebitmap \ + canvas/source/directx/dx_surfacegraphics \ + canvas/source/directx/dx_textlayout \ + canvas/source/directx/dx_textlayout_drawhelper \ + canvas/source/directx/dx_vcltools \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk new file mode 100644 index 000000000000..f5b2bc32e18e --- /dev/null +++ b/canvas/Library_gdipluscanvas.mk @@ -0,0 +1,90 @@ +#************************************************************************* +# +# 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_Library_Library,gdipluscanvas)) + +$(eval $(call gb_Library_set_componentfile,gdipluscanvas,canvas/source/directx/gdipluscanvas)) + +$(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_defs,gdipluscanvas,\ + -DDIRECTX_VERSION=0x0900 \ +)) + +ifneq ($(strip $(VERBOSE)$(verbose)),) +$(eval $(call gb_Library_add_defs,gdipluscanvas,\ + -DVERBOSE \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ + cppu \ + tk \ + sal \ + comphelper \ + cppuhelper \ + stl \ + basegfx \ + canvastools \ + vcl \ + tl \ + utl \ + i18nisolang1 \ + $(gb_STDLIBS) \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ + user32 \ + gdi32 \ + gdiplus \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,gdipluscanvas,\ + canvas/source/directx/dx_bitmap \ + canvas/source/directx/dx_bitmapcanvashelper \ + canvas/source/directx/dx_canvas \ + canvas/source/directx/dx_canvasbitmap \ + canvas/source/directx/dx_canvasfont \ + canvas/source/directx/dx_canvashelper \ + canvas/source/directx/dx_canvashelper_texturefill \ + canvas/source/directx/dx_devicehelper \ + canvas/source/directx/dx_gdiplususer \ + canvas/source/directx/dx_impltools \ + canvas/source/directx/dx_linepolypolygon \ + canvas/source/directx/dx_textlayout \ + canvas/source/directx/dx_textlayout_drawhelper \ + canvas/source/directx/dx_vcltools \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk new file mode 100644 index 000000000000..e17980422bff --- /dev/null +++ b/canvas/Library_nullcanvas.mk @@ -0,0 +1,66 @@ +#************************************************************************* +# +# 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_Library_Library,nullcanvas)) + +$(eval $(call gb_Library_set_include,nullcanvas,\ + $$(INCLUDE) \ + -I$(SRCDIR)/canvas/inc \ + -I$(SRCDIR)/canvas/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +ifneq ($(strip $(VERBOSE)$(verbose)),) +$(eval $(call gb_Library_add_defs,nullcanvas,\ + -DVERBOSE \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,nullcanvas,\ + basegfx \ + canvastools \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,nullcanvas,\ + canvas/source/null/null_canvasbitmap \ + canvas/source/null/null_canvascustomsprite \ + canvas/source/null/null_canvasfont \ + canvas/source/null/null_canvashelper \ + canvas/source/null/null_devicehelper \ + canvas/source/null/null_spritecanvas \ + canvas/source/null/null_spritecanvashelper \ + canvas/source/null/null_spritehelper \ + canvas/source/null/null_textlayout \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk new file mode 100644 index 000000000000..5f1f2d760fb1 --- /dev/null +++ b/canvas/Library_simplecanvas.mk @@ -0,0 +1,59 @@ +#************************************************************************* +# +# 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_Library_Library,simplecanvas)) + +$(eval $(call gb_Library_set_componentfile,simplecanvas,canvas/source/simplecanvas/simplecanvas)) + +$(eval $(call gb_Library_set_include,simplecanvas,\ + $$(INCLUDE) \ + -I$(SRCDIR)/canvas/inc \ + -I$(SRCDIR)/canvas/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +ifneq ($(strip $(VERBOSE)$(verbose)),) +$(eval $(call gb_Library_add_defs,simplecanvas,\ + -DVERBOSE \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,simplecanvas,\ + basegfx \ + canvastools \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,simplecanvas,\ + canvas/source/simplecanvas/simplecanvasimpl \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk new file mode 100644 index 000000000000..9cc7405c3a8a --- /dev/null +++ b/canvas/Library_vclcanvas.mk @@ -0,0 +1,93 @@ +#************************************************************************* +# +# 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_Library_Library,vclcanvas)) + +$(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas)) + +$(eval $(call gb_Library_set_include,vclcanvas,\ + $$(INCLUDE) \ + -I$(SRCDIR)/canvas/inc \ + -I$(SRCDIR)/canvas/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +ifneq ($(strip $(VERBOSE)$(verbose)),) +$(eval $(call gb_Library_add_defs,vclcanvas,\ + -DVERBOSE \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,vclcanvas,\ + basegfx \ + canvastools \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + svt \ + tk \ + tl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,vclcanvas,\ + canvas/source/vcl/backbuffer \ + canvas/source/vcl/bitmapbackbuffer \ + canvas/source/vcl/cachedbitmap \ + canvas/source/vcl/canvas \ + canvas/source/vcl/canvasbitmap \ + canvas/source/vcl/canvasbitmaphelper \ + canvas/source/vcl/canvascustomsprite \ + canvas/source/vcl/canvasfont \ + canvas/source/vcl/canvashelper \ + canvas/source/vcl/devicehelper \ + canvas/source/vcl/impltools \ + canvas/source/vcl/services \ + canvas/source/vcl/spritecanvas \ + canvas/source/vcl/spritecanvashelper \ + canvas/source/vcl/spritedevicehelper \ + canvas/source/vcl/spritehelper \ + canvas/source/vcl/textlayout \ + canvas/source/vcl/windowoutdevholder \ +)) + +# Solaris Sparc with Sun Compiler: noopt +ifneq ($(strip($OS)),SOLARIS) +$(eval $(call gb_Library_add_exception_objects,vclcanvas,\ + canvas/source/vcl/canvashelper_texturefill \ +)) +else +$(eval $(call gb_Library_add_cxxobjects,vclcanvas,\ + canvas/source/vcl/canvashelper_texturefill \ + , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/canvas/Makefile b/canvas/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/canvas/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk new file mode 100644 index 000000000000..41d5c724c354 --- /dev/null +++ b/canvas/Module_canvas.mk @@ -0,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 --git a/canvas/Package_inc.mk b/canvas/Package_inc.mk new file mode 100644 index 000000000000..d21817b9d347 --- /dev/null +++ b/canvas/Package_inc.mk @@ -0,0 +1,63 @@ +#************************************************************************* +# +# 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_Package_Package,canvas_inc,$(SRCDIR)/canvas/inc)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/basemutexhelper.hxx,canvas/base/basemutexhelper.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bitmapcanvasbase.hxx,canvas/base/bitmapcanvasbase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bufferedgraphicdevicebase.hxx,canvas/base/bufferedgraphicdevicebase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/cachedprimitivebase.hxx,canvas/base/cachedprimitivebase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvasbase.hxx,canvas/base/canvasbase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritebase.hxx,canvas/base/canvascustomspritebase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritehelper.hxx,canvas/base/canvascustomspritehelper.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/doublebitmapbase.hxx,canvas/base/doublebitmapbase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/floatbitmapbase.hxx,canvas/base/floatbitmapbase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/graphicdevicebase.hxx,canvas/base/graphicdevicebase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/integerbitmapbase.hxx,canvas/base/integerbitmapbase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/sprite.hxx,canvas/base/sprite.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/spritecanvasbase.hxx,canvas/base/spritecanvasbase.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/spritesurface.hxx,canvas/base/spritesurface.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastools.hxx,canvas/canvastools.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastoolsdllapi.h,canvas/canvastoolsdllapi.h)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/debug.hxx,canvas/debug.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/elapsedtime.hxx,canvas/elapsedtime.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/parametricpolypolygon.hxx,canvas/parametricpolypolygon.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/prioritybooster.hxx,canvas/prioritybooster.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/propertysethelper.hxx,canvas/propertysethelper.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/bitmap.hxx,canvas/rendering/bitmap.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icachedprimitive.hxx,canvas/rendering/icachedprimitive.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icolorbuffer.hxx,canvas/rendering/icolorbuffer.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/irendermodule.hxx,canvas/rendering/irendermodule.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurface.hxx,canvas/rendering/isurface.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurfaceproxy.hxx,canvas/rendering/isurfaceproxy.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurfaceproxymanager.hxx,canvas/rendering/isurfaceproxymanager.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/spriteredrawmanager.hxx,canvas/spriteredrawmanager.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/vclwrapper.hxx,canvas/vclwrapper.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/verbosetrace.hxx,canvas/verbosetrace.hxx)) +$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/verifyinput.hxx,canvas/verifyinput.hxx)) + + +# vim: set noet sw=4 ts=4: diff --git a/canvas/inc/canvas/base/cachedprimitivebase.hxx b/canvas/inc/canvas/base/cachedprimitivebase.hxx index 3d7a22cb4940..21ebf61bb875 100644 --- a/canvas/inc/canvas/base/cachedprimitivebase.hxx +++ b/canvas/inc/canvas/base/cachedprimitivebase.hxx @@ -37,6 +37,7 @@ #include <cppuhelper/compbase2.hxx> #include <comphelper/broadcasthelper.hxx> +#include <canvas/canvastoolsdllapi.h> /* Definition of CachedPrimitiveBase class */ @@ -48,7 +49,7 @@ namespace canvas /** Base class, providing common functionality for implementers of the XCachedPrimitive interface. */ - class CachedPrimitiveBase : public CachedPrimitiveBase_Base, + class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase : public CachedPrimitiveBase_Base, public ::comphelper::OBaseMutex { public: diff --git a/canvas/inc/canvas/base/canvascustomspritehelper.hxx b/canvas/inc/canvas/base/canvascustomspritehelper.hxx index 222be8503ac6..2a571bcf22d6 100644 --- a/canvas/inc/canvas/base/canvascustomspritehelper.hxx +++ b/canvas/inc/canvas/base/canvascustomspritehelper.hxx @@ -36,7 +36,7 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <canvas/base/spritesurface.hxx> - +#include <canvas/canvastoolsdllapi.h> namespace canvas { @@ -45,7 +45,7 @@ namespace canvas /** Base class for an XSprite helper implementation - to be used in concert with CanvasCustomSpriteBase */ - class CanvasCustomSpriteHelper + class CANVASTOOLS_DLLPUBLIC CanvasCustomSpriteHelper { public: CanvasCustomSpriteHelper(); diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index b55bccb8138b..018fdfdc33e0 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx @@ -43,6 +43,7 @@ #include <limits> #include <algorithm> +#include <canvas/canvastoolsdllapi.h> namespace basegfx { @@ -154,56 +155,56 @@ namespace canvas /** Create a RealSize2D with both coordinate values set to +infinity */ - ::com::sun::star::geometry::RealSize2D createInfiniteSize2D(); + CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::RealSize2D createInfiniteSize2D(); // View- and RenderState utilities // =================================================================== - ::com::sun::star::rendering::RenderState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& initRenderState( ::com::sun::star::rendering::RenderState& renderState ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& initViewState( ::com::sun::star::rendering::ViewState& viewState ); - ::basegfx::B2DHomMatrix& + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& getViewStateTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::ViewState& viewState ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& setViewStateTransform( ::com::sun::star::rendering::ViewState& viewState, const ::basegfx::B2DHomMatrix& transform ); - ::basegfx::B2DHomMatrix& + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::RenderState& renderState ); - ::com::sun::star::rendering::RenderState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& appendToViewState( ::com::sun::star::rendering::ViewState& viewState, const ::basegfx::B2DHomMatrix& transform ); - ::com::sun::star::rendering::RenderState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& appendToRenderState( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& prependToViewState( ::com::sun::star::rendering::ViewState& viewState, const ::basegfx::B2DHomMatrix& transform ); - ::com::sun::star::rendering::RenderState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& prependToRenderState( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); - ::basegfx::B2DHomMatrix& + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& mergeViewAndRenderState( ::com::sun::star::rendering::ViewState& resultViewState, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, @@ -214,10 +215,10 @@ namespace canvas // Matrix utilities // =================================================================== - ::com::sun::star::geometry::AffineMatrix2D& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D& matrix ); - ::com::sun::star::geometry::Matrix2D& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D& matrix ); @@ -243,7 +244,7 @@ namespace canvas @return a reference to the resulting rectangle */ - ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange& o_Rect, + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange& o_Rect, const ::basegfx::B2DRange& i_Rect, const ::basegfx::B2DHomMatrix& i_Transformation ); @@ -283,7 +284,7 @@ namespace canvas @see calcTransformedRectBounds() */ - ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix& o_transform, + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix& o_transform, const ::basegfx::B2DRange& i_destRect, const ::basegfx::B2DRange& i_srcRect, const ::basegfx::B2DHomMatrix& i_transformation ); @@ -315,7 +316,7 @@ namespace canvas @see calcRectToRectTransform() @see calcTransformedRectBounds() */ - ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix& o_transform, + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix& o_transform, const ::basegfx::B2DRange& i_srcRect, const ::basegfx::B2DHomMatrix& i_transformation ); @@ -339,7 +340,7 @@ namespace canvas @param rTransformation This transformation is applied to rTransformRect */ - bool isInside( const ::basegfx::B2DRange& rContainedRect, + CANVASTOOLS_DLLPUBLIC bool isInside( const ::basegfx::B2DRange& rContainedRect, const ::basegfx::B2DRange& rTransformRect, const ::basegfx::B2DHomMatrix& rTransformation ); @@ -366,7 +367,7 @@ namespace canvas @return false, if the resulting scroll area is empty */ - bool clipScrollArea( ::basegfx::B2IRange& io_rSourceArea, + CANVASTOOLS_DLLPUBLIC bool clipScrollArea( ::basegfx::B2IRange& io_rSourceArea, ::basegfx::B2IPoint& io_rDestPoint, ::std::vector< ::basegfx::B2IRange >& o_ClippedAreas, const ::basegfx::B2IRange& rBounds ); @@ -394,7 +395,7 @@ namespace canvas @return false, if the resulting blit is empty, i.e. fully clipped away. */ - bool clipBlit( ::basegfx::B2IRange& io_rSourceArea, + CANVASTOOLS_DLLPUBLIC bool clipBlit( ::basegfx::B2IRange& io_rSourceArea, ::basegfx::B2IPoint& io_rDestPoint, const ::basegfx::B2IRange& rSourceBounds, const ::basegfx::B2IRange& rDestBounds ); @@ -414,7 +415,7 @@ namespace canvas @return the integer range, which is covered by the sprite given by rRange. */ - ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange ); + CANVASTOOLS_DLLPUBLIC ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange ); /** Retrieve various internal properties of the actual canvas implementation. @@ -434,7 +435,7 @@ namespace canvas @return A reference to the resulting sequence of parameters */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( + CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& i_rxCanvas, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& o_rxParams ); @@ -443,21 +444,21 @@ namespace canvas Use this method for dead-simple bitmap implementations, that map all their formats to 8888 RGBA color. */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace(); + CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace(); /** Return a memory layout for a default RGBA integer format Use this method for dead-simple bitmap implementations, that map all their formats to 8888 RGBA color. */ - ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( const ::com::sun::star::geometry::IntegerSize2D& rBitmapSize ); /// Convert standard 8888 RGBA color to vcl color - ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor ); + CANVASTOOLS_DLLPUBLIC ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor ); /// Convert standard 8888 RGBA color to vcl color - ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor ); + CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor ); // Modeled closely after boost::numeric_cast, only that we // issue some trace output here and throw a RuntimeException @@ -493,13 +494,13 @@ namespace canvas return static_cast<Target>(arg); } - ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( + CANVASTOOLS_DLLPUBLIC ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( const ::com::sun::star::awt::Rectangle& rRect, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& xWin ); /** Retrieve for small bound marks around each corner of the given rectangle */ - ::basegfx::B2DPolyPolygon getBoundMarksPolyPolygon( const ::basegfx::B2DRange& rRange ); + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DPolyPolygon getBoundMarksPolyPolygon( const ::basegfx::B2DRange& rRange ); /** Calculate number of gradient "strips" to generate (takes into account device resolution) @@ -508,7 +509,7 @@ namespace canvas Maximal integer difference between all color stops, needed for smooth gradient color differences */ - int calcGradientStepCount( ::basegfx::B2DHomMatrix& rTotalTransform, + CANVASTOOLS_DLLPUBLIC int calcGradientStepCount( ::basegfx::B2DHomMatrix& rTotalTransform, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::rendering::Texture& texture, diff --git a/regexp/inc/pch/precompiled_regexp.hxx b/canvas/inc/canvas/canvastoolsdllapi.h index 349242d2b3a3..4cc32ec44210 100644 --- a/regexp/inc/pch/precompiled_regexp.hxx +++ b/canvas/inc/canvas/canvastoolsdllapi.h @@ -25,10 +25,16 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#ifndef INCLUDED_CANVASTOOLSDLLAPI_H +#define INCLUDED_CANVASTOOLSDLLAPI_H -// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:54.405006 +#if defined CANVASTOOLS_DLLIMPLEMENTATION +#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define CANVASTOOLS_DLLPRIVATE SAL_DLLPRIVATE -#ifdef PRECOMPILED_HEADERS #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/inc/canvas/elapsedtime.hxx b/canvas/inc/canvas/elapsedtime.hxx index d48f6127fd52..ccce419d9d4a 100644 --- a/canvas/inc/canvas/elapsedtime.hxx +++ b/canvas/inc/canvas/elapsedtime.hxx @@ -32,6 +32,7 @@ #include <sal/types.h> #include "boost/shared_ptr.hpp" +#include <canvas/canvastoolsdllapi.h> namespace canvas { @@ -43,7 +44,7 @@ namespace canvas -management functions. In its simplest use-case, it measures the time from its creation. */ - class ElapsedTime + class CANVASTOOLS_DLLPUBLIC ElapsedTime { public: /** Create a new ElapsedTime object diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx b/canvas/inc/canvas/parametricpolypolygon.hxx index e8d723dbc0e3..d1f2d8186a3d 100644 --- a/canvas/inc/canvas/parametricpolypolygon.hxx +++ b/canvas/inc/canvas/parametricpolypolygon.hxx @@ -37,6 +37,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <boost/utility.hpp> +#include <canvas/canvastoolsdllapi.h> namespace basegfx { @@ -52,7 +53,7 @@ namespace canvas typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XParametricPolyPolygon2D, ::com::sun::star::lang::XServiceInfo > ParametricPolyPolygon_Base; - class ParametricPolyPolygon : public ::comphelper::OBaseMutex, + class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex, public ParametricPolyPolygon_Base, private ::boost::noncopyable { diff --git a/canvas/inc/canvas/prioritybooster.hxx b/canvas/inc/canvas/prioritybooster.hxx index 7411a950ffd2..dfa2196d9189 100644 --- a/canvas/inc/canvas/prioritybooster.hxx +++ b/canvas/inc/canvas/prioritybooster.hxx @@ -32,6 +32,7 @@ #include <sal/types.h> #include <memory> +#include <canvas/canvastoolsdllapi.h> namespace canvas @@ -52,8 +53,8 @@ namespace canvas Difference in execution priority. Positive values increase prio, negative values decrease prio. */ - explicit PriorityBooster( sal_Int32 nDelta ); - ~PriorityBooster(); + CANVASTOOLS_DLLPUBLIC explicit PriorityBooster( sal_Int32 nDelta ); + CANVASTOOLS_DLLPUBLIC ~PriorityBooster(); private: // also disables copy constructor and assignment operator diff --git a/canvas/inc/canvas/propertysethelper.hxx b/canvas/inc/canvas/propertysethelper.hxx index d11a9ba66588..182a3930f1f2 100644 --- a/canvas/inc/canvas/propertysethelper.hxx +++ b/canvas/inc/canvas/propertysethelper.hxx @@ -37,6 +37,7 @@ #include <vector> #include <memory> +#include <canvas/canvastoolsdllapi.h> namespace canvas { @@ -55,7 +56,7 @@ namespace canvas The core responsibility of this this class is the name/value mapping for property sets. */ - class PropertySetHelper + class CANVASTOOLS_DLLPUBLIC PropertySetHelper { public: typedef boost::function0< ::com::sun::star::uno::Any > GetterType; diff --git a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx index 0d63e804d485..97acee20f307 100644 --- a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx +++ b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx @@ -34,6 +34,7 @@ #include <boost/shared_ptr.hpp> +#include <canvas/canvastoolsdllapi.h> namespace canvas { @@ -74,7 +75,7 @@ namespace canvas /** Create a surface proxy for the given render module. */ - ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule ); + CANVASTOOLS_DLLPUBLIC ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule ); } #endif /* INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX */ diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx b/canvas/inc/canvas/spriteredrawmanager.hxx index 4a66b5c09acd..3bf4ca666cff 100644 --- a/canvas/inc/canvas/spriteredrawmanager.hxx +++ b/canvas/inc/canvas/spriteredrawmanager.hxx @@ -44,6 +44,7 @@ #include <boost/utility.hpp> #include <boost/bind.hpp> +#include <canvas/canvastoolsdllapi.h> /* Definition of SpriteRedrawManager class */ @@ -67,7 +68,7 @@ namespace canvas there) will reside in a common sprite area and handled together in the forEachSpriteArea functor call. */ - class SpriteRedrawManager : private ::boost::noncopyable + class CANVASTOOLS_DLLPUBLIC SpriteRedrawManager : private ::boost::noncopyable { public: /** Data container for the connected components list diff --git a/canvas/inc/canvas/verifyinput.hxx b/canvas/inc/canvas/verifyinput.hxx index 78329644e70d..8c4c11f32494 100644 --- a/canvas/inc/canvas/verifyinput.hxx +++ b/canvas/inc/canvas/verifyinput.hxx @@ -39,6 +39,7 @@ #include <boost/bind.hpp> #include <boost/current_function.hpp> +#include <canvas/canvastoolsdllapi.h> namespace com { namespace sun { namespace star { namespace geometry { @@ -96,7 +97,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -119,7 +120,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::Matrix2D& rMatrix, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::Matrix2D& rMatrix, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -142,7 +143,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -165,7 +166,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -188,7 +189,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D& rSegment, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D& rSegment, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -211,7 +212,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -234,7 +235,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealRectangle2D& rRect, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealRectangle2D& rRect, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -256,7 +257,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::ViewState& viewState, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::ViewState& viewState, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -282,7 +283,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::RenderState& renderState, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::RenderState& renderState, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -305,7 +306,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -327,7 +328,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::Texture& texture, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::Texture& texture, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -349,7 +350,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -371,7 +372,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -393,7 +394,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::FontInfo& fontInfo, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontInfo& fontInfo, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -415,7 +416,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::FontRequest& fontRequest, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontRequest& fontRequest, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -678,7 +679,7 @@ namespace canvas @param size Given rectangle must be within ((0,0), (size.Width, size.Height)) */ - void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect, + CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect, const ::com::sun::star::geometry::IntegerSize2D& size ); /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when @@ -690,7 +691,7 @@ namespace canvas @param size Given position must be within ((0,0), (size.Width, size.Height)) */ - void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos, + CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos, const ::com::sun::star::geometry::IntegerSize2D& size ); /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when @@ -699,7 +700,7 @@ namespace canvas @param size Size to verify */ - void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size, + CANVASTOOLS_DLLPUBLIC void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf ); @@ -710,7 +711,7 @@ namespace canvas @param size Size to verify */ - void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size, + CANVASTOOLS_DLLPUBLIC void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf ); diff --git a/canvas/inc/makefile.mk b/canvas/inc/makefile.mk deleted file mode 100644 index 6a74668fd4cd..000000000000 --- a/canvas/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=.. - -PRJNAME=canvas -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/canvas/prj/build.lst b/canvas/prj/build.lst index dad6e28c0ea5..7d6a51be6a5f 100644 --- a/canvas/prj/build.lst +++ b/canvas/prj/build.lst @@ -1,10 +1,3 @@ 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 --git a/canvas/prj/d.lst b/canvas/prj/d.lst index 933e11490b82..cde5ebec26c2 100644 --- a/canvas/prj/d.lst +++ b/canvas/prj/d.lst @@ -1,34 +1 @@ -..\%__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%\lib\*.a %_DEST%\lib\*.a -..\%__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 --git a/canvas/prj/makefile.mk b/canvas/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/canvas/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx b/canvas/source/cairo/cairo_canvashelper_texturefill.cxx deleted file mode 100644 index 85959d358894..000000000000 --- a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx +++ /dev/null @@ -1,147 +0,0 @@ -/* -*- 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_canvas.hxx" - -#include <canvas/debug.hxx> - -#include <rtl/math.hxx> - -#include <com/sun/star/rendering/TextDirection.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> - -#include <tools/poly.hxx> -#include <vcl/window.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/bmpacc.hxx> -#include <vcl/canvastools.hxx> - -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2drectangle.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/vector/b2dsize.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/polygon/b2dlinegeometry.hxx> -#include <basegfx/tools/canvastools.hxx> -#include <basegfx/numeric/ftools.hxx> - -#include <utility> - -#include <comphelper/sequence.hxx> -#include <canvas/canvastools.hxx> - -#include "cairo_textlayout.hxx" -#include "cairo_parametricpolypolygon.hxx" -#include "cairo_canvashelper.hxx" -#include "cairo_canvasbitmap.hxx" -#include "cairo_impltools.hxx" -#include "cairo_canvasfont.hxx" - -using namespace ::com::sun::star; - -namespace cairocanvas -{ - namespace - { - bool textureFill( OutputDevice& rOutDev, - GraphicObject& rGraphic, - const ::Point& rPosPixel, - const ::Size& rNextTileX, - const ::Size& rNextTileY, - sal_Int32 nTilesX, - sal_Int32 nTilesY, - const ::Size& rTileSize, - const GraphicAttr& rAttr) - { - bool bRet( false ); - Point aCurrPos; - int nX, nY; - - for( nY=0; nY < nTilesY; ++nY ) - { - aCurrPos.X() = rPosPixel.X() + nY*rNextTileY.Width(); - aCurrPos.Y() = rPosPixel.Y() + nY*rNextTileY.Height(); - - for( nX=0; nX < nTilesX; ++nX ) - { - // update return value. This method should return true, if - // at least one of the looped Draws succeeded. - bRet |= rGraphic.Draw( &rOutDev, - aCurrPos, - rTileSize, - &rAttr ); - - aCurrPos.X() += rNextTileX.Width(); - aCurrPos.Y() += rNextTileX.Height(); - } - } - - return bRet; - } - - inline sal_Int32 roundDown( const double& rVal ) - { - return static_cast< sal_Int32 >( floor( rVal ) ); - } - - inline sal_Int32 roundUp( const double& rVal ) - { - return static_cast< sal_Int32 >( ceil( rVal ) ); - } - } - - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas& rCanvas, - const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState, - const uno::Sequence< rendering::Texture >& textures ) - { - ENSURE_ARG_OR_THROW( xPolyPolygon.is(), - "CanvasHelper::fillPolyPolygon(): polygon is NULL"); - ENSURE_ARG_OR_THROW( textures.getLength(), - "CanvasHelper::fillTexturedPolyPolygon: empty texture sequence"); - - cairo_save( mpCairo ); - - useStates( viewState, renderState, true ); - mpTextures = &textures; - drawPolyPolygonPath( xPolyPolygon, Fill ); - mpTextures = NULL; - - cairo_restore( mpCairo ); - - return uno::Reference< rendering::XCachedPrimitive >(NULL); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/exports.dxp b/canvas/source/cairo/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/canvas/source/cairo/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk deleted file mode 100644 index cbcfbe1aa710..000000000000 --- a/canvas/source/cairo/makefile.mk +++ /dev/null @@ -1,149 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=canvas -TARGET=cairocanvas -TARGETTYPE=GUI -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(OS)" == "MACOSX" && "$(GUIBASE)" == "unx" -@all: - @echo "Cannot build cairocanvas with X11..." -.ENDIF - -.IF "$(OS)" == "ANDROID" -@all: - @echo "Cannot build cairocanvas without cairo..." -.ENDIF - -# --- Don't build for Windows unless we're compiling with --disable-directx ----------- -.IF "$(GUI)" == "WNT" && "$(ENABLE_DIRECTX)" != "" -@all: - @echo "Building with the DirectX canvas so not bothering with the cairo one..." -.ENDIF - - -# --- Common ---------------------------------------------------------- - - -.IF "$(SYSTEM_CAIRO)" == "YES" -CFLAGS+=$(CAIRO_CFLAGS) -.ELSE -CFLAGS+=-I$(SOLARINCDIR)/cairo -.ENDIF - -.IF "$(OS)" == "IOS" -CFLAGS+= -x objective-c++ -fobjc-exceptions -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 -.ENDIF - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/cairo_cachedbitmap.obj \ - $(SLO)$/cairo_cairo.obj \ - $(SLO)$/cairo_canvas.obj \ - $(SLO)$/cairo_canvasbitmap.obj \ - $(SLO)$/cairo_canvascustomsprite.obj \ - $(SLO)$/cairo_canvasfont.obj \ - $(SLO)$/cairo_canvashelper.obj \ - $(SLO)$/cairo_canvashelper_text.obj \ - $(SLO)$/cairo_devicehelper.obj \ - $(SLO)$/cairo_services.obj \ - $(SLO)$/cairo_spritecanvas.obj \ - $(SLO)$/cairo_spritecanvashelper.obj \ - $(SLO)$/cairo_spritedevicehelper.obj \ - $(SLO)$/cairo_spritehelper.obj \ - $(SLO)$/cairo_textlayout.obj - -SHL1TARGET=$(TARGET).uno - -SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB) $(I18NISOLANGLIB) - -.IF "$(GUI)"=="UNX" - -.IF "$(SYSTEM_CAIRO)" == "YES" -SHL1STDLIBS+= $(CAIRO_LIBS) -.ELSE -SHL1STDLIBS+= -lcairo -lpixman-1 -.ENDIF - -.IF "$(GUIBASE)"=="aqua" || "$(GUIBASE)"=="cocoatouch" -# native Mac OS X (Quartz) or iOS -SLOFILES+= $(SLO)$/cairo_quartz_cairo.obj -CFLAGSCXX+=$(OBJCXXFLAGS) -.ELSE # "$(GUIBASE)"=="aqua" || "$(GUIBASE)"=="cocoatouch" - -# Xlib -SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj -SHL1STDLIBS+= $(FONTCONFIG_LIBS) -lX11 -lXrender $(FREETYPE_LIBS) -CFLAGS+= $(FREETYPE_CFLAGS) - -.ENDIF # "$(GUIBASE)"=="aqua" || "$(GUIBASE)"=="cocoatouch" - -.ELSE # "$(GUI)"=="UNX" - -.IF "$(GUI)"=="WNT" -SLOFILES+= $(SLO)$/cairo_win32_cairo.obj -.IF "$(COM)"=="GCC" -SHL1STDLIBS+= -lcairo -.ELSE -SHL1STDLIBS+= cairo.lib -.ENDIF -SHL1STDLIBS+= $(GDI32LIB) $(MSIMG32LIB) -.ENDIF - -.ENDIF # "$(GUI)"=="UNX" - -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF -# ========================================================================== - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/cairocanvas.component - -$(MISC)/cairocanvas.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt cairocanvas.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt cairocanvas.component diff --git a/canvas/source/directx/exports.dxp b/canvas/source/directx/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/canvas/source/directx/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/canvas/source/directx/makefile.mk b/canvas/source/directx/makefile.mk deleted file mode 100644 index 9547fef40cc7..000000000000 --- a/canvas/source/directx/makefile.mk +++ /dev/null @@ -1,241 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=canvas -TARGET=directx9canvas -TARGET2=directx5canvas -TARGET3=gdipluscanvas -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# --- Nothing to do if we're compiling with --disable-directx ----------- -.IF "$(ENABLE_DIRECTX)" == "" -@all: - @echo "Building without DirectX support..." -.ENDIF - - -# --- Common ---------------------------------------------------------- - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -.IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!="" -CDEFS+= -DDX_DEBUG_IMAGES -.ENDIF - -# --- This is Windows only! { ---------------------------------------------------------------- - -.IF "$(GUI)" == "WNT" - -SHARED_SLOFILES = \ - $(SLO)$/dx_bitmap.obj \ - $(SLO)$/dx_bitmapcanvashelper.obj \ - $(SLO)$/dx_canvasbitmap.obj \ - $(SLO)$/dx_canvasfont.obj \ - $(SLO)$/dx_canvashelper.obj \ - $(SLO)$/dx_canvashelper_texturefill.obj \ - $(SLO)$/dx_devicehelper.obj \ - $(SLO)$/dx_gdiplususer.obj \ - $(SLO)$/dx_impltools.obj \ - $(SLO)$/dx_linepolypolygon.obj \ - $(SLO)$/dx_textlayout.obj \ - $(SLO)$/dx_textlayout_drawhelper.obj \ - $(SLO)$/dx_vcltools.obj - -DX_SLOFILES = \ - $(SLO)$/dx_5rm.obj \ - $(SLO)$/dx_9rm.obj \ - $(SLO)$/dx_canvascustomsprite.obj \ - $(SLO)$/dx_config.obj \ - $(SLO)$/dx_spritecanvas.obj \ - $(SLO)$/dx_spritecanvashelper.obj \ - $(SLO)$/dx_spritedevicehelper.obj \ - $(SLO)$/dx_spritehelper.obj \ - $(SLO)$/dx_surfacebitmap.obj \ - $(SLO)$/dx_surfacegraphics.obj -DX_SLOFILES += $(SHARED_SLOFILES) - -GDIPLUS_SLOFILES = \ - $(SLO)$/dx_canvas.obj -GDIPLUS_SLOFILES += $(SHARED_SLOFILES) - -STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(VCLLIB) $(TOOLSLIB) $(UNOTOOLSLIB) $(I18NISOLANGLIB) - - -######################################################## -# DX9 -######################################################## - -# Indicates the source obj files for the dx5 lib -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1OBJFILES = $(DX_SLOFILES) - -# Indicates the filename of the shared library. -SHL1TARGET=$(TARGET).uno - -# Links import libraries. -SHL1STDLIBS= $(STDLIBS) - -# Specifies an import library to create. For Win32 only. -SHL1IMPLIB=i$(TARGET) - -# Specifies libraries from the same module to put into the shared library. -SHL1LIBS=$(SLB)$/$(TARGET).lib - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -CDEFS+=-DDIRECTX_VERSION=0x0900 - -SHL1STDLIBS += $(GDI32LIB) -.IF "$(COM)" == "GCC" -SHL1STDLIBS += $(DIRECTXSDK_LIB)/d3d9.lib -.ELSE -SHL1STDLIBS += d3d9.lib -.ENDIF -SHL1STDLIBS += $(GDIPLUSLIB) - -.IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!="" -SHL1STDLIBS += imdebug.lib -.ENDIF - - -######################################################## -# DX5 -######################################################## - -.IF "$(USE_DIRECTX5)" != "" -SECOND_BUILD=DX5 -DX5_SLOFILES=$(DX_SLOFILES) -DX5CDEFS += -DDIRECTX_VERSION=0x0500 - -LIB2TARGET= $(SLB)$/$(TARGET2).lib -LIB2OBJFILES = $(REAL_DX5_SLOFILES) - -# Indicates the filename of the shared library. -SHL2TARGET=$(TARGET2).uno - -# Links import libraries. -SHL2STDLIBS= $(STDLIBS) - -# Specifies an import library to create. For Win32 only. -SHL2IMPLIB=i$(TARGET2).lib - -# Specifies libraries from the same module to put into the shared library. -SHL2LIBS=$(SLB)$/$(TARGET2).lib -SHL2DEF=$(MISC)$/$(SHL2TARGET).def - -DEF2NAME=$(SHL2TARGET) -DEF2EXPORTFILE=exports.dxp - -SHL2STDLIBS += $(GDI32LIB) -SHL2STDLIBS += $(DDRAWLIB) -SHL2STDLIBS += $(GDIPLUSLIB) - -.IF "$(COM)" == "GCC" -SHL2STDLIBS += $(DIRECTXSDK_LIB)/d3dx.lib -.ELSE -SHL2STDLIBS += d3dx.lib -.ENDIF - -.IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!="" -SHL2STDLIBS += imdebug.lib -.ENDIF -.ENDIF # IF "$(USE_DIRECTX5)" != "" - - -######################################################## -# GDI+ -######################################################## - -LIB3TARGET= $(SLB)$/$(TARGET3).lib -LIB3OBJFILES = $(GDIPLUS_SLOFILES) - -# Indicates the filename of the shared library. -SHL3TARGET=$(TARGET3).uno - -# Links import libraries. -SHL3STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(VCLLIB) $(TOOLSLIB) $(UNOTOOLSLIB) $(I18NISOLANGLIB) - -# Specifies an import library to create. For Win32 only. -SHL3IMPLIB=i$(TARGET3).lib - -# Specifies libraries from the same module to put into the shared library. -SHL3LIBS=$(SLB)$/$(TARGET3).lib -SHL3DEF=$(MISC)$/$(SHL3TARGET).def - -DEF3NAME=$(SHL3TARGET) -DEF3EXPORTFILE=exports.dxp - -SHL3STDLIBS += $(GDI32LIB) -SHL3STDLIBS += $(GDIPLUSLIB) - -.IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!="" -SHL3STDLIBS += imdebug.lib -.ENDIF - -.ENDIF # IF "$(GUI)" == "WNT" - -# --- This is Windows only! } ---------------------------------------------------------------- - -# ========================================================================== - -.INCLUDE : target.mk - -ALLTAR : \ - $(MISC)/directx5canvas.component \ - $(MISC)/directx9canvas.component \ - $(MISC)/gdipluscanvas.component - -$(MISC)/directx5canvas.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt directx5canvas.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt directx5canvas.component - -$(MISC)/directx9canvas.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt directx9canvas.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt directx9canvas.component - -$(MISC)/gdipluscanvas.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt gdipluscanvas.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt gdipluscanvas.component diff --git a/canvas/source/null/exports.dxp b/canvas/source/null/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/canvas/source/null/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/canvas/source/null/makefile.mk b/canvas/source/null/makefile.mk deleted file mode 100644 index 07971ef8153e..000000000000 --- a/canvas/source/null/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=canvas -TARGET=nullcanvas -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# --- Common ---------------------------------------------------------- - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/null_canvasbitmap.obj \ - $(SLO)$/null_canvascustomsprite.obj \ - $(SLO)$/null_canvasfont.obj \ - $(SLO)$/null_canvashelper.obj \ - $(SLO)$/null_devicehelper.obj \ - $(SLO)$/null_spritecanvas.obj \ - $(SLO)$/null_spritecanvashelper.obj \ - $(SLO)$/null_spritehelper.obj \ - $(SLO)$/null_textlayout.obj - -SHL1TARGET=$(TARGET).uno - -SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(VCLLIB) - -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp -.ENDIF -# ========================================================================== - -.INCLUDE : target.mk diff --git a/canvas/source/simplecanvas/exports.dxp b/canvas/source/simplecanvas/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/canvas/source/simplecanvas/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/canvas/source/simplecanvas/makefile.mk b/canvas/source/simplecanvas/makefile.mk deleted file mode 100644 index 8c3a9deede72..000000000000 --- a/canvas/source/simplecanvas/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=canvas -TARGET=simplecanvas -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# --- Common ---------------------------------------------------------- - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/simplecanvasimpl.obj - -SHL1TARGET=$(TARGET).uno - -SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) - -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/simplecanvas.component - -$(MISC)/simplecanvas.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt simplecanvas.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt simplecanvas.component diff --git a/canvas/source/tools/makefile.mk b/canvas/source/tools/makefile.mk deleted file mode 100644 index 3169eadb6d95..000000000000 --- a/canvas/source/tools/makefile.mk +++ /dev/null @@ -1,92 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=canvas -TARGET=canvastools -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Common ---------------------------------------------------------- - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF -.IF "$(profiler)"!="" || "$(PROFILER)"!="" -CDEFS+= -DPROFILER -.ENDIF - -.IF "$(L10N_framework)"=="" -SLOFILES = \ - $(SLO)$/cachedprimitivebase.obj \ - $(SLO)$/canvascustomspritehelper.obj \ - $(SLO)$/canvastools.obj \ - $(SLO)$/elapsedtime.obj \ - $(SLO)$/parametricpolypolygon.obj \ - $(SLO)$/prioritybooster.obj \ - $(SLO)$/propertysethelper.obj \ - $(SLO)$/spriteredrawmanager.obj \ - $(SLO)$/surface.obj \ - $(SLO)$/surfaceproxy.obj \ - $(SLO)$/surfaceproxymanager.obj \ - $(SLO)$/pagemanager.obj \ - $(SLO)$/page.obj \ - $(SLO)$/verifyinput.obj - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -.IF "$(COM)" == "MSC" -SHL1IMPLIB= i$(TARGET) -.ELSE -SHL1IMPLIB= $(TARGET)$(DLLPOSTFIX) -.ENDIF -SHL1STDLIBS= $(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB) - -SHL1LIBS= $(SLB)$/$(TARGET).lib - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(LIB1TARGET) - -DEF1DES =Canvastools -DEFLIB1NAME =$(TARGET) - -.IF "$(GUI)" == "WNT" -SHL1STDLIBS += $(WINMMLIB) $(KERNEL32LIB) -.ENDIF -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt : makefile.mk $(TARGET).flt - @$(TYPE) $(TARGET).flt > $@ diff --git a/canvas/source/vcl/exports.dxp b/canvas/source/vcl/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/canvas/source/vcl/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/canvas/source/vcl/makefile.mk b/canvas/source/vcl/makefile.mk deleted file mode 100644 index 7d5f9658c829..000000000000 --- a/canvas/source/vcl/makefile.mk +++ /dev/null @@ -1,93 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=canvas -TARGET=vclcanvas -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# --- Common ---------------------------------------------------------- - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -# Disable optimization for SunCC SPARC -.IF "$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC" -NOOPTFILES = $(SLO)$/canvashelper_texturefill.obj -.ENDIF - -SLOFILES = $(SLO)$/backbuffer.obj \ - $(SLO)$/bitmapbackbuffer.obj \ - $(SLO)$/cachedbitmap.obj \ - $(SLO)$/canvas.obj \ - $(SLO)$/canvasbitmap.obj \ - $(SLO)$/canvasbitmaphelper.obj \ - $(SLO)$/canvascustomsprite.obj \ - $(SLO)$/canvasfont.obj \ - $(SLO)$/canvashelper.obj \ - $(SLO)$/canvashelper_texturefill.obj \ - $(SLO)$/devicehelper.obj \ - $(SLO)$/impltools.obj \ - $(SLO)$/services.obj \ - $(SLO)$/spritecanvas.obj \ - $(SLO)$/spritecanvashelper.obj \ - $(SLO)$/spritedevicehelper.obj \ - $(SLO)$/spritehelper.obj \ - $(SLO)$/textlayout.obj \ - $(SLO)$/windowoutdevholder.obj - -SHL1TARGET=$(TARGET).uno - -SHL1STDLIBS= $(TOOLSLIB) $(TKLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(SVTOOLLIB) $(I18NISOLANGLIB) - -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -# ========================================================================== - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/vclcanvas.component - -$(MISC)/vclcanvas.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - vclcanvas.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt vclcanvas.component diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk index 5da6f2cd2061..652b03ca74af 100644 --- a/comphelper/JunitTest_comphelper_complex.mk +++ b/comphelper/JunitTest_comphelper_complex.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,comphelper_complex)) +$(eval $(call gb_JunitTest_JunitTest,comphelper_complex,SRCDIR)) $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\ comphelper/qa/complex/comphelper/Map \ diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 64c58cc65623..acacafccdf9b 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,comphelper,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_defs,comphelper,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,comphelper,\ -DCOMPHELPER_DLLIMPLEMENTATION \ )) diff --git a/comphelper/qa/string/makefile.mk b/comphelper/qa/string/makefile.mk deleted file mode 100644 index fb7ce8ae23ab..000000000000 --- a/comphelper/qa/string/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ := ..$/.. -PRJNAME := comphelper -TARGET := qa_string - -ENABLE_EXCEPTIONS := TRUE - -.INCLUDE: settings.mk -.INCLUDE : $(PRJ)$/version.mk - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -DLLPRE = # no leading "lib" on .so files - -INCPRE += $(MISC)$/$(TARGET)$/inc - -SHL1TARGET = $(TARGET)_string -SHL1OBJS = $(SLO)$/test_string.obj $(SLO)$/test_string_noadditional.obj -SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(COMPHELPERLIB) -SHL1VERSIONMAP = ..$/version.map -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.INCLUDE: target.mk -.INCLUDE: _cppunit.mk diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk new file mode 100644 index 000000000000..bf1e794dc2cd --- /dev/null +++ b/cppcanvas/Library_cppcanvas.mk @@ -0,0 +1,88 @@ +#************************************************************************* +# +# 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_Library_Library,cppcanvas)) + +$(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc)) + +$(eval $(call gb_Library_add_precompiled_header,cppcanvas,$(SRCDIR)/cppcanvas/inc/pch/precompiled_cppcanvas)) + +$(eval $(call gb_Library_set_include,cppcanvas,\ + -I$(SRCDIR)/cppcanvas/inc \ + -I$(SRCDIR)/cppcanvas/inc/pch \ + -I$(SRCDIR)/cppcanvas/source/inc \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_defs,cppcanvas,\ + -DCPPCANVAS_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,cppcanvas,\ + basegfx \ + canvastools \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + svt \ + tl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,cppcanvas,\ + 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/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/Makefile b/cppcanvas/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/cppcanvas/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/sax/util/makefile.pmk b/cppcanvas/Module_cppcanvas.mk index 1c044bb10ff0..5332d932af9e 100644 --- a/sax/util/makefile.pmk +++ b/cppcanvas/Module_cppcanvas.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,6 +25,11 @@ # #************************************************************************* -# Reduction of exported symbols: -CDEFS += -DSAX_DLLIMPLEMENTATION -VISIBILITY_HIDDEN=TRUE +$(eval $(call gb_Module_Module,cppcanvas)) + +$(eval $(call gb_Module_add_targets,cppcanvas,\ + Library_cppcanvas \ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/cppcanvas/Package_inc.mk b/cppcanvas/Package_inc.mk new file mode 100644 index 000000000000..cda4a3e41225 --- /dev/null +++ b/cppcanvas/Package_inc.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# 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_Package_Package,cppcanvas_inc,$(SRCDIR)/cppcanvas/inc)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvas.hxx,cppcanvas/canvas.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/sprite.hxx,cppcanvas/sprite.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/vclfactory.hxx,cppcanvas/vclfactory.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/font.hxx,cppcanvas/font.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/customsprite.hxx,cppcanvas/customsprite.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvasgraphic.hxx,cppcanvas/canvasgraphic.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/polypolygon.hxx,cppcanvas/polypolygon.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/color.hxx,cppcanvas/color.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/spritecanvas.hxx,cppcanvas/spritecanvas.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/text.hxx,cppcanvas/text.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/renderer.hxx,cppcanvas/renderer.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/basegfxfactory.hxx,cppcanvas/basegfxfactory.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmap.hxx,cppcanvas/bitmap.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmapcanvas.hxx,cppcanvas/bitmapcanvas.hxx)) +$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/cppcanvasdllapi.h,cppcanvas/cppcanvasdllapi.h)) + +# vim: set noet sw=4 ts=4: diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx index 10be95fc8eb5..5cb87aaeb5d3 100644 --- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx +++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx @@ -39,6 +39,7 @@ #include <cppcanvas/sprite.hxx> #include <basegfx/vector/b2isize.hxx> +#include <cppcanvas/cppcanvasdllapi.h> namespace basegfx { @@ -63,7 +64,7 @@ namespace cppcanvas only be drawn on exactly that canvas. You have to regenerate them for different canvases. */ - class BaseGfxFactory + class CPPCANVAS_DLLPUBLIC BaseGfxFactory { public: static BaseGfxFactory& getInstance(); diff --git a/regexp/inc/pch/precompiled_regexp.cxx b/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h index f4eea5e9fbf6..aeaf68b73330 100644 --- a/regexp/inc/pch/precompiled_regexp.cxx +++ b/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h @@ -1,31 +1,39 @@ -/* -*- 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_regexp.hxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* -*- 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_CPPCANVASDLLAPI_H
+#define INCLUDED_CPPCANVASDLLAPI_H
+
+#if defined CPPCANVAS_DLLIMPLEMENTATION
+
+#define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define CPPCANVAS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx b/cppcanvas/inc/cppcanvas/vclfactory.hxx index acd51dfd8a81..14d9e6cbd5a8 100644 --- a/cppcanvas/inc/cppcanvas/vclfactory.hxx +++ b/cppcanvas/inc/cppcanvas/vclfactory.hxx @@ -38,6 +38,7 @@ #include <cppcanvas/text.hxx> #include <cppcanvas/sprite.hxx> +#include <cppcanvas/cppcanvasdllapi.h> class Window; class Bitmap; @@ -71,7 +72,7 @@ namespace cppcanvas only be drawn on exactly that canvas. You have to regenerate them for different canvases. */ - class VCLFactory + class CPPCANVAS_DLLPUBLIC VCLFactory { public: static VCLFactory& getInstance(); diff --git a/cppcanvas/inc/makefile.mk b/cppcanvas/inc/makefile.mk deleted file mode 100644 index ccf2d3a92425..000000000000 --- a/cppcanvas/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=.. - -PRJNAME=cppcanvas -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/cppcanvas/prj/build.lst b/cppcanvas/prj/build.lst index 143af130f39b..bab151c5c142 100644 --- a/cppcanvas/prj/build.lst +++ b/cppcanvas/prj/build.lst @@ -1,8 +1,2 @@ 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 --git a/cppcanvas/prj/d.lst b/cppcanvas/prj/d.lst index eed2dcd06403..c103198198f6 100644 --- a/cppcanvas/prj/d.lst +++ b/cppcanvas/prj/d.lst @@ -1,21 +1,2 @@ -..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin\cppcanv*.dll -..\%__SRC%\bin\mtfrenderer*.dll %_DEST%\bin\mtfrenderer*.dll -..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib\icppcanvas.lib ..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.* ..\%__SRC%\misc\mtfrenderer.component %_DEST%\xml\mtfrenderer.component - -mkdir: %_DEST%\inc\cppcanvas -..\inc\cppcanvas\bitmap.hxx %_DEST%\inc\cppcanvas\bitmap.hxx -..\inc\cppcanvas\bitmapcanvas.hxx %_DEST%\inc\cppcanvas\bitmapcanvas.hxx -..\inc\cppcanvas\canvas.hxx %_DEST%\inc\cppcanvas\canvas.hxx -..\inc\cppcanvas\canvasgraphic.hxx %_DEST%\inc\cppcanvas\canvasgraphic.hxx -..\inc\cppcanvas\color.hxx %_DEST%\inc\cppcanvas\color.hxx -..\inc\cppcanvas\customsprite.hxx %_DEST%\inc\cppcanvas\customsprite.hxx -..\inc\cppcanvas\font.hxx %_DEST%\inc\cppcanvas\font.hxx -..\inc\cppcanvas\polypolygon.hxx %_DEST%\inc\cppcanvas\polypolygon.hxx -..\inc\cppcanvas\renderer.hxx %_DEST%\inc\cppcanvas\renderer.hxx -..\inc\cppcanvas\sprite.hxx %_DEST%\inc\cppcanvas\sprite.hxx -..\inc\cppcanvas\spritecanvas.hxx %_DEST%\inc\cppcanvas\spritecanvas.hxx -..\inc\cppcanvas\text.hxx %_DEST%\inc\cppcanvas\text.hxx -..\inc\cppcanvas\vclfactory.hxx %_DEST%\inc\cppcanvas\vclfactory.hxx -..\inc\cppcanvas\basegfxfactory.hxx %_DEST%\inc\cppcanvas\basegfxfactory.hxx diff --git a/cppcanvas/prj/makefile.mk b/cppcanvas/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/cppcanvas/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/cppcanvas/source/mtfrenderer/makefile.mk b/cppcanvas/source/mtfrenderer/makefile.mk deleted file mode 100644 index b92f2525200c..000000000000 --- a/cppcanvas/source/mtfrenderer/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=cppcanvas -TARGET=metafilerenderer -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Common ---------------------------------------------------------- - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -SLOFILES = $(SLO)$/cachedprimitivebase.obj \ - $(SLO)$/bitmapaction.obj \ - $(SLO)$/emfplus.obj \ - $(SLO)$/implrenderer.obj \ - $(SLO)$/lineaction.obj \ - $(SLO)$/pointaction.obj \ - $(SLO)$/polypolyaction.obj \ - $(SLO)$/rendergraphicaction.obj \ - $(SLO)$/textaction.obj \ - $(SLO)$/transparencygroupaction.obj \ - $(SLO)$/mtftools.obj - -# ========================================================================== - -.INCLUDE : target.mk diff --git a/cppcanvas/source/tools/makefile.mk b/cppcanvas/source/tools/makefile.mk deleted file mode 100644 index ee543616f6e0..000000000000 --- a/cppcanvas/source/tools/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=cppcanvas -TARGET=cppcanvastools -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Common ---------------------------------------------------------- - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -SLOFILES = $(SLO)$/canvasgraphichelper.obj \ - $(SLO)$/tools.obj - -# ========================================================================== - -.INCLUDE : target.mk diff --git a/cppcanvas/source/wrapper/makefile.mk b/cppcanvas/source/wrapper/makefile.mk deleted file mode 100644 index 255cc023d75c..000000000000 --- a/cppcanvas/source/wrapper/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=cppcanvas -TARGET=canvaswrapper -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Common ---------------------------------------------------------- - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -SLOFILES = $(SLO)$/implbitmap.obj \ - $(SLO)$/implcanvas.obj \ - $(SLO)$/implcolor.obj \ - $(SLO)$/implfont.obj \ - $(SLO)$/vclfactory.obj \ - $(SLO)$/basegfxfactory.obj \ - $(SLO)$/impltext.obj \ - $(SLO)$/implpolypolygon.obj \ - $(SLO)$/implbitmapcanvas.obj \ - $(SLO)$/implspritecanvas.obj \ - $(SLO)$/implsprite.obj \ - $(SLO)$/implcustomsprite.obj - -# ========================================================================== - -.INCLUDE : target.mk diff --git a/cppcanvas/util/cppcanvas.flt b/cppcanvas/util/cppcanvas.flt deleted file mode 100644 index 90ec48c26d4e..000000000000 --- a/cppcanvas/util/cppcanvas.flt +++ /dev/null @@ -1,4 +0,0 @@ -__CT -Impl -IMP -internal diff --git a/cppcanvas/util/makefile.mk b/cppcanvas/util/makefile.mk deleted file mode 100644 index 351ca878e6d0..000000000000 --- a/cppcanvas/util/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=cppcanvas -TARGET=cppcanvas -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Common ---------------------------------------------------------- - -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1FILES=\ - $(SLB)$/canvaswrapper.lib \ - $(SLB)$/metafilerenderer.lib \ - $(SLB)$/cppcanvastools.lib - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -.IF "$(COM)" == "MSC" -SHL1IMPLIB= i$(TARGET) -.ELSE -SHL1IMPLIB= $(TARGET)$(DLLPOSTFIX) -.ENDIF -SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) $(SVTOOLLIB) - -.IF "$(debug)$(dbgutil)"!="" -SHL1STDLIBS += $(CPPUHELPERLIB) -.ENDIF # "$(debug)$(dbgutil)"!="" - -SHL1LIBS= $(SLB)$/$(TARGET).lib - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(LIB1TARGET) - -DEF1DES =CPPCanvas -DEFLIB1NAME =$(TARGET) - -# ========================================================================== - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt : makefile.mk - @$(TYPE) $(TARGET).flt > $@ diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk index cefe90422e3b..c67e9082d7ce 100644 --- a/i18npool/source/localedata/data/makefile.mk +++ b/i18npool/source/localedata/data/makefile.mk @@ -42,7 +42,7 @@ my_file = file:/// my_file = file:// .END -my_components = sax.inbuild +my_components = component/sax/source/expatwrap/expwrap.inbuild # --- Settings ----------------------------------------------------- diff --git a/i18npool/source/search/makefile.mk b/i18npool/source/search/makefile.mk index ba47813a68c4..95397d9d47ac 100644 --- a/i18npool/source/search/makefile.mk +++ b/i18npool/source/search/makefile.mk @@ -55,12 +55,6 @@ EXCEPTIONSNOOPTFILES= \ SHL1TARGET= $(TARGET) SHL1OBJS= $(SLOFILES) -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") -I18NREGEXPLIB=-li18nregexp$(COMID) -.ELSE -I18NREGEXPLIB=ii18nregexp.lib -.ENDIF - SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 4ec56f2cf7e0..6b44b64fa22f 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -32,10 +32,6 @@ $(eval $(call gb_Executable_set_include,spadmin.bin,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\ - $$(CXXFLAGS) \ -)) - $(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\ vclmain \ )) diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index e72c676b57eb..87b08acd45be 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -27,8 +27,7 @@ $(eval $(call gb_Library_Library,spa)) -$(eval $(call gb_Library_set_defs,spa,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,spa,\ -DSPA_DLLIMPLEMENTATION \ )) diff --git a/basegfx/source/color/makefile.mk b/regexp/Library_regexp.mk index 3627f8244d10..463892dd2903 100644 --- a/basegfx/source/color/makefile.mk +++ b/regexp/Library_regexp.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,23 +25,27 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=basegfx -TARGET=color +$(eval $(call gb_Library_Library,i18nregexp)) -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_Library_add_package_headers,i18nregexp,regexp_inc)) -# --- Settings ---------------------------------- +$(eval $(call gb_Library_set_include,i18nregexp,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) -.INCLUDE : settings.mk +$(eval $(call gb_Library_add_defs,i18nregexp,\ + -DREGEXP_DLLIMPLEMENTATION \ +)) -# --- Files ------------------------------------- +$(eval $(call gb_Library_add_linked_libs,i18nregexp,\ + sal \ + i18nutil \ + $(gb_STDLIBS) \ +)) -SLOFILES= \ - $(SLO)$/bcolor.obj \ - $(SLO)$/bcolortools.obj \ - $(SLO)$/bcolormodifier.obj +$(eval $(call gb_Library_add_exception_objects,i18nregexp,\ + regexp/source/reclass \ +)) -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/regexp/Makefile b/regexp/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/regexp/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/util/makefile.pmk b/regexp/Module_regexp.mk index fdb7754a69b9..41d2e9e90d87 100644 --- a/ucbhelper/util/makefile.pmk +++ b/regexp/Module_regexp.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,7 +25,11 @@ # #************************************************************************* -# define UCBHELPER_DLLIMPLEMENTATION (see @ ucbhelperdllapi.h) -CDEFS += -DUCBHELPER_DLLIMPLEMENTATION +$(eval $(call gb_Module_Module,regexp)) -VISIBILITY_HIDDEN=TRUE +$(eval $(call gb_Module_add_targets,regexp,\ + Library_regexp \ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/regexp/Package_inc.mk b/regexp/Package_inc.mk new file mode 100644 index 000000000000..b26bfea21bf0 --- /dev/null +++ b/regexp/Package_inc.mk @@ -0,0 +1,31 @@ +#************************************************************************* +# +# 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_Package_Package,regexp_inc,$(SRCDIR)/regexp/inc)) +$(eval $(call gb_Package_add_file,regexp_inc,inc/external/regexp/reclass.hxx,regexp/reclass.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/regexp/inc/makefile.mk b/regexp/inc/makefile.mk deleted file mode 100644 index b65b126709e7..000000000000 --- a/regexp/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=.. - -PRJNAME=regexp -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/regexp/inc/regexp/reclass.hxx b/regexp/inc/regexp/reclass.hxx new file mode 100644 index 000000000000..329ec2032adc --- /dev/null +++ b/regexp/inc/regexp/reclass.hxx @@ -0,0 +1,391 @@ +/* Definitions for data structures and routines for the regular + expression library, version 0.12. + Copyright (C) 1985,89,90,91,92,93,95,96,97,98 Free Software Foundation, Inc. + + This file is part of the GNU C Library. Its master source is NOT part of + the C library, however. The master source lives in /gd/gnu/lib. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* + Modified for OpenOffice.org to use sal_Unicode and Transliteration service. + */ + +#ifndef INCLUDED_REGEXP_RECLASS_HXX +#define INCLUDED_REGEXP_RECLASS_HXX + +#include <i18nutil/unicode.hxx> +#include <com/sun/star/util/SearchFlags.hpp> +#include <com/sun/star/util/SearchOptions.hpp> +#include <sal/types.h> +#include <com/sun/star/i18n/XExtendedTransliteration.hpp> + +#if defined REGEXP_DLLIMPLEMENTATION +#define REGEXP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define REGEXP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +/* If any error codes are removed, changed, or added, update the + `re_error_msg' table in regex.c. */ +typedef enum +{ +#ifdef _XOPEN_SOURCE + REG_ENOSYS = -1, /* This will never happen for this implementation. */ +#endif + + REG_NOERROR = 0, /* Success. */ + REG_NOMATCH, /* Didn't find a match (for regexec). */ + + /* POSIX regcomp return error codes. (In the order listed in the + standard.) */ + REG_BADPAT, /* Invalid pattern. */ + REG_ECOLLATE, /* Not implemented. */ + REG_ECTYPE, /* Invalid character class name. */ + REG_EESCAPE, /* Trailing backslash. */ + REG_ESUBREG, /* Invalid back reference. */ + REG_EBRACK, /* Unmatched left bracket. */ + REG_EPAREN, /* Parenthesis imbalance. */ + REG_EBRACE, /* Unmatched \{. */ + REG_BADBR, /* Invalid contents of \{\}. */ + REG_ERANGE, /* Invalid range end. */ + REG_ESPACE, /* Ran out of memory. */ + REG_BADRPT, /* No preceding re for repetition op. */ + + /* Error codes we've added. */ + REG_EEND, /* Premature end. */ + REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ + REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ +} reg_errcode_t; + + +/* This data structure represents a compiled pattern. Before calling + the pattern compiler, the fields `buffer', `allocated', `fastmap', + can be set. After the pattern has been + compiled, the `re_nsub' field is available. All other fields are + private to the regex routines. */ + +struct REGEXP_DLLPUBLIC re_pattern_buffer +{ +/* [[[begin pattern_buffer]]] */ + /* Space that holds the compiled pattern. It is declared as + `unsigned char *' because its elements are + sometimes used as array indexes. */ + sal_Unicode *buffer; + + /* Number of bytes to which `buffer' points. */ + sal_uInt32 allocated; + + /* Number of bytes actually used in `buffer'. */ + sal_uInt32 used; + + /* Pointer to a fastmap, if any, otherwise zero. re_search uses + the fastmap, if there is one, to skip over impossible + starting points for matches. */ + sal_Unicode *fastmap; + + + /* Number of subexpressions found by the compiler. */ + size_t re_nsub; + + /* Zero if this pattern cannot match the empty string, one else. + Well, in truth it's used only in `re_search2', to see + whether or not we should use the fastmap, so we don't set + this absolutely perfectly; see `re_compile_fastmap' (the + `duplicate' case). */ + unsigned can_be_null : 1; + + /* Set to zero when `regex_compile' compiles a pattern; set to one + by `re_compile_fastmap' if it updates the fastmap. */ + unsigned fastmap_accurate : 1; + + /* If set, a beginning-of-line anchor doesn't match at the + beginning of the string. */ + unsigned not_bol : 1; + + /* Similarly for an end-of-line anchor. */ + unsigned not_eol : 1; + + /* If true, an anchor at a newline matches. */ + unsigned newline_anchor : 1; + +/* [[[end pattern_buffer]]] */ +}; + +/* These are the command codes that appear in compiled regular + expressions. Some opcodes are followed by argument bytes. A + command code can specify any interpretation whatsoever for its + arguments. Zero bytes may appear in the compiled regular expression. */ + +typedef enum +{ + no_op = 0, + + /* Succeed right away--no more backtracking. */ + succeed, + + /* Followed by one byte giving n, then by n literal bytes. */ + exactn, + + /* Matches any (more or less) character. */ + anychar, + + /* Matches any one char belonging to specified set. First + following byte is number of bitmap bytes. Then come bytes + for a bitmap saying which chars are in. Bits in each byte + are ordered low-bit-first. A character is in the set if its + bit is 1. A character too large to have a bit in the map is + automatically not in the set. */ + charset, + + /* Same parameters as charset, but match any character that is + not one of those specified. */ + charset_not, + + /* Start remembering the text that is matched, for storing in a + register. Followed by one byte with the register number, in + the range 0 to one less than the pattern buffer's re_nsub + field. Then followed by one byte with the number of groups + inner to this one. (This last has to be part of the + start_memory only because we need it in the on_failure_jump + of re_match2.) */ + start_memory, + /* Stop remembering the text that is matched and store it in a + memory register. Followed by one byte with the register + number, in the range 0 to one less than `re_nsub' in the + pattern buffer, and one byte with the number of inner groups, + just like `start_memory'. (We need the number of inner + groups here because we don't have any easy way of finding the + corresponding start_memory when we're at a stop_memory.) */ + stop_memory, + + /* Match a duplicate of something remembered. Followed by one + byte containing the register number. */ + duplicate, + + /* Fail unless at beginning of line. */ + begline, + + /* Fail unless at end of line. */ + endline, + + /* Succeeds if at beginning of buffer (if emacs) or at beginning + of string to be matched (if not). */ + begbuf, + + /* Analogously, for end of buffer/string. */ + endbuf, + + /* Followed by two byte relative address to which to jump. */ + jump, + + /* Same as jump, but marks the end of an alternative. */ + jump_past_alt, + + /* Followed by two-byte relative address of place to resume at + in case of failure. */ + on_failure_jump, + + /* Like on_failure_jump, but pushes a placeholder instead of the + current string position when executed. */ + on_failure_keep_string_jump, + + /* Throw away latest failure point and then jump to following + two-byte relative address. */ + pop_failure_jump, + + /* Change to pop_failure_jump if know won't have to backtrack to + match; otherwise change to jump. This is used to jump + back to the beginning of a repeat. If what follows this jump + clearly won't match what the repeat does, such that we can be + sure that there is no use backtracking out of repetitions + already matched, then we change it to a pop_failure_jump. + Followed by two-byte address. */ + maybe_pop_jump, + + /* Jump to following two-byte address, and push a dummy failure + point. This failure point will be thrown away if an attempt + is made to use it for a failure. A `+' construct makes this + before the first repeat. Also used as an intermediary kind + of jump when compiling an alternative. */ + dummy_failure_jump, + + /* Push a dummy failure point and continue. Used at the end of + alternatives. */ + push_dummy_failure, + + /* Followed by two-byte relative address and two-byte number n. + After matching N times, jump to the address upon failure. */ + succeed_n, + + /* Followed by two-byte relative address, and two-byte number n. + Jump to the address N times, then fail. */ + jump_n, + + /* Set the following two-byte relative address to the + subsequent two-byte number. The address *includes* the two + bytes of number. */ + set_number_at, + + wordbeg, /* Succeeds if at word beginning. */ + wordend /* Succeeds if at word end. */ + +} re_opcode_t; + +typedef struct re_pattern_buffer regex_t; + +/* Type for byte offsets within the string. POSIX mandates this. */ +typedef sal_Int32 regoff_t; + +/* This is the structure we store register match data in. See + regex.texinfo for a full description of what registers match. */ +struct REGEXP_DLLPUBLIC re_registers +{ + sal_uInt32 num_regs; + sal_Int32 *start; + sal_Int32 *end; + sal_Int32 num_of_match; +}; + +typedef struct { + sal_Int32 begalt_offset; + sal_Int32 fixup_alt_jump; + sal_Int32 inner_group_offset; + sal_Int32 laststart_offset; + sal_uInt32 regnum; +} compile_stack_elt_t; + +typedef struct { + compile_stack_elt_t *stack; + sal_uInt32 size; + sal_uInt32 avail; +} compile_stack_type; + +union REGEXP_DLLPUBLIC fail_stack_elt +{ + sal_Unicode *pointer; + sal_Int32 integer; +}; + +typedef union fail_stack_elt fail_stack_elt_t; + +typedef struct +{ + fail_stack_elt_t *stack; + sal_uInt32 size; + sal_uInt32 avail; /* Offset of next open position. */ +} fail_stack_type; + +typedef union +{ + fail_stack_elt_t word; + struct + { + /* This field is one if this group can match the empty string, + zero if not. If not yet determined, `MATCH_NULL_UNSET_VALUE'. */ +#define MATCH_NULL_UNSET_VALUE 3 + unsigned match_null_string_p : 2; + unsigned is_active : 1; + unsigned matched_something : 1; + unsigned ever_matched_something : 1; + } bits; +} register_info_type; + + +class REGEXP_DLLPUBLIC Regexpr +{ + ::com::sun::star::uno::Reference< + ::com::sun::star::i18n::XExtendedTransliteration > translit; + + const sal_Unicode *line; // line to search in + sal_Int32 linelen; // length of search string + + sal_Unicode *pattern; // RE pattern to match + sal_Int32 patsize; // Length of pattern + + struct re_pattern_buffer *bufp; + + sal_Bool isIgnoreCase; + + /* Either a translate table to apply to all characters before + comparing them, or zero for no translation. The translation + is applied to a pattern when it is compiled and to a string + when it is matched. */ + int translate; + + sal_uInt32 failure_id; + sal_uInt32 nfailure_points_pushed; + sal_uInt32 nfailure_points_popped; + /* Counts the total number of registers pushed. */ + sal_uInt32 num_regs_pushed; + + sal_uInt32 re_max_failures; + + /* Registers are set to a sentinel when they haven't yet matched. */ + sal_Unicode reg_unset_dummy; + + // private instance functions + inline void store_number( sal_Unicode * destination, sal_Int32 number ); + inline void store_number_and_incr( sal_Unicode *& destination, sal_Int32 number ); + inline void extract_number(sal_Int32 & dest, sal_Unicode *source); + inline void extract_number_and_incr(sal_Int32 & destination, sal_Unicode *& source); + + sal_Bool group_match_null_string_p(sal_Unicode **p, sal_Unicode *end, + register_info_type *reg_info); + sal_Bool alt_match_null_string_p(sal_Unicode *p, sal_Unicode *end, + register_info_type *reg_info); + + sal_Bool common_op_match_null_string_p(sal_Unicode **p, sal_Unicode *end, + register_info_type *reg_info); + sal_Int32 bcmp_translate(const sal_Unicode *s1, + const sal_Unicode *s2, sal_Int32 len); + + sal_Int32 regcomp(void); + sal_Int32 regex_compile(void); + inline void store_op1(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg); + inline void store_op2(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg1, sal_Int32 arg2); + void insert_op1(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg, + sal_Unicode *end); + void insert_op2(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg1, + sal_Int32 arg2, sal_Unicode *end); + sal_Bool at_begline_loc_p(const sal_Unicode *local_pattern, + const sal_Unicode *p); + sal_Bool at_endline_loc_p(const sal_Unicode *p, const sal_Unicode *pend); + reg_errcode_t compile_range(sal_Unicode range_begin, sal_Unicode range_end, sal_Unicode *b); + sal_Bool group_in_compile_stack(compile_stack_type compile_stack, + sal_uInt32 regnum); + sal_Int32 re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range); + + sal_Bool iswordbegin(const sal_Unicode *d, sal_Unicode *string, sal_Int32 ssize); + sal_Bool iswordend(const sal_Unicode *d, sal_Unicode *string, sal_Int32 ssize); + void set_list_bit(sal_Unicode c, sal_Unicode *b); + +public: + // constructors + Regexpr( const ::com::sun::star::util::SearchOptions & rOptions, + ::com::sun::star::uno::Reference< + ::com::sun::star::i18n::XExtendedTransliteration > XTrans ); + + // destructor + ~Regexpr(); + + void set_line( const sal_Unicode *line, sal_Int32 len ); + + // function returning pointers to occurrences in regs + sal_Int32 re_search(struct re_registers *regs, sal_Int32 pOffset); // find pattern in line +}; + +#endif diff --git a/regexp/prj/build.lst b/regexp/prj/build.lst index c51b82c72534..986afb3825a4 100644 --- a/regexp/prj/build.lst +++ b/regexp/prj/build.lst @@ -1,4 +1,2 @@ re regexp : offapi comphelper i18nutil sal NULL -re regexp usr1 - all re_mkout NULL -re regexp\inc nmake - all re_inc NULL -re regexp\source nmake - all re_source re_inc NULL +re regexp\prj nmake - all re_prj NULL diff --git a/regexp/prj/d.lst b/regexp/prj/d.lst index 0408e36f30c6..3f38fbeea4f7 100644 --- a/regexp/prj/d.lst +++ b/regexp/prj/d.lst @@ -1,9 +1 @@ -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\libi18nregexp*.dll.a %_DEST%\lib\libi18nregexp*.dll.a -..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib\ii18nregexp.lib diff --git a/regexp/prj/makefile.mk b/regexp/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/regexp/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/regexp/source/makefile.mk b/regexp/source/makefile.mk deleted file mode 100644 index b1ebf69224cf..000000000000 --- a/regexp/source/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=regexp -TARGET=i18nregexp -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/reclass.obj - -SLOFILES= \ - $(EXCEPTIONSFILES) - -SHL1TARGET= $(TARGET)$(COMID) -.IF "$(COM)" == "MSC" -SHL1IMPLIB= i$(TARGET) -.ELSE -SHL1IMPLIB = $(TARGET)$(COMID) -.ENDIF -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME= $(SHL1TARGET) - -SHL1OBJS= $(SLOFILES) - -LIB1TARGET= $(SLB)$/$(SHL1TARGET).lib -LIB1OBJFILES= $(SHL1OBJS) - -SHL1STDLIBS= \ - $(SALLIB) \ - $(I18NUTILLIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - @echo CLEAR_THE_FILE > $@ - @echo __CT >> $@ diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx index b296230ead9f..c57632a5863b 100644 --- a/regexp/source/reclass.cxx +++ b/regexp/source/reclass.cxx @@ -25,9 +25,6 @@ * ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_regexp.hxx" /* Extended regular expression matching and search library, version 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the @@ -53,6 +50,7 @@ Modified for OpenOffice.org to use sal_Unicode and Transliteration service. */ +#include <regexp/reclass.hxx> #if 0 /* If for any reason (porting, debug) we can't use alloca() use malloc() @@ -74,9 +72,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> -#include "reclass.hxx" - - /* Maximum number of duplicates an interval can allow. Some systems (erroneously) define this in other header files, but we want our value, so remove any previous define. */ diff --git a/basegfx/source/pixel/makefile.mk b/sax/CppunitTest_sax.mk index 2766b7c06c8b..d29632de5fae 100644 --- a/basegfx/source/pixel/makefile.mk +++ b/sax/CppunitTest_sax.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,21 +25,22 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=basegfx -TARGET=pixel +$(eval $(call gb_CppunitTest_CppunitTest,sax_cppunit)) -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_CppunitTest_add_exception_objects,sax_cppunit, \ + sax/qa/cppunit/test_converter \ +)) -# --- Settings ---------------------------------- +$(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \ + cppunit \ + sax \ + sal \ + $(gb_STDLIBS) \ +)) -.INCLUDE : settings.mk +$(eval $(call gb_CppunitTest_set_include,sax_cppunit,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/bpixel.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk new file mode 100644 index 000000000000..05bddd0a03b5 --- /dev/null +++ b/sax/Library_expwrap.mk @@ -0,0 +1,54 @@ +#************************************************************************* +# +# 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_Library_Library,expwrap)) + +$(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_linked_libs,expwrap,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(call gb_Library_use_external,expwrap,expat_utf16) + +$(eval $(call gb_Library_add_exception_objects,expwrap,\ + sax/source/expatwrap/attrlistimpl \ + sax/source/expatwrap/sax_expat \ + sax/source/expatwrap/saxwriter \ + sax/source/expatwrap/xml2utf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/canvas/source/factory/makefile.mk b/sax/Library_fastsax.mk index eee24ea8ba85..2dd9dccf0e52 100644 --- a/canvas/source/factory/makefile.mk +++ b/sax/Library_fastsax.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,39 +25,44 @@ # #************************************************************************* -PRJ = ..$/.. +$(eval $(call gb_Library_Library,fastsax)) -PRJNAME = canvas -TARGET = canvasfactory.uno -ENABLE_EXCEPTIONS = TRUE +$(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax)) -.INCLUDE : settings.mk -DLLPRE = -.IF "$(L10N_framework)"=="" -SLOFILES = \ - $(SLO)$/cf_service.obj +$(eval $(call gb_Library_set_include,fastsax,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(SRCDIR)/sax/inc \ +)) -SHL1TARGET = $(TARGET) +$(eval $(call gb_Library_add_linked_libs,fastsax,\ + cppu \ + cppuhelper \ + sal \ + sax \ + $(gb_STDLIBS) \ +)) -SHL1STDLIBS = \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) -SHL1VERSIONMAP = $(SOLARENV)/src/component.map +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_add_defs,fastsax,\ + -DSYSTEM_ZLIB \ +)) +endif -SHL1DEPN = -SHL1IMPLIB = i$(TARGET) -SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1DEF = $(MISC)$/$(SHL1TARGET).def +$(call gb_Library_use_external,fastsax,expat_utf8) -DEF1NAME = $(SHL1TARGET) -.ENDIF -.INCLUDE : target.mk +# re-uses xml2utf object from sax.uno lib (see below) +$(eval $(call gb_Library_add_exception_objects,fastsax,\ + sax/source/fastparser/facreg \ + sax/source/fastparser/fastparser \ + sax/source/expatwrap/xml2utf \ +)) -ALLTAR : $(MISC)/canvasfactory.component +# mba: currently it's unclear whether xml2utf needs to be compiled with the +# same compiler settings as in the sax.uno lib; in case not, we have to use +# a custom target +#$(eval $(call gb_Library_add_generated_exception_objects,fastsax,\ +# sax/source/expatwrap/xml2utf \ +#)) -$(MISC)/canvasfactory.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt canvasfactory.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt canvasfactory.component +# vim: set noet sw=4 ts=4: diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk new file mode 100644 index 000000000000..f3e089ea8375 --- /dev/null +++ b/sax/Library_sax.mk @@ -0,0 +1,59 @@ +#************************************************************************* +# +# 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_Library_Library,sax)) + +$(eval $(call gb_Library_add_package_headers,sax,\ + sax_inc \ +)) + +$(eval $(call gb_Library_set_include,sax,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(SRCDIR)/sax/inc \ +)) + +$(eval $(call gb_Library_add_defs,sax,\ + -DSAX_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,sax,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,sax,\ + sax/source/tools/converter \ + sax/source/tools/fastattribs \ + sax/source/tools/fastserializer \ + sax/source/tools/fshelper \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sax/Makefile b/sax/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/sax/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk new file mode 100644 index 000000000000..45895302b303 --- /dev/null +++ b/sax/Module_sax.mk @@ -0,0 +1,41 @@ +#************************************************************************* +# +# 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,sax)) + +$(eval $(call gb_Module_add_targets,sax,\ + Library_sax \ + Library_expwrap \ + Library_fastsax \ + Package_inc \ +)) + +$(eval $(call gb_Module_add_check_targets,sax,\ + CppunitTest_sax \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/basegfx/source/curve/makefile.mk b/sax/Package_inc.mk index 9fc84c4a2e08..ebee272d7abf 100644 --- a/basegfx/source/curve/makefile.mk +++ b/sax/Package_inc.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,23 +25,10 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=basegfx -TARGET=curve +$(eval $(call gb_Package_Package,sax_inc,$(SRCDIR)/sax/inc)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/dllapi.h,sax/dllapi.h)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fshelper.hxx,sax/fshelper.hxx)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fastattribs.hxx,sax/fastattribs.hxx)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/converter.hxx,sax/tools/converter.hxx)) -ENABLE_EXCEPTIONS=FALSE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/b2dcubicbezier.obj \ - $(SLO)$/b2dquadraticbezier.obj \ - $(SLO)$/b2dbeziertools.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/sax/prj/build.lst b/sax/prj/build.lst index 658ec97e8e79..940ef70e585c 100644 --- a/sax/prj/build.lst +++ b/sax/prj/build.lst @@ -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 --git a/sax/prj/d.lst b/sax/prj/d.lst index 12cd6cd81370..54fab394e8fc 100644 --- a/sax/prj/d.lst +++ b/sax/prj/d.lst @@ -1,18 +1,2 @@ -..\%__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%\lib\*.a %_DEST%\lib\*.a -..\%__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 --git a/sax/prj/makefile.mk b/sax/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/sax/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index dcd5bb7e5cc8..562b39910fe2 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ +#include <sal/cppunit.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index 870f4dd258ac..58d94792dc0f 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -30,9 +30,7 @@ #define _SAX_ATTRLISTIMPL_HXX #include "sal/config.h" - #include <cppuhelper/implbase2.hxx> - #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> diff --git a/sax/source/expatwrap/sax.component b/sax/source/expatwrap/expwrap.component index 5e6699d9dd33..5e6699d9dd33 100644 --- a/sax/source/expatwrap/sax.component +++ b/sax/source/expatwrap/expwrap.component diff --git a/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk deleted file mode 100644 index a0f177178004..000000000000 --- a/sax/source/expatwrap/makefile.mk +++ /dev/null @@ -1,91 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=sax -TARGET=sax.uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ELSE -CFLAGS += -DXML_UNICODE -.ENDIF - -#----------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/xml2utf.obj\ - $(SLO)$/attrlistimpl.obj\ - $(SLO)$/sax_expat.obj \ - $(SLO)$/saxwriter.obj - -SHL1TARGET= $(TARGET) -.IF "$(COM)" == "MSC" -SHL1IMPLIB= i$(TARGET) -.ELSE -SHL1IMPLIB= $(TARGET) -.ENDIF - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(EXPAT3RDLIB) - -SHL1DEPN= -SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/sax.component $(MISC)/sax.inbuild.component - -$(MISC)/sax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - sax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sax.component - -$(MISC)/sax.inbuild.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt sax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_INBUILD_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sax.component diff --git a/sax/source/fastparser/makefile.mk b/sax/source/fastparser/makefile.mk deleted file mode 100644 index 9690ffab326e..000000000000 --- a/sax/source/fastparser/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=sax -TARGET=fastsax.uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - -#----------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/facreg.obj\ - $(SLO)$/fastparser.obj\ - $(SLO)$/xml2utf.obj - -SHL1TARGET= $(TARGET) -.IF "$(COM)" == "MSC" -SHL1IMPLIB= i$(TARGET) -.ELSE -SHL1IMPLIB= $(TARGET) -.ENDIF - -SHL1STDLIBS= \ - $(SALLIB) \ - $(SAXLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(EXPATASCII3RDLIB) - -SHL1DEPN= -SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/fastsax.component - -$(MISC)/fastsax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - fastsax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt fastsax.component diff --git a/sax/source/tools/makefile.mk b/sax/source/tools/makefile.mk deleted file mode 100644 index abece06312ba..000000000000 --- a/sax/source/tools/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sax -TARGET=sax -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/converter.obj \ - $(SLO)$/fastattribs.obj \ - $(SLO)$/fastserializer.obj \ - $(SLO)$/fshelper.obj - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -.IF "$(COM)" == "MSC" -SHL1IMPLIB= i$(TARGET) -.ELSE -SHL1IMPLIB= $(TARGET)$(DLLPOSTFIX) -.ENDIF - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(COMPHELPERLIB)\ - $(RTLLIB) \ - $(SALLIB) \ - $(ONELIB) - -SHL1DEPN= -SHL1OBJS= $(SLOFILES) -SHL1USE_EXPORTS=name -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME= $(TARGET) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/sot/JunitTest_sot_complex.mk b/sot/JunitTest_sot_complex.mk index e515ab539659..507d3b72244a 100644 --- a/sot/JunitTest_sot_complex.mk +++ b/sot/JunitTest_sot_complex.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,sot_complex)) +$(eval $(call gb_JunitTest_JunitTest,sot_complex,SRCDIR)) $(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\ sot/qa/complex/olesimplestorage/OLESimpleStorageTest \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 927fdc001045..dc4d1912e2be 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -43,8 +43,7 @@ $(eval $(call gb_Library_add_api,sot,\ offapi \ )) -$(eval $(call gb_Library_set_defs,sot,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sot,\ -DSOT_DLLIMPLEMENTATION \ )) diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk index f141dadc342b..357a902d5ec8 100755 --- a/svl/JunitTest_svl_complex.mk +++ b/svl/JunitTest_svl_complex.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,svl_complex)) +$(eval $(call gb_JunitTest_JunitTest,svl_complex,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,svl_complex,\ $$(DEFS) \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 638ab9c89832..08988c41f681 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -45,8 +45,7 @@ $(eval $(call gb_Library_add_api,svl,\ offapi \ )) -$(eval $(call gb_Library_set_defs,svl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,svl,\ -DSVL_DLLIMPLEMENTATION \ )) diff --git a/svl/qa/complex/passwordcontainer/makefile.mk b/svl/qa/complex/passwordcontainer/makefile.mk deleted file mode 100644 index 625404682761..000000000000 --- a/svl/qa/complex/passwordcontainer/makefile.mk +++ /dev/null @@ -1,134 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = svl -TARGET = qa_complex_passwordcontainer - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/passwordcontainer - -# here store only Files which contain a @Test -JAVATESTFILES = \ - PasswordContainerUnitTest.java - - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - PasswordContainerTest.java\ - Test01.java\ - Test02.java\ - Test03.java\ - TestHelper.java\ - MasterPasswdHandler.java - - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - -# -# -# -# -# PRJ = ..$/..$/.. -# TARGET = PasswordContainerUnitTest -# PRJNAME=svl -# PACKAGE = complex$/passwordcontainer -# -# # --- Settings ----------------------------------------------------- -# .INCLUDE: settings.mk -# -# -# #----- compile .java files ----------------------------------------- -# -# JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -# -# JAVAFILES =\ -# PasswordContainerUnitTest.java\ -# PasswordContainerTest.java\ -# TestHelper.java\ -# Test01.java\ -# Test02.java\ -# Test03.java\ -# MasterPasswdHandler.java -# -# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -# -# #----- make a jar from compiled files ------------------------------ -# -# MAXLINELENGTH = 100000 -# -# JARCLASSDIRS = $(PACKAGE) -# JARTARGET = $(TARGET).jar -# JARCOMPRESS = TRUE -# -# # --- Parameters for the test -------------------------------------- -# -# # start an office if the parameter is set for the makefile -# .IF "$(OFFICE)" == "" -# CT_APPEXECCOMMAND = -# .ELSE -# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -# .ENDIF -# -# # test base is java complex -# CT_TESTBASE = -TestBase java_complex -# -# # test looks something like the.full.package.TestName -# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) -# -# # start the runner application -# CT_APP = org.openoffice.Runner -# -# # --- Targets ------------------------------------------------------ -# -# .INCLUDE: target.mk -# -# RUN: run -# -# run: -# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -# -# diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk index 42f3c09af363..665adee8f172 100644 --- a/svtools/JunitTest_svtools_unoapi.mk +++ b/svtools/JunitTest_svtools_unoapi.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\ $$(DEFS) \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index c3dac5e44649..ea6a568da171 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -50,8 +50,7 @@ $(eval $(call gb_Library_set_include,svt,\ -I$(realpath $(SRCDIR)/svtools/inc) \ )) -$(eval $(call gb_Library_set_defs,svt,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,svt,\ -DSVT_DLLIMPLEMENTATION \ )) @@ -62,7 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ cppuhelper \ i18nisolang1 \ i18nutil \ - icuuc \ jvmfwk \ salhelper \ sal \ @@ -76,15 +74,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_JPEG),YES) -$(eval $(call gb_Library_add_linked_libs,svt,\ +$(call gb_Library_use_externals,svt,\ + icuuc \ jpeg \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,svt,\ - jpeglib \ -)) -endif +) $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/brwbox/brwbox1 \ diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk index 5484517db0e5..8e3aed68b88c 100755 --- a/toolkit/JunitTest_toolkit_unoapi.mk +++ b/toolkit/JunitTest_toolkit_unoapi.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\ $$(DEFS) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index e07878f1e90a..c663330c83db 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -40,8 +40,7 @@ $(eval $(call gb_Library_set_include,tk,\ -I$(realpath $(SRCDIR)/toolkit/source) \ )) -$(eval $(call gb_Library_set_defs,tk,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,tk,\ -DTOOLKIT_DLLIMPLEMENTATION \ )) @@ -163,8 +162,9 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ )) 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) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index 6936b70283fe..d423b73c755b 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,mkunroll,\ -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) -$(eval $(call gb_Executable_set_cxxflags,mkunroll,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Executable_add_defs,mkunroll,\ -D_TOOLS_STRINGLIST \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 87c4b3776033..a4a7c7d1fb95 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,rscdep,\ -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) -$(eval $(call gb_Executable_set_cxxflags,rscdep,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Executable_add_defs,rscdep,\ -D_TOOLS_STRINGLIST \ )) @@ -55,8 +54,7 @@ $(eval $(call gb_Executable_add_linked_static_libs,rscdep,\ ifeq ($(OS),WNT) ifeq ($(HAVE_GETOPT),YES) -$(eval $(call gb_Executable_set_cxxflags,rscdep,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Executable_add_defs,rscdep,\ -DHAVE_GETOPT \ )) else diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index 7adf7a998de7..17d2e26cdf08 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,so_checksum,\ -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) -$(eval $(call gb_Executable_set_cxxflags,so_checksum,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Executable_add_defs,so_checksum,\ -D_TOOLS_STRINGLIST \ )) diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index ad3c9c4ec682..439f171f406b 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,tl,\ -I$(WORKDIR)/CustomTarget/tools/source/reversemap \ )) -$(eval $(call gb_Library_set_defs,tl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,tl,\ -DTOOLS_DLLIMPLEMENTATION \ -DVCL \ )) @@ -128,19 +127,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ )) endif -ifeq ($(SYSTEM_ZLIB),YES) -$(eval $(call gb_Library_set_cxxflags,tl,\ - $$(CXXFLAGS) \ - -DSYSTEM_ZLIB \ -)) -$(eval $(call gb_Library_add_linked_libs,tl,\ - z \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,tl,\ - zlib \ -)) -endif +$(call gb_Library_use_external,tl,zlib) ifeq ($(OS),WNT) diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk index ae739de09294..9abc71ba4122 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 94ba4f739382..5583c8b4a056 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 new file mode 100644 index 000000000000..f1df8477ae1f --- /dev/null +++ b/ucbhelper/Library_ucbhelper.mk @@ -0,0 +1,82 @@ +#************************************************************************* +# +# 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_Library_Library,ucbhelper)) + +$(eval $(call gb_Library_add_package_headers,ucbhelper,ucbhelper_inc)) + +$(eval $(call gb_Library_add_precompiled_header,ucbhelper,$(SRCDIR)/ucbhelper/inc/pch/precompiled_ucbhelper)) + +$(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_linked_libs,ucbhelper,\ + cppu \ + cppuhelper \ + sal \ + salhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucbhelper,\ + ucbhelper/source/provider/simpleauthenticationrequest \ + ucbhelper/source/provider/simpleioerrorrequest \ + ucbhelper/source/provider/cancelcommandexecution \ + ucbhelper/source/provider/contenthelper \ + ucbhelper/source/provider/propertyvalueset \ + ucbhelper/source/provider/resultset \ + ucbhelper/source/provider/resultsetmetadata \ + ucbhelper/source/provider/simplecertificatevalidationrequest \ + ucbhelper/source/provider/contentidentifier \ + ucbhelper/source/provider/resultsethelper \ + ucbhelper/source/provider/simplenameclashresolverequest \ + ucbhelper/source/provider/simpleinteractionrequest \ + ucbhelper/source/provider/handleinteractionrequest \ + ucbhelper/source/provider/registerucb \ + ucbhelper/source/provider/contentinfo \ + ucbhelper/source/provider/interactionrequest \ + ucbhelper/source/provider/commandenvironmentproxy \ + ucbhelper/source/provider/providerhelper \ + ucbhelper/source/client/proxydecider \ + ucbhelper/source/client/content \ + ucbhelper/source/client/contentbroker \ + ucbhelper/source/client/commandenvironment \ + ucbhelper/source/client/activedatastreamer \ + ucbhelper/source/client/fileidentifierconverter \ + ucbhelper/source/client/interceptedinteraction \ + ucbhelper/source/client/activedatasink \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/Makefile b/ucbhelper/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/ucbhelper/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/Module_ucbhelper.mk b/ucbhelper/Module_ucbhelper.mk new file mode 100644 index 000000000000..57a40d0544f2 --- /dev/null +++ b/ucbhelper/Module_ucbhelper.mk @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +# replace ucbhelper by the name of the module you are creating + +$(eval $(call gb_Module_Module,ucbhelper)) + +# the targets to be inserted are their file names without .mk extension +$(eval $(call gb_Module_add_targets,ucbhelper,\ + Library_ucbhelper \ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/Package_inc.mk b/ucbhelper/Package_inc.mk new file mode 100644 index 000000000000..abe56b782046 --- /dev/null +++ b/ucbhelper/Package_inc.mk @@ -0,0 +1,59 @@ +#************************************************************************* +# +# 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_Package_Package,ucbhelper_inc,$(SRCDIR)/ucbhelper/inc)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentbroker.hxx,ucbhelper/contentbroker.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleauthenticationrequest.hxx,ucbhelper/simpleauthenticationrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/propertyvalueset.hxx,ucbhelper/propertyvalueset.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentinfo.hxx,ucbhelper/contentinfo.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsetmetadata.hxx,ucbhelper/resultsetmetadata.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contenthelper.hxx,ucbhelper/contenthelper.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatasink.hxx,ucbhelper/activedatasink.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/commandenvironment.hxx,ucbhelper/commandenvironment.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interceptedinteraction.hxx,ucbhelper/interceptedinteraction.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultset.hxx,ucbhelper/resultset.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/ucbhelperdllapi.h,ucbhelper/ucbhelperdllapi.h)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleinteractionrequest.hxx,ucbhelper/simpleinteractionrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleioerrorrequest.hxx,ucbhelper/simpleioerrorrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interactionrequest.hxx,ucbhelper/interactionrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatastreamer.hxx,ucbhelper/activedatastreamer.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/content.hxx,ucbhelper/content.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplecertificatevalidationrequest.hxx,ucbhelper/simplecertificatevalidationrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/proxydecider.hxx,ucbhelper/proxydecider.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fileidentifierconverter.hxx,ucbhelper/fileidentifierconverter.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/cancelcommandexecution.hxx,ucbhelper/cancelcommandexecution.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/commandenvironmentproxy.hxx,ucbhelper/commandenvironmentproxy.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/registerucb.hxx,ucbhelper/registerucb.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsethelper.hxx,ucbhelper/resultsethelper.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/configurationkeys.hxx,ucbhelper/configurationkeys.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentidentifier.hxx,ucbhelper/contentidentifier.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/handleinteractionrequest.hxx,ucbhelper/handleinteractionrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/providerhelper.hxx,ucbhelper/providerhelper.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplenameclashresolverequest.hxx,ucbhelper/simplenameclashresolverequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/macros.hxx,ucbhelper/macros.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/inc/makefile.mk b/ucbhelper/inc/makefile.mk deleted file mode 100644 index c49fd40ec0e4..000000000000 --- a/ucbhelper/inc/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=.. - -PRJNAME=ucbhelper -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/ucbhelper/prj/build.lst b/ucbhelper/prj/build.lst index f97173305622..07a598c4ddb0 100644 --- a/ucbhelper/prj/build.lst +++ b/ucbhelper/prj/build.lst @@ -1,7 +1,3 @@ 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 --git a/ucbhelper/prj/d.lst b/ucbhelper/prj/d.lst index ab5c30a29995..2a89bcdb117b 100644 --- a/ucbhelper/prj/d.lst +++ b/ucbhelper/prj/d.lst @@ -1,41 +1 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so -..\%__SRC%\lib\lib*.dylib %_DEST%\lib\lib*.dylib -..\%__SRC%\lib\lib*.a %_DEST%\lib\lib*.a -..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib -..\%__SRC%\misc\*.map %_DEST%\bin\*.map ..\%__SRC%\misc\*.sym %_DEST%\bin\*.sym - -..\util\ucbhelper.xml %_DEST%\xml\ucbhelper.xml - -mkdir: %_DEST%\inc\ucbhelper -..\inc\ucbhelper\configurationkeys.hxx %_DEST%\inc\ucbhelper\configurationkeys.hxx -..\inc\ucbhelper\registerucb.hxx %_DEST%\inc\ucbhelper\registerucb.hxx -..\inc\ucbhelper\content.hxx %_DEST%\inc\ucbhelper\content.hxx -..\inc\ucbhelper\contentbroker.hxx %_DEST%\inc\ucbhelper\contentbroker.hxx -..\inc\ucbhelper\commandenvironment.hxx %_DEST%\inc\ucbhelper\commandenvironment.hxx -..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc\ucbhelper\contentidentifier.hxx -..\inc\ucbhelper\contenthelper.hxx %_DEST%\inc\ucbhelper\contenthelper.hxx -..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc\ucbhelper\contentidentifier.hxx -..\inc\ucbhelper\contentinfo.hxx %_DEST%\inc\ucbhelper\contentinfo.hxx -..\inc\ucbhelper\fileidentifierconverter.hxx %_DEST%\inc\ucbhelper\fileidentifierconverter.hxx -..\inc\ucbhelper\macros.hxx %_DEST%\inc\ucbhelper\macros.hxx -..\inc\ucbhelper\propertyvalueset.hxx %_DEST%\inc\ucbhelper\propertyvalueset.hxx -..\inc\ucbhelper\providerhelper.hxx %_DEST%\inc\ucbhelper\providerhelper.hxx -..\inc\ucbhelper\resultset.hxx %_DEST%\inc\ucbhelper\resultset.hxx -..\inc\ucbhelper\resultsetmetadata.hxx %_DEST%\inc\ucbhelper\resultsetmetadata.hxx -..\inc\ucbhelper\resultsethelper.hxx %_DEST%\inc\ucbhelper\resultsethelper.hxx -..\inc\ucbhelper\activedatasink.hxx %_DEST%\inc\ucbhelper\activedatasink.hxx -..\inc\ucbhelper\commandenvironmentproxy.hxx %_DEST%\inc\ucbhelper\commandenvironmentproxy.hxx -..\inc\ucbhelper\interactionrequest.hxx %_DEST%\inc\ucbhelper\interactionrequest.hxx -..\inc\ucbhelper\interceptedinteraction.hxx %_DEST%\inc\ucbhelper\interceptedinteraction.hxx -..\inc\ucbhelper\simpleinteractionrequest.hxx %_DEST%\inc\ucbhelper\simpleinteractionrequest.hxx -..\inc\ucbhelper\simpleauthenticationrequest.hxx %_DEST%\inc\ucbhelper\simpleauthenticationrequest.hxx -..\inc\ucbhelper\simplenameclashresolverequest.hxx %_DEST%\inc\ucbhelper\simplenameclashresolverequest.hxx -..\inc\ucbhelper\simplecertificatevalidationrequest.hxx %_DEST%\inc\ucbhelper\simplecertificatevalidationrequest.hxx -..\inc\ucbhelper\simpleioerrorrequest.hxx %_DEST%\inc\ucbhelper\simpleioerrorrequest.hxx -..\inc\ucbhelper\cancelcommandexecution.hxx %_DEST%\inc\ucbhelper\cancelcommandexecution.hxx -..\inc\ucbhelper\handleinteractionrequest.hxx %_DEST%\inc\ucbhelper\handleinteractionrequest.hxx -..\inc\ucbhelper\proxydecider.hxx %_DEST%\inc\ucbhelper\proxydecider.hxx -..\version.mk %_DEST%\inc\ucbhelper\version.mk -..\inc\ucbhelper\ucbhelperdllapi.h %_DEST%\inc\ucbhelper\ucbhelperdllapi.h diff --git a/ucbhelper/prj/makefile.mk b/ucbhelper/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/ucbhelper/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/ucbhelper/source/client/makefile.mk b/ucbhelper/source/client/makefile.mk deleted file mode 100644 index b8a535ba429c..000000000000 --- a/ucbhelper/source/client/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME= ucbhelper -TARGET= client -AUTOSEG= TRUE - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(header)" == "" - -SLOFILES=\ - $(SLO)$/content.obj \ - $(SLO)$/contentbroker.obj \ - $(SLO)$/commandenvironment.obj \ - $(SLO)$/fileidentifierconverter.obj \ - $(SLO)$/activedatasink.obj \ - $(SLO)$/activedatastreamer.obj \ - $(SLO)$/proxydecider.obj \ - $(SLO)$/interceptedinteraction.obj - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx deleted file mode 100644 index ae30c6b5b350..000000000000 --- a/ucbhelper/source/provider/configureucb.cxx +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucbhelper.hxx" -#include <ucbhelper/configureucb.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/ucb/XContentProvider.hpp> -#include <com/sun/star/ucb/XContentProviderManager.hpp> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <rtl/ustrbuf.hxx> - -#include "osl/diagnose.h" - -#include <provconf.hxx> -#include <registerucb.hxx> - -using namespace com::sun::star; - -namespace { - -bool fillPlaceholders(rtl::OUString const & rInput, - uno::Sequence< uno::Any > const & rReplacements, - rtl::OUString * pOutput) -{ - sal_Unicode const * p = rInput.getStr(); - sal_Unicode const * pEnd = p + rInput.getLength(); - sal_Unicode const * pCopy = p; - rtl::OUStringBuffer aBuffer; - while (p != pEnd) - switch (*p++) - { - case '&': - if (pEnd - p >= 4 - && p[0] == 'a' && p[1] == 'm' && p[2] == 'p' - && p[3] == ';') - { - aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('&')); - p += 4; - pCopy = p; - } - else if (pEnd - p >= 3 - && p[0] == 'l' && p[1] == 't' && p[2] == ';') - { - aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('<')); - p += 3; - pCopy = p; - } - else if (pEnd - p >= 3 - && p[0] == 'g' && p[1] == 't' && p[2] == ';') - { - aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('>')); - p += 3; - pCopy = p; - } - break; - - case '<': - sal_Unicode const * q = p; - while (q != pEnd && *q != '>') - ++q; - if (q == pEnd) - break; - rtl::OUString aKey(p, q - p); - rtl::OUString aValue; - bool bFound = false; - for (sal_Int32 i = 2; i + 1 < rReplacements.getLength(); - i += 2) - { - rtl::OUString aReplaceKey; - if ((rReplacements[i] >>= aReplaceKey) - && aReplaceKey == aKey - && (rReplacements[i + 1] >>= aValue)) - { - bFound = true; - break; - } - } - if (!bFound) - return false; - aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(aValue); - p = q + 1; - pCopy = p; - break; - } - aBuffer.append(pCopy, pEnd - pCopy); - *pOutput = aBuffer.makeStringAndClear(); - return true; -} - -} - -namespace ucbhelper { - -//============================================================================ -// -// configureUcb -// -//============================================================================ - -bool -configureUcb( - uno::Reference< ucb::XContentProviderManager > const & rManager, - uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory, - ContentProviderDataList const & rData, - ContentProviderRegistrationInfoList * pInfos) - throw (uno::RuntimeException) -{ - ContentProviderDataList::const_iterator aEnd(rData.end()); - for (ContentProviderDataList::const_iterator aIt(rData.begin()); - aIt != aEnd; ++aIt) - { - ContentProviderRegistrationInfo aInfo; - bool bSuccess = registerAtUcb(rManager, - rServiceFactory, - aIt->ServiceName, - aIt->Arguments, - aIt->URLTemplate, - &aInfo); - - if (bSuccess && pInfos) - pInfos->push_back(aInfo); - } - - return true; -} - -//============================================================================ -// -// configureUcb -// -//============================================================================ - -bool -configureUcb( - uno::Reference< ucb::XContentProviderManager > const & rManager, - uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory, - uno::Sequence< uno::Any > const & rArguments, - std::vector< ContentProviderRegistrationInfo > * pInfos) - throw (uno::RuntimeException) -{ - rtl::OUString aKey1; - rtl::OUString aKey2; - if (rArguments.getLength() < 2 - || !(rArguments[0] >>= aKey1) || !(rArguments[1] >>= aKey2)) - { - OSL_FAIL("ucb::configureUcb(): Bad arguments"); - return false; - } - - ContentProviderDataList aData; - if (!getContentProviderData(rServiceFactory, aKey1, aKey2, aData)) - { - OSL_FAIL("ucb::configureUcb(): No configuration"); - return false; - } - - ContentProviderDataList::const_iterator aEnd(aData.end()); - for (ContentProviderDataList::const_iterator aIt(aData.begin()); - aIt != aEnd; ++aIt) - { - rtl::OUString aProviderArguments; - if (fillPlaceholders(aIt->Arguments, - rArguments, - &aProviderArguments)) - { - ContentProviderRegistrationInfo aInfo; - bool bSuccess = registerAtUcb(rManager, - rServiceFactory, - aIt->ServiceName, - aProviderArguments, - aIt->URLTemplate, - &aInfo); - OSL_ENSURE(bSuccess, "ucb::configureUcb(): Bad content provider"); - - if (bSuccess && pInfos) - pInfos->push_back(aInfo); - } - else - OSL_FAIL("ucb::configureUcb(): Bad argument placeholders"); - } - - return true; -} - -} - -//============================================================================ -// -// unconfigureUcb -// -//============================================================================ - -namespace ucbhelper { - -void -unconfigureUcb( - uno::Reference< ucb::XContentProviderManager > const & rManager, - std::vector< ContentProviderRegistrationInfo > const & rInfos) - throw (uno::RuntimeException) -{ - std::vector< ContentProviderRegistrationInfo >::const_iterator - aEnd(rInfos.end()); - for (std::vector< ContentProviderRegistrationInfo >::const_iterator - aIt(rInfos.begin()); - aIt != aEnd; ++aIt) - deregisterFromUcb(rManager, *aIt); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/makefile.mk b/ucbhelper/source/provider/makefile.mk deleted file mode 100644 index 5999192f7bdb..000000000000 --- a/ucbhelper/source/provider/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME= ucbhelper -TARGET= provider -AUTOSEG= TRUE - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(header)" == "" - -SLOFILES=\ - $(SLO)$/contentidentifier.obj \ - $(SLO)$/providerhelper.obj \ - $(SLO)$/contenthelper.obj \ - $(SLO)$/contentinfo.obj \ - $(SLO)$/propertyvalueset.obj \ - $(SLO)$/registerucb.obj \ - $(SLO)$/resultsetmetadata.obj \ - $(SLO)$/resultset.obj \ - $(SLO)$/resultsethelper.obj \ - $(SLO)$/commandenvironmentproxy.obj \ - $(SLO)$/interactionrequest.obj \ - $(SLO)$/simpleinteractionrequest.obj \ - $(SLO)$/simpleauthenticationrequest.obj \ - $(SLO)$/simplenameclashresolverequest.obj \ - $(SLO)$/simpleioerrorrequest.obj \ - $(SLO)$/cancelcommandexecution.obj \ - $(SLO)$/handleinteractionrequest.obj \ - $(SLO)$/simplecertificatevalidationrequest.obj - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx deleted file mode 100644 index 3e89f9f70b4b..000000000000 --- a/ucbhelper/source/provider/provconf.cxx +++ /dev/null @@ -1,256 +0,0 @@ -/* -*- 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucbhelper.hxx" - -/************************************************************************** - TODO - ************************************************************************** - - *************************************************************************/ - -#include <provconf.hxx> -#include <osl/diagnose.h> -#include <rtl/ustrbuf.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -using namespace com::sun::star; - -//========================================================================= - -#define CONFIG_CONTENTPROVIDERS_KEY \ - "/org.openoffice.ucb.Configuration/ContentProviders" - -//========================================================================= - -namespace ucbhelper { - -void makeAndAppendXMLName( - rtl::OUStringBuffer & rBuffer, const rtl::OUString & rIn ) -{ - sal_Int32 nCount = rIn.getLength(); - for ( sal_Int32 n = 0; n < nCount; ++n ) - { - const sal_Unicode c = rIn.getStr()[ n ]; - switch ( c ) - { - case '&': - rBuffer.appendAscii( "&" ); - break; - - case '"': - rBuffer.appendAscii( """ ); - break; - - case '\'': - rBuffer.appendAscii( "'" ); - break; - - case '<': - rBuffer.appendAscii( "<" ); - break; - - case '>': - rBuffer.appendAscii( ">" ); - break; - - default: - rBuffer.append( c ); - break; - } - } -} - -//========================================================================= -bool getContentProviderData( - const uno::Reference< lang::XMultiServiceFactory > & rServiceMgr, - const rtl::OUString & rKey1, - const rtl::OUString & rKey2, - ContentProviderDataList & rListToFill ) -{ - if ( !rServiceMgr.is() || !rKey1.getLength() || !rKey2.getLength() ) - { - OSL_FAIL( "getContentProviderData - Invalid argument!" ); - return false; - } - - try - { - uno::Reference< lang::XMultiServiceFactory > xConfigProv( - rServiceMgr->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationProvider" )) ), - uno::UNO_QUERY ); - - if ( !xConfigProv.is() ) - { - OSL_FAIL( "getContentProviderData - No config provider!" ); - return false; - } - - rtl::OUStringBuffer aFullPath; - aFullPath.appendAscii( CONFIG_CONTENTPROVIDERS_KEY "/['" ); - makeAndAppendXMLName( aFullPath, rKey1 ); - aFullPath.appendAscii( "']/SecondaryKeys/['" ); - makeAndAppendXMLName( aFullPath, rKey2 ); - aFullPath.appendAscii( "']/ProviderData" ); - - uno::Sequence< uno::Any > aArguments( 1 ); - beans::PropertyValue aProperty; - aProperty.Name - = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); - aProperty.Value <<= aFullPath.makeStringAndClear(); - aArguments[ 0 ] <<= aProperty; - - uno::Reference< uno::XInterface > xInterface( - xConfigProv->createInstanceWithArguments( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationAccess" ) ), - aArguments ) ); - - if ( !xInterface.is() ) - { - OSL_FAIL( "getContentProviderData - No config access!" ); - return false; - } - - uno::Reference< container::XNameAccess > xNameAccess( - xInterface, uno::UNO_QUERY ); - - if ( !xNameAccess.is() ) - { - OSL_FAIL( "getContentProviderData - No XNameAccess!" ); - return false; - } - - uno::Sequence< rtl::OUString > aElems = xNameAccess->getElementNames(); - const rtl::OUString* pElems = aElems.getConstArray(); - sal_Int32 nCount = aElems.getLength(); - - if ( nCount > 0 ) - { - uno::Reference< container::XHierarchicalNameAccess > - xHierNameAccess( xInterface, uno::UNO_QUERY ); - - if ( !xHierNameAccess.is() ) - { - OSL_FAIL( "getContentProviderData - " - "No XHierarchicalNameAccess!" ); - return false; - } - - // Iterate over children. - for ( sal_Int32 n = 0; n < nCount; ++n ) - { - rtl::OUStringBuffer aElemBuffer; - aElemBuffer.appendAscii( "['" ); - makeAndAppendXMLName( aElemBuffer, pElems[ n ] ); - - try - { - ContentProviderData aInfo; - - // Obtain service name. - rtl::OUStringBuffer aKeyBuffer = aElemBuffer; - aKeyBuffer.appendAscii( "']/ServiceName" ); - - rtl::OUString aValue; - if ( !( xHierNameAccess->getByHierarchicalName( - aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) - { - OSL_FAIL( "getContentProviderData - " - "Error getting item value!" ); - continue; - } - - aInfo.ServiceName = aValue; - - // Obtain URL Template. - aKeyBuffer = aElemBuffer; - aKeyBuffer.appendAscii( "']/URLTemplate" ); - - if ( !( xHierNameAccess->getByHierarchicalName( - aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) - { - OSL_FAIL( "getContentProviderData - " - "Error getting item value!" ); - continue; - } - - aInfo.URLTemplate = aValue; - - // Obtain Arguments. - aKeyBuffer = aElemBuffer; - aKeyBuffer.appendAscii( "']/Arguments" ); - - if ( !( xHierNameAccess->getByHierarchicalName( - aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) - { - OSL_FAIL( "getContentProviderData - " - "Error getting item value!" ); - continue; - } - - aInfo.Arguments = aValue; - - // Append info to list. - rListToFill.push_back( aInfo ); - } - catch ( container::NoSuchElementException& ) - { - // getByHierarchicalName - - OSL_FAIL( "getContentProviderData - " - "caught NoSuchElementException!" ); - } - } - } - } - catch ( uno::RuntimeException& ) - { - OSL_FAIL( "getContentProviderData - caught RuntimeException!" ); - return false; - } - catch ( uno::Exception& ) - { - // createInstance, createInstanceWithArguments - - OSL_FAIL( "getContentProviderData - caught Exception!" ); - return false; - } - - return true; -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/util/makefile.mk b/ucbhelper/util/makefile.mk deleted file mode 100644 index 05fee92e83dc..000000000000 --- a/ucbhelper/util/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME= ucbhelper -TARGET= ucbhelper - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : ..$/version.mk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1FILES= $(SLB)$/client.lib \ - $(SLB)$/provider.lib - -SHL1TARGET= $(TARGET)$(UCBHELPER_MAJOR)$(COMID) -SHL1STDLIBS = \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALHELPERLIB) \ - $(SALLIB) - -SHL1DEPN= -.IF "$(COM)" == "MSC" -SHL1IMPLIB= i$(TARGET) -.ELSE -SHL1IMPLIB= $(TARGET)$(UCBHELPER_MAJOR)$(COMID) -.ENDIF -SHL1USE_EXPORTS=name -SHL1LIBS= $(LIB1TARGET) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt -DEFLIB1NAME= $(TARGET) -DEF1DES= Universal Content Broker - Helpers - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -# --- Filter ----------------------------------------------------------- - -$(MISC)$/$(SHL1TARGET).flt : ucbhelper.flt - @echo ------------------------------ - @echo Making: $@ - @$(TYPE) ucbhelper.flt > $@ - diff --git a/ucbhelper/util/ucbhelper.flt b/ucbhelper/util/ucbhelper.flt deleted file mode 100644 index a36cd4f87e65..000000000000 --- a/ucbhelper/util/ucbhelper.flt +++ /dev/null @@ -1,181 +0,0 @@ -_Impl -_impl -IMP -Dbg -DLL -getCppuType -cpp_queryInterface -cpp_acquire -cpp_release -_aType -unnamed -__CT -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -.cxx -??_R0?AV -??3@YAXPAX0@Z -?_M_allocate_and_copy@?$vector@ -?_M_insert_overflow@?$vector@ -?_M_fill_insert@?$vector@ -?_M_create_node@?$list@ -?_M_list@?$_Stl_prime@_N@_STL@@ -?__lower_bound@_STL@@ -?__uninitialized_copy_aux@_STL@@ -?__uninitialized_fill_n_aux@_STL@@ -??1?$_Vector_base@ -??0?$_Vector_base@ -??1?$_STL_alloc_proxy@ -??0?$_STL_alloc_proxy@ -??1?$allocator@ -??1?$pair@ -??0?$pair@ -??1?$vector@ -??1?$hash_map@ -??A?$hash_map@ -?get_allocator@ -?copy@_STL@@ -??1?$map@ -?erase@?$map@ -?make_pair@_STL@@ -??0?$_List_iterator@ -?__copy@_STL@@ -?__copy_backward@_STL@@ -?end@?$list@ -?insert@?$list@ -?deallocate@?$allocator@ -??0?$_Rb_tree_iterator@ -??1?$_Rb_tree_base@ -?_M_create_node@?$_Rb_tree@ -?_M_decrement@?$_Rb_global@ -?_M_empty_initialize@?$_Rb_tree@ -?_M_erase@?$_Rb_tree@ -?_Rebalance@?$_Rb_global@ -?_Rebalance_for_erase@?$_Rb_global@ -?destroy_node@?$_Rb_tree@ -?erase@?$_Rb_tree@ -?find@?$_Rb_tree@ -?insert_unique@?$_Rb_tree@ -?reserve@?$vector@ -??1?$Guard@VMutex@osl@@@osl@@ -??1?$ClearableGuard@VMutex@osl@@@osl@@ -??1Mutex@osl@@ -??1OUString@rtl@@ -??0OUString@rtl@@ -??8@YAEABVOUString@rtl@@ -?createFromAscii@OUString@rtl@@ -?copy@OUString@rtl@@ -?replaceAt@OUString@rtl@@ -?compareTo@OUString@rtl@@ -?toAsciiLowerCase@OUString@rtl@@ -??1OUStringBuffer@rtl@@ -?makeStringAndClear@OUStringBuffer@rtl@@ -?appendAscii@OUStringBuffer@rtl@@ -??1?$ORef@ -?s_pType@?$Sequence@ -??0?$Reference@ -??1?$Reference@ -??C?$Reference@ -?__query@?$Reference@ -?set@?$Reference@ -??0?$Sequence@ -??1?$Sequence@ -??A?$Sequence@V?$Reference@ -??1OTypeCollection@cppu@@ -?getTypes@OTypeCollection@cppu@@ -?queryInterface@cppu@@ -??0OWeakObject@cppu@@ -??3OWeakObject@cppu@@ -?makeAny@uno@star@sun@com@@ -??0Any@uno@star@sun@com@@ -??1Any@uno@star@sun@com@@ -??4Any@uno@star@sun@com@@ -??0Type@uno@star@sun@com@@ -??0Exception@uno@star@sun@com@@ -??1Exception@uno@star@sun@com@@ -??0RuntimeException@uno@star@sun@com@@ -??1RuntimeException@uno@star@sun@com@@ -??8BaseReference@uno@star@sun@com@@ -??1?$WeakImplHelper1@ -?acquire@?$WeakImplHelper1@ -?release@?$WeakImplHelper1@ -?getImplementationId@?$WeakImplHelper1@ -?getTypes@?$WeakImplHelper1@ -?queryInterface@?$WeakImplHelper1@ -?s_cd@?$WeakImplHelper1@ -??0OpenCommandArgument@ucb@star@sun@com@@ -??1Command@ucb@star@sun@com@@ -??1CommandInfo@ucb@star@sun@com@@ -??1ContentInfo@ucb@star@sun@com@@ -??1InsertCommandArgument@ucb@star@sun@com@@ -??1OpenCommandArgument2@ucb@star@sun@com@@ -??1OpenCommandArgument@ucb@star@sun@com@@ -??0EventObject@lang@star@sun@com@@ -??1EventObject@lang@star@sun@com@@ -??0IllegalArgumentException@lang@star@sun@com@@ -??1IllegalArgumentException@lang@star@sun@com@@ -??0IllegalTypeException@beans@star@sun@com@@ -??1IllegalTypeException@beans@star@sun@com@@ -??0NoSupportException@lang@star@sun@com@@ -??1NoSupportException@lang@star@sun@com@@ -??0NotRemoveableException@beans@star@sun@com@@ -??1NotRemoveableException@beans@star@sun@com@@ -??0PropertyExistException@beans@star@sun@com@@ -??1PropertyExistException@beans@star@sun@com@@ -??0UnknownPropertyException@beans@star@sun@com@@ -??1UnknownPropertyException@beans@star@sun@com@@ -??0UnsupportedCommandException@ucb@star@sun@com@@ -??1UnsupportedCommandException@ucb@star@sun@com@@ -??0ListenerAlreadySetException@ucb@star@sun@com@@ -??1ListenerAlreadySetException@ucb@star@sun@com@@ -??0ContentCreationException@ucb@star@sun@com@@ -??1ContentCreationException@ucb@star@sun@com@@ -??0ServiceNotFoundException@ucb@star@sun@com@@ -??1ServiceNotFoundException@ucb@star@sun@com@@ -??0SQLException@sdbc@star@sun@com@@ -??1SQLException@sdbc@star@sun@com@@ -??1InteractiveAugmentedIOException@ucb@star@sun@com@@ -??0CommandFailedException@ucb@star@sun@com@@ -??1CommandFailedException@ucb@star@sun@com@@ -??1ContentEvent@ucb@star@sun@com@@ -??1Property@beans@star@sun@com@@ -??0Property@beans@star@sun@com@@ -??1PropertyValue@beans@star@sun@com@@ -??1PropertySetInfoChangeEvent@beans@star@sun@com@@ -??1PropertyChangeEvent@beans@star@sun@com@@ -??4PropertyChangeEvent@beans@star@sun@com@@ -??1ListEvent@ucb@star@sun@com@@ -??1GlobalTransferCommandArgument@ucb@star@sun@com@@ -?m_pTheBroker@ContentBroker@ucb@@ -?getArray@?$Sequence@UPropertyChangeEvent@beans@star@sun@com@@ -??0Date@util@star@sun@com@@ -??0Time@util@star@sun@com@@ -??0DateTime@util@star@sun@com@@ -??0ClassifiedInteractionRequest@task@star@sun@com@@ -??1AuthenticationRequest@ucb@star@sun@com@@ -??1NameClashResolveRequest@ucb@star@sun@com@@ -_TI2?AVIllegalArgumentException@lang@star@sun@com@@ -_TI2?AVIllegalTypeException@beans@star@sun@com@@ -_TI2?AVNoSupportException@lang@star@sun@com@@ -_TI2?AVNotRemoveableException@beans@star@sun@com@@ -_TI2?AVPropertyExistException@beans@star@sun@com@@ -_TI2?AVUnknownPropertyException@beans@star@sun@com@@ -_TI2?AVUnsupportedCommandException@ucb@star@sun@com@@ -_TI2?AVSQLException@sdbc@star@sun@com@@ -_TI2?AVContentCreationException@ucb@star@sun@com@@ -_TI2?AVListenerAlreadySetException@ucb@star@sun@com@@ -_TI2?AVServiceNotFoundException@ucb@star@sun@com@@ -_TI2?AVCommandFailedException@ucb@star@sun@com@@ -_TI2?AVRuntimeException@uno@star@sun@com@@ -_real@4@00000000000000000000 -_real@8@00000000000000000000 -?makeAndAppendXMLName@ucb@@ -?CreateType@ diff --git a/ucbhelper/util/ucbhelper.xml b/ucbhelper/util/ucbhelper.xml deleted file mode 100644 index 8e13b5f7bc0c..000000000000 --- a/ucbhelper/util/ucbhelper.xml +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> -<module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - - <module-name> ucbhelper </module-name> - - <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> salhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> cppuhelper </project-build-dependency> - - <runtime-module-dependency> sal3 </runtime-module-dependency> - <runtime-module-dependency> salhelper3$(COM) </runtime-module-dependency> - <runtime-module-dependency> cppu3 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency> - - <service-dependency> - com.sun.star.configuration.ConfigurationAccess - </service-dependency> - <service-dependency> - com.sun.star.configuration.ConfigurationProvider - </service-dependency> - <service-dependency> - com.sun.star.script.Converter - </service-dependency> - <service-dependency> - com.sun.star.ucb.CachedDynamicResultSetStubFactory - </service-dependency> - <service-dependency> - com.sun.star.ucb.ContentProviderProxyFactory - </service-dependency> - <service-dependency> - com.sun.star.ucb.PropertiesManager - </service-dependency> - <service-dependency> - com.sun.star.ucb.Store - </service-dependency> - <service-dependency> - com.sun.star.ucb.UniversalContentBroker - </service-dependency> - - <type> com.sun.star.beans.PropertyAttribute </type> - <type> com.sun.star.beans.PropertySetInfoChange </type> - <type> com.sun.star.beans.PropertyValue </type> - <type> com.sun.star.beans.XPropertiesChangeNotifier </type> - <type> com.sun.star.beans.XPropertyAccess </type> - <type> com.sun.star.beans.XPropertyContainer </type> - <type> com.sun.star.beans.XPropertySetInfo </type> - <type> com.sun.star.beans.XPropertySetInfoChangeNotifier </type> - <type> com.sun.star.container.XChild </type> - <type> com.sun.star.container.XHierarchicalNameAccess </type> - <type> com.sun.star.container.XNameAccess </type> - <type> com.sun.star.container.XNamed </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.script.XTypeConverter </type> - <type> com.sun.star.sdbc.ColumnValue </type> - <type> com.sun.star.sdbc.DataType </type> - <type> com.sun.star.sdbc.XCloseable </type> - <type> com.sun.star.sdbc.XColumnLocate </type> - <type> com.sun.star.sdbc.XResultSetMetaData </type> - <type> com.sun.star.sdbc.XResultSetMetaDataSupplier </type> - <type> com.sun.star.sdbc.XRow </type> - <type> com.sun.star.task.XInteractionAbort </type> - <type> com.sun.star.task.XInteractionApprove </type> - <type> com.sun.star.task.XInteractionDisapprove </type> - <type> com.sun.star.task.XInteractionHandler </type> - <type> com.sun.star.task.XInteractionRequest </type> - <type> com.sun.star.task.XInteractionRetry </type> - <type> com.sun.star.ucb.AuthenticationRequest </type> - <type> com.sun.star.ucb.CommandFailedException </type> - <type> com.sun.star.ucb.CommandInfoChange </type> - <type> com.sun.star.ucb.ContentAction </type> - <type> com.sun.star.ucb.ContentCreationError </type> - <type> com.sun.star.ucb.ContentCreationException </type> - <type> com.sun.star.ucb.GlobalTransferCommandArgument </type> - <type> com.sun.star.ucb.InsertCommandArgument </type> - <type> com.sun.star.ucb.InteractiveAugmentedIOException </type> - <type> com.sun.star.ucb.InteractiveIOException </type> - <type> com.sun.star.ucb.ListActionType </type> - <type> com.sun.star.ucb.NameClash </type> - <type> com.sun.star.ucb.NameClashResolveRequest </type> - <type> com.sun.star.ucb.OpenCommandArgument2 </type> - <type> com.sun.star.ucb.OpenMode </type> - <type> com.sun.star.ucb.ResultSetException </type> - <type> com.sun.star.ucb.WelcomeDynamicResultSetStruct </type> - <type> com.sun.star.ucb.XCachedDynamicResultSetStubFactory </type> - <type> com.sun.star.ucb.XCommandEnvironment </type> - <type> com.sun.star.ucb.XCommandInfo </type> - <type> com.sun.star.ucb.XCommandInfoChangeNotifier </type> - <type> com.sun.star.ucb.XCommandProcessor </type> - <type> com.sun.star.ucb.XContentAccess </type> - <type> com.sun.star.ucb.XContentCreator </type> - <type> com.sun.star.ucb.XContentIdentifierFactory </type> - <type> com.sun.star.ucb.XContentProvider </type> - <type> com.sun.star.ucb.XContentProviderFactory </type> - <type> com.sun.star.ucb.XContentProviderManager </type> - <type> com.sun.star.ucb.XDynamicResultSet </type> - <type> com.sun.star.ucb.XFileIdentifierConverter </type> - <type> com.sun.star.ucb.XInteractionReplaceExistingData </type> - <type> com.sun.star.ucb.XInteractionSupplyAuthentication </type> - <type> com.sun.star.ucb.XInteractionSupplyName </type> - <type> com.sun.star.ucb.XParameterizedContentProvider </type> - <type> com.sun.star.ucb.XPropertySetRegistryFactory </type> - <type> com.sun.star.ucb.XSourceInitialization </type> - <type> com.sun.star.uno.RuntimeException </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.util.XChangesListener </type> - <type> com.sun.star.util.XChangesNotifier </type> -</module-description> diff --git a/ucbhelper/version.mk b/ucbhelper/version.mk deleted file mode 100644 index 49f6f0fa67ad..000000000000 --- a/ucbhelper/version.mk +++ /dev/null @@ -1,42 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -UCBHELPER_TARGET=ucbhelper - -# the major -UCBHELPER_MAJOR=4 -# the minor -UCBHELPER_MINOR=0 -# the micro -UCBHELPER_MICRO=0 - -# this is a c++ compatible library -UCBHELPER_CPP=1 - -UCBHELPER=$(UCBHELPER_TARGET)_$(CMPEXT) - -LIBUCBHELPER_UNX=lib$(UCBHELPER).a.$(UCBHELPER_MAJOR) -LIBUCBHELPER_WIN=$(UCBHELPER_TARGET)$(UCBHELPER_MAJOR)$(CMPEXT).dll diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk index cc968c7f49c9..3f23994c9d91 100644 --- a/unotools/JunitTest_unotools_complex.mk +++ b/unotools/JunitTest_unotools_complex.mk @@ -1,50 +1,55 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +#************************************************************************* # -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. +# OpenOffice.org - a multi-platform office productivity suite # -# The Initial Developer of the Original Code is -# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. +# This file is part of OpenOffice.org. # -# Major Contributor(s): +# 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. # -# For minor contributions see the git repository. +# 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). # -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. +# 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_JunitTest_JunitTest,unotools_complex,SRCDIR)) -$(eval $(call gb_JunitTest_JunitTest,unotools_complex)) +$(eval $(call gb_JunitTest_set_defs,unotools_complex,\ + $$(DEFS) \ +)) $(eval $(call gb_JunitTest_add_jars,unotools_complex,\ - $(OUTDIR)/bin/OOoRunner.jar \ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/test.jar \ - $(OUTDIR)/bin/unoil.jar \ - $(OUTDIR)/bin/jurt.jar \ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/test-tools.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ )) $(eval $(call gb_JunitTest_add_sourcefiles,unotools_complex,\ - unotools/qa/complex/tempfile/TempFileUnitTest \ - unotools/qa/complex/tempfile/Test01 \ - unotools/qa/complex/tempfile/Test02 \ - unotools/qa/complex/tempfile/TempFileTest \ - unotools/qa/complex/tempfile/TestHelper \ + unotools/qa/complex/tempfile/TempFileTest \ + unotools/qa/complex/tempfile/TempFileUnitTest \ + unotools/qa/complex/tempfile/Test01 \ + unotools/qa/complex/tempfile/Test02 \ + unotools/qa/complex/tempfile/TestHelper \ )) $(eval $(call gb_JunitTest_add_classes,unotools_complex,\ - complex.tempfile.TempFileUnitTest \ + complex.tempfile.TempFileUnitTest \ )) # vim: set noet sw=4 ts=4: diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index b77a8ebb6826..75c5ab1f5953 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -25,20 +25,31 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. +# declare a library +# utl is the name of the library as it is found in Repository.mk $(eval $(call gb_Library_Library,utl)) +# declare packages that will be delivered before compilation of utl +# learn more about TYPE in the Package.mk template $(eval $(call gb_Library_add_package_headers,utl,unotools_inc)) +# for platforms supporting PCH: declare the location of the pch file +# this is the name of the cxx file (without extension) $(eval $(call gb_Library_add_precompiled_header,utl,$(SRCDIR)/unotools/inc/pch/precompiled_unotools)) +# in case UNO services are exported: declare location of component file +$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl)) + +# add any additional include paths for this library here $(eval $(call gb_Library_set_include,utl,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/unotools/inc/pch) \ -I$(OUTDIR)/inc \ )) -$(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 \ )) @@ -47,6 +58,8 @@ $(eval $(call gb_Library_add_api,utl,\ 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 \ @@ -59,8 +72,8 @@ $(eval $(call gb_Library_add_linked_libs,utl,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl)) - +# add all source files that shall be compiled with exceptions enabled +# the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/accessibility/accessiblerelationsethelper \ unotools/source/accessibility/accessiblestatesethelper \ diff --git a/unotools/Module_unotools.mk b/unotools/Module_unotools.mk index 849767cfe636..948b5b1f624c 100644 --- a/unotools/Module_unotools.mk +++ b/unotools/Module_unotools.mk @@ -1,9 +1,6 @@ # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ +# OpenOffice.org - a multi-platform office productivity suite # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 7a34ee739461..3673218468aa 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,desktop_detector,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,desktop_detector,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,desktop_detector,\ -DDESKTOP_DETECTOR_IMPLEMENTATION \ )) @@ -58,8 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -70,8 +67,14 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\ Xext \ SM \ ICE \ + $(gb_STDLIBS) \ )) +$(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 19c1c9e7fcf6..7ca41baa4b62 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -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)) @@ -56,15 +56,14 @@ $(eval $(call gb_Library_set_include,vcl,\ -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 -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DVCL_DLLIMPLEMENTATION \ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \ -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \ @@ -83,8 +82,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -94,10 +91,14 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_externals,vcl,\ + icule \ + icuuc \ +) + ifeq ($(GUIBASE),aqua) -$(eval $(call gb_Library_set_cxxflags,vcl,\ - $$(CXXFLAGS) \ - $$(OBJCXXFLAGS) \ +$(eval $(call gb_Library_add_cxxflags,vcl,\ + $(gb_OBJCXXFLAGS) \ )) $(eval $(call gb_Library_add_objcxxobjects,vcl,\ vcl/aqua/source/a11y/aqua11yactionwrapper \ @@ -169,16 +170,14 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ endif ifeq ($(GUIBASE),unx) -$(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)\" \ )) ## handle CUPS ifneq ($(ENABLE_CUPS),) -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DENABLE_CUPS \ )) endif @@ -443,34 +442,28 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ 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,\ vcl/source/glyphs/graphite_features \ vcl/source/glyphs/graphite_layout \ )) + +# handle X11 platforms, which have additional files and possibly system graphite ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/glyphs/graphite_serverfont \ )) -ifeq ($(SYSTEM_GRAPHITE),YES) -$(eval $(call gb_Library_set_ldflags,vcl,\ - $$(LDFLAGS) \ - $(GRAPHITE_LIBS) -)) -else -$(eval $(call gb_Library_add_linked_static_libs,vcl,\ - graphite2_off \ -)) -endif else $(eval $(call gb_Library_add_linked_libs,vcl,\ graphite2_off \ version \ )) endif + +$(call gb_Library_use_external,vcl,graphite) endif ## handle Cairo @@ -539,13 +532,11 @@ endif ifeq ($(OS),SOLARIS) ifeq ($(CPUNAME)$(CPU),SPARCU) -$(eval $(call gb_Library_set_ldflags,vcl,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_ldflags,vcl,\ -R/usr/sfw/lib/64 \ )) else -$(eval $(call gb_Library_set_ldflags,vcl,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_ldflags,vcl,\ -R/usr/sfw/lib \ )) endif @@ -555,8 +546,7 @@ ifeq ($(GUIBASE),aqua) $(eval $(call gb_Library_add_linked_libs,vcl,\ AppleRemote \ )) -$(eval $(call gb_Library_set_ldflags,vcl,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vcl,\ -framework QuickTime \ -framework Cocoa \ -framework Carbon \ @@ -566,8 +556,7 @@ endif ifeq ($(OS),WNT) ifeq ($(COM),MSC) -$(eval $(call gb_Library_set_ldflags,vcl,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_ldflags,vcl,\ /ENTRY:LibMain@12 \ )) endif diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index d1954004b3d3..819d9ce8c301 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -64,11 +62,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ $(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) \ @@ -134,30 +132,26 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/window/salobj \ )) -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ -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) -$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_set_include,vclplug_gen,\ + $$(INCLUDE) \ $$(XRANDR_CFLAGS) \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ $(XRANDR_LIBS) \ )) else -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DXRANDR_DLOPEN \ )) endif @@ -167,37 +161,31 @@ endif ifneq ($(USE_XINERAMA),NO) ifneq ($(OS),SOLARIS) # not Solaris -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XORG \ )) ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -lXinerama \ )) else -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif else # Solaris -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XSUN \ )) ifeq ($(USE_XINERAMA_VERSION),Xorg) # Solaris, Xorg ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -lXinerama \ )) else -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif @@ -207,12 +195,10 @@ endif ## handle Render linking ifeq ($(XRENDER_LINK),YES) -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DXRENDER_LINK \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ $(shell pkg-config --libs xrender) \ )) endif diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index da001a220565..d9674f03cb8e 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -35,13 +35,12 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_set_include,vclplug_gtk,\ + $$(INCLUDE) \ $$(GTK_CFLAGS) \ )) -$(eval $(call gb_Library_set_defs,vclplug_gtk,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DVCLPLUG_GTK_IMPLEMENTATION \ -DVERSION=\"$(UPD)$(LAST_MINOR)\" \ )) @@ -51,12 +50,10 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ $$(INCLUDE) \ $(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \ )) -$(eval $(call gb_Library_set_defs,vclplug_gtk,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DENABLE_DBUS \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ $(shell pkg-config --libs dbus-glib-1)\ )) endif @@ -66,8 +63,7 @@ $(eval $(call gb_Library_add_api,vclplug_gtk,\ udkapi \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ $$(GTK_LIBS) \ $$(GTHREAD_LIBS) \ )) @@ -82,8 +78,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -97,6 +91,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_externals,vclplug_gtk,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/a11y/atkaction \ vcl/unx/gtk/a11y/atkbridge \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index bcec46732b7d..e4586b8a108b 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -35,13 +35,12 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_set_include,vclplug_kde,\ + $$(INCLUDE) \ $$(KDE_CFLAGS) \ )) -$(eval $(call gb_Library_set_defs,vclplug_kde,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_kde,\ -DVCLPLUG_KDE_IMPLEMENTATION \ )) @@ -50,9 +49,8 @@ $(eval $(call gb_Library_add_api,vclplug_kde,\ 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,\ @@ -65,8 +63,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -79,6 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ ICE \ )) +$(call gb_Library_use_externals,vclplug_kde,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ vcl/unx/kde/kdedata \ vcl/unx/kde/salnativewidgets-kde \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index c075ca3ba4e1..bbc64aabcbdc 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -38,13 +38,12 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\ -I$(WORKDIR)/CustomTarget/vcl/unx/kde4 \ )) -$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_set_include,vclplug_kde4,\ + $$(INCLUDE) \ $$(KDE4_CFLAGS) \ )) -$(eval $(call gb_Library_set_defs,vclplug_kde4,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_kde4,\ -DVCLPLUG_KDE4_IMPLEMENTATION \ )) @@ -53,9 +52,8 @@ $(eval $(call gb_Library_add_api,vclplug_kde4,\ 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,\ @@ -68,8 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -82,6 +78,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ ICE \ )) +$(call gb_Library_use_externals,vclplug_kde4,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ vcl/unx/kde4/KDEData \ vcl/unx/kde4/KDESalDisplay \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 8c222ad05b9b..7616e6c06025 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,vclplug_svp,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_svp,\ -DVCLPLUG_SVP_IMPLEMENTATION \ )) @@ -56,8 +55,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ basebmp \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -71,6 +68,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_externals,vclplug_svp,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\ vcl/unx/headless/svpbmp \ vcl/unx/headless/svpdummies \ diff --git a/vcl/Package_afmhash.mk b/vcl/Package_afmhash.mk index d3de8357eb93..38b9f0db7896 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: diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index e103a6b3e387..2424d373b24e 100644 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -458,37 +458,51 @@ - (void)applicationWillBecomeActive:(NSNotification *)pNotification { (void)pNotification; - if (GetSalData()->mpMainController->remoteControl) { - + SalData* pSalData = GetSalData(); + if (pSalData->mpMainController->remoteControl) + { // [remoteControl startListening: self]; // does crash because the right thing to do is // [GetSalData()->mpMainController->remoteControl startListening: self]; // but the instance variable 'remoteControl' is declared protected // workaround : declare remoteControl instance variable as public in RemoteMainController.m - [GetSalData()->mpMainController->remoteControl startListening: self]; + [pSalData->mpMainController->remoteControl startListening: self]; #ifdef DEBUG NSLog(@"Apple Remote will become active - Using remote controls"); #endif } + for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin(); + it != pSalData->maPresentationFrames.end(); ++it ) + { + [(*it)->mpWindow setLevel: NSPopUpMenuWindowLevel]; + if( [(*it)->mpWindow isVisible] ) + [(*it)->mpWindow orderFront: NSApp]; + } } - (void)applicationWillResignActive:(NSNotification *)pNotification { (void)pNotification; - if (GetSalData()->mpMainController->remoteControl) { - + SalData* pSalData = GetSalData(); + if (pSalData->mpMainController->remoteControl) + { // [remoteControl stopListening: self]; // does crash because the right thing to do is // [GetSalData()->mpMainController->remoteControl stopListening: self]; // but the instance variable 'remoteControl' is declared protected // workaround : declare remoteControl instance variable as public in RemoteMainController.m - [GetSalData()->mpMainController->remoteControl stopListening: self]; + [pSalData->mpMainController->remoteControl stopListening: self]; #ifdef DEBUG NSLog(@"Apple Remote will resign active - Releasing remote controls"); #endif } + for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin(); + it != pSalData->maPresentationFrames.end(); ++it ) + { + [(*it)->mpWindow setLevel: NSNormalWindowLevel]; + } } - (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index b47619b45657..3f8829b1e72b 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -2269,8 +2269,8 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, rInfo.m_aFontBBox = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ), Point( aTTInfo.xMax, aTTInfo.yMax ) ); rInfo.m_nCapHeight = aTTInfo.yMax; // Well ... - rInfo.m_nAscent = +aTTInfo.winAscent; - rInfo.m_nDescent = -aTTInfo.winDescent; + rInfo.m_nAscent = aTTInfo.winAscent; + rInfo.m_nDescent = aTTInfo.winDescent; // mac fonts usually do not have an OS2-table // => get valid ascent/descent values from other tables if( !rInfo.m_nAscent ) diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index 5183cb9d9a4c..5011564a9065 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -183,74 +183,6 @@ sal_Bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* ) // ----------------------------------------------------------------------- -static struct PaperSizeEntry -{ - double fWidth; - double fHeight; - Paper nPaper; -} aPaperSizes[] = -{ - { 842, 1191, PAPER_A3 }, - { 595, 842, PAPER_A4 }, - { 420, 595, PAPER_A5 }, - { 612, 792, PAPER_LETTER }, - { 612, 1008, PAPER_LEGAL }, - { 728, 1032, PAPER_B4_JIS }, - { 516, 729, PAPER_B5_JIS }, - { 792, 1224, PAPER_TABLOID } -}; - -static bool getPaperSize( double& o_fWidth, double& o_fHeight, const Paper i_ePaper ) -{ - for(unsigned int i = 0; i < SAL_N_ELEMENTS(aPaperSizes); i++ ) - { - if( aPaperSizes[i].nPaper == i_ePaper ) - { - o_fWidth = aPaperSizes[i].fWidth; - o_fHeight = aPaperSizes[i].fHeight; - return true; - } - } - return false; -} - -static Paper recognizePaper( double i_fWidth, double i_fHeight ) -{ - Paper aPaper = PAPER_USER; - sal_uInt64 nPaperDesc = 1000000*sal_uInt64(i_fWidth) + sal_uInt64(i_fHeight); - switch( nPaperDesc ) - { - case 842001191: aPaper = PAPER_A3; break; - case 595000842: aPaper = PAPER_A4; break; - case 420000595: aPaper = PAPER_A5; break; - case 612000792: aPaper = PAPER_LETTER; break; - case 728001032: aPaper = PAPER_B4_JIS; break; - case 516000729: aPaper = PAPER_B5_JIS; break; - case 612001008: aPaper = PAPER_LEGAL; break; - case 792001224: aPaper = PAPER_TABLOID; break; - default: - aPaper = PAPER_USER; - break; - } - - if( aPaper == PAPER_USER ) - { - // search with fuzz factor - for( unsigned int i = 0; i < SAL_N_ELEMENTS(aPaperSizes); i++ ) - { - double w = (i_fWidth > aPaperSizes[i].fWidth) ? i_fWidth - aPaperSizes[i].fWidth : aPaperSizes[i].fWidth - i_fWidth; - double h = (i_fHeight > aPaperSizes[i].fHeight) ? i_fHeight - aPaperSizes[i].fHeight : aPaperSizes[i].fHeight - i_fHeight; - if( w < 3 && h < 3 ) - { - aPaper = aPaperSizes[i].nPaper; - break; - } - } - } - - return aPaper; -} - sal_Bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) { // FIXME: implement driver data @@ -269,7 +201,9 @@ sal_Bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) NSSize aPaperSize = [mpPrintInfo paperSize]; double width = aPaperSize.width, height = aPaperSize.height; // set paper - io_pSetupData->mePaperFormat = recognizePaper( width, height ); + PaperInfo aInfo( PtTo10Mu( width ), PtTo10Mu( height ) ); + aInfo.doSloppyFit(); + io_pSetupData->mePaperFormat = aInfo.getPaper(); if( io_pSetupData->mePaperFormat == PAPER_USER ) { io_pSetupData->mnPaperWidth = PtTo10Mu( width ); @@ -345,10 +279,9 @@ sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetu } else { - double w = 595, h = 842; - getPaperSize( w, h, io_pSetupData->mePaperFormat ); - width = static_cast<long>(PtTo10Mu( w )); - height = static_cast<long>(PtTo10Mu( h )); + PaperInfo aInfo( io_pSetupData->mePaperFormat ); + width = aInfo.getWidth(); + height = aInfo.getHeight(); } setPaperSize( width, height, mePageOrientation ); diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 095427cb1d23..6c06339445a4 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -121,6 +121,7 @@ AquaSalFrame::~AquaSalFrame() SalData* pSalData = GetSalData(); pSalData->maFrames.remove( this ); pSalData->maFrameCheck.erase( this ); + pSalData->maPresentationFrames.remove( this ); DBG_ASSERT( this != s_pCaptureFrame, "capture frame destroyed" ); if( this == s_pCaptureFrame ) @@ -852,13 +853,15 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart ) if( bStart ) { + GetSalData()->maPresentationFrames.push_back( this ); mpActivityTimer.reset( new PreventSleepTimer() ); - [mpWindow setLevel: NSScreenSaverWindowLevel]; + [mpWindow setLevel: NSPopUpMenuWindowLevel]; if( mbShown ) [mpWindow makeMainWindow]; } else { + GetSalData()->maPresentationFrames.remove( this ); mpActivityTimer.reset(); [mpWindow setLevel: NSNormalWindowLevel]; } diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx index ea831f593bfb..5c6fb32acb9d 100644 --- a/vcl/inc/aqua/saldata.hxx +++ b/vcl/inc/aqua/saldata.hxx @@ -84,8 +84,9 @@ struct SalData SALTIMERPROC mpTimerProc; // timer callback proc AquaSalInstance *mpFirstInstance; // pointer of first instance - std::list<AquaSalFrame*> maFrames; // pointer of first frame + std::list<AquaSalFrame*> maFrames; // list of all frames boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance + std::list<AquaSalFrame*> maPresentationFrames; // list of frames in presentation mode SalObject *mpFirstObject; // pointer of first object window SalVirtualDevice *mpFirstVD; // first VirDev SalPrinter *mpFirstPrinter; // first printing printer diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 91aec0e83ba5..e315609165c5 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -10213,9 +10213,6 @@ void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch updateGraphicsState(); - if( m_aGraphicsStack.front().m_aLineColor == Color( COL_TRANSPARENT ) && - m_aGraphicsStack.front().m_aFillColor == Color( COL_TRANSPARENT ) ) - return; if( rPolyPoly.Count() ) { PolyPolygon aPolyPoly( rPolyPoly ); diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index bfb28b5b6996..2001968c60e8 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -1227,6 +1227,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, aMapVDev.EnableOutput(sal_False); VirtualDevice aPaintVDev; // into this one, we render. + aPaintVDev.SetBackground( aBackgroundComponent.aBgColor ); rOutMtf.AddAction( new MetaPushAction( PUSH_MAPMODE ) ); rOutMtf.AddAction( new MetaMapModeAction() ); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 3e701ec22d1e..5943c1749761 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2867,8 +2867,8 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, ::GetTTGlobalFontInfo( aSftTTF.get(), &aTTInfo ); rInfo.m_nFontType = FontSubsetInfo::SFNT_TTF; rInfo.m_aPSName = ImplSalGetUniString( aTTInfo.psname ); - rInfo.m_nAscent = +aTTInfo.winAscent; - rInfo.m_nDescent = -aTTInfo.winDescent; + rInfo.m_nAscent = aTTInfo.winAscent; + rInfo.m_nDescent = aTTInfo.winDescent; rInfo.m_aFontBBox = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ), Point( aTTInfo.xMax, aTTInfo.yMax ) ); rInfo.m_nCapHeight = aTTInfo.yMax; // Well ... |