cws renaissance2: rebase m80

4 files changed, 22 insertions, 19 deletions

diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index 43202b8..d7a615b 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -89,7 +89,13 @@ uiconfig/modules/dbquery/toolbar/toolbar.xml
 uiconfig/modules/dbrelation/toolbar/toolbar.xml
 uiconfig/modules/dbtable/toolbar/toolbar.xml
 uiconfig/modules/StartModule/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/arrowshapes.xml
+uiconfig/modules/schart/toolbar/basicshapes.xml
+uiconfig/modules/schart/toolbar/calloutshapes.xml
+uiconfig/modules/schart/toolbar/flowchartshapes.xml
 uiconfig/modules/schart/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/starshapes.xml
+uiconfig/modules/schart/toolbar/symbolshapes.xml
 uiconfig/modules/schart/toolbar/toolbar.xml
 uiconfig/modules/scalc/toolbar/alignmentbar.xml
 uiconfig/modules/scalc/toolbar/arrowshapes.xml
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index e27edfb..d9958aa 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -93,9 +93,6 @@ sub get_globals
     if ( ! ( $platform && $srcrootdir && $solverdir ) ) {
         die "Error: please set environment\n";
     }
-    if ( ! -d $srcrootdir ) {
-        die "Error: cannot find source directory '$srcrootdir'\n";
-    }
     if ( ! -d $solverdir ) {
         die "Error: cannot find solver directory '$solverdir'\n";
     }
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 1f33001..002cea5 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -29,9 +29,9 @@ PRJ = ..
 PRJNAME = postprocess
 TARGET = packregistry
 
-MY_XCS = $(SOLARXMLDIR)/registry/schema/org/openoffice
-MY_XCU = $(SOLARXMLDIR)/registry/data/org/openoffice
-MY_MOD = $(SOLARXMLDIR)/registry/spool
+MY_XCS = registry/schema/org/openoffice
+MY_XCU = registry/data/org/openoffice
+MY_MOD = registry/spool
 
 MY_XCDS = \
     $(MISC)/base.xcd \
@@ -283,7 +283,6 @@ MY_FILES_main = \
     $(MY_MOD)/fcfg_internalgraphics_filters.xcu \
     $(MY_MOD)/fcfg_internalgraphics_types.xcu \
     $(MY_MOD)/org/openoffice/Office/Embedding-chart.xcu \
-    $(MY_MOD)/org/openoffice/Office/Writer-javamail.xcu \
     $(MY_MOD)/org/openoffice/Setup-start.xcu \
     $(MY_MOD)/org/openoffice/TypeDetection/UISort-calc.xcu \
     $(MY_MOD)/org/openoffice/TypeDetection/UISort-draw.xcu \
@@ -485,25 +484,26 @@ ALLTAR : \
     $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd \
     $(MISC)/lang/registry_{$(alllangiso)}.xcd
 
-{$(MY_XCDS)} : $$(MY_FILES_$$(@:b))
+{$(MY_XCDS)} : $$(MY_FILES_$$(@:b):^"$(SOLARXMLDIR)/")
 
 $(MISC)/%.xcd .ERRREMOVE : $(MISC)/%.list
-    $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt $<
+    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+        $(SOLARENV)/bin/packregistry.xslt $<
 
 $(MISC)/%.list : makefile.mk
     - $(RM) $@
     echo '<list>' $(foreach,i,$(MY_DEPS_$(@:b)) '<dependency file="$i"/>') \
         $(foreach,i,$(MY_FILES_$(@:b)) '<filename>$i</filename>') '</list>' > $@
 
-$(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(MY_MOD)/$$(@:b).xcu
+$(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu
 
 $(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
     $(MKDIRHIER) $(@:d)
     - $(RM) $(MISC)/$(@:b).list
-    echo '<list><dependency file="main"/>\
-        <filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
-    $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
-        $(MISC)/$(@:b).list
+    echo '<list><dependency file="main"/>' \
+        '<filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
+    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+        $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
 
 $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip
 
@@ -519,8 +519,8 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
         find $(@:b).unzip -name \*.xcu -size +0c -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
-    $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
-        $(MISC)/$(@:b).list
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
+        $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
 
 $(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip \
         $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
@@ -538,5 +538,5 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
         find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
-    $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
-        $(MISC)/$(@:b).list
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
+        $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 28b3dcd..3a0839f 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility automation basctl bean fondu 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 sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+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 sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL