diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-03-15 22:21:53 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2013-03-15 22:21:53 +0000 |
| commit | 7c9964d111937a0af503633a8f16195183747d43 (patch) | |
| tree | 3f708875d71e58aa00c94664690e635d35fa6738 /sd | |
| parent | 8bdce6d900be92077b715ff1298b846ce32171b7 (diff) | |
i121873 - Integrate the Presenter Screen
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 9f2319d395cd..bdd108646905 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -35,6 +35,7 @@ #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; @@ -263,18 +264,17 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( if (pCanvas.get()!=NULL && rsURL.getLength()>0 && mpGraphicFilter.get()!=NULL) { - Graphic aGraphic; - OUString sFileName; - if (osl::FileBase::getSystemPathFromFileURL(rsURL, sFileName) - == osl::FileBase::E_None) + sal_Int32 nIndex; + if( rsURL.getToken( 0, '/', nIndex ).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository" ) ) ) { - if (mpGraphicFilter->ImportGraphic(aGraphic, rsURL) == GRFILTER_OK) - { - BitmapEx aBitmapEx (aGraphic.GetBitmapEx()); + OUString sPathName( rsURL.copy( nIndex ) ); + BitmapEx aBitmap; + if ( ::vcl::ImageRepository::loadImage( sPathName, aBitmap, false ) + && !aBitmap.IsEmpty() ) return cppcanvas::VCLFactory::getInstance().createBitmap( pCanvas, - aBitmapEx)->getUNOBitmap(); - } + aBitmap)->getUNOBitmap(); } } |