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

[Libreoffice Gerrit user]

 sc/inc/column.hxx               |    2 +-
 sc/source/core/data/column3.cxx |    3 +--
 sc/source/core/data/table2.cxx  |    3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 761a969465671a2047a5c1deafdb0df16f89463f
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Aug 13 09:35:39 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 14 11:13:17 2018 +0200

    loplugin:returnconstant in ScColumn
    
    Change-Id: I105d07da6e1a9259a7b833a1259c0e992e35a03d
    Reviewed-on: https://gerrit.libreoffice.org/58954
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index bae7372fd915..3692a3a188ed 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -265,7 +265,7 @@ public:
         SCROW nRow1, SCROW nRow2, const SvNumberFormatterMergeMap& rMap, ScColumn& rDestCol );
 
     void CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn& rDestCol );
-    bool InitBlockPosition( sc::ColumnBlockPosition& rBlockPos );
+    void InitBlockPosition( sc::ColumnBlockPosition& rBlockPos );
     void InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const;
 
     void DeleteBeforeCopyFromClip(
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 9a1a5622a608..350b22912091 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -787,13 +787,12 @@ void ScColumn::DeleteArea(
     }
 }
 
-bool ScColumn::InitBlockPosition( sc::ColumnBlockPosition& rBlockPos )
+void ScColumn::InitBlockPosition( sc::ColumnBlockPosition& rBlockPos )
 {
     rBlockPos.miBroadcasterPos = maBroadcasters.begin();
     rBlockPos.miCellNotePos = maCellNotes.begin();
     rBlockPos.miCellTextAttrPos = maCellTextAttrs.begin();
     rBlockPos.miCellPos = maCells.begin();
-    return true;
 }
 
 void ScColumn::InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index d2aa2a0a4d6e..749aa4fe28e6 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -676,7 +676,8 @@ bool ScTable::InitColumnBlockPosition( sc::ColumnBlockPosition& rBlockPos, SCCOL
     if (!ValidCol(nCol))
         return false;
 
-    return aCol[nCol].InitBlockPosition(rBlockPos);
+    aCol[nCol].InitBlockPosition(rBlockPos);
+    return true;
 }
 
 void ScTable::CopyFromClip(