[Libreoffice-commits] .: framework/source

[Lubos Lunak]

 framework/source/classes/menumanager.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit ef9620df989cd1e3ab9cf2e289b035231cca4d39
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Apr 4 17:59:46 2012 +0200

    remove an assert from an attempt to silence clang's false warning
    
    http://llvm.org/bugs/show_bug.cgi?id=12459
    It is not clear to me why the explicit cast was there in the first
    place, but removing it probably can't make the situation worse
    than aborting incorrectly.

diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 202b7eb..40f329c 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -146,14 +146,7 @@ MenuManager::MenuManager(
     m_xFrame            = rFrame;
     m_bInitialized      = sal_False;
     m_bIsBookmarkMenu   = sal_False;
-#ifdef LIBO_WERROR
-    // Wtf? Clang says: call to pure virtual member function
-    // 'acquire'; overrides of 'acquire' in subclasses are not
-    // available in the constructor of 'XInterface'
-    assert(!"Call to pure virtual member function");
-#else
-    SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
-#endif
+    acquire();
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     m_bShowMenuImages   = rSettings.GetUseImagesInMenus();