summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx2
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx4
-rw-r--r--slideshow/source/engine/shapes/viewbackgroundshape.cxx4
-rw-r--r--slideshow/source/engine/shapes/viewshape.cxx8
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx2
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.cxx4
-rw-r--r--slideshow/source/engine/slideview.cxx5
-rw-r--r--slideshow/source/engine/tools.cxx3
-rw-r--r--slideshow/source/engine/transitions/slidechangebase.cxx2
9 files changed, 16 insertions, 18 deletions
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 72d6db281812..34f628cc83a5 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -475,7 +475,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas )
metaFile.WindStart();
cppcanvas::RendererSharedPtr renderer(
- cppcanvas::VCLFactory::getInstance().createRenderer(
+ cppcanvas::VCLFactory::createRenderer(
canvas, metaFile, cppcanvas::Renderer::Parameters() ) );
const bool succ = renderer->draw();
OSL_ASSERT( succ );
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index eca253a0b4aa..b0826834ed84 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -497,8 +497,8 @@ void ShapeImporter::importPolygons(uno::Reference<beans::XPropertySet> const& xP
while(aIter != aEnd)
{
::cppcanvas::PolyPolygonSharedPtr pPolyPoly(
- ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( (*aIter)->getCanvas(),
- aPoly ) );
+ ::cppcanvas::BaseGfxFactory::createPolyPolygon( (*aIter)->getCanvas(),
+ aPoly ) );
if( pPolyPoly )
{
pPolyPoly->setRGBALineColor( unoColor2RGBColor( nLineColor ).getIntegerColor() );
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index 05f255b28604..cdef389d59ce 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -84,7 +84,7 @@ namespace slideshow
// create a bitmap of appropriate size
::cppcanvas::BitmapSharedPtr pBitmap(
- ::cppcanvas::BaseGfxFactory::getInstance().createBitmap(
+ ::cppcanvas::BaseGfxFactory::createBitmap(
rDestinationCanvas,
aBmpSizePixel ) );
@@ -112,7 +112,7 @@ namespace slideshow
maBounds.getMinX(), maBounds.getMinY()));
::cppcanvas::RendererSharedPtr pRenderer(
- ::cppcanvas::VCLFactory::getInstance().createRenderer(
+ ::cppcanvas::VCLFactory::createRenderer(
pBitmapCanvas,
*rMtf.get(),
::cppcanvas::Renderer::Parameters() ) );
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index edbd66631a16..bb87b65534e6 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -158,9 +158,9 @@ namespace slideshow
}
}
- io_rCacheEntry.mpRenderer = ::cppcanvas::VCLFactory::getInstance().createRenderer( rDestinationCanvas,
- *rMtf.get(),
- aParms );
+ io_rCacheEntry.mpRenderer = ::cppcanvas::VCLFactory::createRenderer( rDestinationCanvas,
+ *rMtf.get(),
+ aParms );
io_rCacheEntry.mpMtf = rMtf;
io_rCacheEntry.mpDestinationCanvas = rDestinationCanvas;
@@ -619,7 +619,7 @@ namespace slideshow
{
// create a bitmap of appropriate size
::cppcanvas::BitmapSharedPtr pBitmap(
- ::cppcanvas::BaseGfxFactory::getInstance().createAlphaBitmap(
+ ::cppcanvas::BaseGfxFactory::createAlphaBitmap(
rDestinationCanvas,
aBmpSize ) );
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 7e76377a4c97..079139377720 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -717,7 +717,7 @@ SlideBitmapSharedPtr SlideImpl::createCurrentSlideBitmap( const UnoViewSharedPtr
// create a bitmap of appropriate size
::cppcanvas::BitmapSharedPtr pBitmap(
- ::cppcanvas::BaseGfxFactory::getInstance().createBitmap(
+ ::cppcanvas::BaseGfxFactory::createBitmap(
pCanvas,
rBmpSize ) );
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 7fa45a298012..cdab35a9a919 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -418,8 +418,8 @@ namespace slideshow
++aIter )
{
::cppcanvas::PolyPolygonSharedPtr pPolyPoly(
- ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( (*aIter)->getCanvas(),
- aPoly ) );
+ ::cppcanvas::BaseGfxFactory::createPolyPolygon( (*aIter)->getCanvas(),
+ aPoly ) );
if( pPolyPoly )
{
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index e63ee87f0d3d..a0dab4db4164 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -180,8 +180,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas,
basegfx::B2DRange(rArea)));
::cppcanvas::PolyPolygonSharedPtr pPolyPoly(
- ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( pCanvas,
- aPoly ) );
+ ::cppcanvas::BaseGfxFactory::createPolyPolygon( pCanvas, aPoly ) );
if( pPolyPoly )
{
@@ -782,7 +781,7 @@ SlideView::SlideView( const uno::Reference<presentation::XSlideShowView>& xView,
ENSURE_OR_THROW( mxView.is(),
"SlideView::SlideView(): Invalid view" );
- mpCanvas = cppcanvas::VCLFactory::getInstance().createSpriteCanvas(
+ mpCanvas = cppcanvas::VCLFactory::createSpriteCanvas(
xView->getCanvas() );
ENSURE_OR_THROW( mpCanvas,
"Could not create cppcanvas" );
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index ea01de32691d..3bd58aeaf077 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -677,8 +677,7 @@ namespace slideshow
::basegfx::tools::createPolygonFromRect( rRect ));
::cppcanvas::PolyPolygonSharedPtr pPolyPoly(
- ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( rCanvas,
- aPoly ) );
+ ::cppcanvas::BaseGfxFactory::createPolyPolygon( rCanvas, aPoly ) );
if( pPolyPoly )
{
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index dd0cabfbce4d..d78361ff5b97 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -105,7 +105,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr&
// create a bitmap of appropriate size
cppcanvas::BitmapSharedPtr pBitmap(
- cppcanvas::BaseGfxFactory::getInstance().createBitmap(
+ cppcanvas::BaseGfxFactory::createBitmap(
pCanvas,
slideSizePixel ) );