fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters

The $(share_subdir_name) things in the filter fragment .xcu files didn't actually work it seems. But anyway, it's a bit silly to do expansion at run-time of $(foo) things known at build-time anyway. Thanks to sberg for pointing this out. So just use the normal configury .in mechanism for these. Simpler. Change-Id: I14b3e5cc5169b34df8a1d7ff07cc28452c67bcc8

fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters
The $(share_subdir_name) things in the filter fragment .xcu files didn't actually work it seems. But anyway, it's a bit silly to do expansion at run-time of $(foo) things known at build-time anyway. Thanks to sberg for pointing this out. So just use the normal configury .in mechanism for these. Simpler. Change-Id: I14b3e5cc5169b34df8a1d7ff07cc28452c67bcc8
ac4e19f9 · Tor Lillqvist · 4c30c486 · ac4e19f9 · ac4e19f9 · ac4e19f9
Kaydet (Commit) ac4e19f9 authored Eyl 05, 2013 tarafından Tor Lillqvist
21 changed files
--- a/configure.ac
+++ b/configure.ac
@@ -12519,7 +12519,25 @@ if test -f config_host.mk; then
    config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
 fi

-AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst])
+AC_CONFIG_FILES([config_host.mk
+                 Makefile
+                 lo.xcent
+                 filter/source/config/fragments/filters/DocBook_File.xcu
+                 filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
+                 filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
+                 filter/source/config/fragments/filters/UOF_presentation.xcu
+                 filter/source/config/fragments/filters/UOF_spreadsheet.xcu
+                 filter/source/config/fragments/filters/UOF_text.xcu
+                 filter/source/config/fragments/filters/XHTML_Calc_File.xcu
+                 filter/source/config/fragments/filters/XHTML_Draw_File.xcu
+                 filter/source/config/fragments/filters/XHTML_Impress_File.xcu
+                 filter/source/config/fragments/filters/XHTML_Writer_File.xcu
+                 officecfg/registry/data/org/openoffice/Office/Paths.xcu
+                 officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
+                 officecfg/registry/schema/org/openoffice/Office/Common.xcs
+                 wizards/source/configshare/dialog.xlc
+                 wizards/source/configshare/script.xlc
+                 instsetoo_native/util/openoffice.lst])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_features.h])

--- a/filter/source/config/fragments/filters/DocBook_File.xcu
+++ b/filter/source/config/fragments/filters/DocBook_File.xcu
@@ -20,9 +20,9 @@
        <prop oor:name="Type"><value>writer_DocBook_File</value></prop>
        <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
        <prop oor:name="UIComponent"/>
-        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLImporter,com.sun.star.comp.Writer.XMLExporter,../$(share_subdir_name)/xslt/docbook/docbooktosoffheadings.xsl,../$(share_subdir_name)/xslt/docbook/sofftodocbookheadings.xsl</value></prop>
+        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLImporter,com.sun.star.comp.Writer.XMLExporter,../@LIBO_SHARE_FOLDER@/xslt/docbook/docbooktosoffheadings.xsl,../@LIBO_SHARE_FOLDER@/xslt/docbook/sofftodocbookheadings.xsl</value></prop>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
-        <prop oor:name="TemplateName"><value>../$(share_subdir_name)/xslt/docbook/DocBookTemplate.stw</value></prop>
+        <prop oor:name="TemplateName"><value>../@LIBO_SHARE_FOLDER@/xslt/docbook/DocBookTemplate.stw</value></prop>
        <prop oor:name="UIName">
            <value>DocBook</value>
        </prop>

--- a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
@@ -19,7 +19,7 @@
        <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
        <prop oor:name="UIComponent"/>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
-        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../$(share_subdir_name)/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,../$(share_subdir_name)/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl</value></prop>
+        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../@LIBO_SHARE_FOLDER@/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,../@LIBO_SHARE_FOLDER@/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl</value></prop>
        <prop oor:name="FileFormatVersion"><value>0</value></prop>
        <prop oor:name="Type"><value>calc_MS_Excel_2003_XML</value></prop>
        <prop oor:name="TemplateName"/>

--- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
@@ -19,7 +19,7 @@
        <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
        <prop oor:name="UIComponent"/>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
-        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../$(share_subdir_name)/xslt/import/wordml/wordml2ooo.xsl,../$(share_subdir_name)/xslt/export/wordml/ooo2wordml.xsl</value></prop>
+        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/import/wordml/wordml2ooo.xsl,../share/xslt/export/wordml/ooo2wordml.xsl</value></prop>
        <prop oor:name="FileFormatVersion"><value>0</value></prop>
        <prop oor:name="Type"><value>writer_MS_Word_2003_XML</value></prop>
        <prop oor:name="TemplateName"/>

--- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu.in
+++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu.in
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+    <node oor:name="MS Word 2003 XML" oor:op="replace">
+        <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
+        <prop oor:name="UIComponent"/>
+        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../@LIBO_SHARE_FOLDER@/xslt/import/wordml/wordml2ooo.xsl,../@LIBO_SHARE_FOLDER@/xslt/export/wordml/ooo2wordml.xsl</value></prop>
+        <prop oor:name="FileFormatVersion"><value>0</value></prop>
+        <prop oor:name="Type"><value>writer_MS_Word_2003_XML</value></prop>
+        <prop oor:name="TemplateName"/>
+        <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+    </node>
--- a/filter/source/config/fragments/filters/UOF_presentation.xcu
+++ b/filter/source/config/fragments/filters/UOF_presentation.xcu
@@ -20,7 +20,7 @@
        <prop oor:name="Type"><value>Unified_Office_Format_presentation</value></prop>
        <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
        <prop oor:name="UIComponent"/>
-        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_presentation.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_presentation.xsl</value></prop>
+        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../@LIBO_SHARE_FOLDER@/xslt/import/uof/uof2odf_presentation.xsl,../@LIBO_SHARE_FOLDER@/xslt/export/uof/odf2uof_presentation.xsl</value></prop>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
        <prop oor:name="TemplateName"/>
        <prop oor:name="UIName">

--- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
+++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
@@ -20,7 +20,7 @@
        <prop oor:name="Type"><value>Unified_Office_Format_spreadsheet</value></prop>
        <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
        <prop oor:name="UIComponent"/>
-        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_spreadsheet.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_spreadsheet.xsl</value></prop>
+        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../@LIBO_SHARE_FOLDER@/xslt/import/uof/uof2odf_spreadsheet.xsl,../@LIBO_SHARE_FOLDER@/xslt/export/uof/odf2uof_spreadsheet.xsl</value></prop>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
        <prop oor:name="TemplateName"/>
        <prop oor:name="UIName">

--- a/filter/source/config/fragments/filters/UOF_text.xcu
+++ b/filter/source/config/fragments/filters/UOF_text.xcu
@@ -20,7 +20,7 @@
        <prop oor:name="Type"><value>Unified_Office_Format_text</value></prop>
        <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
        <prop oor:name="UIComponent"/>
-        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_text.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_text.xsl</value></prop>
+        <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../@LIBO_SHARE_FOLDER@/xslt/import/uof/uof2odf_text.xsl,../@LIBO_SHARE_FOLDER@/xslt/export/uof/odf2uof_text.xsl</value></prop>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
        <prop oor:name="TemplateName"/>
        <prop oor:name="UIName">

--- a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu
+++ b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu
@@ -20,7 +20,7 @@
        <prop oor:name="Type"><value>XHTML_File</value></prop>
        <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
        <prop oor:name="UIComponent"/>
-                <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
+                <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,,../@LIBO_SHARE_FOLDER@/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
        <prop oor:name="TemplateName"/>
        <prop oor:name="UIName">

--- a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu
+++ b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu
@@ -20,7 +20,7 @@
        <prop oor:name="Type"><value>XHTML_File</value></prop>
        <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
        <prop oor:name="UIComponent"/>
-                <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
+                <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,,../@LIBO_SHARE_FOLDER@/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
        <prop oor:name="TemplateName"/>
        <prop oor:name="UIName">

--- a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu
+++ b/filter/source/config/fragments/filters/XHTML_Impress_File.xcu
@@ -20,7 +20,7 @@
        <prop oor:name="Type"><value>XHTML_File</value></prop>
        <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
        <prop oor:name="UIComponent"/>
-                <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
+                <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,,../@LIBO_SHARE_FOLDER@/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
        <prop oor:name="TemplateName"/>
        <prop oor:name="UIName">

--- a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu
+++ b/filter/source/config/fragments/filters/XHTML_Writer_File.xcu
@@ -20,7 +20,7 @@
        <prop oor:name="Type"><value>XHTML_File</value></prop>
        <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
        <prop oor:name="UIComponent"/>
