[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/grouparealistener.cxx | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit fdcea8ccc8236b0975ac9c85dcabf9c663e4b627 Author: Luboš Luňák AuthorDate: Sun Feb 20 02:33:36 2022 +0100 Commit: Luboš Luňák CommitDate: Sun Feb 20 08:01:40 2022 +0100 make CollectCellAction sort cells by cell address (tdf#119083) Many calc algorithms perform better if they process cells ordered by tab,col,row. In the case of tdf#119083 it's ScDocument::TrackFormulas(). Change-Id: I1eedefc0130f5cf95feb84a4160b7599d3a09fd6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130205 Tested-by: Luboš Luňák Reviewed-by: Luboš Luňák diff --git a/sc/source/core/tool/grouparealistener.cxx b/sc/source/core/tool/grouparealistener.cxx index 4c92475d9a3f..39b92625b5b8 100644 --- a/sc/source/core/tool/grouparealistener.cxx +++ b/sc/source/core/tool/grouparealistener.cxx @@ -63,8 +63,14 @@ public: void swapCells( std::vector& rCells ) { -// Remove duplicate before the swap. -std::sort(maCells.begin(), maCells.end()); +// Remove duplicate before the swap. Take care to sort them by tab,col,row before sorting by pointer, +// as many calc algorithms perform better if cells are processed in this order. +std::sort(maCells.begin(), maCells.end(), [](const ScFormulaCell* cell1, const ScFormulaCell* cell2) +{ +if( cell1->aPos != cell2->aPos ) +return cell1->aPos < cell2->aPos; +return cell1 < cell2; +}); std::vector::iterator it = std::unique(maCells.begin(), maCells.end()); maCells.erase(it, maCells.end());
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/bcaslot.cxx | 31 +++ 1 file changed, 15 insertions(+), 16 deletions(-) New commits: commit 131710cba68e46c175babbd20c810e7fc2fb811f Author: Luboš Luňák AuthorDate: Sun Feb 20 00:56:37 2022 +0100 Commit: Luboš Luňák CommitDate: Sun Feb 20 07:59:01 2022 +0100 optimize AreaBroadcast() a bit Use ComputeAreaPoints() rather than repeated ComputeSlotOffset(). Change-Id: If7869fe4c37a1e844ec9e6513a7c1799290c077f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130204 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 6869ca24e120..7e6383a9c35b 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -909,24 +909,23 @@ bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const TableSlotsMap::const_iterator iTab( aTableSlotsMap.find( rAddress.Tab())); if (iTab == aTableSlotsMap.end()) return false; -// Process all slots for the given row range, but it's enough to process -// each only once. -ScBroadcastAreaSlot* pLastSlot = nullptr; -ScAddress address(rAddress); -bool wasBroadcast = false; -for( SCROW nRow = rAddress.Row(); nRow < rAddress.Row() + rHint.GetRowCount(); ++nRow ) +// Process all slots for the given row range. +ScRange broadcastRange( rAddress, +ScAddress( rAddress.Col(), rAddress.Row() + rHint.GetRowCount() - 1, rAddress.Tab())); +bool bBroadcasted = false; +ScBroadcastAreaSlot** ppSlots = (*iTab).second->getSlots(); +SCSIZE nStart, nEnd, nRowBreak; +ComputeAreaPoints( broadcastRange, nStart, nEnd, nRowBreak ); +SCSIZE nOff = nStart; +SCSIZE nBreak = nOff + nRowBreak; +ScBroadcastAreaSlot** pp = ppSlots + nOff; +while ( nOff <= nEnd ) { -address.SetRow(nRow); -ScBroadcastAreaSlot* pSlot = (*iTab).second->getAreaSlot( -ComputeSlotOffset( address)); -if ( pSlot && pSlot != pLastSlot ) -{ -if(pSlot->AreaBroadcast( rHint )) -wasBroadcast = true; -pLastSlot = pSlot; -} +if ( *pp ) +bBroadcasted |= (*pp)->AreaBroadcast( rHint ); +ComputeNextSlot( nOff, nBreak, pp, nStart, ppSlots, nRowBreak, mnBcaSlotsCol); } -return wasBroadcast; +return bBroadcasted; } }
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg
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 + 12 files changed, 6 insertions(+) New commits: commit 3bc08a00a1fb18d84225efb261e47fea73cae5f4 Author: Rizal Muttaqin AuthorDate: Sat Feb 19 21:52:39 2022 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 19 23:32:02 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 diff --git a/icon-themes/breeze/cmd/32/selecttables.png b/icon-themes/breeze/cmd/32/selecttables.png new file mode 100644 index ..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 ..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 ..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 ..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 ..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 ..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 ..39daa8838ab9 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/32/selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..eb23bc31c348 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/lc_selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..6d8612f66c19 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/sc_selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..39daa8838ab9 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/32/selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..eb23bc31c348 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/lc_selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..6d8612f66c19 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/sc_selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg
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 + 12 files changed, 6 insertions(+) New commits: commit b965efc0ab5d6996417c92b5588e9d1ff79e0572 Author: Rizal Muttaqin AuthorDate: Sat Feb 19 21:52:39 2022 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 19 23:32:15 2022 +0100 Breeze: add Calc's Edit > Select > Select Sheets.. icons Change-Id: Ide474cd818217f24ec144de00eab58f01f8d2575 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130196 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/breeze/cmd/32/selecttables.png b/icon-themes/breeze/cmd/32/selecttables.png new file mode 100644 index ..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 ..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 ..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 ..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 ..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 ..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 ..39daa8838ab9 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/32/selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..eb23bc31c348 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/lc_selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..6d8612f66c19 --- /dev/null +++ b/icon-themes/breeze_dark_svg/cmd/sc_selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..39daa8838ab9 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/32/selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..eb23bc31c348 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/lc_selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/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 ..6d8612f66c19 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/sc_selecttables.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e64c2cf6cf64def94e9f382bcd101225173ae719 Author: Stanislav Horacek AuthorDate: Sat Feb 19 23:14:42 2022 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 19 23:14:42 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 2d7503bd781bb3d9b4680f75b4af7141fb6295c8 - do not localize CallType values Change-Id: Ie5d6b52da5b254945b48b7e126e56b86936456f4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/130199 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index f5f8ee67bc1b..2d7503bd781b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f5f8ee67bc1b48c912e3bf6490827a9815fa5674 +Subproject commit 2d7503bd781bb3d9b4680f75b4af7141fb6295c8
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/CallByName.xhp | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 2d7503bd781bb3d9b4680f75b4af7141fb6295c8 Author: Stanislav Horacek AuthorDate: Sat Feb 19 18:51:15 2022 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 19 23:14:41 2022 +0100 do not localize CallType values Change-Id: Ie5d6b52da5b254945b48b7e126e56b86936456f4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/130199 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/CallByName.xhp b/source/text/sbasic/shared/CallByName.xhp index 9a34a1883..90581cd66 100644 --- a/source/text/sbasic/shared/CallByName.xhp +++ b/source/text/sbasic/shared/CallByName.xhp @@ -34,7 +34,7 @@ result: An optional variable that contains the result of the called method or property. - + object: A Basic module, ClassModule instance or UNO service holding properties or methods. ProcName: The Function, Sub or Property that is being called. @@ -47,19 +47,19 @@ CallType Description - 1 + 1 Method: Calls a procedure as a function or a subroutine. - 2 + 2 Get: Reads a property or variable content. - 4 + 4 Let: Assigns a content to a Property or variable. - 8 + 8 Set: Assigns a reference value to an Object or Variant variable. @@ -77,7 +77,7 @@ - Sub CallByName_example + Sub CallByName_example Const _Method = 1, _Get = 2, _Let = 4, _Set = 8 BasicLibraries.loadLibrary("Calc") ' Calc.Maths user library.module
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ba002449738d2837d270452351cf2e914db97312 Author: Stanislav Horacek AuthorDate: Sat Feb 19 23:13:18 2022 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 19 23:13:18 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to f5f8ee67bc1b48c912e3bf6490827a9815fa5674 - do not localize UNO service names Change-Id: I8e2452bd5bdacfd34fe93ed87da43c5e18ac279b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/130200 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b54a0e6d50e8..f5f8ee67bc1b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b54a0e6d50e8eaaa37ca844b1c92d3778d4567cf +Subproject commit f5f8ee67bc1b48c912e3bf6490827a9815fa5674
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/calc_functions.xhp | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit f5f8ee67bc1b48c912e3bf6490827a9815fa5674 Author: Stanislav Horacek AuthorDate: Sat Feb 19 19:04:54 2022 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 19 23:13:17 2022 +0100 do not localize UNO service names Change-Id: I8e2452bd5bdacfd34fe93ed87da43c5e18ac279b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/130200 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/calc_functions.xhp b/source/text/sbasic/shared/calc_functions.xhp index 4d4d7b97e..fa495681f 100644 --- a/source/text/sbasic/shared/calc_functions.xhp +++ b/source/text/sbasic/shared/calc_functions.xhp @@ -939,7 +939,7 @@ DAYSINYEAR -com.sun.star.sheet.addin.DateFunctions.getDaysInMonth +com.sun.star.sheet.addin.DateFunctions.getDaysInMonth @@ -947,7 +947,7 @@ MONTHS -com.sun.star.sheet.addin.DateFunctions.getDiffMonths +com.sun.star.sheet.addin.DateFunctions.getDiffMonths @@ -955,7 +955,7 @@ WEEKS -com.sun.star.sheet.addin.DateFunctions.getDiffWeeks +com.sun.star.sheet.addin.DateFunctions.getDiffWeeks @@ -963,7 +963,7 @@ YEARS -com.sun.star.sheet.addin.DateFunctions.getDiffYears +com.sun.star.sheet.addin.DateFunctions.getDiffYears @@ -971,7 +971,7 @@ ROT13 -com.sun.star.sheet.addin.DateFunctions.getRot13 +com.sun.star.sheet.addin.DateFunctions.getRot13 @@ -979,7 +979,7 @@ WEEKSINYEAR -com.sun.star.sheet.addin.DateFunctions.getWeeksInYear +com.sun.star.sheet.addin.DateFunctions.getWeeksInYear @@ -1001,7 +1001,7 @@ OPT_BARRIER -com.sun.star.sheet.addin.PrincingFunctions.getOptBarrier +com.sun.star.sheet.addin.PrincingFunctions.getOptBarrier @@ -1009,7 +1009,7 @@ OPT_PROB_HIT -com.sun.star.sheet.addin.PrincingFunctions.getOptProbHit +com.sun.star.sheet.addin.PrincingFunctions.getOptProbHit @@ -1017,7 +1017,7 @@ OPT_PROB_INMONEY -com.sun.star.sheet.addin.PrincingFunctions.getOptProbInMoney +com.sun.star.sheet.addin.PrincingFunctions.getOptProbInMoney @@ -1025,7 +1025,7 @@ OPT_TOUCH -com.sun.star.sheet.addin.PrincingFunctions.getOptTouch +com.sun.star.sheet.addin.PrincingFunctions.getOptTouch
[Libreoffice-commits] core.git: editeng/source
editeng/source/outliner/outliner.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 19613544fcba9e08d0d9f24cbd976ed12431d4b2 Author: Caolán McNamara AuthorDate: Sat Feb 19 20:43:33 2022 + Commit: Caolán McNamara CommitDate: Sat Feb 19 22:41:18 2022 +0100 tdf#147166 EditTextObjectImpl copy ctor doesn't exactly copy EditTextObjectImpl and this is apparently relied on, so eliding the copy gives unexpected results. EditTextObjectImpl::Clone returns a copy of *this, but the EditTextObjectImpl copy ctor explicitly does not copy the "PortionInfo" member, so in: commit fb8973f31f111229be5184f4e4223e963ced2c7b Author: Caolán McNamara Date: Sat Oct 10 19:21:38 2020 +0100 ofz#23492 the only user of this ctor throws away the original of the clone so we can take ownership of the original instead where the copy was optimized away we want from a state where there was a new EditTextObjectImpl with an empty PortionInfo member to one where the PortionInfo of the EditTextObjectImpl was retained. So explicitly clear this unwanted info. It's very hard to make rational judgements about code if a copy behaves differently than the orignal :-( Change-Id: I642d60841d6bdccbf830f8a2ccdbd9f542a8aa18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130201 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index d5e6630cefe4..41e6ebc4adad 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -381,6 +381,7 @@ std::optional Outliner::CreateParaObject( sal_Int32 nStartPa aParagraphDataVector[nPara-nStartPara] = *GetParagraph(nPara); } +xText->ClearPortionInfo(); // tdf#147166 the PortionInfo is unwanted here OutlinerParaObject aPObj(std::move(xText), std::move(aParagraphDataVector), bIsEditDoc); aPObj.SetOutlinerMode(GetOutlinerMode());
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg
icon-themes/breeze/cmd/32/duplicatesheet.png |binary icon-themes/breeze/cmd/32/move.png|binary icon-themes/breeze/cmd/lc_duplicatesheet.png |binary icon-themes/breeze/cmd/lc_move.png|binary icon-themes/breeze/cmd/sc_duplicatesheet.png |binary icon-themes/breeze/cmd/sc_move.png|binary icon-themes/breeze_dark/cmd/32/duplicatesheet.png |binary icon-themes/breeze_dark/cmd/32/move.png |binary icon-themes/breeze_dark/cmd/lc_duplicatesheet.png |binary icon-themes/breeze_dark/cmd/lc_move.png |binary icon-themes/breeze_dark/cmd/sc_duplicatesheet.png |binary icon-themes/breeze_dark/cmd/sc_move.png |binary icon-themes/breeze_dark_svg/cmd/32/duplicatesheet.svg |1 + icon-themes/breeze_dark_svg/cmd/32/move.svg |1 + icon-themes/breeze_dark_svg/cmd/lc_duplicatesheet.svg |1 + icon-themes/breeze_dark_svg/cmd/lc_move.svg |1 + icon-themes/breeze_dark_svg/cmd/sc_duplicatesheet.svg |1 + icon-themes/breeze_dark_svg/cmd/sc_move.svg |2 +- icon-themes/breeze_svg/cmd/32/duplicatesheet.svg |1 + icon-themes/breeze_svg/cmd/32/move.svg|1 + icon-themes/breeze_svg/cmd/lc_duplicatesheet.svg |1 + icon-themes/breeze_svg/cmd/lc_move.svg|1 + icon-themes/breeze_svg/cmd/sc_duplicatesheet.svg |1 + icon-themes/breeze_svg/cmd/sc_move.svg|2 +- 24 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 992f3922cfe164369f47b5a0f614a54bd539e52a Author: Rizal Muttaqin AuthorDate: Sat Feb 19 18:41:00 2022 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 19 22:07:40 2022 +0100 Breeze: tdf#147521 add Duplicate Sheet icons Change-Id: I4fdde4466f98a0c7d19c880781d1f17091a69619 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130193 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/breeze/cmd/32/duplicatesheet.png b/icon-themes/breeze/cmd/32/duplicatesheet.png new file mode 100644 index ..e9b0ba41558e Binary files /dev/null and b/icon-themes/breeze/cmd/32/duplicatesheet.png differ diff --git a/icon-themes/breeze/cmd/32/move.png b/icon-themes/breeze/cmd/32/move.png new file mode 100644 index ..6129a18ed53b Binary files /dev/null and b/icon-themes/breeze/cmd/32/move.png differ diff --git a/icon-themes/breeze/cmd/lc_duplicatesheet.png b/icon-themes/breeze/cmd/lc_duplicatesheet.png new file mode 100644 index ..a022b391e7d9 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_duplicatesheet.png differ diff --git a/icon-themes/breeze/cmd/lc_move.png b/icon-themes/breeze/cmd/lc_move.png new file mode 100644 index ..234796611f50 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_move.png differ diff --git a/icon-themes/breeze/cmd/sc_duplicatesheet.png b/icon-themes/breeze/cmd/sc_duplicatesheet.png new file mode 100644 index ..67aaeefaf506 Binary files /dev/null and b/icon-themes/breeze/cmd/sc_duplicatesheet.png differ diff --git a/icon-themes/breeze/cmd/sc_move.png b/icon-themes/breeze/cmd/sc_move.png index 5a56b4eec0b1..1a05e0393ab9 100644 Binary files a/icon-themes/breeze/cmd/sc_move.png and b/icon-themes/breeze/cmd/sc_move.png differ diff --git a/icon-themes/breeze_dark/cmd/32/duplicatesheet.png b/icon-themes/breeze_dark/cmd/32/duplicatesheet.png new file mode 100644 index ..0d9b67a73b97 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/duplicatesheet.png differ diff --git a/icon-themes/breeze_dark/cmd/32/move.png b/icon-themes/breeze_dark/cmd/32/move.png new file mode 100644 index ..ef47bf25540b Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/move.png differ diff --git a/icon-themes/breeze_dark/cmd/lc_duplicatesheet.png b/icon-themes/breeze_dark/cmd/lc_duplicatesheet.png new file mode 100644 index ..5c47c579768d Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_duplicatesheet.png differ diff --git a/icon-themes/breeze_dark/cmd/lc_move.png b/icon-themes/breeze_dark/cmd/lc_move.png new file mode 100644 index ..9a5ea0dffaff Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_move.png differ diff --git a/icon-themes/breeze_dark/cmd/sc_duplicatesheet.png b/icon-themes/breeze_dark/cmd/sc_duplicatesheet.png new file mode 100644 index ..8b97f3a4fc9b Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_duplicatesheet.png differ diff --git a/icon-themes/breeze_dark/cmd/sc_move.png b/icon-themes/breeze_dark/cmd/sc_move.png index efa6f6ff6cf7..19b035455b36 100644 Binary files a/icon-themes/breeze_dark/cmd/sc_move.png and b/icon-themes/breeze_dark/cmd/sc_move.png differ diff --git a/icon-themes/breeze_dark_svg/cmd/32/duplicatesheet.svg b/icon-themes/breeze_dark_svg/cmd/32/duplicatesheet.svg new file mode 100644 i
[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg
icon-themes/sukapura/cmd/32/duplicatesheet.png |binary icon-themes/sukapura/cmd/lc_duplicatesheet.png |binary icon-themes/sukapura/cmd/sc_duplicatesheet.png |binary icon-themes/sukapura_svg/cmd/32/duplicatesheet.svg |1 + icon-themes/sukapura_svg/cmd/lc_duplicatesheet.svg |1 + icon-themes/sukapura_svg/cmd/sc_duplicatesheet.svg |2 ++ 6 files changed, 4 insertions(+) New commits: commit 166f57d927802bbe489197097b02ad52bbbffd79 Author: Rizal Muttaqin AuthorDate: Sat Feb 19 18:17:44 2022 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 19 22:07:03 2022 +0100 Sukapura: tdf#147521 add Duplicate Sheet icons Change-Id: I3005a62a1938d832fa33511f08f610d3f23fc814 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130192 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/sukapura/cmd/32/duplicatesheet.png b/icon-themes/sukapura/cmd/32/duplicatesheet.png new file mode 100644 index ..d339aae96f95 Binary files /dev/null and b/icon-themes/sukapura/cmd/32/duplicatesheet.png differ diff --git a/icon-themes/sukapura/cmd/lc_duplicatesheet.png b/icon-themes/sukapura/cmd/lc_duplicatesheet.png new file mode 100644 index ..9de1bc60cb18 Binary files /dev/null and b/icon-themes/sukapura/cmd/lc_duplicatesheet.png differ diff --git a/icon-themes/sukapura/cmd/sc_duplicatesheet.png b/icon-themes/sukapura/cmd/sc_duplicatesheet.png new file mode 100644 index ..76204d4f0da6 Binary files /dev/null and b/icon-themes/sukapura/cmd/sc_duplicatesheet.png differ diff --git a/icon-themes/sukapura_svg/cmd/32/duplicatesheet.svg b/icon-themes/sukapura_svg/cmd/32/duplicatesheet.svg new file mode 100644 index ..b95625d16ddb --- /dev/null +++ b/icon-themes/sukapura_svg/cmd/32/duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/sukapura_svg/cmd/lc_duplicatesheet.svg b/icon-themes/sukapura_svg/cmd/lc_duplicatesheet.svg new file mode 100644 index ..55ddd07b9cee --- /dev/null +++ b/icon-themes/sukapura_svg/cmd/lc_duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/sukapura_svg/cmd/sc_duplicatesheet.svg b/icon-themes/sukapura_svg/cmd/sc_duplicatesheet.svg new file mode 100644 index ..51cb201e9e9d --- /dev/null +++ b/icon-themes/sukapura_svg/cmd/sc_duplicatesheet.svg @@ -0,0 +1,2 @@ +http://www.w3.org/2000/svg";> +/&amp;gt;< /g> \ No newline at end of file
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2f9a7c854d6c4d598dd79a6e4dbf7ba2a9b41a92 Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:43:53 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index 3749bee571d5..718c603cab19 100644 --- a/download.lst +++ b/download.lst @@ -50,8 +50,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a export ETONYEK_VERSION_MICRO := 9 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := 19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-4' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6be3e44a8a91fe7074d236432962922b10a7c203 Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:43:06 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index c6a9c40aec65..057684402f15 100644 --- a/download.lst +++ b/download.lst @@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a export ETONYEK_VERSION_MICRO := 9 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b554214a6dce841b55344153a51be3b34cc09794 Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:41:19 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index 579a315491af..a147bcdee145 100644 --- a/download.lst +++ b/download.lst @@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a export ETONYEK_VERSION_MICRO := 9 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5b88cf450019229726760d3213ff8a9fe206ffac Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:40:47 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index a2cac70220c6..02347aadee4f 100644 --- a/download.lst +++ b/download.lst @@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a export ETONYEK_VERSION_MICRO := 9 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-1' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 86cccb19b7d0739be21916884ca47d3cafc9f0ca Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:40:05 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index 4ea63ec1628d..a1605e3193fa 100644 --- a/download.lst +++ b/download.lst @@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := 9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d export ETONYEK_VERSION_MICRO := 8 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-0' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4d792694b064419002571b32fc52e53eb32d6d7b Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:39:32 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index c7fc4b12ef5a..5ed550e00ae4 100644 --- a/download.lst +++ b/download.lst @@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.0.tar.bz2 export ETONYEK_SHA256SUM := 69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac export ETONYEK_VERSION_MICRO := 7 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-5-4-7-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 23613ee34ff2a4558f77fea3a8ec1da13bfa80cd Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:38:51 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index b577337edffe..38b7c7404b62 100644 --- a/download.lst +++ b/download.lst @@ -41,8 +41,8 @@ export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz export ETONYEK_SHA256SUM := 032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78 export ETONYEK_VERSION_MICRO := 6 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2 -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 73d16f3907678594091ce2439d2f600c17715ab0 Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:35:55 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index 21762fad4e5d..3473daf8e1ab 100644 --- a/download.lst +++ b/download.lst @@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a export ETONYEK_VERSION_MICRO := 9 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := 19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 37b191c6e40e0b761c8b49ba3887b96070902ab0 Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Andras Timar CommitDate: Sat Feb 19 21:33:52 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd diff --git a/download.lst b/download.lst index 8e3687e72555..7dbf11f5cfb7 100644 --- a/download.lst +++ b/download.lst @@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a export ETONYEK_VERSION_MICRO := 10 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := 19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e1d0c27cc98006f8edfa6bc7e6dafb96ca1bc503 Author: Caolán McNamara AuthorDate: Sat Feb 19 16:53:58 2022 + Commit: Caolán McNamara CommitDate: Sat Feb 19 20:40:09 2022 +0100 upgrade expat to 2.4.5 CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130198 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/download.lst b/download.lst index bb4d12649d8f..078e5207435d 100644 --- a/download.lst +++ b/download.lst @@ -48,8 +48,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a export ETONYEK_VERSION_MICRO := 10 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f -export EXPAT_TARBALL := expat-2.4.4.tar.gz +export EXPAT_SHA256SUM := f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 +export EXPAT_TARBALL := expat-2.4.5.tar.xz export FIREBIRD_SHA256SUM := acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76 export FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2 export FONTCONFIG_SHA256SUM := a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d3232aaa3330180ddc929b289fed19e4a895661e Author: Stanislav Horacek AuthorDate: Sat Feb 19 18:56:44 2022 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 19 18:56:44 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b54a0e6d50e8eaaa37ca844b1c92d3778d4567cf - correct and reformulate description of CBool example Change-Id: I4a17e3bebc834c095ce909bbb06f0d7c8655cb04 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/130107 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/helpcontent2 b/helpcontent2 index 71a2d9e0c995..b54a0e6d50e8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 71a2d9e0c995afbc1d71b7030b536c4590107afc +Subproject commit b54a0e6d50e8eaaa37ca844b1c92d3778d4567cf
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03100100.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b54a0e6d50e8eaaa37ca844b1c92d3778d4567cf Author: Stanislav Horacek AuthorDate: Thu Feb 17 18:04:22 2022 +0100 Commit: Mike Kaganski CommitDate: Sat Feb 19 18:56:43 2022 +0100 correct and reformulate description of CBool example Change-Id: I4a17e3bebc834c095ce909bbb06f0d7c8655cb04 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/130107 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/source/text/sbasic/shared/03100100.xhp b/source/text/sbasic/shared/03100100.xhp index 7dd18de93..66dd198cf 100644 --- a/source/text/sbasic/shared/03100100.xhp +++ b/source/text/sbasic/shared/03100100.xhp @@ -41,7 +41,7 @@ CBool (expression As Variant) As Boolean expression can be a number or a set of combined expressions. - + Boolean @@ -54,7 +54,7 @@ -The following examples computes a logical expression and a mathematical formula. It uses the CBool function to evaluate the value that is returned by the Instr function. The function checks if the word "and" is found in the sentence that was entered by the user. +In the following examples, the CBool function evaluates a logical expression, a mathematical formula and the value that is returned by the Instr function. The function checks if the character "a" is found in the sentence that was entered by the user. Sub ExampleCBool Print CBool( 1>2 Xor 44 ) ' computes to True
[Libreoffice-commits] core.git: icon-themes/karasa_jaga icon-themes/karasa_jaga_svg
icon-themes/karasa_jaga/cmd/32/duplicatesheet.png |binary icon-themes/karasa_jaga/cmd/lc_duplicatesheet.png |binary icon-themes/karasa_jaga/cmd/sc_duplicatesheet.png |binary icon-themes/karasa_jaga_svg/cmd/32/duplicatesheet.svg |1 + icon-themes/karasa_jaga_svg/cmd/lc_duplicatesheet.svg |1 + icon-themes/karasa_jaga_svg/cmd/sc_duplicatesheet.svg |1 + 6 files changed, 3 insertions(+) New commits: commit f5651fc116c41611e3d6d0a6a8462c39b22bdf9c Author: Rizal Muttaqin AuthorDate: Sat Feb 19 14:13:29 2022 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 19 15:50:31 2022 +0100 KJ: tdf#147521 add Duplicate Sheet icons Change-Id: I439d6b2e0ca5283d6b67c0bd917886258a6bdf66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130184 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/karasa_jaga/cmd/32/duplicatesheet.png b/icon-themes/karasa_jaga/cmd/32/duplicatesheet.png new file mode 100644 index ..0d132825b4d6 Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/duplicatesheet.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_duplicatesheet.png b/icon-themes/karasa_jaga/cmd/lc_duplicatesheet.png new file mode 100644 index ..8f2749d7da4a Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/lc_duplicatesheet.png differ diff --git a/icon-themes/karasa_jaga/cmd/sc_duplicatesheet.png b/icon-themes/karasa_jaga/cmd/sc_duplicatesheet.png new file mode 100644 index ..c980683231df Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/sc_duplicatesheet.png differ diff --git a/icon-themes/karasa_jaga_svg/cmd/32/duplicatesheet.svg b/icon-themes/karasa_jaga_svg/cmd/32/duplicatesheet.svg new file mode 100644 index ..501bbe00f2cc --- /dev/null +++ b/icon-themes/karasa_jaga_svg/cmd/32/duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/karasa_jaga_svg/cmd/lc_duplicatesheet.svg b/icon-themes/karasa_jaga_svg/cmd/lc_duplicatesheet.svg new file mode 100644 index ..608a85524104 --- /dev/null +++ b/icon-themes/karasa_jaga_svg/cmd/lc_duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/karasa_jaga_svg/cmd/sc_duplicatesheet.svg b/icon-themes/karasa_jaga_svg/cmd/sc_duplicatesheet.svg new file mode 100644 index ..1563b50bd41d --- /dev/null +++ b/icon-themes/karasa_jaga_svg/cmd/sc_duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg
icon-themes/sifr/cmd/32/duplicatesheet.png |binary icon-themes/sifr/cmd/32/move.png|binary icon-themes/sifr/cmd/lc_duplicatesheet.png |binary icon-themes/sifr/cmd/lc_move.png|binary icon-themes/sifr/cmd/sc_duplicatesheet.png |binary icon-themes/sifr/cmd/sc_move.png|binary icon-themes/sifr_dark/cmd/32/duplicatesheet.png |binary icon-themes/sifr_dark/cmd/32/move.png |binary icon-themes/sifr_dark/cmd/lc_duplicatesheet.png |binary icon-themes/sifr_dark/cmd/lc_move.png |binary icon-themes/sifr_dark/cmd/sc_duplicatesheet.png |binary icon-themes/sifr_dark/cmd/sc_move.png |binary icon-themes/sifr_dark_svg/cmd/32/duplicatesheet.svg |1 + icon-themes/sifr_dark_svg/cmd/32/move.svg |2 +- icon-themes/sifr_dark_svg/cmd/lc_duplicatesheet.svg |1 + icon-themes/sifr_dark_svg/cmd/lc_move.svg |2 +- icon-themes/sifr_dark_svg/cmd/sc_duplicatesheet.svg |1 + icon-themes/sifr_dark_svg/cmd/sc_move.svg |2 +- icon-themes/sifr_svg/cmd/32/duplicatesheet.svg |1 + icon-themes/sifr_svg/cmd/32/move.svg|2 +- icon-themes/sifr_svg/cmd/lc_duplicatesheet.svg |1 + icon-themes/sifr_svg/cmd/lc_move.svg|2 +- icon-themes/sifr_svg/cmd/sc_duplicatesheet.svg |1 + icon-themes/sifr_svg/cmd/sc_move.svg|2 +- 24 files changed, 12 insertions(+), 6 deletions(-) New commits: commit 92b10e9ca4d6a78d9879380532e069f26a2703ba Author: Rizal Muttaqin AuthorDate: Sat Feb 19 16:10:28 2022 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 19 15:50:11 2022 +0100 Sifr: tdf#147521 add Duplicate Sheet icons Change-Id: Iecbfdee0c6102c7bcfa17f78e2aeaf15041e000c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130185 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/sifr/cmd/32/duplicatesheet.png b/icon-themes/sifr/cmd/32/duplicatesheet.png new file mode 100644 index ..d4f036fe1638 Binary files /dev/null and b/icon-themes/sifr/cmd/32/duplicatesheet.png differ diff --git a/icon-themes/sifr/cmd/32/move.png b/icon-themes/sifr/cmd/32/move.png index dd393323bf25..57f28234c6e5 100644 Binary files a/icon-themes/sifr/cmd/32/move.png and b/icon-themes/sifr/cmd/32/move.png differ diff --git a/icon-themes/sifr/cmd/lc_duplicatesheet.png b/icon-themes/sifr/cmd/lc_duplicatesheet.png new file mode 100644 index ..9b618bc89c3c Binary files /dev/null and b/icon-themes/sifr/cmd/lc_duplicatesheet.png differ diff --git a/icon-themes/sifr/cmd/lc_move.png b/icon-themes/sifr/cmd/lc_move.png index 987353c4329e..ad789bc415d4 100644 Binary files a/icon-themes/sifr/cmd/lc_move.png and b/icon-themes/sifr/cmd/lc_move.png differ diff --git a/icon-themes/sifr/cmd/sc_duplicatesheet.png b/icon-themes/sifr/cmd/sc_duplicatesheet.png new file mode 100644 index ..e0d66a263371 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_duplicatesheet.png differ diff --git a/icon-themes/sifr/cmd/sc_move.png b/icon-themes/sifr/cmd/sc_move.png index a6d3dc3819b2..8221fda79d35 100644 Binary files a/icon-themes/sifr/cmd/sc_move.png and b/icon-themes/sifr/cmd/sc_move.png differ diff --git a/icon-themes/sifr_dark/cmd/32/duplicatesheet.png b/icon-themes/sifr_dark/cmd/32/duplicatesheet.png new file mode 100644 index ..b8c226e5505e Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/duplicatesheet.png differ diff --git a/icon-themes/sifr_dark/cmd/32/move.png b/icon-themes/sifr_dark/cmd/32/move.png index 63507d832cb9..475927f20bc1 100644 Binary files a/icon-themes/sifr_dark/cmd/32/move.png and b/icon-themes/sifr_dark/cmd/32/move.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_duplicatesheet.png b/icon-themes/sifr_dark/cmd/lc_duplicatesheet.png new file mode 100644 index ..ddae1afcd10f Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_duplicatesheet.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_move.png b/icon-themes/sifr_dark/cmd/lc_move.png index a5226881c766..7e72932fb76f 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_move.png and b/icon-themes/sifr_dark/cmd/lc_move.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_duplicatesheet.png b/icon-themes/sifr_dark/cmd/sc_duplicatesheet.png new file mode 100644 index ..1a5f45985706 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_duplicatesheet.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_move.png b/icon-themes/sifr_dark/cmd/sc_move.png index 59bb1df78491..ea4a57912931 100644 Binary files a/icon-themes/sifr_dark/cmd/sc_move.png and b/icon-themes/sifr_dark/cmd/sc_move.png differ diff --git a/icon-themes/sifr_dark_svg/cmd/32/duplicatesheet.svg b/icon-themes/sifr_dark_svg/cmd/32/duplicatesheet.svg new file mode 100644 index ..17c9ff249209 --- /dev/null +++ b/icon-themes/sifr_da
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr4.cxx |9 +++-- sc/source/core/tool/interpr8.cxx | 18 ++ 2 files changed, 9 insertions(+), 18 deletions(-) New commits: commit 400568f51c63f5ec8de08a3255ce83cc1b0bdb66 Author: Luboš Luňák AuthorDate: Sat Feb 19 13:21:19 2022 +0100 Commit: Luboš Luňák CommitDate: Sat Feb 19 14:13:04 2022 +0100 simplify code using PutInOrder() Change-Id: I71efd7ef83618d4f556dd6a0baa8ca6ffec17392 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130194 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 28ceba647ccf..27170ca94490 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -944,12 +944,9 @@ void ScInterpreter::DoubleRefToVars( const formula::FormulaToken* p, const ScComplexRefData& rCRef = *p->GetDoubleRef(); SingleRefToVars( rCRef.Ref1, rCol1, rRow1, rTab1); SingleRefToVars( rCRef.Ref2, rCol2, rRow2, rTab2); -if (rCol2 < rCol1) -std::swap( rCol2, rCol1); -if (rRow2 < rRow1) -std::swap( rRow2, rRow1); -if (rTab2 < rTab1) -std::swap( rTab2, rTab1); +PutInOrder(rCol1, rCol2); +PutInOrder(rRow1, rRow2); +PutInOrder(rTab1, rTab2); if (!mrDoc.m_TableOpList.empty()) { ScRange aRange( rCol1, rRow1, rTab1, rCol2, rRow2, rTab2 ); diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 124205e46aaa..df75c92d41f1 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -1434,10 +1434,8 @@ void ScInterpreter::ScConcat_MS() SetError( FormulaError::IllegalParameter); break; } -if ( nRow1 > nRow2 ) -std::swap( nRow1, nRow2 ); -if ( nCol1 > nCol2 ) -std::swap( nCol1, nCol2 ); +PutInOrder( nRow1, nRow2 ); +PutInOrder( nCol1, nCol2 ); ScAddress aAdr; aAdr.SetTab( nTab1 ); for ( SCROW nRow = nRow1; nRow <= nRow2; nRow++ ) @@ -1559,10 +1557,8 @@ void ScInterpreter::ScTextJoin_MS() SetError( FormulaError::IllegalParameter); break; } -if ( nRow1 > nRow2 ) -std::swap( nRow1, nRow2 ); -if ( nCol1 > nCol2 ) -std::swap( nCol1, nCol2 ); +PutInOrder( nRow1, nRow2 ); +PutInOrder( nCol1, nCol2 ); ScAddress aAdr; aAdr.SetTab( nTab1 ); for ( SCROW nRow = nRow1; nRow <= nRow2; nRow++ ) @@ -1712,10 +1708,8 @@ void ScInterpreter::ScTextJoin_MS() SetError( FormulaError::IllegalParameter); break; } -if ( nRow1 > nRow2 ) -std::swap( nRow1, nRow2 ); -if ( nCol1 > nCol2 ) -std::swap( nCol1, nCol2 ); +PutInOrder( nRow1, nRow2 ); +PutInOrder( nCol1, nCol2 ); ScAddress aAdr; aAdr.SetTab( nTab1 ); OUString aStr;
[Libreoffice-commits] core.git: uitest/ui_logger_dsl
uitest/ui_logger_dsl/General_commands.tx | 16 - uitest/ui_logger_dsl/Special_commands.tx | 43 +++--- uitest/ui_logger_dsl/UI_Object_commands.tx| 14 uitest/ui_logger_dsl/dialog_commands.tx | 10 +++--- uitest/ui_logger_dsl/dsl_core.py | 12 +-- uitest/ui_logger_dsl/starter_commands.tx |7 +--- uitest/ui_logger_dsl/ui_logger_dsl_grammar.tx | 14 uitest/ui_logger_dsl/uno_commands.tx |6 +-- 8 files changed, 53 insertions(+), 69 deletions(-) New commits: commit 94fc8eaba84a328ea064ee13efdd405e61209a50 Author: Ilmari Lauhakangas AuthorDate: Sat Feb 19 13:00:36 2022 +0200 Commit: Ilmari Lauhakangas CommitDate: Sat Feb 19 13:36:43 2022 +0100 uilogger: improve language in comments Change-Id: I8406bdf375cf83d504e45a5c8f27ce2ceb1f9c51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130190 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/uitest/ui_logger_dsl/General_commands.tx b/uitest/ui_logger_dsl/General_commands.tx index 5f5c404402f5..2be59ce75f1a 100644 --- a/uitest/ui_logger_dsl/General_commands.tx +++ b/uitest/ui_logger_dsl/General_commands.tx @@ -1,9 +1,8 @@ /* -This file for the log statements that is general for all application -we can use it as general commands then relate it to its application -as we have in the starter command -// -also I make set zoom to be general as it will be better +This file is for the log statements that are general for all applications. +We can use them as general rules for commands and relate them to the +applications found in starter_commands.tx +Zoom is also general as it is better to treat it that way. */ import type_options @@ -21,9 +20,8 @@ Select_command: 'Select ' '{"OBJECT":' name=STRING '}' ; -//== -//This Part if you want to type text in any of these UI elements This will be handled with this Grammar +// This part is for typing text in any of these UI elements General_type_command_on_UI_Object: - 'Type on' UI_Obj=STRING what_to_type=Type_options 'from' parent_id=ID -; \ No newline at end of file + 'Type on' UI_Obj=STRING what_to_type=Type_options 'from' parent_id=ID +; diff --git a/uitest/ui_logger_dsl/Special_commands.tx b/uitest/ui_logger_dsl/Special_commands.tx index 9d37029a5e95..fb3a6e235fa9 100644 --- a/uitest/ui_logger_dsl/Special_commands.tx +++ b/uitest/ui_logger_dsl/Special_commands.tx @@ -1,16 +1,16 @@ -import type_options - /* -This file for the log statements that relates to each different applications -Each Grammar Command here is related to his own application +This file is for the log statements that relate to each application. +Each grammar rule here is related to a specific application. */ +import type_options + SpecialCommand: writer_command | calc_command | impress_command | math_command | draw_command ; /* - This part for all the writer log statements: + This part is for all the Writer log statements: 1) Type 2) Select @@ -20,8 +20,6 @@ SpecialCommand: 6) Cut Text 7) Paste Text 8) Insert Break Page - - then we can add whatever we need in the future */ writer_command: writer_Type_command | writer_Select_command | writer_GOTO_command | @@ -32,7 +30,7 @@ writer_Type_command: 'Type on writer' what_to_type=Type_options ; writer_Select_command: - 'Select from Pos' from_pos=INT 'to Pos' to_pos=INT + 'Select from Pos' from_pos=INT 'to Pos' to_pos=INT ; writer_GOTO_command: 'GOTO page number' page_num=INT @@ -53,9 +51,8 @@ writer_Insert_BreakPage: 'Insert Break Page' ; -//=// /* - This part for all the calc log statements: + This part is for all the Calc log statements: 1) select sheet 2) Select cell or range @@ -71,13 +68,11 @@ writer_Insert_BreakPage: 12) Unmerge Cells 13) Open Comment 14) Close Comment - - then we can add whatever we need in the future */ calc_command: calc_Type_command | calc_switch_sheet | calc_Select_cell | calc_AutoFill_filter | calc_SelectMenu_filter | calc_Delete_Cells | calc_Remove_Content | calc_insert_cells | - calc_Cut_Cells | calc_Copy_Cells | calc_Paste_Cells | calc_UNMerge_Cells | + calc_Cut_Cells | calc_Copy_Cells | calc_Paste_Cells | calc_UNMerge_Cells | calc_Merge_Cells | calc_Rename_Sheet | calc_Insert_sheet | calc_Open_Comment | calc_Close_Comment ; @@ -144,17 +139,14 @@ select_options: one_cell | range_of_cells ; -//=// /* - This part for all the impress log statements: + This part is for all the Impress log statements: 1) Type 2) Insert New Slide 3) Delete Slide 4) Duplicate Slide 5) Renam
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/address.hxx |4 ++-- sc/source/core/data/column.cxx |3 ++- sc/source/core/data/conditio.cxx|2 +- sc/source/core/data/drwlayer.cxx|7 --- sc/source/core/data/formulacell.cxx |2 +- sc/source/core/tool/address.cxx | 22 +++--- sc/source/core/tool/token.cxx | 18 +- sc/source/filter/html/htmlimp.cxx |2 +- sc/source/filter/html/htmlpars.cxx | 25 ++--- sc/source/filter/inc/htmlpars.hxx | 10 +++--- sc/source/ui/docshell/docfunc.cxx |4 ++-- sc/source/ui/view/gridwin.cxx |8 12 files changed, 58 insertions(+), 49 deletions(-) New commits: commit 725e1066cbe3bbd6759b3e7396bc5d0ecb55a504 Author: Luboš Luňák AuthorDate: Sat Feb 19 10:29:32 2022 +0100 Commit: Luboš Luňák CommitDate: Sat Feb 19 12:42:54 2022 +0100 remove MAXCOL/MAXROW from ScAddress/ScRange (tdf#147509) Change-Id: I4e80bba8b866f9915a6600ce67774380e619c2e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130188 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index dab74ac0fcc0..4532fffec32d 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -352,7 +352,7 @@ public: The document for the maximum defined sheet number. */ [[nodiscard]] SC_DLLPUBLIC bool Move( SCCOL nDeltaX, SCROW nDeltaY, SCTAB nDeltaZ, -ScAddress& rErrorPos, const ScDocument* pDocument = nullptr ); +ScAddress& rErrorPos, const ScDocument& rDoc ); inline bool operator==( const ScAddress& rAddress ) const; inline bool operator!=( const ScAddress& rAddress ) const; @@ -622,7 +622,7 @@ public: The document for the maximum defined sheet number. */ [[nodiscard]] bool Move( SCCOL aDeltaX, SCROW aDeltaY, SCTAB aDeltaZ, -ScRange& rErrorRange, const ScDocument* pDocument = nullptr ); +ScRange& rErrorRange, const ScDocument& rDoc ); /** Same as Move() but with sticky end col/row anchors. */ [[nodiscard]] bool MoveSticky( const ScDocument& rDoc, SCCOL aDeltaX, SCROW aDeltaY, SCTAB aDeltaZ, diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 80a667801aac..167a3541f511 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2186,7 +2186,8 @@ class UpdateRefOnNonCopy for (++pp; pp != ppEnd; ++pp) // skip the top cell. { ScFormulaCell* pFC = *pp; -if (!pFC->aPos.Move(mpCxt->mnColDelta, mpCxt->mnRowDelta, mpCxt->mnTabDelta, aErrorPos)) +if (!pFC->aPos.Move(mpCxt->mnColDelta, mpCxt->mnRowDelta, mpCxt->mnTabDelta, +aErrorPos, mpCxt->mrDoc)) { assert(!"can't move formula cell"); } diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 841238883dcb..ab5bfce9814a 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -500,7 +500,7 @@ void ScConditionEntry::UpdateReference( sc::RefUpdateContext& rCxt ) if (rCxt.meMode == URM_INSDEL && rCxt.maRange.Contains(aSrcPos)) { ScAddress aErrorPos( ScAddress::UNINITIALIZED ); -if (!aSrcPos.Move(rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta, aErrorPos)) +if (!aSrcPos.Move(rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta, aErrorPos, *mpDoc)) { assert(!"can't move ScConditionEntry"); } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index e625868b5466..47985ebeda51 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -1769,7 +1769,8 @@ static bool lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, return true;// everything is fine } -static bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos ) +static bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, +const ScAddress& rDestPos, const ScDocument& rDoc ) { bool bChanged = false; @@ -1784,7 +1785,7 @@ static bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const S SCCOL nDiffX = rDestPos.Col() - rSourceRange.aStart.Col(); SCROW nDiffY = rDestPos.Row() - rSourceRange.aStart.Row(); SCTAB nDiffZ = rDestPos.Tab() - rSourceRange.aStart.Tab(); -if (!rRange.Move( nDiffX, nDiffY, nDiffZ, aErrorRange)) +if (!rRange.Move( nDiffX, nDiffY, nDiffZ, aErrorRange, rDoc )) { assert(!"can't move range"); } @@ -1957,7 +1958,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipMo
[Libreoffice-commits] core.git: avmedia/source include/avmedia svx/inc svx/source
avmedia/source/viewer/mediawindow.cxx |8 - include/avmedia/mediawindow.hxx |1 svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx|4 svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx | 65 -- 4 files changed, 47 insertions(+), 31 deletions(-) New commits: commit 6f938dce6eaa927cfde39491ef7a0bc1d07df66b Author: Caolán McNamara AuthorDate: Fri Feb 18 21:09:30 2022 + Commit: Caolán McNamara CommitDate: Sat Feb 19 12:01:54 2022 +0100 update video pos and size after change if currently playing I'd prefer if it changed size during the resizing/repositioning, but at least make it immediately take the final size after the resize/reposition has happened. Change-Id: Ic3b4dd23921ad5cf6092f1514dd6538f9946998a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130178 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 6c61a7e9b361..c251f020225e 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -142,30 +142,30 @@ bool MediaWindow::start() return mpImpl->start(); } - void MediaWindow::updateMediaItem( MediaItem& rItem ) const { mpImpl->updateMediaItem( rItem ); } - void MediaWindow::executeMediaItem( const MediaItem& rItem ) { mpImpl->executeMediaItem( rItem ); } - void MediaWindow::show() { mpImpl->Show(); } - void MediaWindow::hide() { mpImpl->Hide(); } +bool MediaWindow::isVisible() const +{ +return mpImpl->IsVisible(); +} vcl::Window* MediaWindow::getWindow() const { diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 78e0b1a299a3..d031f51adaf0 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -74,6 +74,7 @@ namespace avmedia voidshow(); voidhide(); +boolisVisible() const; public: diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index 21fbed38142c..d362048df3db 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -51,7 +51,11 @@ namespace sdr::contact voidupdateMediaItem( ::avmedia::MediaItem& rItem ) const; voidexecuteMediaItem( const ::avmedia::MediaItem& rItem ); +virtual void ActionChanged() override; + private: +void updateMediaWindow() const; + #if HAVE_FEATURE_AVMEDIA std::unique_ptr mpMediaWindow; #endif diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index 27768ff0777f..0241fabd5661 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -84,6 +84,43 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const return aRet; } +void ViewObjectContactOfSdrMediaObj::ActionChanged() +{ +ViewObjectContactOfSdrObj::ActionChanged(); +if (mpMediaWindow && mpMediaWindow->isVisible()) +updateMediaWindow(); +} + +void ViewObjectContactOfSdrMediaObj::updateMediaWindow() const +{ +basegfx::B2DRange aViewRange(getObjectRange()); + aViewRange.transform(GetObjectContact().getViewInformation2D().getViewTransformation()); + +const tools::Rectangle aViewRectangle( +static_cast(floor(aViewRange.getMinX())), static_cast(floor(aViewRange.getMinY())), +static_cast(ceil(aViewRange.getMaxX())), static_cast(ceil(aViewRange.getMaxY(; + +// mpMediaWindow contains a SalObject window and gtk won't accept +// the size until after the SalObject widget is shown but if we +// show it before setting a size then vcl will detect that the +// vcl::Window has no size and make it invisible instead. If we +// call setPosSize twice with the same size before and after show +// then the second attempt is a no-op as vcl caches the size. + +// so call it initially with a size arbitrarily 1 pixel wider than +// we want so we have an initial size to make vcl happy +tools::Rectangle aInitialRect(aViewRectangle); +aInitialRect.AdjustRight(1); +mpMediaWindow->setPosSize(aInitialRect); + +// then make it visible +mpMediaWindow->show(); + +// set the final desired size which is different to let vcl send it +// through to gtk which will now accept it as the underlying +// m_pSocket of GtkSalObject::SetPosSize is now visible +mpMediaWindow->setPosSize(aViewRectangle); +} void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const { @@ -100,33 +137,7 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem(
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/gtk/gtkplayer.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f10ac3e5bd720e363e5c76a2c841dded4859a7a0 Author: Caolán McNamara AuthorDate: Fri Feb 18 20:35:01 2022 + Commit: Caolán McNamara CommitDate: Sat Feb 19 12:01:32 2022 +0100 gtk4: use gtk_widget_set_can_target so the video can be picked up and moved at least the rect it should stick to can be picked up and moved Change-Id: I71b53865049fef8dc3efa09dd441d66003ed1f47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130177 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/avmedia/source/gtk/gtkplayer.cxx b/avmedia/source/gtk/gtkplayer.cxx index ea6276e02a59..098e8b3b6fe6 100644 --- a/avmedia/source/gtk/gtkplayer.cxx +++ b/avmedia/source/gtk/gtkplayer.cxx @@ -272,10 +272,12 @@ uno::Reference<::media::XPlayerWindow> m_pVideo = gtk_picture_new_for_paintable(GDK_PAINTABLE(m_pStream)); gtk_picture_set_keep_aspect_ratio(GTK_PICTURE(m_pVideo), false); +gtk_widget_set_can_target(m_pVideo, false); gtk_widget_set_vexpand(m_pVideo, true); gtk_widget_set_hexpand(m_pVideo, true); GtkWidget* pParent = static_cast(pEnvData->pWidget); +gtk_widget_set_can_target(pParent, false); gtk_grid_attach(GTK_GRID(pParent), m_pVideo, 0, 0, 1, 1); gtk_widget_show(m_pVideo); gtk_widget_show(pParent); @@ -355,7 +357,7 @@ uno::Reference SAL_CALL GtkPlayer::createFrameGrabber() rtl::Reference xFrameGrabber; SAL_WARN("avmedia.gtk", "TODO: createFrameGrabber"); -const awt::Size aPrefSize(getPreferredPlayerWindowSize()); +// const awt::Size aPrefSize(getPreferredPlayerWindowSize()); xFrameGrabber.set(new GtkFrameGrabber(m_pStream));
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/gtk/gtkplayer.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 62d9d64c90eaf4b6d8ff20b615c5645e12a9cba9 Author: Caolán McNamara AuthorDate: Fri Feb 18 20:13:10 2022 + Commit: Caolán McNamara CommitDate: Sat Feb 19 12:01:10 2022 +0100 gtk4: the assumption is that video is supposed to fit to the window Change-Id: Iacc31ee978a1279c23ac895fb6f8fd610ab3113d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130176 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/avmedia/source/gtk/gtkplayer.cxx b/avmedia/source/gtk/gtkplayer.cxx index b01eaeeed630..ea6276e02a59 100644 --- a/avmedia/source/gtk/gtkplayer.cxx +++ b/avmedia/source/gtk/gtkplayer.cxx @@ -271,6 +271,7 @@ uno::Reference<::media::XPlayerWindow> return nullptr; m_pVideo = gtk_picture_new_for_paintable(GDK_PAINTABLE(m_pStream)); +gtk_picture_set_keep_aspect_ratio(GTK_PICTURE(m_pVideo), false); gtk_widget_set_vexpand(m_pVideo, true); gtk_widget_set_hexpand(m_pVideo, true);
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/flowfrm.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 869a2228401195179deea0a6ad994183841c2c4d Author: Caolán McNamara AuthorDate: Fri Feb 18 19:51:13 2022 + Commit: Caolán McNamara CommitDate: Sat Feb 19 12:00:24 2022 +0100 cid#1500273 silence Dereference null return value this has been unchecked since the initial commit, so let's assume its intentional Change-Id: Iefe5ea1c49b6e97d3b7bb1021d214c00d4369c72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130174 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index c53512b2763a..9fb4575e98c8 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2339,6 +2339,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat ) else { const SwFrame *pCol = m_rThis.FindColFrame(); +assert(pCol); bool bGoOn = true; bool bJump = false; do
[Libreoffice-commits] core.git: offapi/com
0 files changed New commits: commit 8a34ce5c3a1c4feffefa8a6c9315aed61cede2e6 Author: Andrea Gelmini AuthorDate: Sat Feb 19 10:24:05 2022 +0100 Commit: Julien Nabet CommitDate: Sat Feb 19 11:52:48 2022 +0100 Removed executable bits on idl file Change-Id: I1579cf509d3c3d50de2ebb1a03e6ca01fe27820a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130187 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeMetalType.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeMetalType.idl old mode 100755 new mode 100644
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/CRowSetColumn.cxx | 51 +++- dbaccess/source/core/api/CRowSetDataColumn.cxx | 50 +++- dbaccess/source/core/api/resultcolumn.cxx | 52 - dbaccess/source/core/api/resultset.cxx | 22 +- dbaccess/source/core/api/statement.cxx | 30 +++--- dbaccess/source/core/dataaccess/datasource.cxx | 38 +- 6 files changed, 119 insertions(+), 124 deletions(-) New commits: commit ec41dcdddb47f39ede581ce00dc20ecd4fe3458b Author: Julien Nabet AuthorDate: Sat Feb 19 11:00:59 2022 +0100 Commit: Julien Nabet CommitDate: Sat Feb 19 11:51:59 2022 +0100 Simplify sequence of Property in dbaccess Change-Id: I270702ad4b4878ee5c1942be3c45eae370f37f8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130189 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 56328bd18009..98435b7c4498 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -44,33 +44,30 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData ::cppu::IPropertyArrayHelper* ORowSetColumn::createArrayHelper( ) const { -css::uno::Sequence< css::beans::Property> aDescriptor(21); -css::beans::Property* pDesc = aDescriptor.getArray(); -sal_Int32 nPos = 0; - -pDesc[nPos++] = css::beans::Property(PROPERTY_CATALOGNAME, PROPERTY_ID_CATALOGNAME, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_DISPLAYSIZE, PROPERTY_ID_DISPLAYSIZE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISAUTOINCREMENT, PROPERTY_ID_ISAUTOINCREMENT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISCASESENSITIVE, PROPERTY_ID_ISCASESENSITIVE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISCURRENCY, PROPERTY_ID_ISCURRENCY, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISDEFINITELYWRITABLE, PROPERTY_ID_ISDEFINITELYWRITABLE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISNULLABLE, PROPERTY_ID_ISNULLABLE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISREADONLY, PROPERTY_ID_ISREADONLY, cppu::UnoType::get(), css::beans::PropertyAttribute::BOUND ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISROWVERSION, PROPERTY_ID_ISROWVERSION, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISSEARCHABLE, PROPERTY_ID_ISSEARCHABLE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISSIGNED, PROPERTY_ID_ISSIGNED, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_ISWRITABLE, PROPERTY_ID_ISWRITABLE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_LABEL, PROPERTY_ID_LABEL, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_PRECISION, PROPERTY_ID_PRECISION, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_SCALE, PROPERTY_ID_SCALE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_SCHEMANAME, PROPERTY_ID_SCHEMANAME, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_SERVICENAME, PROPERTY_ID_SERVICENAME, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_TABLENAME, PROPERTY_ID_TABLENAME, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_TYPE, PROPERTY_ID_TYPE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_TYPENAME, PROPERTY_ID_TYPENAME, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY ); -pDesc[nPos++] = css::beans::Property(PROPERTY_VALUE, PROPERTY_ID_VALUE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::BOUND); - -OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); +css::uno::Sequence< css::beans::Property> aDescriptor +{ +{ PROPERTY_CATALOGNAME, PROPERTY_ID_CATALOGNAME, cppu::UnoType::get()
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/duplicatesheet.png |binary icon-themes/elementary/cmd/lc_duplicatesheet.png |binary icon-themes/elementary/cmd/sc_duplicatesheet.png |binary icon-themes/elementary_svg/cmd/32/duplicatesheet.svg |1 + icon-themes/elementary_svg/cmd/lc_duplicatesheet.svg |1 + icon-themes/elementary_svg/cmd/sc_duplicatesheet.svg |1 + 6 files changed, 3 insertions(+) New commits: commit e984de7855659fe96d37c533e4d5a8ba370f4b31 Author: Rizal Muttaqin AuthorDate: Sat Feb 19 13:50:10 2022 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 19 10:14:42 2022 +0100 elementary: tdf#147521 add Duplicate Sheet icons Change-Id: I102efd1dcc7e42e60afb3f0efcfd497a3afde515 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130181 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/duplicatesheet.png b/icon-themes/elementary/cmd/32/duplicatesheet.png new file mode 100644 index ..1eaa38877978 Binary files /dev/null and b/icon-themes/elementary/cmd/32/duplicatesheet.png differ diff --git a/icon-themes/elementary/cmd/lc_duplicatesheet.png b/icon-themes/elementary/cmd/lc_duplicatesheet.png new file mode 100644 index ..860ef50648e6 Binary files /dev/null and b/icon-themes/elementary/cmd/lc_duplicatesheet.png differ diff --git a/icon-themes/elementary/cmd/sc_duplicatesheet.png b/icon-themes/elementary/cmd/sc_duplicatesheet.png new file mode 100644 index ..61c338eb550d Binary files /dev/null and b/icon-themes/elementary/cmd/sc_duplicatesheet.png differ diff --git a/icon-themes/elementary_svg/cmd/32/duplicatesheet.svg b/icon-themes/elementary_svg/cmd/32/duplicatesheet.svg new file mode 100644 index ..9b5e660fa354 --- /dev/null +++ b/icon-themes/elementary_svg/cmd/32/duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/cmd/lc_duplicatesheet.svg b/icon-themes/elementary_svg/cmd/lc_duplicatesheet.svg new file mode 100644 index ..5d0ceee2712a --- /dev/null +++ b/icon-themes/elementary_svg/cmd/lc_duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/cmd/sc_duplicatesheet.svg b/icon-themes/elementary_svg/cmd/sc_duplicatesheet.svg new file mode 100644 index ..95db1995cbd2 --- /dev/null +++ b/icon-themes/elementary_svg/cmd/sc_duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - filter/source
filter/source/svg/svgwriter.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 0716aee2a3e06289379224ba93c9afb4b81248a1 Author: Marco Cecchetti AuthorDate: Mon Feb 14 15:53:08 2022 +0100 Commit: Andras Timar CommitDate: Sat Feb 19 10:06:44 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 Reviewed-by: Jan Holesovsky (cherry picked from commit 5eec28d86a5953de3aa0d5f0c424e92334860270) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129939 Tested-by: Jenkins Reviewed-by: Marco Cecchetti (cherry picked from commit 76a98fa478ac8e75cf3f982e4f65548d69371b39) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129944 Reviewed-by: Andras Timar 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 ); }
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/module_ooo.ulf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0a3678ef3b048d166179513670633e1bb3acfb8 Author: Julien Nabet AuthorDate: Fri Feb 18 17:42:01 2022 +0100 Commit: Julien Nabet CommitDate: Sat Feb 19 10:00:00 2022 +0100 Fix "Adding Central Kurdish(ckb) Spell Checker & Dictionary" Change-Id: I494c515e91ddcab469941ce04d08e9b11974ee7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130169 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf index c900375278f8..9fcbda9fec88 100644 --- a/scp2/source/ooo/module_ooo.ulf +++ b/scp2/source/ooo/module_ooo.ulf @@ -103,7 +103,7 @@ en-US = "Catalan spelling dictionary, hyphenation rules, and thesaurus" [STR_NAME_MODULE_EXTENSION_DICTIONARY_CKB] en-US = "Central Kurdish" -[STR_DESC_MODULE_EXTENSION_DICTIONARY_CS] +[STR_DESC_MODULE_EXTENSION_DICTIONARY_CKB] en-US = "Central Kurdish spelling dictionary" [STR_NAME_MODULE_EXTENSION_DICTIONARY_CS]
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/duplicatesheet.png |binary icon-themes/colibre/cmd/lc_duplicatesheet.png |binary icon-themes/colibre/cmd/sc_duplicatesheet.png |binary icon-themes/colibre_svg/cmd/32/duplicatesheet.svg |1 + icon-themes/colibre_svg/cmd/lc_duplicatesheet.svg |1 + icon-themes/colibre_svg/cmd/sc_duplicatesheet.svg |4 6 files changed, 6 insertions(+) New commits: commit 6fd0d51549ef750e9e3c77ece7b4ab05ccf8ab23 Author: Rizal Muttaqin AuthorDate: Sat Feb 19 13:58:35 2022 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 19 09:29:05 2022 +0100 Colibre: tdf#147521 add Duplicate Sheet icons Change-Id: I6f5df1857af9e0b0f81220658d09bab7ff0d6d7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130183 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/duplicatesheet.png b/icon-themes/colibre/cmd/32/duplicatesheet.png new file mode 100644 index ..cc8fa4d2a70d Binary files /dev/null and b/icon-themes/colibre/cmd/32/duplicatesheet.png differ diff --git a/icon-themes/colibre/cmd/lc_duplicatesheet.png b/icon-themes/colibre/cmd/lc_duplicatesheet.png new file mode 100644 index ..0c203e583226 Binary files /dev/null and b/icon-themes/colibre/cmd/lc_duplicatesheet.png differ diff --git a/icon-themes/colibre/cmd/sc_duplicatesheet.png b/icon-themes/colibre/cmd/sc_duplicatesheet.png new file mode 100644 index ..ea1d33eb6f68 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_duplicatesheet.png differ diff --git a/icon-themes/colibre_svg/cmd/32/duplicatesheet.svg b/icon-themes/colibre_svg/cmd/32/duplicatesheet.svg new file mode 100644 index ..1c36bb8b3f3d --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/lc_duplicatesheet.svg b/icon-themes/colibre_svg/cmd/lc_duplicatesheet.svg new file mode 100644 index ..608841badd0b --- /dev/null +++ b/icon-themes/colibre_svg/cmd/lc_duplicatesheet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sc_duplicatesheet.svg b/icon-themes/colibre_svg/cmd/sc_duplicatesheet.svg new file mode 100644 index ..bb95f2c8d91f --- /dev/null +++ b/icon-themes/colibre_svg/cmd/sc_duplicatesheet.svg @@ -0,0 +1,4 @@ +http://www.w3.org/2000/svg";> + + +/&amp;amp;amp;amp;amp;gt; \ No newline at end of file
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - chart2/uiconfig
chart2/uiconfig/ui/tp_SeriesToAxis.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 23ab6c3c42beff3d7436db8dede9330dbe870bcc Author: Caolán McNamara AuthorDate: Fri Feb 18 09:04:41 2022 + Commit: Adolfo Jayme Barrientos CommitDate: Sat Feb 19 09:11:06 2022 +0100 Resolves: tdf#147393 SpinButtons should be can-focus Change-Id: I092ed9c3421267ea3b2c671020e7079c3f792e17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130095 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui b/chart2/uiconfig/ui/tp_SeriesToAxis.ui index d6e2e1b91369..79b1817019e6 100644 --- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui +++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui @@ -146,7 +146,7 @@ True -False +True adjustmentGAP True @@ -163,7 +163,7 @@ True -False +True adjustmentOVERLAP True
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - chart2/uiconfig
chart2/uiconfig/ui/tp_SeriesToAxis.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a4a8eff788919ce9a2f458e1b0e3393547be7954 Author: Caolán McNamara AuthorDate: Fri Feb 18 09:04:41 2022 + Commit: Adolfo Jayme Barrientos CommitDate: Sat Feb 19 09:10:47 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 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 @@ True -False +True adjustmentGAP True @@ -162,7 +162,7 @@ True -False +True adjustmentOVERLAP True