summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2010-01-14 18:09:52 +0100
committerKurt Zenker <kz@openoffice.org>2010-01-14 18:09:52 +0100
commitc61a2aa9400c1dd264249a01ee8263db71d9241d (patch)
tree59ddda2598435082fc39f41044f3cba60f91e166
parentb3bb4ef0319ac117eb04dda28fd8594b1dfc1004 (diff)
parent29e198888b594845b2deea46f88835a48d6dde0d (diff)
CWS-TOOLING: integrate CWS impress185_DEV300
-rw-r--r--svx/inc/svx/svdograf.hxx1
-rw-r--r--svx/source/svdraw/svdograf.cxx17
-rw-r--r--svx/source/table/svdotable.cxx2
3 files changed, 10 insertions, 10 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();
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 00d09251cd..b52302c9dc 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2575,7 +2575,7 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag
basegfx::B2DPolyPolygon aRetval;
const SdrHdl* pHdl = rDrag.GetHdl();
- if(HDL_USER == pHdl->GetKind())
+ if( pHdl && (HDL_USER == pHdl->GetKind()) )
{
const TableEdgeHdl* pEdgeHdl = dynamic_cast< const TableEdgeHdl* >( pHdl );