[Libreoffice-commits] .: sfx2/source

Michael Meeks michael at kemper.freedesktop.org
Fri Nov 4 05:34:05 PDT 2011


 sfx2/source/appl/shutdownicon.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9b699a2ce1e70f4752de9b9184765f46ffd274f8
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Nov 4 12:34:19 2011 +0000

    WaE: calm down windows shutdownicon warning

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 82c1af7..81b814e 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -116,11 +116,14 @@ SFX_IMPL_ONEINSTANCEFACTORY( ShutdownIcon );
 bool ShutdownIcon::bModalMode = false;
 ShutdownIcon* ShutdownIcon::pShutdownIcon = NULL;
 
+#if !defined( ENABLE_QUICKSTART_APPLET ) || defined( UNX )
 // To remove conditionals
 extern "C" {
     static void disabled_initSystray() { }
     static void disabled_deInitSystray() { }
 }
+#endif
+
 #define DOSTRING( x )                       #x
 #define STRING( x )                         DOSTRING( x )
 


More information about the Libreoffice-commits mailing list