diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-05-12 12:05:44 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2022-05-12 16:38:38 +0200 |
| commit | 1e990a5ab399a1bb15d4002ca30f13611ba6edbc (patch) | |
| tree | e19a35998d7dcf6962cb05635de777f9f8663652 /sc/inc | |
| parent | d9b072cd077cbb515e5aef584d98cb5deda48776 (diff) | |
fix up order of some ScDocument functions
For better or worse the usual order of arguments in Calc is
SCCOL, SCROW, SCTAB, so make this consistent.
Change-Id: Ie63c75f5ae92f82cb757c0873f7ff569f331e0df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134229
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/document.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index f61650e5a256..7f32bb7bc6bd 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1325,19 +1325,19 @@ public: bool RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC void DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow ); - SC_DLLPUBLIC void DoEmptyBlock( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow ); + SC_DLLPUBLIC void DoMergeContents( SCCOL nStartCol, SCROW nStartRow, + SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); + SC_DLLPUBLIC void DoEmptyBlock( SCCOL nStartCol, SCROW nStartRow, + SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); // without checking: - SC_DLLPUBLIC void DoMerge( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, bool bDeleteCaptions = true ); + SC_DLLPUBLIC void DoMerge( SCCOL nStartCol, SCROW nStartRow, + SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, bool bDeleteCaptions = true ); void RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ); - bool IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, bool bIgnoreNotes = false ) const; - bool IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, + bool IsBlockEmpty( SCCOL nStartCol, SCROW nStartRow, + SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, bool bIgnoreNotes = false ) const; + bool IsPrintEmpty( SCCOL nStartCol, SCROW nStartRow, + SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, bool bLeftIsEmpty = false, ScRange* pLastRange = nullptr, tools::Rectangle* pLastMM = nullptr ) const; |