diff options
| author | Armin Weiss <aw@openoffice.org> | 2002-12-09 14:53:33 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2002-12-09 14:53:33 +0000 |
| commit | 0c74c25fd3fa0af7bfdd062b9651948e15141a6d (patch) | |
| tree | adab0436c56de34fed4c10ddcfd274b30c40a3d3 /svx/source/svdraw/svdedtv.cxx | |
| parent | 5f4e6e865b183d2bf8ae8557f0f30c6f465d692e (diff) | |
#105899# Removed last changes, see bug
Diffstat (limited to 'svx/source/svdraw/svdedtv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdedtv.cxx | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 56b48b41943d..f647f9c2e296 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdedtv.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: aw $ $Date: 2002-12-04 11:10:47 $ + * last change: $Author: aw $ $Date: 2002-12-09 15:53:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -539,9 +539,6 @@ void SdrEditView::CheckPossibilities() BOOL bNoMovRotFound=FALSE; const SdrPageView* pPV0=NULL; - // #105899# Track if at least one SdrGrafObj is in selection - sal_Bool bAtLestOneGrafObj(sal_False); - for (ULONG nm=0; nm<nMarkAnz; nm++) { const SdrMark* pM=aMark.GetMark(nm); const SdrObject* pObj=pM->GetObj(); @@ -551,12 +548,6 @@ void SdrEditView::CheckPossibilities() pPV0=pPV; } - // #105899# - if(!bAtLestOneGrafObj && pObj && pObj->ISA(SdrGrafObj)) - { - bAtLestOneGrafObj = sal_True; - } - SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); BOOL bMovPrt=pObj->IsMoveProtect(); @@ -624,14 +615,6 @@ void SdrEditView::CheckPossibilities() } } - // #105899# Forbid combination if selection contains at least one - // SDrGrafObj. This is set to TRUE here since bCanConvToPath for - // SDrGrafObj's is allowed to enable the trace dialog. - if(bAtLestOneGrafObj && nMarkAnz > 1 && bCombinePossible) - { - bCombinePossible = FALSE; - } - bMoreThanOneNotMovable=nMovableCount<nMarkAnz-1; bOneOrMoreMovable=nMovableCount!=0; bGrpEnterPossible=bUnGroupPossible; |