From c6a73009747814513ab5a7277c211449c7378870 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 16 Aug 2013 11:08:32 +0300 Subject: Use subfolder names from Change all instances of hardcoded "program", "share" etc subfolder names to use those from instead. In normal builds, the end result will not change. Change-Id: I91c95cd8e482818be67307e889ae6df887763f53 --- .../registry/data/org/openoffice/Office/Addons.xcu | 36 +++++++++---------- .../data/org/openoffice/Office/Impress.xcu | 2 +- .../registry/data/org/openoffice/Office/Paths.xcu | 24 ++++++------- .../data/org/openoffice/Office/WebWizard.xcu | 4 +-- .../schema/org/openoffice/Office/Common.xcs | 42 +++++++++++----------- 5 files changed, 54 insertions(+), 54 deletions(-) (limited to 'officecfg/registry') diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu index b01deb962e60..cecba99e6f20 100644 --- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu @@ -166,10 +166,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_arrowshapes.up-arrow.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_arrowshapes.up-arrow.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_arrowshapes.up-arrow.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_arrowshapes.up-arrow.png @@ -179,10 +179,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_arrowshapes.down-arrow.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_arrowshapes.down-arrow.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_arrowshapes.down-arrow.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_arrowshapes.down-arrow.png @@ -192,10 +192,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_arrowshapes.circular-leftarrow.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_arrowshapes.circular-leftarrow.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_arrowshapes.circular-leftarrow.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_arrowshapes.circular-leftarrow.png @@ -205,10 +205,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_arrowshapes.circular-arrow.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_arrowshapes.circular-arrow.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_arrowshapes.circular-arrow.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_arrowshapes.circular-arrow.png @@ -218,10 +218,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_runbasic.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_runbasic.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_runbasic.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_runbasic.png @@ -231,10 +231,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_basicstop.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_basicstop.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_basicstop.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_basicstop.png @@ -244,10 +244,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_navigationbarleft.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_navigationbarleft.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_navigationbarleft.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_navigationbarleft.png @@ -257,10 +257,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_newdoc.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_newdoc.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_newdoc.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_newdoc.png @@ -270,10 +270,10 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_editglossary.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_editglossary.png - vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_editglossary.png + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_editglossary.png diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu index ad5cbd9b1559..3f2e9a43debb 100644 --- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu @@ -202,7 +202,7 @@ - vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml + vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions-ogl.xml diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index a5c438da4dce..ace000205363 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -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 index 9484f0aa4ba8..70f0f097d9f2 100644 --- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu +++ b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu @@ -1241,12 +1241,12 @@ - $(inst)/share/gallery/www-back/ + $(inst)/$(share_subdir_name)/gallery/www-back/ - $(inst)/share/gallery/surface + $(inst)/$(share_subdir_name)/gallery/surface diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 64661b5cd923..c1e96a153a22 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1529,7 +1529,7 @@ Specifies the settings of the AutoCorrect dialog. - $(insturl)/share/autocorr + $(insturl)/$(share_subdir_name)/autocorr $(userurl)/autocorr @@ -1539,7 +1539,7 @@ modules. - $(insturl)/share/autotext/$(vlang) + $(insturl)/$(share_subdir_name)/autotext/$(vlang) $(userurl)/autotext @@ -1555,7 +1555,7 @@ AutoPilots. - $(insturl)/share/basic + $(insturl)/$(share_subdir_name)/basic $(userurl)/basic @@ -1564,20 +1564,20 @@ Contains the bitmap files which can be used for menu and toolbar icons. - $(insturl)/share/config/symbol + $(insturl)/$(share_subdir_name)/config/symbol Contains the configuration files. This value cannot be changed through the user interface. - $(insturl)/share/config + $(insturl)/$(share_subdir_name)/config Contains the provided dictionaries. - $(insturl)/share/wordbook + $(insturl)/$(share_subdir_name)/wordbook @@ -1598,7 +1598,7 @@ and multimedia files. - $(insturl)/share/gallery + $(insturl)/$(share_subdir_name)/gallery $(userurl)/gallery @@ -1620,7 +1620,7 @@ Contains the files that are necessary for the spellcheck. - $(insturl)/share/dict + $(insturl)/$(share_subdir_name)/dict @@ -1665,8 +1665,8 @@ sub-folders. - $(insturl)/share/template/$(vlang) - $(insturl)/share/template/common + $(insturl)/$(share_subdir_name)/template/$(vlang) + $(insturl)/$(share_subdir_name)/template/common $(userurl)/template @@ -1677,7 +1677,7 @@ merged from UserConfig and from these folders. - $(insturl)/share/config + $(insturl)/$(share_subdir_name)/config @@ -1720,7 +1720,7 @@ AutoCorrect dialog. - $(insturl)/share/autocorr + $(insturl)/$(share_subdir_name)/autocorr $(userurl)/autocorr @@ -1730,7 +1730,7 @@ located. - $(insturl)/share/autotext/$(vlang) + $(insturl)/$(share_subdir_name)/autotext/$(vlang) $(userurl)/autotext @@ -1747,7 +1747,7 @@ the AutoPilots, are located. - $(insturl)/share/basic + $(insturl)/$(share_subdir_name)/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/config/symbol + $(insturl)/$(share_subdir_name)/config/symbol Specifies the default directory where the configuration files are stored. - $(insturl)/share/config + $(insturl)/$(share_subdir_name)/config Specifies the default directory where the provided dictionaries are located. - $(insturl)/share/wordbook/$(vlang) + $(insturl)/$(share_subdir_name)/wordbook/$(vlang) @@ -1792,7 +1792,7 @@ multimedia files are located. - $(insturl)/share/gallery + $(insturl)/$(share_subdir_name)/gallery $(userurl)/gallery @@ -1815,7 +1815,7 @@ Specifies the default directory where the files that are necessary for the spellcheck are saved. - $(insturl)/share/dict + $(insturl)/$(share_subdir_name)/dict @@ -1853,8 +1853,8 @@ are located in folders and sub-folders. - $(insturl)/share/template/$(vlang) - $(insturl)/share/template/common + $(insturl)/$(share_subdir_name)/template/$(vlang) + $(insturl)/$(share_subdir_name)/template/common $(userurl)/template -- cgit