diff --git a/configure.ac b/configure.ac index 2f20dd1de6a8..c1425a77b375 100644 --- 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]) diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu b/filter/source/config/fragments/filters/DocBook_File.xcu.in similarity index 83% rename from filter/source/config/fragments/filters/DocBook_File.xcu rename to filter/source/config/fragments/filters/DocBook_File.xcu.in index 724e6ebe7114..d7a9fb324c01 100644 --- a/filter/source/config/fragments/filters/DocBook_File.xcu +++ b/filter/source/config/fragments/filters/DocBook_File.xcu.in @@ -20,9 +20,9 @@ writer_DocBook_File com.sun.star.text.TextDocument - 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 + 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 com.sun.star.comp.Writer.XmlFilterAdaptor - ../$(share_subdir_name)/xslt/docbook/DocBookTemplate.stw + ../@LIBO_SHARE_FOLDER@/xslt/docbook/DocBookTemplate.stw DocBook diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu.in similarity index 87% rename from filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu rename to filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu.in index f283b57a2933..ae48e70fdd29 100644 --- a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu.in @@ -19,7 +19,7 @@ IMPORT EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.Writer.XmlFilterAdaptor - 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 + 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 0 calc_MS_Excel_2003_XML 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 56efe87dd509..61cdad1fc891 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 @@ IMPORT EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.Writer.XmlFilterAdaptor - 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 + 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 0 writer_MS_Word_2003_XML 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 new file mode 100644 index 000000000000..006f400bf09d --- /dev/null +++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu.in @@ -0,0 +1,27 @@ + + + IMPORT EXPORT ALIEN 3RDPARTYFILTER + + com.sun.star.comp.Writer.XmlFilterAdaptor + 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 + 0 + writer_MS_Word_2003_XML + + com.sun.star.text.TextDocument + diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu b/filter/source/config/fragments/filters/UOF_presentation.xcu.in similarity index 92% rename from filter/source/config/fragments/filters/UOF_presentation.xcu rename to filter/source/config/fragments/filters/UOF_presentation.xcu.in index 800e9e1dee61..dda8c7825f7b 100644 --- a/filter/source/config/fragments/filters/UOF_presentation.xcu +++ b/filter/source/config/fragments/filters/UOF_presentation.xcu.in @@ -20,7 +20,7 @@ Unified_Office_Format_presentation com.sun.star.presentation.PresentationDocument - 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 + 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 com.sun.star.comp.Writer.XmlFilterAdaptor diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu.in similarity index 89% rename from filter/source/config/fragments/filters/UOF_spreadsheet.xcu rename to filter/source/config/fragments/filters/UOF_spreadsheet.xcu.in index 148131b5dc0c..a86f2f18f0f4 100644 --- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu +++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu.in @@ -20,7 +20,7 @@ Unified_Office_Format_spreadsheet com.sun.star.sheet.SpreadsheetDocument - 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 + 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 com.sun.star.comp.Writer.XmlFilterAdaptor diff --git a/filter/source/config/fragments/filters/UOF_text.xcu b/filter/source/config/fragments/filters/UOF_text.xcu.in similarity index 89% rename from filter/source/config/fragments/filters/UOF_text.xcu rename to filter/source/config/fragments/filters/UOF_text.xcu.in index 0f7d6223712b..3270d1ac4cf0 100644 --- a/filter/source/config/fragments/filters/UOF_text.xcu +++ b/filter/source/config/fragments/filters/UOF_text.xcu.in @@ -20,7 +20,7 @@ Unified_Office_Format_text com.sun.star.text.TextDocument - 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 + 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 com.sun.star.comp.Writer.XmlFilterAdaptor diff --git a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu.in similarity index 95% rename from filter/source/config/fragments/filters/XHTML_Calc_File.xcu rename to filter/source/config/fragments/filters/XHTML_Calc_File.xcu.in index a13b05dc9b8a..5aa0729b8740 100644 --- a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu.in @@ -20,7 +20,7 @@ XHTML_File com.sun.star.sheet.SpreadsheetDocument - 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 + 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 com.sun.star.comp.Writer.XmlFilterAdaptor diff --git a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu.in similarity index 95% rename from filter/source/config/fragments/filters/XHTML_Draw_File.xcu rename to filter/source/config/fragments/filters/XHTML_Draw_File.xcu.in index c63283a4e098..d304b52b9596 100644 --- a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu.in @@ -20,7 +20,7 @@ XHTML_File com.sun.star.drawing.DrawingDocument - 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 + 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 com.sun.star.comp.Writer.XmlFilterAdaptor diff --git a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu b/filter/source/config/fragments/filters/XHTML_Impress_File.xcu.in similarity index 95% rename from filter/source/config/fragments/filters/XHTML_Impress_File.xcu rename to filter/source/config/fragments/filters/XHTML_Impress_File.xcu.in index f8431fe16520..a06d4b2fe706 100644 --- a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Impress_File.xcu.in @@ -20,7 +20,7 @@ XHTML_File com.sun.star.presentation.PresentationDocument - 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 + 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 com.sun.star.comp.Writer.XmlFilterAdaptor diff --git a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu b/filter/source/config/fragments/filters/XHTML_Writer_File.xcu.in similarity index 95% rename from filter/source/config/fragments/filters/XHTML_Writer_File.xcu rename to filter/source/config/fragments/filters/XHTML_Writer_File.xcu.in index e50ec3077545..993d78c6e093 100644 --- a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Writer_File.xcu.in @@ -20,7 +20,7 @@ XHTML_File com.sun.star.text.TextDocument - 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 + 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 com.sun.star.comp.Writer.XmlFilterAdaptor diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 085a99cb9e10..7604a879a2a4 100644 --- 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 }; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index b9b390c75792..e1093b7f540a 100644 --- 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 diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu.in similarity index 88% rename from officecfg/registry/data/org/openoffice/Office/Paths.xcu rename to officecfg/registry/data/org/openoffice/Office/Paths.xcu.in index ace000205363..4b5ec7dd2f8f 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu.in @@ -26,7 +26,7 @@ - + $(userurl)/autocorr @@ -34,7 +34,7 @@ - + $(userurl)/autotext @@ -52,7 +52,7 @@ - + $(userurl)/basic @@ -60,12 +60,12 @@ - + - + @@ -80,7 +80,7 @@ - + $(userurl)/gallery @@ -103,8 +103,8 @@ - - + + $(userurl)/wordbook @@ -112,7 +112,7 @@ - + $(userurl)/wordbook @@ -135,7 +135,7 @@ - + @@ -158,7 +158,7 @@ - + $(userurl)/template @@ -166,7 +166,7 @@ - + diff --git a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu.in similarity index 99% rename from officecfg/registry/data/org/openoffice/Office/WebWizard.xcu rename to officecfg/registry/data/org/openoffice/Office/WebWizard.xcu.in index 70f0f097d9f2..3861af800175 100644 --- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu +++ b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu.in @@ -1241,12 +1241,12 @@ - $(inst)/$(share_subdir_name)/gallery/www-back/ + $(inst)/@LIBO_SHARE_FOLDER@/gallery/www-back/ - $(inst)/$(share_subdir_name)/gallery/surface + $(inst)/@LIBO_SHARE_FOLDER@/gallery/surface diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs.in similarity index 99% rename from officecfg/registry/schema/org/openoffice/Office/Common.xcs rename to officecfg/registry/schema/org/openoffice/Office/Common.xcs.in index ac9ed4593a00..3de839b9f93e 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs.in @@ -1529,7 +1529,7 @@ Specifies the settings of the AutoCorrect dialog. - $(insturl)/$(share_subdir_name)/autocorr + $(insturl)/@LIBO_SHARE_FOLDER@/autocorr $(userurl)/autocorr @@ -1539,7 +1539,7 @@ modules. - $(insturl)/$(share_subdir_name)/autotext/$(vlang) + $(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang) $(userurl)/autotext @@ -1555,7 +1555,7 @@ AutoPilots. - $(insturl)/$(share_subdir_name)/basic + $(insturl)/@LIBO_SHARE_FOLDER@/basic $(userurl)/basic @@ -1564,20 +1564,20 @@ Contains the bitmap files which can be used for menu and toolbar icons. - $(insturl)/$(share_subdir_name)/config/symbol + $(insturl)/@LIBO_SHARE_FOLDER@/config/symbol Contains the configuration files. This value cannot be changed through the user interface. - $(insturl)/$(share_subdir_name)/config + $(insturl)/@LIBO_SHARE_FOLDER@/config Contains the provided dictionaries. - $(insturl)/$(share_subdir_name)/wordbook + $(insturl)/@LIBO_SHARE_FOLDER@/wordbook @@ -1598,7 +1598,7 @@ and multimedia files. - $(insturl)/$(share_subdir_name)/gallery + $(insturl)/@LIBO_SHARE_FOLDER@/gallery $(userurl)/gallery @@ -1620,7 +1620,7 @@ Contains the files that are necessary for the spellcheck. - $(insturl)/$(share_subdir_name)/dict + $(insturl)/@LIBO_SHARE_FOLDER@/dict @@ -1665,8 +1665,8 @@ sub-folders. - $(insturl)/$(share_subdir_name)/template/$(vlang) - $(insturl)/$(share_subdir_name)/template/common + $(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang) + $(insturl)/@LIBO_SHARE_FOLDER@/template/common $(userurl)/template @@ -1677,7 +1677,7 @@ merged from UserConfig and from these folders. - $(insturl)/$(share_subdir_name)/config + $(insturl)/@LIBO_SHARE_FOLDER@/config @@ -1720,7 +1720,7 @@ AutoCorrect dialog. - $(insturl)/$(share_subdir_name)/autocorr + $(insturl)/@LIBO_SHARE_FOLDER@/autocorr $(userurl)/autocorr @@ -1730,7 +1730,7 @@ located. - $(insturl)/$(share_subdir_name)/autotext/$(vlang) + $(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang) $(userurl)/autotext @@ -1747,7 +1747,7 @@ the AutoPilots, are located. - $(insturl)/$(share_subdir_name)/basic + $(insturl)/@LIBO_SHARE_FOLDER@/basic $(userurl)/basic @@ -1756,21 +1756,21 @@ Specifies the default directory where the bitmap files, which can be used for the menu and toolbar icons, are located. - $(insturl)/$(share_subdir_name)/config/symbol + $(insturl)/@LIBO_SHARE_FOLDER@/config/symbol Specifies the default directory where the configuration files are stored. - $(insturl)/$(share_subdir_name)/config + $(insturl)/@LIBO_SHARE_FOLDER@/config Specifies the default directory where the provided dictionaries are located. - $(insturl)/$(share_subdir_name)/wordbook/$(vlang) + $(insturl)/@LIBO_SHARE_FOLDER@/wordbook/$(vlang) @@ -1792,7 +1792,7 @@ multimedia files are located. - $(insturl)/$(share_subdir_name)/gallery + $(insturl)/@LIBO_SHARE_FOLDER@/gallery $(userurl)/gallery @@ -1815,7 +1815,7 @@ Specifies the default directory where the files that are necessary for the spellcheck are saved. - $(insturl)/$(share_subdir_name)/dict + $(insturl)/@LIBO_SHARE_FOLDER@/dict @@ -1853,8 +1853,8 @@ are located in folders and sub-folders. - $(insturl)/$(share_subdir_name)/template/$(vlang) - $(insturl)/$(share_subdir_name)/template/common + $(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang) + $(insturl)/@LIBO_SHARE_FOLDER@/template/common $(userurl)/template diff --git a/wizards/source/configshare/dialog.xlc b/wizards/source/configshare/dialog.xlc index 60ab31e7d743..297b562dec80 100644 --- a/wizards/source/configshare/dialog.xlc +++ b/wizards/source/configshare/dialog.xlc @@ -1,12 +1,12 @@ - - - - - - - - + + + + + + + + diff --git a/wizards/source/configshare/dialog.xlc.in b/wizards/source/configshare/dialog.xlc.in new file mode 100644 index 000000000000..256461658603 --- /dev/null +++ b/wizards/source/configshare/dialog.xlc.in @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/wizards/source/configshare/script.xlc b/wizards/source/configshare/script.xlc index a88496229958..13330d288e20 100644 --- a/wizards/source/configshare/script.xlc +++ b/wizards/source/configshare/script.xlc @@ -1,12 +1,12 @@ - - - - - - - - + + + + + + + + diff --git a/wizards/source/configshare/script.xlc.in b/wizards/source/configshare/script.xlc.in new file mode 100644 index 000000000000..ac22172d1296 --- /dev/null +++ b/wizards/source/configshare/script.xlc.in @@ -0,0 +1,12 @@ + + + + + + + + + + + +