-                <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl,,true</value></prop>
+                <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,,../@LIBO_SHARE_FOLDER@/xslt/export/xhtml/opendoc2xhtml.xsl,,true</value></prop>
        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
        <prop oor:name="TemplateName"/>
        <prop oor:name="UIName">

--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -179,7 +179,6 @@ enum PreDefVariable
    PREDEFVAR_BASEINSTURL,
    PREDEFVAR_USERDATAURL,
    PREDEFVAR_BRANDBASEURL,
-    PREDEFVAR_SHARE_SUBDIR_NAME,
    PREDEFVAR_COUNT
 };


--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -104,7 +104,6 @@
 #define VARIABLE_BASEINSTURL                            "$(baseinsturl)"
 #define VARIABLE_USERDATAURL                            "$(userdataurl)"
 #define VARIABLE_BRANDBASEURL                           "$(brandbaseurl)"
-#define VARIABLE_SHARE_SUBDIR_NAME                      "$(share_subdir_name)"

 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
@@ -194,8 +193,7 @@ static const FixedVariable aFixedVarTable[] =
    // New variable of hierachy service (#i32656#)
    { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL,  REPLACELENGTH_BASEINSTURL,true                     },
    { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL,  REPLACELENGTH_USERDATAURL,true                     },
-    { VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true },
-    { VARIABLE_SHARE_SUBDIR_NAME,PREDEFVAR_SHARE_SUBDIR_NAME, RTL_CONSTASCII_LENGTH(VARIABLE_SHARE_SUBDIR_NAME), false }
+    { VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true }
 };

 //_________________________________________________________________________________________________________________
@@ -1117,8 +1115,6 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
    rtl::Bootstrap::expandMacros(
        aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);

-    aPreDefPathVariables.m_FixedVar[PREDEFVAR_SHARE_SUBDIR_NAME] = rtl::OUString(LIBO_SHARE_FOLDER);
-
    Any             aAny;

    // Get inspath and userpath from bootstrap mechanism in every case as file URL

--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -26,7 +26,7 @@
    </node>
    <node oor:name="AutoCorrect" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/autocorr" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autocorr" oor:op="fuse"/>
      </node>
      <prop oor:name="WritePath">
        <value>$(userurl)/autocorr</value>
@@ -34,7 +34,7 @@
    </node>
    <node oor:name="AutoText" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/autotext/$(vlang)" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)" oor:op="fuse"/>
      </node>
      <prop oor:name="WritePath">
        <value>$(userurl)/autotext</value>
@@ -52,7 +52,7 @@
    </node>
    <node oor:name="Basic" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/basic" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/basic" oor:op="fuse"/>
      </node>
      <prop oor:name="WritePath">
        <value>$(userurl)/basic</value>
@@ -60,12 +60,12 @@
    </node>
    <node oor:name="Bitmap" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/config/symbol" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol" oor:op="fuse"/>
      </node>
    </node>
    <node oor:name="Config" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config" oor:op="fuse"/>
      </node>
    </node>
    <node oor:name="Favorite" oor:op="fuse" oor:mandatory="true">
@@ -80,7 +80,7 @@
    </node>
    <node oor:name="Gallery" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/gallery" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/gallery" oor:op="fuse"/>
      </node>
      <prop oor:name="WritePath">
        <value>$(userurl)/gallery</value>
@@ -103,8 +103,8 @@
    </node>
    <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/dict" oor:op="fuse"/>
-        <node oor:name="$(insturl)/$(share_subdir_name)/dict/ooo" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/dict" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/dict/ooo" oor:op="fuse"/>
      </node>
      <prop oor:name="UserPaths">
        <value>$(userurl)/wordbook</value>
@@ -112,7 +112,7 @@
    </node>
    <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/wordbook" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/wordbook" oor:op="fuse"/>
      </node>
      <prop oor:name="WritePath">
        <value>$(userurl)/wordbook</value>
@@ -135,7 +135,7 @@
    </node>
    <node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node install:module="internallibexttextcatdata" oor:name="$(insturl)/$(share_subdir_name)/fingerprint" oor:op="fuse"/>
