CWS gnumake3: kill ENABLE_VBA

4 files changed, 0 insertions, 29 deletions

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9e83554af800..f6c009e389a1 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)
 
@@ -336,9 +334,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);
@@ -372,7 +367,6 @@ File gid_File_Lib_Vbamsforms
   #endif
 End
 
-#endif // VBA_EXTENSION
 File gid_File_Lib_Vbahelper
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -383,7 +377,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 7088f6212391..c31ac34636b2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1154,23 +1154,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/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