diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-01-19 11:45:03 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-01-19 12:10:41 -0500 |
| commit | 781689a5554fcb0a3cbc8e526914d5287e41a0c5 (patch) | |
| tree | f97727ceca791d43d3276297445512ecb698c518 /sc/inc/drwlayer.hxx | |
| parent | ada9698d918ffd6859680acbd361599d8f8dbd19 (diff) | |
| parent | b207eeb1182b078cf6c620a0529137b43429657b (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sc/inc/document.hxx
sc/source/core/data/drwlayer.cxx
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 de87e7e0a781..fcf7ce1361b6 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -153,7 +153,7 @@ public: void MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos = true ); - BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes = true ); + BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow ); void DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 ); |