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

[Petr Mladek]

 scp2/source/ooo/makefile.mk          |    4 ----
 scp2/source/ooo/module_systemint.scp |   14 --------------
 2 files changed, 18 deletions(-)

New commits:
commit 5312462b3b3312dde1f9bacb59c320f69c13c3e1
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Dec 14 19:15:08 2010 +0100

    Revert "add broffice dekstop integration to the install set on Linux (fdo#32229)"
    
    Michael fixed it better with fixing translation of the pt_BR strings in
    desktop files.
    
    This reverts commit e1f9bc93fd1e1757b837b4b31a47fc2f90cee727.

diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 8256abb..fc2ebdd 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -108,10 +108,6 @@ SCPDEFS+=-DSYSTEM_CAIRO
 SCPDEFS+=-DENABLE_CAIRO
 .ENDIF
 
-.IF "$(ENABLE_BROFFICE)" == "TRUE"
-SCPDEFS+=-DENABLE_BROFFICE
-.ENDIF
-
 .IF "$(SYSTEM_LIBXML)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBXML
 .ENDIF
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index c9ce35e..12ccef4 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -48,17 +48,3 @@ Module gid_Module_Optional_Systemintegration
 	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
 End
 
-#ifdef ENABLE_BROFFICE
-#ifdef UNX
-
-Module gid_Module_Optional_Systemintegration_Br
-    ParentID = gid_Module_Optional;
-    Sortkey = "800";
-    MOD_NAME_DESC(MODULE_OPTIONAL_SYSTEMINTEGRATION);
-    Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
-    PackageName = "broffice-desktop-integration.tar.gz";
-    InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
-End
-
-#endif
-#endif