sal_Bool to bool

Change-Id: I4f8a592404272f3ba2602aa1ef42d399d7faae78

8 files changed, 64 insertions, 64 deletions

diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index b385aefb12a3..13cf6f05b5ef 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -117,7 +117,7 @@ protected:
 
     // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen.
     // pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein.
-    OutlinerView* ImpMakeOutlinerView(Window* pWin, sal_Bool bNoPaint, OutlinerView* pGivenView) const;
+    OutlinerView* ImpMakeOutlinerView(Window* pWin, bool bNoPaint, OutlinerView* pGivenView) const;
     void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect, OutputDevice& rTargetDevice) const;
     void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const;
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 06c36402f6f8..f67151001585 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -172,9 +172,9 @@ void SdrObjEditView::ModelHasChanged()
         SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( mxTextEditObj.get() );
         if (pTextObj!=NULL) {
             sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount();
-            sal_Bool bAreaChg=sal_False;
-            sal_Bool bAnchorChg=sal_False;
-            sal_Bool bColorChg=sal_False;
+            bool bAreaChg=false;
+            bool bAnchorChg=false;
+            bool bColorChg=false;
             bool bContourFrame=pTextObj->IsContourTextFrame();
             EVAnchorMode eNewAnchor(ANCHOR_VCENTER_HCENTER);
             Rectangle aOldArea(aMinTextEditArea);
@@ -228,7 +228,7 @@ void SdrObjEditView::ModelHasChanged()
                         if (nStat!=nStat0) pOLV->SetControlWord(nStat);
                     }
                     pTextEditOutliner->SetUpdateMode(sal_True);
-                    bAreaChg=sal_True;
+                    bAreaChg=true;
                 }
             }
             if (pTextEditOutlinerView!=NULL) { // check fill and anchor
@@ -433,13 +433,13 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const
     }
 }
 
-OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPaint*/, OutlinerView* pGivenView) const
+OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, bool /*bNoPaint*/, OutlinerView* pGivenView) const
 {
     // background
     Color aBackground(GetTextEditBackgroundColor(*this));
     SdrTextObj* pText = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() );
-    sal_Bool bTextFrame=pText!=NULL && pText->IsTextFrame();
-    sal_Bool bContourFrame=pText!=NULL && pText->IsContourTextFrame();
+    bool bTextFrame=pText!=NULL && pText->IsTextFrame();
+    bool bContourFrame=pText!=NULL && pText->IsContourTextFrame();
     // create OutlinerView
     OutlinerView* pOutlView=pGivenView;
     pTextEditOutliner->SetUpdateMode(sal_False);
@@ -540,12 +540,12 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
     bTextEditNewObj=bIsNewObj;
     const sal_uInt32 nWinAnz(PaintWindowCount());
     sal_uInt32 i;
-    sal_Bool bBrk(sal_False);
+    bool bBrk(false);
     // break, when no object given
 
     if(!pObj)
     {
-        bBrk = sal_True;
+        bBrk = true;
     }
 
     if(!bBrk && !pWin)
@@ -563,7 +563,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
         // break, when no window exists
         if(!pWin)
         {
-            bBrk = sal_True;
+            bBrk = true;
         }
     }
 
@@ -574,7 +574,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
         // break, when no PageView for the object exists
         if(!pPV)
         {
-            bBrk = sal_True;
+            bBrk = true;
         }
     }
 
@@ -583,7 +583,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
         // no TextEdit on objects in locked Layer
         if(pPV->GetLockedLayers().IsSet(pObj->GetLayer()))
         {
-            bBrk = sal_True;
+            bBrk = true;
         }
     }
 
@@ -608,7 +608,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             pTextEditOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
         }
 
-        sal_Bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
+        bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
 
         aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl();
         // FieldHdl has to be set by SdrBeginTextEdit, because this call an UpdateFields
