revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

2 files changed, 31 insertions, 31 deletions

diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 80ff622427bd..37a710a45663 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -213,19 +213,19 @@ SlideSorter::~SlideSorter()
 
 model::SlideSorterModel& SlideSorter::GetModel() const
 {
-    assert(mpSlideSorterModel.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorterModel.get()!=nullptr);
     return *mpSlideSorterModel;
 }
 
 view::SlideSorterView& SlideSorter::GetView() const
 {
-    assert(mpSlideSorterView.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorterView.get()!=nullptr);
     return *mpSlideSorterView;
 }
 
 controller::SlideSorterController& SlideSorter::GetController() const
 {
-    assert(mpSlideSorterController.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorterController.get()!=nullptr);
     return *mpSlideSorterController;
 }
 
@@ -325,7 +325,7 @@ model::SlideSorterModel* SlideSorter::CreateModel()
     ViewShellBase* pViewShellBase = GetViewShellBase();
     if (pViewShellBase != nullptr)
     {
-        assert (pViewShellBase->GetDocument() != nullptr);
+        OSL_ASSERT (pViewShellBase->GetDocument() != nullptr);
 
         return new model::SlideSorterModel(*this);
     }
@@ -410,13 +410,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction)
 
 std::shared_ptr<controller::Properties> const & SlideSorter::GetProperties() const
 {
-    assert(mpProperties);
+    OSL_ASSERT(mpProperties);
     return mpProperties;
 }
 
 std::shared_ptr<view::Theme> const & SlideSorter::GetTheme() const
 {
-    assert(mpTheme);
+    OSL_ASSERT(mpTheme);
     return mpTheme;
 }
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index b72f1f48c717..1f015f1ae9bc 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -255,7 +255,7 @@ css::uno::Reference<css::accessibility::XAccessible>
     if (mpView == nullptr || mpSlideSorter.get() == nullptr)
         return nullptr;
 
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
 
     ::accessibility::AccessibleSlideSorterView *pAccessibleView =
     new ::accessibility::AccessibleSlideSorterView(
@@ -283,13 +283,13 @@ void SlideSorterViewShell::SwitchViewFireFocus(const css::uno::Reference< css::a
 
 SlideSorter& SlideSorterViewShell::GetSlideSorter() const
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     return *mpSlideSorter;
 }
 
 bool SlideSorterViewShell::RelocateToParentWindow (vcl::Window* pParentWindow)
 {
-    assert(mpSlideSorter);
+    OSL_ASSERT(mpSlideSorter);
     if ( ! mpSlideSorter)
         return false;
 
@@ -357,32 +357,32 @@ SdPage* SlideSorterViewShell::GetActualPage()
 void SlideSorterViewShell::GetMenuState ( SfxItemSet& rSet)
 {
     ViewShell::GetMenuState(rSet);
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetSlotManager()->GetMenuState(rSet);
 }
 
 void SlideSorterViewShell::GetClipboardState ( SfxItemSet& rSet)
 {
     ViewShell::GetMenuState(rSet);
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetSlotManager()->GetClipboardState(rSet);
 }
 
 void SlideSorterViewShell::ExecCtrl (SfxRequest& rRequest)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().ExecCtrl(rRequest);
 }
 
 void SlideSorterViewShell::GetCtrlState (SfxItemSet& rSet)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetCtrlState(rSet);
 }
 
 void SlideSorterViewShell::FuSupport (SfxRequest& rRequest)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().FuSupport(rRequest);
 }
 
@@ -391,7 +391,7 @@ void SlideSorterViewShell::FuSupport (SfxRequest& rRequest)
 */
 void SlideSorterViewShell::FuTemporary (SfxRequest& rRequest)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     switch (rRequest.GetSlot())
     {
         case SID_MODIFYPAGE:
@@ -415,19 +415,19 @@ void SlideSorterViewShell::FuTemporary (SfxRequest& rRequest)
 
 void SlideSorterViewShell::GetStatusBarState (SfxItemSet& rSet)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetStatusBarState(rSet);
 }
 
 void SlideSorterViewShell::FuPermanent (SfxRequest& rRequest)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().FuPermanent(rRequest);
 }
 
 void SlideSorterViewShell::GetAttrState (SfxItemSet& rSet)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetAttrState(rSet);
 }
 
