diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:23:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:38 +0100 |
commit | 92c697c0e3e4bde88424322875c993c161696b1e (patch) | |
tree | ea1be62a0cb8fd7f7e63dd03a52441cedd8e96eb /sd/source/ui/tools/PreviewRenderer.cxx | |
parent | loplugin:nullptr (automatic rewrite) (diff) | |
download | core-92c697c0e3e4bde88424322875c993c161696b1e.tar.gz core-92c697c0e3e4bde88424322875c993c161696b1e.zip |
loplugin:nullptr (automatic rewrite)
Change-Id: If1b80da64ba575f07b31dce9bc0e34b7eb9f11a4
Diffstat (limited to 'sd/source/ui/tools/PreviewRenderer.cxx')
-rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 67e3f5ac6eb5..a383b759668e 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -67,11 +67,11 @@ PreviewRenderer::PreviewRenderer ( OutputDevice* pTemplate, const bool bHasFrame) : mpPreviewDevice (VclPtr<VirtualDevice>::Create()), - mpDocShellOfView(NULL), + mpDocShellOfView(nullptr), maFrameColor (svtools::ColorConfig().GetColorValue(svtools::DOCBOUNDARIES).nColor), mbHasFrame(bHasFrame) { - if (pTemplate != NULL) + if (pTemplate != nullptr) { mpPreviewDevice->SetDigitLanguage (pTemplate->GetDigitLanguage()); mpPreviewDevice->SetBackground(pTemplate->GetBackground()); @@ -85,7 +85,7 @@ PreviewRenderer::PreviewRenderer ( PreviewRenderer::~PreviewRenderer() { - if (mpDocShellOfView != NULL) + if (mpDocShellOfView != nullptr) EndListening (*mpDocShellOfView); } @@ -96,7 +96,7 @@ Image PreviewRenderer::RenderPage ( const bool bObeyHighContrastMode, const bool bDisplayPresentationObjects) { - if (pPage != NULL) + if (pPage != nullptr) { const Size aPageModelSize (pPage->GetSize()); const double nAspectRatio ( @@ -124,7 +124,7 @@ Image PreviewRenderer::RenderPage ( { Image aPreview; - if (pPage != NULL) + if (pPage != nullptr) { try { @@ -214,11 +214,11 @@ bool PreviewRenderer::Initialize ( const Size& rPixelSize, const bool bObeyHighContrastMode) { - if (pPage == NULL) + if (pPage == nullptr) return false; SdrModel* pModel = pPage->GetModel(); - if (pModel == NULL) + if (pModel == nullptr) return false; SetupOutputSize(*pPage, rPixelSize); @@ -229,7 +229,7 @@ bool PreviewRenderer::Initialize ( // Create view ProvideView (pDocShell); - if (mpView.get() == NULL) + if (mpView.get() == nullptr) return false; // Adjust contrast mode. @@ -254,7 +254,7 @@ bool PreviewRenderer::Initialize ( // Make sure that a page view exists. SdrPageView* pPageView = mpView->GetSdrPageView(); - if (pPageView == NULL) + if (pPageView == nullptr) return false; // #i121224# No need to set SetApplicationBackgroundColor (which is the color @@ -298,9 +298,9 @@ void PreviewRenderer::PaintPage ( vcl::Region aRegion (aPaintRectangle); // Turn off online spelling and redlining. - SdrOutliner* pOutliner = NULL; + SdrOutliner* pOutliner = nullptr; EEControlBits nSavedControlWord = EEControlBits::NONE; - if (mpDocShellOfView!=NULL && mpDocShellOfView->GetDoc()!=NULL) + if (mpDocShellOfView!=nullptr && mpDocShellOfView->GetDoc()!=nullptr) { pOutliner = &mpDocShellOfView->GetDoc()->GetDrawOutliner(); nSavedControlWord = pOutliner->GetControlWord(); @@ -322,7 +322,7 @@ void PreviewRenderer::PaintPage ( } // Restore the previous online spelling and redlining states. - if (pOutliner != NULL) + if (pOutliner != nullptr) pOutliner->SetControlWord(nSavedControlWord); } @@ -410,15 +410,15 @@ void PreviewRenderer::ProvideView (DrawDocShell* pDocShell) // Switch our attention, i.e. listening for DYING events, to // the new doc shell. - if (mpDocShellOfView != NULL) + if (mpDocShellOfView != nullptr) EndListening (*mpDocShellOfView); mpDocShellOfView = pDocShell; - if (mpDocShellOfView != NULL) + if (mpDocShellOfView != nullptr) StartListening (*mpDocShellOfView); } - if (mpView.get() == NULL) + if (mpView.get() == nullptr) { - mpView.reset (new DrawView (pDocShell, mpPreviewDevice.get(), NULL)); + mpView.reset (new DrawView (pDocShell, mpPreviewDevice.get(), nullptr)); } mpView->SetPreviewRenderer(true); #if 1 @@ -499,7 +499,7 @@ void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint) // ProvideView will create a new one (for another // doc shell, of course.) mpView.reset(); - mpDocShellOfView = NULL; + mpDocShellOfView = nullptr; } } @@ -521,7 +521,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP { SdrObject* pObject = rOriginal.GetViewContact().TryToGetSdrObject(); - if (pObject==NULL || pObject->GetPage() == NULL) + if (pObject==nullptr || pObject->GetPage() == nullptr) { // not a SdrObject visualisation (maybe e.g. page) or no page return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence( |