diff options
| author | Eike Rathke <erack@redhat.com> | 2020-04-08 00:47:09 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2020-04-08 01:57:45 +0200 |
| commit | b1da67699bd05b26ee11460347ca7077d366c2fc (patch) | |
| tree | c6f9b96bceac4fabe3748f66e52232684ef0f20d /sc/inc | |
| parent | b3363960f97dcb7eaa10dfa708d71198a345924c (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
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 576a88a8f71a..0eb2ad5f1c85 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 847a4c42ccee..99c328157347 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -900,7 +900,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 8feb233480cf..7de7f24b59c2 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -392,11 +392,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; |