sc/source/ui/drawfunc/fuconarc.cxx | 8 ++++---- sc/source/ui/drawfunc/fuconcustomshape.cxx | 6 +++--- sc/source/ui/drawfunc/fuconpol.cxx | 6 +++--- sc/source/ui/drawfunc/fuconrec.cxx | 8 ++++---- sc/source/ui/drawfunc/fuconstr.cxx | 4 ++-- sc/source/ui/drawfunc/fuconuno.cxx | 6 +++--- sc/source/ui/drawfunc/fudraw.cxx | 4 ++-- sc/source/ui/drawfunc/fuins1.cxx | 8 ++++---- sc/source/ui/drawfunc/fuins2.cxx | 12 ++++++------ sc/source/ui/drawfunc/fupoor.cxx | 4 ++-- sc/source/ui/drawfunc/fusel.cxx | 4 ++-- sc/source/ui/drawfunc/futext.cxx | 14 +++++++------- sc/source/ui/drawfunc/futext2.cxx | 4 ++-- sc/source/ui/drawfunc/futext3.cxx | 2 +- sc/source/ui/inc/fuconarc.hxx | 2 +- sc/source/ui/inc/fuconcustomshape.hxx | 2 +- sc/source/ui/inc/fuconpol.hxx | 2 +- sc/source/ui/inc/fuconrec.hxx | 2 +- sc/source/ui/inc/fuconstr.hxx | 2 +- sc/source/ui/inc/fuconuno.hxx | 2 +- sc/source/ui/inc/fudraw.hxx | 2 +- sc/source/ui/inc/fuinsert.hxx | 8 ++++---- sc/source/ui/inc/fupoor.hxx | 4 ++-- sc/source/ui/inc/fusel.hxx | 2 +- sc/source/ui/inc/futext.hxx | 2 +- sc/source/ui/view/tabview5.cxx | 2 +- sc/source/ui/view/tabvwsh2.cxx | 18 +++++++++--------- sc/source/ui/view/tabvwshb.cxx | 8 ++++---- 28 files changed, 74 insertions(+), 74 deletions(-)
New commits: commit 058ba67b89174d3c364974b5a519d407c5d108a1 Author: Xisco Fauli <[email protected]> AuthorDate: Wed May 28 17:07:35 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed May 28 19:53:36 2025 +0200 FuPoor: pass SdrModel by ref Change-Id: I7f928dfef0d4136e25fd8933254d759fc6812990 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185974 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 77deb115fac8..ec184240cf53 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -28,8 +28,8 @@ #include <osl/diagnose.h> FuConstArc::FuConstArc(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) - : FuConstruct(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, const SfxRequest& rReq) + : FuConstruct(rViewSh, pWin, pViewP, rDoc, rReq) { } @@ -118,7 +118,7 @@ rtl::Reference<SdrObject> FuConstArc::CreateDefaultObject(const sal_uInt16 nID, // case SID_DRAW_CIRCLECUT: rtl::Reference<SdrObject> pObj(SdrObjFactory::MakeNewObject( - *pDrDoc, + rDrDoc, pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier())); @@ -136,7 +136,7 @@ rtl::Reference<SdrObject> FuConstArc::CreateDefaultObject(const sal_uInt16 nID, pObj->SetLogicRect(aRect); - SfxItemSet aAttr(pDrDoc->GetItemPool()); + SfxItemSet aAttr(rDrDoc.GetItemPool()); aAttr.Put(makeSdrCircStartAngleItem(9000_deg100)); aAttr.Put(makeSdrCircEndAngleItem(0_deg100)); diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index f6b8af4aab7f..7e1eb0961f88 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -34,8 +34,8 @@ using namespace com::sun::star; -FuConstCustomShape::FuConstCustomShape(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, const SfxRequest& rReq ) - : FuConstruct(rViewSh, pWin, pViewP, pDoc, rReq) +FuConstCustomShape::FuConstCustomShape(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel& rDoc, const SfxRequest& rReq ) + : FuConstruct(rViewSh, pWin, pViewP, rDoc, rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); if ( pArgs ) @@ -114,7 +114,7 @@ void FuConstCustomShape::Deactivate() rtl::Reference<SdrObject> FuConstCustomShape::CreateDefaultObject(const sal_uInt16 /* nID */, const tools::Rectangle& rRectangle) { rtl::Reference<SdrObject> pObj(SdrObjFactory::MakeNewObject( - *pDrDoc, + rDrDoc, pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier())); diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 7290b5186ad7..d9f09189bf98 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -29,8 +29,8 @@ #include <basegfx/point/b2dpoint.hxx> FuConstPolygon::FuConstPolygon(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) - : FuConstruct(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, const SfxRequest& rReq) + : FuConstruct(rViewSh, pWin, pViewP, rDoc, rReq) { } @@ -186,7 +186,7 @@ rtl::Reference<SdrObject> FuConstPolygon::CreateDefaultObject(const sal_uInt16 n // case SID_DRAW_FREELINE_NOFILL: rtl::Reference<SdrObject> pObj(SdrObjFactory::MakeNewObject( - *pDrDoc, + rDrDoc, pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier())); diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 2244003db843..1829bccfc969 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -34,8 +34,8 @@ #include <basegfx/point/b2dpoint.hxx> FuConstRectangle::FuConstRectangle(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) - : FuConstruct(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, const SfxRequest& rReq) + : FuConstruct(rViewSh, pWin, pViewP, rDoc, rReq) { } @@ -180,7 +180,7 @@ void FuConstRectangle::Deactivate() rtl::Reference<SdrObject> FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const tools::Rectangle& rRectangle) { rtl::Reference<SdrObject> pObj(SdrObjFactory::MakeNewObject( - *pDrDoc, + rDrDoc, pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier())); @@ -271,7 +271,7 @@ rtl::Reference<SdrObject> FuConstRectangle::CreateDefaultObject(const sal_uInt16 } } - SfxItemSet aAttr(pDrDoc->GetItemPool()); + SfxItemSet aAttr(rDrDoc.GetItemPool()); SetLineEnds(aAttr, *pObj, nID); pObj->SetMergedItemSet(aAttr); } diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 717bb3db7a5c..7f18781588f8 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -33,8 +33,8 @@ #define SC_MAXDRAGMOVE 3 FuConstruct::FuConstruct(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) - : FuDraw(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, const SfxRequest& rReq) + : FuDraw(rViewSh, pWin, pViewP, rDoc, rReq) { } diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index e3c8f0b4d70e..6bf8150b16f8 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -24,8 +24,8 @@ #include <svx/svxids.hrc> FuConstUnoControl::FuConstUnoControl(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) - : FuConstruct(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, const SfxRequest& rReq) + : FuConstruct(rViewSh, pWin, pViewP, rDoc, rReq) , nInventor(SdrInventor::Unknown) , nIdentifier(SdrObjKind::NONE) { @@ -105,7 +105,7 @@ rtl::Reference<SdrObject> FuConstUnoControl::CreateDefaultObject(const sal_uInt1 // case SID_FM_CREATE_CONTROL: rtl::Reference<SdrObject> pObj(SdrObjFactory::MakeNewObject( - *pDrDoc, + rDrDoc, pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier())); diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 4da9a3db26cd..e352fce10c89 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -57,8 +57,8 @@ void collectUIInformation( const OUString& aevent ) // base class for draw module specific functions FuDraw::FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) - : FuPoor(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, const SfxRequest& rReq) + : FuPoor(rViewSh, pWin, pViewP, rDoc, rReq) , aNewPointer(PointerStyle::Arrow) , aOldPointer(PointerStyle::Arrow) { diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 728865a43f4d..b0a59dc2db1c 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -267,9 +267,9 @@ static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, FuInsertGraphic::FuInsertGraphic( ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, + SdrModel& rDoc, SfxRequest& rReq ) - : FuPoor(rViewSh, pWin, pViewP, pDoc, rReq) + : FuPoor(rViewSh, pWin, pViewP, rDoc, rReq) { const SfxItemSet* pReqArgs = rReq.GetArgs(); const SfxStringItem* pGraphicItem; @@ -387,9 +387,9 @@ FuInsertGraphic::~FuInsertGraphic() FuInsertMedia::FuInsertMedia( ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, + SdrModel& rDoc, const SfxRequest& rReq ) : - FuPoor(rViewSh, pWin, pViewP, pDoc, rReq) + FuPoor(rViewSh, pWin, pViewP, rDoc, rReq) { #if HAVE_FEATURE_AVMEDIA OUString aURL; diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index b0143dab0a53..cec343f4bc60 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -216,8 +216,8 @@ void lcl_ChartInit(const uno::Reference <embed::XEmbeddedObject>& xObj, ScViewDa } FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, SfxRequest& rReq) - : FuPoor(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, SfxRequest& rReq) + : FuPoor(rViewSh, pWin, pViewP, rDoc, rReq) { if( ! rReq.IsAPI() ) rReq.Done(); @@ -354,7 +354,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* aPnt.AdjustX( -(aSize.Width()) ); // move position to left edge tools::Rectangle aRect (aPnt, aSize); rtl::Reference<SdrOle2Obj> pObj = new SdrOle2Obj( - *pDoc, // TTTT should be reference + rDoc, aObjRef, aName, aRect); @@ -410,8 +410,8 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* } FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, SfxRequest& rReq, const Link<css::ui::dialogs::DialogClosedEvent*, void>& rLink) - : FuPoor(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, SfxRequest& rReq, const Link<css::ui::dialogs::DialogClosedEvent*, void>& rLink) + : FuPoor(rViewSh, pWin, pViewP, rDoc, rReq) { const SfxItemSet* pReqArgs = rReq.GetArgs(); @@ -595,7 +595,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawV tools::Rectangle aRect (aStart, aSize); rtl::Reference<SdrOle2Obj> pObj = new SdrOle2Obj( - *pDoc, // TTTT should be reference + rDoc, svt::EmbeddedObjectRef(xObj, nAspect), aName, aRect); diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 1c1aecbb4b2a..1785a19c0fd0 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -33,11 +33,11 @@ #include <svx/sdrhittesthelper.hxx> FuPoor::FuPoor(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) : + SdrModel& rDoc, const SfxRequest& rReq) : pView(pViewP), rViewShell(rViewSh), pWindow(pWin), - pDrDoc(pDoc), + rDrDoc(rDoc), aSfxRequest(rReq), aScrollTimer("sc FuPoor aScrollTimer"), aDragTimer("sc FuPoor aDragTimer"), diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 6e5375c01a5b..d6b95662c2d4 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -56,8 +56,8 @@ using namespace com::sun::star; FuSelection::FuSelection(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) - : FuDraw(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, const SfxRequest& rReq) + : FuDraw(rViewSh, pWin, pViewP, rDoc, rReq) { } diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 3826e04fe474..ce3b1d71dfe8 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -101,8 +101,8 @@ static void lcl_UpdateHyphenator( Outliner& rOutliner, const SdrObject* pObj ) } FuText::FuText(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq) - : FuConstruct(rViewSh, pWin, pViewP, pDoc, rReq) + SdrModel& rDoc, const SfxRequest& rReq) + : FuConstruct(rViewSh, pWin, pViewP, rDoc, rReq) { } @@ -396,7 +396,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); // set needed attributes for scrolling - SfxItemSetFixed<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST> aItemSet( pDrDoc->GetItemPool()); + SfxItemSetFixed<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST> aItemSet( rDrDoc.GetItemPool()); aItemSet.Put( makeSdrTextAutoGrowWidthItem( false ) ); aItemSet.Put( makeSdrTextAutoGrowHeightItem( false ) ); @@ -419,7 +419,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); if(auto pText = DynCastSdrTextObj( pObj)) { - SfxItemSet aSet(pDrDoc->GetItemPool()); + SfxItemSet aSet(rDrDoc.GetItemPool()); pText->SetVerticalWriting(true); @@ -628,7 +628,7 @@ rtl::Reference<SdrObject> FuText::CreateDefaultObject(const sal_uInt16 nID, cons // case SID_DRAW_NOTEEDIT: rtl::Reference<SdrObject> pObj(SdrObjFactory::MakeNewObject( - *pDrDoc, + rDrDoc, pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier())); @@ -649,7 +649,7 @@ rtl::Reference<SdrObject> FuText::CreateDefaultObject(const sal_uInt16 nID, cons if(bVertical) { - SfxItemSet aSet(pDrDoc->GetItemPool()); + SfxItemSet aSet(rDrDoc.GetItemPool()); aSet.Put(makeSdrTextAutoGrowWidthItem(true)); aSet.Put(makeSdrTextAutoGrowHeightItem(false)); @@ -661,7 +661,7 @@ rtl::Reference<SdrObject> FuText::CreateDefaultObject(const sal_uInt16 nID, cons if(bMarquee) { - SfxItemSetFixed<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST> aSet(pDrDoc->GetItemPool()); + SfxItemSetFixed<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST> aSet(rDrDoc.GetItemPool()); aSet.Put( makeSdrTextAutoGrowWidthItem( false ) ); aSet.Put( makeSdrTextAutoGrowHeightItem( false ) ); diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index 8f30cb4a6f86..795c6866ef51 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -27,7 +27,7 @@ std::unique_ptr<SdrOutliner> FuText::MakeOutliner() { ScViewData& rViewData = rViewShell.GetViewData(); - std::unique_ptr<SdrOutliner> pOutl = SdrMakeOutliner(OutlinerMode::OutlineObject, *pDrDoc); + std::unique_ptr<SdrOutliner> pOutl = SdrMakeOutliner(OutlinerMode::OutlineObject, rDrDoc); rViewData.UpdateOutlinerFlags(*pOutl); @@ -36,7 +36,7 @@ std::unique_ptr<SdrOutliner> FuText::MakeOutliner() // #i10426# The ref device isn't set to the EditEngine before SdrBeginTextEdit now, // so the device must be taken from the model here. - OutputDevice* pRef = pDrDoc->GetRefDevice(); + OutputDevice* pRef = rDrDoc.GetRefDevice(); if (pRef && pRef != pWindow->GetOutDev()) pRef->SetMapMode(MapMode(MapUnit::Map100thMM)); diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 1ec00b328dfa..999ade29e55c 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -51,7 +51,7 @@ void FuText::StopEditMode() ScViewData& rViewData = rViewShell.GetViewData(); ScDocument& rDoc = rViewData.GetDocument(); ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer(); - OSL_ENSURE( pDrawLayer && (pDrawLayer == pDrDoc), "FuText::StopEditMode - missing or different drawing layers" ); + OSL_ENSURE( pDrawLayer && (pDrawLayer == &rDrDoc), "FuText::StopEditMode - missing or different drawing layers" ); ScAddress aNotePos; ScPostIt* pNote = nullptr; diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index a330840ed078..f75676112bc2 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -26,7 +26,7 @@ class FuConstArc : public FuConstruct { public: FuConstArc(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuConstArc() override; // Mouse- & Key-Events diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index b491b48fe5e6..be6db00cb48e 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -29,7 +29,7 @@ class SAL_DLLPUBLIC_RTTI FuConstCustomShape : public FuConstruct public: FuConstCustomShape(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuConstCustomShape() override; // Mouse- & Key-Events diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index 8cebc3b03a76..1356edcadbc5 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -26,7 +26,7 @@ class FuConstPolygon : public FuConstruct { public: FuConstPolygon(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuConstPolygon() override; // Mouse- & Key-Events diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index 865ad5b2b425..7f0604d09d54 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -26,7 +26,7 @@ class FuConstRectangle : public FuConstruct { public: FuConstRectangle(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuConstRectangle() override; // Mouse- & Key-Events diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index a9076ee3ead8..791488c6fe5d 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -28,7 +28,7 @@ class SAL_DLLPUBLIC_RTTI FuConstruct : public FuDraw { public: FuConstruct(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuConstruct() override; // Mouse- & Key-Events diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index a1034c3ed4b6..5d16f36da486 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -33,7 +33,7 @@ class SAL_DLLPUBLIC_RTTI FuConstUnoControl final : public FuConstruct public: FuConstUnoControl(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuConstUnoControl() override; // Mouse- & Key-Events diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 0fdd6f9e88f1..3f196449f30a 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -31,7 +31,7 @@ protected: PointerStyle aOldPointer; public: - FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, + FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuDraw() override; diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index 3018d66fecd1..1675dc73df2c 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -27,7 +27,7 @@ class FuInsertGraphic : public FuPoor { public: FuInsertGraphic(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq); + SdrModel& rDoc, SfxRequest& rReq); virtual ~FuInsertGraphic() override; }; @@ -35,14 +35,14 @@ class FuInsertOLE : public FuPoor { public: FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq); + SdrModel& rDoc, SfxRequest& rReq); }; class FuInsertChart : public FuPoor { public: FuInsertChart( ScTabViewShell& pViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq, + SdrModel& rDoc, SfxRequest& rReq, const Link<css::ui::dialogs::DialogClosedEvent*, void>& rLink); }; @@ -50,7 +50,7 @@ class FuInsertMedia : public FuPoor { public: FuInsertMedia(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuInsertMedia() override; }; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 79e1bf86db33..073b4c81c606 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -42,7 +42,7 @@ protected: ScDrawView* pView; ScTabViewShell& rViewShell; VclPtr<vcl::Window> pWindow; - SdrModel* pDrDoc; + SdrModel& rDrDoc; SfxRequest aSfxRequest; @@ -63,7 +63,7 @@ private: bool mbSelectionHasChanged; public: FuPoor(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuPoor(); // see member diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index fcb5815630da..f667d4ca0aaf 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -28,7 +28,7 @@ class FuSelection : public FuDraw { public: FuSelection(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq ); + SdrModel& rDoc, const SfxRequest& rReq ); virtual ~FuSelection() override; // Mouse- & Key-Events diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index fc8e75dc15c0..bb01d5580d4a 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -28,7 +28,7 @@ class FuText : public FuConstruct { public: FuText(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, const SfxRequest& rReq); + SdrModel& rDoc, const SfxRequest& rReq); virtual ~FuText() override; diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 6f623cf151ae..a792e6749173 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -252,7 +252,7 @@ void ScTabView::MakeDrawView( TriState nForceDesignMode ) } SfxRequest aSfxRequest(SID_OBJECT_SELECT, SfxCallMode::SLOT, aViewData.GetViewShell()->GetPool()); SetDrawFuncPtr(new FuSelection(*aViewData.GetViewShell(), GetActiveWin(), pDrawView.get(), - pLayer,aSfxRequest)); + *pLayer,aSfxRequest)); // used when switching back from page preview: restore saved design mode state // (otherwise, keep the default from the draw view ctor) diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 545f8ce8841a..3aa9ff0a101d 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -89,7 +89,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( nNewId == SID_DRAW_CHART ) { // #i71254# directly insert a chart instead of drawing its output rectangle - FuInsertChart(*this, pWin, pView, &rModel, rReq, LINK( this, ScTabViewShell, DialogClosedHdl )); + FuInsertChart(*this, pWin, pView, rModel, rReq, LINK( this, ScTabViewShell, DialogClosedHdl )); return; } @@ -217,7 +217,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) case SID_OBJECT_SELECT: // not always switch back if(rMarkList.GetMarkCount() == 0) SetDrawShell(bEx); - pTabView->SetDrawFuncPtr(new FuSelection(*this, pWin, pView, &rModel, aNewReq)); + pTabView->SetDrawFuncPtr(new FuSelection(*this, pWin, pView, rModel, aNewReq)); break; case SID_DRAW_LINE: @@ -232,13 +232,13 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) case SID_DRAW_RECT: case SID_DRAW_ELLIPSE: case SID_DRAW_MEASURELINE: - pTabView->SetDrawFuncPtr(new FuConstRectangle(*this, pWin, pView, &rModel, aNewReq)); + pTabView->SetDrawFuncPtr(new FuConstRectangle(*this, pWin, pView, rModel, aNewReq)); bCreateDirectly = comphelper::LibreOfficeKit::isActive(); break; case SID_DRAW_CAPTION: case SID_DRAW_CAPTION_VERTICAL: - pTabView->SetDrawFuncPtr(new FuConstRectangle(*this, pWin, pView, &rModel, aNewReq)); + pTabView->SetDrawFuncPtr(new FuConstRectangle(*this, pWin, pView, rModel, aNewReq)); pView->SetFrameDragSingles( false ); rBindings.Invalidate( SID_BEZIER_EDIT ); break; @@ -251,26 +251,26 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) case SID_DRAW_BEZIER_FILL: case SID_DRAW_FREELINE: case SID_DRAW_FREELINE_NOFILL: - pTabView->SetDrawFuncPtr(new FuConstPolygon(*this, pWin, pView, &rModel, aNewReq)); + pTabView->SetDrawFuncPtr(new FuConstPolygon(*this, pWin, pView, rModel, aNewReq)); break; case SID_DRAW_ARC: case SID_DRAW_PIE: case SID_DRAW_CIRCLECUT: - pTabView->SetDrawFuncPtr(new FuConstArc(*this, pWin, pView, &rModel, aNewReq)); + pTabView->SetDrawFuncPtr(new FuConstArc(*this, pWin, pView, rModel, aNewReq)); break; case SID_DRAW_TEXT: case SID_DRAW_TEXT_VERTICAL: case SID_DRAW_TEXT_MARQUEE: case SID_DRAW_NOTEEDIT: - pTabView->SetDrawFuncPtr(new FuText(*this, pWin, pView, &rModel, aNewReq)); + pTabView->SetDrawFuncPtr(new FuText(*this, pWin, pView, rModel, aNewReq)); bCreateDirectly = comphelper::LibreOfficeKit::isActive(); break; case SID_FM_CREATE_CONTROL: SetDrawFormShell(true); - pTabView->SetDrawFuncPtr(new FuConstUnoControl(*this, pWin, pView, &rModel, aNewReq)); + pTabView->SetDrawFuncPtr(new FuConstUnoControl(*this, pWin, pView, rModel, aNewReq)); eFormObjKind = eNewFormObjKind; break; @@ -282,7 +282,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) case SID_DRAWTBX_CS_STAR : case SID_DRAW_CS_ID : { - pTabView->SetDrawFuncPtr(new FuConstCustomShape(*this, pWin, pView, &rModel, aNewReq)); + pTabView->SetDrawFuncPtr(new FuConstCustomShape(*this, pWin, pView, rModel, aNewReq)); bCreateDirectly = comphelper::LibreOfficeKit::isActive(); diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 74657a7bee60..67887bd10104 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -392,17 +392,17 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) switch ( nSlot ) { case SID_INSERT_GRAPHIC: - FuInsertGraphic(*this, pWin, pView, &rModel, rReq); + FuInsertGraphic(*this, pWin, pView, rModel, rReq); // shell is set in MarkListHasChanged break; case SID_INSERT_AVMEDIA: - FuInsertMedia(*this, pWin, pView, &rModel, rReq); + FuInsertMedia(*this, pWin, pView, rModel, rReq); // shell is set in MarkListHasChanged break; case SID_INSERT_DIAGRAM: - FuInsertChart(*this, pWin, pView, &rModel, rReq, LINK( this, ScTabViewShell, DialogClosedHdl )); + FuInsertChart(*this, pWin, pView, rModel, rReq, LINK( this, ScTabViewShell, DialogClosedHdl )); if (comphelper::LibreOfficeKit::isActive()) rDocSh.SetModified(); break; @@ -410,7 +410,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) case SID_INSERT_OBJECT: case SID_INSERT_SMATH: case SID_INSERT_FLOATINGFRAME: - FuInsertOLE(*this, pWin, pView, &rModel, rReq); + FuInsertOLE(*this, pWin, pView, rModel, rReq); break; case SID_INSERT_SIGNATURELINE:
