#105899# Track if at least one SdrGrafObj is in selection

#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.

1 files changed, 22 insertions, 2 deletions

diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index e49ed4903bf4..56b48b41943d 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdedtv.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-07 14:21:40 $
+ *  last change: $Author: aw $ $Date: 2002-12-04 11:10:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -538,6 +538,10 @@ 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();
@@ -546,6 +550,13 @@ void SdrEditView::CheckPossibilities()
                     if (pPV->IsReadOnly()) bReadOnly=TRUE;
                     pPV0=pPV;
                 }
+
+                // #105899#
+                if(!bAtLestOneGrafObj && pObj && pObj->ISA(SdrGrafObj))
+                {
+                    bAtLestOneGrafObj = sal_True;
+                }
+
                 SdrObjTransformInfoRec aInfo;
                 pObj->TakeObjInfo(aInfo);
                 BOOL bMovPrt=pObj->IsMoveProtect();
@@ -612,6 +623,15 @@ void SdrEditView::CheckPossibilities()
                         bImportMtfPossible=((SdrOle2Obj*)pObj)->HasGDIMetaFile();
                 }
             }
+
+            // #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;