diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-01-10 16:28:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-01-10 16:28:21 -0500 |
| commit | 9a3cc6c0cf6447ffd65e86f93c4ca1a90c6e3ad8 (patch) | |
| tree | 4caf9aae0e08d2f9940cad71758e9729e0ffe11e /sc/inc/drwlayer.hxx | |
| parent | a7e04046d004dc7fec59c69e13aa0915e2577d55 (diff) | |
| parent | 69bb367315288b644439dc46d34743a2575a3527 (diff) | |
Merge branch 'libreoffice-3-3'
Their change regarding the filtering performance conflicted with
mine. I'll just take their code for now.
Conflicts:
sc/inc/document.hxx
sc/source/core/data/table2.cxx
sc/source/core/data/table3.cxx
Diffstat (limited to 'sc/inc/drwlayer.hxx')
| -rw-r--r-- | sc/inc/drwlayer.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 4ac4384358f4..49053e96898c 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -157,7 +157,7 @@ public: void WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips ); void HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips ); - BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow ); + BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes = true ); void DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 ); |