[Libreoffice-commits] core.git: sw/inc sw/source

[Noel Grandin (via logerrit)]

 sw/inc/node.hxx                       |    2 +-
 sw/source/core/docnode/ndtbl.cxx      |    6 +++---
 sw/source/filter/inc/msfilter.hxx     |    2 +-
 sw/source/filter/ww8/writerhelper.cxx |    6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 4a07e9e31a6cd93958f94354a15325af098c93b8
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Oct 7 19:41:56 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Oct 7 22:03:37 2022 +0200

    use more SwPosition
    
    part of the process of hiding the internals of SwPosition
    
    Change-Id: I3107ad6cb8636125ec98342ec4ed69d2c703a74b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141090
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index e6176ce5b91b..1ac709ca2965 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -525,7 +525,7 @@ public:
 
     /// Creates the frms for the table node (i.e. the TabFrames).
     /// pIdxBehind is optional parameter.
-    void MakeOwnFrames(SwNodeIndex* pIdxBehind = nullptr);
+    void MakeOwnFrames(SwPosition* pIdxBehind = nullptr);
 
     /** Method deletes all views of document for the node.
        The content frames are removed from the respective layout. */
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 341bc2188af8..6b384f9a18a0 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2377,17 +2377,17 @@ void 
SwTableNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx)
 /**
  * Create a TableFrame for every Shell and insert before the corresponding 
ContentFrame.
  */
-void SwTableNode::MakeOwnFrames(SwNodeIndex* pIdxBehind)
+void SwTableNode::MakeOwnFrames(SwPosition* pIdxBehind)
 {
     SwNode *pNd = GetNodes().FindPrvNxtFrameNode( *this, EndOfSectionNode() );
     if( !pNd )
     {
         if (pIdxBehind)
-            *pIdxBehind = *this;
+            pIdxBehind->Assign(*this);
         return;
     }
     if (pIdxBehind)
-        *pIdxBehind = *pNd;
+        pIdxBehind->Assign(*pNd);
 
     SwFrame *pFrame( nullptr );
     SwLayoutFrame *pUpper( nullptr );
diff --git a/sw/source/filter/inc/msfilter.hxx 
b/sw/source/filter/inc/msfilter.hxx
index 1a3626bdd521..70ef8d12aa80 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -289,7 +289,7 @@ namespace sw
             explicit InsertedTablesManager(const SwDoc &rDoc);
         private:
             bool mbHasRoot;
-            std::map<std::unique_ptr<InsertedTableListener>, SwNodeIndex*> 
maTables;
+            std::map<std::unique_ptr<InsertedTableListener>, SwPosition*> 
maTables;
         };
 
         void MoveAttrFieldmarkInserted(SwFltPosition& rMkPos, SwFltPosition& 
rPtPos, const SwPosition& rPos);
diff --git a/sw/source/filter/ww8/writerhelper.cxx 
b/sw/source/filter/ww8/writerhelper.cxx
index ebb9e855f593..8b14ceb70b79 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -887,7 +887,7 @@ namespace sw
 
                     if (pFrameFormat != nullptr)
                     {
-                        SwNodeIndex *pIndex = aTable.second;
+                        SwPosition *pIndex = aTable.second;
                         pTable->DelFrames();
                         pTable->MakeOwnFrames(pIndex);
                     }
@@ -899,11 +899,11 @@ namespace sw
         {
             if (!mbHasRoot)
                 return;
-            //Associate this tablenode with this after position, replace an 
//old
+            //Associate this tablenode with this after position, replace an old
             //node association if necessary
             maTables.emplace(
                     std::unique_ptr<InsertedTableListener>(new 
InsertedTableListener(rTableNode)),
-                    &(rPaM.GetPoint()->nNode));
+                    rPaM.GetPoint());
         }
     }