diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-01-07 15:44:10 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-01-07 15:44:10 -0500 |
commit | 8cce3ef4c1d81d7e2ea31c43135403825ddca064 (patch) | |
tree | 83df9b860b380728c2038a6a9eac2f770012a39f /sc/inc/drwlayer.hxx | |
parent | 24eb59f23a4bcdcc51dca972661dc05a058a1e1a (diff) | |
parent | 62cfba8ec4ca92fa3b20b2de8719ef8ca0d89bbe (diff) |
Merge commit 'ooo/OOO330_m19' into libreoffice-3-3
Conflicts:
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 d84044a5da32..e59e836be501 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -160,7 +160,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 ); |