summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/ViewShellBase.cxx
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 /sd/source/ui/view/ViewShellBase.cxx
parentd0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff)
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'sd/source/ui/view/ViewShellBase.cxx')
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 65913edae752..308e28f890af 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -487,7 +487,7 @@ void ViewShellBase::OuterResizePixel (const Point& rOrigin, const Size &rSize)
void ViewShellBase::Rearrange()
{
- assert(GetViewFrame()!=nullptr);
+ OSL_ASSERT(GetViewFrame()!=nullptr);
// There is a bug in the communication between embedded objects and the
// framework::LayoutManager that leads to missing resize updates. The
@@ -526,7 +526,7 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable()
SfxPrinter* ViewShellBase::GetPrinter (bool bCreate)
{
- assert(mpImpl.get()!=nullptr);
+ OSL_ASSERT(mpImpl.get()!=nullptr);
return GetDocShell()->GetPrinter (bCreate);
}
@@ -535,7 +535,7 @@ sal_uInt16 ViewShellBase::SetPrinter (
SfxPrinter* pNewPrinter,
SfxPrinterChangeFlags nDiffFlags)
{
- assert(mpImpl.get()!=nullptr);
+ OSL_ASSERT(mpImpl.get()!=nullptr);
GetDocShell()->SetPrinter(pNewPrinter);
@@ -917,8 +917,8 @@ OUString ViewShellBase::GetInitialViewShellType()
std::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer()
{
- assert(mpImpl.get()!=nullptr);
- assert(mpImpl->mpEventMultiplexer.get()!=nullptr);
+ OSL_ASSERT(mpImpl.get()!=nullptr);
+ OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=nullptr);
return mpImpl->mpEventMultiplexer;
}
@@ -930,37 +930,37 @@ const ::tools::Rectangle& ViewShellBase::getClientRectangle() const
std::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const
{
- assert(mpImpl.get()!=nullptr);
- assert(mpImpl->mpToolBarManager.get()!=nullptr);
+ OSL_ASSERT(mpImpl.get()!=nullptr);
+ OSL_ASSERT(mpImpl->mpToolBarManager.get()!=nullptr);
return mpImpl->mpToolBarManager;
}
std::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const
{
- assert(mpImpl.get()!=nullptr);
- assert(mpImpl->mpFormShellManager.get()!=nullptr);
+ OSL_ASSERT(mpImpl.get()!=nullptr);
+ OSL_ASSERT(mpImpl->mpFormShellManager.get()!=nullptr);
return mpImpl->mpFormShellManager;
}
DrawController& ViewShellBase::GetDrawController() const
{
- assert(mpImpl.get()!=nullptr);
+ OSL_ASSERT(mpImpl.get()!=nullptr);
return *mpImpl->mpController;
}
void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabBar)
{
- assert(mpImpl.get()!=nullptr);
+ OSL_ASSERT(mpImpl.get()!=nullptr);
mpImpl->mpViewTabBar = rViewTabBar;
}
vcl::Window* ViewShellBase::GetViewWindow()
{
- assert(mpImpl.get()!=nullptr);
+ OSL_ASSERT(mpImpl.get()!=nullptr);
return mpImpl->mpViewWindow.get();
}