summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/svdograf.hxx1
-rw-r--r--svx/source/svdraw/svdograf.cxx17
2 files changed, 9 insertions, 9 deletions
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 8a81917dfe..0d74a071a0 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -144,6 +144,7 @@ public:
void SetGraphicObject( const GraphicObject& rGrfObj );
const GraphicObject& GetGraphicObject( bool bForceSwapIn = false) const;
+ void NbcSetGraphic(const Graphic& rGrf);
void SetGraphic(const Graphic& rGrf);
const Graphic& GetGraphic() const;
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 8d150e506c..f31a663311 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -133,14 +133,8 @@ void SdrGraphicLink::DataChanged( const String& rMimeType,
Graphic aGraphic;
if( SvxLinkManager::GetGraphicFromAny( rMimeType, rValue, aGraphic ))
{
- GraphicType eOldGraphicType = pGrafObj->GetGraphicType(); // kein Hereinswappen
- const sal_Bool bIsChanged = pModel->IsChanged();
-
- pGrafObj->SetGraphic( aGraphic );
- if( GRAPHIC_NONE != eOldGraphicType )
- pGrafObj->SetChanged();
- else
- pModel->SetChanged( bIsChanged );
+ pGrafObj->NbcSetGraphic( aGraphic );
+ pGrafObj->ActionChanged();
}
else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) !=
SvxLinkManager::RegisterStatusInfoId() )
@@ -303,11 +297,16 @@ const GraphicObject& SdrGrafObj::GetGraphicObject(bool bForceSwapIn) const
// -----------------------------------------------------------------------------
-void SdrGrafObj::SetGraphic( const Graphic& rGrf )
+void SdrGrafObj::NbcSetGraphic( const Graphic& rGrf )
{
pGraphic->SetGraphic( rGrf );
pGraphic->SetUserData();
mbIsPreview = sal_False;
+}
+
+void SdrGrafObj::SetGraphic( const Graphic& rGrf )
+{
+ NbcSetGraphic(rGrf);
SetChanged();
BroadcastObjectChange();
}