summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sdext/source/pdfimport/tree/imagecontainer.cxx2
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx8
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx6
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.cxx8
-rw-r--r--sdext/source/presenter/PresenterButton.cxx4
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.cxx2
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx4
-rw-r--r--sdext/source/presenter/PresenterController.cxx6
-rw-r--r--sdext/source/presenter/PresenterHelpView.cxx2
-rw-r--r--sdext/source/presenter/PresenterNotesView.cxx8
-rw-r--r--sdext/source/presenter/PresenterPaneBase.cxx12
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.cxx8
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.cxx4
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.cxx4
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.cxx2
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx14
-rw-r--r--sdext/source/presenter/PresenterScrollBar.cxx12
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.cxx2
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx18
-rw-r--r--sdext/source/presenter/PresenterSpritePane.cxx4
-rw-r--r--sdext/source/presenter/PresenterTextView.cxx4
-rw-r--r--sdext/source/presenter/PresenterTheme.cxx6
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx40
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx2
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx6
25 files changed, 94 insertions, 94 deletions
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index b44ef77db127..0bc8c605c0b7 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -114,7 +114,7 @@ ImageId ImageContainer::addImage( const uno::Sequence<beans::PropertyValue>& xBi
void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContext )
{
- OSL_ASSERT( nId >= 0 && nId < ImageId( m_aImages.size()) );
+ assert( nId >= 0 && nId < ImageId( m_aImages.size()) );
const uno::Sequence<beans::PropertyValue>& rEntry( m_aImages[nId] );
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index cdbcd2ddb6eb..25391e80d9bf 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -826,7 +826,7 @@ void Parser::parseLine( const OString& rLine )
const OString& rCmd = readNextToken();
const hash_entry* pEntry = PdfKeywordHash::in_word_set( rCmd.getStr(),
rCmd.getLength() );
- OSL_ASSERT(pEntry);
+ assert(pEntry);
switch( pEntry->eKey )
{
case CLIPPATH:
@@ -1017,7 +1017,7 @@ bool xpdf_ImportFromFile( const OUString& rURL,
const uno::Reference< uno::XComponentContext >& xContext,
const OUString& rFilterOptions )
{
- OSL_ASSERT(rSink);
+ assert(rSink);
OUString aSysUPath;
if( osl_getSystemPathFromFileURL( rURL.pData, &aSysUPath.pData ) != osl_File_E_None )
@@ -1196,8 +1196,8 @@ bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >& xI
const uno::Reference< uno::XComponentContext >& xContext,
const OUString& rFilterOptions )
{
- OSL_ASSERT(xInput.is());
- OSL_ASSERT(rSink);
+ assert(xInput.is());
+ assert(rSink);
// convert XInputStream to local temp file
oslFileHandle aFile = nullptr;
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 3dd042d6cc79..fbe4e0a742ac 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1846,8 +1846,8 @@ AccessibleFocusManager::AccessibleFocusManager()
void AccessibleFocusManager::AddFocusableObject (
const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
{
- OSL_ASSERT(rpObject.is());
- OSL_ASSERT(::std::find(maFocusableObjects.begin(),maFocusableObjects.end(), rpObject)==maFocusableObjects.end());
+ assert(rpObject.is());
+ assert(::std::find(maFocusableObjects.begin(),maFocusableObjects.end(), rpObject)==maFocusableObjects.end());
maFocusableObjects.push_back(rpObject);
}
@@ -1862,7 +1862,7 @@ void AccessibleFocusManager::RemoveFocusableObject (
maFocusableObjects.erase(iObject);
else
{
- OSL_ASSERT(iObject!=maFocusableObjects.end());
+ assert(iObject!=maFocusableObjects.end());
}
}
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
index ea39f17e2588..25cc120ff1b5 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -136,7 +136,7 @@ void PresenterBitmapContainer::LoadBitmaps (
}
catch (Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -165,7 +165,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
}
catch (Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -193,8 +193,8 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const SharedBitmapDescriptor& rpDefault)
{
- OSL_ASSERT(rxCanvas.is());
- OSL_ASSERT(rxPresenterHelper.is());
+ assert(rxCanvas.is());
+ assert(rxPresenterHelper.is());
SharedBitmapDescriptor pBitmap (new BitmapDescriptor(rpDefault));
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 4487e70bad0e..aa2eab3dd0a7 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -302,7 +302,7 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent
if (meState == PresenterBitmapDescriptor::ButtonDown)
{
- OSL_ASSERT(mpPresenterController.get()!=nullptr);
+ assert(mpPresenterController.get()!=nullptr);
mpPresenterController->DispatchUnoCommand(msAction);
meState = PresenterBitmapDescriptor::Normal;
@@ -420,7 +420,7 @@ Reference<rendering::XBitmap> PresenterButton::GetBitmap (
return mpIcon->GetBitmap(eMode);
else
{
- OSL_ASSERT(mpIcon.get()!=nullptr);
+ assert(mpIcon.get()!=nullptr);
return nullptr;
}
}
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx
index 4903a87e1afe..6a275e1a0fc1 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -249,7 +249,7 @@ void PresenterCanvasHelper::SetDeviceColor(
{
// Other component counts then 4 (RGBA) are not accepted (anymore).
- OSL_ASSERT(rRenderState.DeviceColor.getLength() == 4);
+ assert(rRenderState.DeviceColor.getLength() == 4);
if (rRenderState.DeviceColor.getLength() == 4)
{
rRenderState.DeviceColor[0] = ((aColor >> 16) & 0x0ff) / 255.0;
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 23867f4bc931..893cf254737b 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -194,7 +194,7 @@ void PresenterConfigurationAccess::ForAll (
const OUString& rsKey (aKeys[nItemIndex]);
Reference<container::XNameAccess> xSetItem (rxContainer->getByName(rsKey), UNO_QUERY);
Reference<beans::XPropertySet> xSet (xSetItem, UNO_QUERY);
- OSL_ASSERT(xSet.is());
+ assert(xSet.is());
if (xSetItem.is())
{
// Get from the current item of the container the children
@@ -268,7 +268,7 @@ Any PresenterConfigurationAccess::GetProperty (
const Reference<beans::XPropertySet>& rxProperties,
const OUString& rsKey)
{
- OSL_ASSERT(rxProperties.is());
+ assert(rxProperties.is());
if ( ! rxProperties.is())
return Any();
try
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 477ad680ff7c..ce57350fe738 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -116,7 +116,7 @@ PresenterController::PresenterController (
mpAccessibleObject(),
mbIsAccessibilityActive(false)
{
- OSL_ASSERT(mxController.is());
+ assert(mxController.is());
if ( ! mxSlideShowController.is())
throw lang::IllegalArgumentException(
@@ -368,7 +368,7 @@ void PresenterController::UpdatePaneTitles()
PresenterPaneContainer::PaneList::const_iterator iPane;
for (iPane=mpPaneContainer->maPanes.begin(); iPane!=mpPaneContainer->maPanes.end(); ++iPane)
{
- OSL_ASSERT((*iPane).get() != nullptr);
+ assert((*iPane).get() != nullptr);
OUString sTemplate (IsAccessibilityActive()
? (*iPane)->msAccessibleTitleTemplate
@@ -1166,7 +1166,7 @@ double PresenterController::GetSlideAspectRatio() const
}
catch (RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
return nSlideAspectRatio;
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 6ed5f744afe5..bed7c089b76e 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -531,7 +531,7 @@ bool LineDescriptor::IsEmpty() const
void LineDescriptor::CalculateSize (
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont)
{
- OSL_ASSERT(rxFont.is());
+ assert(rxFont.is());
rendering::StringContext aContext (msLine, 0, msLine.getLength());
Reference<rendering::XTextLayout> xLayout (
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 4fc1ac3a4995..668c4545f81f 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -456,7 +456,7 @@ void PresenterNotesView::Layout()
}
catch(beans::UnknownPropertyException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
if(AllSettings::GetLayoutRTL())
{
@@ -552,7 +552,7 @@ void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox)
}
// Paint the horizontal separator.
- OSL_ASSERT(mxViewId.is());
+ assert(mxViewId.is());
PresenterCanvasHelper::SetDeviceColor(aRenderState, maSeparatorColor);
mxCanvas->drawLine(
@@ -660,7 +660,7 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange)
}
catch (Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
}
@@ -680,7 +680,7 @@ void PresenterNotesView::UpdateScrollBar()
}
catch(beans::UnknownPropertyException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
mpScrollBar->SetLineHeight(mpFont->mnSize*1.2);
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 295e76c94284..5b6eb6f409ce 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -109,8 +109,8 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle)
{
msTitle = rsTitle;
- OSL_ASSERT(mpPresenterController.get()!=nullptr);
- OSL_ASSERT(mpPresenterController->GetPaintManager().get()!=nullptr);
+ assert(mpPresenterController.get()!=nullptr);
+ assert(mpPresenterController->GetPaintManager().get()!=nullptr);
mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow);
}
@@ -345,7 +345,7 @@ void PresenterPaneBase::PaintBorderBackground (
void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox)
{
- OSL_ASSERT(mxPaneId.is());
+ assert(mxPaneId.is());
if (mxBorderPainter.is() && mxBorderWindow.is() && mxBorderCanvas.is())
{
@@ -365,9 +365,9 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox)
void PresenterPaneBase::LayoutContextWindow()
{
- OSL_ASSERT(mxPaneId.is());
- OSL_ASSERT(mxBorderWindow.is());
- OSL_ASSERT(mxContentWindow.is());
+ assert(mxPaneId.is());
+ assert(mxBorderWindow.is());
+ assert(mxContentWindow.is());
if (mxBorderPainter.is() && mxPaneId.is() && mxBorderWindow.is() && mxContentWindow.is())
{
const awt::Rectangle aBorderBox (mxBorderWindow->getPosSize());
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index f35662ebebbc..284713eaac44 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -565,7 +565,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
std::shared_ptr<RendererPaneStyle>
PresenterPaneBorderPainter::Renderer::GetRendererPaneStyle (const OUString& rsResourceURL)
{
- OSL_ASSERT(mpTheme.get()!=nullptr);
+ assert(mpTheme.get()!=nullptr);
RendererPaneStyleContainer::const_iterator iStyle (maRendererPaneStyles.find(rsResourceURL));
if (iStyle == maRendererPaneStyles.end())
@@ -810,14 +810,14 @@ RendererPaneStyle::RendererPaneStyle (
try
{
::std::vector<sal_Int32> aInnerBorder (rpTheme->GetBorderSize(rsStyleName, false));
- OSL_ASSERT(aInnerBorder.size()==4);
+ assert(aInnerBorder.size()==4);
maInnerBorderSize.mnLeft = aInnerBorder[0];
maInnerBorderSize.mnTop = aInnerBorder[1];
maInnerBorderSize.mnRight = aInnerBorder[2];
maInnerBorderSize.mnBottom = aInnerBorder[3];
::std::vector<sal_Int32> aOuterBorder (rpTheme->GetBorderSize(rsStyleName, true));
- OSL_ASSERT(aOuterBorder.size()==4);
+ assert(aOuterBorder.size()==4);
maOuterBorderSize.mnLeft = aOuterBorder[0];
maOuterBorderSize.mnTop = aOuterBorder[1];
maOuterBorderSize.mnRight = aOuterBorder[2];
@@ -825,7 +825,7 @@ RendererPaneStyle::RendererPaneStyle (
}
catch(beans::UnknownPropertyException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
UpdateBorderSizes();
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 66eef2cef50f..27448bed3b4f 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -199,7 +199,7 @@ PresenterPaneContainer::SharedPaneDescriptor
}
catch (RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
}
@@ -339,7 +339,7 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor)
for (iPane=maPanes.begin(); iPane!=iEnd; ++iPane)
if (iPane->get() == rpDescriptor.get())
break;
- OSL_ASSERT(iPane!=iEnd);
+ assert(iPane!=iEnd);
if (iPane == iEnd)
return;
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index a2a83d8cc27b..33519be65aa3 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -101,7 +101,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont
}
catch (RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
if (xCC.is())
xCC->removeResourceFactoryForReference(this);
mxConfigurationControllerWeak = WeakReference<XConfigurationController>();
@@ -242,7 +242,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
}
catch (Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
return nullptr;
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 240ba57e7aab..927b57ae460e 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -280,7 +280,7 @@ void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArgume
}
catch (RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
}
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 1739468f360f..e6db514f3447 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -496,7 +496,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber (
}
catch (const beans::UnknownPropertyException&)
{
- OSL_ASSERT(false);
+ assert(false);
// For some reason we can not access the screen number. Use
// the default instead.
}
@@ -605,7 +605,7 @@ void PresenterScreen::SetupPaneFactory (const Reference<XComponentContext>& rxCo
}
catch (const RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -621,7 +621,7 @@ void PresenterScreen::SetupViewFactory (const Reference<XComponentContext>& rxCo
}
catch (const RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -725,7 +725,7 @@ void PresenterScreen::ProcessViewDescriptions (
}
catch (const RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -771,7 +771,7 @@ void PresenterScreen::ProcessComponent (
}
catch (const Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -798,7 +798,7 @@ void PresenterScreen::ProcessViewDescription (
}
catch (const Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -824,7 +824,7 @@ void PresenterScreen::SetupView(
aViewDescriptor = iDescriptor->second;
// Prepare the pane.
- OSL_ASSERT(mpPaneContainer.get() != nullptr);
+ assert(mpPaneContainer.get() != nullptr);
mpPaneContainer->PreparePane(
xPaneId,
rsViewURL,
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index 89ac7f52ce16..9613f00d494b 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -220,7 +220,7 @@ void PresenterScrollBar::SetTotalSize (const double nTotalSize)
void PresenterScrollBar::SetThumbSize (const double nThumbSize)
{
- OSL_ASSERT(nThumbSize>=0);
+ assert(nThumbSize>=0);
if (mnThumbSize != nThumbSize)
{
mnThumbSize = nThumbSize;
@@ -258,7 +258,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx
}
catch(Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
else
@@ -296,8 +296,8 @@ void PresenterScrollBar::Paint (
{
if ( ! mxCanvas.is() || ! mxWindow.is())
{
- OSL_ASSERT(mxCanvas.is());
- OSL_ASSERT(mxWindow.is());
+ assert(mxCanvas.is());
+ assert(mxWindow.is());
return;
}
@@ -446,7 +446,7 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven
geometry::RealRectangle2D const & PresenterScrollBar::GetRectangle (const Area eArea) const
{
- OSL_ASSERT(eArea>=0 && eArea<AreaCount);
+ assert(eArea>=0 && eArea<AreaCount);
return maBox[eArea];
}
@@ -581,7 +581,7 @@ PresenterBitmapContainer::BitmapDescriptor::Mode PresenterScrollBar::GetBitmapMo
bool PresenterScrollBar::IsDisabled (const Area eArea) const
{
- OSL_ASSERT(eArea>=0 && eArea<AreaCount);
+ assert(eArea>=0 && eArea<AreaCount);
return ! maEnabledState[eArea];
}
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 978a6577ac45..d106f50d6068 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -222,7 +222,7 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag
}
catch (beans::UnknownPropertyException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 7953b2b560cc..f8267de9d059 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -529,8 +529,8 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r
break;
case 2:
- OSL_ASSERT(mpPresenterController.get()!=nullptr);
- OSL_ASSERT(mpPresenterController->GetWindowManager().get()!=nullptr);
+ assert(mpPresenterController.get()!=nullptr);
+ assert(mpPresenterController->GetWindowManager().get()!=nullptr);
mpPresenterController->GetWindowManager()->SetSlideSorterState(false);
GotoSlide(nSlideIndex);
break;
@@ -613,7 +613,7 @@ void SAL_CALL PresenterSlideSorter::propertyChange (
void SAL_CALL PresenterSlideSorter::notifyPreviewCreation (
sal_Int32 nSlideIndex)
{
- OSL_ASSERT(mpLayout.get()!=nullptr);
+ assert(mpLayout.get()!=nullptr);
awt::Rectangle aBBox (mpLayout->GetBoundingBox(nSlideIndex));
mpPresenterController->GetPaintManager()->Invalidate(mxWindow, aBBox, true);
@@ -807,7 +807,7 @@ void PresenterSlideSorter::ClearBackground (
const Reference<rendering::XCanvas>& rxCanvas,
const awt::Rectangle& rUpdateBox)
{
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
const awt::Rectangle aWindowBox (mxWindow->getPosSize());
mpPresenterController->GetCanvasHelper()->Paint(
@@ -840,7 +840,7 @@ double PresenterSlideSorter::GetSlideAspectRatio() const
}
catch (RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
}
return nSlideAspectRatio;
@@ -861,7 +861,7 @@ void PresenterSlideSorter::PaintPreview (
const css::awt::Rectangle& rUpdateBox,
const sal_Int32 nSlideIndex)
{
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
geometry::IntegerSize2D aSize (mpLayout->maPreviewSize);
@@ -994,7 +994,7 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
if (mpLayout->mnRowCount<=0 || mpLayout->mnColumnCount<=0)
{
- OSL_ASSERT(mpLayout->mnRowCount>0 || mpLayout->mnColumnCount>0);
+ assert(mpLayout->mnRowCount>0 || mpLayout->mnColumnCount>0);
return;
}
@@ -1928,7 +1928,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapOnce(
const double nX,
const double nY)
{
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
if ( ! rxBitmap.is())
return;
@@ -1959,7 +1959,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled(
const double nWidth,
const double nHeight)
{
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
if ( ! rxBitmap.is())
return;
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index f951258cd053..a7da7fb3d0e3 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -174,8 +174,8 @@ void PresenterSpritePane::CreateCanvases (
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas)
{
- OSL_ASSERT(!mxParentWindow.is() || mxParentWindow==rxParentWindow);
- OSL_ASSERT(!mxParentCanvas.is() || mxParentCanvas==rxParentCanvas);
+ assert(!mxParentWindow.is() || mxParentWindow==rxParentWindow);
+ assert(!mxParentCanvas.is() || mxParentCanvas==rxParentCanvas);
mxParentWindow = rxParentWindow;
mxParentCanvas = rxParentCanvas;
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index f876ea729194..2b71b407cb09 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -627,7 +627,7 @@ sal_Int32 PresenterTextParagraph::GetWordBoundary(
const sal_Int32 nLocalCharacterIndex,
const sal_Int32 nDistance)
{
- OSL_ASSERT(nDistance==-1 || nDistance==+1);
+ assert(nDistance==-1 || nDistance==+1);
if (nLocalCharacterIndex < 0)
{
@@ -1207,7 +1207,7 @@ void PresenterTextParagraph::Line::ProvideCellBoxes()
maCellBoxes = mxLayoutedLine->queryInkMeasures();
else
{
- OSL_ASSERT(mxLayoutedLine.is());
+ assert(mxLayoutedLine.is());
}
}
}
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 881aa4e12e34..ee3a09e6af3c 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -317,7 +317,7 @@ OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const
const OUString& rsStyleName,
const bool bOuter) const
{
- OSL_ASSERT(mpTheme.get() != nullptr);
+ assert(mpTheme.get() != nullptr);
SharedPaneStyle pPaneStyle (mpTheme->GetPaneStyle(rsStyleName));
if (pPaneStyle.get() != nullptr)
@@ -725,7 +725,7 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
}
catch (Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
return PresenterTheme::SharedFontDescriptor();
@@ -755,7 +755,7 @@ Any ReadContext::GetByName (
const Reference<container::XNameAccess>& rxNode,
const OUString& rsName)
{
- OSL_ASSERT(rxNode.is());
+ assert(rxNode.is());
if (rxNode->hasByName(rsName))
return rxNode->getByName(rsName);
else
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index de0a63e2d355..96578da5e01c 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -424,7 +424,7 @@ void SAL_CALL PresenterToolBar::disposing()
ElementContainer::const_iterator iEnd (maElementContainer.end());
for ( ; iPart!=iEnd; ++iPart)
{
- OSL_ASSERT(iPart->get()!=nullptr);
+ assert(iPart->get()!=nullptr);
ElementContainerPart::iterator iElement ((*iPart)->begin());
ElementContainerPart::const_iterator iPartEnd ((*iPart)->end());
for ( ; iElement!=iPartEnd; ++iElement)
@@ -959,7 +959,7 @@ void PresenterToolBar::Paint (
const awt::Rectangle& rUpdateBox,
const rendering::ViewState& rViewState)
{
- OSL_ASSERT(mxCanvas.is());
+ assert(mxCanvas.is());
ElementContainer::iterator iPart;
ElementContainer::const_iterator iEnd (maElementContainer.end());
@@ -1190,8 +1190,8 @@ Element::Element (
{
if (mpToolBar.get() != nullptr)
{
- OSL_ASSERT(mpToolBar->GetPresenterController().is());
- OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is());
+ assert(mpToolBar->GetPresenterController().is());
+ assert(mpToolBar->GetPresenterController()->GetWindowManager().is());
}
}
@@ -1292,7 +1292,7 @@ bool Element::SetState (
void Element::Invalidate (const bool bSynchronous)
{
- OSL_ASSERT(mpToolBar.is());
+ assert(mpToolBar.is());
mpToolBar->InvalidateArea(GetBoundingBox(), bSynchronous);
}
@@ -1318,8 +1318,8 @@ bool Element::IsFilling() const
void Element::UpdateState()
{
- OSL_ASSERT(mpToolBar.get() != nullptr);
- OSL_ASSERT(mpToolBar->GetPresenterController().get() != nullptr);
+ assert(mpToolBar.get() != nullptr);
+ assert(mpToolBar->GetPresenterController().get() != nullptr);
if (mpMode.get() == nullptr)
return;
@@ -1430,7 +1430,7 @@ void ElementMode::ReadElementMode (
}
catch(Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -1453,9 +1453,9 @@ Button::Button (
: Element(rpToolBar),
mbIsListenerRegistered(false)
{
- OSL_ASSERT(mpToolBar.get() != nullptr);
- OSL_ASSERT(mpToolBar->GetPresenterController().is());
- OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is());
+ assert(mpToolBar.get() != nullptr);
+ assert(mpToolBar->GetPresenterController().is());
+ assert(mpToolBar->GetPresenterController()->GetWindowManager().is());
}
void Button::Initialize()
@@ -1466,12 +1466,12 @@ void Button::Initialize()
void Button::disposing()
{
- OSL_ASSERT(mpToolBar.get() != nullptr);
+ assert(mpToolBar.get() != nullptr);
if (mpToolBar.get() != nullptr
&& mbIsListenerRegistered)
{
- OSL_ASSERT(mpToolBar->GetPresenterController().is());
- OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is());
+ assert(mpToolBar->GetPresenterController().is());
+ assert(mpToolBar->GetPresenterController()->GetWindowManager().is());
mbIsListenerRegistered = false;
mpToolBar->GetPresenterController()->GetWindowManager()->RemoveLayoutListener(this);
@@ -1483,7 +1483,7 @@ void Button::Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const rendering::ViewState& rViewState)
{
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
if (mpMode.get() == nullptr)
return;
@@ -1615,7 +1615,7 @@ awt::Size Label::CreateBoundingSize (
void Label::SetText (const OUString& rsText)
{
- OSL_ASSERT(mpToolBar.get() != nullptr);
+ assert(mpToolBar.get() != nullptr);
if (mpMode.get() == nullptr)
return;
@@ -1635,7 +1635,7 @@ void Label::Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const rendering::ViewState& rViewState)
{
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
if (mpMode.get() == nullptr)
return;
@@ -1692,7 +1692,7 @@ void Text::Paint (
const awt::Point& rOffset)
{
(void)rOffset;
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
if (msText.isEmpty())
return;
@@ -1919,7 +1919,7 @@ void VerticalSeparator::Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const rendering::ViewState& rViewState)
{
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
awt::Rectangle aBBox (GetBoundingBox());
@@ -1970,7 +1970,7 @@ void HorizontalSeparator::Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const rendering::ViewState& rViewState)
{
- OSL_ASSERT(rxCanvas.is());
+ assert(rxCanvas.is());
awt::Rectangle aBBox (GetBoundingBox());
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index e70cf2786ad8..85a68df9edc4 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -164,7 +164,7 @@ void PresenterViewFactory::Register (const Reference<frame::XController>& rxCont
}
catch (RuntimeException&)
{
- OSL_ASSERT(false);
+ assert(false);
if (mxConfigurationController.is())
mxConfigurationController->removeResourceFactoryForReference(this);
mxConfigurationController = nullptr;
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 749e8a58d08a..96a27c08b368 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -166,7 +166,7 @@ void PresenterWindowManager::NotifyViewCreation (const Reference<XView>& rxView)
{
PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
mpPaneContainer->FindPaneId(rxView->getResourceId()->getAnchor()));
- OSL_ASSERT(pDescriptor.get() != nullptr);
+ assert(pDescriptor.get() != nullptr);
if (pDescriptor.get() != nullptr)
{
Layout();
@@ -403,7 +403,7 @@ bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode)
{
- OSL_ASSERT(mpPresenterController.get() != nullptr);
+ assert(mpPresenterController.get() != nullptr);
if (meLayoutMode != eMode
|| mbIsSlideSorterActive
@@ -611,7 +611,7 @@ void PresenterWindowManager::Layout()
}
catch (Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
throw;
}