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

[Noel Grandin (via logerrit)]

 sw/inc/docary.hxx               |    8 +++-----
 sw/source/core/doc/docredln.cxx |    6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 51c639d1e85bc62fb8dec28faeed31ddb30c2854
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri May 24 13:03:09 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri May 24 15:32:03 2019 +0200

    expand SwRangeRedlinePtr
    
    it is just obfuscating the code
    
    Change-Id: I72491d4861d06bd032bb014314c18605967aa3c9
    Reviewed-on: https://gerrit.libreoffice.org/72824
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 56ba62c654d4..0e025c996bfc 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -322,8 +322,6 @@ struct CompareSwRedlineTable
 // Notification type for notifying about redlines to LOK clients
 enum class RedlineNotification { Add, Remove, Modify };
 
-typedef SwRangeRedline* SwRangeRedlinePtr;
-
 class SwRedlineTable
 {
 public:
@@ -338,9 +336,9 @@ public:
     bool Contains(const SwRangeRedline* p) const { return maVector.find(const_cast<SwRangeRedline*>(p)) != maVector.end(); }
     size_type GetPos(const SwRangeRedline* p) const;
 
-    bool Insert(SwRangeRedlinePtr& p);
-    bool Insert(SwRangeRedlinePtr& p, size_type& rInsPos);
-    bool InsertWithValidRanges(SwRangeRedlinePtr& p, size_type* pInsPos = nullptr);
+    bool Insert(SwRangeRedline*& p);
+    bool Insert(SwRangeRedline*& p, size_type& rInsPos);
+    bool InsertWithValidRanges(SwRangeRedline*& p, size_type* pInsPos = nullptr);
 
     void Remove( size_type nPos );
     void Remove( const SwRangeRedline* p );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 4e764327ac85..36734eaa0c61 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -422,7 +422,7 @@ void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, SwRangeRe
     }
 }
 
-bool SwRedlineTable::Insert(SwRangeRedlinePtr& p)
+bool SwRedlineTable::Insert(SwRangeRedline*& p)
 {
     if( p->HasValidRange() )
     {
@@ -435,7 +435,7 @@ bool SwRedlineTable::Insert(SwRangeRedlinePtr& p)
     return InsertWithValidRanges( p );
 }
 
-bool SwRedlineTable::Insert(SwRangeRedlinePtr& p, size_type& rP)
+bool SwRedlineTable::Insert(SwRangeRedline*& p, size_type& rP)
 {
     if( p->HasValidRange() )
     {
@@ -557,7 +557,7 @@ std::vector<SwRangeRedline*> GetAllValidRanges(std::unique_ptr<SwRangeRedline> p
 
 } // namespace sw
 
-bool SwRedlineTable::InsertWithValidRanges(SwRangeRedlinePtr& p, size_type* pInsPos)
+bool SwRedlineTable::InsertWithValidRanges(SwRangeRedline*& p, size_type* pInsPos)
 {
     bool bAnyIns = false;
     std::vector<SwRangeRedline*> const redlines(