summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
commit97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch)
tree7974a8b9423c56982646366b0859dfb2a1a88d50 /svtools
parentd0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff)
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/config/itemholder2.cxx2
-rw-r--r--svtools/source/control/toolbarmenu.cxx4
-rw-r--r--svtools/source/dialogs/colrdlg.cxx2
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx2
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx6
5 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index bf55780dde80..638120cf1515 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -162,7 +162,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
break;
default:
- assert(false);
+ OSL_ASSERT(false);
break;
}
}
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 69b02388ff98..92d23b77f701 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -46,7 +46,7 @@ namespace svtools {
static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
{
- assert( pWindow );
+ OSL_ASSERT( pWindow );
if ( pWindow )
{
// ->manually search topmost system window
@@ -60,7 +60,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
pWindow = pWindow->GetParent();
}
pWindow = pTopMostSysWin;
- assert( pWindow );
+ OSL_ASSERT( pWindow );
return pWindow;
}
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 066d508c4b4b..fb315dc7ea18 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -101,7 +101,7 @@ short SvColorDialog::Execute()
}
catch(Exception&)
{
- assert(false);
+ OSL_ASSERT(false);
}
return ret;
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 5376dcf3aea0..4d802f1d7763 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -63,7 +63,7 @@ ToolboxController::ToolboxController(
, m_aCommandURL( aCommandURL )
, m_aListenerContainer( m_aMutex )
{
- assert( m_xContext.is() );
+ OSL_ASSERT( m_xContext.is() );
registerProperty( TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE,
TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE,
css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY,
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 36b33ff23824..a0e0853a79fe 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -517,7 +517,7 @@ Any SAL_CALL TreeControlPeer::getSelection()
--nSelectionCount;
}
- assert( (pEntry == nullptr) && (nSelectionCount == 0) );
+ OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
aRet <<= aSelection;
}
@@ -618,7 +618,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
--nSelectionCount;
}
- assert( (pEntry == nullptr) && (nSelectionCount == 0) );
+ OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
}
@@ -641,7 +641,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
--nSelectionCount;
}
- assert( (pEntry == nullptr) && (nSelectionCount == 0) );
+ OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
}