summaryrefslogtreecommitdiff
path: root/reportdesign/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-19 09:21:45 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-19 09:04:21 +0100
commite354b3fb803397fef2a6309fc0cf714a315bedee (patch)
tree41cdbb9a00a786e1e4bed2a2f23e509fcaebb6a2 /reportdesign/source
parent238d65f6823012ddc6820a82ace89ab4be43243e (diff)
loplugin:redundantpointerops add some more smart pointer types
Change-Id: Ia7f3441404d8d2e5de501e70da496b6fdc6c9a4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90728 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/source')
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx4
-rw-r--r--reportdesign/source/ui/inc/SectionWindow.hxx6
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx8
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx22
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx2
5 files changed, 21 insertions, 21 deletions
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index a42cd269aa98..47e8d715464c 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -81,8 +81,8 @@ namespace rptui
Point getThumbPos() const { return Point(m_aHScroll->GetThumbPos(),m_aVScroll->GetThumbPos())/*m_aScrollOffset*/; }
void setTotalSize(sal_Int32 _nWidth, sal_Int32 _nHeight);
const Size& getTotalSize() const { return m_aTotalPixelSize; }
- ScrollBar& GetHScroll() { return *m_aHScroll.get(); }
- ScrollBar& GetVScroll() { return *m_aVScroll.get(); }
+ ScrollBar& GetHScroll() { return *m_aHScroll; }
+ ScrollBar& GetVScroll() { return *m_aVScroll; }
// forwards
void SetMode( DlgEdMode _eMode );
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 726e4d513c84..9197073f41a1 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -106,9 +106,9 @@ namespace rptui
virtual ~OSectionWindow() override;
virtual void dispose() override;
- OStartMarker& getStartMarker() { return *m_aStartMarker.get(); }
- OReportSection& getReportSection() { return *m_aReportSection.get(); }
- OEndMarker& getEndMarker() { return *m_aEndMarker.get(); }
+ OStartMarker& getStartMarker() { return *m_aStartMarker; }
+ OReportSection& getReportSection() { return *m_aReportSection; }
+ OEndMarker& getEndMarker() { return *m_aEndMarker; }
OViewsWindow* getViewsWindow() { return m_pParent; }
void setCollapsed(bool _bCollapsed);
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 6d9f2006effc..08c7d22729d7 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -54,8 +54,8 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)
{
SetMapMode( MapMode( MapUnit::Map100thMM ) );
- impl_initScrollBar( *m_aHScroll.get() );
- impl_initScrollBar( *m_aVScroll.get() );
+ impl_initScrollBar( *m_aHScroll );
+ impl_initScrollBar( *m_aVScroll );
m_aReportWindow->SetMapMode( MapMode( MapUnit::Map100thMM ) );
m_aReportWindow->Show();
@@ -174,11 +174,11 @@ Size OScrollWindowHelper::ResizeScrollBars()
{
Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100);
const sal_Int32 nNewWidth = aOutPixSz.Width() - aOffset.X() - static_cast<long>(aStartWidth);
- lcl_setScrollBar(nNewWidth,Point( static_cast<long>(aStartWidth) + aOffset.X(), aOutPixSz.Height() ), Size( nNewWidth, nScrSize ), *m_aHScroll.get());
+ lcl_setScrollBar(nNewWidth,Point( static_cast<long>(aStartWidth) + aOffset.X(), aOutPixSz.Height() ), Size( nNewWidth, nScrSize ), *m_aHScroll);
}
{
const sal_Int32 nNewHeight = aOutPixSz.Height() - m_aReportWindow->getRulerHeight();
- lcl_setScrollBar(nNewHeight,Point( aOutPixSz.Width(), m_aReportWindow->getRulerHeight() ), Size( nScrSize,nNewHeight), *m_aVScroll.get());
+ lcl_setScrollBar(nNewHeight,Point( aOutPixSz.Width(), m_aReportWindow->getRulerHeight() ), Size( nScrSize,nNewHeight), *m_aVScroll);
}
return aOutPixSz;
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index cc16aedf9d59..d26735462811 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -68,9 +68,9 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep
m_aStartMarker->setCollapsedHdl(LINK(this,OSectionWindow,Collapsed));
m_aStartMarker->zoom(rMapMode.GetScaleX());
- setZoomFactor(rMapMode.GetScaleX(), *m_aReportSection.get());
- setZoomFactor(rMapMode.GetScaleX(), *m_aSplitter.get());
- setZoomFactor(rMapMode.GetScaleX(), *m_aEndMarker.get());
+ setZoomFactor(rMapMode.GetScaleX(), *m_aReportSection);
+ setZoomFactor(rMapMode.GetScaleX(), *m_aSplitter);
+ setZoomFactor(rMapMode.GetScaleX(), *m_aEndMarker);
m_aSplitter->Show();
m_aStartMarker->Show();
@@ -310,9 +310,9 @@ void OSectionWindow::zoom(const Fraction& _aZoom)
setZoomFactor(_aZoom,*this);
m_aStartMarker->zoom(_aZoom);
- setZoomFactor(_aZoom, *m_aReportSection.get());
- setZoomFactor(_aZoom, *m_aSplitter.get());
- setZoomFactor(_aZoom, *m_aEndMarker.get());
+ setZoomFactor(_aZoom, *m_aReportSection);
+ setZoomFactor(_aZoom, *m_aSplitter);
+ setZoomFactor(_aZoom, *m_aEndMarker);
Invalidate();
}
@@ -375,19 +375,19 @@ void OSectionWindow::scrollChildren(long _nX)
MapMode aMapMode( m_aReportSection->GetMapMode() );
const Point aOld = aMapMode.GetOrigin();
- lcl_setOrigin(*m_aReportSection.get(), aDelta.X(), 0);
+ lcl_setOrigin(*m_aReportSection, aDelta.X(), 0);
aMapMode = m_aReportSection->GetMapMode();
const Point aNew = aMapMode.GetOrigin();
const Point aDiff = aOld - aNew;
{
- lcl_scroll(*m_aReportSection.get(), aDiff);
+ lcl_scroll(*m_aReportSection, aDiff);
}
- lcl_scroll(*m_aEndMarker.get(), m_aEndMarker->PixelToLogic(Point(_nX,0)));
+ lcl_scroll(*m_aEndMarker, m_aEndMarker->PixelToLogic(Point(_nX,0)));
- lcl_setOrigin(*m_aSplitter.get(),_nX, 0);
- lcl_scroll(*m_aSplitter.get(),aDiff);
+ lcl_setOrigin(*m_aSplitter,_nX, 0);
+ lcl_scroll(*m_aSplitter,aDiff);
}
} // rptui
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 0e19ed712ba6..9ef341bacd1c 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -295,7 +295,7 @@ void OStartMarker::zoom(const Fraction& _aZoom)
{
setZoomFactor(_aZoom,*this);
m_aVRuler->SetZoom(_aZoom);
- setZoomFactor(_aZoom, *m_aText.get());
+ setZoomFactor(_aZoom, *m_aText);
Resize();
Invalidate();
}