Save Commit: must be squashed!!! ObjectGraphic refactor

Change-Id: I69f0b8bef3a08d1a325ccbe2b5f128df9cc14880

3 files changed, 8 insertions, 8 deletions

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index b8df2b08b1a8..ccfc96eb9c73 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1287,10 +1287,10 @@ sal_Bool EscherPropertyContainer::CreateOLEGraphicProperties(
     return bRetValue;
 }
 
-sal_Bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const GraphicObject& rGraphicObj )
+sal_Bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const rtl::Reference<GraphicObject>& rGraphicObj )
 {
     sal_Bool    bRetValue = sal_False;
-    OString aUniqueId( rGraphicObj.GetUniqueID() );
+    OString aUniqueId( rGraphicObj->GetUniqueID() );
     if ( !aUniqueId.isEmpty() )
     {
         AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
@@ -4238,7 +4238,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
 
         sal_Bool            bUseNativeGraphic( sal_False );
 
-        Graphic             aGraphic( mxGraphicObject->GetTransformedGraphic( pGraphicAttr ) );
+        Graphic             aGraphic( xGraphicObject->GetTransformedGraphic( pGraphicAttr ) );
         GfxLink             aGraphicLink;
         SvMemoryStream      aStream;
 
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 611045848aad..cf18bae30b85 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6132,8 +6132,8 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p
             {
                 /* if this entry is available, then it should be possible
                 to get the Graphic via GraphicObject */
-                GraphicObject aGraphicObject( iter->second );
-                rData = aGraphicObject.GetGraphic();
+                rtl::Reference <GraphicObject> xGraphicObject = GraphicObject::Create( iter->second );
+                rData = xGraphicObject->GetGraphic();
                 if ( rData.GetType() != GRAPHIC_NONE )
                     bOk = sal_True;
                 else
@@ -6190,8 +6190,8 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p
             if ( bOk )
             {
                 // create new BlipCacheEntry for this graphic
-                GraphicObject aGraphicObject( rData );
-                aEscherBlipCache.insert(std::make_pair(nIdx_,aGraphicObject.GetUniqueID()));
+                rtl::Reference<GraphicObject> xGraphicObject = GraphicObject::Create( rData );
+                aEscherBlipCache.insert(std::make_pair(nIdx_, xGraphicObject->GetUniqueID()));
             }
         }
     }
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 41307b7b6631..9ef91fd4eace 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7355,7 +7355,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
                     const XFillBitmapItem aXFillBitmapItem((const XFillBitmapItem&)pObj->GetMergedItem( XATTR_FILLBITMAP ));
                     OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX);
                     aURL += OStringToOUString(
-                        aXFillBitmapItem.GetGraphicObject().GetUniqueID(),
+                        aXFillBitmapItem.GetGraphicObject()->GetUniqueID(),
                         RTL_TEXTENCODING_ASCII_US);
 
                     xPropSet->setPropertyValue("FillBitmapURL", Any( aURL ) );