diff options
| author | Bernhard Widl <bernhard.widl@cib.de> | 2017-06-26 18:47:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-27 12:51:27 +0200 |
| commit | 37e7bb9c7803a3d4a3b4c44562487403e274203f (patch) | |
| tree | cc1d0e9c18883e3f285b9ed3f5214ff6176679ee | |
| parent | 6124490c1e486d648d75cd1c3f7f4e793fb1d1c0 (diff) | |
fdo#43157 convert OSL_ASSERT to assert in sw/source
Change-Id: Ibef2f8deb36e2123f22bd925d1360c34de0ce47b
Reviewed-on: https://gerrit.libreoffice.org/39270
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/swdll.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/FrameControlsManager.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 30ff406b8ef3..e8b63c9352c8 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -7065,7 +7065,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) pVer8 += 24; //FONTSIGNATURE cbFfnM1-=24; - OSL_ASSERT(cbFfnM1 >= 2); + assert(cbFfnM1 >= 2); sal_uInt8 nMaxNullTerminatedPossible = cbFfnM1/2 - 1; sal_Unicode *pPrimary = reinterpret_cast<sal_Unicode*>(pVer8); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 74c833b39940..810f75e461c5 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -604,7 +604,7 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) else if (&rEdit == m_pBottomMarginED) pOpposite = m_pTopMarginED; - OSL_ASSERT(pOpposite); + assert(pOpposite); if (pOpposite) { diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index c7611e0e0f9f..9fe4c69efbae 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -829,7 +829,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) switch( pEvHint->GetEventId() ) { case SfxEventHintId::LoadFinished: - OSL_ASSERT(!pWrtSh); + SAL_WARN_IF(pWrtSh, "sw", "pWrtSh should be null"); // if it is a new document created from a template, // update fixed fields if (pDocSh->GetMedium()) diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index 0b226ec4dadd..af1e91322a80 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -172,7 +172,7 @@ SwDLL::~SwDLL() sw::Filters & SwDLL::getFilters() { - OSL_ASSERT(filters_); + assert(filters_); return *filters_.get(); } diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx index a16193227b1d..3ffb9a96f532 100644 --- a/sw/source/uibase/docvw/FrameControlsManager.cxx +++ b/sw/source/uibase/docvw/FrameControlsManager.cxx @@ -104,7 +104,7 @@ void SwFrameControlsManager::SetReadonlyControls( bool bReadonly ) void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrame* pPageFrame, FrameControlType eType, Point aOffset ) { - OSL_ASSERT( eType == Header || eType == Footer ); + assert( eType == Header || eType == Footer ); // Check if we already have the control SwFrameControlPtr pControl; |