User: hr Date: 2007-08-06 10:49:24+0000 Modified: dba/reportdesign/source/ui/report/dlgedfunc.cxx
Log: #i10000#,#i80354#: remove merge conflict resolution error File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: dlgedfunc.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/dlgedfunc.cxx?r1=1.4&r2=1.5 Delta lines: +3 -23 -------------------- --- dlgedfunc.cxx 2007-08-03 12:46:17+0000 1.4 +++ dlgedfunc.cxx 2007-08-06 10:49:22+0000 1.5 @@ -4,9 +4,9 @@ * * $RCSfile: dlgedfunc.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2007/08/03 12:46:17 $ + * last change: $Author: hr $ $Date: 2007/08/06 10:49:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -478,26 +478,6 @@ return bReturn; } // ----------------------------------------------------------------------------- -bool DlgEdFunc::isOnlyCustomShapeMarked() -{ - OSectionView* pView = pParent->getView(); - bool bReturn = true; - const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - for (sal_uInt32 i = 0; i < rMarkList.GetMarkCount();++i ) - { - SdrMark* pMark = rMarkList.GetMark(i); - // bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL; - SdrObject* pObj = pMark->GetMarkedSdrObj(); - if (pObj->GetObjIdentifier() != OBJ_CUSTOMSHAPE) - { - // we found an object in the marked objects, which is not a custom shape. - bReturn = false; - break; - } - } - return bReturn; -} -// ----------------------------------------------------------------------------- bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) { if (isOnlyCustomShapeMarked()) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
