diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-16 15:12:13 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-17 08:08:22 +0000 |
commit | c23757066d914ac04a39abcd72279c7c3d8919d5 (patch) | |
tree | e391a6f83a6e6ad89785e79cc39d0f503ed5fa53 /svx/source/svdraw | |
parent | f6a0ed20ba79c72788fa029fe99572e2d5a666e7 (diff) |
loplugin:constantparam in svx
Change-Id: I50fa7e4c7525d2f8107a11d8203957a47680eb80
Reviewed-on: https://gerrit.libreoffice.org/23303
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 15 | ||||
-rw-r--r-- | svx/source/svdraw/svddrgv.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdglue.cxx | 22 | ||||
-rw-r--r-- | svx/source/svdraw/svditer.cxx | 12 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 10 | ||||
-rw-r--r-- | svx/source/svdraw/svdmrkv1.cxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 40 | ||||
-rw-r--r-- | svx/source/svdraw/svdoedge.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdopath.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdundo.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdviter.cxx | 8 |
13 files changed, 65 insertions, 71 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index c5e2bfd3657a..56fa3eadcf3e 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -203,13 +203,12 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntrySdrObject::createPri SdrDragEntryPrimitive2DSequence::SdrDragEntryPrimitive2DSequence( - const drawinglayer::primitive2d::Primitive2DContainer& rSequence, - bool bAddToTransparent) + const drawinglayer::primitive2d::Primitive2DContainer& rSequence) : SdrDragEntry(), maPrimitive2DSequence(rSequence) { // add parts to transparent overlay stuff if necessary - setAddToTransparent(bAddToTransparent); + setAddToTransparent(true); } SdrDragEntryPrimitive2DSequence::~SdrDragEntryPrimitive2DSequence() @@ -351,11 +350,11 @@ void SdrDragMethod::createSdrDragEntries() } } -void SdrDragMethod::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) +void SdrDragMethod::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact) { // add full object drag; Clone() at the object has to work // for this - addSdrDragEntry(new SdrDragEntrySdrObject(rOriginal, rObjectContact, bModify)); + addSdrDragEntry(new SdrDragEntrySdrObject(rOriginal, rObjectContact, true/*bModify*/)); } void SdrDragMethod::createSdrDragEntries_SolidDrag() @@ -399,7 +398,7 @@ void SdrDragMethod::createSdrDragEntries_SolidDrag() { // add full object drag; Clone() at the object has to work // for this - createSdrDragEntryForSdrObject(*pCandidate, rOC, true); + createSdrDragEntryForSdrObject(*pCandidate, rOC); } if(bAddWireframe) @@ -1472,7 +1471,7 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const } -void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/) +void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact) { // for SdrDragMove, use current Primitive2DContainer of SdrObject visualization // in given ObjectContact directly @@ -1484,7 +1483,7 @@ void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr // here we want the complete primitive sequence without visible clippings rObjectContact.resetViewPort(); - addSdrDragEntry(new SdrDragEntryPrimitive2DSequence(rVOC.getPrimitive2DSequenceHierarchy(aDisplayInfo), true)); + addSdrDragEntry(new SdrDragEntryPrimitive2DSequence(rVOC.getPrimitive2DSequenceHierarchy(aDisplayInfo))); } void SdrDragMove::applyCurrentTransformationToSdrObject(SdrObject& rTarget) diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index acc28ac97c0c..950b0cc2426a 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -661,7 +661,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point } else { - mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj, true); + mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj); } if(bClosed0 != pMarkedPath->IsClosedObj()) diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 946b26dd7966..27f9f68afa25 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -350,20 +350,16 @@ sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const return nRet; } -sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, sal_uInt16 nId0) const +sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const { - sal_uInt16 nCount=GetCount(); - sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; - sal_uInt16 nNum=bBack ? 0 : nCount; - while ((bBack ? nNum<nCount : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) { - if (!bBack) nNum--; - const SdrGluePoint* pGP=GetObject(nNum); - if (bNext) { - if (pGP->GetId()==nId0) bNext=false; - } else { - if (pGP->IsHit(rPnt,rOut,pObj)) nRet=nNum; - } - if (bBack) nNum++; + sal_uInt16 nCount = GetCount(); + sal_uInt16 nRet = SDRGLUEPOINT_NOTFOUND; + sal_uInt16 nNum = nCount; + while ((nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) { + nNum--; + const SdrGluePoint* pGP = GetObject(nNum); + if (pGP->IsHit(rPnt,rOut,pObj)) + nRet = nNum; } return nRet; } diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index e26465dcc13c..3ed440278c17 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -32,17 +32,17 @@ SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, bo Reset(); } -SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode, bool bReverse) +SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode) : mnIndex(0L), - mbReverse(bReverse) + mbReverse(false) { ImpProcessObjectList(rObjList, eMode, bUseZOrder); Reset(); } -SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, bool bReverse ) +SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode ) : mnIndex(0L), - mbReverse(bReverse) + mbReverse(false) { if ( dynamic_cast<const SdrObjGroup*>(&rObj) != nullptr ) ImpProcessObjectList(*rObj.GetSubList(), eMode, true); @@ -51,9 +51,9 @@ SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, bool b Reset(); } -SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, bool bReverse ) +SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode ) : mnIndex(0L), - mbReverse(bReverse) + mbReverse(false) { ImpProcessMarkList(rMarkList, eMode); Reset(); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index d899f81943e8..06988245b3cb 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -236,22 +236,22 @@ SdrModel::SdrModel(): maMaPag(), maPages() { - ImpCtor(nullptr, nullptr, false, LOADREFCOUNTS); + ImpCtor(nullptr, nullptr, false, false); } -SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts): +SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable): maMaPag(), maPages() { - ImpCtor(pPool,pPers,bUseExtColorTable, bLoadRefCounts); + ImpCtor(pPool,pPers,bUseExtColorTable, false/*bLoadRefCounts*/); } -SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts): +SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable): maMaPag(), maPages(), aTablePath(rPath) { - ImpCtor(pPool,pPers,bUseExtColorTable, bLoadRefCounts); + ImpCtor(pPool,pPers,bUseExtColorTable, false/*bLoadRefCounts*/); } SdrModel::~SdrModel() diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 68201cc02e78..5b1239a92c70 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -468,7 +468,6 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark) bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV) const { - sal_uInt16 nId0=rnId; rpObj=nullptr; rpPV=nullptr; rnId=0; if (!IsGluePointEditMode()) return false; OutputDevice* pOut=mpActualOutDev.get(); @@ -484,7 +483,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=nullptr) { - sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,false/*bBack*/,false/*bNext*/,nId0); + sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj); if (nNum!=SDRGLUEPOINT_NOTFOUND) { // #i38892# diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index e8ee5c3c1d16..6ae45eb021b7 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2162,47 +2162,47 @@ static void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem else rAttr.Put(rItem); } -void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const +void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr) const { const Rectangle& rSnap=GetSnapRect(); const Rectangle& rLogic=GetLogicRect(); - lcl_SetItem(rAttr,bMerge,SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, IsMoveProtect())); - lcl_SetItem(rAttr,bMerge,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect())); - lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable())); - lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible())); - lcl_SetItem(rAttr,bMerge,makeSdrRotateAngleItem(GetRotateAngle())); - lcl_SetItem(rAttr,bMerge,SdrShearAngleItem(GetShearAngle())); - lcl_SetItem(rAttr,bMerge,SdrOneSizeWidthItem(rSnap.GetWidth()-1)); - lcl_SetItem(rAttr,bMerge,SdrOneSizeHeightItem(rSnap.GetHeight()-1)); - lcl_SetItem(rAttr,bMerge,SdrOnePositionXItem(rSnap.Left())); - lcl_SetItem(rAttr,bMerge,SdrOnePositionYItem(rSnap.Top())); + lcl_SetItem(rAttr,false,SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, IsMoveProtect())); + lcl_SetItem(rAttr,false,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect())); + lcl_SetItem(rAttr,false,SdrObjPrintableItem(IsPrintable())); + lcl_SetItem(rAttr,false,SdrObjVisibleItem(IsVisible())); + lcl_SetItem(rAttr,false,makeSdrRotateAngleItem(GetRotateAngle())); + lcl_SetItem(rAttr,false,SdrShearAngleItem(GetShearAngle())); + lcl_SetItem(rAttr,false,SdrOneSizeWidthItem(rSnap.GetWidth()-1)); + lcl_SetItem(rAttr,false,SdrOneSizeHeightItem(rSnap.GetHeight()-1)); + lcl_SetItem(rAttr,false,SdrOnePositionXItem(rSnap.Left())); + lcl_SetItem(rAttr,false,SdrOnePositionYItem(rSnap.Top())); if (rLogic.GetWidth()!=rSnap.GetWidth()) { - lcl_SetItem(rAttr,bMerge,SdrLogicSizeWidthItem(rLogic.GetWidth()-1)); + lcl_SetItem(rAttr,false,SdrLogicSizeWidthItem(rLogic.GetWidth()-1)); } if (rLogic.GetHeight()!=rSnap.GetHeight()) { - lcl_SetItem(rAttr,bMerge,SdrLogicSizeHeightItem(rLogic.GetHeight()-1)); + lcl_SetItem(rAttr,false,SdrLogicSizeHeightItem(rLogic.GetHeight()-1)); } OUString aName(GetName()); if (!aName.isEmpty()) { - lcl_SetItem(rAttr, bMerge, makeSdrObjectNameItem(aName)); + lcl_SetItem(rAttr, false, makeSdrObjectNameItem(aName)); } - lcl_SetItem(rAttr,bMerge,SdrLayerIdItem(GetLayer())); + lcl_SetItem(rAttr,false,SdrLayerIdItem(GetLayer())); const SdrLayerAdmin* pLayAd=pPage!=nullptr ? &pPage->GetLayerAdmin() : pModel!=nullptr ? &pModel->GetLayerAdmin() : nullptr; if (pLayAd!=nullptr) { const SdrLayer* pLayer=pLayAd->GetLayerPerID(GetLayer()); if (pLayer!=nullptr) { - lcl_SetItem(rAttr,bMerge,SdrLayerNameItem(pLayer->GetName())); + lcl_SetItem(rAttr,false,SdrLayerNameItem(pLayer->GetName())); } } Point aRef1(rSnap.Center()); Point aRef2(aRef1); aRef2.Y()++; - lcl_SetItem(rAttr,bMerge,SdrTransformRef1XItem(aRef1.X())); - lcl_SetItem(rAttr,bMerge,SdrTransformRef1YItem(aRef1.Y())); - lcl_SetItem(rAttr,bMerge,SdrTransformRef2XItem(aRef2.X())); - lcl_SetItem(rAttr,bMerge,SdrTransformRef2YItem(aRef2.Y())); + lcl_SetItem(rAttr,false,SdrTransformRef1XItem(aRef1.X())); + lcl_SetItem(rAttr,false,SdrTransformRef1YItem(aRef1.Y())); + lcl_SetItem(rAttr,false,SdrTransformRef2XItem(aRef2.X())); + lcl_SetItem(rAttr,false,SdrTransformRef2YItem(aRef2.Y())); } SfxStyleSheet* SdrObject::GetStyleSheet() const diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 1b768d3921e9..0eb55d639978 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -67,7 +67,7 @@ void SdrObjConnection::ResetVars() bAutoCorner=false; } -bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const +bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP) const { bool bRet = false; if (pObj!=nullptr) { // one object has to be docked already! @@ -88,7 +88,7 @@ bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const } } } - if (bRet && bSetAbsPos) { + if (bRet) { Point aPt(rGP.GetAbsolutePos(*pObj)); aPt+=aObjOfs; rGP.SetPos(aPt); @@ -777,14 +777,14 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& sal_uInt16 nCount2=bAuto2 ? 4 : 1; for (sal_uInt16 nNum1=0; nNum1<nCount1; nNum1++) { if (bAuto1) rCon1.nConId=nNum1; - if (bCon1 && rCon1.TakeGluePoint(aGP1,true)) { + if (bCon1 && rCon1.TakeGluePoint(aGP1)) { aPt1=aGP1.GetPos(); nEsc1=aGP1.GetEscDir(); if (nEsc1==SdrEscapeDirection::SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs); } for (sal_uInt16 nNum2=0; nNum2<nCount2; nNum2++) { if (bAuto2) rCon2.nConId=nNum2; - if (bCon2 && rCon2.TakeGluePoint(aGP2,true)) { + if (bCon2 && rCon2.TakeGluePoint(aGP2)) { aPt2=aGP2.GetPos(); nEsc2=aGP2.GetEscDir(); if (nEsc2==SdrEscapeDirection::SMART) nEsc2=ImpCalcEscAngle(rCon2.pObj,aPt2-rCon2.aObjOfs); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 6d4ab3dd650f..7bf0ffe0991e 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -779,9 +779,9 @@ SdrOle2Obj::SdrOle2Obj( bool bFrame_ ) : { } -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_ ) : +SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect) : SdrRectObj(rNewRect), - mpImpl(new SdrOle2ObjImpl(bFrame_, rNewObjRef)) + mpImpl(new SdrOle2ObjImpl(false/*bFrame_*/, rNewObjRef)) { mpImpl->aPersistName = rNewObjName; diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index e18b68b0c77d..789c51f44de7 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2534,13 +2534,13 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum) } } -sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHideHim) +sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj) { sal_uInt32 nNewHdl; if(bNewObj) { - nNewHdl = NbcInsPoint(0L, rPos, true, bHideHim); + nNewHdl = NbcInsPoint(0L, rPos, true, true/*bHideHim*/); } else { @@ -2559,7 +2559,7 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHid nPolyIndex += GetPathPoly().getB2DPolygon(a).count(); } - nNewHdl = NbcInsPoint(nPolyIndex, rPos, false, bHideHim); + nNewHdl = NbcInsPoint(nPolyIndex, rPos, false, true/*bHideHim*/); } ImpForceKind(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 38a30208286f..37e81e7cdffe 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1413,7 +1413,7 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum) } } -void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 /*n*/) +void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) { rStr = ImpGetResStr(nStrCacheID); } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 66816b426960..24c633939c9b 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -360,7 +360,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if( pTableObj ) { sal_Int32 nX = 0, nY = 0; - switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY, 0 ) ) + switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY ) ) { case sdr::table::SDRTABLEHIT_CELL: eHit = SDRHIT_CELL; @@ -381,7 +381,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if( pTableObj ) { sal_Int32 nX = 0, nY = 0; - switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY, 0 ) ) + switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY ) ) { case sdr::table::SDRTABLEHIT_CELL: eHit = SDRHIT_CELL; diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index a34a9e510689..3a11f869bcba 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -37,22 +37,22 @@ void SdrViewIter::ImpInitVars() } -SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) +SdrViewIter::SdrViewIter(const SdrPage* pPage) { mpPage = pPage; mpModel = (pPage) ? pPage->GetModel() : nullptr; mpObject = nullptr; - mbNoMasterPage = bNoMasterPage; + mbNoMasterPage = false; ImpInitVars(); } -SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) +SdrViewIter::SdrViewIter(const SdrObject* pObject) { mpObject = pObject; mpModel = (pObject) ? pObject->GetModel() : nullptr; mpPage = (pObject) ? pObject->GetPage() : nullptr; - mbNoMasterPage = bNoMasterPage; + mbNoMasterPage = false; if(!mpModel || !mpPage) { |