Const correct-ness in one place...

And an avalanche of changes that ensued.

Change-Id: I7f882b621ba5af4cd01b2ac7f482ee3eed24e3d5

30 files changed, 39 insertions, 39 deletions

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 9949d3d34d96..cf08b7f339cd 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1132,7 +1132,7 @@ sal_Bool EscherPropertyContainer::CreateOLEGraphicProperties(
         SdrObject* pSdrOLE2( GetSdrObjectFromXShape( rXShape ) );   // SJ: leaving unoapi, because currently there is
         if ( pSdrOLE2 && pSdrOLE2->ISA( SdrOle2Obj ) )              // no access to the native graphic object
         {
-            Graphic* pGraphic = ((SdrOle2Obj*)pSdrOLE2)->GetGraphic();
+            const Graphic* pGraphic = static_cast<SdrOle2Obj*>(pSdrOLE2)->GetGraphic();
             if ( pGraphic )
             {
                 GraphicObject aGraphicObject( *pGraphic );
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index 818531ddc660..a355ac486e71 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -110,7 +110,7 @@ public:
     void WriteStretch();
     void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing );
 
-    ::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::rtl::OUString& rURL, Graphic *pGraphic=NULL );
+    ::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::rtl::OUString& rURL, const Graphic *pGraphic=NULL );
     void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
 
     void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape,
diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx
index 5f83326ad6a7..39b4c0d9ec72 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/oox/inc/oox/export/shapes.hxx
@@ -62,7 +62,7 @@ public:
 protected:
     sal_Int32           mnShapeIdMax, mnPictureIdMax;
 
-    void WriteGraphicObjectShapePart( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, Graphic *pGraphic=NULL );
+    void WriteGraphicObjectShapePart( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, const Graphic *pGraphic=NULL );
 
 private:
     sal_Int32           mnXmlNamespace;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 1a574325f7aa..2d9bd9f4a117 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -526,7 +526,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
     return sRelId;
 }
 
-OUString DrawingML::WriteBlip( Reference< XPropertySet > rXPropSet, OUString& rURL, Graphic *pGraphic )
+OUString DrawingML::WriteBlip( Reference< XPropertySet > rXPropSet, OUString& rURL, const Graphic *pGraphic )
 {
     OUString sRelId = pGraphic ? WriteImage( *pGraphic ) : WriteImage( rURL );
     sal_Int16 nBright = 0;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 9c8436e158c1..df14d1233d39 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -816,7 +816,7 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
     return *this;
 }
 
