summaryrefslogtreecommitdiff
path: root/svx/source
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 /svx/source
parent3f390be5a7f3dd0108e2257fa57cfcca6d0859e3 (diff)
Const correct-ness in one place...
And an avalanche of changes that ensued. Change-Id: I7f882b621ba5af4cd01b2ac7f482ee3eed24e3d5
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx2
-rw-r--r--svx/source/svdraw/svdoole2.cxx4
-rw-r--r--svx/source/unodraw/unoshap4.cxx6
-rw-r--r--svx/source/unodraw/unoshape.cxx2
4 files changed, 7 insertions, 7 deletions
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;