diff options
Diffstat (limited to 'sd/source/ui/slidesorter/view/SlideSorterView.cxx')
-rw-r--r-- | sd/source/ui/slidesorter/view/SlideSorterView.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 70b625df6e22..1c791e990eff 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -347,14 +347,14 @@ void SlideSorterView::UpdateOrientation() { // Get access to the docking window. vcl::Window* pWindow = mrSlideSorter.GetContentWindow(); - PaneDockingWindow* pDockingWindow = NULL; - while (pWindow!=NULL && pDockingWindow==NULL) + PaneDockingWindow* pDockingWindow = nullptr; + while (pWindow!=nullptr && pDockingWindow==nullptr) { pDockingWindow = dynamic_cast<PaneDockingWindow*>(pWindow); pWindow = pWindow->GetParent(); } - if (pDockingWindow != NULL) + if (pDockingWindow != nullptr) { const long nScrollBarSize ( Application::GetSettings().GetStyleSettings().GetScrollBarSize()); @@ -471,7 +471,7 @@ void SlideSorterView::DeterminePageObjectVisibilities() for (long nIndex=aUnion.Min(); nIndex<=aUnion.Max(); nIndex++) { pDescriptor = mrModel.GetPageDescriptor(nIndex); - if (pDescriptor.get() != NULL) + if (pDescriptor.get() != nullptr) SetState( pDescriptor, PageDescriptor::ST_Visible, @@ -492,7 +492,7 @@ void SlideSorterView::DeterminePageObjectVisibilities() iLink!=iEnd; ++iLink) { - iLink->Call(NULL); + iLink->Call(nullptr); } } @@ -514,7 +514,7 @@ void SlideSorterView::UpdatePreciousFlags() for (int nIndex=0; nIndex<=nPageCount; ++nIndex) { pDescriptor = mrModel.GetPageDescriptor(nIndex); - if (pDescriptor.get() != NULL) + if (pDescriptor.get() != nullptr) { pCache->SetPreciousFlag( pDescriptor->GetPage(), @@ -609,7 +609,7 @@ void SlideSorterView::CompleteRedraw ( mnLockRedrawSmph ? "locked" : ""); #endif - if (pDevice == NULL || pDevice!=mrSlideSorter.GetContentWindow()) + if (pDevice == nullptr || pDevice!=mrSlideSorter.GetContentWindow()) return; // The parent implementation of CompleteRedraw is called only when @@ -698,7 +698,7 @@ void SlideSorterView::ConfigurationChanged ( std::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() { sd::Window *pWindow (mrSlideSorter.GetContentWindow()); - if (pWindow && mpPreviewCache.get() == NULL) + if (pWindow && mpPreviewCache.get() == nullptr) { mpPreviewCache.reset( new cache::PageCache( @@ -753,7 +753,7 @@ void SlideSorterView::DragFinished (sal_Int8 nDropAction) void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) { ::sd::DrawDocShell* pDocShell = mrModel.GetDocument()->GetDocSh(); - if (pDocShell!=NULL && pDocShell->IsEnableSetModified()) + if (pDocShell!=nullptr && pDocShell->IsEnableSetModified()) mbModelChangedWhileModifyEnabled = true; ::sd::View::Notify(rBroadcaster, rHint); |