Propchange: openoffice/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 7 19:24:03 2016 @@ -1,7 +1,9 @@ -/incubator/ooo/branches/gbuild:1409397 +/incubator/ooo/branches/gbuild:1409313-1413470 /openoffice/branches/AOO400:1503684 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666 /openoffice/branches/alg_writerframes:1556289-1579189 +/openoffice/branches/gbuild:1413471 +/openoffice/branches/gbuild-reintegration:1731503-1755453 /openoffice/branches/ia2:1417739-1541842 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
Modified: openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch (original) +++ openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch Sun Aug 7 19:24:03 2016 @@ -1,6 +1,6 @@ --- misc/apr-util-1.5.4/Library_apr-util.mk 2012-01-05 14:49:40.529219100 +0100 +++ misc/build/apr-util-1.5.4/Library_apr-util.mk 2012-01-05 14:47:18.621102400 +0100 -@@ -1 +1,90 @@ +@@ -1 +1,89 @@ -dummy +#/************************************************************** +# * @@ -34,8 +34,7 @@ + -I$(OUTDIR)/inc/apr \ +)) + -+$(eval $(call gb_Library_set_defs,apr-util,\ -+ $$(DEFS) \ ++$(eval $(call gb_Library_add_defs,apr-util,\ + -DAPU_DECLARE_EXPORT -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS \ +)) + Modified: openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk (original) +++ openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk Sun Aug 7 19:24:03 2016 @@ -31,15 +31,10 @@ $(eval $(call gb_Library_set_include,gte -I./include \ )) -$(eval $(call gb_Library_set_defs,gtest,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,gtest,\ -DGTEST_CREATE_SHARED_LIBRARY=1 \ )) -$(eval $(call gb_Library_set_ldflags,gtest,\ - $$(LDFLAGS) \ -)) - $(eval $(call gb_Library_add_linked_libs,gtest,\ kernel32 msvcrt oldnames \ $(gb_Library_STLLIBS) \ Modified: openoffice/trunk/ext_libraries/ratscan/scan/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/ratscan/scan/makefile.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/ext_libraries/ratscan/scan/makefile.mk (original) +++ openoffice/trunk/ext_libraries/ratscan/scan/makefile.mk Sun Aug 7 19:24:03 2016 @@ -48,7 +48,7 @@ $(MISC)/aoo-$(version)_rat-scan-output.h @echo @echo Find rat scan report in $@ -$(MISC)/rat-scan-output.xml : rat-scan.xml $(SRC_ROOT)/rat-excludes +$(MISC)/rat-scan-output.xml .PHONY : rat-scan.xml $(SRC_ROOT)/rat-excludes $(ANT) -f rat-scan.xml -DRAT_SCAN_OUTPUT=$@ -DRAT_JAR_HOME=$(rat_jar_home) $(MISC)/excluded-files.txt : $(MISC)/excluded-files-raw.txt Modified: openoffice/trunk/ext_libraries/serf/win/Library_serf.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/win/Library_serf.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/ext_libraries/serf/win/Library_serf.mk (original) +++ openoffice/trunk/ext_libraries/serf/win/Library_serf.mk Sun Aug 7 19:24:03 2016 @@ -31,8 +31,7 @@ $(eval $(call gb_Library_set_include,ser -I$(OUTDIR)/inc/external/zlib \ )) -$(eval $(call gb_Library_set_defs,serf,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,serf,\ -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS \ )) @@ -44,8 +43,7 @@ $(FIXED_DEF_FILE) : $(ORIGINAL_DEF_FILE) cp $< $@ echo serf_bucket_request_set_CL >> $@ -$(eval $(call gb_Library_set_ldflags,serf,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_ldflags,serf,\ -DEF:$(FIXED_DEF_FILE) \ )) Modified: openoffice/trunk/main/GNUmakefile URL: http://svn.apache.org/viewvc/openoffice/trunk/main/GNUmakefile?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/GNUmakefile (original) +++ openoffice/trunk/main/GNUmakefile Sun Aug 7 19:24:03 2016 @@ -19,13 +19,21 @@ # #************************************************************** +# if no environment is set, try to find one, source it and re-exec ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif + +all: + if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi && \ + if test -z "$${SOLARENV}"; then echo "No environment set!"; exit 1; fi && \ + $(MAKE) + +else # SOLARENV GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk $(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/Module_*.mk)))) +endif # SOLARENV + # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/Module_ooo.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/Module_ooo.mk (original) +++ openoffice/trunk/main/Module_ooo.mk Sun Aug 7 19:24:03 2016 @@ -24,25 +24,46 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ + basebmp \ + basegfx \ + canvas \ comphelper \ + cppcanvas \ + dbaccess \ drawinglayer \ - svgio \ - editeng \ + editeng \ + formula \ framework \ + idl \ + linguistic \ + offapi \ + oovbaapi \ + oox \ padmin \ + reportdesign \ + sax \ + sd \ sfx2 \ - sot \ + sot \ + starmath \ + svgio \ svl \ svtools \ svx \ sw \ toolkit \ tools \ - vcl \ + ucbhelper \ + udkapi \ + unotools \ unoxml \ + vbahelper \ + vcl \ + wizards \ + writerfilter \ xmloff \ - vbahelper \ - formula \ + xmlreader \ + xmlscript \ )) # vim: set noet ts=4 sw=4: Modified: openoffice/trunk/main/Repository.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/Repository.mk (original) +++ openoffice/trunk/main/Repository.mk Sun Aug 7 19:24:03 2016 @@ -31,6 +31,7 @@ $(eval $(call gb_Helper_register_executa mkunroll \ rscdep \ so_checksum \ + svidl \ sspretty \ )) @@ -40,16 +41,26 @@ $(eval $(call gb_Helper_register_executa $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ AppleRemote \ + adabas \ + adabasui \ + agg \ avmedia \ - basegfx \ basebmp \ + basegfx \ canvastools \ cppcanvas \ cui \ + dba \ + dbaxml \ + dbmm \ + dbui \ + dbpool \ + dbtools \ desktop_detector \ drawinglayer \ svgio \ editeng \ + file \ for \ forui \ fwe \ @@ -61,10 +72,20 @@ $(eval $(call gb_Helper_register_librari lng \ msfilter \ msword \ + odbc \ + odbcbase \ + oox \ qstart_gtk \ + rpt \ + rptui \ + rptxml \ sax \ sb \ + sdbc \ + sdbt \ sfx \ + sm \ + smd \ sot \ spa \ svl \ @@ -74,6 +95,10 @@ $(eval $(call gb_Helper_register_librari sw \ swd \ swui \ + sd \ + sdd \ + sdui \ + sdfilt \ textconversiondlgs \ ootk \ tl \ @@ -81,6 +106,7 @@ $(eval $(call gb_Helper_register_librari unordf \ unoxml \ vbahelper \ + writerfilter \ vcl \ vclplug_gen \ vclplug_gtk \ @@ -93,14 +119,10 @@ $(eval $(call gb_Helper_register_librari )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ - xml2 \ + xmlreader \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icuuc \ - icule \ - rdf \ - xslt \ )) @@ -123,11 +145,22 @@ $(eval $(call gb_Helper_register_librari )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ + cairocanvas \ + canvasfactory \ + directx5canvas \ + directx9canvas \ + expwrap \ + fastsax \ fsstorage \ + gdipluscanvas \ hatchwindowfactory \ + nullcanvas \ passwordcontainer \ + simplecanvas \ vbaswobj \ msforms \ + vclcanvas \ + writerfilter_debug \ )) @@ -138,11 +171,9 @@ $(eval $(call gb_Helper_register_librari )) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - jpeglib \ + basegfx_s \ ooopathutils \ salcpprt \ - zlib \ - graphite \ vclmain \ )) Modified: openoffice/trunk/main/RepositoryFixes.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/RepositoryFixes.mk (original) +++ openoffice/trunk/main/RepositoryFixes.mk Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ # not follow any of the established nameschemes ifeq ($(OS),LINUX) + gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) @@ -32,20 +33,28 @@ gb_Library_FILENAMES := $(patsubst jvmfw gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES)) gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) -endif +endif # ifeq ($(OS),LINUX) + +ifeq ($(OS),SOLARIS) +gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) +#$(info libnames: $(gb_Library_FILENAMES)) + +endif ifeq ($(OS),MACOSX) + gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++ gb_Library_FILENAMES := $(patsubst stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES)) @@ -54,11 +63,12 @@ gb_Library_FILENAMES := $(patsubst stl:% endif gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) -endif - +endif # ifeq ($(OS),MACOSX) ifeq ($(OS),WNT) + ifneq ($(USE_MINGW),) + gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) @@ -69,6 +79,8 @@ gb_Library_FILENAMES := $(patsubst svt:i gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) @@ -76,18 +88,25 @@ gb_Library_FILENAMES := $(patsubst z:iz% gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) +# handle libraries in msvc format that don't use an "i" prefix for their import library +# these are libraries built by OOo, but only a few of them +# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library +# we link against their dlls in gcc format directly gb_Library_NOILIBFILENAMES:=\ icule \ icuuc \ - sot \ uwinapi \ + winmm \ gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) +# some Windows platform libraries are missing in mingw library set +# we have to use them from the PSDK by linking against their ilibs gb_Library_ILIBFILENAMES:=\ gdiplus \ uuid \ + winmm \ gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT)) @@ -96,13 +115,13 @@ gb_Library_DLLFILENAMES := $(patsubst co gb_Library_DLLFILENAMES := $(patsubst icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(gb_Library_MAJORVER)%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES)) gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) -else +else #ifneq ($(USE_MINGW),) + gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) @@ -113,50 +132,34 @@ gb_Library_FILENAMES := $(patsubst svt:i gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) -gb_Library_NOILIBFILENAMES:=\ - advapi32 \ - gdi32 \ - gdiplus \ - gnu_getopt \ - icuuc \ - icule \ - imm32\ - kernel32 \ - msimg32 \ - msvcrt \ - mpr \ - oldnames \ - ole32 \ - oleaut32 \ - shell32 \ - sot \ - user32 \ - uuid \ - uwinapi \ - winspool \ +# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema +gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE) +gb_Library_NOILIBFILENAMES += icuuc icule gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) +gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) + #ifneq ($(gb_PRODUCT),$(true)) #gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES)) #endif gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) -endif +endif # ifneq ($(USE_MINGW),) -endif +endif # ifeq ($(OS),WNT) ifeq ($(OS),OS2) gb_Library_FILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelpgcc3%,$(gb_Library_FILENAMES)) @@ -175,7 +178,6 @@ gb_Library_FILENAMES := $(patsubst svl:i gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vcl:ivcl%,vcl:vcl%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbh4%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vos3:vos3%,vos3:vos3gcc3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xo:ixo%,xo:xo%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:xml2%,$(gb_Library_FILENAMES)) @@ -207,16 +209,6 @@ gb_Library_ILIBFILENAMES:=\ endif -ifeq ($(OS),SOLARIS) -gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) -#$(info libnames: $(gb_Library_FILENAMES)) - -endif - ifeq ($(OS),FREEBSD) gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) @@ -225,7 +217,6 @@ gb_Library_FILENAMES := $(patsubst jvmfw gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES)) gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) @@ -236,20 +227,8 @@ endif gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) -ifeq ($(SYSTEM_LIBXML),YES) -gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS)) -endif - -ifeq ($(SYSTEM_LIBXSLT),YES) -gb_Library_TARGETS := $(filter-out xslt,$(gb_Library_TARGETS)) -endif - -ifeq ($(SYSTEM_REDLAND),YES) -gb_Library_TARGETS := $(filter-out rdf,$(gb_Library_TARGETS)) -endif - -ifeq ($(SYSTEM_ICU),YES) -gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS)) +ifeq ($(SYSTEM_EXPAT),YES) +gb_Library_TARGETS := $(filter-out expat,$(gb_Library_TARGETS)) endif # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/UnoControls/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/UnoControls/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/UnoControls/prj/build.lst (original) +++ openoffice/trunk/main/UnoControls/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,4 +1,4 @@ -us UnoControls : LIBXSLT:libxslt cppuhelper offuh tools NULL +us UnoControls : LIBXSLT:libxslt cppuhelper offapi tools NULL us UnoControls usr1 - all us_mkout NULL us UnoControls\source\base nmake - all us_base NULL us UnoControls\source\controls nmake - all us_ctrls NULL Modified: openoffice/trunk/main/accessibility/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/accessibility/prj/build.lst (original) +++ openoffice/trunk/main/accessibility/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,4 +1,4 @@ -ac accessibility : L10N:l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL +ac accessibility : L10N:l10n tools jurt offapi unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL ac accessibility usr1 - all ac_mkout NULL ac accessibility\inc nmake - all ac_inc NULL ac accessibility\bridge\org\openoffice\java\accessibility nmake - w ac_ooja ac_inc NULL Modified: openoffice/trunk/main/animations/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/animations/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/animations/prj/build.lst (original) +++ openoffice/trunk/main/animations/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,3 +1,3 @@ -animations animations : cppuhelper comphelper offuh LIBXSLT:libxslt NULL +animations animations : cppuhelper comphelper offapi LIBXSLT:libxslt NULL animations animations usr1 - all animations_mkout NULL animations animations\source\animcore nmake - all animations_animcore NULL Modified: openoffice/trunk/main/basctl/source/dlged/propbrw.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/dlged/propbrw.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basctl/source/dlged/propbrw.cxx (original) +++ openoffice/trunk/main/basctl/source/dlged/propbrw.cxx Sun Aug 7 19:24:03 2016 @@ -52,7 +52,7 @@ #include <sfx2/viewsh.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #endif #include <comphelper/property.hxx> #include <comphelper/composedprops.hxx> Modified: openoffice/trunk/main/basebmp/inc/basebmp/bitmapdevice.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/inc/basebmp/bitmapdevice.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basebmp/inc/basebmp/bitmapdevice.hxx (original) +++ openoffice/trunk/main/basebmp/inc/basebmp/bitmapdevice.hxx Sun Aug 7 19:24:03 2016 @@ -34,6 +34,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; @@ -67,7 +74,7 @@ struct ImplBitmapDevice; 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: @@ -634,7 +641,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 ); @@ -645,7 +652,7 @@ BitmapDeviceSharedPtr createBitmapDevice 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 ); @@ -656,7 +663,7 @@ BitmapDeviceSharedPtr createBitmapDevice 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, @@ -671,7 +678,7 @@ BitmapDeviceSharedPtr createBitmapDevice 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. @@ -680,7 +687,7 @@ BitmapDeviceSharedPtr subsetBitmapDevice 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 ); } Modified: openoffice/trunk/main/basebmp/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basebmp/prj/build.lst (original) +++ openoffice/trunk/main/basebmp/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -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 Modified: openoffice/trunk/main/basebmp/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basebmp/prj/d.lst (original) +++ openoffice/trunk/main/basebmp/prj/d.lst Sun Aug 7 19:24:03 2016 @@ -1,9 +0,0 @@ -..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib%_EXT%\ibasebmp.lib - -..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin%_EXT%\basebmp?????.dll - -..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib%_EXT%\libbasebmp*.* -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a - -mkdir: %_DEST%\inc%_EXT%\basebmp -..\inc\basebmp\*.hxx %_DEST%\inc%_EXT%\basebmp\*.hxx Modified: openoffice/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx Sun Aug 7 19:24:03 2016 @@ -28,6 +28,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -48,7 +49,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] Modified: openoffice/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <boost/utility.hpp> #include <boost/shared_ptr.hpp> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -57,7 +58,7 @@ namespace basegfx All usages should handle instances of BColorModifier encapsulated into these shared pointers. */ - class BColorModifier : private boost::noncopyable + class BASEGFX_DLLPUBLIC BColorModifier : private boost::noncopyable { private: protected: @@ -92,7 +93,7 @@ namespace basegfx luminance value calculated based on the source color by using the following weights: r * 0.30, g * 0.59, b * 0.11 */ - class BColorModifier_gray : public BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier_gray : public BColorModifier { private: protected: @@ -120,7 +121,7 @@ namespace basegfx returns a color where red green and blue are inverted using 1.0 - n */ - class BColorModifier_invert : public BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier_invert : public BColorModifier { private: protected: @@ -152,7 +153,7 @@ namespace basegfx This derivation is used for the svg importer and does exactly what SVG defines for this needed case. */ - class BColorModifier_luminance_to_alpha : public BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier_luminance_to_alpha : public BColorModifier { private: protected: @@ -182,7 +183,7 @@ namespace basegfx given color, replacing everything. Useful e.g. for unified shadow creation */ - class BColorModifier_replace : public BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier_replace : public BColorModifier { private: ::basegfx::BColor maBColor; @@ -219,7 +220,7 @@ namespace basegfx col * (1 - f) + aSourceColor * f */ - class BColorModifier_interpolate : public BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier_interpolate : public BColorModifier { private: ::basegfx::BColor maBColor; @@ -257,7 +258,7 @@ namespace basegfx returns black when the luminance of the given color is less than the given treshhold value in the range [0.0 .. 1.0], else white */ - class BColorModifier_black_and_white : public BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier_black_and_white : public BColorModifier { private: double mfValue; @@ -294,7 +295,7 @@ namespace basegfx col(r,g,b) = clamp(pow(col(r,g,b), 1.0 / gamma), 0.0, 1.0) */ - class BColorModifier_gamma : public BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier_gamma : public BColorModifier { private: double mfValue; @@ -332,7 +333,7 @@ namespace basegfx - be able to cover a bigger change range utilizing the cmobination - allow execution by a small, common, precalculated table */ - class BColorModifier_RGBLuminanceContrast : public BColorModifier + class BASEGFX_DLLPUBLIC BColorModifier_RGBLuminanceContrast : public BColorModifier { private: double mfRed; @@ -385,7 +386,7 @@ namespace basegfx All references to BColorModifier members use shared pointers, thus instances of BColorModifierStack can be copied by the default mechanisms if needed. */ - class BColorModifierStack + class BASEGFX_DLLPUBLIC BColorModifierStack { protected: ::std::vector< BColorModifierSharedPtr > maBColorModifiers; Modified: openoffice/trunk/main/basegfx/inc/basegfx/color/bcolortools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/color/bcolortools.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/color/bcolortools.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/color/bcolortools.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_COLOR_BCOLORTOOLS_HXX #include <sal/types.h> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -35,29 +36,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 Modified: openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <sal/types.h> #include <vector> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -39,7 +40,7 @@ namespace basegfx namespace basegfx { - class B2DCubicBezierHelper + class BASEGFX_DLLPUBLIC B2DCubicBezierHelper { private: ::std::vector< double > maLengthArray; Modified: openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/range/b2drange.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -39,7 +40,7 @@ namespace basegfx namespace basegfx { - class B2DCubicBezier + class BASEGFX_DLLPUBLIC B2DCubicBezier { B2DPoint maStartPoint; B2DPoint maEndPoint; Modified: openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx Sun Aug 7 19:24:03 2016 @@ -25,12 +25,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; Modified: openoffice/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx Sun Aug 7 19:24:03 2016 @@ -26,13 +26,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; Modified: openoffice/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx Sun Aug 7 19:24:03 2016 @@ -28,6 +28,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/range/b2drange.hxx> +#include <basegfx/basegfxdllapi.h> namespace rtl { class OUString; } @@ -45,16 +46,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) @@ -74,7 +75,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, @@ -92,7 +93,7 @@ namespace basegfx rTranslate.getX(), rTranslate.getY()); } - B2DHomMatrix createShearXRotateTranslateB2DHomMatrix( + BASEGFX_DLLPUBLIC B2DHomMatrix createShearXRotateTranslateB2DHomMatrix( double fShearX, double fRadiant, double fTranslateX, double fTranslateY); @@ -107,7 +108,7 @@ namespace basegfx rTranslate.getX(), rTranslate.getY()); } - B2DHomMatrix createScaleTranslateB2DHomMatrix( + BASEGFX_DLLPUBLIC B2DHomMatrix createScaleTranslateB2DHomMatrix( double fScaleX, double fScaleY, double fTranslateX, double fTranslateY); inline B2DHomMatrix createScaleTranslateB2DHomMatrix( @@ -120,7 +121,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( @@ -133,7 +134,7 @@ namespace basegfx } /// special for the case to map from source range to target range - B2DHomMatrix createSourceRangeTargetRangeTransform( + BASEGFX_DLLPUBLIC B2DHomMatrix createSourceRangeTargetRangeTransform( const B2DRange& rSourceRange, const B2DRange& rTargetRange); @@ -146,7 +147,7 @@ namespace basegfx { namespace tools { - class B2DHomMatrixBufferedDecompose + class BASEGFX_DLLPUBLIC B2DHomMatrixBufferedDecompose { private: B2DVector maScale; @@ -185,7 +186,7 @@ namespace basegfx { namespace tools { - class B2DHomMatrixBufferedOnDemandDecompose + class BASEGFX_DLLPUBLIC B2DHomMatrixBufferedOnDemandDecompose { private: B2DHomMatrix maB2DHomMatrix; @@ -227,7 +228,7 @@ namespace basegfx } // end of namespace tools /// Returns a string with svg's "matrix(m00,m10,m01,m11,m02,m12)" representation - ::rtl::OUString exportToSvg( const B2DHomMatrix& rMatrix ); + BASEGFX_DLLPUBLIC ::rtl::OUString exportToSvg( const B2DHomMatrix& rMatrix ); } // end of namespace basegfx Modified: openoffice/trunk/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx Sun Aug 7 19:24:03 2016 @@ -28,13 +28,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; Modified: openoffice/trunk/main/basegfx/inc/basegfx/numeric/ftools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/numeric/ftools.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/numeric/ftools.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/numeric/ftools.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,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 @@ -149,15 +150,15 @@ namespace basegfx snapToNearestMultiple(0.25, 0.5) = 0.0 snapToNearestMultiple(0.26, 0.5) = 0.5 */ - double snapToNearestMultiple(double v, const double fStep); + BASEGFX_DLLPUBLIC double snapToNearestMultiple(double v, const double fStep); /** Snap v to the range [0.0 .. fWidth] using modulo */ - double snapToZeroRange(double v, double fWidth); + BASEGFX_DLLPUBLIC double snapToZeroRange(double v, double fWidth); /** Snap v to the range [fLow .. fHigh] using modulo */ - double snapToRange(double v, double fLow, double fHigh); + BASEGFX_DLLPUBLIC double snapToRange(double v, double fLow, double fHigh); /** return fValue with the sign of fSignCarrier, thus evtl. changed */ @@ -170,7 +171,7 @@ namespace basegfx #endif } - class fTools + class BASEGFX_DLLPUBLIC fTools { /// Threshold value for equalZero() static double mfSmallValue; Modified: openoffice/trunk/main/basegfx/inc/basegfx/pixel/bpixel.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/pixel/bpixel.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/pixel/bpixel.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/pixel/bpixel.hxx Sun Aug 7 19:24:03 2016 @@ -27,6 +27,7 @@ #include <sal/types.h> #include <basegfx/numeric/ftools.hxx> #include <basegfx/color/bcolor.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -35,7 +36,7 @@ namespace basegfx { - class BPixel + class BASEGFX_DLLPUBLIC BPixel { protected: union Modified: openoffice/trunk/main/basegfx/inc/basegfx/point/b2dhompoint.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/point/b2dhompoint.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/point/b2dhompoint.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/point/b2dhompoint.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_POINT_B2DHOMPOINT_HXX #include <basegfx/point/b2dpoint.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -41,7 +42,7 @@ namespace basegfx @see B2DTuple */ - class B2DHomPoint + class BASEGFX_DLLPUBLIC B2DHomPoint { protected: /// This member contains the coordinate part of the point Modified: openoffice/trunk/main/basegfx/inc/basegfx/point/b2dpoint.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/point/b2dpoint.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/point/b2dpoint.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/point/b2dpoint.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/point/b2ipoint.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -116,14 +117,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() { @@ -139,7 +140,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 ////////////////////////////////////////////////////////////////////////////// Modified: openoffice/trunk/main/basegfx/inc/basegfx/point/b2ipoint.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/point/b2ipoint.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/point/b2ipoint.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/point/b2ipoint.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_POINT_B2IPOINT_HXX #include <basegfx/tuple/b2ituple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -39,7 +40,7 @@ namespace basegfx @see B2ITuple */ - class B2IPoint : public ::basegfx::B2ITuple + class BASEGFX_DLLPUBLIC B2IPoint : public ::basegfx::B2ITuple { public: /** Create a 2D Point Modified: openoffice/trunk/main/basegfx/inc/basegfx/point/b3dhompoint.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/point/b3dhompoint.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/point/b3dhompoint.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/point/b3dhompoint.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_POINT_B3DHOMPOINT_HXX #include <basegfx/point/b3dpoint.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -41,7 +42,7 @@ namespace basegfx @see B3DTuple */ - class B3DHomPoint + class BASEGFX_DLLPUBLIC B3DHomPoint { protected: /// This member contains the coordinate part of the point Modified: openoffice/trunk/main/basegfx/inc/basegfx/point/b3dpoint.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/point/b3dpoint.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/point/b3dpoint.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/point/b3dpoint.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_POINT_B3DPOINT_HXX #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -39,7 +40,7 @@ namespace basegfx @see B3DTuple */ - class B3DPoint : public ::basegfx::B3DTuple + class BASEGFX_DLLPUBLIC B3DPoint : public ::basegfx::B3DTuple { public: /** Create a 3D Point @@ -139,7 +140,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 Modified: openoffice/trunk/main/basegfx/inc/basegfx/point/b3ipoint.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/point/b3ipoint.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/point/b3ipoint.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/point/b3ipoint.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_POINT_B3IPOINT_HXX #include <basegfx/tuple/b3ituple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -39,7 +40,7 @@ namespace basegfx @see B3ITuple */ - class B3IPoint : public ::basegfx::B3ITuple + class BASEGFX_DLLPUBLIC B3IPoint : public ::basegfx::B3ITuple { public: /** Create a 3D Point Modified: openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx Sun Aug 7 19:24:03 2016 @@ -29,6 +29,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <com/sun/star/drawing/LineCap.hpp> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -69,7 +70,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, @@ -128,7 +129,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, Modified: openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx Sun Aug 7 19:24:03 2016 @@ -28,6 +28,7 @@ #include <o3tl/cow_wrapper.hxx> #include <basegfx/vector/b2enums.hxx> #include <basegfx/range/b2drange.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -46,7 +47,7 @@ namespace basegfx namespace basegfx { - class B2DPolygon + class BASEGFX_DLLPUBLIC B2DPolygon { public: typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType; Modified: openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -42,21 +43,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). @@ -64,13 +65,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 Modified: openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -35,39 +36,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
