[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - scp2/source

[Bjoern Michaelsen]

 scp2/source/ooo/file_library_ooo.scp  |    4 ++++
 scp2/source/ooo/makefile.mk           |    4 ++++
 scp2/source/ooo/module_hidden_ooo.scp |    4 +++-
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit d421ddb805a0f1ea819908fb7865883812ba1682
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Apr 4 12:21:44 2011 +0200

    add lomenubar lib

diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 6423d38..86ef48c 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -250,6 +250,10 @@ SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\"
 SCPDEFS+=-DMINGW_GXXDLL=\""$(MINGW_GXXDLL)"\"
 .ENDIF
 
+.IF "$(ENABLE_LOMENUBAR)" == "TRUE"
+SCPDEFS+=-DENABLE_LOMENUBAR
+.ENDIF
+
 SCP_PRODUCT_TYPE=osl
 
 ICUVERSION_DEPENDENT_FILES= \
commit 1f09dd9b7fc8d902042ebbc575904c0e39fc931b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Apr 1 19:39:40 2011 +0200

    add lomenubar lib

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3b433b3..fde7f70 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1806,3 +1806,7 @@ File gid_File_Lib_sellangmsi
     Name = "sellangmsi.dll";
 End
 #endif
+
+#ifdef ENABLE_LOMENUBAR
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno )
+#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index faa50a3..d7883e9 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -431,6 +431,9 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Fps,
 	gid_File_Lib_Ftransl,
 	gid_File_Lib_Lngpckinsthlp,
+#ifdef ENABLE_LOMENUBAR
+	gid_File_Lib_Lomenubar,
+#endif
     gid_File_Lib_sn_tools,
     gid_File_Lib_relnotes,
     GID_FILE_LIB_WPD,
@@ -875,4 +878,3 @@ End
 // End
 // #endif
 
-