diff options
| author | Steve Yin <steve_y@apache.org> | 2014-01-03 08:48:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-03 14:00:20 +0000 |
| commit | 6b8704d974abd4ab7fb58036a961fa0b7136aaa7 (patch) | |
| tree | 2ad6cfca91976a6fbedda63a2589647c939e66b3 /sc/inc/attarray.hxx | |
| parent | WaE: C4805: '!=' : unsafe mix of type 'sal_Bool' and type 'bool' in operation (diff) | |
| download | core-6b8704d974abd4ab7fb58036a961fa0b7136aaa7.tar.gz core-6b8704d974abd4ab7fb58036a961fa0b7136aaa7.zip | |
Resolves: #i123909# Select one column, paste cell range...
with merged cell in, no response
(cherry picked from commit acc76cb44c51fbefc8f34009300acb9382c3ad27)
Conflicts:
sc/inc/attarray.hxx
sc/inc/column.hxx
sc/inc/document.hxx
sc/source/core/data/attarray.cxx
sc/source/core/data/column2.cxx
sc/source/core/data/documen3.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table4.cxx
Change-Id: Id9c1e0fe86876da6e39ea2b34a484d69eb5d8633
Diffstat (limited to 'sc/inc/attarray.hxx')
| -rw-r--r-- | sc/inc/attarray.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index c4f514bf145f..c2789b3013f7 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -187,6 +187,11 @@ public: SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, sal_Int16 nStripFlags = 0) const; void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); + + /* i123909: Pre-calculate needed memory, and pre-reserve enough memory */ + bool Reserve( SCSIZE nCount ); + SCSIZE Count() const { return nCount; } + SCSIZE Count( SCROW nRw1, SCROW nRw2 ); }; // Iterator for attributes |