sb138: merged in re/DEV300_next towards DEV300_m100

7 files changed, 19 insertions, 71 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e1634ab78f76..7afdcd81e1ec 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -124,8 +124,7 @@ Module gid_Module_Langpack_Brand_Template
             gid_Brand_Dir_Readme,
             gid_Brand_Dir_Share,
             gid_Brand_Dir_Share_Readme);
-    Files = (gid_Brand_File_Res_Iso,
-             gid_Brand_File_Res_Ooo,
+    Files = (gid_Brand_File_Res_About,
              gid_Brand_File_Res_Oirm,
              gid_Brand_File_Help_C05_Sdatabase_Zip,
              gid_Brand_File_Help_C05_Scalc_Zip,
@@ -1497,3 +1496,6 @@ File gid_Brand_File_Bin_Python
     Styles = (PACKED);
 End
 #endif
+
+BRAND_RES_FILE( gid_Brand_File_Res_About, about )
+
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 228f70ee1391..0e3eaba90e84 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -55,7 +55,6 @@ File gid_File_Lib_Basprov
   #endif
 End
 
-#ifdef ENABLE_VBA
 File gid_File_Lib_Vbaevent
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -66,7 +65,6 @@ File gid_File_Lib_Vbaevent
     Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
   #endif
 End
-#endif // ENABLE_VBA
 
 STD_LIB_FILE( gid_File_Lib_Bib , bib)
 
@@ -160,9 +158,9 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
 File gid_File_Lib_Comphelper2
     TXT_FILE_BODY;
   #ifdef UNX
-    Name = STRING(CONCAT3(libcomphelp4,COMID,UNXSUFFIX));
+    Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT3(comphelp4,COMID,.dll));
+    Name = STRING(CONCAT3(comphelp,COMID,.dll));
   #endif
     Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
@@ -236,8 +234,6 @@ STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
 
 STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 
-STD_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
-
 STD_LIB_FILE( gid_File_Lib_Dbase2, dbase )
 
 STD_LIB_FILE( gid_File_Lib_Dbfile , file)
@@ -336,9 +332,6 @@ File gid_File_Lib_Stringresource
   #endif
 End
 
-#if defined ENABLE_VBA
-#ifndef VBA_EXTENSION
-
 File gid_File_Lib_Vbaobj
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -366,13 +359,12 @@ File gid_File_Lib_Vbamsforms
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(msforms,.uno,.dll));
   #endif
 End
 
-#endif // VBA_EXTENSION
 File gid_File_Lib_Vbahelper
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -383,7 +375,6 @@ File gid_File_Lib_Vbahelper
     Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
   #endif
 End
-#endif // ENABLE_VBA
 
 
 #ifdef WNT
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 972c371ce489..eab2ebdf1734 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -135,35 +135,6 @@ End
 #endif
 #endif
 
-File gid_File_Bin_Gengal
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-  #ifdef UNX
-    Name = "gengal.bin";
-  #else
-    Name = "gengal.exe";
-  #endif
-End
-
-#ifdef UNX
-
-File gid_File_Script_Gengal
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "gengal";
-End
-
-#endif
-
-File gid_File_Profile_Gengal
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = PROFILENAME(gengal);
-End
-
 #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
 
 File gid_File_Bin_Pluginapp
@@ -926,9 +897,16 @@ File gid_File_Lm_Scots_Gaelic
     Styles = (PACKED);
 End
 
-File gid_File_Lm_Serbian_Ascii
+File gid_File_Lm_Serbian
     TXT_FILE_BODY;
-    Name = "serbian_ascii.lm";
+    Name = "serbian.lm";
+    Dir = gid_Dir_Share_Fingerprint;
+    Styles = (PACKED);
+End
+
+File gid_File_Lm_Serbian_Latin
+    TXT_FILE_BODY;
+    Name = "serbian-latin.lm";
     Dir = gid_Dir_Share_Fingerprint;
     Styles = (PACKED);
 End
@@ -1183,23 +1161,12 @@ File gid_File_Rdb_Offapi
     Name = "offapi.rdb";
 End
 
-#if defined ENABLE_VBA
-#ifndef VBA_EXTENSION
 File gid_File_Rdb_TypesVba
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Styles = (PACKED, OVERWRITE);
     Name = "oovbaapi.rdb";
 End
-#else
-File gid_File_ExtnVba
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED, OVERWRITE);
-    Name = "vbaapi.oxt";
-End
-#endif
-#endif
 
 File gid_File_Registry_Lang
     Dir = gid_Dir_Share_Registry_Res;
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 5f2e2795eaad..77e3456443ab 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -219,13 +219,6 @@ SCPDEFS+=-DSYSTEM_NEON
 SCPDEFS+=-DOPENSSL
 .ENDIF
 
-.IF "$(ENABLE_VBA)" == "YES"
-    .IF "$(VBA_EXTENSION)" == "YES"
-        SCPDEFS+=-DVBA_EXTENSION
-    .ENDIF
-SCPDEFS+=-DENABLE_VBA
-.ENDIF
-
 .IF "$(DISABLE_ATL)"!=""
 SCPDEFS+=-DDISABLE_ATL
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index e1bc26118011..3810b3126334 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -168,7 +168,6 @@ Module gid_Module_Root_Files_4
     gid_File_Lib_Sdbt,
     gid_File_Lib_Dbmm,
 	gid_File_Lib_Dba,
-	gid_File_Lib_Dbacfg,
 	gid_File_Lib_Dbase2,
 	gid_File_Lib_Dbaxml,
 	gid_File_Lib_Dbt,
@@ -594,7 +593,8 @@ Module gid_Module_Root_Files_6
     gid_File_Lm_Sanskrit,
     gid_File_Lm_Scots,
     gid_File_Lm_Scots_Gaelic,
-    gid_File_Lm_Serbian_Ascii,
+    gid_File_Lm_Serbian,
+    gid_File_Lm_Serbian_Latin,
     gid_File_Lm_Slovak_Ascii,
     gid_File_Lm_Slovenian,
     gid_File_Lm_Spanish,
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 4d78d3efb606..6111ab8130f9 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -59,4 +59,3 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
   #endif
 End
 
-BRAND_RES_FILE( gid_Brand_File_Res_Ooo, ooo )
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 81bfb6a8dd2d..3c6dfefc1286 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -342,11 +342,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_TYPES";
-#if defined ENABLE_VBA && !defined VBA_EXTENSION
     Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
-#else
-    Value = "$ORIGIN/offapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
-#endif
 End
 
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services