summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 09:54:46 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 09:54:46 +1000
commitddce1e22fbdd3256c304541ac0470bb2c2a82ed1 (patch)
tree632484f21aee025a9d6e9bb85eda93c28772bc23 /framework
parentbbd2d2c116158613ec690bdadca7abe59af88860 (diff)
tdf#43157: convert framework module away from OSL_ASSERT to assert
Change-Id: Iac0093a2a69d53c91c827ebba01fcdb5353e9b96
Diffstat (limited to 'framework')
-rw-r--r--framework/source/accelerators/presethandler.cxx2
-rw-r--r--framework/source/recording/dispatchrecorder.cxx2
-rw-r--r--framework/source/services/ContextChangeEventMultiplexer.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx6
4 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 62ba06b9fe14..d1d094d0b3b1 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -170,7 +170,7 @@ void lcl_throwCorruptedUIConfigurationException(
{
css::uno::Exception e;
bool ok = (exception >>= e);
- OSL_ASSERT(ok); (void) ok; // avoid warnings
+ assert(ok); (void) ok; // avoid warnings
throw css::configuration::CorruptedUIConfigurationException(
lcl_getLocalizedMessage(id),
css::uno::Reference< css::uno::XInterface >(),
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index b8b9c3f47bd7..6d69d002541a 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -78,7 +78,7 @@ Sequence< Any > make_seq_out_of_struct(
}
typelib_TypeDescription * pTD = nullptr;
TYPELIB_DANGER_GET( &pTD, type.getTypeLibType() );
- OSL_ASSERT( pTD );
+ assert( pTD );
if (! pTD)
{
throw RuntimeException(
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 1171aebc87d7..0c9f372e039c 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -317,7 +317,7 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing ( const css::lang::EventO
if (iDescriptor == maListeners.end())
{
- OSL_ASSERT(iDescriptor != maListeners.end());
+ assert(iDescriptor != maListeners.end());
return;
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 2ab500e34b04..3b936d92ff8f 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -148,7 +148,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
m_xContext( rxContext ),
m_sIconTheme( SvtMiscOptions().GetIconTheme() )
{
- OSL_ASSERT( m_xContext.is() );
+ assert( m_xContext.is() );
vcl::Window* pWindow = m_pToolBar;
while ( pWindow && !pWindow->IsSystemWindow() )
@@ -204,12 +204,12 @@ ToolBarManager::~ToolBarManager()
{
assert(!m_aAsyncUpdateControllersTimer.IsActive());
assert(!m_pToolBar); // must be disposed by ToolbarLayoutManager
- OSL_ASSERT( !m_bAddedToTaskPaneList );
+ assert( !m_bAddedToTaskPaneList );
}
void ToolBarManager::Destroy()
{
- OSL_ASSERT( m_pToolBar != nullptr );
+ assert( m_pToolBar != nullptr );
SolarMutexGuard g;
if ( m_bAddedToTaskPaneList )
{