diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-09-05 17:10:18 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-05 18:17:00 +0200 |
commit | 791a8b96f754798192875da287c84f8cfa4e533e (patch) | |
tree | 54d9249ae49370c67465417e47c374b53094cc10 | |
parent | 0bf232422af9d2b53e54230c1ae0f554f42eb2ff (diff) |
Revert "fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters"
This reverts commit ac4e19f9085dbd0103c7336a5318aa1e55b3e3e0.
Unfortunately does not work if BUILDDIR is different from SRCDIR.
-rw-r--r-- | configure.ac | 20 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/DocBook_File.xcu (renamed from filter/source/config/fragments/filters/DocBook_File.xcu.in) | 4 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu (renamed from filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu.in) | 2 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/MS_Word_2003_XML.xcu | 2 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/MS_Word_2003_XML.xcu.in | 27 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/UOF_presentation.xcu (renamed from filter/source/config/fragments/filters/UOF_presentation.xcu.in) | 2 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/UOF_spreadsheet.xcu (renamed from filter/source/config/fragments/filters/UOF_spreadsheet.xcu.in) | 2 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/UOF_text.xcu (renamed from filter/source/config/fragments/filters/UOF_text.xcu.in) | 2 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/XHTML_Calc_File.xcu (renamed from filter/source/config/fragments/filters/XHTML_Calc_File.xcu.in) | 2 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/XHTML_Draw_File.xcu (renamed from filter/source/config/fragments/filters/XHTML_Draw_File.xcu.in) | 2 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/XHTML_Impress_File.xcu (renamed from filter/source/config/fragments/filters/XHTML_Impress_File.xcu.in) | 2 | ||||
-rw-r--r-- | filter/source/config/fragments/filters/XHTML_Writer_File.xcu (renamed from filter/source/config/fragments/filters/XHTML_Writer_File.xcu.in) | 2 | ||||
-rw-r--r-- | framework/inc/services/substitutepathvars.hxx | 1 | ||||
-rw-r--r-- | framework/source/services/substitutepathvars.cxx | 6 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Paths.xcu (renamed from officecfg/registry/data/org/openoffice/Office/Paths.xcu.in) | 24 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/WebWizard.xcu (renamed from officecfg/registry/data/org/openoffice/Office/WebWizard.xcu.in) | 4 | ||||
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs (renamed from officecfg/registry/schema/org/openoffice/Office/Common.xcs.in) | 42 | ||||
-rw-r--r-- | wizards/source/configshare/dialog.xlc | 16 | ||||
-rw-r--r-- | wizards/source/configshare/dialog.xlc.in | 12 | ||||
-rw-r--r-- | wizards/source/configshare/script.xlc | 16 | ||||
-rw-r--r-- | wizards/source/configshare/script.xlc.in | 12 |
21 files changed, 69 insertions, 133 deletions
diff --git a/configure.ac b/configure.ac index c1425a77b375..2f20dd1de6a8 100644 --- a/configure.ac +++ b/configure.ac @@ -12519,25 +12519,7 @@ 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 - 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_FILES([config_host.mk Makefile lo.xcent 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]) diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu.in b/filter/source/config/fragments/filters/DocBook_File.xcu index d7a9fb324c01..724e6ebe7114 100644 --- a/filter/source/config/fragments/filters/DocBook_File.xcu.in +++ 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,../@LIBO_SHARE_FOLDER@/xslt/docbook/docbooktosoffheadings.xsl,../@LIBO_SHARE_FOLDER@/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,../$(share_subdir_name)/xslt/docbook/docbooktosoffheadings.xsl,../$(share_subdir_name)/xslt/docbook/sofftodocbookheadings.xsl</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> - <prop oor:name="TemplateName"><value>../@LIBO_SHARE_FOLDER@/xslt/docbook/DocBookTemplate.stw</value></prop> + <prop oor:name="TemplateName"><value>../$(share_subdir_name)/xslt/docbook/DocBookTemplate.stw</value></prop> <prop oor:name="UIName"> <value>DocBook</value> </prop> diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu.in b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu index ae48e70fdd29..f283b57a2933 100644 --- a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu.in +++ 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,../@LIBO_SHARE_FOLDER@/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,../@LIBO_SHARE_FOLDER@/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,../$(share_subdir_name)/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,../$(share_subdir_name)/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"/> diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu index 61cdad1fc891..56efe87dd509 100644 --- 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/xslt/import/wordml/wordml2ooo.xsl,../share/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_subdir_name)/xslt/import/wordml/wordml2ooo.xsl,../$(share_subdir_name)/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"/> diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu.in b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu.in deleted file mode 100644 index 006f400bf09d..000000000000 --- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu.in +++ /dev/null @@ -1,27 +0,0 @@ -<!-- - * 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> diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu.in b/filter/source/config/fragments/filters/UOF_presentation.xcu index dda8c7825f7b..800e9e1dee61 100644 --- a/filter/source/config/fragments/filters/UOF_presentation.xcu.in +++ 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,../@LIBO_SHARE_FOLDER@/xslt/import/uof/uof2odf_presentation.xsl,../@LIBO_SHARE_FOLDER@/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,../$(share_subdir_name)/xslt/import/uof/uof2odf_presentation.xsl,../$(share_subdir_name)/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"> diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu.in b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu index a86f2f18f0f4..148131b5dc0c 100644 --- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu.in +++ 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,../@LIBO_SHARE_FOLDER@/xslt/import/uof/uof2odf_spreadsheet.xsl,../@LIBO_SHARE_FOLDER@/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,../$(share_subdir_name)/xslt/import/uof/uof2odf_spreadsheet.xsl,../$(share_subdir_name)/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"> diff --git a/filter/source/config/fragments/filters/UOF_text.xcu.in b/filter/source/config/fragments/filters/UOF_text.xcu index 3270d1ac4cf0..0f7d6223712b 100644 --- a/filter/source/config/fragments/filters/UOF_text.xcu.in +++ 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,../@LIBO_SHARE_FOLDER@/xslt/import/uof/uof2odf_text.xsl,../@LIBO_SHARE_FOLDER@/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,../$(share_subdir_name)/xslt/import/uof/uof2odf_text.xsl,../$(share_subdir_name)/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"> diff --git a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu.in b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu index 5aa0729b8740..a13b05dc9b8a 100644 --- a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu.in +++ 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,,../@LIBO_SHARE_FOLDER@/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,,../$(share_subdir_name)/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"> diff --git a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu.in b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu index d304b52b9596..c63283a4e098 100644 --- a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu.in +++ 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,,../@LIBO_SHARE_FOLDER@/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,,../$(share_subdir_name)/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"> diff --git a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu.in b/filter/source/config/fragments/filters/XHTML_Impress_File.xcu index a06d4b2fe706..f8431fe16520 100644 --- a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu.in +++ 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,,../@LIBO_SHARE_FOLDER@/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,,../$(share_subdir_name)/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"> diff --git a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu.in b/filter/source/config/fragments/filters/XHTML_Writer_File.xcu index 993d78c6e093..e50ec3077545 100644 --- a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu.in +++ 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,,../@LIBO_SHARE_FOLDER@/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,,../$(share_subdir_name)/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"> diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 7604a879a2a4..085a99cb9e10 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -179,6 +179,7 @@ enum PreDefVariable PREDEFVAR_BASEINSTURL, PREDEFVAR_USERDATAURL, PREDEFVAR_BRANDBASEURL, + PREDEFVAR_SHARE_SUBDIR_NAME, PREDEFVAR_COUNT }; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index e1093b7f540a..b9b390c75792 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -104,6 +104,7 @@ #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; @@ -193,7 +194,8 @@ 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_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 } }; //_________________________________________________________________________________________________________________ @@ -1115,6 +1117,8 @@ 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 diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu.in b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index 4b5ec7dd2f8f..ace000205363 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu.in +++ 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)/@LIBO_SHARE_FOLDER@/autocorr" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/basic" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/config/symbol" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/config" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/gallery" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/dict" oor:op="fuse"/> - <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/dict/ooo" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/dict" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/wordbook" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/fingerprint" oor:op="fuse"/> + <node install:module="internallibexttextcatdata" oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/template/$(vlang)" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/config" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/> </node> </node> <node oor:name="UserConfig" oor:op="fuse" oor:mandatory="true"> diff --git a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu.in b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu index 3861af800175..70f0f097d9f2 100644 --- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu.in +++ 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)/@LIBO_SHARE_FOLDER@/gallery/www-back/</value> + <value>$(inst)/$(share_subdir_name)/gallery/www-back/</value> </prop> </node> <node oor:name="2" oor:op="replace"> <prop oor:name="Href"> - <value>$(inst)/@LIBO_SHARE_FOLDER@/gallery/surface</value> + <value>$(inst)/$(share_subdir_name)/gallery/surface</value> </prop> </node> <node oor:name="3" oor:op="replace"> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs.in b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 3de839b9f93e..ac9ed4593a00 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs.in +++ 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)/@LIBO_SHARE_FOLDER@/autocorr</it> + <it>$(insturl)/$(share_subdir_name)/autocorr</it> <it>$(userurl)/autocorr</it> </value> </prop> @@ -1539,7 +1539,7 @@ modules.</desc> </info> <value> - <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it> + <it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it> <it>$(userurl)/autotext</it> </value> </prop> @@ -1555,7 +1555,7 @@ AutoPilots.</desc> </info> <value> - <it>$(insturl)/@LIBO_SHARE_FOLDER@/basic</it> + <it>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/config/symbol</value> + <value>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/config</value> + <value>$(insturl)/$(share_subdir_name)/config</value> </prop> <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false"> <info> <desc>Contains the provided dictionaries.</desc> </info> - <value>$(insturl)/@LIBO_SHARE_FOLDER@/wordbook</value> + <value>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/gallery</it> + <it>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/dict</value> + <value>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it> - <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it> + <it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it> + <it>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/config</it> + <it>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/autocorr</it> + <it>$(insturl)/$(share_subdir_name)/autocorr</it> <it>$(userurl)/autocorr</it> </value> </prop> @@ -1730,7 +1730,7 @@ located.</desc> </info> <value> - <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it> + <it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it> <it>$(userurl)/autotext</it> </value> </prop> @@ -1747,7 +1747,7 @@ the AutoPilots, are located.</desc> </info> <value> - <it>$(insturl)/@LIBO_SHARE_FOLDER@/basic</it> + <it>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/config/symbol</value> + <value>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/config</value> + <value>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/wordbook/$(vlang)</value> + <value>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/gallery</it> + <it>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/dict</value> + <value>$(insturl)/$(share_subdir_name)/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)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it> - <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it> + <it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it> + <it>$(insturl)/$(share_subdir_name)/template/common</it> <it>$(userurl)/template</it> </value> </prop> diff --git a/wizards/source/configshare/dialog.xlc b/wizards/source/configshare/dialog.xlc index 297b562dec80..60ab31e7d743 100644 --- a/wizards/source/configshare/dialog.xlc +++ b/wizards/source/configshare/dialog.xlc @@ -1,12 +1,12 @@ <?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/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: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:libraries> diff --git a/wizards/source/configshare/dialog.xlc.in b/wizards/source/configshare/dialog.xlc.in deleted file mode 100644 index 256461658603..000000000000 --- a/wizards/source/configshare/dialog.xlc.in +++ /dev/null @@ -1,12 +0,0 @@ -<?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> diff --git a/wizards/source/configshare/script.xlc b/wizards/source/configshare/script.xlc index 13330d288e20..a88496229958 100644 --- a/wizards/source/configshare/script.xlc +++ b/wizards/source/configshare/script.xlc @@ -1,12 +1,12 @@ <?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/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: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:libraries> diff --git a/wizards/source/configshare/script.xlc.in b/wizards/source/configshare/script.xlc.in deleted file mode 100644 index ac22172d1296..000000000000 --- a/wizards/source/configshare/script.xlc.in +++ /dev/null @@ -1,12 +0,0 @@ -<?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> |