diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-03-26 11:50:55 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2013-03-26 11:50:55 +0000 |
| commit | ddff14ee8d033aebd56b948bfaa23704f791ba46 (patch) | |
| tree | d95a9b0d39192dce558dbab31e2bc514a57f49a6 /sd | |
| parent | cb2cddde5d962d02c72e7de646cb5bbdb1efa15c (diff) | |
i121873 - Revert revision 1457992, 1457161, 1457159
Notes
Notes:
prefer: ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/presenter/PresenterHelper.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index ca2baa7ff131..9f2319d395cd 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -35,7 +35,6 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/imagerepository.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -264,17 +263,18 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( if (pCanvas.get()!=NULL && rsURL.getLength()>0 && mpGraphicFilter.get()!=NULL) { - sal_Int32 nIndex = 0; - if( rsURL.getToken( 0, '/', nIndex ).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository" ) ) ) + Graphic aGraphic; + OUString sFileName; + if (osl::FileBase::getSystemPathFromFileURL(rsURL, sFileName) + == osl::FileBase::E_None) { - OUString sPathName( rsURL.copy( nIndex ) ); - BitmapEx aBitmap; - if ( ::vcl::ImageRepository::loadImage( sPathName, aBitmap, false ) - && !aBitmap.IsEmpty() ) + if (mpGraphicFilter->ImportGraphic(aGraphic, rsURL) == GRFILTER_OK) + { + BitmapEx aBitmapEx (aGraphic.GetBitmapEx()); return cppcanvas::VCLFactory::getInstance().createBitmap( pCanvas, - aBitmap)->getUNOBitmap(); + aBitmapEx)->getUNOBitmap(); + } } } |