core.git: Changes to 'refs/tags/cp-24.04.1-4'

[Aron Budea (via logerrit)]

Tag 'cp-24.04.1-4' created by Aron Budea  at 
2024-04-24 11:42 +

cp-24.04.1-4

Changes since cp-24.04.1-3-5:
---
 0 files changed
---

core.git: Branch 'distro/collabora/co-24.04' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 91ae3cd2d8d77b19fdda6e819fae5f2d15395db5
Author: Aron Budea 
AuthorDate: Wed Apr 24 13:24:20 2024 +0200
Commit: Aron Budea 
CommitDate: Wed Apr 24 13:24:20 2024 +0200

Bump version to 24.04.1.4

Change-Id: I94576bbd5fde3526450640cc7aeee5859d6da504

diff --git a/configure.ac b/configure.ac
index 50351e596c1e..9919fc0ea251 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[24.04.1.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[24.04.1.4],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-24-2' - vcl/source

[Aron Budea (via logerrit)]

 vcl/source/gdi/sallayout.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit beff8cb9344f13ddbcdc667ad6b73d2d405fa21d
Author: Aron Budea 
AuthorDate: Sat Apr 6 22:48:07 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 8 16:55:48 2024 +0200

tdf#160342 Unwanted space before end of line when printing

Also adjust some numeric literals to reflect they're
floating point values in the expressions.

Regression from 172b500ccbc8dac0496cc2936a9bcca793c0b594.

Change-Id: I8281ba7c7d480135471ba94b11d447d76fd33063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165860
Tested-by: Jenkins
Reviewed-by: Aron Budea 
(cherry picked from commit 357f07bfd96da6cca87fcf0ef339495c2fea6937)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165836
Reviewed-by: خالد حسني 
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index af281127ba86..d052ab53221b 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -292,7 +292,7 @@ void GenericSalLayout::Justify(double nNewWidth)
 std::vector::iterator pGlyphIter;
 // count stretchable glyphs
 int nStretchable = 0;
-double nMaxGlyphWidth = 0;
+double nMaxGlyphWidth = 0.0;
 for(pGlyphIter = m_GlyphItems.begin(); pGlyphIter != pGlyphIterRight; 
++pGlyphIter)
 {
 if( !pGlyphIter->IsInCluster() )
@@ -303,7 +303,7 @@ void GenericSalLayout::Justify(double nNewWidth)
 
 // move rightmost glyph to requested position
 nOldWidth -= pGlyphIterRight->origWidth();
-if( nOldWidth <= 0 )
+if( nOldWidth <= 0.0 )
 return;
 if( nNewWidth < nMaxGlyphWidth)
 nNewWidth = nMaxGlyphWidth;
@@ -312,10 +312,10 @@ void GenericSalLayout::Justify(double nNewWidth)
 
 // justify glyph widths and positions
 double nDiffWidth = nNewWidth - nOldWidth;
-if( nDiffWidth >= 0) // expanded case
+if( nDiffWidth >= 0.0 ) // expanded case
 {
 // expand width by distributing space between glyphs evenly
-int nDeltaSum = 0;
+double nDeltaSum = 0.0;
 for( pGlyphIter = m_GlyphItems.begin(); pGlyphIter != pGlyphIterRight; 
++pGlyphIter )
 {
 // move glyph to justified position

core.git: vcl/source

[Aron Budea (via logerrit)]

 vcl/source/gdi/sallayout.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1a856fcede54b37701089849a838b6d52bb04b8c
Author: Aron Budea 
AuthorDate: Sat Apr 6 22:48:07 2024 +0200
Commit: Aron Budea 
CommitDate: Sun Apr 7 09:35:19 2024 +0200

tdf#160342 Unwanted space before end of line when printing

Also adjust some numeric literals to reflect they're
floating point values in the expressions.

Regression from 172b500ccbc8dac0496cc2936a9bcca793c0b594.

Change-Id: I8281ba7c7d480135471ba94b11d447d76fd33063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165860
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 3240e481578f..28138c3f61fd 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -304,7 +304,7 @@ void GenericSalLayout::Justify(double nNewWidth)
 std::vector::iterator pGlyphIter;
 // count stretchable glyphs
 int nStretchable = 0;
-double nMaxGlyphWidth = 0;
+double nMaxGlyphWidth = 0.0;
 for(pGlyphIter = m_GlyphItems.begin(); pGlyphIter != pGlyphIterRight; 
++pGlyphIter)
 {
 if( !pGlyphIter->IsInCluster() )
@@ -315,7 +315,7 @@ void GenericSalLayout::Justify(double nNewWidth)
 
 // move rightmost glyph to requested position
 nOldWidth -= pGlyphIterRight->origWidth();
-if( nOldWidth <= 0 )
+if( nOldWidth <= 0.0 )
 return;
 if( nNewWidth < nMaxGlyphWidth)
 nNewWidth = nMaxGlyphWidth;
@@ -324,10 +324,10 @@ void GenericSalLayout::Justify(double nNewWidth)
 
 // justify glyph widths and positions
 double nDiffWidth = nNewWidth - nOldWidth;
-if( nDiffWidth >= 0) // expanded case
+if( nDiffWidth >= 0.0 ) // expanded case
 {
 // expand width by distributing space between glyphs evenly
-int nDeltaSum = 0;
+double nDeltaSum = 0.0;
 for( pGlyphIter = m_GlyphItems.begin(); pGlyphIter != pGlyphIterRight; 
++pGlyphIter )
 {
 // move glyph to justified position

core.git: Branch 'distro/collabora/co-23.05' - desktop/source sfx2/source

[Aron Budea (via logerrit)]

 desktop/source/lib/init.cxx  |2 ++
 sfx2/source/control/unoctitm.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit f74a502670dc7b4cba3100df58ed0d07b6906c67
Author: Aron Budea 
AuthorDate: Tue Mar 12 18:20:24 2024 +1030
Commit: Aron Budea 
CommitDate: Mon Apr 1 02:18:18 2024 +0200

lok: Send Accept / RejectTrackedChangedToNext state change

Change-Id: I194c0c3260fe90273f5b5f50c18a63e48ae85449
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164699
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 
(cherry picked from commit ee979fc26c6509e077be0b746d907d6e13619954)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165586

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 323d0751cb6d..a81b0410d81e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3755,6 +3755,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:ParaspaceDecrease"),
 OUString(".uno:AcceptTrackedChange"),
 OUString(".uno:RejectTrackedChange"),
+OUString(".uno:AcceptTrackedChangeToNext"),
+OUString(".uno:RejectTrackedChangeToNext"),
 OUString(".uno:ShowResolvedAnnotations"),
 OUString(".uno:InsertBreak"),
 OUString(".uno:InsertEndnote"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 10d2230007db..0e3a092cd8b3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1037,6 +1037,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "RejectAllTrackedChanges" ||
  aEvent.FeatureURL.Path == "AcceptTrackedChange" ||
  aEvent.FeatureURL.Path == "RejectTrackedChange" ||
+ aEvent.FeatureURL.Path == "AcceptTrackedChangeToNext" ||
+ aEvent.FeatureURL.Path == "RejectTrackedChangeToNext" ||
  aEvent.FeatureURL.Path == "NextTrackedChange" ||
  aEvent.FeatureURL.Path == "PreviousTrackedChange" ||
  aEvent.FeatureURL.Path == "FormatGroup" ||

core.git: Changes to 'refs/tags/mimo-7.5.9.2.M2'

[Aron Budea (via logerrit)]

Tag 'mimo-7.5.9.2.M2' created by Aron Budea  at 
2024-03-29 16:07 +

mimo-7.5.9.2.M2

Changes since mimo-7.5.9.2.M1-4:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-7.3.7.2.M9'

[Aron Budea (via logerrit)]

Tag 'mimo-7.3.7.2.M9' created by Aron Budea  at 
2024-03-29 16:05 +

mimo-7.3.7.2.M9

Changes since mimo-7.3.7.2.M8-3:
---
 0 files changed
---

core.git: Branch 'distro/mimo/mimo-7-2' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14040f2d6ea496eeaedceff94eb24209fb356df6
Author: Aron Budea 
AuthorDate: Fri Mar 29 02:41:19 2024 +1030
Commit: Aron Budea 
CommitDate: Fri Mar 29 02:41:19 2024 +1030

Bump version to 7.2.7.2.M16

Change-Id: Ic985d8b1508c29e504bed77d8ea418b5155f63e9

diff --git a/configure.ac b/configure.ac
index fe45aab0dfe3..59b390d8c07a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.7.2.M15],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.2.M16],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/mimo/mimo-7-5' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3bc3fd766378649e8c48226a82ef65d986fbc826
Author: Aron Budea 
AuthorDate: Fri Mar 29 00:55:42 2024 +1030
Commit: Aron Budea 
CommitDate: Fri Mar 29 00:55:42 2024 +1030

Bump version to 7.5.9.2.M2

Change-Id: If0ed93f823717fab42d5797f88f7e9397558ba69

diff --git a/configure.ac b/configure.ac
index a1578171e7b6..1c88358d44a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.5.9.2.M1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.9.2.M2],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/mimo/mimo-7-3' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9e9714f9c27f3608b7c19f361aff6af98a7cad6
Author: Aron Budea 
AuthorDate: Fri Mar 29 00:52:19 2024 +1030
Commit: Aron Budea 
CommitDate: Fri Mar 29 00:52:19 2024 +1030

Bump version to 7.3.7.2.M9

Change-Id: I245b17cedfbc84a1224f998b24e1f30d4c892d23

diff --git a/configure.ac b/configure.ac
index 2568674a71f5..c0f0d23ba16a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.3.7.2.M8],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.2.M9],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-23.05' - sc/source

[Aron Budea (via logerrit)]

 sc/source/ui/view/gridwin.cxx  |2 --
 sc/source/ui/view/viewdata.cxx |   26 --
 2 files changed, 28 deletions(-)

New commits:
commit 8f695dd653031863673b099c14fa20841df2cd88
Author: Aron Budea 
AuthorDate: Mon Mar 25 14:55:29 2024 +1030
Commit: Aron Budea 
CommitDate: Mon Mar 25 08:20:41 2024 +0100

Revert "lok calc: show cell cursor on in place editing"

Causes calc/focus_spec.js to fail in COOL.
Or when clicking into formula bar, cell takes back focus.

This reverts commit cc88ad715f80b13efb29744673d044df9c16550c.

Change-Id: I9b43c5893a721fc4c42bf1e5f2ef0f514c127ee5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165263
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index fbb6bceb0e5c..3cf47209647c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6107,8 +6107,6 @@ void ScGridWindow::UpdateAllOverlays()
 
 void ScGridWindow::DeleteCursorOverlay()
 {
-if (comphelper::LibreOfficeKit::isActive() && 
mrViewData.HasEditView(eWhich))
-return;
 ScTabViewShell* pViewShell = mrViewData.GetViewShell();
 pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_CURSOR, "EMPTY");
 SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_CELL_VIEW_CURSOR, 
"rectangle", "EMPTY");
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index c7bd25aabb51..c2ec647d203b 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -71,7 +71,6 @@
 
 #include 
 #include 
-#include 
 
 using namespace com::sun::star;
 
@@ -1519,22 +1518,6 @@ tools::Rectangle ScViewData::GetEditArea( ScSplitPos 
eWhich, SCCOL nPosX, SCROW
 GetEditArea( pPattern, bForceToTop );
 }
 
-namespace {
-
-void notifyCellCursorAt(const ScTabViewShell* pViewShell, SCCOL nCol, SCROW 
nRow,
-const tools::Rectangle& rCursor)
-{
-std::stringstream ss;
-ss << rCursor.getX() << ", " << rCursor.getY() << ", " << 
rCursor.GetWidth() << ", "
-   << rCursor.GetHeight() << ", " << nCol << ", " << nRow;
-
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_CURSOR, 
ss.str().c_str());
-SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_CELL_VIEW_CURSOR, 
"rectangle",
-   ss.str().c_str());
-}
-
-}
-
 void ScViewData::SetEditEngine( ScSplitPos eWhich,
 ScEditEngineDefaulter* pNewEngine,
 vcl::Window* pWin, SCCOL nNewX, SCROW nNewY )
@@ -1650,9 +1633,6 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 tools::Rectangle aOutputArea = pWin->PixelToLogic( aPixRect, 
GetLogicMode() );
 pEditView[eWhich]->SetOutputArea( aOutputArea );
 
