Undo basis/brand split: merge basis share/ into brand share/.

18 files changed, 66 insertions, 90 deletions

diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index dbab1f4bbc99..4a2b6d092c4f 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -84,6 +84,6 @@ End
 File gid_File_Share_Registry_Base_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "base.xcd";
 End
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index 140a430afd2e..c1d1b1cb2685 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -31,7 +31,7 @@
 File gid_File_Share_Registry_Binfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "binfilter.xcd";
 End
 
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index a2f1fdbac1ae..3adb751cbffd 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -41,7 +41,7 @@ STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
 File gid_File_Share_Registry_Calc_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "calc.xcd";
 End
 
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 975b600aa965..9a388bc3874f 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -30,7 +30,7 @@
 File gid_File_Share_Registry_Draw_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "draw.xcd";
 End
 
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index b4da427fa670..e3d2baf39132 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -48,7 +48,7 @@ End
 File gid_File_Share_Registry_Gnome_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "gnome.xcd";
 End
 #endif
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index 15a18d297421..a968866bade8 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -30,7 +30,7 @@
 File gid_File_Share_Registry_Graphicfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "graphicfilter.xcd";
 End
 
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 074a4798266c..bbac0236b705 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -40,7 +40,7 @@ End
 File gid_File_Share_Registry_Impress_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "impress.xcd";
 End
 
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 300deca7aa34..91d5a4eefdaf 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -57,6 +57,6 @@ End
 File gid_File_Share_Registry_Ogltrans_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "ogltrans.xcd";
 End
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index e9eb2d1fbabd..614b120a691f 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -52,21 +52,21 @@ End
 File gid_File_Share_Registry_Palm_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "palm.xcd";
 End
 
 File gid_File_Share_Registry_Pocketexcel_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "pocketexcel.xcd";
 End
 
 File gid_File_Share_Registry_Pocketword_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "pocketword.xcd";
 End
 
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index c801808a444b..a080a048b023 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -28,7 +28,7 @@
 #include "macros.inc"
 
 Directory gid_Dir_Share_Layout
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "layout";
 End
 
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 8265088bd234..f3bbd32ea452 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -46,7 +46,7 @@ STD_RES_FILE( gid_File_Res_Sm, sm )
 File gid_File_Share_Registry_Math_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "math.xcd";
 End
 
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 2a7ddd376b6f..1267e33a5f77 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -32,7 +32,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
 File gid_File_Share_Registry_Onlineupdate_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "onlineupdate.xcd";
 End
 
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 0393302ce14b..e9c3adea01ab 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -349,22 +349,13 @@ Directory gid_Dir_Plugin
     Styles = (WORKSTATION, CREATE);
 End
 
-Directory gid_Dir_Share
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Ooo_Basis;
-#endif
-    DosName = "share";
-End
-
 Directory gid_Dir_Share_Migration
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "migration";
 End
 
 Directory gid_Dir_Fonts
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "fonts";
 End
 
@@ -378,7 +369,7 @@ End
 #endif
 
 Directory gid_Dir_Share_Xslt
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "xslt";
 End
 
@@ -460,7 +451,7 @@ Directory gid_Dir_Share_Xslt_Import_Common
 End
 
 Directory gid_Dir_Share_Dtd
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "dtd";
 End
 
@@ -485,17 +476,12 @@ Directory gid_Dir_Share_Dtd_Math_1_01
 End
 
 Directory gid_Dir_Share_Pqa
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "pqa";
 End
 
-Directory gid_Dir_Share_Config
-    ParentID = gid_Dir_Share;
-    DosName = "config";
-End
-
 Directory gid_Dir_Share_Config_Wizard
-    ParentID = gid_Dir_Share_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "wizard";
 End
 
@@ -510,7 +496,7 @@ Directory gid_Dir_Share_Config_Wizard_Web_Buttons
 End
 
 Directory gid_Dir_Share_Config_Sofficecfg
-    ParentID = gid_Dir_Share_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "soffice.cfg";
 End
 
@@ -674,18 +660,13 @@ Directory gid_Dir_Share_Config_Sofficecfg_Swriter_Menubar
     DosName = "menubar";
 End
 
