diff options
| author | Oliver Bolte <obo@openoffice.org> | 2010-01-08 15:25:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2010-01-08 15:25:58 +0000 |
| commit | 2e721139bbe2cd057d3596b50ef97d34dc190942 (patch) | |
| tree | 531fa38eb3df7afa099be820c71cc0012f040acd | |
| parent | 6f43b973e70a27ae33f42ed846d4aa0cea323a29 (diff) | |
CWS-TOOLING: integrate CWS impress185
2010-01-07 15:15:46 +0100 aw r277880 : #i107966# Removed wrong '5'
2010-01-07 13:31:24 +0100 aw r277879 : #i107839# Added a NbcSetGraphic to SvxGraphicLink and use it in SvxGraphicLink::DataChanged to avoid unwanted ModelChange
2010-01-07 12:53:09 +0100 cl r277878 : reverted previous patch
2009-12-28 16:03:56 +0100 cl r277837 : #i107966# check if there really is a handle to avoid a reported crash
2009-12-28 16:02:47 +0100 cl r277836 : #i107965# report rectangles with 0 or negative width or height as empty
| -rw-r--r-- | svx/inc/svx/svdograf.hxx | 1 | ||||
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 17 | ||||
| -rw-r--r-- | svx/source/table/svdotable.cxx | 2 |
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 67d02ac706..28ccf8ec96 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 d639b3e884..947ecc25a7 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 ); |