-void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, Graphic* pGraphic )
+void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const Graphic* pGraphic )
 {
     DBG(printf("write graphic object shape\n"));
 
@@ -1382,7 +1382,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape )
                         SdrObject* pSdrOLE2( GetSdrObjectFromXShape( xShape ) );
                         if ( pSdrOLE2 && pSdrOLE2->ISA( SdrOle2Obj ) )
                         {
-                            Graphic* pGraphic = ((SdrOle2Obj*)pSdrOLE2)->GetGraphic();
+                            const Graphic* pGraphic = ((SdrOle2Obj*)pSdrOLE2)->GetGraphic();
                             if ( pGraphic )
                                 WriteGraphicObjectShapePart( xShape, pGraphic );
                         }
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index dfc8fb18eb54..0d31c275b3a4 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -160,7 +160,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
         break;
         case OBJ_OLE2:
         {
-            Graphic* pGraphic = ((SdrOle2Obj*)pObject)->GetGraphic();
+            const Graphic* pGraphic = static_cast<SdrOle2Obj*>(pObject)->GetGraphic();
             if ( pGraphic )
             {
                 String aLinkName;
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 251fa5d5b044..06ff385b43e8 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -90,7 +90,7 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& )
         {
             SdrOle2Obj* aOle2Object = ((SdrOle2Obj*) pObject)->Clone();
             aOle2Object->NbcResize(Point(), Fraction(1,1), Fraction(1,1));
-            Graphic* pGraphic = aOle2Object->GetGraphic();
+            const Graphic* pGraphic = aOle2Object->GetGraphic();
             if( pGraphic != NULL )
             {
                 String sGrfNm, sFilterNm;
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 363fbf428646..cb3799f8c542 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -214,7 +214,7 @@ void ScDrawView::UpdateIMap( SdrObject* pObj )
             aGraphic = ( (SdrGrafObj*) pObj )->GetGraphic();
         else
         {
-            Graphic* pGraphic = ((const SdrOle2Obj*) pObj )->GetGraphic();
+            const Graphic* pGraphic = static_cast<const SdrOle2Obj*>(pObj)->GetGraphic();
             if ( pGraphic )
                 aGraphic = *pGraphic;
         }
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index c4a9c0dd4ad8..bd6c094b4112 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -183,7 +183,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
 
                     // TODO/LATER: the standalone handling of the graphic should not be used any more in future
                     // The EmbedDataHelper should bring the graphic in future
-                    Graphic* pObjGr = static_cast< SdrOle2Obj* >( pObj )->GetGraphic();
+                    const Graphic* pObjGr = static_cast< SdrOle2Obj* >( pObj )->GetGraphic();
                     if ( pObjGr )
                         mpGraphic = new Graphic( *pObjGr );
                 }
diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index 28976c65ec66..606aad34f089 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.hxx
@@ -88,7 +88,7 @@ public:
 
     sal_Int64       GetViewAspect() const;
     void            SetViewAspect( sal_Int64 nAspect );
-    Graphic*        GetGraphic( ::rtl::OUString* pMediaType=0 ) const;
+    const Graphic* GetGraphic( OUString* pMediaType = NULL ) const;
 
     // the original size of the object ( size of the icon for iconified object )
     // no conversion is done if no target mode is provided
diff --git a/svtools/inc/svtools/embedtransfer.hxx b/svtools/inc/svtools/embedtransfer.hxx
index b63772511168..9da80b87f37a 100644
--- a/svtools/inc/svtools/embedtransfer.hxx
+++ b/svtools/inc/svtools/embedtransfer.hxx
@@ -42,13 +42,13 @@ protected:
 public:
     // object, replacement image, and the aspect
     SvEmbedTransferHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
-                            Graphic* pGraphic,
+                           const Graphic* pGraphic,
                             sal_Int64 nAspect );
     ~SvEmbedTransferHelper();
 
     static void         FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
-                            Graphic* pGraphic,
+                            const Graphic* pGraphic,
                             sal_Int64 nAspect );
 };
 
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index c405e387412a..07b90d4f9b01 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -431,13 +431,13 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate )
     {
         GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
         if( mpImpl->pGraphic )
-            rGF.ImportGraphic( *mpImpl->pGraphic, String(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW );
+            rGF.ImportGraphic( *mpImpl->pGraphic, OUString(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW );
         mpImpl->mnGraphicVersion++;
         delete pGraphicStream;
     }
 }
 
-Graphic* EmbeddedObjectRef::GetGraphic( ::rtl::OUString* pMediaType ) const
+const Graphic* EmbeddedObjectRef::GetGraphic( OUString* pMediaType ) const
 {
     if ( mpImpl->bNeedUpdate )
         // bNeedUpdate will be set to false while retrieving new replacement
@@ -457,7 +457,7 @@ Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const
 
     if ( mpImpl->nViewAspect == embed::Aspects::MSOLE_ICON )
     {
-        Graphic* pGraphic = GetGraphic();
+        const Graphic* pGraphic = GetGraphic();
         if ( pGraphic )
         {
             aSourceMapMode = pGraphic->GetPrefMapMode();
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index af115a04c01e..4caf4fb0f663 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -39,7 +39,7 @@
 using namespace ::com::sun::star;
 
 SvEmbedTransferHelper::SvEmbedTransferHelper( const uno::Reference< embed::XEmbeddedObject >& xObj,
-                                                Graphic* pGraphic,
+                                              const Graphic* pGraphic,
                                                 sal_Int64 nAspect )
 : m_xObj( xObj )
 , m_pGraphic( pGraphic ? new Graphic( *pGraphic ) : NULL )
@@ -190,7 +190,7 @@ void SvEmbedTransferHelper::ObjectReleased()
 
 void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc,
     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
-    Graphic* pGraphic,
+    const Graphic* pGraphic,
     sal_Int64 nAspect )
 {
     //TODO/LATER: need TypeName to fill it into the Descriptor (will be shown in listbox)
diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx
index 6fdc74d676e7..b5442dc19617 100644
--- a/svx/inc/svx/svdoole2.hxx
+++ b/svx/inc/svx/svdoole2.hxx
@@ -97,7 +97,7 @@ public:
     // Ein OLE-Zeichenobjekt kann eine StarView-Grafik beinhalten.
     // Diese wird angezeigt, wenn das OLE-Objekt leer ist.
     void        SetGraphic(const Graphic* pGrf);
-    Graphic*    GetGraphic() const;
+    const Graphic* GetGraphic() const;
     void        GetNewReplacement();
 
     // the original size of the object ( size of the icon for iconified object )
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 5ecedad34db2..597b526a80ab 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -43,7 +43,7 @@ namespace drawinglayer
 
             if(pSource)
             {
-                Graphic* pOLEGraphic = pSource->GetGraphic();
+                const Graphic* pOLEGraphic = pSource->GetGraphic();
 
                 if(pOLEGraphic)
                 {
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index cb0760e65b72..98bd1ec64116 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1291,7 +1291,7 @@ void SdrOle2Obj::Disconnect_Impl()
 
 SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHCGraphic */) const
 {
-    Graphic* pOLEGraphic = GetGraphic();
+    const Graphic* pOLEGraphic = GetGraphic();
 
     if(pOLEGraphic)
     {
@@ -1855,7 +1855,7 @@ void SdrOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
         ImpSetVisAreaSize();
 }
 
-Graphic* SdrOle2Obj::GetGraphic() const
+const Graphic* SdrOle2Obj::GetGraphic() const
 {
     if ( xObjRef.is() )
         return xObjRef.GetGraphic();
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index a79ef1103257..3baea7086c44 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -220,7 +220,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
         SdrOle2Obj* pObj = dynamic_cast<SdrOle2Obj*>(mpObj.get());
         if( pObj )
         {
-            Graphic* pGraphic = pObj->GetGraphic();
+            const Graphic* pGraphic = pObj->GetGraphic();
             if( pGraphic )
             {
                 sal_Bool bIsWMF = sal_False;
@@ -326,7 +326,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
     case OWN_ATTR_VALUE_GRAPHIC:
     {
         uno::Reference< graphic::XGraphic > xGraphic;
-        Graphic* pGraphic = static_cast<SdrOle2Obj*>( mpObj.get() )->GetGraphic();
+        const Graphic* pGraphic = static_cast<SdrOle2Obj*>( mpObj.get() )->GetGraphic();
         if( pGraphic )
             xGraphic = pGraphic->GetXGraphic();
         rValue <<= xGraphic;
@@ -339,7 +339,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
         SdrOle2Obj* pOle = dynamic_cast< SdrOle2Obj* >( mpObj.get() );
         if( pOle )
         {
-            Graphic* pGraphic = pOle->GetGraphic();
+            const Graphic* pGraphic = pOle->GetGraphic();
 
             // if there isn't already a preview graphic set, check if we need to generate
             // one if model says so
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 8ff4a8bc0446..22195256af28 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2928,7 +2928,7 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
         SdrOle2Obj* pObj = dynamic_cast<SdrOle2Obj*>(mpObj.get());
         if( pObj )
         {
-            Graphic* pGraphic = pObj->GetGraphic();
+            const Graphic* pGraphic = pObj->GetGraphic();
             if( pGraphic )
             {
                 sal_Bool bIsWMF = sal_False;
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index a93911e6b7bc..9596d4ba7d81 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -110,7 +110,7 @@ public:
 
     virtual Size GetTwipSize() const;
 
-    Graphic* GetGraphic();
+    const Graphic* GetGraphic();
 
     void GetNewReplacement();
 
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 914e189a2707..e87c9bf26a32 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1114,7 +1114,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
             //TODO/LATER: is it a problem that the JobSetup isn't used?
             //xRef->DoDraw( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), *pJobSetup );
 
-            Graphic* pGraphic = pOLENd->GetGraphic();
+            const Graphic* pGraphic = pOLENd->GetGraphic();
             if ( pGraphic && pGraphic->GetType() != GRAPHIC_NONE )
             {
                 pGraphic->Draw( pOut, aPosition, aSize );
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index e30b18f9cba9..7144549f658d 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1312,7 +1312,7 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel )
                 // get its graphic
                 Graphic aGraphic;
                 pOle2Obj->Connect();
-                Graphic* pGraphic = pOle2Obj->GetGraphic();
+                const Graphic* pGraphic = pOle2Obj->GetGraphic();
                 if( pGraphic )
                     aGraphic = *pGraphic;
                 pOle2Obj->Disconnect();
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 71775aa33853..f9dbc73a5ff9 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -262,7 +262,7 @@ SwOLENode::~SwOLENode()
     delete pGraphic;
 }
 
-Graphic* SwOLENode::GetGraphic()
+const Graphic* SwOLENode::GetGraphic()
 {
     if ( aOLEObj.GetOleRef().is() )
         return aOLEObj.xOLERef.GetGraphic();
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index b70bc19ecf59..4e3d78360c0d 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3085,7 +3085,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplaceme
                        pDoc->GetNodes()[ pCnt->GetCntntIdx()->
                                         GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
 
-        Graphic* pGraphic = pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode()->GetGraphic();
+        const Graphic* pGraphic = pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode()->GetGraphic();
         if ( pGraphic )
             return pGraphic->GetXGraphic();
     }
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9d1ded5a685f..b2cf7e303a75 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2025,7 +2025,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     else
     {
         // inline, we also have to write the image itself
-        Graphic* pGraphic = 0;
+        const Graphic* pGraphic = 0;
         if (pGrfNode)
             pGraphic = &const_cast< Graphic& >( pGrfNode->GetGrf() );
         else
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 14afa3619218..867d6c290522 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3336,7 +3336,7 @@ void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, S
     Size aRendered(aSize);
     aRendered.Width() = rSize.Width();
     aRendered.Height() = rSize.Height();
-    Graphic* pGraphic = rOLENode.GetGraphic();
+    const Graphic* pGraphic = rOLENode.GetGraphic();
     Size aMapped(pGraphic->GetPrefSize());
     const SwCropGrf &rCr = (const SwCropGrf &)rOLENode.GetAttr(RES_GRFATR_CROPGRF);
     const sal_Char* pBLIPType = OOO_STRING_SVTOOLS_RTF_PNGBLIP;
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index ad8f3a88bab1..ef3738695690 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -866,7 +866,7 @@ namespace sw
             rtl::OUString msOrigPersistName;
             com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxIPRef;
             SfxObjectShell& mrPers;
-            Graphic* mpGraphic;
+            const Graphic* mpGraphic;
         public:
             /** Take ownership of a SdrOle2Objs OLE object
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 8707c22a0510..d0e16d787651 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1552,7 +1552,7 @@ sal_Int32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh
         instead ==> allows unicode text to be preserved
         */
 #ifdef OLE_PREVIEW_AS_EMF
-        Graphic* pGraphic = rOLENd.GetGraphic();
+        const Graphic* pGraphic = rOLENd.GetGraphic();
 #endif
         OpenContainer(ESCHER_SpContainer);
 
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index c009af1b627b..84a49a34ba45 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -490,7 +490,7 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SwDoc& _rDoc )
                 // get its graphic
                 Graphic aGraphic;
                 pOle2Obj->Connect();
-                Graphic* pGraphic = pOle2Obj->GetGraphic();
+                const Graphic* pGraphic = pOle2Obj->GetGraphic();
                 if( pGraphic )
                     aGraphic = *pGraphic;
                 pOle2Obj->Disconnect();
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 9dd3f36c9d9d..30b8ae9471cc 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -327,7 +327,7 @@ uno::Reference < embed::XEmbeddedObject > SwTransferable::FindOLEObj( sal_Int64&
     return xObj;
 }
 
-Graphic* SwTransferable::FindOLEReplacementGraphic() const
+const Graphic* SwTransferable::FindOLEReplacementGraphic() const
 {
     if( pClpDocFac )
     {
@@ -456,7 +456,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
         // get OLE-Object from ClipDoc and get the data from that.
         sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; // will be set in the next statement
         uno::Reference < embed::XEmbeddedObject > xObj = FindOLEObj( nAspect );
-        Graphic* pOLEGraph = FindOLEReplacementGraphic();
+        const Graphic* pOLEGraph = FindOLEReplacementGraphic();
         if( xObj.is() )
         {
             TransferableDataHelper aD( new SvEmbedTransferHelper( xObj, pOLEGraph, nAspect ) );
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx
index 9a87ec66092a..c4610263246b 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/ui/inc/swdtflvr.hxx
@@ -79,7 +79,7 @@ class SwTransferable : public TransferableHelper
 
     // helper methods for the copy
     com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const;
-    Graphic* FindOLEReplacementGraphic() const;
+    const Graphic* FindOLEReplacementGraphic() const;
     void DeleteSelection();
 
     // helper methods for the paste