@@ -440,7 +440,7 @@ void SlideSorterViewShell::Paint (
     ::sd::Window* pWindow)
 {
     SetActiveWindow (pWindow);
-    assert(mpSlideSorter);
+    OSL_ASSERT(mpSlideSorter);
     if (mpSlideSorter)
         mpSlideSorter->GetController().Paint(rBBox,pWindow);
 }
@@ -449,7 +449,7 @@ void SlideSorterViewShell::ArrangeGUIElements()
 {
     if (IsActive())
     {
-        assert(mpSlideSorter.get()!=nullptr);
+        OSL_ASSERT(mpSlideSorter.get()!=nullptr);
         mpSlideSorter->ArrangeGUIElements(maViewPos, maViewSize);
         mbIsArrangeGUIElementsPending = false;
     }
@@ -503,14 +503,14 @@ void SlideSorterViewShell::Command (
     const CommandEvent& rEvent,
     ::sd::Window* pWindow)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     if ( ! mpSlideSorter->GetController().Command (rEvent, pWindow))
         ViewShell::Command (rEvent, pWindow);
 }
 
 void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     if (pFrameView != nullptr)
     {
         view::SlideSorterView& rView (mpSlideSorter->GetView());
@@ -546,7 +546,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView)
 
 void SlideSorterViewShell::WriteFrameViewData()
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     if (mpFrameView != nullptr)
     {
         view::SlideSorterView& rView (mpSlideSorter->GetView());
@@ -584,7 +584,7 @@ void SlideSorterViewShell::SetZoom (long int )
 
 void SlideSorterViewShell::SetZoomRect (const ::tools::Rectangle& rZoomRect)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     Size aPageSize (mpSlideSorter->GetView().GetLayouter().GetPageObjectSize());
 
     ::tools::Rectangle aRect(rZoomRect);
@@ -632,7 +632,7 @@ void SlideSorterViewShell::StartDrag (
     const Point& rDragPt,
     vcl::Window* pWindow )
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetClipboard().StartDrag (
         rDragPt,
         pWindow);
@@ -645,7 +645,7 @@ sal_Int8 SlideSorterViewShell::AcceptDrop (
     sal_uInt16 nPage,
     sal_uInt16 nLayer)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     return mpSlideSorter->GetController().GetClipboard().AcceptDrop (
         rEvt,
         rTargetHelper,
@@ -661,7 +661,7 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop (
     sal_uInt16 nPage,
     sal_uInt16 nLayer)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     return mpSlideSorter->GetController().GetClipboard().ExecuteDrop (
         rEvt,
         rTargetHelper,
@@ -673,28 +673,28 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop (
 std::shared_ptr<SlideSorterViewShell::PageSelection>
     SlideSorterViewShell::GetPageSelection() const
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     return mpSlideSorter->GetController().GetPageSelector().GetPageSelection();
 }
 
 void SlideSorterViewShell::SetPageSelection (
     const std::shared_ptr<PageSelection>& rSelection)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetPageSelector().SetPageSelection(rSelection, true);
 }
 
 void SlideSorterViewShell::AddSelectionChangeListener (
     const Link<LinkParamNone*,void>& rCallback)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetSelectionManager()->AddSelectionChangeListener(rCallback);
 }
 
 void SlideSorterViewShell::RemoveSelectionChangeListener (
     const Link<LinkParamNone*,void>& rCallback)
 {
-    assert(mpSlideSorter.get()!=nullptr);
+    OSL_ASSERT(mpSlideSorter.get()!=nullptr);
     mpSlideSorter->GetController().GetSelectionManager()->RemoveSelectionChangeListener(rCallback);
 }