[Libreoffice-commits] .: 4 commits - sfx2/source

[Tor Lillqvist]

 sfx2/source/appl/shutdownicon.cxx  |    5 +++++
 sfx2/source/bastyp/fltlst.hxx      |    2 +-
 sfx2/source/dialog/taskpane.cxx    |    2 +-
 sfx2/source/doc/docundomanager.cxx |    6 +++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit e6b5c5345f25c8881f0dca33d4a7bd4262d5e01e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Oct 6 11:05:26 2011 +0300

    WaE: class has virtual functions, but destructor is not virtual

diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index 3ae7238..0f42b9d 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -103,6 +103,10 @@ namespace sfx2
         {
         }
 
+        virtual ~DocumentUndoManager_Impl()
+        {
+        };
+
         const SfxObjectShell* getObjectShell() const { return rAntiImpl.getBaseModel().GetObjectShell(); }
               SfxObjectShell* getObjectShell()       { return rAntiImpl.getBaseModel().GetObjectShell(); }
 
@@ -206,7 +210,7 @@ namespace sfx2
         {
         }
 
-        ~UndoManagerGuard()
+        virtual ~UndoManagerGuard()
         {
         }
 
commit f3cf2a1901e0c7559b8749d94a5865e3508be664
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Oct 6 10:54:10 2011 +0300

    WaE: class has virtual functions, but destructor is not virtual

diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 673b562..3204dc6 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -872,7 +872,7 @@ namespace sfx2
             ModuleTaskPane& i_rTaskPane,
             TitledDockingWindow& i_rDockingWindow
         );
-        ~TaskPaneController_Impl();
+        virtual ~TaskPaneController_Impl();
 
         void    SetDefaultTitle( const String& i_rTitle );
         void    ActivateToolPanel( const ::rtl::OUString& i_rPanelURL );
commit 3120dc697c721b9823bbabf113eeb8b28f288269
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Oct 6 10:45:07 2011 +0300

    WaE: class has virtual functions, but destructor is not virtual

diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index e7d010b..b0c362e 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
@@ -50,7 +50,7 @@ class SfxFilterListener
 
     public:
         SfxFilterListener();
-        ~SfxFilterListener();
+        virtual ~SfxFilterListener();
 
     public:
         // XRefreshListener
commit 18a203e7e9e99c4577e46b08219a238ce1fe0e99
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Oct 6 10:35:53 2011 +0300

    WaE: unreachable code

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 32610f1..82c1af7 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -179,6 +179,10 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
     }
 #  endif // UNX
 #endif // ENABLE_QUICKSTART_APPLET
+
+#if !defined( ENABLE_QUICKSTART_APPLET ) || defined( UNX )
+    // Avoid unreachable code. In the ENABLE_QUICKSTART_APPLET && !UNX
+    // case, we have already returned.
     if ( pModule )
     {
         if ( !*pInit )
@@ -188,6 +192,7 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
     }
 
     return true;
+#endif // !ENABLE_QUICKSTART_APPLET || UNX
 }
 
 // These two timeouts are necessary to avoid there being