use a transparent graphic for the OLE2 image, and spell 'Empty' correctly.

Change-Id: I94fbe74b6febede4819851dfa78690507b04f4f7

include/svx/svdoole2.hxx

@@ -181,8 +181,8 @@ public:
     sal_Bool CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize );
     sal_Bool AddOwnLightClient();
 
-    // handy to get the empty replacement bitmap without accessing all the old stuff
-    static Bitmap GetEmtyOLEReplacementBitmap();
+    // handy to get the empty replacement graphic without accessing all the old stuff
+    static Graphic GetEmptyOLEReplacementGraphic();
 
     void SetWindow(const com::sun::star::uno::Reference < com::sun::star::awt::XWindow >& _xWindow);
 

sc/source/filter/excel/xiescher.cxx

@@ -2903,8 +2903,8 @@ SdrObject* XclImpPictureObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const
     // avoid a 'blank' shape that can result from a failed control import
     if ( !xSdrObj && IsOcxControl() && maGraphic.GetType() == GRAPHIC_NONE )
     {
-        Graphic aReplacement( SdrOle2Obj::GetEmtyOLEReplacementBitmap() );
-        const_cast< XclImpPictureObj* >( this )->maGraphic = aReplacement;
+        const_cast< XclImpPictureObj* >( this )->maGraphic =
+                SdrOle2Obj::GetEmptyOLEReplacementGraphic();
     }
     // no OLE - create a plain picture from IMGDATA record data
     if( !xSdrObj && (maGraphic.GetType() != GRAPHIC_NONE) )

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;
             }
 

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())));
 }
 
 //////////////////////////////////////////////////////////////////////////////