@@ -717,12 +717,12 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
 
             if(pWin)
             {
-                sal_Bool bExtraInvalidate(sal_False);
+                bool bExtraInvalidate(false);
 
                 if(!bExtraInvalidate)
                 {
                     if(pTextObj->IsFitToSize())
-                        bExtraInvalidate = sal_True;
+                        bExtraInvalidate = true;
                 }
 
                 if(bExtraInvalidate)
@@ -747,7 +747,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
         }
         else
         {
-            bBrk = sal_True;
+            bBrk = true;
             pTextEditOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
             pTextEditOutliner->SetBeginPasteOrDropHdl(Link());
             pTextEditOutliner->SetEndPasteOrDropHdl(Link());
@@ -867,7 +867,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
             }
             // check deletion of entire TextObj
             SdrUndoAction* pDelUndo=NULL;
-            sal_Bool bDelObj=sal_False;
+            bool bDelObj=false;
             SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pTEObj);
             if (pTextObj!=NULL && bTextEditNewObj)
             {
@@ -1394,7 +1394,7 @@ sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHar
 sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
     sal_Bool bRet=sal_False;
-    sal_Bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
+    bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
     sal_Bool bAllTextSelected=ImpIsTextEditAllSelected();
     const SfxItemSet* pSet=&rSet;
 
@@ -1413,7 +1413,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
     {
 #ifdef DBG_UTIL
         {
-            sal_Bool bHasEEFeatureItems=sal_False;
+            bool bHasEEFeatureItems=false;
             SfxItemIter aIter(rSet);
             const SfxPoolItem* pItem=aIter.FirstItem();
             while (!bHasEEFeatureItems && pItem!=NULL)
@@ -1422,7 +1422,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
                 {
                     sal_uInt16 nW=pItem->Which();
                     if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END)
-                        bHasEEFeatureItems=sal_True;
+                        bHasEEFeatureItems=true;
                 }
 
                 pItem=aIter.NextItem();
@@ -1438,7 +1438,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
 #endif
 
         sal_Bool bOnlyEEItems;
-        sal_Bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
+        bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
         // everything selected? -> attributes to the border, too
         // if no EEItems, attributes to the border only
         if (bAllTextSelected || bNoEEItems)
@@ -1593,7 +1593,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin)
 
     if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW)
     {
-        OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,sal_False,NULL);
+        OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,false,NULL);
         pTextEditOutliner->InsertView(pOutlView);
     }
 }
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 01358ec6007f..6dccf8a26312 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -465,7 +465,7 @@ sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal
 {
     sal_Bool bHas=sal_False;
     sal_Bool bOnly=sal_True;
-    sal_Bool bLookOnly=pbOnlyEE!=NULL;
+    bool bLookOnly=pbOnlyEE!=NULL;
     SfxWhichIter aIter(rSet);
     sal_uInt16 nWhich=aIter.FirstWhich();
     while (((bLookOnly && bOnly) || !bHas) && nWhich!=0) {
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 02d9412e948a..a153bdd8f7a4 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -629,11 +629,11 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
     ::sdr::overlay::OverlayObject* pRetval = 0L;
 
     // support bigger sizes
-    sal_Bool bForceBiggerSize(sal_False);
+    bool bForceBiggerSize(false);
 
     if(pHdlList->GetHdlSize() > 3)
     {
-        bForceBiggerSize = sal_True;
+        bForceBiggerSize = true;
     }
 
     if(bForceBiggerSize)
@@ -761,9 +761,9 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const
 Pointer SdrHdl::GetPointer() const
 {
     PointerStyle ePtr=POINTER_MOVE;
-    const sal_Bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
-    const sal_Bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
-    const sal_Bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
+    const bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
+    const bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
+    const bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
     if (bSize && pHdlList!=NULL && (bRot || bDis)) {
         switch (eKind) {
             case HDL_UPLFT: case HDL_UPRGT:
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index cb77ec4ba2ef..04ee1d9285bf 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -87,9 +87,9 @@ public:
     sal_Int32                       nMin;
     sal_Int32                       nMax;
 
-    sal_Bool                        bComment;
-    sal_Bool                        bIsNum;
-    sal_Bool                        bCanNum;
+    bool                            bComment;
+    bool                            bIsNum;
+    bool                            bCanNum;
 
 public:
     ImpItemListRow()
@@ -100,14 +100,14 @@ public:
         nVal(0),
         nMin(0),
         nMax(0),
-        bComment(sal_False),
-        bIsNum(sal_False),
-        bCanNum(sal_False)
+        bComment(false),
+        bIsNum(false),
+        bCanNum(false)
     {}
 
     XubString GetItemTypeStr() const;
-    sal_Bool operator==(const ImpItemListRow& rEntry) const;
-    sal_Bool operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); }
+    bool operator==(const ImpItemListRow& rEntry) const;
+    bool operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); }
 };
 
 XubString ImpItemListRow::GetItemTypeStr() const
