sw/source/core/doc/DocumentContentOperationsManager.cxx | 6 +++---
sw/source/core/docnode/node.cxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 210042432462316db196464a83763405acc6b698
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Aug 30 13:56:24 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 30 15:31:16 2022 +0200
use more SwPosition::Assign
part of hiding the internals of SwPosition
Change-Id: I8dfb5e72563d2036b89ebdf49a7b1c29629ada14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139008
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index a53753299f22..1c8489ab95ce 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4444,8 +4444,8 @@ bool
DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam, SwDelet
// If the Node that contained the Cursor has been deleted,
// the Content has to be assigned to the current Content.
- pStt->nContent.Assign( pStt->GetNode().GetContentNode(),
- pStt->GetContentIndex() );
+ if (pStt->GetNode().GetContentNode())
+ pStt->SetContent( pStt->GetContentIndex() );
// If we deleted across Node boundaries we have to correct the PaM,
// because they are in different Nodes now.
@@ -5291,7 +5291,7 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
// If the next node is a start node, then step back: the start node
// has been copied and needs to be in the selection for the undo
if (pCopyPam->GetPoint()->GetNode().IsStartNode())
- pCopyPam->GetPoint()->nNode--;
+ pCopyPam->GetPoint()->Adjust(SwNodeOffset(-1));
}
pCopyPam->Exchange();
commit 0e17717404d147a99d4c1f797298598ba54bb95f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Aug 30 13:28:35 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 30 15:30:55 2022 +0200
SAL_WARN->SAL_INFO in SwContentNode::ChkCondColl
we call this on all nodes, so it's not really a bug
Change-Id: I7bb258e68abf6fb0ced5a46924b715febb79c587
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139036
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 58096ad98047..e8d415d9d1c2 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1999,7 +1999,7 @@ void SwContentNode::ChkCondColl(const SwTextFormatColl*
pColl)
{
if(pColl != GetRegisteredIn())
{
- SAL_WARN("sw.core", "Wrong cond collection, skipping check of Cond
Colls.");
+ SAL_INFO("sw.core", "Not our cond collection, skipping check of Cond
Colls.");
return;
}
if(&GetNodes() != &GetDoc().GetNodes())