-Directory gid_Dir_Share_Registry
-    ParentID = gid_Dir_Share;
-    DosName = "registry";
-End
-
 Directory gid_Dir_Share_Registry_Res
-    ParentID = gid_Dir_Share_Registry;
+    ParentID = gid_Brand_Dir_Share_Registry;
     HostName = "res";
 End
 
 Directory gid_Dir_Autotext
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "autotext";
 End
 
@@ -695,13 +676,13 @@ Directory gid_Dir_Autotext_Language
 End
 
 Directory gid_Dir_Share_Autocorr
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "autocorr";
     Styles = (WORKSTATION, CREATE);
 End
 
 Directory gid_Dir_Basic
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "basic";
 End
 
@@ -761,62 +742,57 @@ Directory gid_Dir_Basic_Scriptbindinglib
 End
 
 Directory gid_Dir_Share_Scripts
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "Scripts";
 End
 
 Directory gid_Dir_Share_Dict
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "dict";
 End
 
-Directory gid_Dir_Config
-    ParentID = gid_Dir_Share;
-    DosName = "config";
-End
-
 Directory gid_Dir_Config_Language
-    ParentID = gid_Dir_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DIR_ISOLANGUAGE_ALL_LANG_2;
 End
 
 Directory gid_Dir_Share_Config_Help
-    ParentID = gid_Dir_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "help";
 End
 
 Directory gid_Dir_Config_More
-    ParentID = gid_Dir_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "more";
 End
 
 Directory gid_Dir_Config_Start
-    ParentID = gid_Dir_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "start";
 End
 
 Directory gid_Dir_Config_Tasks
-    ParentID = gid_Dir_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "tasks";
 End
 
 Directory gid_Dir_Config_Settings
-    ParentID = gid_Dir_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "settings";
 End
 
 Directory gid_Dir_Config_Symbol
-    ParentID = gid_Dir_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "symbol";
 End
 
 Directory gid_Dir_Config_Webcast
-    ParentID = gid_Dir_Config;
+    ParentID = gid_Brand_Dir_Share_Config;
     DosName = "webcast";
 End
 
 Directory gid_Dir_Gallery
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "gallery";
 End
 
@@ -961,7 +937,7 @@ Directory gid_Dir_Gallery_Wwwgraf
 End
 
 Directory gid_Dir_Template
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "template";
 End
 
@@ -1076,7 +1052,7 @@ Directory gid_Dir_Template_Internal
 End
 
 Directory gid_Dir_Share_Database
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "database";
 End
 
@@ -1086,12 +1062,12 @@ Directory gid_Dir_Share_Database_Language
 End
 
 Directory gid_Dir_Explorer
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "explorer";
 End
 
 Directory gid_Dir_Bookmark
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "bookmark";
 End
 
@@ -1131,12 +1107,12 @@ Directory gid_Dir_Bookmark_Tourismus
 End
 
 Directory gid_Dir_Palmpilot
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "palmpilot";
 End
 
 Directory gid_Dir_Samples
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "samples";
 End
 
@@ -1187,17 +1163,17 @@ Directory gid_Dir_Samples_Databases_Dateien
 End
 
 Directory gid_Dir_Wordbook
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "wordbook";
 End
 
 Directory gid_Dir_Share_Plugin
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "plugin";
 End
 
 Directory gid_Dir_Share_Fingerprint
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "fingerprint";
 End
 
@@ -1307,7 +1283,7 @@ End
 #ifdef UNX
 
 Directory gid_Dir_Psprint
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "psprint";
 End
 
@@ -1334,7 +1310,7 @@ End
 #ifdef UNX
 
 Directory gid_Dir_Share_Icons
-    ParentID = gid_Dir_Share;
+    ParentID = gid_Brand_Dir_Share;
     DosName = "icons";
 End
 
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 993161786c26..6b2efbe9ea63 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -51,7 +51,7 @@ End
 #ifdef UNX
 
 File gid_File_Extra_Cfgsrv_Bitmap_Unx
-    Dir = gid_Dir_Config;
+    Dir = gid_Brand_Dir_Share_Config;
     ARCHIVE_TXT_FILE_BODY;
     Name = "cfgsrvbitmapunx.zip";
 End