@@ -142,7 +142,7 @@ XubString ImpItemListRow::GetItemTypeStr() const
     return aStr;
 }
 
-sal_Bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
+bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
 {
     return (aName.equals(rEntry.aName)
         && aValue.equals(rEntry.aValue)
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 8bb9773c08e0..bd6d3445cb0b 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -323,7 +323,7 @@ const SdrLayer* SdrLayerAdmin::GetLayerPerID(sal_uInt16 nID) const
 SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
 {
     SetOfByte aSet;
-    sal_Bool bDown = (pParent == NULL);
+    bool bDown = (pParent == NULL);
     sal_uInt16 j;
     for (j=0; j<GetLayerCount(); j++)
     {
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index c6bc6f4645bd..12e77d0dc667 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1390,7 +1390,7 @@ void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPer
 {
     sal_Int32 nMul(rVal.GetNumerator());
     sal_Int32 nDiv(rVal.GetDenominator());
-    sal_Bool bNeg(nMul < 0);
+    bool bNeg(nMul < 0);
 
     if(nDiv < 0)
         bNeg = !bNeg;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 3b09919212ae..f593ee488d73 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -519,7 +519,7 @@ sal_Bool SdrMarkView::ImpIsFrameHandles() const
 {
     sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
     sal_Bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
-    sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE;
+    bool bStdDrag=eDragMode==SDRDRAG_MOVE;
     if (nMarkAnz==1 && bStdDrag && bFrmHdl)
     {
         const SdrObject* pObj=GetMarkedObjectByIndex(0);
@@ -559,7 +559,7 @@ void SdrMarkView::SetMarkHandles()
 {
     // remember old focus handle values to search for it again
     const SdrHdl* pSaveOldFocusHdl = aHdl.GetFocusHdl();
-    sal_Bool bSaveOldFocus(sal_False);
+    bool bSaveOldFocus(false);
     sal_uInt32 nSavePolyNum(0L), nSavePointNum(0L);
     SdrHdlKind eSaveKind(HDL_MOVE);
     SdrObject* pSaveObj = NULL;
@@ -569,7 +569,7 @@ void SdrMarkView::SetMarkHandles()
         && pSaveOldFocusHdl->GetObj()->ISA(SdrPathObj)
         && (pSaveOldFocusHdl->GetKind() == HDL_POLY || pSaveOldFocusHdl->GetKind() == HDL_BWGT))
     {
-        bSaveOldFocus = sal_True;
+        bSaveOldFocus = true;
         nSavePolyNum = pSaveOldFocusHdl->GetPolyNum();
         nSavePointNum = pSaveOldFocusHdl->GetPointNum();
         pSaveObj = pSaveOldFocusHdl->GetObj();
@@ -587,8 +587,8 @@ void SdrMarkView::SetMarkHandles()
     if(!areMarkHandlesHidden())
     {
         sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
-        sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE;
-        sal_Bool bSingleTextObjMark=sal_False;
+        bool bStdDrag=eDragMode==SDRDRAG_MOVE;
+        bool bSingleTextObjMark=false;
 
         if (nMarkAnz==1)
         {
@@ -624,7 +624,7 @@ void SdrMarkView::SetMarkHandles()
         {
             Rectangle aRect(GetMarkedObjRect());
             // #i33755#
-            const sal_Bool bHideHandlesWhenInTextEdit(
+            const bool bHideHandlesWhenInTextEdit(
                 ((SdrView*)this)->IsTextEdit()
                 && pMarkedObj
                 && pMarkedObj->ISA(SdrTextObj)
@@ -669,8 +669,8 @@ void SdrMarkView::SetMarkHandles()
                 }
                 else
                 {
-                    sal_Bool bWdt0=aRect.Left()==aRect.Right();
-                    sal_Bool bHgt0=aRect.Top()==aRect.Bottom();
+                    bool bWdt0=aRect.Left()==aRect.Right();
+                    bool bHgt0=aRect.Top()==aRect.Bottom();
                     if (bWdt0 && bHgt0)
                     {
                         aHdl.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT));
@@ -1123,7 +1123,7 @@ void SdrMarkView::CheckMarked()
         SdrObject* pObj=pM->GetMarkedSdrObj();
         SdrPageView* pPV=pM->GetPageView();
         SdrLayerID nLay=pObj->GetLayer();
-        sal_Bool bRaus=!pObj->IsInserted(); // Obj deleted?
+        bool bRaus=!pObj->IsInserted(); // Obj deleted?
         if (!pObj->Is3DObj()) {
             bRaus=bRaus || pObj->GetPage()!=pPV->GetPage();   // Obj suddenly in different Page or Group
         }
@@ -1585,13 +1585,13 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT
 }
 SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const
 {
-    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
-    sal_Bool bBefMrk=(nOptions & SDRSEARCH_BEFOREMARK)!=0;
+    bool bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
+    bool bBefMrk=(nOptions & SDRSEARCH_BEFOREMARK)!=0;
     SdrObject* pRet=NULL;
     rpRootObj=NULL;
     if (pOL!=NULL)
     {
-        sal_Bool bRemap(pOL->GetOwnerObj() && pOL->GetOwnerObj()->ISA(E3dScene));
+        bool bRemap(pOL->GetOwnerObj() && pOL->GetOwnerObj()->ISA(E3dScene));
         E3dScene* pRemapScene = (bRemap ? (E3dScene*)pOL->GetOwnerObj() : 0L);
 
         sal_uIntPtr nObjAnz=pOL->GetObjCount();
@@ -1639,14 +1639,14 @@ sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj,
     if (pnPassNum!=NULL) *pnPassNum=0;
     rpObj=NULL;
     rpPV=NULL;
-    sal_Bool bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0;
-    sal_Bool bMarked=(nOptions & SDRSEARCH_MARKED) !=0;
-    sal_Bool bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0;
-    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+    bool bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0;
+    bool bMarked=(nOptions & SDRSEARCH_MARKED) !=0;
+    bool bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0;
+    bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
 #if OSL_DEBUG_LEVEL > 0
-    sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i.
-    sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i.
-    sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i.
+    bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i.
+    bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i.
+    bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i.
 #endif
     if (nTol<0) nTol=ImpGetHitTolLogic(nTol,NULL);
     Point aPt(rPnt);
@@ -1684,7 +1684,7 @@ sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj,
                 nPgAnz++;
             }
 
-            sal_Bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
+            bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
             if (bExtraPassForWholePage) nPgAnz++; // First search in AktObjList, then on the entire page
             sal_uInt16 nPgNum=bBack ? 0 : nPgAnz;
             while (pHitObj==NULL && (bBack ? nPgNum<nPgAnz : nPgNum>0)) {
@@ -1753,8 +1753,8 @@ sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj,
 sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const
 {
     SortMarkedObjects();
-    sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
-    sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0;
+    bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
+    bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0;
     rpObj=NULL;
     rpPV=NULL;
     if (pnMarkNum!=NULL) *pnMarkNum=CONTAINER_ENTRY_NOTFOUND;
@@ -1970,7 +1970,7 @@ sal_Bool SdrMarkView::EnterMarkedGroup()
 
     if(pPV)
     {
-        sal_Bool bEnter=sal_False;
+        bool bEnter=false;
         for (sal_uInt32 nm(GetMarkedObjectCount()); nm > 0 && !bEnter;)
         {
             nm--;
@@ -1980,7 +1980,7 @@ sal_Bool SdrMarkView::EnterMarkedGroup()
                 if (pObj->IsGroupObject()) {
                     if (pPV->EnterGroup(pObj)) {
                         bRet=sal_True;
-                        bEnter=sal_True;
+                        bEnter=true;
                     }
                 }
             }