diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-12 13:52:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-12 13:52:28 +0000 |
| commit | 1259ace49442b7b53249bdb244998e47fdb5c9a5 (patch) | |
| tree | 539c1ec2860693efc19b3aeef24fa5a26a310d4a /svx/source/unodraw/unoshap2.cxx | |
| parent | c7c250f21047a7b028d630000382141e83f9f530 (diff) | |
INTEGRATION: CWS aw013 (1.44.130); FILE MERGED
2004/07/02 12:03:41 aw 1.44.130.1: #i29181#
Diffstat (limited to 'svx/source/unodraw/unoshap2.cxx')
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index f454ebad50a2..88c50c98c2d2 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoshap2.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: rt $ $Date: 2004-07-06 13:34:55 $ + * last change: $Author: rt $ $Date: 2004-07-12 14:52:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,6 +112,14 @@ #include "shapeimpl.hxx" #include "svdoashp.hxx" +// #i29181# +#ifndef _SVDVITER_HXX +#include "svdviter.hxx" +#endif +#ifndef _SVDVIEW_HXX //autogen +#include "svdview.hxx" +#endif + using namespace ::osl; using namespace ::vos; using namespace ::rtl; @@ -344,6 +352,19 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS if( nObjNum < nObjCount ) { + // #i29181# + // If the SdrObject which is about to be deleted is in any selection, + // deselect it first. + SdrViewIter aIter( pSdrShape ); + + for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() ) + { + if(CONTAINER_ENTRY_NOTFOUND != pView->TryToFindMarkedObject(pSdrShape)) + { + pView->MarkObj(pSdrShape, pView->GetPageViewPvNum(0), sal_True, sal_False); + } + } + delete rList.NbcRemoveObject( nObjNum ); pShape->InvalidateSdrObject(); } |