From 01c64f9dffe04c3d3ff0c81ca740827d658ea3da Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sat, 28 Sep 2013 17:09:33 +0200
Subject: save commit: fix various breakage due to GraphicObject... need rebase
 -i

Change-Id: Ia131c13b8831dc994d5866f968fc3e196ff69972
---
 sw/source/core/graphic/ndgrf.cxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'sw/source')

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 09449a0cfd3a..09c22f010cfd 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -62,7 +62,7 @@ SwGrfNode::SwGrfNode(
         SwGrfFmtColl *pGrfColl,
         SwAttrSet* pAutoAttr ) :
     SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
-    mxGrfObj(),
+    mxGrfObj(GraphicObject::Create(Graphic())),
     mxReplacementGraphic(),
     // #i73788#
     mbLinkedInputStreamReady( false ),
@@ -72,7 +72,7 @@ SwGrfNode::SwGrfNode(
         bFrameInPaint = bScaleImageMap = sal_False;
 
     bGrafikArrived = sal_True;
-    ReRead(rGrfName,rFltName, pGraphic, mxGrfObj.is() ? mxGrfObj.get() : NULL, sal_False);
+    ReRead(rGrfName,rFltName, pGraphic, mxGrfObj.get(), sal_False);
     mxGrfObj->SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
 }
 
@@ -105,7 +105,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
                       SwGrfFmtColl *pGrfColl,
                       SwAttrSet* pAutoAttr ) :
     SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
-    mxGrfObj(),
+    mxGrfObj(GraphicObject::Create(Graphic())),
     mxReplacementGraphic(),
     // #i73788#
     mbLinkedInputStreamReady( false ),
@@ -245,8 +245,10 @@ sal_Bool SwGrfNode::ReRead(
         bReadGrf = sal_True;
     }
     // Was the graphic already loaded?
-    else if( !bNewGrf && mxGrfObj.is() && GRAPHIC_NONE != mxGrfObj->GetType() )
+    else if( !bNewGrf && GRAPHIC_NONE != mxGrfObj->GetType() )
+    {
         return sal_True;
+    }
     else
     {
         if( HasStreamName() )
@@ -501,7 +503,7 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData )
                     // no default bitmap anymore, thus re-paint
                     mxReplacementGraphic.clear();
 
-                    mxGrfObj = rtl::Reference<GraphicObject>();
+                    mxGrfObj = GraphicObject::Create(Graphic());
                     onGraphicChanged();
                     SwMsgPoolItem aMsgHint( RES_GRAPHIC_PIECE_ARRIVED );
                     ModifyNotification( &aMsgHint, &aMsgHint );
-- 
cgit v1.2.3