summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-11-17 18:35:53 -0500
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-11-17 18:35:53 -0500
commit218ab60cf1dc9a01a8f8bb49c7be1762595d5ffe (patch)
tree6f60f4a9a9544ffbf74395d5ab724708dce2976f
parentUse group-area listeners during copy & paste if we can. (diff)
downloadcore-218ab60cf1dc9a01a8f8bb49c7be1762595d5ffe.tar.gz
core-218ab60cf1dc9a01a8f8bb49c7be1762595d5ffe.zip
Rename these to make it clear that they are only to be called from ...
ScDocument::CopyFromClip. Change-Id: Ia95b65ca7982735b9c217a7b60d194117d64e774
-rw-r--r--sc/inc/column.hxx2
-rw-r--r--sc/inc/table.hxx2
-rw-r--r--sc/source/core/data/column4.cxx8
-rw-r--r--sc/source/core/data/document.cxx2
-rw-r--r--sc/source/core/data/table2.cxx4
5 files changed, 9 insertions, 9 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6d8b09199582..5a0f70cf5b3f 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 b1e06e102f28..7d802e3295e2 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 925bb4cabb56..40f18bf0e01e 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 77e57aaad333..d6bb230d1a69 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 b6f1441898c1..6a4647caa0a9 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(