[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx                |    2 +-
 sc/inc/table.hxx                 |    2 +-
 sc/source/core/data/column4.cxx  |    8 ++++----
 sc/source/core/data/document.cxx |    2 +-
 sc/source/core/data/table2.cxx   |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 218ab60cf1dc9a01a8f8bb49c7be1762595d5ffe
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Nov 17 18:35:53 2014 -0500

    Rename these to make it clear that they are only to be called from ...
    
    ScDocument::CopyFromClip.
    
    Change-Id: Ia95b65ca7982735b9c217a7b60d194117d64e774

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6d8b091..5a0f70c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -255,7 +255,7 @@ public:
     void CopyFromClip(
         sc::CopyFromClipContext& rCxt, SCROW nRow1, SCROW nRow2, long nDy, ScColumn& rColumn );
 
-    void StartListeningInArea(
+    void StartListeningFromClip(
         sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, SCROW nRow1, SCROW nRow2 );
 
     void        RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b1e06e1..7d802e3 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -436,7 +436,7 @@ public:
         sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
         SCsCOL nDx, SCsROW nDy, ScTable* pTable );
 
-    void StartListeningInArea(
+    void StartListeningFromClip(
         sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt,
         SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
 
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 925bb4c..40f18bf 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1137,13 +1137,13 @@ bool ScColumn::HasFormulaCell( SCROW nRow1, SCROW nRow2 ) const
 
 namespace {
 
-class StartListeningInAreaHandler
+class StartListeningFromClipHandler
 {
     sc::StartListeningContext& mrStartCxt;
     sc::EndListeningContext& mrEndCxt;
 
 public:
-    StartListeningInAreaHandler( sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt ) :
+    StartListeningFromClipHandler( sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt ) :
         mrStartCxt(rStartCxt), mrEndCxt(rEndCxt) {}
 
     void operator() ( const sc::CellStoreType::value_type& node, size_t nOffset, size_t nDataSize )
@@ -1221,10 +1221,10 @@ private:
 
 }
 
-void ScColumn::StartListeningInArea(
+void ScColumn::StartListeningFromClip(
     sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, SCROW nRow1, SCROW nRow2 )
 {
-    StartListeningInAreaHandler aFunc(rStartCxt, rEndCxt);
+    StartListeningFromClipHandler aFunc(rStartCxt, rEndCxt);
     sc::ProcessBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
 }
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 77e57aa..d6bb230 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2430,7 +2430,7 @@ void ScDocument::StartListeningFromClip( SCCOL nCol1, SCROW nRow1,
         ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
         for (; itr != itrEnd && *itr < nMax; ++itr)
             if (maTabs[*itr])
-                maTabs[*itr]->StartListeningInArea(aStartCxt, aEndCxt, nCol1, nRow1, nCol2, nRow2);
+                maTabs[*itr]->StartListeningFromClip(aStartCxt, aEndCxt, nCol1, nRow1, nCol2, nRow2);
     }
 }
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index b6f1441..6a4647c 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1059,7 +1059,7 @@ void ScTable::SetDirtyFromClip(
             aCol[i].SetDirtyFromClip(nRow1, nRow2, rBroadcastSpans);
 }
 
-void ScTable::StartListeningInArea(
+void ScTable::StartListeningFromClip(
     sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt,
     SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
 {
@@ -1067,7 +1067,7 @@ void ScTable::StartListeningInArea(
     if (nRow2 > MAXROW) nRow2 = MAXROW;
     if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
         for (SCCOL i = nCol1; i <= nCol2; i++)
-            aCol[i].StartListeningInArea(rStartCxt, rEndCxt, nRow1, nRow2);
+            aCol[i].StartListeningFromClip(rStartCxt, rEndCxt, nRow1, nRow2);
 }
 
 void ScTable::CopyToTable(