summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-01-17 14:28:41 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-01-17 14:30:59 -0500
commit1fb5ecdd7442247e0ed8154928b66fab0bcbe3ad (patch)
treeb3fb2f85d285f2080a65b0d0526a3f82d7790bec /oox
parent3f390be5a7f3dd0108e2257fa57cfcca6d0859e3 (diff)
Const correct-ness in one place...
And an avalanche of changes that ensued. Change-Id: I7f882b621ba5af4cd01b2ac7f482ee3eed24e3d5
Diffstat (limited to 'oox')
-rw-r--r--oox/inc/oox/export/drawingml.hxx2
-rw-r--r--oox/inc/oox/export/shapes.hxx2
-rw-r--r--oox/source/export/drawingml.cxx2
-rw-r--r--oox/source/export/shapes.cxx4
4 files changed, 5 insertions, 5 deletions
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 );
}