summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-04-29 10:27:55 +0200
committerDavid Tardon <dtardon@redhat.com>2015-04-29 10:28:05 +0200
commitf6d4cd396803f568ca667ed5e4d7725ade99b5df (patch)
treea9e5f2f888f057d9143e3acbc0de4232f60f1397 /framework
parentf01c61a70dca72e4e66f0e6f9df5c2ad52bb778f (diff)
error C2666: 'operator ==' : 2 overloads have similar conversions
Change-Id: I2813d08f5f903d4d5115f04f58598b3841facfd0
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/toolbarmanager.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index aca1580fef76..7455ca7c9c65 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 );
}