diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 11:52:37 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 11:52:37 +1000 |
| commit | 2b1737f648024328390bf44c4f2c614e748a92fd (patch) | |
| tree | a550f95981bd5ea0966329f2457a80fbd0f4fed0 /svx/source/sdr | |
| parent | c3c5c16849d1dfc9503b10a35f076907e8ccabb1 (diff) | |
tdf#43157: convert svx module away from OSL_ASSERT to assert
Change-Id: I3d76e4237a1c8a389244fab6e8f546d818b77d9a
Diffstat (limited to 'svx/source/sdr')
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/properties/attributeproperties.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 943775beed68..eefc491c4f98 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -52,7 +52,7 @@ namespace } catch(const uno::Exception&) { - OSL_ASSERT(false); + assert(false); } } diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index d18959eb4ca1..299b07342814 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -243,7 +243,7 @@ namespace sdr void AttributeProperties::MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel) { - OSL_ASSERT(pNewModel!=nullptr); + assert(pNewModel!=nullptr); if(pSrcPool && pDestPool && (pSrcPool != pDestPool)) { @@ -282,7 +282,7 @@ namespace sdr // name or use the default. // Look up the style in the new document. - OSL_ASSERT(pNewModel->GetStyleSheetPool() != nullptr); + assert(pNewModel->GetStyleSheetPool() != nullptr); SfxStyleSheet* pNewStyleSheet = dynamic_cast<SfxStyleSheet*>( pNewModel->GetStyleSheetPool()->Find( pStySheet->GetName(), |