summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-09-03 00:27:35 +0200
committerEike Rathke <erack@redhat.com>2015-09-03 12:12:30 +0200
commite65c447cef27ce98a2f66e830ba7f03f1c70a5f6 (patch)
tree4e8f0178db84e4c7284f41bbbead8af975648de5
parentbcfd7f7614251d7904a771b9abbabb3dea3554dd (diff)
revert an unmaintainable dead end approach
back to the drawing board.. This reverts commit 4185c2a66137ffa0b0476421f8ef3d4f4a89b805. This reverts commit be7b9220e8f59673a69bbb98f784c4118a08d249. This reverts commit 17a74558c48bd1496d122231777b9a7e63a1252a. Partially reverts commit 92fbe21b85bcd5c3a6fe1c9674cadd357da0d982 for the ScDocShellModificator dtor part. Change-Id: If4199b57c6e7301bc87a9c10b8864b6b086d1300
-rw-r--r--sc/source/ui/docshell/docsh.cxx18
-rw-r--r--sc/source/ui/inc/docsh.hxx6
2 files changed, 0 insertions, 24 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 84dff202b936..c9c6b7029f53 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3067,19 +3067,6 @@ ScDocShellModificator::ScDocShellModificator( ScDocShell& rDS )
ScDocShellModificator::~ScDocShellModificator()
{
ScDocument& rDoc = rDocShell.GetDocument();
- if (!maContentModified.empty() && !rDoc.IsImportingXML())
- {
- /* TODO: it would be nice to join a pending list with the next
- * instance further down in the stack so that only the last one
- * popped actually does the work. For that we'd need a parent or keep a
- * master list at ScDocShell. */
- for (size_t i=0, n = maContentModified.size(); i < n; ++i)
- {
- const ScRange* p = maContentModified[i];
- if (p)
- rDoc.RefreshTableColumnNames( *p);
- }
- }
rDoc.SetAutoCalcShellDisabled( bAutoCalcShellDisabled );
if ( !bAutoCalcShellDisabled && rDocShell.IsDocumentModifiedPending() )
rDocShell.SetDocumentModified(); // last one shuts off the lights
@@ -3106,11 +3093,6 @@ void ScDocShellModificator::SetDocumentModified()
}
}
-void ScDocShellModificator::AppendCellContentModified( const ScRange& rRange )
-{
- maContentModified.Join( rRange);
-}
-
bool ScDocShell::IsChangeRecording() const
{
ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack();
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 3c4c7d9aa42b..ce1d3125e144 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -453,7 +453,6 @@ typedef tools::SvRef<ScDocShell> ScDocShellRef;
*/
class SC_DLLPUBLIC ScDocShellModificator
{
- ScRangeList maContentModified;
ScDocShell& rDocShell;
boost::scoped_ptr<ScRefreshTimerProtector> mpProtector;
bool bAutoCalcShellDisabled;
@@ -466,11 +465,6 @@ public:
ScDocShellModificator( ScDocShell& );
~ScDocShellModificator();
void SetDocumentModified();
-
- /** Append a cell position/range to the list of modified cell
- contents. Used in dtor to call maintenance on data structures
- that depend on cell content. */
- void AppendCellContentModified( const ScRange& rRange );
};
//#i97876# Spreadsheet data changes are not notified