summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-05-13 21:25:38 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-05-20 20:13:05 -0400
commit1d3d107a764ebfab38c50fda04e79f36763b2b12 (patch)
tree485e68ab258fe55893b2031a4fc298167bb82076 /sc/inc
parent410154e76c229a862b43a9eee6ffc44b845f6ffd (diff)
Keep track of empty broadcaster segments, and delete them all in one go.
This massively speeds up the deletion of a large group of adjacent formula cells. As an example, on machine, deletion of formula cells over B2:B109101 (109100 cells in total) got reduced from 4.7 seconds to 0.09 seconds). Change-Id: Ib72da42a6644421601111907cf7c899d828c2996
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/column.hxx1
-rw-r--r--sc/inc/columnspanset.hxx53
-rw-r--r--sc/inc/document.hxx1
-rw-r--r--sc/inc/listenercontext.hxx6
-rw-r--r--sc/inc/table.hxx1
5 files changed, 61 insertions, 1 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 88950318af23..9ee830b49157 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -474,6 +474,7 @@ public:
SvtBroadcaster* GetBroadcaster( SCROW nRow );
const SvtBroadcaster* GetBroadcaster( SCROW nRow ) const;
+ void DeleteBroadcasters( SCROW nRow1, SCROW nRow2 );
private:
void DeleteRange(
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
new file mode 100644
index 000000000000..afd17977add9
--- /dev/null
+++ b/sc/inc/columnspanset.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SC_COLUMNSPANSET_HXX
+#define SC_COLUMNSPANSET_HXX
+
+#include "address.hxx"
+
+#include <vector>
+#include <mdds/flat_segment_tree.hpp>
+#include <boost/noncopyable.hpp>
+
+namespace sc {
+
+/**
+ * Structure that stores segments of boolean flags per column, and perform
+ * custom action on those segments.
+ */
+class ColumnSpanSet : boost::noncopyable
+{
+ typedef mdds::flat_segment_tree<SCROW, bool> ColumnSpansType;
+ typedef std::vector<ColumnSpansType*> TableType;
+ typedef std::vector<TableType*> DocType;
+
+ DocType maDoc;
+
+public:
+ class Action
+ {
+ public:
+ virtual ~Action() = 0;
+ virtual void execute(const ScAddress& rPos, SCROW nLength, bool bVal) = 0;
+ };
+
+ ~ColumnSpanSet();
+
+ void set(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bVal);
+
+ void executeFromTop(Action& ac) const;
+ void executeFromBottom(Action& ac) const;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index eeec34935a81..0c59a6750cdf 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1958,6 +1958,7 @@ public:
SvtBroadcaster* GetBroadcaster( const ScAddress& rPos );
const SvtBroadcaster* GetBroadcaster( const ScAddress& rPos ) const;
+ void DeleteBroadcasters( const ScAddress& rTopPos, SCROW nLength );
private: // CLOOK-Impl-methods
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 584671342444..2fc55a769821 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -11,14 +11,18 @@
#define SC_LISTENERCONTEXT_HXX
#include "address.hxx"
+#include "columnspanset.hxx"
+
+#include <boost/noncopyable.hpp>
class ScDocument;
namespace sc {
-class EndListeningContext
+class EndListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
+ ColumnSpanSet maSet;
public:
EndListeningContext(ScDocument& rDoc);
ScDocument& getDoc();
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index f805cf43f294..543bdc9861d4 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -834,6 +834,7 @@ public:
SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow );
const SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow ) const;
+ void DeleteBroadcasters( SCCOL nCol, SCROW nRow1, SCROW nRow2 );
/** Replace behaves differently to the Search; adjust the rCol and rRow accordingly.