diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 11:07:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 13:29:58 +0100 |
| commit | b100796c3922fe8fe83628053fc0294bd48b044a (patch) | |
| tree | 757436924977496ee387129de0e8ebe5d4e00b63 /svtools | |
| parent | 0d95753e4292b1e1338268acdcbe638d3de97e2b (diff) | |
last private:resource ... bitmapex user is gone
so drop private:resource ... bitmapex example and update docs
Change-Id: I244c575573cffda5eb8ca52afd2f4a04a9b18f14
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/graphic/provider.cxx | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 12f3dfa413de..6106bef363a8 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -83,7 +83,6 @@ private: static css::uno::Reference< css::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL ); static css::uno::Reference< css::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL ); - static css::uno::Reference< css::graphic::XGraphic > implLoadResource( const OUString& rResourceURL ); static css::uno::Reference< css::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL ); static css::uno::Reference< css::graphic::XGraphic > implLoadBitmap( const css::uno::Reference< css::awt::XBitmap >& rBitmap ); static css::uno::Reference< css::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL ); @@ -247,53 +246,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno return xRet; } - -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) -{ - uno::Reference< ::graphic::XGraphic > xRet; - sal_Int32 nIndex = 0; - - if( rResourceURL.getToken( 0, '/', nIndex ) == "private:resource" ) - { - OString aResMgrName(OUStringToOString( - rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US)); - - std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() )); - - if( pResMgr ) - { - const OUString aResourceType( rResourceURL.getToken( 0, '/', nIndex ) ); - const ResId aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr ); - - if( !aResourceType.isEmpty() ) - { - BitmapEx aBmpEx; - - if (aResourceType == "bitmapex") - { - aResId.SetRT( RSC_BITMAP ); - - if( pResMgr->IsAvailable( aResId ) ) - { - aBmpEx = BitmapEx( aResId ); - } - } - - if( !aBmpEx.IsEmpty() ) - { - ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic; - - pUnoGraphic->init( aBmpEx ); - xRet = pUnoGraphic; - } - } - } - } - - return xRet; -} - - uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDescriptor( const uno::Sequence< beans::PropertyValue >& rMediaProperties ) { uno::Reference< beans::XPropertySet > xRet; @@ -333,8 +285,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc { uno::Reference< ::graphic::XGraphic > xGraphic( implLoadMemory( aURL ) ); if( !xGraphic.is() ) - xGraphic = implLoadResource( aURL ); - if( !xGraphic.is() ) xGraphic = implLoadGraphicObject( aURL ); if ( !xGraphic.is() ) @@ -437,9 +387,6 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co if( !xRet.is() ) xRet = implLoadGraphicObject( aPath ); - if( !xRet.is() ) - xRet = implLoadResource( aPath ); - if ( !xRet.is() ) xRet = implLoadRepositoryImage( aPath ); |