Use subfolder names from <config_folders.h>

Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.

Change-Id: I91c95cd8e482818be67307e889ae6df887763f53

1 files changed, 21 insertions, 21 deletions

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 @@
             <desc>Specifies the settings of the AutoCorrect dialog.</desc>
           </info>
           <value>
-            <it>$(insturl)/share/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)/share/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)/share/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)/share/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)/share/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)/share/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)/share/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)/share/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)/share/template/$(vlang)</it>
-            <it>$(insturl)/share/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)/share/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)/share/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)/share/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)/share/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)/share/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)/share/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)/share/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)/share/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)/share/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)/share/template/$(vlang)</it>
-            <it>$(insturl)/share/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>