@@ -66,7 +66,7 @@ File gid_File_Extra_Cfgusr
 End
 
 File gid_File_Extra_Cfgsrv
-    Dir = gid_Dir_Config;
+    Dir = gid_Brand_Dir_Share_Config;
     TXT_FILE_BODY;
     Styles = (ARCHIVE);
     Name = "cfgsrvnolang.zip";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 37e1f9d77cca..b7b329457d89 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -598,7 +598,7 @@ End
 File gid_File_Share_Registry_Main_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "main.xcd";
 End
 
@@ -607,7 +607,7 @@ End
 File gid_File_Share_Registry_Forcedefault_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "forcedefault.xcd";
 End
 
@@ -616,14 +616,14 @@ End
 File gid_File_Oo_Ldap_Xcd_Sample
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "oo-ldap.xcd.sample";
 End
 
 File gid_File_Oo_Ad_Ldap_Xcd_Sample
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "oo-ad-ldap.xcd.sample";
 End
 
@@ -656,14 +656,14 @@ End
 File gid_File_Registry_Spool_Langpack_Lang
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     FILE_ALL_LANG_LETTER(Langpack-,xcd);
 End
 
 File gid_File_Share_Registry_Ctl_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name (ar) = "ctl.xcd";
     Name (dz) = "ctl.xcd";
     Name (fa) = "ctl.xcd";
@@ -683,7 +683,7 @@ End
 File gid_File_Share_Registry_Ctlseqcheck_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name (km) = "ctlseqcheck.xcd";
     Name (lo) = "ctlseqcheck.xcd";
     Name (th) = "ctlseqcheck.xcd";
@@ -1228,7 +1228,7 @@ End
 
 File gid_File_Config_Javasettingsunopkginstall
     USER_FILE_BODY;
-    Dir = gid_Dir_Config;
+    Dir = gid_Brand_Dir_Share_Config;
     Name = "javasettingsunopkginstall.xml";
   #ifdef SOLARIS
     Styles = (PACKED,VOLATILEFILE);
@@ -1240,7 +1240,7 @@ End
 #ifdef THEME_DEFAULT
 File gid_File_Images_Zip
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
+    Dir = gid_Brand_Dir_Share_Config;
     Name = "images.zip";
     Styles = (PACKED);
 End
@@ -1249,7 +1249,7 @@ End
 #ifdef THEME_CRYSTAL
 File gid_File_ImagesCrystal_Zip
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
+    Dir = gid_Brand_Dir_Share_Config;
     Name = "images_crystal.zip";
     Styles = (PACKED);
 End
@@ -1258,7 +1258,7 @@ End
 #ifdef THEME_OXYGEN
 File gid_File_ImagesOxygen_Zip
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
+    Dir = gid_Brand_Dir_Share_Config;
     Name = "images_oxygen.zip";
     Styles = (PACKED);
 End
@@ -1267,7 +1267,7 @@ End
 #ifdef THEME_HICONTRAST
 File gid_File_ImagesHicontrast_Zip
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
+    Dir = gid_Brand_Dir_Share_Config;
     Name = "images_hicontrast.zip";
     Styles = (PACKED);
 End
@@ -1276,7 +1276,7 @@ End
 #ifdef THEME_TANGO
 File gid_File_ImagesTango_Zip
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
+    Dir = gid_Brand_Dir_Share_Config;
     Name = "images_tango.zip";
     Styles = (PACKED);
 End
@@ -1285,7 +1285,7 @@ End
 File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "lingucomponent.xcd";
 End
 
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 2895c5c8b27e..cfef220e2703 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -118,7 +118,7 @@ End
 File gid_File_Share_Registry_Pyuno_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "pyuno.xcd";
 End
 
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index a1ae5ca69188..3c831d85c2b1 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -88,6 +88,6 @@ End
 File gid_File_Share_Registry_Writer_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "writer.xcd";
 End
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index 788a511950a3..d71b521ad341 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -30,7 +30,7 @@
 File gid_File_Share_Registry_Xsltfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
+    Dir = gid_Brand_Dir_Share_Registry;
     Name = "xsltfilter.xcd";
 End