Skip to content

C
core
Kaydet (Commit) 687275db authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

canvas is null under Xdmx so createBitmap fails 

Change-Id: Ia7ce38ef07e6225ce785fab580343dfcd7ecb948
üst ea8028a5
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
sd/source/ui/presenter/PresenterHelper.cxx
Dosyayı görüntüle @ 687275db
...@@ -454,11 +454,15 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( ...@@ -454,11 +454,15 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap (
cppcanvas::VCLFactory::getInstance().createCanvas( cppcanvas::VCLFactory::getInstance().createCanvas(
Reference<css::rendering::XBitmapCanvas>(rxCanvas,UNO_QUERY))); Reference<css::rendering::XBitmapCanvas>(rxCanvas,UNO_QUERY)));
if (pCanvas.get()!=NULL) if (pCanvas.get() != NULL)
{ {
BitmapEx aBitmapEx = SdResId(nid); BitmapEx aBitmapEx = SdResId(nid);
return cppcanvas::VCLFactory::getInstance().createBitmap( cppcanvas::BitmapSharedPtr xBitmap(
pCanvas, aBitmapEx)->getUNOBitmap(); cppcanvas::VCLFactory::getInstance().createBitmap(pCanvas,
aBitmapEx));
if (xBitmap.get() == NULL)
return NULL;
return xBitmap->getUNOBitmap();
} }
return NULL; return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment