[Libreoffice-commits] core.git: framework/source

[David Tardon]

 framework/source/uielement/toolbarmanager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f6d4cd396803f568ca667ed5e4d7725ade99b5df
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 29 10:27:55 2015 +0200

    error C2666: 'operator ==' : 2 overloads have similar conversions
    
    Change-Id: I2813d08f5f903d4d5115f04f58598b3841facfd0

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index aca1580..7455ca7 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -243,7 +243,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
 ToolBarManager::~ToolBarManager()
 {
     assert(!m_aAsyncUpdateControllersTimer.IsActive());
-    OSL_ASSERT( m_pToolBar == 0 );
+    OSL_ASSERT( !m_pToolBar );
     OSL_ASSERT( !m_bAddedToTaskPaneList );
 }