diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-04-04 17:59:46 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-04-04 18:03:11 +0200 |
commit | ef9620df989cd1e3ab9cf2e289b035231cca4d39 (patch) | |
tree | 7367441de1a139d5949e159c8fceaaebcb36b410 /framework | |
parent | 33619919036457e3a37c4c47a8cef274d55253a8 (diff) |
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.
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/classes/menumanager.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 202b7eba5cd0..40f329cd432c 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(); |