summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-09 23:16:59 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-10 07:43:42 +0200
commitd55320b95b40770986a7bce9ab96fbd570dd8cb7 (patch)
treeddbda2967793f014a4076063d9f13733c5e82368 /sw
parentf9569785dd513b9b2f1d7c8c687fed285b0ad280 (diff)
More loplugin:redundantpointerops
...same as 7d361e96c9ea822790db21806e9fc05279423833 "loplugin:redundantpointerops" (that were presumably missed by that commit because I only pulled 682fdbf1312cf6ca70fe209bf4d7051dad8f5008 "loplugin:redundantpointerops check other pointer types" halfway through my local build) Change-Id: I1497e4fca2046cbcd107bb2ac5ed6f41bd68de98 Reviewed-on: https://gerrit.libreoffice.org/80569 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/doccomp.cxx6
-rw-r--r--sw/source/core/doc/tblrwcl.cxx12
-rw-r--r--sw/source/core/text/itratr.cxx4
3 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index f516d1ddc8cf..e730f141ec5f 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1856,8 +1856,8 @@ long SwDoc::CompareDoc( const SwDoc& rDoc )
for (auto& a : aComparisons)
{
- CompareData& rD0 = *a.first.get();
- CompareData& rD1 = *a.second.get();
+ CompareData& rD0 = *a.first;
+ CompareData& rD1 = *a.second;
rD1.CompareLines( rD0 );
nRet |= rD1.ShowDiffs( rD0 );
}
@@ -1869,7 +1869,7 @@ long SwDoc::CompareDoc( const SwDoc& rDoc )
for (auto& a : aComparisons)
{
- CompareData& rD1 = *a.second.get();
+ CompareData& rD1 = *a.second;
rD1.SetRedlinesToDoc( !bDocWasModified );
}
getIDocumentState().SetModified();
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index f6a42078861e..30dbf907a327 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1692,7 +1692,7 @@ static void lcl_CalcNewWidths(const FndLines_t& rFndLines, CpyPara& rPara)
// selected cells
for( size_t nLine = 0; nLine < nLineCount; ++nLine )
{
- std::vector< sal_uLong > &rWidth = (*rPara.pWidths.get())[ nLine ];
+ std::vector< sal_uLong > &rWidth = (*rPara.pWidths)[ nLine ];
const FndLine_ *pFndLine = rFndLines[ nLine ].get();
if( pFndLine && !pFndLine->GetBoxes().empty() )
{
@@ -1743,7 +1743,7 @@ static void lcl_CalcNewWidths(const FndLines_t& rFndLines, CpyPara& rPara)
{
for( size_t nLine = 0; nLine < nLineCount; ++nLine )
{
- std::vector< sal_uLong > &rWidth = (*rPara.pWidths.get())[ nLine ];
+ std::vector< sal_uLong > &rWidth = (*rPara.pWidths)[ nLine ];
const size_t nCount = rWidth.size();
if( nCount > 2 )
{
@@ -1775,10 +1775,10 @@ static void lcl_CopyBoxToDoc(FndBox_ const& rFndBox, CpyPara *const pCpyPara)
if( pCpyPara->pTableNd->GetTable().IsNewModel() )
{
if( pCpyPara->nBoxIdx == 1 )
- nDummy1 = (*pCpyPara->pWidths.get())[pCpyPara->nLnIdx][0];
- nRealSize = (*pCpyPara->pWidths.get())[pCpyPara->nLnIdx][pCpyPara->nBoxIdx++];
- if( pCpyPara->nBoxIdx == (*pCpyPara->pWidths.get())[pCpyPara->nLnIdx].size()-1 )
- nDummy2 = (*pCpyPara->pWidths.get())[pCpyPara->nLnIdx][pCpyPara->nBoxIdx];
+ nDummy1 = (*pCpyPara->pWidths)[pCpyPara->nLnIdx][0];
+ nRealSize = (*pCpyPara->pWidths)[pCpyPara->nLnIdx][pCpyPara->nBoxIdx++];
+ if( pCpyPara->nBoxIdx == (*pCpyPara->pWidths)[pCpyPara->nLnIdx].size()-1 )
+ nDummy2 = (*pCpyPara->pWidths)[pCpyPara->nLnIdx][pCpyPara->nBoxIdx];
}
else
{
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 02f44d5cc74e..a27701186c1a 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -532,7 +532,7 @@ static bool CanSkipOverRedline(
// store the effective items & compare all at the end
SfxItemSet const& rSet((pAttr->Which() == RES_TXTATR_CHARFMT)
? static_cast<SfxItemSet const&>(pAttr->GetCharFormat().GetCharFormat()->GetAttrSet())
- : *pAttr->GetAutoFormat().GetStyleHandle().get());
+ : *pAttr->GetAutoFormat().GetStyleHandle());
InsertCharAttrs(activeCharAttrsStart, rSet);
}
break;
@@ -622,7 +622,7 @@ static bool CanSkipOverRedline(
}
SfxItemSet const& rSet((pAttr->Which() == RES_TXTATR_CHARFMT)
? static_cast<SfxItemSet const&>(pAttr->GetCharFormat().GetCharFormat()->GetAttrSet())
- : *pAttr->GetAutoFormat().GetStyleHandle().get());
+ : *pAttr->GetAutoFormat().GetStyleHandle());
InsertCharAttrs(activeCharAttrsEnd, rSet);
}