diff options
Diffstat (limited to 'sd/source/ui/slidesorter/shell/SlideSorter.cxx')
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorter.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 571980eb17e6..39bf90fbeda0 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -149,7 +149,7 @@ SlideSorter::SlideSorter ( void SlideSorter::Init() { - if (mpViewShellBase != NULL) + if (mpViewShellBase != nullptr) mxControllerWeak = mpViewShellBase->GetController(); // Reinitialize colors in Properties with window specific values. @@ -174,7 +174,7 @@ void SlideSorter::Init() if (pContentWindow) { vcl::Window* pParentWindow = pContentWindow->GetParent(); - if (pParentWindow != NULL) + if (pParentWindow != nullptr) pParentWindow->SetBackground(Wallpaper()); pContentWindow->SetBackground(Wallpaper()); pContentWindow->SetViewOrigin (Point(0,0)); @@ -215,19 +215,19 @@ SlideSorter::~SlideSorter() model::SlideSorterModel& SlideSorter::GetModel() const { - OSL_ASSERT(mpSlideSorterModel.get()!=NULL); + OSL_ASSERT(mpSlideSorterModel.get()!=nullptr); return *mpSlideSorterModel; } view::SlideSorterView& SlideSorter::GetView() const { - OSL_ASSERT(mpSlideSorterView.get()!=NULL); + OSL_ASSERT(mpSlideSorterView.get()!=nullptr); return *mpSlideSorterView; } controller::SlideSorterController& SlideSorter::GetController() const { - OSL_ASSERT(mpSlideSorterController.get()!=NULL); + OSL_ASSERT(mpSlideSorterController.get()!=nullptr); return *mpSlideSorterController; } @@ -255,7 +255,7 @@ void SlideSorter::SetupListeners() if (pWindow) { vcl::Window* pParentWindow = pWindow->GetParent(); - if (pParentWindow != NULL) + if (pParentWindow != nullptr) pParentWindow->AddEventListener( LINK( mpSlideSorterController.get(), @@ -289,7 +289,7 @@ void SlideSorter::ReleaseListeners() WindowEventHandler)); vcl::Window* pParentWindow = pWindow->GetParent(); - if (pParentWindow != NULL) + if (pParentWindow != nullptr) pParentWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), controller::SlideSorterController, @@ -304,15 +304,15 @@ void SlideSorter::ReleaseListeners() void SlideSorter::CreateModelViewController() { mpSlideSorterModel.reset(CreateModel()); - DBG_ASSERT (mpSlideSorterModel.get()!=NULL, + DBG_ASSERT (mpSlideSorterModel.get()!=nullptr, "Can not create model for slide browser"); mpSlideSorterView.reset(CreateView()); - DBG_ASSERT (mpSlideSorterView.get()!=NULL, + DBG_ASSERT (mpSlideSorterView.get()!=nullptr, "Can not create view for slide browser"); mpSlideSorterController.reset(CreateController()); - DBG_ASSERT (mpSlideSorterController.get()!=NULL, + DBG_ASSERT (mpSlideSorterController.get()!=nullptr, "Can not create controller for slide browser"); // Now that model, view, and controller are constructed, do the @@ -325,14 +325,14 @@ model::SlideSorterModel* SlideSorter::CreateModel() { // Get pointers to the document. ViewShellBase* pViewShellBase = GetViewShellBase(); - if (pViewShellBase != NULL) + if (pViewShellBase != nullptr) { - OSL_ASSERT (pViewShellBase->GetDocument() != NULL); + OSL_ASSERT (pViewShellBase->GetDocument() != nullptr); return new model::SlideSorterModel(*this); } else - return NULL; + return nullptr; } view::SlideSorterView* SlideSorter::CreateView() @@ -378,14 +378,14 @@ bool SlideSorter::RelocateToWindow (vcl::Window* pParentWindow) ReleaseListeners(); - vcl::Window *pNewWindow = NULL; + vcl::Window *pNewWindow = nullptr; if (mpViewShell) { mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow); pNewWindow = mpViewShell->GetParentWindow(); } else - pNewWindow = NULL; + pNewWindow = nullptr; SetupControls(pNewWindow); SetupListeners(); @@ -395,7 +395,7 @@ bool SlideSorter::RelocateToWindow (vcl::Window* pParentWindow) // view shell. (One is created earlier while the construtor of the base // class is executed. But because at that time the correct // accessibility object can not be constructed we do that now.) - if (mpContentWindow.get() !=NULL) + if (mpContentWindow.get() !=nullptr) { mpContentWindow->Hide(); mpContentWindow->Show(); @@ -406,7 +406,7 @@ bool SlideSorter::RelocateToWindow (vcl::Window* pParentWindow) void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) { - if (GetViewShell() != NULL) + if (GetViewShell() != nullptr) { GetViewShell()->SetCurrentFunction(rpFunction); GetViewShell()->SetOldFunction(rpFunction); @@ -414,7 +414,7 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) else { ContentWindow* pWindow = dynamic_cast<ContentWindow*>(GetContentWindow().get()); - if (pWindow != NULL) + if (pWindow != nullptr) pWindow->SetCurrentFunction(rpFunction); } } |