diff options
| author | Eike Rathke <erack@redhat.com> | 2020-04-08 00:47:09 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-04-19 21:45:16 +0200 |
| commit | 3ef9c47a5ed638ed890dd297e3a69dca6080c932 (patch) | |
| tree | 24991aa86b74f1cf88afb1ff1112bb08233ba38b /sc/inc | |
| parent | a0c189130f7d10722fc0dbf0a7fd354907fae725 (diff) | |
Resolves: tdf#131442 Sort must not contain matrix formula except 1x1 array
Change-Id: Idc7a9646a70c59fceee0b36426f38a938cf073ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91858
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit b1da67699bd05b26ee11460347ca7077d366c2fc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91723
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/column.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/document.hxx | 3 | ||||
| -rw-r--r-- | sc/inc/table.hxx | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 74fa4e8b37f9..4f839d0063dd 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -234,7 +234,7 @@ public: void FindUsed( SCROW nStartRow, SCROW nEndRow, mdds::flat_segment_tree<SCROW, bool>& rUsed ) const; SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const; - sc::MatrixEdge GetBlockMatrixEdges(SCROW nRow1, SCROW nRow2, sc::MatrixEdge nMask ) const; + sc::MatrixEdge GetBlockMatrixEdges(SCROW nRow1, SCROW nRow2, sc::MatrixEdge nMask, bool bNoMatrixAtAll ) const; bool HasSelectionMatrixFragment(const ScMarkData& rMark) const; bool GetFirstVisibleAttr( SCROW& rFirstRow ) const; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 758bd4c4b0d0..15fdc5074357 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -890,7 +890,8 @@ public: bool IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - bool* pOnlyNotBecauseOfMatrix = nullptr ) const; + bool* pOnlyNotBecauseOfMatrix = nullptr, + bool bNoMatrixAtAll = false ) const; bool IsSelectionEditable( const ScMarkData& rMark, bool* pOnlyNotBecauseOfMatrix = nullptr ) const; bool HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index bf97930109b7..b2fca017608f 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -389,11 +389,13 @@ public: void UnlockTable(); bool IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, - SCROW nRow2, bool* pOnlyNotBecauseOfMatrix = nullptr ) const; + SCROW nRow2, bool* pOnlyNotBecauseOfMatrix = nullptr, + bool bNoMatrixAtAll = false ) const; bool IsSelectionEditable( const ScMarkData& rMark, bool* pOnlyNotBecauseOfMatrix = nullptr ) const; - bool HasBlockMatrixFragment( const SCCOL nCol1, SCROW nRow1, const SCCOL nCol2, SCROW nRow2 ) const; + bool HasBlockMatrixFragment( const SCCOL nCol1, SCROW nRow1, const SCCOL nCol2, SCROW nRow2, + bool bNoMatrixAtAll = false ) const; bool HasSelectionMatrixFragment( const ScMarkData& rMark ) const; bool IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes ) const; |