summaryrefslogtreecommitdiffstats
path: root/sd/source/ui/view/ToolBarManager.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/ToolBarManager.cxx')
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx42
1 files changed, 21 insertions, 21 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index d82b529ea24c..cb802fd3ef9d 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -368,13 +368,13 @@ ToolBarManager::~ToolBarManager()
void ToolBarManager::Shutdown()
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
mpImpl.reset();
}
void ToolBarManager::ResetToolBars (ToolBarGroup eGroup)
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
UpdateLock aLock (shared_from_this());
mpImpl->ResetToolBars(eGroup);
@@ -383,7 +383,7 @@ void ToolBarManager::ResetToolBars (ToolBarGroup eGroup)
void ToolBarManager::ResetAllToolBars()
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
UpdateLock aLock (shared_from_this());
mpImpl->ResetAllToolBars();
@@ -394,7 +394,7 @@ void ToolBarManager::AddToolBar (
ToolBarGroup eGroup,
const OUString& rsToolBarName)
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
UpdateLock aLock (shared_from_this());
mpImpl->AddToolBar(eGroup,rsToolBarName);
@@ -405,7 +405,7 @@ void ToolBarManager::AddToolBarShell (
ToolBarGroup eGroup,
ShellId nToolBarId)
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
UpdateLock aLock (shared_from_this());
mpImpl->AddToolBarShell(eGroup,nToolBarId);
@@ -416,7 +416,7 @@ void ToolBarManager::RemoveToolBar (
ToolBarGroup eGroup,
const OUString& rsToolBarName)
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
UpdateLock aLock (shared_from_this());
mpImpl->RemoveToolBar(eGroup,rsToolBarName);
@@ -427,7 +427,7 @@ void ToolBarManager::SetToolBar (
ToolBarGroup eGroup,
const OUString& rsToolBarName)
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
UpdateLock aLock (shared_from_this());
mpImpl->ResetToolBars(eGroup);
@@ -439,7 +439,7 @@ void ToolBarManager::SetToolBarShell (
ToolBarGroup eGroup,
ShellId nToolBarId)
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
UpdateLock aLock (shared_from_this());
mpImpl->ResetToolBars(eGroup);
@@ -449,37 +449,37 @@ void ToolBarManager::SetToolBarShell (
void ToolBarManager::PreUpdate()
{
- if (mpImpl.get()!=nullptr)
+ if (mpImpl != nullptr)
mpImpl->PreUpdate();
}
void ToolBarManager::RequestUpdate()
{
- if (mpImpl.get()!=nullptr)
+ if (mpImpl != nullptr)
mpImpl->RequestUpdate();
}
void ToolBarManager::LockViewShellManager()
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
mpImpl->LockViewShellManager();
}
void ToolBarManager::LockUpdate()
{
- if (mpImpl.get()!=nullptr)
+ if (mpImpl != nullptr)
mpImpl->LockUpdate();
}
void ToolBarManager::UnlockUpdate()
{
- if (mpImpl.get()!=nullptr)
+ if (mpImpl != nullptr)
mpImpl->UnlockUpdate();
}
void ToolBarManager::MainViewShellChanged ()
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
mpImpl->ReleaseAllToolBarShells();
mpImpl->GetToolBarRules().MainViewShellChanged(ViewShell::ST_NONE);
@@ -488,7 +488,7 @@ void ToolBarManager::MainViewShellChanged ()
void ToolBarManager::MainViewShellChanged (const ViewShell& rMainViewShell)
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
{
mpImpl->ReleaseAllToolBarShells();
mpImpl->GetToolBarRules().MainViewShellChanged(rMainViewShell);
@@ -499,13 +499,13 @@ void ToolBarManager::SelectionHasChanged (
const ViewShell& rViewShell,
const SdrView& rView)
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
mpImpl->GetToolBarRules().SelectionHasChanged(rViewShell,rView);
}
void ToolBarManager::ToolBarsDestroyed()
{
- if (mpImpl.get() != nullptr)
+ if (mpImpl != nullptr)
mpImpl->ToolBarsDestroyed();
}
@@ -727,7 +727,7 @@ void ToolBarManager::Implementation::PostUpdate()
void ToolBarManager::Implementation::LockViewShellManager()
{
- if (mpViewShellManagerLock.get() == nullptr)
+ if (mpViewShellManagerLock == nullptr)
mpViewShellManagerLock.reset(
new ViewShellManager::UpdateLock(mrBase.GetViewShellManager()));
}
@@ -740,7 +740,7 @@ void ToolBarManager::Implementation::LockUpdate()
DBG_ASSERT(mnLockCount<100, "ToolBarManager lock count unusually high");
if (mnLockCount == 0)
{
- OSL_ASSERT(mpSynchronousLayouterLock.get()==nullptr);
+ OSL_ASSERT(mpSynchronousLayouterLock == nullptr);
mpSynchronousLayouterLock.reset(new LayouterLock(mxLayouter));
}
@@ -792,7 +792,7 @@ void ToolBarManager::Implementation::Update (
// functionality. Those that are not used anymore are
// deactivated now. Those that are missing are activated in the
// next step together with the view shells.
- if (mpViewShellManagerLock.get() == nullptr)
+ if (mpViewShellManagerLock == nullptr)
mpViewShellManagerLock.reset(
new ViewShellManager::UpdateLock(mrBase.GetViewShellManager()));
maToolBarShellList.UpdateShells(
@@ -1384,7 +1384,7 @@ void ToolBarShellList::UpdateShells (
const std::shared_ptr<ViewShell>& rpMainViewShell,
const std::shared_ptr<ViewShellManager>& rpManager)
{
- if (rpMainViewShell.get() != nullptr)
+ if (rpMainViewShell != nullptr)
{
GroupedShellList aList;