[Libreoffice-commits] core.git: oox/source sd/source svx/source sw/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 10 05:44:16 UTC 2019
oox/source/drawingml/table/tablecontext.cxx | 2 +-
sd/source/filter/html/buttonset.cxx | 4 ++--
svx/source/dialog/framelinkarray.cxx | 2 +-
svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx | 6 +++---
sw/source/core/doc/doccomp.cxx | 6 +++---
sw/source/core/doc/tblrwcl.cxx | 12 ++++++------
sw/source/core/text/itratr.cxx | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit d55320b95b40770986a7bce9ab96fbd570dd8cb7
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 9 23:16:59 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Oct 10 07:43:42 2019 +0200
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 at redhat.com>
diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx
index c3291b07ba20..3371e105f691 100644
--- a/oox/source/drawingml/table/tablecontext.cxx
+++ b/oox/source/drawingml/table/tablecontext.cxx
@@ -33,7 +33,7 @@ namespace oox { namespace drawingml { namespace table {
TableContext::TableContext( ContextHandler2Helper const & rParent, const ShapePtr& pShapePtr )
: ShapeContext( rParent, ShapePtr(), pShapePtr )
-, mrTableProperties( *pShapePtr->getTableProperties().get() )
+, mrTableProperties( *pShapePtr->getTableProperties() )
{
pShapePtr->setTableType();
}
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index c4b1523d7e59..a6c88b85f367 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -192,7 +192,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButton
{
if( (nSet >= 0) && (nSet < static_cast<int>(maButtons.size())))
{
- ButtonsImpl& rSet = *maButtons[nSet].get();
+ ButtonsImpl& rSet = *maButtons[nSet];
std::vector< Graphic > aGraphics;
@@ -240,7 +240,7 @@ bool ButtonSetImpl::exportButton( int nSet, const OUString& rPath, const OUStrin
{
if( (nSet >= 0) && (nSet < static_cast<int>(maButtons.size())))
{
- ButtonsImpl& rSet = *maButtons[nSet].get();
+ ButtonsImpl& rSet = *maButtons[nSet];
return rSet.copyGraphic( rName, rPath );
}
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index e0a2e93b9376..49bdb3aeacf6 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1235,7 +1235,7 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
if (rLeft.IsUsed())
{
- HelperCreateVerticalEntry(*this, rLeft, nCol, nRow, aOrigin, aX, aY, *aData.get(), true, pForceColor);
+ HelperCreateVerticalEntry(*this, rLeft, nCol, nRow, aOrigin, aX, aY, *aData, true, pForceColor);
}
}
}
diff --git a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
index c2af0c9a69ec..903a75ea2fe0 100644
--- a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
@@ -776,7 +776,7 @@ namespace drawinglayer
{
// decompose all buffered SdrFrameBorderData entries and try to merge them
// to reduce existing number of BorderLinePrimitive2D(s)
- for(const auto& rCandidate : *getFrameBorders().get())
+ for(const auto& rCandidate : *getFrameBorders())
{
// get decomposition on one SdrFrameBorderData entry
Primitive2DContainer aPartial;
@@ -838,7 +838,7 @@ namespace drawinglayer
else
{
// just decompose all buffered SdrFrameBorderData entries, do not try to merge
- for(const auto& rCandidate : *getFrameBorders().get())
+ for(const auto& rCandidate : *getFrameBorders())
{
rCandidate.create2DDecomposition(
aRetval,
@@ -863,7 +863,7 @@ namespace drawinglayer
if(getFrameBorders() && doForceToSingleDiscreteUnit())
{
// detect used minimal non-zero partial border width
- for(const auto& rCandidate : *getFrameBorders().get())
+ for(const auto& rCandidate : *getFrameBorders())
{
mfMinimalNonZeroBorderWidth = getMinimalNonZeroValue(
mfMinimalNonZeroBorderWidth,
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);
}
More information about the Libreoffice-commits
mailing list