[Libreoffice-commits] core.git: 2 commits - sw/source
Caolán McNamara
caolanm at redhat.com
Fri Oct 21 07:59:37 UTC 2016
sw/source/core/text/frmcrsr.cxx | 3 +--
sw/source/filter/ww8/ww8par2.cxx | 2 +-
sw/source/filter/ww8/ww8par6.cxx | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 851703f2c525ee4192d9837998ce3e9f66f92012
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 20 20:34:27 2016 +0100
coverity#1371270 Missing move assignment operator
Change-Id: I47438184a9a895b7aa9889ae1308fda29434a774
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 130c710..959dd44 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -1198,8 +1198,7 @@ bool SwTextFrame::UnitDown_(SwPaM *pPam, const SwTwips nOffset,
// We make sure that we move down.
if( nTmpOfst <= nStart && ! bFirstOfDouble )
nTmpOfst = nStart + 1;
- pPam->GetPoint()->nContent =
- SwIndex( const_cast<SwTextFrame*>(this)->GetTextNode(), nTmpOfst );
+ pPam->GetPoint()->nContent.Assign(const_cast<SwTextFrame*>(this)->GetTextNode(), nTmpOfst);
if ( IsVertical() )
const_cast<SwTextFrame*>(this)->SwapWidthAndHeight();
commit 0454c5717fe2fd0c96ff5b09b4c3a5b71ef8d862
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 20 20:33:21 2016 +0100
coverity#1371301 Missing move assignment operator
Change-Id: Ic6f11b8e39bafd401f4b261fa8aad66d8782ebeb
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 5f5c4f8..817139d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2337,7 +2337,7 @@ void wwSectionManager::PrependedInlineNode(const SwPosition &rPos,
OSL_ENSURE(!maSegments.empty(),
"should not be possible, must be at least one segment");
if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode))
- maSegments.back().maStart = SwNodeIndex(rNode);
+ maSegments.back().maStart.Assign(rNode);
}
void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 5f3afa8..11850a0 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2408,7 +2408,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
void wwSectionManager::JoinNode(const SwPosition &rPos, const SwNode &rNode)
{
if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode))
- maSegments.back().maStart = SwNodeIndex(rNode);
+ maSegments.back().maStart.Assign(rNode);
}
bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr)
More information about the Libreoffice-commits
mailing list