diff options
Diffstat (limited to 'cppcanvas/source/wrapper/vclfactory.cxx')
| -rw-r--r-- | cppcanvas/source/wrapper/vclfactory.cxx | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index 0b5f7c33fd80..669aabfc16e3 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.cxx @@ -39,26 +39,6 @@ using namespace ::com::sun::star; namespace cppcanvas { - /* Singleton handling */ - struct InitInstance - { - VCLFactory* operator()() - { - return new VCLFactory(); - } - }; - - VCLFactory& VCLFactory::getInstance() - { - return *rtl_Instance< VCLFactory, InitInstance, ::osl::MutexGuard, - ::osl::GetGlobalMutex >::create( - InitInstance(), ::osl::GetGlobalMutex()); - } - - VCLFactory::VCLFactory() - { - } - CanvasSharedPtr VCLFactory::createCanvas( const uno::Reference< rendering::XCanvas >& xCanvas ) { return CanvasSharedPtr( @@ -71,7 +51,7 @@ namespace cppcanvas new internal::ImplBitmapCanvas( xCanvas ) ); } - SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const vcl::Window& rVCLWindow ) const + SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const vcl::Window& rVCLWindow ) { return SpriteCanvasSharedPtr( new internal::ImplSpriteCanvas( @@ -80,14 +60,14 @@ namespace cppcanvas uno::UNO_QUERY) ) ); } - SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& xCanvas ) const + SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& xCanvas ) { return SpriteCanvasSharedPtr( new internal::ImplSpriteCanvas( xCanvas ) ); } BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& rCanvas, - const ::BitmapEx& rBmpEx ) const + const ::BitmapEx& rBmpEx ) { OSL_ENSURE( rCanvas.get() != NULL && rCanvas->getUNOCanvas().is(), @@ -108,7 +88,7 @@ namespace cppcanvas RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr& rCanvas, const ::GDIMetaFile& rMtf, - const Renderer::Parameters& rParms ) const + const Renderer::Parameters& rParms ) { return RendererSharedPtr( new internal::ImplRenderer( rCanvas, rMtf, |