diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-09 08:45:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-13 09:37:12 +0200 |
commit | 26ec80f47df1b32c5e1ae8c96d597ef8c90fee86 (patch) | |
tree | 11b53e701f50ff170552054ef7d23136cd4710b6 /sd/source/ui/presenter | |
parent | b5f5a386504e320b022f8609c9c36652ae2d3d18 (diff) |
loplugin:staticmethods
Change-Id: I33a8ca28b0c3bf1c31758d93238e74927bebde9c
Diffstat (limited to 'sd/source/ui/presenter')
-rw-r--r-- | sd/source/ui/presenter/PresenterHelper.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterPreviewCache.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterTextView.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/presenter/SlideRenderer.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index fa55eee8f5fa..8e62792adb37 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -398,14 +398,14 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); const cppcanvas::CanvasSharedPtr pCanvas ( - cppcanvas::VCLFactory::getInstance().createCanvas( + cppcanvas::VCLFactory::createCanvas( Reference<css::rendering::XCanvas>(rxCanvas,UNO_QUERY))); if (pCanvas.get() != NULL) { BitmapEx aBitmapEx = SdResId(nid); cppcanvas::BitmapSharedPtr xBitmap( - cppcanvas::VCLFactory::getInstance().createBitmap(pCanvas, + cppcanvas::VCLFactory::createBitmap(pCanvas, aBitmapEx)); if (xBitmap.get() == NULL) return NULL; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 22bdfa96930e..c4fd99bb1b7e 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -138,7 +138,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( OSL_ASSERT(mpCacheContext.get()!=NULL); cppcanvas::CanvasSharedPtr pCanvas ( - cppcanvas::VCLFactory::getInstance().createCanvas(rxCanvas)); + cppcanvas::VCLFactory::createCanvas(rxCanvas)); const SdrPage* pPage = mpCacheContext->GetPage(nSlideIndex); if (pPage == NULL) @@ -148,7 +148,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( if (aPreview.IsEmpty()) return NULL; else - return cppcanvas::VCLFactory::getInstance().createBitmap( + return cppcanvas::VCLFactory::createBitmap( pCanvas, aPreview)->getUNOBitmap(); } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index a9c746fe5f19..b9fe2662921e 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -128,7 +128,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments) if (xCanvas.is()) { mpImplementation->SetCanvas( - cppcanvas::VCLFactory::getInstance().createCanvas(xCanvas)); + cppcanvas::VCLFactory::createCanvas(xCanvas)); } } catch (RuntimeException&) @@ -476,7 +476,7 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void mpEditEngine->Draw(mpOutputDevice, aWindowBox, Point(0,mnTop)); const BitmapEx aBitmap (mpOutputDevice->GetBitmapEx(Point(0,0), maSize)); - mxBitmap = cppcanvas::VCLFactory::getInstance().createBitmap( + mxBitmap = cppcanvas::VCLFactory::createBitmap( mpCanvas, aBitmap )->getUNOBitmap(); diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index c744aac4a378..bec55173cf9a 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -107,9 +107,9 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas ( SolarMutexGuard aGuard; cppcanvas::CanvasSharedPtr pCanvas ( - cppcanvas::VCLFactory::getInstance().createCanvas(rxCanvas)); + cppcanvas::VCLFactory::createCanvas(rxCanvas)); if (pCanvas.get() != NULL) - return cppcanvas::VCLFactory::getInstance().createBitmap( + return cppcanvas::VCLFactory::createBitmap( pCanvas, CreatePreview(rxSlide, rMaximalSize, nSuperSampleFactor))->getUNOBitmap(); else |