diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-05-07 13:45:12 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-05-07 13:45:12 +0200 |
| commit | 601b4d14eebd08fdba2c81f14e796e05e159af39 (patch) | |
| tree | 5a812427472ef37e0b545ce7a62e2c0cac991bd0 /sc/inc | |
| parent | 3e1f891a9f733f0b0a6d4f16e1455dd015661f7e (diff) | |
| parent | 3cf7ffb23f3024ba4c477399dde26f224b0fb554 (diff) | |
Merge branch 'libreoffice-6-4' into distro/lhm/libreoffice-6-4+backports
Conflicts:
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
Change-Id: I2e0b84875a10a1255d88d54a3c5857c3e5832521
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; |