You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2011/12/02 11:39:30 UTC
svn commit: r1209389 - in /incubator/ooo/branches/alg/svgreplacement/main:
instsetoo_native/util/makefile.mk postprocess/prj/build.lst
svtools/source/graphic/grfcache.cxx xmloff/source/draw/ximpshap.cxx
Author: alg
Date: Fri Dec 2 10:39:30 2011
New Revision: 1209389
URL: http://svn.apache.org/viewvc?rev=1209389&view=rev
Log:
svg: updates for win and mac builds
Modified:
incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/util/makefile.mk
incubator/ooo/branches/alg/svgreplacement/main/postprocess/prj/build.lst
incubator/ooo/branches/alg/svgreplacement/main/svtools/source/graphic/grfcache.cxx
incubator/ooo/branches/alg/svgreplacement/main/xmloff/source/draw/ximpshap.cxx
Modified: incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/util/makefile.mk?rev=1209389&r1=1209388&r2=1209389&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/util/makefile.mk Fri Dec 2 10:39:30 2011
@@ -228,7 +228,6 @@ ure_%{$(PKGFORMAT:^".")} :
-msilanguage $(MISC)$/win_ulffiles
.ENDIF
-$(foreach,i,$(alllangiso)) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
@@ -243,7 +242,7 @@ openoffice:
.ENDIF # "$(alllangiso)"!=""
.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
@@ -256,18 +255,6 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPC
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-$(BIN)$/broffice_dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_dev_nologo$/intro.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
-$(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
-$(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
Modified: incubator/ooo/branches/alg/svgreplacement/main/postprocess/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/postprocess/prj/build.lst?rev=1209389&r1=1209388&r2=1209389&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/postprocess/prj/build.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/postprocess/prj/build.lst Fri Dec 2 10:39:30 2011
@@ -1,4 +1,4 @@
-po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po postprocess :: svgio accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
Modified: incubator/ooo/branches/alg/svgreplacement/main/svtools/source/graphic/grfcache.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svtools/source/graphic/grfcache.cxx?rev=1209389&r1=1209388&r2=1209389&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svtools/source/graphic/grfcache.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svtools/source/graphic/grfcache.cxx Fri Dec 2 10:39:30 2011
@@ -29,7 +29,7 @@
#include <vcl/outdev.hxx>
#include <tools/poly.hxx>
#include "grfcache.hxx"
-
+#include <rtl/crc.h>
#include <memory>
// -----------
Modified: incubator/ooo/branches/alg/svgreplacement/main/xmloff/source/draw/ximpshap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/xmloff/source/draw/ximpshap.cxx?rev=1209389&r1=1209388&r2=1209389&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/xmloff/source/draw/ximpshap.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/xmloff/source/draw/ximpshap.cxx Fri Dec 2 10:39:30 2011
@@ -82,6 +82,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <tools/string.hxx>
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
+#include <com/sun/star/container/XChild.hpp>
// --> OD 2006-02-22 #b6382898#
#include <com/sun/star/text/XTextDocument.hpp>