diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-07 15:45:13 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-08 08:26:23 +0200 |
commit | 231e16d9091c2d318d99c2f2eb985311e7138127 (patch) | |
tree | 7b8d30778cdb696cdf4c0ec80a58f6b488e4d5e5 /sfx2 | |
parent | e47172ce2ac486b909ee8f46380dca8efedb6a24 (diff) |
loplugin:redundantpointerops simplify *p.get()
Change-Id: I12517651fb3f777fd08e384992bb3e84b340ad85
Reviewed-on: https://gerrit.libreoffice.org/80382
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/childwinimpl.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/shell.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 12 |
5 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx index 447df7319f8e..d04f0c2b4089 100644 --- a/sfx2/source/appl/childwinimpl.cxx +++ b/sfx2/source/appl/childwinimpl.cxx @@ -27,12 +27,12 @@ size_t SfxChildWinContextArr_Impl::size() const const SfxChildWinContextFactory& SfxChildWinContextArr_Impl::operator []( size_t i ) const { - return *maData[i].get(); + return *maData[i]; } SfxChildWinContextFactory& SfxChildWinContextArr_Impl::operator []( size_t i ) { - return *maData[i].get(); + return *maData[i]; } void SfxChildWinContextArr_Impl::push_back( std::unique_ptr<SfxChildWinContextFactory> p ) @@ -47,12 +47,12 @@ size_t SfxChildWinFactArr_Impl::size() const const SfxChildWinFactory& SfxChildWinFactArr_Impl::operator []( size_t i ) const { - return *maData[i].get(); + return *maData[i]; } SfxChildWinFactory& SfxChildWinFactArr_Impl::operator []( size_t i ) { - return *maData[i].get(); + return *maData[i]; } void SfxChildWinFactArr_Impl::push_back( std::unique_ptr<SfxChildWinFactory> p ) diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index e8aabfda8fdb..65116d668add 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -277,7 +277,7 @@ namespace // first Matcher created for this factory aImplArr.push_back(std::make_unique<SfxFilterMatcher_Impl>(aName)); - return *aImplArr.back().get(); + return *aImplArr.back(); } } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 0381423f1034..4543f70571a6 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -92,7 +92,7 @@ public: SfxFoundCache_Impl& operator[] ( size_t i ) { - return *maData[i].get(); + return *maData[i]; } size_t size() const diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index ca312f61a0d9..85c84d632df5 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -570,7 +570,7 @@ void SfxShell::SetVerbs(const css::uno::Sequence < css::embed::VerbDescriptor >& if (!pImpl->aSlotArr.empty()) { - SfxSlot& rSlot = *pImpl->aSlotArr[0].get(); + SfxSlot& rSlot = *pImpl->aSlotArr[0]; pNewSlot->pNextSlot = rSlot.pNextSlot; rSlot.pNextSlot = pNewSlot; } diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index a71c91514e23..77b9ea1f4fd9 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -384,7 +384,7 @@ void SfxSplitWindow::Split() sal_uInt16 nCount = maDockArr.size(); for ( sal_uInt16 n=0; n<nCount; n++ ) { - const SfxDock_Impl& rD = *maDockArr[n].get(); + const SfxDock_Impl& rD = *maDockArr[n]; if ( rD.pWin ) { const sal_uInt16 nId = rD.nType; @@ -440,7 +440,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize sal_uInt16 nCount = maDockArr.size(); for ( sal_uInt16 n=0; n<nCount; n++ ) { - SfxDock_Impl& rDock = *maDockArr[n].get(); + SfxDock_Impl& rDock = *maDockArr[n]; if ( rDock.bNewLine ) { // The window opens a new line @@ -520,7 +520,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow const *pDockWin, bool b sal_uInt16 nCount = maDockArr.size(); for ( sal_uInt16 n=0; n<nCount; n++ ) { - const SfxDock_Impl& rDock = *maDockArr[n].get(); + const SfxDock_Impl& rDock = *maDockArr[n]; if ( rDock.nType == pDockWin->GetType() ) { if ( rDock.bNewLine && n<nCount-1 ) @@ -589,7 +589,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize sal_uInt16 nInsertPos = 0; for ( sal_uInt16 n=0; n<nCount; n++ ) { - SfxDock_Impl& rD = *maDockArr[n].get(); + SfxDock_Impl& rD = *maDockArr[n]; if (rD.pWin) { @@ -742,7 +742,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl const * pDock, sal_uInt16 nCount = maDockArr.size(); for ( sal_uInt16 n=0; n<nCount; ++n ) { - const SfxDock_Impl& rD = *maDockArr[n].get(); + const SfxDock_Impl& rD = *maDockArr[n]; if ( rD.pWin ) { const sal_uInt16 nId = rD.nType; @@ -798,7 +798,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow const * pDockWin, bool bHide sal_uInt16 nCount = maDockArr.size(); for ( sal_uInt16 n=0; n<nCount; n++ ) { - SfxDock_Impl& rDock = *maDockArr[n].get(); + SfxDock_Impl& rDock = *maDockArr[n]; if ( rDock.nType == pDockWin->GetType() ) { rDock.pWin = nullptr; |