svx: Refactor (sdr) views to access the SdrModel by reference

In SdrPaintView (and subclasses) the mpModel variable is always
the same as the input (reference) model, so there is no need for
that extra variable.

Change the strange and confusing var. name mrSdrModelFromSdrView
(the input reference to SdrModel) to just mrModel and use that in
GetModel(). Change the GetModel() to return a reference instead
of a pointer and reactor the code to accomodate the change.

This gets rid of many nullptr checks for the pointer that the
GetModel() returns and makes the code more simple is some cases.

Change-Id: I18351a417fd82f49262a83de036ec1420a65399c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146373
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index c246aeb9971c..09ccc044a3c4 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -268,7 +268,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
                                 pNewObj->SetLogicRect(aRet);
                             }
                         }
-                        m_pView->AddUndo( m_pView->GetModel()->GetSdrUndoFactory().CreateUndoNewObject( *pNewObj ) );
+                        m_pView->AddUndo(m_pView->GetModel().GetSdrUndoFactory().CreateUndoNewObject(*pNewObj));
                         m_pView->MarkObj( pNewObj.get(), m_pView->GetSdrPageView() );
                         if ( m_xSection.is() && (o3tl::make_unsigned(aRet.getOpenHeight() + aRet.Top()) > m_xSection->getHeight()) )
                             m_xSection->setHeight(aRet.getOpenHeight() + aRet.Top());
@@ -330,7 +330,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
     ::std::vector< uno::Reference<report::XReportComponent> > aCopies;
     aCopies.reserve(nMark);
 
-    SdrUndoFactory& rUndo = m_pView->GetModel()->GetSdrUndoFactory();
+    SdrUndoFactory& rUndo = m_pView->GetModel().GetSdrUndoFactory();
 
     for( size_t i = nMark; i > 0; )
     {
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 996d2530a1e3..e11735bf72ca 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -816,7 +816,7 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification,
             if ( lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification) )
             {
                 const Size aSize(nXMov,nYMov);
-                pView->AddUndo(pView->GetModel()->GetSdrUndoFactory().CreateUndoMoveObject(*pObj,aSize));
+                pView->AddUndo(pView->GetModel().GetSdrUndoFactory().CreateUndoMoveObject(*pObj,aSize));
                 pObj->Move(aSize);
                 aObjRect =   pObj->GetSnapRect();
             }
@@ -838,7 +838,7 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification,
                         [[fallthrough]];
                     case ControlModification::WIDTH_SMALLEST:
                     case ControlModification::HEIGHT_SMALLEST:
-                        pView->AddUndo( pView->GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
+                        pView->AddUndo( pView->GetModel().GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
                         {
                             OObjectBase* pObjBase = dynamic_cast<OObjectBase*>(pObj);
                             OSL_ENSURE(pObjBase,"Where comes this object from?");
@@ -974,9 +974,9 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const tools::Recta
 
             pNewObj->SetLogicRect(_aRect);
             pNewObj->Move(Size(0, aNewPos.Y()));
-            bool bChanged = rView.GetModel()->IsChanged();
+            bool bChanged = rView.GetModel().IsChanged();
             rReportSection.getPage()->InsertObject(pNewObj.get());
-            rView.GetModel()->SetChanged(bChanged);
+            rView.GetModel().SetChanged(bChanged);
             m_aBegDragTempList.push_back(pNewObj.get());
 
             rView.MarkObj( pNewObj.get(), rView.GetSdrPageView() );
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index babf2266b4f5..41893a9a35ed 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -421,7 +421,7 @@ void PropBrw::Update( OSectionView* pNewView )
     {
         if ( m_pView )
         {
-            EndListening( *(m_pView->GetModel()) );
+            EndListening(m_pView->GetModel());
             m_pView = nullptr;
         }
 
@@ -480,7 +480,7 @@ void PropBrw::Update( OSectionView* pNewView )
             implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) );
         }
 
-        StartListening( *(m_pView->GetModel()) );
+        StartListening(m_pView->GetModel());
     }
     catch ( Exception& )
     {
@@ -498,7 +498,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
     {
         if ( m_pView )
         {
-            EndListening( *(m_pView->GetModel()) );
+            EndListening(m_pView->GetModel());
             m_pView = nullptr;
         }