diff options
Diffstat (limited to 'sd/source/ui/presenter/PresenterHelper.cxx')
-rw-r--r-- | sd/source/ui/presenter/PresenterHelper.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index b2ff18223acb..6b1a76f0ec6a 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -91,7 +91,7 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( { // Make the frame window transparent and make the parent able to // draw behind it. - if (pParentWindow.get() != NULL) + if (pParentWindow.get() != nullptr) pParentWindow->EnableChildTransparentMode(); } @@ -150,7 +150,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( // No shared window is given or an explicit canvas service name is // specified. Create a new canvas. vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); - if (pWindow != NULL) + if (pWindow != nullptr) { Sequence<Any> aArg (5); @@ -180,10 +180,10 @@ void SAL_CALL PresenterHelper::toTop ( throw (css::uno::RuntimeException, std::exception) { vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); - if (pWindow != NULL) + if (pWindow != nullptr) { pWindow->ToTop(); - pWindow->SetZOrder(NULL, ZOrderFlags::Last); + pWindow->SetZOrder(nullptr, ZOrderFlags::Last); } } @@ -202,7 +202,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( throw (RuntimeException, std::exception) { if ( ! rxCanvas.is()) - return NULL; + return nullptr; static IdMapEntry const map[] = { { "bitmaps/Background.png", BMP_PRESENTERSCREEN_BACKGROUND }, @@ -396,7 +396,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( } } if (nid == 0) { - return 0; + return nullptr; } ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); @@ -405,18 +405,18 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( cppcanvas::VCLFactory::createCanvas( Reference<css::rendering::XCanvas>(rxCanvas,UNO_QUERY))); - if (pCanvas.get() != NULL) + if (pCanvas.get() != nullptr) { BitmapEx aBitmapEx = SdResId(nid); cppcanvas::BitmapSharedPtr xBitmap( cppcanvas::VCLFactory::createBitmap(pCanvas, aBitmapEx)); - if (xBitmap.get() == NULL) - return NULL; + if (xBitmap.get() == nullptr) + return nullptr; return xBitmap->getUNOBitmap(); } - return NULL; + return nullptr; } void SAL_CALL PresenterHelper::captureMouse ( @@ -427,7 +427,7 @@ void SAL_CALL PresenterHelper::captureMouse ( // Capture the mouse (if not already done.) vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); - if (pWindow != NULL && ! pWindow->IsMouseCaptured()) + if (pWindow != nullptr && ! pWindow->IsMouseCaptured()) { pWindow->CaptureMouse(); } @@ -440,7 +440,7 @@ void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWi // Release the mouse (if not already done.) vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); - if (pWindow != NULL && pWindow->IsMouseCaptured()) + if (pWindow != nullptr && pWindow->IsMouseCaptured()) { pWindow->ReleaseMouse(); } @@ -453,7 +453,7 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative ( { vcl::Window* pChildWindow = VCLUnoHelper::GetWindow(rxChildWindow); vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); - if (pChildWindow!=NULL && pParentWindow!=NULL) + if (pChildWindow!=nullptr && pParentWindow!=nullptr) { Rectangle aBox (pChildWindow->GetWindowExtentsRelative(pParentWindow)); return awt::Rectangle(aBox.Left(),aBox.Top(),aBox.GetWidth(),aBox.GetHeight()); |