f052892015
- updated to libreoffice-3.4.2.5 (SUSE 3.4.2-rc2) OBS-URL: https://build.opensuse.org/request/show/80943 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=19
25 lines
978 B
Diff
25 lines
978 B
Diff
--- cui/source/options/treeopt.cxx.old 2011-05-20 18:05:12.000000000 +0200
|
|
+++ cui/source/options/treeopt.cxx 2011-08-29 17:03:53.000000000 +0200
|
|
@@ -2128,7 +2128,7 @@ void OfaTreeOptionsDialog::Initialize( c
|
|
if ( nPageId == RID_SVXPAGE_INET_MAIL )
|
|
continue;
|
|
#endif
|
|
-#if defined MACOSX
|
|
+#if defined MACOSX || !defined WITH_MOZILLA_XUL
|
|
// Disable Mozilla Plug-in tab-page on Mac
|
|
if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN )
|
|
continue;
|
|
--- cui/source/options/makefile.mk.old 2011-08-29 18:30:17.000000000 +0200
|
|
+++ cui/source/options/makefile.mk 2011-08-29 16:28:25.000000000 +0200
|
|
@@ -38,6 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
|
|
CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
|
|
.ENDIF # ENABLE_LAYOUT == TRUE
|
|
|
|
+.IF "$(WITH_MOZILLA_XUL)" == "YES"
|
|
+CFLAGS+= -DWITH_MOZILLA_XUL
|
|
+.ENDIF
|
|
+
|
|
# --- Files --------------------------------------------------------
|
|
|
|
SRS1NAME=options
|