summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-02-05 00:07:21 -0500
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-02-05 00:29:45 -0500
commitbd9db38e4525474e6a35a91748a34ce473807075 (patch)
tree1899640ad8865f5c48ed531c2db552b6f9522271 /sc/source/ui/inc
parent21ab2ba866c8bea31cf2832d1c53227963a6010a (diff)
Remove use of GetMark*Ranges() from DeleteMulti().
Change-Id: I4a17e5f0f1c81c968c821467f326a1c9b06a85a9
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/undoblk.hxx18
1 files changed, 10 insertions, 8 deletions
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 1b10216b3ebd..6dabb13e6f67 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -25,6 +25,7 @@
#include "spellparam.hxx"
#include "cellmergeoption.hxx"
#include "paramisc.hxx"
+#include <columnspanset.hxx>
#include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp>
@@ -110,10 +111,12 @@ class ScUndoDeleteMulti: public ScMoveUndo
{
public:
TYPEINFO();
- ScUndoDeleteMulti( ScDocShell* pNewDocShell,
- sal_Bool bNewRows, sal_Bool bNeedsRefresh, SCTAB nNewTab,
- const SCCOLROW* pRng, SCCOLROW nRngCnt,
- ScDocument* pUndoDocument, ScRefUndoData* pRefData );
+
+ ScUndoDeleteMulti( ScDocShell* pNewDocShell,
+ bool bNewRows, bool bNeedsRefresh, SCTAB nNewTab,
+ const std::vector<sc::ColRowSpan>& rSpans,
+ ScDocument* pUndoDocument, ScRefUndoData* pRefData );
+
virtual ~ScUndoDeleteMulti();
virtual void Undo();
@@ -124,11 +127,10 @@ public:
virtual OUString GetComment() const;
private:
- sal_Bool bRows;
- sal_Bool bRefresh;
+ bool mbRows:1;
+ bool mbRefresh:1;
SCTAB nTab;
- SCCOLROW* pRanges;
- SCCOLROW nRangeCnt;
+ std::vector<sc::ColRowSpan> maSpans;
sal_uLong nStartChangeAction;
sal_uLong nEndChangeAction;