Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
postprocess/prj/build.lst

5 files changed, 8 insertions, 6 deletions

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 0cef8d0037f9..0a439373ca83 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -102,6 +102,7 @@ my_components = \
     component/unoxml/source/rdf/unordf \
     component/unoxml/source/service/unoxml \
     component/vbahelper/util/msforms \
+    component/vcl/vcl \
     component/writerfilter/util/writerfilter \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
@@ -177,7 +178,6 @@ my_components = \
     updchk.uno \
     uui \
     vbaevents \
-    vcl \
     vclcanvas \
     wpft \
     wpgfilter \
@@ -196,7 +196,7 @@ my_components += pythonloader
 .IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
 my_components += splash
 .ENDIF
-
+    
 .IF "$(BUILD_SPECIAL)" != ""
 my_components += oooimprovement
 .END
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 335639d3a0d9..71ee36db0e79 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -516,14 +516,16 @@ $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip
 # It can happen that localized $(SOLARPCKDIR)/fcfg_langpack_*.zip contain
 # zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the
 # find shell command below (see issue 110041):
+
 $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
     $(MKDIRHIER) $(@:d)
     rm -rf $(MISC)/$(@:b).unzip
     mkdir $(MISC)/$(@:b).unzip
     cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
     - $(RM) $(MISC)/$(@:b).list
+    # filter out filenames starting with "."
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip -name \*.xcu -size +0c -print) \
+        find $(@:b).unzip -name \[!.\]\*.xcu -size +0c -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
@@ -541,8 +543,9 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
     cd $(MISC)/fcfg_drivers_$*.unzip && \
         unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
     - $(RM) $(MISC)/$(@:b).list
+    # filter out filenames starting with "."
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
+        find $(@:b).unzip fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(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 48dc474a26c1..f249876bd04e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting setup_native slideshow starmath sw sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 27999d2c4cbb..199a8944be24 100755..100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -224,7 +224,6 @@ reg3.dll         0x00000000607e0000 0x00020000
 reg4allmsdoc.dll 0x0000000060790000 0x00040000
 regactivex.dll   0x0000000060710000 0x00020000
 regpatchactivex.dll 0x0000000060690000 0x00020000
-relnotes.dll     0x0000000060660000 0x00020000
 remotebridge.uno.dll 0x0000000060640000 0x00010000
 resmi.dll        0x0000000060610000 0x00020000
 resourcemodel.dll 0x0000000060580000 0x00080000
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
index 0ccfa6bf49a0..0ccfa6bf49a0 100755..100644
--- a/postprocess/rebase/makefile.mk
+++ b/postprocess/rebase/makefile.mk