+        <node install:module="internallibexttextcatdata" oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/fingerprint" oor:op="fuse"/>
        <node install:module="externallibexttextcatdata" oor:name="${SYSTEM_LIBEXTTEXTCAT_DATA}" oor:op="fuse"/>
      </node>
    </node>
@@ -158,7 +158,7 @@
    </node>
    <node oor:name="Template" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/template/$(vlang)" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)" oor:op="fuse"/>
      </node>
      <prop oor:name="WritePath">
        <value>$(userurl)/template</value>
@@ -166,7 +166,7 @@
    </node>
    <node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true">
      <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/>
+        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config" oor:op="fuse"/>
      </node>
    </node>
    <node oor:name="UserConfig" oor:op="fuse" oor:mandatory="true">

--- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
@@ -1241,12 +1241,12 @@
    <node oor:name="BackgroundImages">
      <node oor:name="1" oor:op="replace">
        <prop oor:name="Href">
-          <value>$(inst)/$(share_subdir_name)/gallery/www-back/</value>
+          <value>$(inst)/@LIBO_SHARE_FOLDER@/gallery/www-back/</value>
        </prop>
      </node>
      <node oor:name="2" oor:op="replace">
        <prop oor:name="Href">
-          <value>$(inst)/$(share_subdir_name)/gallery/surface</value>
+          <value>$(inst)/@LIBO_SHARE_FOLDER@/gallery/surface</value>
        </prop>
      </node>
      <node oor:name="3" oor:op="replace">

--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1529,7 +1529,7 @@
            <desc>Specifies the settings of the AutoCorrect dialog.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/autocorr</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autocorr</it>
            <it>$(userurl)/autocorr</it>
          </value>
        </prop>
@@ -1539,7 +1539,7 @@
            modules.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
            <it>$(userurl)/autotext</it>
          </value>
        </prop>
@@ -1555,7 +1555,7 @@
            AutoPilots.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/basic</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/basic</it>
            <it>$(userurl)/basic</it>
          </value>
        </prop>
@@ -1564,20 +1564,20 @@
            <desc>Contains the bitmap files which can be used for menu and
            toolbar icons.</desc>
          </info>
-          <value>$(insturl)/$(share_subdir_name)/config/symbol</value>
+          <value>$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol</value>
        </prop>
        <prop oor:name="Config" oor:type="xs:string" oor:nillable="false">
          <info>
            <desc>Contains the configuration files. This value cannot be changed
            through the user interface.</desc>
          </info>
-          <value>$(insturl)/$(share_subdir_name)/config</value>
+          <value>$(insturl)/@LIBO_SHARE_FOLDER@/config</value>
        </prop>
        <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false">
          <info>
            <desc>Contains the provided dictionaries.</desc>
          </info>
-          <value>$(insturl)/$(share_subdir_name)/wordbook</value>
+          <value>$(insturl)/@LIBO_SHARE_FOLDER@/wordbook</value>
        </prop>
        <prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false">
          <info>
@@ -1598,7 +1598,7 @@
            and multimedia files.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/gallery</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/gallery</it>
            <it>$(userurl)/gallery</it>
          </value>
        </prop>
@@ -1620,7 +1620,7 @@
            <desc>Contains the files that are necessary for the
            spellcheck.</desc>
          </info>
-          <value>$(insturl)/$(share_subdir_name)/dict</value>
+          <value>$(insturl)/@LIBO_SHARE_FOLDER@/dict</value>
        </prop>
        <prop oor:name="Module" oor:type="xs:string" oor:nillable="false">
          <info>
@@ -1665,8 +1665,8 @@
            sub-folders.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it>
-            <it>$(insturl)/$(share_subdir_name)/template/common</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
            <it>$(userurl)/template</it>
          </value>
        </prop>
@@ -1677,7 +1677,7 @@
            merged from UserConfig and from these folders.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/config</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/config</it>
          </value>
        </prop>
        <prop oor:name="UserConfig" oor:type="xs:string" oor:nillable="false">
@@ -1720,7 +1720,7 @@
            AutoCorrect dialog.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/autocorr</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autocorr</it>
            <it>$(userurl)/autocorr</it>
          </value>
        </prop>
@@ -1730,7 +1730,7 @@
            located.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
            <it>$(userurl)/autotext</it>
          </value>
        </prop>
@@ -1747,7 +1747,7 @@
            the AutoPilots, are located.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/basic</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/basic</it>
            <it>$(userurl)/basic</it>
          </value>
        </prop>
