diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-06 22:19:38 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-06 22:21:57 +0100 |
| commit | 29c101fe68ad1794744ec576f9d020eb56bba4cd (patch) | |
| tree | 2ef2f99728bc4843e458398384e63281d35995f5 /svx | |
| parent | 3fe227a65de7bd4aae803dcff6802824c624bd09 (diff) | |
use a transparent graphic for the OLE2 image, and spell 'Empty' correctly.
Change-Id: I94fbe74b6febede4819851dfa78690507b04f4f7
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 3 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 7177957cafa6..cea71d529d87 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -55,8 +55,7 @@ namespace drawinglayer if(GRAPHIC_NONE == aGraphic.GetType()) { // no source, use fallback resource emty OLE graphic - const Bitmap aEmptyOLEBitmap(SdrOle2Obj::GetEmtyOLEReplacementBitmap()); - aGraphic = Graphic(aEmptyOLEBitmap); + aGraphic = SdrOle2Obj::GetEmptyOLEReplacementGraphic(); bScaleContent = true; } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index fcf27cc5bcbb..af194c0f2f58 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1338,7 +1338,7 @@ SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHC // bitmap fill pClone->SetMergedItem(XFillStyleItem(XFILL_BITMAP)); - pClone->SetMergedItem(XFillBitmapItem(String(), Graphic(GetEmtyOLEReplacementBitmap()))); + pClone->SetMergedItem(XFillBitmapItem(String(), GetEmptyOLEReplacementGraphic())); pClone->SetMergedItem(XFillBmpTileItem(false)); pClone->SetMergedItem(XFillBmpStretchItem(false)); @@ -2208,9 +2208,9 @@ sal_Bool SdrOle2Obj::AddOwnLightClient() ////////////////////////////////////////////////////////////////////////////// -Bitmap SdrOle2Obj::GetEmtyOLEReplacementBitmap() +Graphic SdrOle2Obj::GetEmptyOLEReplacementGraphic() { - return Bitmap(ResId(BMP_SVXOLEOBJ, *ImpGetResMgr())); + return Graphic(BitmapEx(ResId(BMP_SVXOLEOBJ, *ImpGetResMgr()))); } ////////////////////////////////////////////////////////////////////////////// |