-if (bLOKPrintTwips)
-notifyCellCursorAt(GetViewShell(), nNewX, nNewY, aPTwipsRect);
-
 if ( bActive && eWhich == GetActivePart() )
 {
 // keep the part that has the active edit view available after
@@ -2141,9 +2121,6 @@ void ScViewData::EditGrowX()
 
 pCurView->SetOutputArea(aArea);
 
-if (bLOKPrintTwips)
-notifyCellCursorAt(GetViewShell(), nEditCol, nEditRow, aAreaPTwips);
-
 //  In vertical mode, the whole text is moved to the next cell 
(right-aligned),
 //  so everything must be repainted. Otherwise, paint only the new area.
 //  If growing in centered alignment, if the cells left and right have 
different sizes,
@@ -2257,9 +2234,6 @@ void ScViewData::EditGrowY( bool bInitial )
 
 pCurView->SetOutputArea(aArea);
 
-if (bLOKPrintTwips)
-notifyCellCursorAt(GetViewShell(), nEditCol, nEditRow, aAreaPTwips);
-
 if (nEditEndRow >= nBottom || bMaxReached)
 {
 if (!(nControl & EVControlBits::AUTOSCROLL))

core.git: desktop/source sfx2/source

[Aron Budea (via logerrit)]

 desktop/source/lib/init.cxx  |2 ++
 sfx2/source/control/unoctitm.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit d3ae37902ee2ded2926b1a41816b33404f1cda1d
Author: Aron Budea 
AuthorDate: Tue Mar 12 18:20:24 2024 +1030
Commit: Aron Budea 
CommitDate: Tue Mar 12 19:24:12 2024 +0100

lok: Send Accept / RejectTrackedChangedToNext state change

Change-Id: I194c0c3260fe90273f5b5f50c18a63e48ae85449
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164699
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 
(cherry picked from commit 9358d70f57ffd2ea40a3ae71db14b26307fce92e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164685
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d2525bcddcb3..90bddb4fb899 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3781,6 +3781,8 @@ static void doc_iniUnoCommands ()
 u".uno:ParaspaceDecrease"_ustr,
 u".uno:AcceptTrackedChange"_ustr,
 u".uno:RejectTrackedChange"_ustr,
+u".uno:AcceptTrackedChangeToNext"_ustr,
+u".uno:RejectTrackedChangeToNext"_ustr,
 u".uno:ShowResolvedAnnotations"_ustr,
 u".uno:InsertBreak"_ustr,
 u".uno:InsertEndnote"_ustr,
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 9ab895887033..28097661bb7e 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1021,6 +1021,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "RejectAllTrackedChanges" ||
  aEvent.FeatureURL.Path == "AcceptTrackedChange" ||
  aEvent.FeatureURL.Path == "RejectTrackedChange" ||
+ aEvent.FeatureURL.Path == "AcceptTrackedChangeToNext" ||
+ aEvent.FeatureURL.Path == "RejectTrackedChangeToNext" ||
  aEvent.FeatureURL.Path == "NextTrackedChange" ||
  aEvent.FeatureURL.Path == "PreviousTrackedChange" ||
  aEvent.FeatureURL.Path == "FormatGroup" ||

core.git: Branch 'distro/collabora/co-24.04' - desktop/source sfx2/source

[Aron Budea (via logerrit)]

 desktop/source/lib/init.cxx  |2 ++
 sfx2/source/control/unoctitm.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit ee979fc26c6509e077be0b746d907d6e13619954
Author: Aron Budea 
AuthorDate: Tue Mar 12 18:20:24 2024 +1030
Commit: Aron Budea 
CommitDate: Tue Mar 12 13:41:34 2024 +0100

lok: Send Accept / RejectTrackedChangedToNext state change

Change-Id: I194c0c3260fe90273f5b5f50c18a63e48ae85449
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164699
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 739ba2a42021..264d0515cf0e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3790,6 +3790,8 @@ static void doc_iniUnoCommands ()
 u".uno:ParaspaceDecrease"_ustr,
 u".uno:AcceptTrackedChange"_ustr,
 u".uno:RejectTrackedChange"_ustr,
+u".uno:AcceptTrackedChangeToNext"_ustr,
+u".uno:RejectTrackedChangeToNext"_ustr,
 u".uno:ShowResolvedAnnotations"_ustr,
 u".uno:InsertBreak"_ustr,
 u".uno:InsertEndnote"_ustr,
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 9b588293082b..fade31109f35 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1073,6 +1073,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "RejectAllTrackedChanges" ||
  aEvent.FeatureURL.Path == "AcceptTrackedChange" ||
  aEvent.FeatureURL.Path == "RejectTrackedChange" ||
+ aEvent.FeatureURL.Path == "AcceptTrackedChangeToNext" ||
+ aEvent.FeatureURL.Path == "RejectTrackedChangeToNext" ||
  aEvent.FeatureURL.Path == "NextTrackedChange" ||
  aEvent.FeatureURL.Path == "PreviousTrackedChange" ||
  aEvent.FeatureURL.Path == "FormatGroup" ||

dictionaries.git: Changes to 'refs/tags/cp-22.05.22-2'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.22-2' created by Andras Timar  at 
2024-02-19 08:15 +

cp-22.05.22-2

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

dictionaries.git: Changes to 'refs/tags/cp-22.05.22-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.22-1' created by Andras Timar  at 
2024-02-15 12:56 +

cp-22.05.22-1

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

core.git: pyuno/source

[Aron Budea (via logerrit)]

 pyuno/source/module/pyuno.cxx |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 6efe49e729ff6b1f427283e24300e4d6bd2395af
Author: Aron Budea 
AuthorDate: Thu Feb 15 15:36:35 2024 +1030
Commit: Aron Budea 
CommitDate: Thu Feb 15 12:49:31 2024 +0100

pyuno: Use expected return value (-1) on failure

Both PyObject_SetAttr and PyObject_SetItem are expected to:

Raise an exception and return -1 on failure; return 0 on success.
https://docs.python.org/3/c-api/object.html

Change-Id: Id1f6129e91e9da2f5d3bc18584224c3393d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163418
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index bd4904d5f729..44fd8af6810e 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -939,7 +939,7 @@ static int lcl_setitem_index( PyUNO const *me, PyObject 
*pKey, PyObject *pValue
 }
 
 PyErr_SetString( PyExc_TypeError, "cannot assign to object" );
-return 1;
+return -1;
 }
 
 static int lcl_setitem_slice( PyUNO const *me, PyObject *pKey, PyObject 
*pValue )
@@ -979,27 +979,27 @@ static int lcl_setitem_slice( PyUNO const *me, PyObject 
*pKey, PyObject *pValue
 if ( !PyTuple_Check (pValue) )
 {
 PyErr_SetString( PyExc_TypeError, "value is not a tuple" );
-return 1;
+return -1;
 }
 
 Py_ssize_t nTupleLength_ssize = PyTuple_Size( pValue );
 if ( nTupleLength_ssize > SAL_MAX_INT32 )
 {
 PyErr_SetString( PyExc_ValueError, "tuple too large" );
-return 1;
+return -1;
 }
 sal_Int32 nTupleLength = static_cast(nTupleLength_ssize);
 
 if ( (nTupleLength != nSliceLength) && (nStep != 1) )
 {
 PyErr_SetString( PyExc_ValueError, "number of items assigned must 
be equal" );
-return 1;
+return -1;
 }
 
 if ( (nTupleLength != nSliceLength) && !xIndexContainer.is() )
 {
 PyErr_SetString( PyExc_ValueError, "cannot change length" );
-return 1;
+return -1;
 }
 
 sal_Int32 nCur, i;
@@ -1057,7 +1057,7 @@ static int lcl_setitem_slice( PyUNO const *me, PyObject 
*pKey, PyObject *pValue
 }
 
 PyErr_SetString( PyExc_TypeError, "cannot assign to object" );
-return 1;
+return -1;
 }
 
 static int lcl_setitem_string( PyUNO const *me, PyObject *pKey, PyObject 
*pValue )
@@ -1129,7 +1129,7 @@ static int lcl_setitem_string( PyUNO const *me, PyObject 
*pKey, PyObject *pValue
 }
 
 PyErr_SetString( PyExc_TypeError, "cannot assign to object" );
-return 1;
+return -1;
 }
 
 static int PyUNO_setitem( PyObject *self, PyObject *pKey, PyObject *pValue )
@@ -1182,7 +1182,7 @@ static int PyUNO_setitem( PyObject *self, PyObject *pKey, 
PyObject *pValue )
 raisePyExceptionWithAny( css::uno::Any( e ) );
 }
 
-return 1;
+return -1;
 }
 
 static PyObject* PyUNO_iter( PyObject *self )
@@ -1461,25 +1461,25 @@ static int PyUNO_setattr (PyObject* self, char* name, 
PyObject* value)
 catch( const css::reflection::InvocationTargetException & e )
 {
 raisePyExceptionWithAny( e.TargetException );
-return 1;
+return -1;
 }
 catch( const css::beans::UnknownPropertyException & e )
 {
 raisePyExceptionWithAny( Any(e) );
-return 1;
+return -1;
 }
 catch( const css::script::CannotConvertException  )
 {
 raisePyExceptionWithAny( Any(e) );
-return 1;
+return -1;
 }
 catch( const RuntimeException & e )
 {
 raisePyExceptionWithAny( Any( e ) );
-return 1;
+return -1;
 }
 PyErr_SetString (PyExc_AttributeError, name);
-return 1; //as above.
+return -1; //as above.
 }
 
 static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )

core.git: basic/source

[Aron Budea (via logerrit)]

 basic/source/runtime/methods.cxx |  190 ---
 1 file changed, 81 insertions(+), 109 deletions(-)

New commits:
commit 8318337c3e30075acc72fa8c9d5051c33319fdf5
Author: Aron Budea 
AuthorDate: Sun Jan 28 21:46:32 2024 +1030
Commit: Aron Budea 
CommitDate: Fri Feb 9 00:30:21 2024 +0100

tdf#147132 tdf#154285 basic: Flatten and check param count of Is* fns

Change-Id: I6d27dd49613a5cc26f4244dadc9bdd65361a0475
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162657
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index ad3b638805a2..d58a2cef9ee0 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2272,162 +2272,134 @@ void SbRtl_Date(StarBASIC *, SbxArray & rPar, bool 
bWrite)
 
 void SbRtl_IsArray(StarBASIC *, SbxArray & rPar, bool)
 {
-if (rPar.Count() < 2)
-{
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
-}
-else
-{
-rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) != 0);
-}
+if (rPar.Count() != 2)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+
+rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) != 0);
 }
 
 void SbRtl_IsObject(StarBASIC *, SbxArray & rPar, bool)
 {
-if (rPar.Count() < 2)
-{
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
-}
-else
-{
-SbxVariable* pVar = rPar.Get(1);
-bool bObject = pVar->IsObject();
-SbxBase* pObj = (bObject ? pVar->GetObject() : nullptr);
+if (rPar.Count() != 2)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
 
-if( auto pUnoClass = dynamic_cast( pObj) )
-{
-bObject = pUnoClass->getUnoClass().is();
-}
-rPar.Get(0)->PutBool(bObject);
+SbxVariable* pVar = rPar.Get(1);
+bool bObject = pVar->IsObject();
+SbxBase* pObj = (bObject ? pVar->GetObject() : nullptr);
+
+if( auto pUnoClass = dynamic_cast( pObj) )
+{
+bObject = pUnoClass->getUnoClass().is();
 }
+rPar.Get(0)->PutBool(bObject);
 }
 
 void SbRtl_IsDate(StarBASIC *, SbxArray & rPar, bool)
 {
-if (rPar.Count() < 2)
+if (rPar.Count() != 2)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+
+// #46134 only string is converted, all other types result in sal_False
+SbxVariableRef xArg = rPar.Get(1);
+SbxDataType eType = xArg->GetType();
+bool bDate = false;
+
+if( eType == SbxDATE )
 {
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+bDate = true;
 }
-else
+else if( eType == SbxSTRING )
 {
-// #46134 only string is converted, all other types result in sal_False
-SbxVariableRef xArg = rPar.Get(1);
-SbxDataType eType = xArg->GetType();
-bool bDate = false;
-
-if( eType == SbxDATE )
-{
-bDate = true;
-}
-else if( eType == SbxSTRING )
-{
-ErrCode nPrevError = SbxBase::GetError();
-SbxBase::ResetError();
+ErrCode nPrevError = SbxBase::GetError();
+SbxBase::ResetError();
 
-// force conversion of the parameter to SbxDATE
-xArg->SbxValue::GetDate();
+// force conversion of the parameter to SbxDATE
+xArg->SbxValue::GetDate();
 
-bDate = !SbxBase::IsError();
+bDate = !SbxBase::IsError();
 
-SbxBase::ResetError();
-SbxBase::SetError( nPrevError );
-}
-rPar.Get(0)->PutBool(bDate);
+SbxBase::ResetError();
+SbxBase::SetError( nPrevError );
 }
+rPar.Get(0)->PutBool(bDate);
 }
 
 void SbRtl_IsEmpty(StarBASIC *, SbxArray & rPar, bool)
 {
-if (rPar.Count() < 2)
+if (rPar.Count() != 2)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+
+SbxVariable* pVar = nullptr;
+if( SbiRuntime::isVBAEnabled() )
 {
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+pVar = getDefaultProp(rPar.Get(1));
+}
+if ( pVar )
+{
+pVar->Broadcast( SfxHintId::BasicDataWanted );
+rPar.Get(0)->PutBool(pVar->IsEmpty());
 }
 else
 {
-SbxVariable* pVar = nullptr;
-if( SbiRuntime::isVBAEnabled() )
-{
-pVar = getDefaultProp(rPar.Get(1));
-}
-if ( pVar )
-{
-pVar->Broadcast( SfxHintId::BasicDataWanted );
-rPar.Get(0)->PutBool(pVar->IsEmpty());
-}
-else
-{
-rPar.Get(0)->PutBool(rPar.Get(1)->IsEmpty());
-}
+rPar.Get(0)->PutBool(rPar.Get(1)->IsEmpty());
 }
 }
 
 void SbRtl_IsError(StarBASIC *, SbxArray & rPar, bool)
 {
-if (rPar.Count() < 2)
+if (rPar.Count() != 2)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+
+SbxVariable* pVar = rPar.Get(1);
+SbUnoObject* pObj = dynamic_cast( pVar  

core.git: Branch 'distro/collabora/co-24.04' - external/mdds

[Aron Budea (via logerrit)]

 external/mdds/gcc-12-silence-use-after-free.patch.1 |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 780e8c77fe6b93978db94601ffba200a5f2101b8
Author: Aron Budea 
AuthorDate: Wed Jan 17 02:54:34 2024 +1030
Commit: Aron Budea 
CommitDate: Fri Jan 19 11:33:56 2024 +1030

silence use-after-free warning in mdds for gcc12.3 in optimized build

Follow-up to e7c4166f1e150b10bc2ac52e93f8ad7503db09dc as GCC 12.3
seems to be affected, too.

Change-Id: I8e5ba9be64625ffd21d43e627996a9ea8602ce9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162181
Tested-by: Jenkins
Reviewed-by: Aron Budea 
(cherry picked from commit 5d52d7dcdf07e5d117e9854af5956b2e93ad3e46)

diff --git a/external/mdds/gcc-12-silence-use-after-free.patch.1 
b/external/mdds/gcc-12-silence-use-after-free.patch.1
index 3f8dd0afe0f3..94f7ba979e61 100644
--- a/external/mdds/gcc-12-silence-use-after-free.patch.1
+++ b/external/mdds/gcc-12-silence-use-after-free.patch.1
@@ -28,13 +28,13 @@ diff -ur mdds.org/include/mdds/node.hpp 
mdds/include/mdds/node.hpp
  {
 ---p->refcount;
 -if (!p->refcount)
-+#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ < 3 && !defined 
__clang__
++#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ <= 3 && !defined 
__clang__
 +#pragma GCC diagnostic push
 +#pragma GCC diagnostic ignored "-Wuse-after-free"
 +#endif
 +if(--p->refcount == 0)
  delete p;
-+#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ < 3 && !defined 
__clang__
++#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ <= 3 && !defined 
__clang__
 +#pragma GCC diagnostic pop
 +#endif
  }

core.git: external/mdds

[Aron Budea (via logerrit)]

 external/mdds/gcc-12-silence-use-after-free.patch.1 |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5d52d7dcdf07e5d117e9854af5956b2e93ad3e46
Author: Aron Budea 
AuthorDate: Wed Jan 17 02:54:34 2024 +1030
Commit: Aron Budea 
CommitDate: Thu Jan 18 00:42:16 2024 +0100

silence use-after-free warning in mdds for gcc12.3 in optimized build

Follow-up to e7c4166f1e150b10bc2ac52e93f8ad7503db09dc as GCC 12.3
seems to be affected, too.

Change-Id: I8e5ba9be64625ffd21d43e627996a9ea8602ce9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162181
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/external/mdds/gcc-12-silence-use-after-free.patch.1 
b/external/mdds/gcc-12-silence-use-after-free.patch.1
index 3f8dd0afe0f3..94f7ba979e61 100644
--- a/external/mdds/gcc-12-silence-use-after-free.patch.1
+++ b/external/mdds/gcc-12-silence-use-after-free.patch.1
@@ -28,13 +28,13 @@ diff -ur mdds.org/include/mdds/node.hpp 
mdds/include/mdds/node.hpp
  {
 ---p->refcount;
 -if (!p->refcount)
-+#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ < 3 && !defined 
__clang__
++#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ <= 3 && !defined 
__clang__
 +#pragma GCC diagnostic push
 +#pragma GCC diagnostic ignored "-Wuse-after-free"
 +#endif
 +if(--p->refcount == 0)
  delete p;
-+#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ < 3 && !defined 
__clang__
++#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ <= 3 && !defined 
__clang__
 +#pragma GCC diagnostic pop
 +#endif
  }

core.git: Branch 'distro/collabora/co-24.04' - sal/osl

[Aron Budea (via logerrit)]

 sal/osl/unx/file.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8963d03ed9c349447a0073d2dabfebc3f2a875d
Author: Aron Budea 
AuthorDate: Tue Jan 16 12:24:36 2024 +1030
Commit: Aron Budea 
CommitDate: Tue Jan 16 12:26:01 2024 +1030

Fix build

Change-Id: I4c097d4c18f2f6793cde1f3bf3beab2b4c733be4

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 848a586ad2ce..ecd721cfc31c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -35,6 +35,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -61,7 +62,6 @@
 #include 
 #include 
 #include 
-#include 
 #endif
 
 namespace {

core.git: sfx2/source

[Aron Budea (via logerrit)]

 sfx2/source/view/lokhelper.cxx |   59 +++--
 1 file changed, 28 insertions(+), 31 deletions(-)

New commits:
commit 1bc6a730ecb7db289e7f72db3c9bce4812e775ed
Author: Aron Budea 
AuthorDate: Tue Jan 9 12:39:56 2024 +1030
Commit: Aron Budea 
CommitDate: Sun Jan 14 16:37:41 2024 +0100

lok: Replace loop with std::find_if(...)

Change-Id: Icfe912f7b79454b9d208c39382ba187d0a0c16c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161810
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Attila Szűcs 
Reviewed-by: Aron Budea 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162045
Tested-by: Jenkins

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 02cc7fe25230..2106168f459e 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -184,44 +184,41 @@ void SfxLokHelper::setView(int nId)
 const ViewShellId nViewShellId(nId);
 std::vector& rViewArr = pApp->GetViewShells_Impl();
 
-for (const SfxViewShell* pViewShell : rViewArr)
-{
-if (pViewShell->GetViewShellId() == nViewShellId)
-{
-DisableCallbacks dc;
+const auto itViewShell = std::find_if(rViewArr.begin(), rViewArr.end(), 
[nViewShellId](SfxViewShell* pViewShell){ return pViewShell->GetViewShellId() 
== nViewShellId; });
+if (itViewShell == rViewArr.end())
+return;
 
-bool bIsCurrShell = (pViewShell == SfxViewShell::Current());
-if (bIsCurrShell && 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == 
pViewShell->GetLOKLanguageTag().getBcp47())
-return;
+const SfxViewShell* pViewShell = *itViewShell;
+DisableCallbacks dc;
 
-if (bIsCurrShell)
-{
-// If we wanted to set the SfxViewShell that is actually set, 
we could skip it.
-// But it looks like that the language can go wrong, so we 
have to fix that.
-// This can happen, when someone sets the language or 
SfxViewShell::Current() separately.
-SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) 
lang:"
-<< 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47()
-<< " new lang:" << 
pViewShell->GetLOKLanguageTag().getBcp47());
-}
+bool bIsCurrShell = (pViewShell == SfxViewShell::Current());
+if (bIsCurrShell && 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == 
pViewShell->GetLOKLanguageTag().getBcp47())
+return;
 
-// update the current LOK language and locale for the dialog 
tunneling
-
comphelper::LibreOfficeKit::setLanguageTag(pViewShell->GetLOKLanguageTag());
-comphelper::LibreOfficeKit::setLocale(pViewShell->GetLOKLocale());
+if (bIsCurrShell)
+{
+// If we wanted to set the SfxViewShell that is actually set, we could 
skip it.
+// But it looks like that the language can go wrong, so we have to fix 
that.
+// This can happen, when someone sets the language or 
SfxViewShell::Current() separately.
+SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) lang:"
+<< 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47()
+<< " new lang:" << 
pViewShell->GetLOKLanguageTag().getBcp47());
+}
 
-if (bIsCurrShell)
-return;
+// update the current LOK language and locale for the dialog tunneling
+
comphelper::LibreOfficeKit::setLanguageTag(pViewShell->GetLOKLanguageTag());
+comphelper::LibreOfficeKit::setLocale(pViewShell->GetLOKLocale());
 
-SfxViewFrame& rViewFrame = pViewShell->GetViewFrame();
-rViewFrame.MakeActive_Impl(false);
+if (bIsCurrShell)
+return;
 
-// Make comphelper::dispatchCommand() find the correct frame.
-uno::Reference xFrame = 
rViewFrame.GetFrame().GetFrameInterface();
-uno::Reference xDesktop = 
frame::Desktop::create(comphelper::getProcessComponentContext());
-xDesktop->setActiveFrame(xFrame);
-return;
-}
-}
+SfxViewFrame& rViewFrame = pViewShell->GetViewFrame();
+rViewFrame.MakeActive_Impl(false);
 
+// Make comphelper::dispatchCommand() find the correct frame.
+uno::Reference xFrame = 
rViewFrame.GetFrame().GetFrameInterface();
+uno::Reference xDesktop = 
frame::Desktop::create(comphelper::getProcessComponentContext());
+xDesktop->setActiveFrame(xFrame);
 }
 
 SfxViewShell* SfxLokHelper::getViewOfId(int nId)

core.git: Branch 'distro/collabora/co-23.05' - sfx2/source

[Aron Budea (via logerrit)]

 sfx2/source/view/lokhelper.cxx |   59 +++--
 1 file changed, 28 insertions(+), 31 deletions(-)

New commits:
commit 64f9abf4de93ed0d7006970dec70e22f9085fcc3
Author: Aron Budea 
AuthorDate: Tue Jan 9 12:39:56 2024 +1030
Commit: Aron Budea 
CommitDate: Thu Jan 11 11:41:46 2024 +0100

lok: Replace loop with std::find_if(...)

Change-Id: Icfe912f7b79454b9d208c39382ba187d0a0c16c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161810
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Attila Szűcs 
Reviewed-by: Aron Budea 

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index c54551b1637f..0deb4d6a65a2 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -185,44 +185,41 @@ void SfxLokHelper::setView(int nId)
 const ViewShellId nViewShellId(nId);
 std::vector& rViewArr = pApp->GetViewShells_Impl();
 
-for (const SfxViewShell* pViewShell : rViewArr)
-{
-if (pViewShell->GetViewShellId() == nViewShellId)
-{
-DisableCallbacks dc;
+const auto itViewShell = std::find_if(rViewArr.begin(), rViewArr.end(), 
[nViewShellId](SfxViewShell* pViewShell){ return pViewShell->GetViewShellId() 
== nViewShellId; });
+if (itViewShell == rViewArr.end())
+return;
 
-bool bIsCurrShell = (pViewShell == SfxViewShell::Current());
-if (bIsCurrShell && 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == 
pViewShell->GetLOKLanguageTag().getBcp47())
-return;
+const SfxViewShell* pViewShell = *itViewShell;
+DisableCallbacks dc;
 
-if (bIsCurrShell)
-{
-// If we wanted to set the SfxViewShell that is actually set, 
we could skip it.
-// But it looks like that the language can go wrong, so we 
have to fix that.
-// This can happen, when someone sets the language or 
SfxViewShell::Current() separately.
-SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) 
lang:"
-<< 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47()
-<< " new lang:" << 
pViewShell->GetLOKLanguageTag().getBcp47());
-}
+bool bIsCurrShell = (pViewShell == SfxViewShell::Current());
+if (bIsCurrShell && 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == 
pViewShell->GetLOKLanguageTag().getBcp47())
+return;
 
-// update the current LOK language and locale for the dialog 
tunneling
-
comphelper::LibreOfficeKit::setLanguageTag(pViewShell->GetLOKLanguageTag());
-comphelper::LibreOfficeKit::setLocale(pViewShell->GetLOKLocale());
+if (bIsCurrShell)
+{
+// If we wanted to set the SfxViewShell that is actually set, we could 
skip it.
+// But it looks like that the language can go wrong, so we have to fix 
that.
+// This can happen, when someone sets the language or 
SfxViewShell::Current() separately.
+SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) lang:"
+<< 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47()
+<< " new lang:" << 
pViewShell->GetLOKLanguageTag().getBcp47());
+}
 
-if (bIsCurrShell)
-return;
+// update the current LOK language and locale for the dialog tunneling
+
comphelper::LibreOfficeKit::setLanguageTag(pViewShell->GetLOKLanguageTag());
+comphelper::LibreOfficeKit::setLocale(pViewShell->GetLOKLocale());
 
-SfxViewFrame* pViewFrame = pViewShell->GetViewFrame();
-pViewFrame->MakeActive_Impl(false);
+if (bIsCurrShell)
+return;
 
-// Make comphelper::dispatchCommand() find the correct frame.
-uno::Reference xFrame = 
pViewFrame->GetFrame().GetFrameInterface();
-uno::Reference xDesktop = 
frame::Desktop::create(comphelper::getProcessComponentContext());
-xDesktop->setActiveFrame(xFrame);
-return;
-}
-}
+SfxViewFrame* pViewFrame = pViewShell->GetViewFrame();
+pViewFrame->MakeActive_Impl(false);
 
+// Make comphelper::dispatchCommand() find the correct frame.
+uno::Reference xFrame = 
pViewFrame->GetFrame().GetFrameInterface();
+uno::Reference xDesktop = 
frame::Desktop::create(comphelper::getProcessComponentContext());
+xDesktop->setActiveFrame(xFrame);
 }
 
 SfxViewShell* SfxLokHelper::getViewOfId(int nId)

core.git: Branch 'distro/collabora/co-23.05' - sfx2/source

[Aron Budea (via logerrit)]

 sfx2/source/view/lokhelper.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1df99bcd3556162e33acc6300b7ca4b8b4c9c057
Author: Aron Budea 
AuthorDate: Thu Jan 11 10:13:42 2024 +1030
Commit: Aron Budea 
CommitDate: Thu Jan 11 01:44:54 2024 +0100

Revert "lok: Log actual differing language"

A change that fixes the same issue got merged recently.

This reverts commit 9c35edb44a82a346122e9ba762165161d1ebcf02.

Change-Id: Ib2565e41b31b7e53e423aba2bdf60d4dbb9f0da5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161901
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 0eb4a31607ac..c54551b1637f 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -192,8 +192,7 @@ void SfxLokHelper::setView(int nId)
 DisableCallbacks dc;
 
 bool bIsCurrShell = (pViewShell == SfxViewShell::Current());
-const auto aKitLang = 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47();
-if (bIsCurrShell && aKitLang == 
pViewShell->GetLOKLanguageTag().getBcp47())
+if (bIsCurrShell && 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == 
pViewShell->GetLOKLanguageTag().getBcp47())
 return;
 
 if (bIsCurrShell)
@@ -202,7 +201,7 @@ void SfxLokHelper::setView(int nId)
 // But it looks like that the language can go wrong, so we 
have to fix that.
 // This can happen, when someone sets the language or 
SfxViewShell::Current() separately.
 SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) 
lang:"
-<< aKitLang
+<< 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47()
 << " new lang:" << 
pViewShell->GetLOKLanguageTag().getBcp47());
 }
 

core.git: Branch 'distro/collabora/co-23.05' - sfx2/source

[Aron Budea (via logerrit)]

 sfx2/source/view/lokhelper.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9c35edb44a82a346122e9ba762165161d1ebcf02
Author: Aron Budea 
AuthorDate: Tue Jan 9 00:48:48 2024 +1030
Commit: Andras Timar 
CommitDate: Wed Jan 10 16:39:01 2024 +0100

lok: Log actual differing language

...not the same after it is overwritten

Change-Id: I5cde7db22d66d73965c0d13f0890ddca0e37a616
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161790
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index c54551b1637f..0eb4a31607ac 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -192,7 +192,8 @@ void SfxLokHelper::setView(int nId)
 DisableCallbacks dc;
 
 bool bIsCurrShell = (pViewShell == SfxViewShell::Current());
-if (bIsCurrShell && 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == 
pViewShell->GetLOKLanguageTag().getBcp47())
+const auto aKitLang = 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47();
+if (bIsCurrShell && aKitLang == 
pViewShell->GetLOKLanguageTag().getBcp47())
 return;
 
 if (bIsCurrShell)
@@ -201,7 +202,7 @@ void SfxLokHelper::setView(int nId)
 // But it looks like that the language can go wrong, so we 
have to fix that.
 // This can happen, when someone sets the language or 
SfxViewShell::Current() separately.
 SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) 
lang:"
-<< 
comphelper::LibreOfficeKit::getLanguageTag().getBcp47()
+<< aKitLang
 << " new lang:" << 
pViewShell->GetLOKLanguageTag().getBcp47());
 }
 

dictionaries.git: Changes to 'refs/tags/cp-22.05.21-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.21-1' created by Andras Timar  at 
2024-01-08 18:08 +

cp-22.05.21-1

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

core.git: sc/inc sc/source

[Aron Budea (via logerrit)]

 sc/inc/table.hxx |   10 ++
 sc/source/core/data/dociter.cxx  |   20 ++--
 sc/source/core/data/document.cxx |2 +-
 sc/source/core/data/table2.cxx   |   16 
 sc/source/core/data/table4.cxx   |2 +-
 5 files changed, 22 insertions(+), 28 deletions(-)

New commits:
commit 93801094fa7a3d276dc56138fafbf21029aae4d5
Author: Aron Budea 
AuthorDate: Tue Dec 12 02:15:43 2023 +1030
Commit: Mike Kaganski 
CommitDate: Tue Dec 12 05:40:12 2023 +0100

sc: Unify GetColumnData

This added ColumnData:
a15c02effa654da06e9695b5e4c0c595f851a878
This added GetColumnData:
1c53f5b6647dcffa57012990d342b21eaff19888

Both functions are the same, one is const, other is non-const.

Change-Id: I8ed214290c7ee8d9e22bd466f9ada95b40300e34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160601
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 3bf61e701c16..dbfffacc67bf 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -309,12 +309,8 @@ public:
 // out-of-line the cold part of the function
 void CreateColumnIfNotExistsImpl( const SCCOL nScCol );
 
-ScColumnData& GetColumnData( SCCOL nCol )
-{
-if( nCol >= aCol.size())
-return aDefaultColData;
-return aCol[nCol];
-}
+const ScColumnData& GetColumnData( SCCOL nCol ) const { return nCol < 
aCol.size() ? aCol[ nCol ] : aDefaultColData; }
+ScColumnData& GetColumnData( SCCOL nCol ) { return nCol < aCol.size() ? 
aCol[ nCol ] : aDefaultColData; }
 
 sal_uInt64  GetCellCount() const;
 sal_uInt64  GetWeightedCount() const;
@@ -1187,8 +1183,6 @@ public:
 
 std::set QueryColumnsWithFormulaCells() const;
 
-const ScColumnData& ColumnData( SCCOL nCol ) const { return nCol < 
aCol.size() ? aCol[ nCol ] : aDefaultColData; }
-
 void CheckIntegrity() const;
 
 void CollectBroadcasterState(sc::BroadcasterState& rState) const;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 35c0d2caa8fd..6fd13c2e3885 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1383,7 +1383,7 @@ void ScHorizontalAttrIterator::InitForNextRow(bool 
bInitialization)
 SCCOL nPos = i - nStartCol;
 if ( bInitialization || pNextEnd[nPos] < nRow )
 {
-const ScAttrArray& pArray = 
rDoc.maTabs[nTab]->ColumnData(i).AttrArray();
+const ScAttrArray& pArray = 
rDoc.maTabs[nTab]->GetColumnData(i).AttrArray();
 
 SCSIZE nIndex;
 if (bInitialization)
@@ -1579,7 +1579,7 @@ ScDocAttrIterator::ScDocAttrIterator(ScDocument& 
rDocument, SCTAB nTable,
 nCol( nCol1 )
 {
 if ( ValidTab(nTab) && nTab < rDoc.GetTableCount() && rDoc.maTabs[nTab] )
-pColIter = rDoc.maTabs[nTab]->ColumnData(nCol).CreateAttrIterator( 
nStartRow, nEndRow );
+pColIter = rDoc.maTabs[nTab]->GetColumnData(nCol).CreateAttrIterator( 
nStartRow, nEndRow );
 }
 
 ScDocAttrIterator::~ScDocAttrIterator()
@@ -1599,7 +1599,7 @@ const ScPatternAttr* ScDocAttrIterator::GetNext( SCCOL& 
rCol, SCROW& rRow1, SCRO
 
 ++nCol;
 if ( nCol <= nEndCol )
-pColIter = rDoc.maTabs[nTab]->ColumnData(nCol).CreateAttrIterator( 
nStartRow, nEndRow );
+pColIter = 
rDoc.maTabs[nTab]->GetColumnData(nCol).CreateAttrIterator( nStartRow, nEndRow );
 else
 pColIter.reset();
 }
@@ -1711,10 +1711,10 @@ ScAttrRectIterator::ScAttrRectIterator(ScDocument& 
rDocument, SCTAB nTable,
 {
 if ( ValidTab(nTab) && nTab < rDoc.GetTableCount() && rDoc.maTabs[nTab] )
 {
-pColIter = 
rDoc.maTabs[nTab]->ColumnData(nIterStartCol).CreateAttrIterator( nStartRow, 
nEndRow );
+pColIter = 
rDoc.maTabs[nTab]->GetColumnData(nIterStartCol).CreateAttrIterator( nStartRow, 
nEndRow );
 while ( nIterEndCol < nEndCol &&
-rDoc.maTabs[nTab]->ColumnData(nIterEndCol).IsAllAttrEqual(
-rDoc.maTabs[nTab]->ColumnData(nIterEndCol+1), nStartRow, 
nEndRow ) )
+rDoc.maTabs[nTab]->GetColumnData(nIterEndCol).IsAllAttrEqual(
+rDoc.maTabs[nTab]->GetColumnData(nIterEndCol+1), 
nStartRow, nEndRow ) )
 ++nIterEndCol;
 }
 }
@@ -1728,7 +1728,7 @@ void ScAttrRectIterator::DataChanged()
 if (pColIter)
 {
 SCROW nNextRow = pColIter->GetNextRow();
-pColIter = 
rDoc.maTabs[nTab]->ColumnData(nIterStartCol).CreateAttrIterator( nNextRow, 
nEndRow );
+pColIter = 
rDoc.maTabs[nTab]->GetColumnData(nIterStartCol).CreateAttrIterator( nNextRow, 
nEndRow );
 }
 }
 
@@ -1749,10 +1749,10 @@ const ScPatternAttr* ScAttrRectIterator::GetNext( 
SCCOL& rCol1, SCCOL& rCol2,
 if ( nIterStartCol <= nEndCol )
 {
 nIterEndCol = nIterStartCol;
-pColIter = 

core.git: Changes to 'refs/tags/mimo-7.2.7.2.M15'

[Aron Budea (via logerrit)]

Tag 'mimo-7.2.7.2.M15' created by Aron Budea  at 
2023-12-11 00:17 +

mimo-7.2.7.2.M15

Changes since mimo-7.2.7.2.M14-7:
---
 0 files changed
---

core.git: Changes to 'refs/tags/7.2.7.2.M15'

[Aron Budea (via logerrit)]

Tag '7.2.7.2.M15' created by Aron Budea  at 
2023-12-11 00:14 +

7.2.7.2.M15

Changes since mimo-7.2.7.2.M14-7:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-7.1.8.1.M6'

[Aron Budea (via logerrit)]

Tag 'mimo-7.1.8.1.M6' created by Aron Budea  at 
2023-12-11 00:11 +

mimo-7.1.8.1.M6

Changes since mimo-7.1.8.1.M5-7:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-7.0.7.0.M14'

[Aron Budea (via logerrit)]

Tag 'mimo-7.0.7.0.M14' created by Aron Budea  at 
2023-12-11 00:09 +

mimo-7.0.7.0.M14

Changes since mimo-7.0.7.0.M13-7:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-6.4.7.2.M10'

[Aron Budea (via logerrit)]

Tag 'mimo-6.4.7.2.M10' created by Aron Budea  at 
2023-12-11 00:07 +

mimo-6.4.7.2.M10

Changes since mimo-6.4.7.2.M9-7:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-6.2.8.2.M13'

[Aron Budea (via logerrit)]

Tag 'mimo-6.2.8.2.M13' created by Aron Budea  at 
2023-12-11 00:02 +

mimo-6.2.8.2.M13

Changes since mimo-6.2.8.2.M12-7:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/co-22.05.21-1'

[Aron Budea (via logerrit)]

Tag 'co-22.05.21-1' created by Andras Timar  at 
2023-11-25 19:35 +

co-22.05.21-1

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

core.git: Branch 'distro/mimo/mimo-6-2' - sw/source

[Aron Budea (via logerrit)]

 sw/source/uibase/wrtsh/wrtsh2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c971d1b920ef0cc7b25e0ec71c8d3824e220e3e0
Author: Aron Budea 
AuthorDate: Sun Dec 10 00:19:43 2023 +1030
Commit: Aron Budea 
CommitDate: Sun Dec 10 00:19:43 2023 +1030

build fix

Change-Id: I68d53a45cf59dac25c4b92ef4c232751f14f6684

diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx 
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 040830a27107..4c856efab95e 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -495,7 +495,7 @@ static void LoadURL(SwView& rView, const OUString& rURL, 
LoadUrlFlags nFilter,
 {
 // May be the relative link -> try to convert to absolute path
 OUString sParentPath =
-
rVSh.GetDoc()->GetDocShell()->GetMedium()->GetURLObject().GetPath();
+rView.GetDocShell()->GetMedium()->GetURLObject().GetPath();
 
 bool bCorrectURL = true;
 aURL = INetURLObject();

core.git: Branch 'distro/mimo/mimo-6-2' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a94c68a214691edf9b81bbf4edc096d3af133c13
Author: Aron Budea 
AuthorDate: Fri Dec 8 12:12:47 2023 +1030
Commit: Aron Budea 
CommitDate: Fri Dec 8 12:12:47 2023 +1030

Bump version to 6.2.8.2.M13

Change-Id: I1040187300dcb46191df3a9d5440c75c66b55c40

diff --git a/configure.ac b/configure.ac
index 58a49bbb2fe7..d71d2b3ad3c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.2.8.2.M12],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M13],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 

core.git: Branch 'distro/mimo/mimo-6-4' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37d0d1c981820a4bb9c2dd6dcff5395b65126cc1
Author: Aron Budea 
AuthorDate: Fri Dec 8 12:08:39 2023 +1030
Commit: Aron Budea 
CommitDate: Fri Dec 8 12:08:39 2023 +1030

Bump version to 6.4.7.2.M10

Change-Id: Iee2a59a1a2387c504512374da0c5b005afef10f8

diff --git a/configure.ac b/configure.ac
index 442de0bb7f8e..8eeb0760a846 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.4.7.2.M9],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.7.2.M10],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/mimo/mimo-7-0' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 58d782c16aee2779d6d85079bbfc9c3cd828a5f9
Author: Aron Budea 
AuthorDate: Fri Dec 8 12:06:18 2023 +1030
Commit: Aron Budea 
CommitDate: Fri Dec 8 12:06:18 2023 +1030

Bump version to 7.0.7.0.M14

Change-Id: Ibc8d81e161e68022077c191eb6567451cdc83221

diff --git a/configure.ac b/configure.ac
index 2b7cdabb2c49..d469483c2a1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.0.7.0.M13],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.7.0.M14],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/mimo/mimo-7-1' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 331830262512b2a0b5fd1e1b9feb3003c6df6113
Author: Aron Budea 
AuthorDate: Fri Dec 8 12:02:27 2023 +1030
Commit: Aron Budea 
CommitDate: Fri Dec 8 12:02:27 2023 +1030

Bump version to 7.1.8.1.M6

Change-Id: Id5a7b1ac9011a56e7bd41e00d05db9ac3e3f076c

diff --git a/configure.ac b/configure.ac
index 5d55d53f14d8..77405709ee0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.1.8.1.M5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.1.8.1.M6],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/mimo/mimo-7-2' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc8e705fc2a0b299dfcf33d21301a2a27cac5d04
Author: Aron Budea 
AuthorDate: Fri Dec 8 11:56:28 2023 +1030
Commit: Aron Budea 
CommitDate: Fri Dec 8 11:56:28 2023 +1030

Bump version to 7.2.7.2.M15

Change-Id: I176cd41c2f59c843371e0f46c1a9274908786b61

diff --git a/configure.ac b/configure.ac
index 10dd79660e42..fe45aab0dfe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.7.2.M14],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.2.M15],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-23.05.6-1'

[Aron Budea (via logerrit)]

Tag 'co-23.05.6-1' created by Andras Timar  at 
2023-12-04 22:17 +

co-23.05.6-1

Changes since cp-23.05.6-1-2:
---
 0 files changed
---

[Libreoffice-commits] core.git: sc/source

[Aron Budea (via logerrit)]

 sc/source/ui/docshell/docfunc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b4a705f7477da2b546d0658e46e96f4e69017e4
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:33:28 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 21:36:55 2023 +0100

sc SetLayoutRTL: Only call PostPaint for current tab

...instead of the usual 0-, a layout change of the current
sheet should have no effect on others.

Change-Id: I5a9a2da78daf1fab06da939574c0e8a027533fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160254
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 67cdcf1ab2d2977fa79f9ecd7935ad8f3a8b4377)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160181
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 7ad32d4963b9..1a8d902bea19 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3485,7 +3485,7 @@ bool ScDocFunc::SetLayoutRTL( SCTAB nTab, bool bRTL )
 rDocShell.GetUndoManager()->AddUndoAction( 
std::make_unique( , nTab, bRTL ) );
 }
 
-rDocShell.PostPaint( 0,0,0,rDoc.MaxCol(),rDoc.MaxRow(),MAXTAB, 
PaintPartFlags::All );
+rDocShell.PostPaint( 0,0,nTab,rDoc.MaxCol(),rDoc.MaxRow(),nTab, 
PaintPartFlags::All );
 aModificator.SetDocumentModified();
 
 SfxBindings* pBindings = rDocShell.GetViewBindings();

[Libreoffice-commits] core.git: sc/source

[Aron Budea (via logerrit)]

 sc/source/ui/docshell/docsh3.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c822a05625da33479527e11a80fe44d3d7b504c8
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:22:17 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 21:28:46 2023 +0100

lok: Notify all tabs in the range

34d5abf464dfbf4bdc36f6b87e606c84a1f4d99d restricted this to the
first tab, but PostPaint(...) is sometimes called with a
0.. tab range, even if the change only affected somewhere
in between.

In addition, restrict range end to the last actual tab in the
spreadsheet.

Change-Id: I44a7bb351e17bf85b13fedfe2a9f3d76543c4372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160253
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4d30910523bccb3b965f254401e6341af2ee8704)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160182
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 788aac9af86e..96546d11a5fe 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -110,12 +110,13 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 {
 ScRangeList aPaintRanges;
 std::set aTabsInvalidated;
+const SCTAB nMaxTab = m_pDocument->GetTableCount() - 1;
 for (size_t i = 0, n = rRanges.size(); i < n; ++i)
 {
 const ScRange& rRange = rRanges[i];
 SCCOL nCol1 = rRange.aStart.Col(), nCol2 = rRange.aEnd.Col();
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
-SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
+SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = std::min(nMaxTab, 
rRange.aEnd.Tab());
 
 if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol();
 if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow();
@@ -168,7 +169,8 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 }
 }
 aPaintRanges.push_back(ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2));
-aTabsInvalidated.insert(nTab1);
+for (auto nTabNum = nTab1; nTabNum <= nTab2; ++nTabNum)
+aTabsInvalidated.insert(nTabNum);
 }
 
 Broadcast(ScPaintHint(aPaintRanges.Combine(), nPart));

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source

[Aron Budea (via logerrit)]

 sc/source/ui/docshell/docfunc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 67cdcf1ab2d2977fa79f9ecd7935ad8f3a8b4377
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:33:28 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 20:11:49 2023 +0100

sc SetLayoutRTL: Only call PostPaint for current tab

...instead of the usual 0-, a layout change of the current
sheet should have no effect on others.

Change-Id: I5a9a2da78daf1fab06da939574c0e8a027533fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160254
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index be844634ea25..12ff9a0f9908 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3485,7 +3485,7 @@ bool ScDocFunc::SetLayoutRTL( SCTAB nTab, bool bRTL )
 rDocShell.GetUndoManager()->AddUndoAction( 
std::make_unique( , nTab, bRTL ) );
 }
 
-rDocShell.PostPaint( 0,0,0,rDoc.MaxCol(),rDoc.MaxRow(),MAXTAB, 
PaintPartFlags::All );
+rDocShell.PostPaint( 0,0,nTab,rDoc.MaxCol(),rDoc.MaxRow(),nTab, 
PaintPartFlags::All );
 aModificator.SetDocumentModified();
 
 SfxBindings* pBindings = rDocShell.GetViewBindings();

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source

[Aron Budea (via logerrit)]

 sc/source/ui/docshell/docsh3.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4d30910523bccb3b965f254401e6341af2ee8704
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:22:17 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 20:09:29 2023 +0100

lok: Notify all tabs in the range

34d5abf464dfbf4bdc36f6b87e606c84a1f4d99d restricted this to the
first tab, but PostPaint(...) is sometimes called with a
0.. tab range, even if the change only affected somewhere
in between.

In addition, restrict range end to the last actual tab in the
spreadsheet.

Change-Id: I44a7bb351e17bf85b13fedfe2a9f3d76543c4372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160253
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 8b24cf81d727..0e2efa7f09fc 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -110,12 +110,13 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 {
 ScRangeList aPaintRanges;
 std::set aTabsInvalidated;
+const SCTAB nMaxTab = m_pDocument->GetTableCount() - 1;
 for (size_t i = 0, n = rRanges.size(); i < n; ++i)
 {
 const ScRange& rRange = rRanges[i];
 SCCOL nCol1 = rRange.aStart.Col(), nCol2 = rRange.aEnd.Col();
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
-SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
+SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = std::min(nMaxTab, 
rRange.aEnd.Tab());
 
 if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol();
 if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow();
@@ -168,7 +169,8 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 }
 }
 aPaintRanges.push_back(ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2));
-aTabsInvalidated.insert(nTab1);
+for (auto nTabNum = nTab1; nTabNum <= nTab2; ++nTabNum)
+aTabsInvalidated.insert(nTabNum);
 }
 
 Broadcast(ScPaintHint(aPaintRanges.Combine(), nPart));

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-22.05.20-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.20-1' created by Andras Timar  at 
2023-10-27 14:27 +

cp-22.05.20-1

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

[Libreoffice-commits] core.git: basic/source

[Aron Budea (via logerrit)]

 basic/source/runtime/methods.cxx |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit c4c017d1b8fe30d1ef452782eef71371282deb37
Author: Aron Budea 
AuthorDate: Sat Jul 29 02:16:58 2023 +0200
Commit: Mike Kaganski 
CommitDate: Fri Oct 13 17:04:16 2023 +0200

tdf#147132  tdf#154285 Flatten and check param count of IsMissing fn

Change-Id: I17d79dcedf2b2e1cd45ef2eb82ff5e89a9bb2b46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155028
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 2e84e964d0be..ad3b638805a2 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2433,15 +2433,11 @@ void SbRtl_IsNumeric(StarBASIC *, SbxArray & rPar, bool)
 
 void SbRtl_IsMissing(StarBASIC *, SbxArray & rPar, bool)
 {
-if (rPar.Count() < 2)
-{
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
-}
-else
-{
-// #57915 Missing is reported by an error
-rPar.Get(0)->PutBool(rPar.Get(1)->IsErr());
-}
+if (rPar.Count() != 2)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+
+// #57915 Missing is reported by an error
+rPar.Get(0)->PutBool(rPar.Get(1)->IsErr());
 }
 
 // Function looks for wildcards, removes them and always returns the pure path

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.3.7.2.M7'

[Aron Budea (via logerrit)]

Tag 'mimo-7.3.7.2.M7' created by Aron Budea  at 
2023-10-13 06:58 +

mimo-7.3.7.2.M7

Changes since mimo-7.3.7.2.M6-1:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-3' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8225348de49dbc3598704a93069a7d016ec96901
Author: Aron Budea 
AuthorDate: Tue Oct 10 03:39:11 2023 +0200
Commit: Aron Budea 
CommitDate: Tue Oct 10 03:39:11 2023 +0200

Bump version to 7.3.7.2.M7

Change-Id: I6854af292c86fbe56ca9be6cae0e8fe229b837ba

diff --git a/configure.ac b/configure.ac
index 78f7cc94f264..b36d57c11a58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.3.7.2.M6],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.2.M7],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/unx

[Aron Budea (via logerrit)]

 vcl/unx/generic/gdi/cairotextrender.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4abf34d4e63a5df302ecd1ce005bef68a0c78d1
Author: Aron Budea 
AuthorDate: Tue Sep 26 00:09:52 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 11:44:17 2023 +0200

tdf#152675 treat all cairo versions <= 1.17.8 the same (actually)

Use correct condition.

Follow-up to 1dd357ccf7ca9edbe5f2ef60465c2559f678d306.

Change-Id: Icc2d04c0023b0a6595ece89d389919f3821aacbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157260
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 5b52a7c3154f5263db82f19f7cc7d0e7b32da603)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157220

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 9c8b3b6563de..7459b17935fc 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -321,7 +321,7 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
 // See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
 // b) tdf#152675 a similar report for cairo: 1.16.0-4ubuntu1,
 // assume that everything <= 1.17.8 is unsafe to disable this
-if (cairo_version() <= CAIRO_VERSION_ENCODE(1, 17, 8))
+if (cairo_version() > CAIRO_VERSION_ENCODE(1, 17, 8))
 cairo_font_options_set_hint_metrics(pOptions, 
CAIRO_HINT_METRICS_OFF);
 }
 cairo_set_font_options(cr, pOptions);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/unx

[Aron Budea (via logerrit)]

 vcl/unx/generic/gdi/cairotextrender.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cdb098171a67f4859d2e97cb001528c97de74a76
Author: Aron Budea 
AuthorDate: Tue Sep 26 00:09:52 2023 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:22:32 2023 +0200

tdf#152675 treat all cairo versions <= 1.17.8 the same (actually)

Use correct condition.

Follow-up to 1dd357ccf7ca9edbe5f2ef60465c2559f678d306.

Change-Id: Icc2d04c0023b0a6595ece89d389919f3821aacbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157260
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 5b52a7c3154f5263db82f19f7cc7d0e7b32da603)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157219
Reviewed-by: Xisco Fauli 

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 719b5085fcc5..f0ab33c15f5d 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -443,7 +443,7 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
 // See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
 // b) tdf#152675 a similar report for cairo: 1.16.0-4ubuntu1,
 // assume that everything <= 1.17.8 is unsafe to disable this
-if (cairo_version() <= CAIRO_VERSION_ENCODE(1, 17, 8))
+if (cairo_version() > CAIRO_VERSION_ENCODE(1, 17, 8))
 cairo_font_options_set_hint_metrics(pOptions, 
CAIRO_HINT_METRICS_OFF);
 }
 cairo_set_font_options(cr, pOptions);

[Libreoffice-commits] core.git: vcl/unx

[Aron Budea (via logerrit)]

 vcl/unx/generic/gdi/cairotextrender.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b52a7c3154f5263db82f19f7cc7d0e7b32da603
Author: Aron Budea 
AuthorDate: Tue Sep 26 00:09:52 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 09:31:21 2023 +0200

tdf#152675 treat all cairo versions <= 1.17.8 the same (actually)

Use correct condition.

Follow-up to 1dd357ccf7ca9edbe5f2ef60465c2559f678d306.

Change-Id: Icc2d04c0023b0a6595ece89d389919f3821aacbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157260
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 2394c33b0c82..9b998066954b 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -445,7 +445,7 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
 // See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
 // b) tdf#152675 a similar report for cairo: 1.16.0-4ubuntu1,
 // assume that everything <= 1.17.8 is unsafe to disable this
-if (cairo_version() <= CAIRO_VERSION_ENCODE(1, 17, 8))
+if (cairo_version() > CAIRO_VERSION_ENCODE(1, 17, 8))
 cairo_font_options_set_hint_metrics(pOptions, 
CAIRO_HINT_METRICS_OFF);
 }
 cairo_set_font_options(cr, pOptions);

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-22.05.19-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.19-1' created by Andras Timar  at 
2023-09-19 13:11 +

cp-22.05.19-1

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-22.05.19-1'

[Aron Budea (via logerrit)]

Tag 'co-22.05.19-1' created by Andras Timar  at 
2023-09-17 18:24 +

co-22.05.19-1

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

[Libreoffice-commits] dictionaries.git: Dictionary_id.mk

[Aron Budea (via logerrit)]

 Dictionary_id.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1a0dc6e5aee05f2a07a632adf6e121082fbd1bf5
Author: Aron Budea 
AuthorDate: Thu Jan 12 05:38:08 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Sep 9 23:53:47 2023 +0200

Add Indonesian hyphenation library to dictionary package

Change-Id: I807f295947ef9ab053f990c9220a78dad8485629
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/145372
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/Dictionary_id.mk b/Dictionary_id.mk
index 7f46144..e59ec67 100644
--- a/Dictionary_id.mk
+++ b/Dictionary_id.mk
@@ -12,6 +12,7 @@ $(eval $(call 
gb_Dictionary_Dictionary,dict-id,dictionaries/id))
 $(eval $(call gb_Dictionary_add_root_files,dict-id,\
dictionaries/id/LICENSE-dict \
dictionaries/id/LICENSE-thes\
+   dictionaries/id/hyph_id_ID.dic \
dictionaries/id/id_ID.aff \
dictionaries/id/id_ID.dic \
dictionaries/id/README-dict.adoc \

[Libreoffice-commits] core.git: dictionaries

[Aron Budea (via logerrit)]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7317420bf85e8f6f40f544321096dcb3adcc5e23
Author: Aron Budea 
AuthorDate: Sat Sep 9 22:53:47 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Sep 9 23:53:47 2023 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to 1a0dc6e5aee05f2a07a632adf6e121082fbd1bf5
  - Add Indonesian hyphenation library to dictionary package

Change-Id: I807f295947ef9ab053f990c9220a78dad8485629
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/145372
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/dictionaries b/dictionaries
index c1ddcf602ba9..1a0dc6e5aee0 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c1ddcf602ba97f8e99383f34e8027074d8193f61
+Subproject commit 1a0dc6e5aee05f2a07a632adf6e121082fbd1bf5

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.2.7.2.M14'

[Aron Budea (via logerrit)]

Tag 'mimo-7.2.7.2.M14' created by Aron Budea  at 
2023-09-06 02:12 +

mimo-7.2.7.2.M14

Changes since mimo-7.2.7.2.M13-8:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source

[Aron Budea (via logerrit)]

 sc/source/ui/view/tabview2.cxx |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 8f822b7032c98d37bd0cb7cb010f0375444f4f31
Author: Aron Budea 
AuthorDate: Mon Sep 4 03:15:13 2023 +0200
Commit: Aron Budea 
CommitDate: Tue Sep 5 11:14:00 2023 +0200

sc: ui: view: Use conditional assignment

Change-Id: I51ba012079a955c139a0c55f12a4b141ba536aa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156502
Tested-by: Jenkins
Reviewed-by: Henry Castro 
(cherry picked from commit 4d8cff696cfdb23733b0e91348b28a83f1c3bedc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156538
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 308e734f95a0..d2293ff94f36 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -217,10 +217,7 @@ void moveRefByCell(SCCOL& rNewX, SCROW& rNewY,
 SCCOL nTempX = rNewX;
 while (rDoc.IsHorOverlapped(nTempX, rNewY, nRefTab))
 {
-if (nMovX > 0)
-++nTempX;
-else
---nTempX;
+nTempX = (nMovX > 0) ? nTempX + 1 : nTempX - 1;
 if (!checkBoundary(, nTempX, rNewY))
 break;
 }
@@ -242,10 +239,7 @@ void moveRefByCell(SCCOL& rNewX, SCROW& rNewY,
 SCROW nTempY = rNewY;
 while (rDoc.IsVerOverlapped(rNewX, nTempY, nRefTab))
 {
-if (nMovY > 0)
-++nTempY;
-else
---nTempY;
+nTempY = (nMovY > 0) ? nTempY + 1 : nTempY - 1;
 if (!checkBoundary(, rNewX, nTempY))
 break;
 }

[Libreoffice-commits] core.git: sc/source

[Aron Budea (via logerrit)]

 sc/source/ui/view/tabview2.cxx |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 4d8cff696cfdb23733b0e91348b28a83f1c3bedc
Author: Aron Budea 
AuthorDate: Mon Sep 4 03:15:13 2023 +0200
Commit: Henry Castro 
CommitDate: Mon Sep 4 15:37:59 2023 +0200

sc: ui: view: Use conditional assignment

Change-Id: I51ba012079a955c139a0c55f12a4b141ba536aa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156502
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 4faa5d89d569..e28ff1d7 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -217,10 +217,7 @@ void moveRefByCell(SCCOL& rNewX, SCROW& rNewY,
 SCCOL nTempX = rNewX;
 while (rDoc.IsHorOverlapped(nTempX, rNewY, nRefTab))
 {
-if (nMovX > 0)
-++nTempX;
-else
---nTempX;
+nTempX = (nMovX > 0) ? nTempX + 1 : nTempX - 1;
 if (!checkBoundary(, nTempX, rNewY))
 break;
 }
@@ -242,10 +239,7 @@ void moveRefByCell(SCCOL& rNewX, SCROW& rNewY,
 SCROW nTempY = rNewY;
 while (rDoc.IsVerOverlapped(rNewX, nTempY, nRefTab))
 {
-if (nMovY > 0)
-++nTempY;
-else
---nTempY;
+nTempY = (nMovY > 0) ? nTempY + 1 : nTempY - 1;
 if (!checkBoundary(, rNewX, nTempY))
 break;
 }

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10dc6392d5a0c59003e59aeb2ea987856460ff62
Author: Aron Budea 
AuthorDate: Sat Sep 2 02:17:57 2023 +0200
Commit: Aron Budea 
CommitDate: Sat Sep 2 02:17:57 2023 +0200

Bump version to 7.2.7.2.M14

Change-Id: I2688cee50654964280695f7377ab379949d4a0a0

diff --git a/configure.ac b/configure.ac
index cd1661af3f32..10dd79660e42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.7.2.M13],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.2.M14],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-3' - translations

[Aron Budea (via logerrit)]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8dc221adb889ce39ae978ddabc00347026cad15c
Author: Aron Budea 
AuthorDate: Thu Aug 24 22:31:58 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Aug 24 22:31:58 2023 +0200

Update git submodules

* Update translations from branch 'distro/mimo/mimo-7-3'
  to a6d574508503410750abe83d44517e2abb5dd01c
  - Update French translation for Background color

Change-Id: If8fcb867a54051ef62da5d72aebe768cf95632da

diff --git a/translations b/translations
index 2060c9f41a94..a6d574508503 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2060c9f41a942d6e5267c3ebe9c1f704d922bf9d
+Subproject commit a6d574508503410750abe83d44517e2abb5dd01c

[Libreoffice-commits] translations.git: Branch 'distro/mimo/mimo-7-3' - source/fr

[Aron Budea (via logerrit)]

 source/fr/sc/messages.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6d574508503410750abe83d44517e2abb5dd01c
Author: Aron Budea 
AuthorDate: Thu Aug 24 22:22:06 2023 +0200
Commit: Aron Budea 
CommitDate: Thu Aug 24 22:22:06 2023 +0200

Update French translation for Background color

Change-Id: If8fcb867a54051ef62da5d72aebe768cf95632da

diff --git a/source/fr/sc/messages.po b/source/fr/sc/messages.po
index 459cc5073d9..8f934823b47 100644
--- a/source/fr/sc/messages.po
+++ b/source/fr/sc/messages.po
@@ -31219,7 +31219,7 @@ msgstr "Couleur du texte"
 #: sc/uiconfig/scalc/ui/standardfilterdialog.ui:551
 msgctxt "standardfilterdialog|cond"
 msgid "Background color"
-msgstr "Couleur d'Arrière-plan"
+msgstr "Couleur d'arrière-plan"
 
 #. rmPTC
 #: sc/uiconfig/scalc/ui/standardfilterdialog.ui:441

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-22.05.18-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.18-1' created by Aron Budea  at 
2023-08-13 02:16 +

cp-22.05.18-1

Changes since cp-22.05.17-1-8:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99be3fb17a4039f495fbe614b184d555fed558e5
Author: Aron Budea 
AuthorDate: Sun Aug 13 04:09:03 2023 +0200
Commit: Aron Budea 
CommitDate: Sun Aug 13 04:09:03 2023 +0200

Bump version to 22.05.18.1

Change-Id: Ibf1268c93fb83561e3e87ef5899c908ef8a9f59e

diff --git a/configure.ac b/configure.ac
index c42502675378..aeb48dbd15f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[22.05.17.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.18.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-3' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd0da356a644430fe1925e01eb429c9c3d1e884c
Author: Aron Budea 
AuthorDate: Fri Aug 11 12:23:45 2023 +0200
Commit: Aron Budea 
CommitDate: Fri Aug 11 12:23:45 2023 +0200

Bump version to 7.3.7.2.M6

Change-Id: I5de38f7fd7269367846887aef3decefa5c16d4e7

diff --git a/configure.ac b/configure.ac
index 52205e99ac64..78f7cc94f264 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.3.7.2.M5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.2.M6],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - basic/qa sax/source

[Aron Budea (via logerrit)]

 basic/qa/basic_coverage/test_tdf150137_parse_fail.bas |   37 ++
 sax/source/fastparser/fastparser.cxx  |8 ++-
 2 files changed, 42 insertions(+), 3 deletions(-)

New commits:
commit 8e00558e6a569995905e1d18643605c6e4946391
Author: Aron Budea 
AuthorDate: Sun Aug 6 05:08:23 2023 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 8 20:30:38 2023 +0200

tdf#150137 fastparser: don't crash on undeclared namespace

Change-Id: Icc8bbb391c7e34754b7274d67d73ff509827a3d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155381
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 
(cherry picked from commit c9e863801509fb37b125a8fb07358fb1b235496d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155402
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas 
b/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas
new file mode 100644
index ..fdf9f1e9948e
--- /dev/null
+++ b/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas
@@ -0,0 +1,37 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Option Explicit
+
+Function doUnitTest() As String
+On Error GoTo ErrorHandler ' Set up error handler
+
+Dim Xml As String
+Dim XmlLen As Long
+' Not namespace-well-formed XML, parse is expected to fail
+Xml = ""
+XmlLen = Len(Xml)
+Dim XmlByte(1 To XmlLen) As Byte
+Dim Index As Integer
+For Index = 1 To XmlLen
+XmlByte(Index) = Asc(Mid(Xml, Index, 1))
+Next
+Dim source As Object
+source = CreateUnoStruct("com.sun.star.xml.sax.InputSource")
+source.aInputStream = 
com.sun.star.io.SequenceInputStream.createStreamFromSequence(XmlByte)
+Dim parser As Object
+parser = CreateUnoService("com.sun.star.xml.sax.FastParser")
+' Parse crashed before the fix
+parser.ParseStream(source)
+
+' Shouldn't end up here
+doUnitTest = "FAIL"
+Exit Function
+ErrorHandler:
+doUnitTest = "OK"
+End Function
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 344dda9cd63e..93e661313bd3 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1265,12 +1265,14 @@ void FastSaxParserImpl::callbackStartElement(const 
xmlChar *localName , const xm
 OUString aElementPrefix;
 if( prefix != nullptr )
 {
-if ( !m_bIgnoreMissingNSDecl || URI != nullptr )
+aElementPrefix = OUString( XML_CAST( prefix ), strlen( 
XML_CAST( prefix )), RTL_TEXTENCODING_UTF8 );
+if ( URI != nullptr )
 sNamespace = OUString( XML_CAST( URI ), strlen( XML_CAST( 
URI )), RTL_TEXTENCODING_UTF8 );
-else
+else if ( m_bIgnoreMissingNSDecl )
 sNamespace.clear();
+else
+throw SAXException("No namespace defined for " + 
aElementPrefix, {}, {});
 nNamespaceToken = GetNamespaceToken( sNamespace );
-aElementPrefix = OUString( XML_CAST( prefix ), strlen( 
XML_CAST( prefix )), RTL_TEXTENCODING_UTF8 );
 }
 OUString aElementLocalName( XML_CAST( localName ), strlen( 
XML_CAST( localName )), RTL_TEXTENCODING_UTF8 );
 rEvent.msNamespace = sNamespace;

[Libreoffice-commits] core.git: basic/qa sax/source

[Aron Budea (via logerrit)]

 basic/qa/basic_coverage/test_tdf150137_parse_fail.bas |   37 ++
 sax/source/fastparser/fastparser.cxx  |8 ++-
 2 files changed, 42 insertions(+), 3 deletions(-)

New commits:
commit c9e863801509fb37b125a8fb07358fb1b235496d
Author: Aron Budea 
AuthorDate: Sun Aug 6 05:08:23 2023 +0200
Commit: Aron Budea 
CommitDate: Mon Aug 7 17:38:30 2023 +0200

tdf#150137 fastparser: don't crash on undeclared namespace

Change-Id: Icc8bbb391c7e34754b7274d67d73ff509827a3d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155381
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas 
b/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas
new file mode 100644
index ..fdf9f1e9948e
--- /dev/null
+++ b/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas
@@ -0,0 +1,37 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Option Explicit
+
+Function doUnitTest() As String
+On Error GoTo ErrorHandler ' Set up error handler
+
+Dim Xml As String
+Dim XmlLen As Long
+' Not namespace-well-formed XML, parse is expected to fail
+Xml = ""
+XmlLen = Len(Xml)
+Dim XmlByte(1 To XmlLen) As Byte
+Dim Index As Integer
+For Index = 1 To XmlLen
+XmlByte(Index) = Asc(Mid(Xml, Index, 1))
+Next
+Dim source As Object
+source = CreateUnoStruct("com.sun.star.xml.sax.InputSource")
+source.aInputStream = 
com.sun.star.io.SequenceInputStream.createStreamFromSequence(XmlByte)
+Dim parser As Object
+parser = CreateUnoService("com.sun.star.xml.sax.FastParser")
+' Parse crashed before the fix
+parser.ParseStream(source)
+
+' Shouldn't end up here
+doUnitTest = "FAIL"
+Exit Function
+ErrorHandler:
+doUnitTest = "OK"
+End Function
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index fd1b147f044e..3c67010ad1cb 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1264,12 +1264,14 @@ void FastSaxParserImpl::callbackStartElement(const 
xmlChar *localName , const xm
 OUString aElementPrefix;
 if( prefix != nullptr )
 {
-if ( !m_bIgnoreMissingNSDecl || URI != nullptr )
+aElementPrefix = OUString( XML_CAST( prefix ), strlen( 
XML_CAST( prefix )), RTL_TEXTENCODING_UTF8 );
+if ( URI != nullptr )
 sNamespace = OUString( XML_CAST( URI ), strlen( XML_CAST( 
URI )), RTL_TEXTENCODING_UTF8 );
-else
+else if ( m_bIgnoreMissingNSDecl )
 sNamespace.clear();
+else
+throw SAXException("No namespace defined for " + 
aElementPrefix, {}, {});
 nNamespaceToken = GetNamespaceToken( sNamespace );
-aElementPrefix = OUString( XML_CAST( prefix ), strlen( 
XML_CAST( prefix )), RTL_TEXTENCODING_UTF8 );
 }
 OUString aElementLocalName( XML_CAST( localName ), strlen( 
XML_CAST( localName )), RTL_TEXTENCODING_UTF8 );
 rEvent.msNamespace = sNamespace;

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-4' - 2 commits - sc/source sw/qa sw/source

[Aron Budea (via logerrit)]

 sc/source/filter/rtf/rtfexp.cxx |2 +-
 sw/qa/extras/uiwriter/data/tdf62032_apply_style.odt |binary
 sw/qa/extras/uiwriter/uiwriter7.cxx |   20 
 sw/source/core/doc/docfmt.cxx   |5 +
 4 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit d599e6aa16f5f7ec0d3fed789a214940a53570bb
Author: Aron Budea 
AuthorDate: Thu Aug 3 21:54:55 2023 +0200
Commit: Aron Budea 
CommitDate: Thu Aug 3 21:54:55 2023 +0200

Fix build

Change-Id: I0e680463f5c3be39b1e32c9b5d1ae43a7876d4cd

diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index b63570dfb249..5cde1ae45085 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -188,7 +188,7 @@ void ScRTFExport::WriteFontTable(const SvxFontItem& 
rFontItem, int nIndex)
 
 rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
 rtl_TextEncoding eChrSet = rFontItem.GetCharSet();
-if (IsOpenSymbol(rFontItem.GetFamilyName()))
+if (IsStarSymbol(rFontItem.GetFamilyName()))
 eChrSet = RTL_TEXTENCODING_UTF8;
 else if( RTL_TEXTENCODING_DONTKNOW == eChrSet )
 eChrSet = osl_getThreadTextEncoding();
commit d466d3b4422e6fc6405cf17bbeee48ae52fa1d3e
Author: luigiiucci 
AuthorDate: Thu Jun 15 23:31:26 2023 +0200
Commit: Aron Budea 
CommitDate: Thu Aug 3 21:54:13 2023 +0200

tdf#62032 use style list level when changing style

If a style S1 has a list level L1, and we
change the style to S1 in a text node that
has list level L2, the new text node
list level must be L1

Change-Id: Ic25b02cb2da3153fc5c3723998c9f7f01247
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153161
Reviewed-by: Ashod Nakashian 
Tested-by: Jenkins
(cherry picked from commit c1cfe85f8bba10d367ef9ef1d6d569f53969dd34)

diff --git a/sw/qa/extras/uiwriter/data/tdf62032_apply_style.odt 
b/sw/qa/extras/uiwriter/data/tdf62032_apply_style.odt
new file mode 100644
index ..86cda167ee8a
Binary files /dev/null and 
b/sw/qa/extras/uiwriter/data/tdf62032_apply_style.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx 
b/sw/qa/extras/uiwriter/uiwriter7.cxx
index 833a35f97e61..f9f989fdba5b 100644
--- a/sw/qa/extras/uiwriter/uiwriter7.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter7.cxx
@@ -2813,6 +2813,26 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf149089)
 CPPUNIT_ASSERT_EQUAL(nGridWidth1, nGridWidth2);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf62032ApplyStyle)
+{
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf62032_apply_style.odt");
+SwWrtShell* pWrtSh = pDoc->GetDocShell()->GetWrtShell();
+
+pWrtSh->Down(/*bSelect=*/false);
+
+uno::Sequence aPropertyValues = 
comphelper::InitPropertySequence({
+{ "Style", uno::Any(OUString("A 2")) },
+{ "FamilyName", uno::Any(OUString("ParagraphStyles")) },
+});
+dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
+
+// Without the fix in place, it fails with:
+// - Expected: 1.1
+// - Actual  : 2
+CPPUNIT_ASSERT_EQUAL(OUString("1.1"),
+ getProperty(getParagraph(2), 
"ListLabelString").trim());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index dbf8fefeda4a..519584baf812 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1065,6 +1065,11 @@ static bool lcl_SetTextFormatColl( SwNode* pNode, void* 
pArgs )
 pCNd->ResetAttr( RES_PARATR_LIST_ISCOUNTED );
 pCNd->ResetAttr( RES_PARATR_LIST_ID );
 }
+else
+{
+// forcing reset of list level from parapgaph
+pCNd->SetAttr(pFormat->GetFormatAttr(RES_PARATR_LIST_LEVEL));
+}
 }
 }
 

[Libreoffice-commits] core.git: desktop/source sfx2/source

[Aron Budea (via logerrit)]

 desktop/source/lib/init.cxx  |3 +++
 sfx2/source/control/unoctitm.cxx |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit c93267f2901805aa6fe7b7ea44d4ba24e47233da
Author: Aron Budea 
AuthorDate: Mon Jul 17 03:37:05 2023 +0200
Commit: Aron Budea 
CommitDate: Sun Jul 30 14:51:39 2023 +0200

Send Calc pivot table command state changes to LOK

Change-Id: I0d9e04b0a0452f66cb9703d9f34fe6cb44d724c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154506
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 
(cherry picked from commit b62f9f484a0fc9215e34153daac4a8bdb9698d4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155034
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6e8c0db99223..08609ef442d9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3606,6 +3606,9 @@ static void doc_iniUnoCommands ()
 OUString(".uno:GroupSparklines"),
 OUString(".uno:UngroupSparklines"),
 OUString(".uno:FormatSparklineMenu"),
+OUString(".uno:DataDataPilotRun"),
+OUString(".uno:RecalcPivotTable"),
+OUString(".uno:DeletePivotTable"),
 OUString(".uno:Protect"),
 OUString(".uno:UnsetCellsReadOnly"),
 OUString(".uno:ContentControlProperties"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 20ae855ab6f3..9b75d0a51118 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1097,6 +1097,9 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "GroupSparklines" ||
  aEvent.FeatureURL.Path == "UngroupSparklines" ||
  aEvent.FeatureURL.Path == "FormatSparklineMenu" ||
+ aEvent.FeatureURL.Path == "DataDataPilotRun" ||
+ aEvent.FeatureURL.Path == "RecalcPivotTable" ||
+ aEvent.FeatureURL.Path == "DeletePivotTable" ||
  aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
  aEvent.FeatureURL.Path == "NumberFormatIncDecimals" ||
  aEvent.FeatureURL.Path == "Protect" ||

[Libreoffice-commits] core.git: sfx2/source

[Aron Budea (via logerrit)]

 sfx2/source/control/unoctitm.cxx |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 97a32713174a14758672d388de7627c71e2b70f8
Author: Aron Budea 
AuthorDate: Sat Jun 10 03:50:04 2023 +0200
Commit: Aron Budea 
CommitDate: Wed Jul 26 17:32:43 2023 +0200

lok: sfx2: fix change state "SheetRightToLeft" 2nd attempt

This reverts commit 71e5f7e43471cc479ea1e818c813170a389964e6,
and adds SheetRightToLeft in a different place.

Change-Id: Id7001d06b247713de2e4dfe5076d156988e932d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152808
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 
(cherry picked from commit f44aed75f1c1f64c07651376fd2f638f61e0c3b1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154928
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 2feec75dac6c..20ae855ab6f3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -932,21 +932,14 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "FormatPaintbrush" ||
 aEvent.FeatureURL.Path == "FreezePanes" ||
 aEvent.FeatureURL.Path == "Sidebar" ||
-aEvent.FeatureURL.Path == "SheetRightToLeft" ||
 aEvent.FeatureURL.Path == "SpacePara1" ||
 aEvent.FeatureURL.Path == "SpacePara15" ||
 aEvent.FeatureURL.Path == "SpacePara2" ||
 aEvent.FeatureURL.Path == "DataFilterAutoFilter")
 {
 bool bTemp = false;
-
-if (aEvent.IsEnabled)
-{
-aEvent.State >>= bTemp;
-aBuffer.append(bTemp);
-}
-else
-aBuffer.append("disabled");
+aEvent.State >>= bTemp;
+aBuffer.append(bTemp);
 }
 else if (aEvent.FeatureURL.Path == "CharFontName")
 {
@@ -1193,7 +1186,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aBuffer.append(OUString::boolean(aBool));
 }
 }
-else if (aEvent.FeatureURL.Path == "ToggleMergeCells")
+else if (aEvent.FeatureURL.Path == "ToggleMergeCells" ||
+ aEvent.FeatureURL.Path == "SheetRightToLeft")
 {
 bool aBool;
 

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sfx2/source

[Aron Budea (via logerrit)]

 sfx2/source/control/unoctitm.cxx |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit f44aed75f1c1f64c07651376fd2f638f61e0c3b1
Author: Aron Budea 
AuthorDate: Sat Jun 10 03:50:04 2023 +0200
Commit: Henry Castro 
CommitDate: Wed Jul 26 13:38:28 2023 +0200

lok: sfx2: fix change state "SheetRightToLeft" 2nd attempt

This reverts commit f86c951441270aaf75431369eabcfe26c35e4c63,
and adds SheetRightToLeft in a different place.

Change-Id: Id7001d06b247713de2e4dfe5076d156988e932d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152808
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 20de9bb29ad3..fad61699db90 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -948,21 +948,14 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "FormatPaintbrush" ||
 aEvent.FeatureURL.Path == "FreezePanes" ||
 aEvent.FeatureURL.Path == "Sidebar" ||
-aEvent.FeatureURL.Path == "SheetRightToLeft" ||
 aEvent.FeatureURL.Path == "SpacePara1" ||
 aEvent.FeatureURL.Path == "SpacePara15" ||
 aEvent.FeatureURL.Path == "SpacePara2" ||
 aEvent.FeatureURL.Path == "DataFilterAutoFilter")
 {
 bool bTemp = false;
-
-if (aEvent.IsEnabled)
-{
-aEvent.State >>= bTemp;
-aBuffer.append(bTemp);
-}
-else
-aBuffer.append("disabled");
+aEvent.State >>= bTemp;
+aBuffer.append(bTemp);
 }
 else if (aEvent.FeatureURL.Path == "CharFontName")
 {
@@ -1212,7 +1205,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aBuffer.append(OUString::boolean(aBool));
 }
 }
-else if (aEvent.FeatureURL.Path == "ToggleMergeCells")
+else if (aEvent.FeatureURL.Path == "ToggleMergeCells" ||
+ aEvent.FeatureURL.Path == "SheetRightToLeft")
 {
 bool aBool;
 

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-23.05.2-2'

[Aron Budea (via logerrit)]

Tag 'cp-23.05.2-2' created by Aron Budea  at 
2023-07-24 15:14 +

cp-23.05.2-2

Changes since cp-23.05.2-1-4:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22110b2036e37e868c9d06310588d90bbee63d69
Author: Aron Budea 
AuthorDate: Mon Jul 24 16:32:25 2023 +0200
Commit: Aron Budea 
CommitDate: Mon Jul 24 16:32:25 2023 +0200

Bump version to 23.05.2.2

Change-Id: I17804cdcbc251b0908f725325531a76d2959172e

diff --git a/configure.ac b/configure.ac
index 015014904c6a..fe519e1a4730 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[23.05.2.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.2.2],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-23.05.2-1'

[Aron Budea (via logerrit)]

Tag 'cp-23.05.2-1' created by Aron Budea  at 
2023-07-20 11:40 +

cp-23.05.2-1

Changes since cp-23.05.1-2-97:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af1c0f53d8cea1e1efc1c7956a0f38c61532d5f8
Author: Aron Budea 
AuthorDate: Thu Jul 20 12:40:38 2023 +0200
Commit: Aron Budea 
CommitDate: Thu Jul 20 12:40:38 2023 +0200

Bump version to 23.05.2.1

Change-Id: I213da0dae2453f60e6503727592eac492bfbad24

diff --git a/configure.ac b/configure.ac
index b8f596fafdcc..015014904c6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[23.05.1.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.2.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source sfx2/source

[Aron Budea (via logerrit)]

 desktop/source/lib/init.cxx  |3 +++
 sfx2/source/control/unoctitm.cxx |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit b62f9f484a0fc9215e34153daac4a8bdb9698d4b
Author: Aron Budea 
AuthorDate: Mon Jul 17 03:37:05 2023 +0200
Commit: Aron Budea 
CommitDate: Thu Jul 20 12:38:50 2023 +0200

Send Calc pivot table command state changes to LOK

Change-Id: I0d9e04b0a0452f66cb9703d9f34fe6cb44d724c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154506
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 45bd9e608e70..81f797e5f197 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3588,6 +3588,9 @@ static void doc_iniUnoCommands ()
 OUString(".uno:GroupSparklines"),
 OUString(".uno:UngroupSparklines"),
 OUString(".uno:FormatSparklineMenu"),
+OUString(".uno:DataDataPilotRun"),
+OUString(".uno:RecalcPivotTable"),
+OUString(".uno:DeletePivotTable"),
 OUString(".uno:Protect"),
 OUString(".uno:UnsetCellsReadOnly"),
 OUString(".uno:ContentControlProperties"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 99bbc2afa7bf..20de9bb29ad3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1120,6 +1120,9 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "GroupSparklines" ||
  aEvent.FeatureURL.Path == "UngroupSparklines" ||
  aEvent.FeatureURL.Path == "FormatSparklineMenu" ||
+ aEvent.FeatureURL.Path == "DataDataPilotRun" ||
+ aEvent.FeatureURL.Path == "RecalcPivotTable" ||
+ aEvent.FeatureURL.Path == "DeletePivotTable" ||
  aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
  aEvent.FeatureURL.Path == "NumberFormatIncDecimals" ||
  aEvent.FeatureURL.Path == "Protect" ||

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/skia

[Aron Budea (via logerrit)]

 vcl/skia/gdiimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aebc5c5ab1a1ab8e88ff5aacece11f29900cb569
Author: Aron Budea 
AuthorDate: Sun Jul 16 17:25:55 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Jul 19 03:02:34 2023 +0200

tdf#155661 Apply border from center point not from whole size

Regression from 6965bb07bb33429a7663a3f3ebe58ed89c4327d9
and 8b8a988f38b704e466211bb91a3269756c34222b.

Change-Id: I2e8c21fbdbbc7efb4b473c63b098044384a70d6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154501
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 4202dfcae19ee47e9a3fda02fac34c18cb0d16ff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154542

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 94e1f7c176fa..cc823e4ccdd4 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -2049,8 +2049,8 @@ bool SkiaSalGraphicsImpl::drawGradient(const 
tools::PolyPolygon& rPolyPolygon,
   SkPoint::Make(toSkX(aPoly[1].X()), 
toSkY(aPoly[1].Y())) };
 SkColor colors[3] = { endColor, startColor, endColor };
 SkScalar border = SkDoubleToScalar(aGradient.GetBorder() / 100.0);
-SkScalar pos[3]
-= { std::min(border, 0.5), 0.5, std::max(1 - 
border, 0.5) };
+SkScalar pos[3] = { std::min(border * 0.5f, 0.5f), 0.5f,
+std::max(1 - border * 0.5f, 0.5f) };
 shader = SkGradientShader::MakeLinear(points, colors, pos, 3, 
SkTileMode::kClamp);
 }
 else

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/skia

[Aron Budea (via logerrit)]

 vcl/skia/gdiimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4fe26f0e0347618c06369d8582a5d0a5aca0fe9a
Author: Aron Budea 
AuthorDate: Sun Jul 16 17:25:55 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Jul 19 03:02:17 2023 +0200

tdf#155661 Apply border from center point not from whole size

Regression from 6965bb07bb33429a7663a3f3ebe58ed89c4327d9
and 8b8a988f38b704e466211bb91a3269756c34222b.

Change-Id: I2e8c21fbdbbc7efb4b473c63b098044384a70d6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154501
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 4202dfcae19ee47e9a3fda02fac34c18cb0d16ff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154543

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 269c536abc7d..dbe64f3e0d10 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -2036,8 +2036,8 @@ bool SkiaSalGraphicsImpl::drawGradient(const 
tools::PolyPolygon& rPolyPolygon,
   SkPoint::Make(toSkX(aPoly[1].X()), 
toSkY(aPoly[1].Y())) };
 SkColor colors[3] = { endColor, startColor, endColor };
 SkScalar border = SkDoubleToScalar(aGradient.GetBorder() / 100.0);
-SkScalar pos[3]
-= { std::min(border, 0.5), 0.5, std::max(1 - 
border, 0.5) };
+SkScalar pos[3] = { std::min(border * 0.5f, 0.5f), 0.5f,
+std::max(1 - border * 0.5f, 0.5f) };
 shader = SkGradientShader::MakeLinear(points, colors, pos, 3, 
SkTileMode::kClamp);
 }
 else

[Libreoffice-commits] core.git: vcl/skia

[Aron Budea (via logerrit)]

 vcl/skia/gdiimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4202dfcae19ee47e9a3fda02fac34c18cb0d16ff
Author: Aron Budea 
AuthorDate: Sun Jul 16 17:25:55 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Jul 18 06:50:30 2023 +0200

tdf#155661 Apply border from center point not from whole size

Regression from 6965bb07bb33429a7663a3f3ebe58ed89c4327d9
and 8b8a988f38b704e466211bb91a3269756c34222b.

Change-Id: I2e8c21fbdbbc7efb4b473c63b098044384a70d6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154501
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 3c0957be4806..45f3fc1c1b97 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -2049,8 +2049,8 @@ bool SkiaSalGraphicsImpl::drawGradient(const 
tools::PolyPolygon& rPolyPolygon,
   SkPoint::Make(toSkX(aPoly[1].X()), 
toSkY(aPoly[1].Y())) };
 SkColor colors[3] = { endColor, startColor, endColor };
 SkScalar border = SkDoubleToScalar(aGradient.GetBorder() / 100.0);
-SkScalar pos[3]
-= { std::min(border, 0.5), 0.5, std::max(1 - 
border, 0.5) };
+SkScalar pos[3] = { std::min(border * 0.5f, 0.5f), 0.5f,
+std::max(1 - border * 0.5f, 0.5f) };
 shader = SkGradientShader::MakeLinear(points, colors, pos, 3, 
SkTileMode::kClamp);
 }
 else

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-22.05.17-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.17-1' created by Aron Budea  at 
2023-07-12 13:07 +

cp-22.05.17-1

Changes since cp-22.05.16-1-20:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1c2341b0397dcc2575c05f143fdf7eac9aabe53
Author: Aron Budea 
AuthorDate: Wed Jul 12 15:04:32 2023 +0200
Commit: Aron Budea 
CommitDate: Wed Jul 12 15:04:32 2023 +0200

Bump version to 22.05.17.1

Change-Id: I3e7103abfd2f54bc6be120d64a37e521fa876f39

diff --git a/configure.ac b/configure.ac
index 72cbed9fe25f..c42502675378 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[22.05.16.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.17.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.3.7.2.M5'

[Aron Budea (via logerrit)]

Tag 'mimo-7.3.7.2.M5' created by Aron Budea  at 
2023-07-09 23:24 +

mimo-7.3.7.2.M5

Changes since mimo-7.3.7.2.M4-3:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.2.7.2.M13'

[Aron Budea (via logerrit)]

Tag 'mimo-7.2.7.2.M13' created by Aron Budea  at 
2023-07-09 23:22 +

mimo-7.2.7.2.M13

Changes since mimo-7.2.7.2.M12-4:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - 5 commits - configure.ac framework/source sc/qa sc/source vcl/source

[Aron Budea (via logerrit)]

 configure.ac  |2 -
 framework/source/dispatch/popupmenudispatcher.cxx |1 
 sc/qa/unit/helper/qahelper.cxx|   38 ++
 sc/source/core/data/dpoutput.cxx  |6 ++-
 sc/source/ui/view/viewfun3.cxx|2 +
 vcl/source/gdi/embeddedfontshelper.cxx|   31 -
 6 files changed, 75 insertions(+), 5 deletions(-)

New commits:
commit 5bf29bcf370d125083a95ed01285518a85d3c217
Author: Aron Budea 
AuthorDate: Fri Jul 7 01:35:08 2023 +0200
Commit: Aron Budea 
CommitDate: Fri Jul 7 01:36:48 2023 +0200

Bump version to 7.2.7.2.M13

Change-Id: I652e750886187df0687369cf1fa52947433cd5ac

diff --git a/configure.ac b/configure.ac
index c9f95e780b74..cd1661af3f32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.7.2.M12],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.2.M13],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 70974255a94eb9e91c266261d329bce53ba79556
Author: Noel Grandin 
AuthorDate: Fri Nov 5 10:12:14 2021 +0200
Commit: Aron Budea 
CommitDate: Fri Jul 7 01:33:02 2023 +0200

[-Werror=nonnull] ‘this’ pointer is null

gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0
is now complaining about a double-unlock

Which has been there ever since
commit fb6c93aed8d3d7468e4c9b412e432633c36e68fc
Date:   Wed Dec 13 14:05:51 2006 +
INTEGRATION: CWS fwk54 (1.1.2); FILE ADDED
2006/11/10 12:54:27 cd 1.1.2.1: #i65187# Protocol handler for
vnd.sun.star.popup URLs to support dispatch by popup menu controller

Change-Id: I87206bb7313b69babb16859808868ffa00707faa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124731
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 03b476c0da596545bd9b99cc744a5fb56bfb797a)

diff --git a/framework/source/dispatch/popupmenudispatcher.cxx 
b/framework/source/dispatch/popupmenudispatcher.cxx
index 1b845347454f..89fbcb939cf7 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -137,7 +137,6 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
 
 // Find popup menu controller using the base URL
 xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider;
-aGuard.clear();
 
 // Ask popup menu dispatch provider for dispatch object
 if ( xDispatchProvider.is() )
commit 3d3d016e29532df7639752b72e2adf797028cd11
Author: luigiiucci 
AuthorDate: Tue Jun 13 22:10:00 2023 +0200
Commit: Aron Budea 
CommitDate: Fri Jul 7 01:31:53 2023 +0200

tdf#155486 Adding fonts to .odt when there is "no perfect match"

Problem does not seem to have any
 relation with .otf files management.
Problem arises when:
  - we use a font with setting certain
family/bold/italic/pitch values
  - we have this font installed, but
we don't have a version with
matching
family/bold/italic/pitch
In this case the "not a perfect match"
 fonts were not saved in the .odt

Change-Id: Ie4e2b9c34b79ac99f03c57bed4fdc5f4d718dcc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153007
Tested-by: Jenkins
Reviewed-by: خالد حسني 
(cherry picked from commit e7c885389bfb9387acf8a21ea38769e678a76aac)
(cherry picked from commit a3a00555d4b0e07ee921f85ac088e7b17047c6cf)
(cherry picked from commit 4da8ce44a6e6a41d1506ba9087c28896c36a2722)

diff --git a/vcl/source/gdi/embeddedfontshelper.cxx 
b/vcl/source/gdi/embeddedfontshelper.cxx
index 7e242d640837..404ffb49fa2b 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -258,6 +258,15 @@ OUString EmbeddedFontsHelper::fontFileUrl( 
std::u16string_view familyName, FontF
 graphics->GetDevFontList(  );
 std::unique_ptr< ImplDeviceFontList > fontInfo( fonts.GetDeviceFontList());
 PhysicalFontFace* selected = nullptr;
+
+// Maybe we don't find the perfect match for the font. E.G. we have fonts 
with the same family name
+// but not same bold or italic etc..
+// In this case we add all the fonts having the family name of tyhe used 
font:
+//  - we store all these fonts in familyNameFonts during loop
+//  - if we haven't found the perfect match we store all fonts in 
familyNameFonts
+typedef std::vector FontList;
+FontList familyNameFonts;
+
 for( int i = 0;

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-3' - 4 commits - configure.ac sc/qa sc/source vcl/source

[Aron Budea (via logerrit)]

 configure.ac   |2 -
 sc/qa/unit/helper/qahelper.cxx |   38 +
 sc/source/core/data/dpoutput.cxx   |6 -
 sc/source/ui/view/viewfun3.cxx |2 +
 vcl/source/gdi/embeddedfontshelper.cxx |   31 +-
 5 files changed, 75 insertions(+), 4 deletions(-)

New commits:
commit cf0a4747cef76399d7acd30c4dcda7a78e7973c2
Author: Aron Budea 
AuthorDate: Fri Jul 7 00:19:06 2023 +0200
Commit: Aron Budea 
CommitDate: Fri Jul 7 00:19:06 2023 +0200

Bump version to 7.3.7.2.M5

Change-Id: Id24ff02237b8830a16a58483827f05951600dfe2

diff --git a/configure.ac b/configure.ac
index 13379b00ccc1..52205e99ac64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.3.7.2.M4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.2.M5],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 4da8ce44a6e6a41d1506ba9087c28896c36a2722
Author: luigiiucci 
AuthorDate: Tue Jun 13 22:10:00 2023 +0200
Commit: Aron Budea 
CommitDate: Thu Jul 6 23:27:04 2023 +0200

tdf#155486 Adding fonts to .odt when there is "no perfect match"

Problem does not seem to have any
 relation with .otf files management.
Problem arises when:
  - we use a font with setting certain
family/bold/italic/pitch values
  - we have this font installed, but
we don't have a version with
matching
family/bold/italic/pitch
In this case the "not a perfect match"
 fonts were not saved in the .odt

Change-Id: Ie4e2b9c34b79ac99f03c57bed4fdc5f4d718dcc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153007
Tested-by: Jenkins
Reviewed-by: خالد حسني 
(cherry picked from commit e7c885389bfb9387acf8a21ea38769e678a76aac)
(cherry picked from commit a3a00555d4b0e07ee921f85ac088e7b17047c6cf)

diff --git a/vcl/source/gdi/embeddedfontshelper.cxx 
b/vcl/source/gdi/embeddedfontshelper.cxx
index 34d227e5f5b2..2ca5ccd3c1b7 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -261,6 +261,15 @@ OUString EmbeddedFontsHelper::fontFileUrl( 
std::u16string_view familyName, FontF
 graphics->GetDevFontList(  );
 std::unique_ptr< vcl::font::PhysicalFontFaceCollection > fontInfo( 
fonts.GetFontFaceCollection());
 vcl::font::PhysicalFontFace* selected = nullptr;
+
+// Maybe we don't find the perfect match for the font. E.G. we have fonts 
with the same family name
+// but not same bold or italic etc..
+// In this case we add all the fonts having the family name of tyhe used 
font:
+//  - we store all these fonts in familyNameFonts during loop
+//  - if we haven't found the perfect match we store all fonts in 
familyNameFonts
+typedef std::vector FontList;
+FontList familyNameFonts;
+
 for( int i = 0;
  i < fontInfo->Count();
  ++i )
@@ -288,12 +297,30 @@ OUString EmbeddedFontsHelper::fontFileUrl( 
std::u16string_view familyName, FontF
 { // Some fonts specify 'DONTKNOW' for some things, still a good 
match, if we don't find a better one.
 selected = f;
 }
+// adding "not perfact match" to familyNameFonts vector
+familyNameFonts.push_back(f);
+
 }
 }
-if( selected != nullptr )
+
+// if we have found a perfect match we will add only "selected", otherwise 
all familyNameFonts
+FontList fontsToAdd = (selected ? FontList(1, selected) : 
std::move(familyNameFonts));
+
+for (vcl::font::PhysicalFontFace* f : fontsToAdd)
 {
+if (!selected) { // recalculate file not for "not perfect match"
+filename = OUString::Concat(familyName) + "_" + 
OUString::number(f->GetFamilyType()) + "_" +
+OUString::number(f->GetItalic()) + "_" + 
OUString::number(f->GetWeight()) + "_" +
+OUString::number(f->GetPitch()) + ".ttf"; // TODO is it always 
ttf?
+url = path + filename;
+if (osl::File(url).open(osl_File_OpenFlag_Read) == 
osl::File::E_None) // = exists()
+{
+// File with contents of the font file already exists, assume 
it's been created by a previous call.
+continue;
+}
+}
 tools::Long size;
-if (const void* data = graphics->GetEmbedFontData(selected, ))
+if (const void* data = graphics->GetEmbedFontData(f, ))
 {
 if( sufficientTTFRights( data, size, rights ))
 {
commit 

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source

[Aron Budea (via logerrit)]

 desktop/source/lib/init.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9676d121182ce8a2b395df01b75a9c3cb625fc50
Author: Aron Budea 
AuthorDate: Mon Feb 13 14:59:04 2023 +0100
Commit: Andras Timar 
CommitDate: Wed Jul 5 09:56:29 2023 +0200

Fix build [-Werror=unused-parameter]

desktop/source/lib/init.cxx:5430:51: error: unused parameter ‘pThis’ 
[-Werror=unused-parameter]
 5430 | static char* getLanguages(LibreOfficeKitDocument* pThis, const 
char* pCommand)
  |   ^

After 7fb089be113f3f95d9a13e3aafafc64107301d1d.

Change-Id: If4d9a751e4d32df4d8b854e197da5e8eb7e96d9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146906
Reviewed-by: Andras Timar 
Tested-by: Jenkins CollaboraOffice 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 70d049feac51..8448209e87b5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5628,7 +5628,7 @@ static void addLocale(boost::property_tree::ptree& 
rValues, css::lang::Locale co
 rValues.push_back(std::make_pair("", aChild));
 }
 
-static char* getLanguages(LibreOfficeKitDocument* pThis, const char* pCommand)
+static char* getLanguages(const char* pCommand)
 {
 css::uno::Sequence< css::lang::Locale > aLocales;
 css::uno::Sequence< css::lang::Locale > aGrammarLocales;
@@ -6001,7 +6001,7 @@ static char* doc_getCommandValues(LibreOfficeKitDocument* 
pThis, const char* pCo
 
 if (!strcmp(pCommand, ".uno:LanguageStatus"))
 {
-return getLanguages(pThis, pCommand);
+return getLanguages(pCommand);
 }
 else if (!strcmp(pCommand, ".uno:CharFontName"))
 {

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source

[Aron Budea (via logerrit)]

 sc/source/ui/app/inputwin.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 2418b8bac7ebca555d0c15ae63b92b7e474636c0
Author: Aron Budea 
AuthorDate: Mon Jul 3 23:53:56 2023 +0200
Commit: Aron Budea 
CommitDate: Tue Jul 4 01:23:45 2023 +0200

Fix build

sc/source/ui/app/inputwin.cxx: In member function ‘virtual bool 
ScTextWnd::Command(const CommandEvent&)’:
sc/source/ui/app/inputwin.cxx:1739:22: error: unused variable ‘pParaPoint’ 
[-Werror=unused-variable]
 1739 | const Point* pParaPoint = static_cast(rCEvt.GetEventData());
  |  ^~
sc/source/ui/app/inputwin.cxx:1740:15: error: unused variable 
‘aSelectionStartEnd’ [-Werror=unused-variable]
 1740 | Point aSelectionStartEnd = rCEvt.GetMousePosPixel();
  |   ^~

After ea846af14bffc9f48862c39e6232f188df4bbe62.

Change-Id: Ica1a1a8985a3fdfc2fbd38652f687bf0d8c5fc36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153934
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a413424a11c5..671e529e74ce 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1733,12 +1733,6 @@ bool ScTextWnd::Command( const CommandEvent& rCEvt )
 if (!m_xEditView)
 return true;
 
-// information about paragraph is in additional data
-// information about position in a paragraph in a Mouse Pos
-// see vcl/jsdialog/executor.cxx "textselection" event
-const Point* pParaPoint = static_cast(rCEvt.GetEventData());
-Point aSelectionStartEnd = rCEvt.GetMousePosPixel();
-
 sal_Int32 nParaStart, nParaEnd, nPosStart, nPosEnd;
 
 // We use IME - do not select anything, put cursor at the end

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/uiconfig

[Aron Budea (via logerrit)]

 sw/uiconfig/swriter/ui/pagenumberdlg.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fd79d1169b608f461d4ea8df24f61f34b80401f5
Author: Aron Budea 
AuthorDate: Thu Jun 29 04:51:10 2023 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 30 00:49:36 2023 +0200

tdf#155706 tdf#86630 sw page number wizard: make OK default

Change-Id: If1b902d34157be8c9eab2d5ec140f5e85dfc49e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153731
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit 19fbd6862302065cdf490085d1a8fea49f73d6ca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153753
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sw/uiconfig/swriter/ui/pagenumberdlg.ui 
b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
index 27f9bbed1543..f014545da429 100644
--- a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
+++ b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
@@ -24,6 +24,8 @@
 _OK
 True
 True
+True
+True
 True
 True
   

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/uiconfig

[Aron Budea (via logerrit)]

 sw/uiconfig/swriter/ui/pagenumberdlg.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit db1cdc6be062cd6c4240a1ec4d96c0ef613e2b27
Author: Aron Budea 
AuthorDate: Thu Jun 29 04:51:10 2023 +0200
Commit: Justin Luth 
CommitDate: Thu Jun 29 22:15:00 2023 +0200

tdf#155706 tdf#86630 sw page number wizard: make OK default

Change-Id: If1b902d34157be8c9eab2d5ec140f5e85dfc49e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153731
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit b336512318947fb863d9aadec91ccf6316b8d39a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153752

diff --git a/sw/uiconfig/swriter/ui/pagenumberdlg.ui 
b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
index 27f9bbed1543..f014545da429 100644
--- a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
+++ b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
@@ -24,6 +24,8 @@
 _OK
 True
 True
+True
+True
 True
 True
   

[Libreoffice-commits] core.git: sw/uiconfig

[Aron Budea (via logerrit)]

 sw/uiconfig/swriter/ui/pagenumberdlg.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 19fbd6862302065cdf490085d1a8fea49f73d6ca
Author: Aron Budea 
AuthorDate: Thu Jun 29 04:51:10 2023 +0200
Commit: Justin Luth 
CommitDate: Thu Jun 29 13:16:52 2023 +0200

tdf#155706 tdf#86630 sw page number wizard: make OK default

Change-Id: If1b902d34157be8c9eab2d5ec140f5e85dfc49e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153731
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/uiconfig/swriter/ui/pagenumberdlg.ui 
b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
index 27f9bbed1543..f014545da429 100644
--- a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
+++ b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
@@ -24,6 +24,8 @@
 _OK
 True
 True
+True
+True
 True
 True
   

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-22.05.16-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.16-1' created by Aron Budea  at 
2023-06-28 18:57 +

cp-22.05.16-1

Changes since cp-22.05.15-2-27:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 26451099702871030eb9ce6d1b502f529c124dd0
Author: Aron Budea 
AuthorDate: Wed Jun 28 20:53:25 2023 +0200
Commit: Aron Budea 
CommitDate: Wed Jun 28 20:53:25 2023 +0200

Bump version to 22.05.16.1

Change-Id: Ib1b7b82830a8d99056c6044557555c306976aeb4

diff --git a/configure.ac b/configure.ac
index 9802aa37a0f8..72cbed9fe25f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[22.05.15.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.16.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac

[Aron Budea (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9543e7a2366ac3ce101009ae5d20b9d4ed0e06ef
Author: Aron Budea 
AuthorDate: Tue Jun 20 01:09:29 2023 +0200
Commit: Aron Budea 
CommitDate: Tue Jun 20 01:28:37 2023 +0200

Accept iOS SDK 16.5

Change-Id: Idf53c90cc3ef5c59cc9ad6151c13cc2125daf546
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153304
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/configure.ac b/configure.ac
index f83a3c7f8f6b..9802aa37a0f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3501,8 +3501,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=16.2
-older_sdk_vers="16.1 16.0 15.6 15.5 15.4 15.2 15.0"
+current_sdk_ver=16.5
+older_sdk_vers="16.4 16.3 16.2 16.1 16.0 15.6 15.5 15.4 15.2 15.0"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=14.5

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-22.05.15-2'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.15-2' created by Andras Timar  at 
2023-05-24 16:24 +

cp-22.05.15-2

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-22.05.15-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.15-1' created by Andras Timar  at 
2023-05-23 19:45 +

cp-22.05.15-1

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - cui/source cui/uiconfig

[Aron Budea (via logerrit)]

 cui/source/inc/optlingu.hxx |1 +
 cui/source/options/optlingu.cxx |   17 ++---
 cui/uiconfig/ui/optlingupage.ui |4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 086d03602959d096caa440772cfb1f92bc6a9257
Author: Aron Budea 
AuthorDate: Sun Apr 30 01:40:55 2023 +0200
Commit: Andras Timar 
CommitDate: Thu May 18 20:34:37 2023 +0200

cui, lok: Hide options irrelevant for online in Spelling Options dialog

User-defined Dictionaries part and
Get more dictionaries URL + icon.

Change-Id: I73825a481e1981145abbf36b44485fb1628fbe13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151212
Tested-by: Jenkins
Reviewed-by: Aron Budea 
(cherry picked from commit 17e3aa456095cab2d9058f99f8523f080c0774e0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151374
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 365acfbbb0fb..dbe0b8428718 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -118,6 +118,7 @@ private:
 std::unique_ptr m_xLinguDicsDelPB;
 std::unique_ptr m_xLinguOptionsCLB;
 std::unique_ptr m_xLinguOptionsEditPB;
+std::unique_ptr m_xMoreDictsBox;
 std::unique_ptr m_xMoreDictsLink;
 
 voidAddDicBoxEntry( const css::uno::Reference< 
css::linguistic2::XDictionary > , sal_uInt16 nIdx );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6db7634159b1..1a65d9d5cee5 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -847,6 +848,7 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, 
weld::DialogController*
 , m_xLinguDicsDelPB(m_xBuilder->weld_button("lingudictsdelete"))
 , m_xLinguOptionsCLB(m_xBuilder->weld_tree_view("linguoptions"))
 , m_xLinguOptionsEditPB(m_xBuilder->weld_button("linguoptionsedit"))
+, m_xMoreDictsBox(m_xBuilder->weld_box("moredictsbox"))
 , m_xMoreDictsLink(m_xBuilder->weld_link_button("moredictslink"))
 {
 m_xLinguModulesCLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
@@ -872,7 +874,15 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, 
weld::DialogController*
 
 m_xMoreDictsLink->connect_activate_link(LINK(this, SvxLinguTabPage, 
OnLinkClick));
 if (officecfg::Office::Security::Hyperlinks::Open::get() == 
SvtExtendedSecurityOptions::OPEN_NEVER)
-m_xMoreDictsLink->hide();
+m_xMoreDictsBox->hide();
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+// hide User-defined Dictionaries part
+m_xBuilder->weld_frame("dictsframe")->hide();
+// hide Get more dictionaries URL + icon
+m_xMoreDictsBox->hide();
+}
 
 xProp = LinguMgr::GetLinguPropertySet();
 xDicList.set( LinguMgr::GetDictionaryList() );
@@ -1526,9 +1536,10 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
 m_xLinguModulesCLB->hide();
 m_xLinguModulesEditPB->hide();
 
-if (officecfg::Office::Security::Hyperlinks::Open::get() != 
SvtExtendedSecurityOptions::OPEN_NEVER)
+if (officecfg::Office::Security::Hyperlinks::Open::get() != 
SvtExtendedSecurityOptions::OPEN_NEVER &&
+!comphelper::LibreOfficeKit::isActive())
 {
-m_xMoreDictsLink->show();
+m_xMoreDictsBox->show();
 }
 }
 }
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index 5ae94f81c0b6..13d9b3d059f9 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -231,7 +231,7 @@
   
 
 
-  
+  
 True
 False
 0
@@ -516,7 +516,7 @@
   
 
 
-  
+  
 True
 False
 

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-22.05.14-3'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.14-3' created by Andras Timar  at 
2023-05-05 17:12 +

cp-22.05.14-3

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Aron Budea (via logerrit)]

 cui/source/inc/optlingu.hxx |1 +
 cui/source/options/optlingu.cxx |   17 ++---
 cui/uiconfig/ui/optlingupage.ui |4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 5e7327e9313e2d9fe2f0defb30d3e7dc28c0b2ce
Author: Aron Budea 
AuthorDate: Sun Apr 30 01:40:55 2023 +0200
Commit: Aron Budea 
CommitDate: Fri May 5 05:51:20 2023 +0200

cui, lok: Hide options irrelevant for online in Spelling Options dialog

User-defined Dictionaries part and
Get more dictionaries URL + icon.

Change-Id: I73825a481e1981145abbf36b44485fb1628fbe13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151212
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 29adee861417..d0933e4ac831 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -120,6 +120,7 @@ private:
 std::unique_ptr m_xLinguDicsDelPB;
 std::unique_ptr m_xLinguOptionsCLB;
 std::unique_ptr m_xLinguOptionsEditPB;
+std::unique_ptr m_xMoreDictsBox;
 std::unique_ptr m_xMoreDictsLink;
 
 voidAddDicBoxEntry( const css::uno::Reference< 
css::linguistic2::XDictionary > , sal_uInt16 nIdx );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index b80343657f22..3530d20f8750 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -853,6 +854,7 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, 
weld::DialogController*
 , m_xLinguDicsDelPB(m_xBuilder->weld_button("lingudictsdelete"))
 , m_xLinguOptionsCLB(m_xBuilder->weld_tree_view("linguoptions"))
 , m_xLinguOptionsEditPB(m_xBuilder->weld_button("linguoptionsedit"))
+, m_xMoreDictsBox(m_xBuilder->weld_box("moredictsbox"))
 , m_xMoreDictsLink(m_xBuilder->weld_link_button("moredictslink"))
 {
 m_xLinguModulesCLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
@@ -878,7 +880,15 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, 
weld::DialogController*
 
 m_xMoreDictsLink->connect_activate_link(LINK(this, SvxLinguTabPage, 
OnLinkClick));
 if (officecfg::Office::Security::Hyperlinks::Open::get() == 
SvtExtendedSecurityOptions::OPEN_NEVER)
-m_xMoreDictsLink->hide();
+m_xMoreDictsBox->hide();
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+// hide User-defined Dictionaries part
+m_xBuilder->weld_frame("dictsframe")->hide();
+// hide Get more dictionaries URL + icon
+m_xMoreDictsBox->hide();
+}
 
 xProp = LinguMgr::GetLinguPropertySet();
 xDicList.set( LinguMgr::GetDictionaryList() );
@@ -1550,9 +1560,10 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
 m_xLinguModulesCLB->hide();
 m_xLinguModulesEditPB->hide();
 
-if (officecfg::Office::Security::Hyperlinks::Open::get() != 
SvtExtendedSecurityOptions::OPEN_NEVER)
+if (officecfg::Office::Security::Hyperlinks::Open::get() != 
SvtExtendedSecurityOptions::OPEN_NEVER &&
+!comphelper::LibreOfficeKit::isActive())
 {
-m_xMoreDictsLink->show();
+m_xMoreDictsBox->show();
 }
 }
 }
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index 5ae94f81c0b6..13d9b3d059f9 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -231,7 +231,7 @@
   
 
 
-  
+  
 True
 False
 0
@@ -516,7 +516,7 @@
   
 
 
-  
+  
 True
 False
 

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-22.05.14-2'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.14-2' created by Andras Timar  at 
2023-05-04 08:01 +

cp-22.05.14-2

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - cui/source cui/uiconfig

[Aron Budea (via logerrit)]

 cui/source/inc/optlingu.hxx |1 +
 cui/source/options/optlingu.cxx |   17 ++---
 cui/uiconfig/ui/optlingupage.ui |4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 88a82f69351842ddd2491564aee8038fc990f63e
Author: Aron Budea 
AuthorDate: Sun Apr 30 01:00:33 2023 +0200
Commit: Andras Timar 
CommitDate: Thu May 4 09:28:17 2023 +0200

cui, lok: Hide options irrelevant for online in Spelling Options dialog

User-defined Dictionaries part and
Get more dictionaries URL + icon.

Change-Id: I73825a481e1981145abbf36b44485fb1628fbe13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151211
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 365acfbbb0fb..dbe0b8428718 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -118,6 +118,7 @@ private:
 std::unique_ptr m_xLinguDicsDelPB;
 std::unique_ptr m_xLinguOptionsCLB;
 std::unique_ptr m_xLinguOptionsEditPB;
+std::unique_ptr m_xMoreDictsBox;
 std::unique_ptr m_xMoreDictsLink;
 
 voidAddDicBoxEntry( const css::uno::Reference< 
css::linguistic2::XDictionary > , sal_uInt16 nIdx );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3e0acc1c05d7..bb597ba9e296 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -845,6 +846,7 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, 
weld::DialogController*
 , m_xLinguDicsDelPB(m_xBuilder->weld_button("lingudictsdelete"))
 , m_xLinguOptionsCLB(m_xBuilder->weld_tree_view("linguoptions"))
 , m_xLinguOptionsEditPB(m_xBuilder->weld_button("linguoptionsedit"))
+, m_xMoreDictsBox(m_xBuilder->weld_box("moredictsbox"))
 , m_xMoreDictsLink(m_xBuilder->weld_link_button("moredictslink"))
 {
 m_xLinguModulesCLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
@@ -870,7 +872,15 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, 
weld::DialogController*
 
 m_xMoreDictsLink->connect_activate_link(LINK(this, SvxLinguTabPage, 
OnLinkClick));
 if (officecfg::Office::Security::Hyperlinks::Open::get() == 
SvtExtendedSecurityOptions::OPEN_NEVER)
-m_xMoreDictsLink->hide();
+m_xMoreDictsBox->hide();
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+// hide User-defined Dictionaries part
+m_xBuilder->weld_frame("dictsframe")->hide();
+// hide Get more dictionaries URL + icon
+m_xMoreDictsBox->hide();
+}
 
 xProp = LinguMgr::GetLinguPropertySet();
 xDicList.set( LinguMgr::GetDictionaryList() );
@@ -1526,9 +1536,10 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
 m_xLinguModulesCLB->hide();
 m_xLinguModulesEditPB->hide();
 
-if (officecfg::Office::Security::Hyperlinks::Open::get() != 
SvtExtendedSecurityOptions::OPEN_NEVER)
+if (officecfg::Office::Security::Hyperlinks::Open::get() != 
SvtExtendedSecurityOptions::OPEN_NEVER &&
+!comphelper::LibreOfficeKit::isActive())
 {
-m_xMoreDictsLink->show();
+m_xMoreDictsBox->show();
 }
 }
 }
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index 5ae94f81c0b6..13d9b3d059f9 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -231,7 +231,7 @@
   
 
 
-  
+  
 True
 False
 0
@@ -516,7 +516,7 @@
   
 
 
-  
+  
 True
 False
 

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-22.05.14-1'

[Aron Budea (via logerrit)]

Tag 'cp-22.05.14-1' created by Andras Timar  at 
2023-05-03 15:45 +

cp-22.05.14-1

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---