@@ -1756,21 +1756,21 @@
            <desc>Specifies the default directory where the bitmap files, which
            can be used for the menu and toolbar icons, are located.</desc>
          </info>
-          <value>$(insturl)/$(share_subdir_name)/config/symbol</value>
+          <value>$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol</value>
        </prop>
        <prop oor:name="Config" oor:type="xs:string" oor:nillable="false">
          <info>
            <desc>Specifies the default directory where the configuration files
            are stored.</desc>
          </info>
-          <value>$(insturl)/$(share_subdir_name)/config</value>
+          <value>$(insturl)/@LIBO_SHARE_FOLDER@/config</value>
        </prop>
        <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false">
          <info>
            <desc>Specifies the default directory where the provided
            dictionaries are located.</desc>
          </info>
-          <value>$(insturl)/$(share_subdir_name)/wordbook/$(vlang)</value>
+          <value>$(insturl)/@LIBO_SHARE_FOLDER@/wordbook/$(vlang)</value>
        </prop>
        <prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false">
          <info>
@@ -1792,7 +1792,7 @@
            multimedia files are located.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/gallery</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/gallery</it>
            <it>$(userurl)/gallery</it>
          </value>
        </prop>
@@ -1815,7 +1815,7 @@
            <desc>Specifies the default directory where the files that are
            necessary for the spellcheck are saved.</desc>
          </info>
-          <value>$(insturl)/$(share_subdir_name)/dict</value>
+          <value>$(insturl)/@LIBO_SHARE_FOLDER@/dict</value>
        </prop>
        <prop oor:name="Module" oor:type="xs:string" oor:nillable="false">
          <info>
@@ -1853,8 +1853,8 @@
            are located in folders and sub-folders.</desc>
          </info>
          <value>
-            <it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it>
-            <it>$(insturl)/$(share_subdir_name)/template/common</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
+            <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
            <it>$(userurl)/template</it>
          </value>
        </prop>

--- a/wizards/source/configshare/dialog.xlc
+++ b/wizards/source/configshare/dialog.xlc
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
 <library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
- <library:library library:name="FormWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/FormWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Template" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Template/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Tools" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Tools/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Gimmicks" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Gimmicks/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="ImportWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ImportWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Euro" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Euro/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Depot" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="FormWizard" xlink:href="$(INST)/share/basic/FormWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Template" xlink:href="$(INST)/share/basic/Template/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Tools" xlink:href="$(INST)/share/basic/Tools/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Gimmicks" xlink:href="$(INST)/share/basic/Gimmicks/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ImportWizard" xlink:href="$(INST)/share/basic/ImportWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Euro" xlink:href="$(INST)/share/basic/Euro/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Depot" xlink:href="$(INST)/share/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/share/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
 </library:libraries>
--- a/wizards/source/configshare/dialog.xlc.in
+++ b/wizards/source/configshare/dialog.xlc.in
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
+<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <library:library library:name="FormWizard" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/FormWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Template" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Template/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Tools" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Tools/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Gimmicks" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Gimmicks/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ImportWizard" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ImportWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Euro" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Euro/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Depot" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+</library:libraries>
--- a/wizards/source/configshare/script.xlc
+++ b/wizards/source/configshare/script.xlc
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
 <library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
- <library:library library:name="FormWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/FormWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Template" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Template/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Tools" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Tools/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Gimmicks" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Gimmicks/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="ImportWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ImportWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Euro" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Euro/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="Depot" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
- <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="FormWizard" xlink:href="$(INST)/share/basic/FormWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Template" xlink:href="$(INST)/share/basic/Template/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Tools" xlink:href="$(INST)/share/basic/Tools/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Gimmicks" xlink:href="$(INST)/share/basic/Gimmicks/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ImportWizard" xlink:href="$(INST)/share/basic/ImportWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Euro" xlink:href="$(INST)/share/basic/Euro/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Depot" xlink:href="$(INST)/share/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/share/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
 </library:libraries>
--- a/wizards/source/configshare/script.xlc.in
+++ b/wizards/source/configshare/script.xlc.in
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
+<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <library:library library:name="FormWizard" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/FormWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Template" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Template/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Tools" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Tools/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Gimmicks" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Gimmicks/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ImportWizard" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ImportWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Euro" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Euro/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="Depot" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+</library:libraries>