chart2/uiconfig/ui/tp_SeriesToAxis.ui | 4 ++-- filter/source/svg/svgwriter.cxx | 3 +++ icon-themes/breeze/cmd/32/selecttables.png |binary icon-themes/breeze/cmd/lc_selecttables.png |binary icon-themes/breeze/cmd/sc_selecttables.png |binary icon-themes/breeze_dark/cmd/32/selecttables.png |binary icon-themes/breeze_dark/cmd/lc_selecttables.png |binary icon-themes/breeze_dark/cmd/sc_selecttables.png |binary icon-themes/breeze_dark_svg/cmd/32/selecttables.svg | 1 + icon-themes/breeze_dark_svg/cmd/lc_selecttables.svg | 1 + icon-themes/breeze_dark_svg/cmd/sc_selecttables.svg | 1 + icon-themes/breeze_svg/cmd/32/selecttables.svg | 1 + icon-themes/breeze_svg/cmd/lc_selecttables.svg | 1 + icon-themes/breeze_svg/cmd/sc_selecttables.svg | 1 + sc/inc/table.hxx | 2 ++ sc/source/core/data/document.cxx | 12 ++++++++---- sc/source/core/data/table2.cxx | 15 +++++++++++++++ 17 files changed, 36 insertions(+), 6 deletions(-)
New commits: commit 512cdbee3530f3d4399c3192c8a97a4a6d3d90e5 Author: Rizal Muttaqin <[email protected]> AuthorDate: Sat Feb 19 21:52:39 2022 +0700 Commit: Andras Timar <[email protected]> CommitDate: Sun Feb 20 09:06:07 2022 +0100 Breeze: add Calc's Edit > Select > Select Sheets.. icons Change-Id: Ide474cd818217f24ec144de00eab58f01f8d2575 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130159 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <[email protected]> diff --git a/icon-themes/breeze/cmd/32/selecttables.png b/icon-themes/breeze/cmd/32/selecttables.png new file mode 100644 index 000000000000..1e83b60ec8c8 Binary files /dev/null and b/icon-themes/breeze/cmd/32/selecttables.png differ diff --git a/icon-themes/breeze/cmd/lc_selecttables.png b/icon-themes/breeze/cmd/lc_selecttables.png new file mode 100644 index 000000000000..0c46c467e51b Binary files /dev/null and b/icon-themes/breeze/cmd/lc_selecttables.png differ diff --git a/icon-themes/breeze/cmd/sc_selecttables.png b/icon-themes/breeze/cmd/sc_selecttables.png new file mode 100644 index 000000000000..c347b65a47a9 Binary files /dev/null and b/icon-themes/breeze/cmd/sc_selecttables.png differ diff --git a/icon-themes/breeze_dark/cmd/32/selecttables.png b/icon-themes/breeze_dark/cmd/32/selecttables.png new file mode 100644 index 000000000000..1e83b60ec8c8 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/selecttables.png differ diff --git a/icon-themes/breeze_dark/cmd/lc_selecttables.png b/icon-themes/breeze_dark/cmd/lc_selecttables.png new file mode 100644 index 000000000000..0c46c467e51b Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_selecttables.png differ diff --git a/icon-themes/breeze_dark/cmd/sc_selecttables.png b/icon-themes/breeze_dark/cmd/sc_selecttables.png new file mode 100644 index 000000000000..c347b65a47a9 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_selecttables.png differ diff --git a/icon-themes/breeze_dark_svg/cmd/32/selecttables.svg b/icon-themes/breeze_dark_svg/cmd/32/selecttables.svg new file mode 100644 index 000000000000..39daa8838ab9 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/32/selecttables.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path d="m4 4v24h9v-4h15v-20zm1 1h7v2h-7zm8 0h6v2h-6zm7 0h7v2h-7zm-15 3h7v3h-7zm8 0h6v3h-6zm7 0h7v3h-7zm-15 4h7v3h-7zm8 0h6v3h-6zm7 0h7v3h-7zm-15 4h7v3h-7zm8 0h6v3h-6zm7 0h7v3h-7zm-15 4h7v3h-7zm8 0h6v3h-6zm7 0h7v3h-7zm-15 4h7v3h-7z" fill="#3daee9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/cmd/lc_selecttables.svg b/icon-themes/breeze_dark_svg/cmd/lc_selecttables.svg new file mode 100644 index 000000000000..eb23bc31c348 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/lc_selecttables.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m4 4v16h6v-3h10v-13zm1 1h4v2h-4zm5 0h4v2h-4zm5 0h4v2h-4zm-10 3h4v2h-4zm5 0h4v2h-4zm5 0h4v2h-4zm-10 3h4v2h-4zm5 0h4v2h-4zm5 0h4v2h-4zm-10 3h4v2h-4zm5 0h4v2h-4zm5 0h4v2h-4zm-10 3h4v2h-4z" fill="#3daee9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/cmd/sc_selecttables.svg b/icon-themes/breeze_dark_svg/cmd/sc_selecttables.svg new file mode 100644 index 000000000000..6d8612f66c19 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/sc_selecttables.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg";><path d="m2 2v12h4 1v-3h7v-9zm1 1h3v3h-3zm4 0h2v3h-2zm3 0h3v3h-1-1-1zm-7 4h3v3h-3zm4 0h2v3h-2zm3 0h1 1 1v3h-3zm-7 4h3v2h-3z" fill="#3daee9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/cmd/32/selecttables.svg b/icon-themes/breeze_svg/cmd/32/selecttables.svg new file mode 100644 index 000000000000..39daa8838ab9 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/32/selecttables.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path d="m4 4v24h9v-4h15v-20zm1 1h7v2h-7zm8 0h6v2h-6zm7 0h7v2h-7zm-15 3h7v3h-7zm8 0h6v3h-6zm7 0h7v3h-7zm-15 4h7v3h-7zm8 0h6v3h-6zm7 0h7v3h-7zm-15 4h7v3h-7zm8 0h6v3h-6zm7 0h7v3h-7zm-15 4h7v3h-7zm8 0h6v3h-6zm7 0h7v3h-7zm-15 4h7v3h-7z" fill="#3daee9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/cmd/lc_selecttables.svg b/icon-themes/breeze_svg/cmd/lc_selecttables.svg new file mode 100644 index 000000000000..eb23bc31c348 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/lc_selecttables.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m4 4v16h6v-3h10v-13zm1 1h4v2h-4zm5 0h4v2h-4zm5 0h4v2h-4zm-10 3h4v2h-4zm5 0h4v2h-4zm5 0h4v2h-4zm-10 3h4v2h-4zm5 0h4v2h-4zm5 0h4v2h-4zm-10 3h4v2h-4zm5 0h4v2h-4zm5 0h4v2h-4zm-10 3h4v2h-4z" fill="#3daee9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/cmd/sc_selecttables.svg b/icon-themes/breeze_svg/cmd/sc_selecttables.svg new file mode 100644 index 000000000000..6d8612f66c19 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/sc_selecttables.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg";><path d="m2 2v12h4 1v-3h7v-9zm1 1h3v3h-3zm4 0h2v3h-2zm3 0h3v3h-1-1-1zm-7 4h3v3h-3zm4 0h2v3h-2zm3 0h1 1 1v3h-3zm-7 4h3v2h-3z" fill="#3daee9"/></svg> \ No newline at end of file commit d91d8149cbc61c880f2029b150accf5dbdec0187 Author: Marco Cecchetti <[email protected]> AuthorDate: Mon Feb 14 15:53:08 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Feb 20 09:06:07 2022 +0100 svg filter: google chrome doesn't render white spaces correctly In Google Chrome white spaces at the beginning of a text line are not rendered at all. Change-Id: Idd3b1bc5a383b21a54cc1629173bbe26a6da83bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129918 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Jan Holesovsky <[email protected]> (cherry picked from commit 5eec28d86a5953de3aa0d5f0c424e92334860270) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129939 Tested-by: Jenkins Reviewed-by: Marco Cecchetti <[email protected]> (cherry picked from commit 76a98fa478ac8e75cf3f982e4f65548d69371b39) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129944 Reviewed-by: Andras Timar <[email protected]> diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 10d4982bee80..6178da0549db 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1791,6 +1791,9 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, } else { + // Without the following attribute Google Chrome does not render leading spaces + mrExport.AddAttribute( XML_NAMESPACE_NONE, "style", "white-space: pre" ); + SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ); mrExport.GetDocHandler()->characters( rText ); } commit deb185dc522574250e84e990322364f3c4fe1ebe Author: Caolán McNamara <[email protected]> AuthorDate: Fri Feb 18 09:04:41 2022 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sun Feb 20 09:06:07 2022 +0100 Resolves: tdf#147393 SpinButtons should be can-focus Change-Id: I092ed9c3421267ea3b2c671020e7079c3f792e17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130131 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui b/chart2/uiconfig/ui/tp_SeriesToAxis.ui index dd25988f0ea8..5ef76e094f17 100644 --- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui +++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui @@ -145,7 +145,7 @@ <child> <object class="GtkSpinButton" id="MT_GAP"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="adjustment">adjustmentGAP</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> @@ -162,7 +162,7 @@ <child> <object class="GtkSpinButton" id="MT_OVERLAP"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="adjustment">adjustmentOVERLAP</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> commit b9952977e8114606a7f97b21c94fb1a8a9e468f7 Author: Luboš Luňák <[email protected]> AuthorDate: Thu Feb 17 15:27:59 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Feb 20 09:06:06 2022 +0100 fix range checking in calls like ScDocument::GetNote() Change-Id: I5612e765b3484b0515f4a16030ee19133ae3126a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130076 Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> (cherry picked from commit 957d99a539df6e21fd40370938ca5dab1613cf8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130104 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index fa8d6326d479..e61f2f717d89 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -473,6 +473,8 @@ public: void GetLastDataPos(SCCOL& rCol, SCROW& rRow) const; std::unique_ptr<ScPostIt> ReleaseNote( SCCOL nCol, SCROW nRow ); + ScPostIt* GetNote( SCCOL nCol, SCROW nRow ); + void SetNote( SCCOL nCol, SCROW nRow, std::unique_ptr<ScPostIt> pNote ); size_t GetNoteCount( SCCOL nCol ) const; SCROW GetNotePosition( SCCOL nCol, size_t nIndex ) const; diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 3592eb4a3ee1..b62407916300 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6520,9 +6520,8 @@ ScPostIt* ScDocument::GetNote(const ScAddress& rPos) ScPostIt* ScDocument::GetNote(SCCOL nCol, SCROW nRow, SCTAB nTab) { - if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && - nCol < maTabs[nTab]->GetAllocatedColumnsCount()) - return maTabs[nTab]->aCol[nCol].GetCellNote(nRow); + if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size())) + return maTabs[nTab]->GetNote(nCol, nRow); else return nullptr; @@ -6535,7 +6534,8 @@ void ScDocument::SetNote(const ScAddress& rPos, std::unique_ptr<ScPostIt> pNote) void ScDocument::SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab, std::unique_ptr<ScPostIt> pNote) { - return maTabs[nTab]->CreateColumnIfNotExists(nCol).SetCellNote(nRow, std::move(pNote)); + if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size())) + maTabs[nTab]->SetNote(nCol, nRow, std::move(pNote)); } bool ScDocument::HasNote(const ScAddress& rPos) const @@ -6582,6 +6582,9 @@ bool ScDocument::HasColNotes(SCCOL nCol, SCTAB nTab) const if (!pTab) return false; + if (nCol >= pTab->GetAllocatedColumnsCount()) + return false; + return pTab->aCol[nCol].HasCellNotes(); } @@ -6625,6 +6628,7 @@ ScPostIt* ScDocument::GetOrCreateNote(const ScAddress& rPos) else return CreateNote(rPos); } + ScPostIt* ScDocument::CreateNote(const ScAddress& rPos) { ScPostIt* pPostIt = new ScPostIt(*this, rPos); diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 027e61d0ab7b..0ab94dea70bc 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1818,6 +1818,21 @@ std::unique_ptr<ScPostIt> ScTable::ReleaseNote( SCCOL nCol, SCROW nRow ) return aCol[nCol].ReleaseNote(nRow); } +ScPostIt* ScTable::GetNote( SCCOL nCol, SCROW nRow ) +{ + if (!ValidCol(nCol) || nCol >= GetAllocatedColumnsCount()) + return nullptr; + return aCol[nCol].GetCellNote(nRow); +} + +void ScTable::SetNote( SCCOL nCol, SCROW nRow, std::unique_ptr<ScPostIt> pNote ) +{ + if (!ValidColRow(nCol, nRow)) + return; + + CreateColumnIfNotExists(nCol).SetCellNote(nRow, std::move(pNote)); +} + size_t ScTable::GetNoteCount( SCCOL nCol ) const { if (!ValidCol(nCol) || nCol >= GetAllocatedColumnsCount())
