core.git: sc/inc sc/source

[Caolán McNamara (via logerrit)]

 sc/inc/interpretercontext.hxx  |4 ++-
 sc/source/core/inc/interpre.hxx|6 -
 sc/source/core/tool/interpr1.cxx   |   31 -
 sc/source/core/tool/interpretercontext.cxx |4 +++
 4 files changed, 17 insertions(+), 28 deletions(-)

New commits:
commit d5ce3af3b14f7086416be778a2b4efd094852db3
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 17:30:05 2024 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 20:43:41 2024 +0100

move rng out of ScInterpreter and into the ScInterpreterContext

the former is created a lot, while the latter lives in a reusable
pool

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

diff --git a/sc/inc/interpretercontext.hxx b/sc/inc/interpretercontext.hxx
index c46f00395cc0..1fd037a719b5 100644
--- a/sc/inc/interpretercontext.hxx
+++ b/sc/inc/interpretercontext.hxx
@@ -9,8 +9,9 @@
 
 #pragma once
 
-#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include "types.hxx"
@@ -48,6 +49,7 @@ struct ScInterpreterContext
 // Allocation cache for "aConditions" array in 
ScInterpreter::IterateParameterIfs()
 // This is populated/used only when formula-group threading is enabled.
 std::vector maConditions;
+std::mt19937 aRNG;
 ScInterpreter* pInterpreter;
 
 ScInterpreterContext(const ScDocument& rDoc, SvNumberFormatter* 
pFormatter);
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index b92833b9535d..ebff66afafe0 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -35,7 +35,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -232,7 +231,6 @@ private:
 
 ScCalcConfig maCalcConfig;
 formula::FormulaTokenIterator aCode;
-std::optional oRNG;
 ScAddress   aPos;
 ScTokenArray* pArr;
 ScInterpreterContext& mrContext;
@@ -554,8 +552,6 @@ private:
 // Returns true if last jump was executed and result matrix pushed.
 bool JumpMatrix( short nStackLevel );
 
-std::mt19937& GetRNG();
-
 double Compare( ScQueryOp eOp );
 /** @param pOptions
 NULL means case sensitivity document option is to be used!
@@ -580,7 +576,7 @@ private:
 void ScPi();
 void ScRandom();
 void ScRandbetween();
-void ScRandomImpl( const std::function& RandomFunc,
+void ScRandomImpl( const std::function& RandomFunc,
 double fFirst, double fLast );
 void ScTrue();
 void ScFalse();
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 0a9ee65ff37c..1c85074f9ac0 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -67,13 +67,12 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
 #include 
-#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1737,7 +1736,7 @@ void ScInterpreter::ScPi()
 PushDouble(M_PI);
 }
 
-void ScInterpreter::ScRandomImpl( const std::function& RandomFunc,
+void ScInterpreter::ScRandomImpl( const std::function& RandomFunc,
 double fFirst, double fLast )
 {
 if (bMatrixFormula)
@@ -1764,7 +1763,7 @@ void ScInterpreter::ScRandomImpl( const 
std::functionPutDouble( RandomFunc( GetRNG(), fFirst, fLast),
+pResMat->PutDouble( RandomFunc( fFirst, fLast),
 static_cast(i), static_cast(j));
 }
 }
@@ -1794,28 +1793,16 @@ void ScInterpreter::ScRandomImpl( const 
std::function::max()));
-oRNG = std::mt19937(nSeed);
+PushDouble( RandomFunc( fFirst, fLast));
 }
-return *oRNG;
 }
 
 void ScInterpreter::ScRandom()
 {
-auto RandomFunc = [](std::mt19937& rRNG, double, double)
+auto RandomFunc = [this]( double, double )
 {
 std::uniform_real_distribution dist(0.0, 1.0);
-return dist(rRNG);
+return dist(mrContext.aRNG);
 };
 ScRandomImpl( RandomFunc, 0.0, 0.0);
 }
@@ -1835,10 +1822,10 @@ void ScInterpreter::ScRandbetween()
 return;
 }
 fMax = std::nextafter( fMax+1, -DBL_MAX);
-auto RandomFunc = [](std::mt19937& rRNG, double fFirst, double fLast)
+auto RandomFunc = [this]( double fFirst, double fLast )
 {
 std::uniform_real_distribution dist(fFirst, fLast);
-return floor(dist(rRNG));
+return floor(dist(mrContext.aRNG));
 };
 ScRandomImpl( RandomFunc, fMin, fMax);
 }
diff --git a/sc/source/core/tool/interpretercontext.cxx 
b/sc/source/core/tool/interpretercontext.cxx
index ef9e1f3947bf..e39710c638f1 100644
--- a/sc/source/core/tool/interpretercontext.cxx
+++ b/sc/source/core/tool/interpretercontext.cxx
@@ -22,6 +22,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,6 +35,9 @@ ScInterpreterContext::ScInterpreterContext(const ScDocument& 
rDoc, 

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

[Pranam Lashkari (via logerrit)]

 svx/source/svdraw/svdedxv.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a3f416e353031b9abb4ecfd3bf703e2238a5599f
Author: Pranam Lashkari 
AuthorDate: Mon Mar 11 21:03:30 2024 +0530
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 21:49:13 2024 +0100

LOK: send LOK_CALLBACK_SHAPE_INNER_TEXT info on empty textbox initialization

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

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 90e8e116e807..083f0f1e932b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2434,8 +2434,10 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& 
rSet, bool bReplaceAll)
 mpTextEditOutlinerView->SetAttribs(rSet);
 
 Outliner* pTEOutliner = mpTextEditOutlinerView->GetOutliner();
-if (mpModel && pTEOutliner && pTEOutliner->IsModified())
+if (mpModel && pTEOutliner && pTEOutliner->IsModified()) {
 mpModel->SetChanged();
+SetInnerTextAreaForLOKit();
+}
 
 ImpMakeTextCursorAreaVisible();
 }

core.git: svx/source

[Pranam Lashkari (via logerrit)]

 svx/source/svdraw/svdedxv.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f8bb64a3cffb80793a6b3b9c41f78c5feccb168e
Author: Pranam Lashkari 
AuthorDate: Mon Mar 11 21:03:30 2024 +0530
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 21:48:33 2024 +0100

LOK: send LOK_CALLBACK_SHAPE_INNER_TEXT info on empty textbox initialization

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

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f60baf1b64fe..799d51f85930 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2513,7 +2513,10 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& 
rSet, bool bReplaceAll)
 
 Outliner* pTEOutliner = mpTextEditOutlinerView->GetOutliner();
 if (pTEOutliner && pTEOutliner->IsModified())
+{
 GetModel().SetChanged();
+SetInnerTextAreaForLOKit();
+}
 
 ImpMakeTextCursorAreaVisible();
 }

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

[Pranam Lashkari (via logerrit)]

 svx/source/svdraw/svdedxv.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5c4e77c839988838ead659b9986da8dfebfcf7e0
Author: Pranam Lashkari 
AuthorDate: Mon Mar 11 21:03:30 2024 +0530
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 21:48:48 2024 +0100

LOK: send LOK_CALLBACK_SHAPE_INNER_TEXT info on empty textbox initialization

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

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 0efdd449e00e..4afe96b4c657 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2426,7 +2426,10 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& 
rSet, bool bReplaceAll)
 
 Outliner* pTEOutliner = mpTextEditOutlinerView->GetOutliner();
 if (pTEOutliner && pTEOutliner->IsModified())
+{
 GetModel().SetChanged();
+SetInnerTextAreaForLOKit();
+}
 
 ImpMakeTextCursorAreaVisible();
 }

help.git: source/text

[Pierre F (via logerrit)]

 source/text/sbasic/shared/03030303.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a86b2f17b0cceb46e7b6b6c1c58a343b5cb2
Author: Pierre F 
AuthorDate: Mon Mar 11 20:08:47 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 11 23:50:28 2024 +0100

fix rounding and use Format()  tdf#155654

Change-Id: I8a9643fb9713177eba3bb56e93d26a989ac9f099
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164677
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/sbasic/shared/03030303.xhp 
b/source/text/sbasic/shared/03030303.xhp
index 3054e52809..8d7e9f6394 100644
--- a/source/text/sbasic/shared/03030303.xhp
+++ b/source/text/sbasic/shared/03030303.xhp
@@ -51,11 +51,11 @@
   Dim 
lSec As Long,lMin As Long,lHour As Long
   lSec = 
Timer
   MsgBox lSec, 0, "Seconds 
since midnight"
-  lMin = 
lSec / 60
+  lMin = 
Int(lSec / 60)
   lSec = 
lSec Mod 60
-  lHour 
= lMin / 60
+  lHour 
= Int(lMin / 60)
   lMin = 
lMin Mod 60
-MsgBox Right("00"  lHour 
, 2)  ":" Right("00"  lMin , 2)  ":"  Right("00"  
lSec , 2), 0, "The time is"
+MsgBox Format(lHour,"00") 
 ":" Format(lMin,"00")  ":"  Format(lSec,"00"),  0, "The 
time is"
 End 
Sub
 
 

core.git: helpcontent2

[Pierre F (via logerrit)]

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

New commits:
commit 173bf8bf8b8e485691f8f0b4b33da0a139babc34
Author: Pierre F 
AuthorDate: Mon Mar 11 23:50:28 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 11 23:50:28 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a86b2f17b0cceb46e7b6b6c1c58a343b5cb2
  - fix rounding and use Format()  tdf#155654

Change-Id: I8a9643fb9713177eba3bb56e93d26a989ac9f099
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164677
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 3a192b621db3..a86b2f17 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3a192b621db3644d50544a64f56ac34909711f92
+Subproject commit a86b2f17b0cceb46e7b6b6c1c58a343b5cb2

core.git: include/tools svx/source tools/source

[Caolán McNamara (via logerrit)]

 include/tools/json_writer.hxx |1 +
 svx/source/tbxctrls/PaletteManager.cxx|3 +--
 svx/source/theme/ThemeColorPaletteManager.cxx |4 +++-
 tools/source/misc/json_writer.cxx |   10 ++
 4 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 17dc98b0f0d96362db03e48c0589013c349da156
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 13:27:23 2024 +
Commit: Noel Grandin 
CommitDate: Mon Mar 11 18:47:41 2024 +0100

Document Colors do not show any color in the Palette

same is true for "Theme Colors", a problem since:

commit 4ccc2f0e3f45c9d78f74b1848851bedf71f7382d
Date:   Fri Mar 1 22:11:14 2024 +0200

cool#8327 use tools::JsonWriter for theme colors

Change-Id: Ibaab5df197bd8005037e066181e8a50bdda5ceda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164658
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Noel Grandin 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164669
Tested-by: Jenkins

diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index eca19a6e736a..92d219457789 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -46,6 +46,7 @@ public:
 
 [[nodiscard]] ScopedJsonWriterNode<'}'> startNode(std::string_view 
nodeName);
 [[nodiscard]] ScopedJsonWriterNode<']'> startArray(std::string_view 
nodeName);
+[[nodiscard]] ScopedJsonWriterNode<']'> startAnonArray();
 [[nodiscard]] ScopedJsonWriterNode<'}'> startStruct();
 
 void put(std::u16string_view pPropName, std::u16string_view rPropValue);
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index fda9803c9d03..d1dafc182bb9 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -480,8 +480,7 @@ void PaletteManager::generateJSON(tools::JsonWriter& aTree, 
const std::set 
JsonWriter::startArray(std::string_view pN
 return { *this };
 }
 
+JsonWriter::ScopedJsonWriterNode<']'> JsonWriter::startAnonArray()
+{
+putRaw("[ ");
+
+mStartNodeCount++;
+mbFirstFieldInNode = true;
+
+return { *this };
+}
+
 JsonWriter::ScopedJsonWriterNode<'}'> JsonWriter::startStruct()
 {
 putRaw("{ ");

core.git: embeddedobj/source

[Andrea Gelmini (via logerrit)]

 embeddedobj/source/msole/olecomponent.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83c2a63223f8f08319d359b4a9a10f37539c021b
Author: Andrea Gelmini 
AuthorDate: Mon Mar 11 17:24:17 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 11 18:57:32 2024 +0100

Fix typo

Change-Id: I9d09cb02d5fed17d48f0bc42ac41cf8bad3b66b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164667
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index 34bce5751467..745e0e83a7e3 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -81,7 +81,7 @@ FORMATETC const pFormatTemplates[FORMATS_NUM] = {
 //
 // To handle this, several workarounds were implemented in the past; the 
mentioned "OnMainThread"
 // argument is one of these, allowing open document requests be processed not 
in the handler threads
-// that receired the request, but in the main thread which will then be used 
for interaction. Also
+// that received the request, but in the main thread which will then be used 
for interaction. Also
 // OleComponent::GetExtent was changed to check if the first call to 
IDataObject::GetData failed
 // with RPC_E_WRONG_THREAD, and then retry in the main thread.
 //

core.git: embeddedobj/source

[Andrea Gelmini (via logerrit)]

 embeddedobj/source/msole/olecomponent.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea1d09b039d295f0818a283e03bdaf3d5f21d5f0
Author: Andrea Gelmini 
AuthorDate: Mon Mar 11 17:22:23 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 11 18:56:34 2024 +0100

Fix typo

Change-Id: Idc184c5155fa69888561fed5709da36c330d1c2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164666
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index 63436bbcfea6..34bce5751467 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -74,7 +74,7 @@ FORMATETC const pFormatTemplates[FORMATS_NUM] = {
 // loadComponentFromURL, and the instantiation of the object happens during 
the load), or in MTA
 // (the thread actually serving the incoming calls).
 //
-// The objects typically can only be used in the appartment where they were 
instantiated. This means
+// The objects typically can only be used in the apartment where they were 
instantiated. This means
 // that e.g. a call to IOleObject::Close will fail, if it is performed in a 
different thread, when
 // it was started in the main thread. And vice versa, opening a document in a 
handler thread, then
 // trying to interact with the OLE object in GUI would fail.

core.git: sd/inc sd/source

[Baole Fang (via logerrit)]

 sd/inc/strings.hrc|1 +
 sd/source/ui/framework/factories/BasicPaneFactory.cxx |3 ++-
 sd/source/ui/framework/factories/FullScreenPane.cxx   |   14 ++
 sd/source/ui/framework/factories/FullScreenPane.hxx   |9 +++--
 4 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 1999e2b35c8106fa959f04bbd381ddb49d257a1d
Author: Baole Fang 
AuthorDate: Wed Mar 6 20:00:27 2024 -0500
Commit: Thorsten Behrens 
CommitDate: Mon Mar 11 22:55:44 2024 +0100

tdf#158152: Make presenter console to "Console: file"

Add a new parameter pDrawDocShell to FullScreenPane to extract filename.
A new string STR_FULLSCREEN_CONSOLE is added for presenter console.
Now, the presenter console's title becomes "Console: file".

Change-Id: Ic18d00044dde602dd92210600e3c5311b46500b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164515
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 2522768a6a7b..3ff7cac89795 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -155,6 +155,7 @@
 #define STR_EFFECTDLG_PROGRAM   
NC_("STR_EFFECTDLG_PROGRAM", "Program")
 #define STR_EFFECTDLG_MACRO 
NC_("STR_EFFECTDLG_MACRO", "Macro")
 #define STR_FULLSCREEN_SLIDESHOW
NC_("STR_FULLSCREEN_SLIDESHOW", "Presenting: %s")
+#define STR_FULLSCREEN_CONSOLE  
NC_("STR_FULLSCREEN_CONSOLE", "Console: %s")
 
 // To translators: this is the spinbutton in the slidesorter toolbar to set 
the number of slides to show per row
 #define STR_SLIDES  NNC_("STR_SLIDES", "%1 
slide", "%1 slides")
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx 
b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index e112ac4c315a..4ce694a2e7df 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -345,7 +345,8 @@ Reference BasicPaneFactory::CreateFullScreenPane 
(
 new FullScreenPane(
 rxComponentContext,
 rxPaneId,
-mpViewShellBase->GetViewWindow()));
+mpViewShellBase->GetViewWindow(),
+mpViewShellBase->GetDocShell()));
 
 return xPane;
 }
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx 
b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 39da06144c09..202032b3d6f9 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -26,6 +26,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -36,7 +39,8 @@ namespace sd::framework {
 FullScreenPane::FullScreenPane (
 const Reference& rxComponentContext,
 const Reference& rxPaneId,
-const vcl::Window* pViewShellWindow)
+const vcl::Window* pViewShellWindow,
+const DrawDocShell* pDrawDocShell)
 : FrameWindowPane(rxPaneId,nullptr),
   mxComponentContext(rxComponentContext)
 {
@@ -76,10 +80,12 @@ FullScreenPane::FullScreenPane (
 
 // Set title and icon of the new window to those of the current window
 // of the view shell.
-if (pViewShellWindow != nullptr)
+if (pViewShellWindow != nullptr && pDrawDocShell != nullptr)
 {
-const SystemWindow* pSystemWindow = 
pViewShellWindow->GetSystemWindow();
-mpWorkWindow->SetText(pSystemWindow->GetText());
+SystemWindow* pSystemWindow = pViewShellWindow->GetSystemWindow();
+OUString Title(SdResId(STR_FULLSCREEN_CONSOLE));
+Title = Title.replaceFirst("%s", 
pDrawDocShell->GetTitle(SFX_TITLE_DETECT));
+mpWorkWindow->SetText(Title);
 mpWorkWindow->SetIcon(pSystemWindow->GetIcon());
 }
 
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx 
b/sd/source/ui/framework/factories/FullScreenPane.hxx
index 138503d02f1a..fb5838d9eccd 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -27,6 +27,7 @@ class VclWindowEvent;
 
 namespace vcl { class Window; }
 namespace com::sun::star::uno { class XComponentContext; }
+namespace sd { class DrawDocShell; }
 
 namespace sd::framework {
 
@@ -43,13 +44,17 @@ public:
 @param rxPaneId
 The resource id of the new pane.
 @param pViewShellWindow
-The top-level parent of this window is used to obtain title and
+The top-level parent of this window is used to obtain
 icon for the new top-level window.
+@param pDrawDocShell
+The DrawDocShell parent of this window is used to obtain
+title for the new top-level window.
 */
 FullScreenPane (
 const css::uno::Reference& 
rxComponentContext,
 const 

help.git: source/text

[Pierre F (via logerrit)]

 source/text/shared/01/0211.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3a192b621db3644d50544a64f56ac34909711f92
Author: Pierre F 
AuthorDate: Mon Mar 11 20:46:04 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 11 23:48:34 2024 +0100

clarify match/replace. tdf#153212

Change-Id: I019014574dc1fda4850363aecb70d083a89c0fec
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164678
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/01/0211.xhp 
b/source/text/shared/01/0211.xhp
index e96b9854c8..33925f27dc 100644
--- a/source/text/shared/01/0211.xhp
+++ b/source/text/shared/01/0211.xhp
@@ -250,14 +250,14 @@
 To 
enclose a set of ‘|’ alternatives. For example, the regular expression 
"b(oo|ac)k" matches both "book" and "back".
 
 
-To group 
terms in a complex expression to be operated on by the post-fix operators: "*", 
"+" and "?" along with the post-fix repetition operators. For example, the 
regular expression "a(bc)?d" matches both "ad" and "abcd" in a search.; the 
regular expression "M(iss){2}ippi" matches "Mississippi".
+To group 
terms in a complex expression to be operated on by the post-fix operators: "*", 
"+" and "?" along with the post-fix repetition operators. For example, the 
regular expression "a(bc)?d" matches both "ad" and "abcd"; "M(iss){2}ippi" 
matches "Mississippi".
 
 
-To 
record the matched sub string inside the parentheses as a reference for later 
use in the Find box using the "
" construct or in the Replace box using the "$n" construct. 
The reference to the first match is represented by "
" in the 
Find box and by "$1" in the Replace box. The 
reference to the second matched sub string by "" and "$2" respectively, and so 
on.
+To 
reference the matched sub string inside the parentheses for later use. The "\N" 
construct is used in the Find box, the "$N" construct is used 
in the Replace box. "N" being a digit, the reference to the 
first match is represented by "
" in the Find box and by "$1" 
in the Replace box; "" and "$2" reference to the second 
matched, and so on.
 
 
-For example, 
the regular expression "(890)7

" matches "8907890890".
-With the 
regular expression "(fruit|truth)" in the Find box and the regular expression 
"$1ful" in the Replace box occurrences of the words "fruit" and "truth" can be 
replaced with the words "fruitful" and "truthful" respectively without 
affecting the words "fruitfully" and "truthfully"
+For example, 
the regular expression "(890)xy
z
" matches "890xy890z890".
+With the 
regular expression "(fruit|truth)" in the Find box, and the replacement 
expression "$1ful" in the Replace box, occurrences of "fruit" and "truth" are 
replaced with "fruitful" and "truthful" respectively. Note: "" prevents 
"fruitfully" or "truthfully" from matching.
 
   
   

core.git: helpcontent2

[Pierre F (via logerrit)]

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

New commits:
commit a11c8dc43762706d53234685db48ce971377c2ee
Author: Pierre F 
AuthorDate: Mon Mar 11 23:48:34 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 11 23:48:34 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 3a192b621db3644d50544a64f56ac34909711f92
  - clarify match/replace. tdf#153212

Change-Id: I019014574dc1fda4850363aecb70d083a89c0fec
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164678
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 2694856dafe3..3a192b621db3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2694856dafe3e7850b966583e093e62b05dc099d
+Subproject commit 3a192b621db3644d50544a64f56ac34909711f92

core.git: embeddedobj/source

[Andrea Gelmini (via logerrit)]

 embeddedobj/source/general/docholder.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b83bd661b8d212e66df541ff91c976b1564ab4e
Author: Andrea Gelmini 
AuthorDate: Mon Mar 11 17:25:33 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 11 19:33:19 2024 +0100

Fix typo

Change-Id: I26617232049c6218b99d00e1f69adad42e8249ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164668
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/embeddedobj/source/general/docholder.cxx 
b/embeddedobj/source/general/docholder.cxx
index d0bbc659ca2c..4fcb563bc424 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -544,7 +544,7 @@ uno::Reference< container::XIndexAccess > 
DocumentHolder::RetrieveOwnMenu_Impl()
 }
 
 if ( !xResult.is() )
-throw uno::RuntimeException("Unable to retrive the UI configuration 
menu.", getXWeak());
+throw uno::RuntimeException("Unable to retrieve the UI configuration 
menu.", getXWeak());
 
 return xResult;
 }

core.git: 2 commits - svx/source

[Andrea Gelmini (via logerrit)]

 svx/source/gallery2/galbrws1.cxx |1 -
 svx/source/svdraw/svdmrkv.cxx|5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d759c8b39ce04ee9c1a515c01f7ed104ccb81cc1
Author: Andrea Gelmini 
AuthorDate: Mon Mar 11 17:21:48 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 11 20:42:20 2024 +0100

Remove duplicated include

Change-Id: Iba8d8295252670c0f0ab590934bcb654f2bd2625
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164665
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 85d43005b515..c68c2d8ba83e 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -48,7 +48,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
commit caddd0199ea1f07e1fdef6d4231da5d3f8e9c367
Author: Pranam Lashkari 
AuthorDate: Mon Mar 11 19:19:01 2024 +0530
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 20:42:09 2024 +0100

LOK: don't send empty callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT

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

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index ccb873811143..49c67aa8f21f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -817,8 +817,9 @@ void SdrMarkView::SetInnerTextAreaForLOKit() const
 if (!comphelper::LibreOfficeKit::isActive())
 return;
 SfxViewShell* pViewShell = GetSfxViewShell();
-if (pViewShell)
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, 
CreateInnerTextRectString());
+OString sRectString = CreateInnerTextRectString();
+if (pViewShell && !sRectString.isEmpty())
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, 
sRectString);
 }
 
 void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const 
SfxViewShell* pOtherShell)

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

[Pranam Lashkari (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 663d61986cb529644fbc2385638e95b77b41d245
Author: Pranam Lashkari 
AuthorDate: Mon Mar 11 19:19:01 2024 +0530
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 20:42:20 2024 +0100

LOK: don't send empty callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT

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

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 477fb573d722..38e13d8e3857 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -817,8 +817,9 @@ void SdrMarkView::SetInnerTextAreaForLOKit() const
 if (!comphelper::LibreOfficeKit::isActive())
 return;
 SfxViewShell* pViewShell = GetSfxViewShell();
-if (pViewShell)
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, 
CreateInnerTextRectString());
+OString sRectString = CreateInnerTextRectString();
+if (pViewShell && !sRectString.isEmpty())
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, 
sRectString);
 }
 
 void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const 
SfxViewShell* pOtherShell)

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

[Pranam Lashkari (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 93d9d675e0f17fa18b0876d8f73bb9731a06186d
Author: Pranam Lashkari 
AuthorDate: Mon Mar 11 19:19:01 2024 +0530
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 20:42:37 2024 +0100

LOK: don't send empty callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT

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

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 67f0f6ffa96c..0636dc28ed64 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -822,8 +822,9 @@ void SdrMarkView::SetInnerTextAreaForLOKit() const
 if (!comphelper::LibreOfficeKit::isActive())
 return;
 SfxViewShell* pViewShell = GetSfxViewShell();
-if (pViewShell)
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, 
CreateInnerTextRectString().getStr());
+OString sRectString = CreateInnerTextRectString();
+if (pViewShell && !sRectString.isEmpty())
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, 
sRectString.getStr());
 }
 
 void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const 
SfxViewShell* pOtherShell)

core.git: basic/source

[Arnaud VERSINI (via logerrit)]

 basic/source/uno/dlgcont.cxx|6 +++---
 basic/source/uno/scriptcont.cxx |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 68b73e7a290a340be48c8b9ed4d9f970d9a56204
Author: Arnaud VERSINI 
AuthorDate: Sun Mar 3 16:30:39 2024 +0100
Commit: Arnaud Versini 
CommitDate: Mon Mar 11 08:32:32 2024 +0100

basic : use OUstring literal for XServiceInfo implementation

Change-Id: Ic4501ec887bb3f1249ab4a8da1eae07f6b2a22ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164305
Tested-by: Jenkins
Reviewed-by: Arnaud Versini 

diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 666b6d355a00..170a5c0c01cd 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -471,13 +471,13 @@ SfxDialogLibraryContainer:: HasExecutableCode( const 
OUString& /*Library*/ )
 
 OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( )
 {
-return "com.sun.star.comp.sfx2.DialogLibraryContainer";
+return u"com.sun.star.comp.sfx2.DialogLibraryContainer"_ustr;
 }
 
 Sequence< OUString > SAL_CALL 
SfxDialogLibraryContainer::getSupportedServiceNames( )
 {
-return {"com.sun.star.script.DocumentDialogLibraryContainer",
-"com.sun.star.script.DialogLibraryContainer"}; // for compatibility
+return {u"com.sun.star.script.DocumentDialogLibraryContainer"_ustr,
+u"com.sun.star.script.DialogLibraryContainer"_ustr}; // for 
compatibility
 }
 
 // Implementation class SfxDialogLibrary
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 2a5a1249a017..2f5cb5f15198 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1113,13 +1113,13 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer:: 
HasExecutableCode( const OUString&
 // Service
 OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( )
 {
-return "com.sun.star.comp.sfx2.ScriptLibraryContainer";
+return u"com.sun.star.comp.sfx2.ScriptLibraryContainer"_ustr;
 }
 
 Sequence< OUString > SAL_CALL 
SfxScriptLibraryContainer::getSupportedServiceNames( )
 {
-return {"com.sun.star.script.DocumentScriptLibraryContainer",
-"com.sun.star.script.ScriptLibraryContainer"}; // for compatibility
+return {u"com.sun.star.script.DocumentScriptLibraryContainer"_ustr,
+u"com.sun.star.script.ScriptLibraryContainer"_ustr}; // for 
compatibility
 }
 
 // Implementation class SfxScriptLibrary

core.git: Branch 'distro/collabora/co-24.04' - sw/qa writerfilter/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin2.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport21.cxx |   10 ++
 writerfilter/source/dmapper/GraphicImport.cxx  |   10 ++
 3 files changed, 20 insertions(+)

New commits:
commit 14451b801029e8efc05d7f777692a91eddab9e16
Author: Justin Luth 
AuthorDate: Tue Mar 5 20:19:09 2024 -0500
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 09:47:18 2024 +0100

tdf#160049 dml shape import: use margins with left/right HoriOrientRel

make CppunitTest_sw_ooxmlexport21 \
CPPUNIT_TEST_NAME=testTdf160049_anchorMargin

Change-Id: I3e2df2037cabfedbb6df6b8c8257e90baeaab96e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164445
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164584
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin2.docx 
b/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin2.docx
new file mode 100644
index ..349ed4cbeea7
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin2.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
index d57c94835e4b..61c1b3172d19 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
@@ -302,6 +302,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf160049_anchorMarginVML, 
"tdf160049_anchorMarginV
  getProperty(getShape(1), 
"HoriOrientRelation"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf160049_anchorMargin2, 
"tdf160049_anchorMargin2.docx")
+{
+// given a DML compat14 (Word 2010) document with a LEFT "column/text" 
anchored shape
+
+// The shape takes into account the margin, so it looks like it is in the 
middle of the doc,
+// which is "Paragraph text area"/PRINT_AREA/1, not "Entire paragraph 
area"/FRAME/0
+CPPUNIT_ASSERT_EQUAL(css::text::RelOrientation::PRINT_AREA,
+ getProperty(getShape(1), 
"HoriOrientRelation"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf160049_anchorMargin15, 
"tdf160049_anchorMargin15.docx")
 {
 // given a DML compat15 (Word 2013) document with a LEFT "column/text" 
anchored image
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 3e5d6d87b267..46a5da451226 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1268,6 +1268,16 @@ void GraphicImport::lcl_attribute(Id nName, Value& 
rValue)
 m_pImpl->m_bLayoutInCell = false;
 }
 
+if (m_pImpl->m_nHoriRelation == 
text::RelOrientation::FRAME
+&& m_pImpl->m_nHoriOrient > 
text::HoriOrientation::NONE
+&& m_pImpl->m_nHoriOrient != 
text::HoriOrientation::CENTER
+&& m_pImpl->m_nHoriOrient < 
text::HoriOrientation::FULL)
+{
+// before compat15, relative 
left/right/inside/outside honored margins.
+if 
(m_pImpl->m_rDomainMapper.GetSettingsTable()->GetWordCompatibilityMode() < 15)
+m_pImpl->m_nHoriRelation = 
text::RelOrientation::PRINT_AREA;
+}
+
 // Anchored: Word only supports at-char in that case.
 text::TextContentAnchorType eAnchorType = 
text::TextContentAnchorType_AT_CHARACTER;
 

core.git: Branch 'distro/collabora/co-24.04' - sw/qa writerfilter/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf160077_layoutInCell.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport21.cxx|   27 ++
 writerfilter/source/dmapper/GraphicImport.cxx |   13 ++
 3 files changed, 40 insertions(+)

New commits:
commit 8192ed8c0e0e474ef631f7012577fb2821708b52
Author: Justin Luth 
AuthorDate: Wed Mar 6 18:56:55 2024 -0500
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 09:47:34 2024 +0100

tdf#160077 writerfilter: shape vertRelation is FRAME for layoutinCell

When layoutInCell is active, then the offset must be applied
against the paragraph instead of the page or page margins.

There were only two unit tests that matched this,
and both were off-sheet positioned.
-tdf151704_thinColumnHeight.docx
-tdf92157.docx

make CppunitTest_sw_ooxmlexport21 \
CPPUNIT_TEST_NAME=testTdf160077_layoutInCell

Change-Id: I28241136c0c0be12d3f2dd876550ecdf91b0009c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164514
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164585
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf160077_layoutInCell.docx 
b/sw/qa/extras/ooxmlexport/data/tdf160077_layoutInCell.docx
new file mode 100644
index ..811fc47e184c
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf160077_layoutInCell.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
index 61c1b3172d19..e26abce21066 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
@@ -321,6 +321,33 @@ DECLARE_OOXMLEXPORT_TEST(testTdf160049_anchorMargin15, 
"tdf160049_anchorMargin15
  getProperty(getShape(1), 
"HoriOrientRelation"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf160077_layoutInCell, 
"tdf160077_layoutInCell.docx")
+{
+// given an in-table, slightly rotated image vertically aligned -1cm 
(above) the top page margin
+// (which is actually forced to layoutInCell, so that becomes 1cm above 
the paragraph instead)
+
+xmlDocUniquePtr pDump = parseLayoutDump();
+const sal_Int32 nCellTop
+= getXPath(pDump, "//row[1]/cell[1]/infos/bounds"_ostr, 
"top"_ostr).toInt32();
+const sal_Int32 nParaTop
+= getXPath(pDump, "//row[1]/cell[1]/txt/infos/bounds"_ostr, 
"top"_ostr).toInt32();
+const sal_Int32 nImageTop
+= getXPath(pDump, 
"//row[1]/cell[1]/txt/anchored/SwAnchoredDrawObject/bounds"_ostr,
+   "top"_ostr)
+  .toInt32();
+// The image is approximately half-way between cell top and the start of 
the text
+// correct ImageTop: 3588, while incorrect value was 1117. Cell top is 
3051, ParaTop is 4195
+const sal_Int32 nHalfway = nCellTop + (nParaTop - nCellTop) / 2;
+CPPUNIT_ASSERT_DOUBLES_EQUAL(nHalfway, nImageTop, 50); // +/- 4.4%
+
+// The effect is implemented by forcing "Entire paragraph area"/FRAME/0
+// instead of "Page text area"/PAGE_PRINT_AREA/8
+CPPUNIT_ASSERT_EQUAL(css::text::RelOrientation::FRAME,
+ getProperty(getShape(1), 
"VertOrientRelation"));
+// since layoutInCell had been turned off. If the implementation changes, 
check the layout.
+CPPUNIT_ASSERT(!getProperty(getShape(1), "IsFollowingTextFlow"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf153909_followTextFlow, 
"tdf153909_followTextFlow.docx")
 {
 // Although MSO's UI reports "layoutInCell" for the rectangle, it isn't 
specified or honored
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 46a5da451226..9b0f161d2f94 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1263,6 +1263,19 @@ void GraphicImport::lcl_attribute(Id nName, Value& 
rValue)
 
 if (m_pImpl->m_nWrap == text::WrapTextMode_THROUGH && 
m_pImpl->m_nHoriRelation == text::RelOrientation::FRAME)
 {
+if (m_pImpl->m_bLayoutInCell && 
m_pImpl->m_rDomainMapper.IsInTable()
+&& (m_pImpl->m_nVertRelation == 
text::RelOrientation::PAGE_FRAME
+|| m_pImpl->m_nVertRelation == 
text::RelOrientation::PAGE_PRINT_AREA))
+{
+// Impossible to be page-oriented when layout 
in cell.
+// Since we are turning LayoutInCell off (to 
simplify layout),
+// we need to set the orientation to the 
paragraph,
+// as MSO effectively does when it forces 
layoutInCell.
+// Probably also needs to happen with 
TEXT_LINE,
+// but MSO is 

help.git: source/text

[Pierre F (via logerrit)]

 source/text/shared/guide/insert_specialchar.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dfdacad1658ed67ef45738653a64750e49244020
Author: Pierre F 
AuthorDate: Mon Mar 11 06:54:00 2024 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Mon Mar 11 10:02:32 2024 +0100

link to *Entering Unicode Characters*

Change-Id: I7007bcbfb18f46cb043eb3a8923240460d09cbb7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164617
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/shared/guide/insert_specialchar.xhp 
b/source/text/shared/guide/insert_specialchar.xhp
index 3580bb523a..3792557e75 100644
--- a/source/text/shared/guide/insert_specialchar.xhp
+++ b/source/text/shared/guide/insert_specialchar.xhp
@@ -56,6 +56,7 @@
 
 
Special Characters
+   Entering Unicode 
Characters
AutoCorrect
 
 

core.git: helpcontent2

[Pierre F (via logerrit)]

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

New commits:
commit 755297eceaf9c471bd53c4f413b3cf7bd5a8296a
Author: Pierre F 
AuthorDate: Mon Mar 11 10:02:33 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 11 10:02:33 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to dfdacad1658ed67ef45738653a64750e49244020
  - link to *Entering Unicode Characters*

Change-Id: I7007bcbfb18f46cb043eb3a8923240460d09cbb7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164617
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 969dc6587446..dfdacad1658e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 969dc658744688aa9e1dc64611a327399d078462
+Subproject commit dfdacad1658ed67ef45738653a64750e49244020

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

[Darshan11 (via logerrit)]

 cui/source/tabpages/numpages.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 08a5c1352f4d65c180995cdfca5c981f88035901
Author: Darshan11 
AuthorDate: Fri Mar 8 20:54:43 2024 +0530
Commit: Szymon Kłos 
CommitDate: Mon Mar 11 09:36:28 2024 +0100

Hide "Add and resize" button from numbering and bullets dialog for ONLINE

- Image tab had "Add and resize" option for numbering and bullets dialog
- which is not need in online
- so we will just hide that browseBtn for online
Change-Id: Ib87f1e7ae7e6df5256ab77122b477695a45cf441
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164587
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 1f5de3dc387b..f39afdd4318f 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -739,6 +739,10 @@ 
SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogC
 m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxBitmapPickTabPage, 
DoubleClickHdl_Impl));
 m_xBtBrowseFile->connect_clicked(LINK(this, SvxBitmapPickTabPage, 
ClickAddBrowseHdl_Impl));
 
+if(comphelper::LibreOfficeKit::isActive())
+{
+m_xBtBrowseFile->hide();
+}
 eCoreUnit = 
rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
 
 // determine graphic name

core.git: Branch 'distro/collabora/co-24.04' - 3 commits - oox/source sw/qa sw/source writerfilter/source

[Justin Luth (via logerrit)]

 oox/source/vml/vmlshape.cxx  |   17 +++-
 sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin15.docx  |binary
 sw/qa/extras/ooxmlexport/data/tdf160049_anchorMarginVML.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport21.cxx   |   21 +++
 sw/qa/extras/ww8export/data/tdf160049_anchorMargin.doc   |binary
 sw/qa/extras/ww8export/ww8export4.cxx|   10 +
 sw/source/filter/ww8/ww8graf.cxx |6 +++
 writerfilter/source/dmapper/GraphicImport.cxx|   10 +
 8 files changed, 61 insertions(+), 3 deletions(-)

New commits:
commit 8dcc7c73999727a5a5e5577d6d48f43f403e2995
Author: Justin Luth 
AuthorDate: Tue Mar 5 19:43:51 2024 -0500
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 09:44:45 2024 +0100

tdf#160049 doc import: use margins with left/right HoriOrientRelation

No interesting existing unit tests.

make CppunitTest_sw_ww8export4 \
CPPUNIT_TEST_NAME=testTdf160049_anchorMargin

Change-Id: Ib855d9f35db9e0f47aff18400b69a990cd1ad5ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/16
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164583
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/qa/extras/ww8export/data/tdf160049_anchorMargin.doc 
b/sw/qa/extras/ww8export/data/tdf160049_anchorMargin.doc
new file mode 100644
index ..d1082515fd9c
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf160049_anchorMargin.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export4.cxx 
b/sw/qa/extras/ww8export/ww8export4.cxx
index d31bf17a31f6..e297ac949afe 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -49,6 +49,16 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf77964)
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER, 
getProperty(getShapeByName(u"Image2"), 
"AnchorType"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf160049_anchorMargin, 
"tdf160049_anchorMargin.doc")
+{
+// given a document with a LEFT "column/text" anchored image
+
+// The image takes into account the margin, so it looks like it is in the 
middle of the doc,
+// which is "Paragraph text area"/PRINT_AREA/1, not "Entire paragraph 
area"/FRAME/0
+CPPUNIT_ASSERT_EQUAL(css::text::RelOrientation::PRINT_AREA,
+ getProperty(getShape(1), 
"HoriOrientRelation"));
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf150197_anlv2ListFormat, 
"tdf150197_anlv2ListFormat.doc")
 {
 CPPUNIT_ASSERT_EQUAL(OUString("1."), 
getProperty(getParagraph(2), "ListLabelString"));
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 8a9dd1197129..7d486f471e1f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2400,6 +2400,12 @@ RndStdIds 
SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec& rRecord, WW8_FS
 rFSPA.nXaLeft = 0;
 rFSPA.nXaRight = nWidth;
 }
+else if ((eHoriOri == text::HoriOrientation::LEFT || eHoriOri == 
text::HoriOrientation::RIGHT)
+ && eHoriRel == text::RelOrientation::FRAME)
+{
+// relative left/right honors paragraph margins, but not with center 
or none/absolute offset
+eHoriRel = text::RelOrientation::PRINT_AREA;
+}
 
 // #i24255# - position of floating screen objects in
 // R2L layout are given in L2R layout, thus convert them of all
commit bb6fa9b093e857c7d34eb161ff4c6692f09f7b9e
Author: Justin Luth 
AuthorDate: Tue Mar 5 19:22:34 2024 -0500
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 09:44:39 2024 +0100

tdf#160049 dml import: use margins with left/right HoriOrientRelation

I'm really surprised this wasn't found much earlier.
Even DOC format isn't handling this.

compat15 gets rid of this inconsistency.

Surprisingly, there were no interesting unit tests matching this.

make CppunitTest_sw_ooxmlexport21 \
CPPUNIT_TEST_NAME=testTdf160049_anchorMarginVML

make CppunitTest_sw_ooxmlexport21 \
CPPUNIT_TEST_NAME=testTdf160049_anchorMargin15

Change-Id: Ic5c316569ad3640ba0e786d39a6e5c006c74d665
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164443
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164582
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin15.docx 
b/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin15.docx
new file mode 100755
index ..0b80c9652fbe
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin15.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
index 339e54784843..d57c94835e4b 100644
--- 

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

[Julien Nabet (via logerrit)]

 sc/source/ui/docshell/docsh3.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 18db9d334e1cafddeef53ddff435d6c059aaf803
Author: Julien Nabet 
AuthorDate: Mon Mar 4 13:21:06 2024 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 09:44:10 2024 +0100

tdf#159373: band-aid for crash in: ScTable::HasAttrib

band-aid because as Eike indicated in 
https://bugs.documentfoundation.org/show_bug.cgi?id=159373#c8
"Question remains why this PostPaint() is called at all for an invalid 
range.."

Change-Id: Ie44378119202addd8ddb46f0be4b0124be9fd48b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164354
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164586
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index b61f3c9a0f65..d935b1848c6c 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -118,6 +118,9 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
 SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = std::min(nMaxTab, 
rRange.aEnd.Tab());
 
+if (nTab1 < 0 || nTab2 < 0)
+continue;
+
 if (!m_pDocument->ValidCol(nCol1))
 {
 nMaxWidthAffectedHint = -1; // Hint no longer valid

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

[Julien Nabet (via logerrit)]

 sw/source/core/edit/edsect.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1ecbee191411bf340173fd64d56888e245a54e08
Author: Julien Nabet 
AuthorDate: Fri Mar 8 17:35:00 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 11 10:01:00 2024 +0100

tdf#160095: fix crash when using ALT+RETURN twice

Change-Id: Idc4c84039115c8d88418246a17e281c26fb49b70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164592
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 82e6236cd6ba6f45aa913a3be606e6b00f81fe07)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164614
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index daaa7296e81e..070a37a90d2f 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -316,6 +316,9 @@ static const SwNode* lcl_SpecialInsertNode(const 
SwPosition* pCurrentPos)
 // find the table/section which is close
 if( pTableNode == nullptr )
 {
+if( pSectionNode == nullptr )
+return nullptr;
+
 pInnermostNode = pSectionNode;
 pSection = _cast(pSectionNode)->GetSection();
 }

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

[Jaume Pujantell (via logerrit)]

 sfx2/source/appl/module.cxx |   14 +-
 sfx2/source/dialog/mgetempl.cxx |4 +---
 sfx2/source/sidebar/ControllerItem.cxx  |   12 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |4 +---
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |4 +---
 sw/source/uibase/sidebar/PageFormatPanel.cxx|4 +---
 6 files changed, 25 insertions(+), 17 deletions(-)

New commits:
commit 3ca938a25439d6f23bbd6830a96e5180ff94f757
Author: Jaume Pujantell 
AuthorDate: Fri Mar 8 16:24:11 2024 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 09:17:21 2024 +0100

lok: use locale units in dialogs and sidebar

When oepning tha same doucment with different locales, the dailogs and
sidebar show units (cm/inch) of the first locale (or the locale used in
preloading, en-US) for all the views.

This patch changes the units used according to the LOK locale.

Change-Id: I3d515873bde661f2d9048bbc405843e83134cca7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164589
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 03f4fc2fa8f5..b610c2ee8e2a 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #define ShellClass_SfxModule
 #include 
@@ -245,11 +247,7 @@ FieldUnit SfxModule::GetCurrentFieldUnit()
 FieldUnit eUnit = FieldUnit::INCH;
 SfxModule* pModule = GetActiveModule();
 if ( pModule )
-{
-const SfxPoolItem* pItem = pModule->GetItem( SID_ATTR_METRIC );
-if ( pItem )
-eUnit = static_cast(static_cast(pItem)->GetValue());
-}
+return pModule->GetFieldUnit();
 else
 SAL_WARN( "sfx.appl", "GetModuleFieldUnit(): no module found" );
 return eUnit;
@@ -257,6 +255,12 @@ FieldUnit SfxModule::GetCurrentFieldUnit()
 
 FieldUnit SfxModule::GetFieldUnit() const
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+MeasurementSystem eSystem
+= 
LocaleDataWrapper(comphelper::LibreOfficeKit::getLocale()).getMeasurementSystemEnum();
+return MeasurementSystem::Metric == eSystem ? FieldUnit::CM : 
FieldUnit::INCH;
+}
 FieldUnit eUnit = FieldUnit::INCH;
 const SfxPoolItem* pItem = GetItem( SID_ATTR_METRIC );
 if ( pItem )
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index a9b62452591e..7e9faad8dcd3 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -301,9 +301,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl()
 SfxModule* pModule = SfxModule::GetActiveModule();
 if ( pModule )
 {
-const SfxPoolItem* pPoolItem = pModule->GetItem( SID_ATTR_METRIC );
-if ( pPoolItem )
-eFieldUnit = static_cast(static_cast( pPoolItem )->GetValue());
+eFieldUnit = pModule->GetFieldUnit();
 }
 
 switch ( eFieldUnit )
diff --git a/sfx2/source/sidebar/ControllerItem.cxx 
b/sfx2/source/sidebar/ControllerItem.cxx
index e02276ec0cdd..28248710f1a6 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -20,6 +20,11 @@
 #include 
 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace css;
 using namespace css::uno;
@@ -59,6 +64,13 @@ void ControllerItem::RequestUpdate()
 {
 std::unique_ptr pState;
 const SfxItemState eState (GetBindings().QueryState(GetId(), pState));
+if (GetId() == SID_ATTR_METRIC && comphelper::LibreOfficeKit::isActive())
+{
+MeasurementSystem eSystem
+= 
LocaleDataWrapper(comphelper::LibreOfficeKit::getLocale()).getMeasurementSystemEnum();
+FieldUnit eUnit = MeasurementSystem::Metric == eSystem ? FieldUnit::CM 
: FieldUnit::INCH;
+
static_cast(pState.get())->SetValue(static_cast(eUnit));
+}
 mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState.get());
 }
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 20e05096d6c4..8e88bdc2c656 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -374,9 +374,7 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState 
eState, const SfxPoolI
 SfxModule* pModule = pSh->GetModule();
 if ( pModule )
 {
-const SfxPoolItem* pItem = pModule->GetItem( SID_ATTR_METRIC );
-if ( pItem )
-eUnit = static_cast(static_cast(pItem)->GetValue());
+eUnit = pModule->GetFieldUnit();
 }
 else
 {
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 

core.git: Branch 'distro/vector/vector-7.5.9' - 5 commits - basctl/source basic/source editeng/source embeddedobj/source filter/source include/editeng include/filter include/oox include/sfx2 include/s

[Mike Kaganski (via logerrit)]

 basctl/source/basicide/unomodel.cxx  |2 
 basic/source/basmgr/basicmanagerrepository.cxx   |2 
 basic/source/basmgr/basmgr.cxx   |   18 
 basic/source/uno/scriptcont.cxx  |2 
 editeng/source/misc/svxacorr.cxx |   34 -
 embeddedobj/source/inc/oleembobj.hxx |   14 
 embeddedobj/source/msole/olecomponent.cxx|  535 +--
 embeddedobj/source/msole/olecomponent.hxx|   12 
 embeddedobj/source/msole/oleembed.cxx|   21 
 embeddedobj/source/msole/olevisual.cxx   |7 
 filter/source/msfilter/msdffimp.cxx  |   30 -
 filter/source/msfilter/msoleexp.cxx  |8 
 filter/source/msfilter/rtfutil.cxx   |6 
 filter/source/msfilter/svdfppt.cxx   |   22 
 filter/source/msfilter/svxmsbas2.cxx |8 
 include/editeng/svxacorr.hxx |5 
 include/filter/msfilter/msdffimp.hxx |6 
 include/filter/msfilter/svdfppt.hxx  |4 
 include/filter/msfilter/svxmsbas.hxx |2 
 include/oox/ole/olehelper.hxx|8 
 include/sfx2/event.hxx   |9 
 include/sfx2/objsh.hxx   |   13 
 include/sot/object.hxx   |6 
 include/sot/storage.hxx  |6 
 include/svx/gallerybinaryengine.hxx  |4 
 oox/source/ole/olehelper.cxx |   18 
 oox/source/ole/vbaexport.cxx |   12 
 sc/inc/global.hxx|4 
 sc/inc/rangelst.hxx  |1 
 sc/inc/tablink.hxx   |7 
 sc/source/core/data/global.cxx   |2 
 sc/source/filter/excel/excel.cxx |   32 -
 sc/source/filter/excel/excimp8.cxx   |6 
 sc/source/filter/excel/expop2.cxx|4 
 sc/source/filter/excel/xepivot.cxx   |4 
 sc/source/filter/excel/xeroot.cxx|2 
 sc/source/filter/excel/xestream.cxx  |4 
 sc/source/filter/excel/xiescher.cxx  |2 
 sc/source/filter/excel/xipivot.cxx   |4 
 sc/source/filter/excel/xiroot.cxx|2 
 sc/source/filter/excel/xlroot.cxx|   12 
 sc/source/filter/ftools/ftools.cxx   |   16 
 sc/source/filter/inc/XclImpChangeTrack.hxx   |2 
 sc/source/filter/inc/ftools.hxx  |   10 
 sc/source/filter/inc/xcl97esc.hxx|2 
 sc/source/filter/inc/xeroot.hxx  |2 
 sc/source/filter/inc/xiescher.hxx|2 
 sc/source/filter/inc/xiroot.hxx  |2 
 sc/source/filter/inc/xlroot.hxx  |   16 
 sc/source/filter/xcl97/XclExpChangeTrack.cxx |4 
 sc/source/filter/xcl97/XclImpChangeTrack.cxx |2 
 sc/source/filter/xcl97/xcl97rec.cxx  |2 
 sc/source/ui/app/drwtrans.cxx|   15 
 sc/source/ui/app/seltrans.cxx|6 
 sc/source/ui/app/transobj.cxx|   19 
 sc/source/ui/docshell/arealink.cxx   |5 
 sc/source/ui/docshell/docsh4.cxx |3 
 sc/source/ui/docshell/externalrefmgr.cxx |   15 
 sc/source/ui/docshell/tablink.cxx|   18 
 sc/source/ui/inc/docsh.hxx   |2 
 sc/source/ui/inc/drwtrans.hxx|2 
 sc/source/ui/inc/instbdlg.hxx|5 
 sc/source/ui/inc/linkarea.hxx|3 
 sc/source/ui/inc/transobj.hxx|2 
 sc/source/ui/miscdlgs/instbdlg.cxx   |5 
 sc/source/ui/miscdlgs/linkarea.cxx   |9 
 sc/source/ui/unoobj/exceldetect.cxx  |2 
 sc/source/ui/unoobj/unodoc.cxx   |2 
 sc/source/ui/view/drawvie4.cxx   |6 
 sc/source/ui/view/viewfun3.cxx   |4 
 sd/inc/drawdoc.hxx   |2 
 sd/inc/sdfilter.hxx  |4 
 sd/inc/sdmod.hxx |4 
 sd/source/filter/eppt/eppt.cxx   |   20 
 sd/source/filter/eppt/eppt.hxx   |   10 
 sd/source/filter/eppt/epptso.cxx |4 
 sd/source/filter/ppt/pptin.cxx   |8 
 sd/source/filter/ppt/pptin.hxx   |4 
 sd/source/filter/ppt/propread.hxx|3 
 sd/source/filter/sdpptwrp.cxx|   24 -
 sd/source/ui/app/sdmod.cxx   |4 
 sd/source/ui/app/sdmod1.cxx  |   10 
 sd/source/ui/dlg/morphdlg.cxx|4 
 sd/source/ui/dlg/vectdlg.cxx |4 
 sd/source/ui/inc/DrawDocShell.hxx|3 
 sd/source/ui/inc/sdtreelb.hxx

help.git: source/text

[Pierre F (via logerrit)]

 source/text/shared/01/0210.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 969dc658744688aa9e1dc64611a327399d078462
Author: Pierre F 
AuthorDate: Mon Mar 11 08:36:09 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 11 09:59:25 2024 +0100

less tautological and more reader friendly wording (tdf#91336)

Change-Id: I98516428b87c22c035897965b5f66caeb6c29fb6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164618
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/01/0210.xhp 
b/source/text/shared/01/0210.xhp
index 20ada2481d..df3b843931 100644
--- a/source/text/shared/01/0210.xhp
+++ b/source/text/shared/01/0210.xhp
@@ -207,13 +207,13 @@
   
 
 
-Allows you to use regular expressions in your 
search.
+Allows you to search for advanced patterns using meta 
characters.
   
 
 i72448
 Ext help text not found within switches. Solution: Keep switched text for 
normal display, add hidden help text as "fall through".
 
-  Allows you to use regular expressions 
in your search.
+  Allows you to search for advanced 
patterns using meta characters.
 
 
   

core.git: helpcontent2

[Pierre F (via logerrit)]

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

New commits:
commit ac921aa54ced3f37016b55ea254f759a45ac6359
Author: Pierre F 
AuthorDate: Mon Mar 11 09:59:25 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 11 09:59:25 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 969dc658744688aa9e1dc64611a327399d078462
  - less tautological and more reader friendly wording (tdf#91336)

Change-Id: I98516428b87c22c035897965b5f66caeb6c29fb6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164618
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index a09dfabece27..969dc6587446 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a09dfabece27637223b8deadd448c24e2fbb35b0
+Subproject commit 969dc658744688aa9e1dc64611a327399d078462

Re: ESC meeting minutes: 2024-03-07

[Miklos Vajna]

Hi Stephan,

On Fri, Mar 08, 2024 at 12:46:47PM +0100, Stephan Bergmann 
 wrote:
> Is there any documentation, or anybody able to explain at an adequate level,
> what is taken into consideration when making those decisions?
> 
> Wondering when I see Gerrit changes like
>  "Add Embind'ing of UNO Any
> getter for interfaces", which didn't touch any file that would actually be
> used by any of the 
> builds, nevertheless getting channeled through the sequential build.

My understanding is that it simply looks at what files are touched by
the gerrit change, has knowledge of what was the 'touched files -> build
result' connection in the past and tries to guess based on that.

And your particular case might be what Cloph mentioned that currently
the decision is pessimistic and hence need to re-train it, or it's not
useful.

Cloph: do we have the code for this on gerrit somewhere? It would be
good verify if my assumption is indeed correct.

Thanks,

Miklos

core.git: Branch 'libreoffice-7-6' - configure.ac filter/qa

[Mike Kaganski (via logerrit)]

 configure.ac   |   14 --
 filter/qa/unit/svg.cxx |3 ++-
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 98f565a0468bf692ce62784a278cbd58abb6
Author: Mike Kaganski 
AuthorDate: Sat Mar 9 08:03:08 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 11 11:47:18 2024 +0100

Enable CVE tests on Windows by default

Since commit c16969b9bc73fdd77e763299d6aea7b614e203e2
(tdf#84553 Detect and warn of Windows Antivirus., 2020-02-08),
it is checked that antivirus is disabled in $SRC_ROOT and $BUILDDIR.

This reverts commit a6b2c618cb02168bba950652367f494a1021cf53
(disable cve tests by default on windows, 2014-10-01).

Change-Id: I3816e97cfb4559f7647167ed291b75468b03dc4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 4c65ab909598766e5859a5f0ce4bf55b23c9551b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164622
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index f1ed823a8ac3..11f796584019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11019,20 +11019,6 @@ dnl 
===
 dnl Check for disabling cve_tests
 dnl ===
 AC_MSG_CHECKING([whether to execute CVE tests])
-# If not explicitly enabled or disabled, default
-if test -z "$enable_cve_tests"; then
-case "$OS" in
-WNT)
-# Default cves off for Windows with its wild and wonderful
-# variety of AV software kicking in and panicking
-enable_cve_tests=no
-;;
-*)
-# otherwise yes
-enable_cve_tests=yes
-;;
-esac
-fi
 if test "$enable_cve_tests" = "no"; then
 AC_MSG_RESULT([no])
 DISABLE_CVE_TESTS=TRUE
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index 4c1ddd10b58a..79eafd5d4053 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -45,7 +45,8 @@ void SvgFilterTest::registerNamespaces(xmlXPathContextPtr& 
pXmlXpathCtx)
 
 CPPUNIT_TEST_FIXTURE(SvgFilterTest, testPreserveJpg)
 {
-#if !defined(MACOSX)
+// On Windows, SVGFilter::filterWriterOrCalc can't get current frame to obtain 
selection
+#if !defined(MACOSX) && !defined(_WIN32)
 // Load a document with a jpeg image in it.
 loadFromURL(u"preserve-jpg.odt");
 

Re: 32 bit build failure (smb, narrowing)

[Kevin Ottens]

Hello,

Sorry for the delay, end of last week has been a bit hectic... I see you 
already made a fix. Thanks a lot!

Regards.

On Friday, 8 March 2024 08:23:29 CET Rene Engelhard wrote:
> Hi,
> 
> see
> https://buildd.debian.org/status/fetch.php?pkg=libreoffice=i386=4%3
> A24.2.2~rc1-1=1709881487=1:
> 
> /<>/sal/osl/unx/file.cxx: In function ‘void
> osl_file_adjustLockFlags(const rtl::OString&, int*, sal_uInt32*)’:
> /<>/sal/osl/unx/file.cxx:71:26: error: narrowing conversion
> of ‘4283649346’ from ‘unsigned int’ to ‘int’ [-Wnarrowing]
> 71 | #define CIFS_SUPER_MAGIC 0xFF534D42
> 
>|  ^~
> 
> /<>/sal/osl/unx/file.cxx:795:14: note: in expansion of
> macro ‘CIFS_SUPER_MAGIC’
> 
>795 | case CIFS_SUPER_MAGIC:
>|  ^~~~
> 
> /<>/sal/osl/unx/file.cxx:72:26: error: narrowing conversion
> of ‘4266872130’ from ‘unsigned int’ to ‘int’ [-Wnarrowing]
> 72 | #define SMB2_SUPER_MAGIC 0xFE534D42
> 
>|  ^~
> 
> /<>/sal/osl/unx/file.cxx:796:14: note: in expansion of
> macro ‘SMB2_SUPER_MAGIC’
> 
>796 | case SMB2_SUPER_MAGIC:
>|  ^~~~
> 
> make[2]: *** [/<>/solenv/gbuild/LinkTarget.mk:340:
> /<>/workdir/CxxObject/sal/osl/unx/file.o] Error 1
> 
> This is due to
> 
> commit a8814b5921676b1c01a19b0af243712c55fb0307
> Author: Kevin Ottens 
> Date:   Fri Feb 2 15:39:36 2024 +0100
> 
>  tdf#55004 Fix backup copy creation for files on mounted samba shares
> 
>  There is an unfortunate interaction between file locking and backup
>  creation at save time.
> 
>  openFilePath has logic to lock a file when opening. This goes through
>  fcntl to set a write lock on the file. Later on, when the user wants to
> save changes, a backup copy might be created (very likely now since this
>  is the defaults in the settings). To create this backup, the file is
>  opened again for reading. Unfortunately this open call fails due to the
> lock (even though it is a write lock).
> 
>  This commit changes the behavior. osl_file_adjustLockFlags now
> checks if
>  the file is on a mounted samba share. If that's the case we force the
>  osl_File_OpenFlag_NoLock flag. No issue is then exhibited at backup
>  creation, allowing the save to proceed properly.
> 
>  Change-Id: Ieab252f9f68598834e13339fc5fcea440f0a4c2f
>  Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162935
>  Tested-by: Jenkins
>  Reviewed-by: Stephan Bergmann 
>  (cherry picked from commit 63efbc8ad8aae12b54e649c1495d1233c1a9b33f)
>  Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163549
> 
> Can you have a look, please? I had a brief one, but that is a simple
> define which shoudln't break. Then the switch does
>  switch (aFileStatFs.f_type) {
> which uses
>  struct statfs aFileStatFs;
> 
> So it probably is a type difference in the kernel struct already for 32
> vs 64 bit?
> 
> Regards,
> 
> Rene


-- 
Kévin Ottens
kevin.ott...@enioka.com
+33 7 57 08 95 13

core.git: Branch 'libreoffice-24-2' - configure.ac filter/qa

[Mike Kaganski (via logerrit)]

 configure.ac   |   14 --
 filter/qa/unit/svg.cxx |3 ++-
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 6bc66a08b8fef03772979f67a34df4e9cc3ff33d
Author: Mike Kaganski 
AuthorDate: Sat Mar 9 08:03:08 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 11 11:36:28 2024 +0100

Enable CVE tests on Windows by default

Since commit c16969b9bc73fdd77e763299d6aea7b614e203e2
(tdf#84553 Detect and warn of Windows Antivirus., 2020-02-08),
it is checked that antivirus is disabled in $SRC_ROOT and $BUILDDIR.

This reverts commit a6b2c618cb02168bba950652367f494a1021cf53
(disable cve tests by default on windows, 2014-10-01).

Change-Id: I3816e97cfb4559f7647167ed291b75468b03dc4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 4c65ab909598766e5859a5f0ce4bf55b23c9551b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164621
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 901392b32fcf..51e1e55a404b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11100,20 +11100,6 @@ dnl 
===
 dnl Check for disabling cve_tests
 dnl ===
 AC_MSG_CHECKING([whether to execute CVE tests])
-# If not explicitly enabled or disabled, default
-if test -z "$enable_cve_tests"; then
-case "$OS" in
-WNT)
-# Default cves off for Windows with its wild and wonderful
-# variety of AV software kicking in and panicking
-enable_cve_tests=no
-;;
-*)
-# otherwise yes
-enable_cve_tests=yes
-;;
-esac
-fi
 if test "$enable_cve_tests" = "no"; then
 AC_MSG_RESULT([no])
 DISABLE_CVE_TESTS=TRUE
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index 4446fa35cb9b..617213933ff0 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -46,7 +46,8 @@ void SvgFilterTest::registerNamespaces(xmlXPathContextPtr& 
pXmlXpathCtx)
 
 CPPUNIT_TEST_FIXTURE(SvgFilterTest, testPreserveJpg)
 {
-#if !defined(MACOSX)
+// On Windows, SVGFilter::filterWriterOrCalc can't get current frame to obtain 
selection
+#if !defined(MACOSX) && !defined(_WIN32)
 // Load a document with a jpeg image in it.
 loadFromFile(u"preserve-jpg.odt");
 

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

[Justin Luth (via logerrit)]

 sd/source/ui/dlg/headerfooterdlg.cxx |   22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 703cc8d674d81573a1e6191a12cec4012cca22f7
Author: Justin Luth 
AuthorDate: Tue Feb 27 09:57:35 2024 -0500
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 13:15:13 2024 +0100

tdf#159927 sd headerfooterdlg: detect existing date/time language

Sometimes it was hard to change an existing foreign language
to your own language for Impress' header/footer fields.

The function was only checking the first master slide for the
date/time language. If it didn't have one, then the default locale
was selected.

However, although all pages share the same date/time language,
it is not necessary for all (or even the first) master slide
to have a date/time field. So check through all the master slides
until one with a date/time is found.

Obviously if none have one defined things still work OK,
because that is effectively how it was working beforehand.

I don't have much hope for a successful unit test.
I'll try to develop it as a follow-up to this patch.

Change-Id: Ida44957013978720ad12fadc9b4ebc88bc10ea40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164045
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit 62323124f54885c6de4ac4fa38052d380309a5a1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164506
Reviewed-by: Miklos Vajna 

diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx 
b/sd/source/ui/dlg/headerfooterdlg.cxx
index 8401ec38cd6e..92f7e9be1cb0 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -151,7 +151,8 @@ private:
 
 void FillFormatList(sal_Int32 nSelectedPos);
 void GetOrSetDateTimeLanguage( LanguageType , bool bSet );
-void GetOrSetDateTimeLanguage( LanguageType , bool bSet, SdPage* 
pPage );
+// returns true if the page has a date/time field item
+bool GetOrSetDateTimeLanguage(LanguageType& rLanguage, bool bSet, SdPage* 
pPage);
 
 public:
 HeaderFooterTabPage(weld::Container* pParent, SdDrawDocument* pDoc, 
SdPage* pActualPage, bool bHandoutMode );
@@ -535,25 +536,29 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( 
LanguageType , boo
 }
 else
 {
-// get the language from the first master page
-// or set it to all master pages
-sal_uInt16 nPageCount = bSet ? mpDoc->GetMasterSdPageCount( 
PageKind::Notes ) : 1;
+const sal_uInt16 nPageCount = 
mpDoc->GetMasterSdPageCount(PageKind::Standard);
 sal_uInt16 nPage;
 for( nPage = 0; nPage < nPageCount; nPage++ )
 {
-GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 
nPage, PageKind::Standard ) );
+SdPage* pMasterSlide = mpDoc->GetMasterSdPage(nPage, 
PageKind::Standard);
+bool bHasDateFieldItem = GetOrSetDateTimeLanguage(rLanguage, bSet, 
pMasterSlide);
+
+// All pages must use the same language. If getting the language, 
only need to find one.
+if (!bSet && bHasDateFieldItem)
+break;
 }
 }
 }
 
-void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType , 
bool bSet, SdPage* pPage )
+bool HeaderFooterTabPage::GetOrSetDateTimeLanguage(LanguageType& rLanguage, 
bool bSet,
+   SdPage* pPage)
 {
 if( !pPage )
-return;
+return false;
 
 SdrTextObj* pObj = static_cast(pPage->GetPresObj( 
PresObjKind::DateTime ));
 if( !pObj )
-return;
+return false;
 
 Outliner* pOutl = mpDoc->GetInternalOutliner();
 pOutl->Init( OutlinerMode::TextObject );
@@ -623,6 +628,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( 
LanguageType , boo
 
 pOutl->Clear();
 pOutl->Init( nOutlMode );
+return bHasDateFieldItem;
 }
 
 PresLayoutPreview::PresLayoutPreview()

core.git: sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter8.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 4c382515069d1ccf9ffc3f647ab3acc26c2aba6f
Author: Xisco Fauli 
AuthorDate: Mon Mar 11 10:00:39 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 11 12:57:06 2024 +0100

tdf#160095: sw_uiwriter8: Add unittest

Change-Id: Id7d35511fbbc6a0d11f521bff9ad7469ae068ec7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164649
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx 
b/sw/qa/extras/uiwriter/uiwriter8.cxx
index 21fb637e0157..278c593b754d 100644
--- a/sw/qa/extras/uiwriter/uiwriter8.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter8.cxx
@@ -1287,6 +1287,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146356)
 // - Expected: Some Text
 // - Actual  : Table of Contents
 CPPUNIT_ASSERT_EQUAL(OUString("Some Text"), getParagraph(1)->getString());
+
+// tdf#160095: Without the fix in place, this test would have crashed here
+pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_MOD2 | 
awt::Key::RETURN);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(OUString("Some Text"), getParagraph(1)->getString());
 }
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121546)

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

[Julien Nabet (via logerrit)]

 sc/source/ui/docshell/docsh3.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2ffba480017a44522cb6c8946d75f6ad5f1c9026
Author: Julien Nabet 
AuthorDate: Mon Mar 4 13:21:06 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 11 12:19:11 2024 +0100

tdf#159373: band-aid for crash in: ScTable::HasAttrib

band-aid because as Eike indicated in 
https://bugs.documentfoundation.org/show_bug.cgi?id=159373#c8
"Question remains why this PostPaint() is called at all for an invalid 
range.."

Change-Id: Ie44378119202addd8ddb46f0be4b0124be9fd48b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164354
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164644

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 96546d11a5fe..4634c5cbf191 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -118,6 +118,9 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
 SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = std::min(nMaxTab, 
rRange.aEnd.Tab());
 
+if (nTab1 < 0 || nTab2 < 0)
+continue;
+
 if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol();
 if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow();
 if (!m_pDocument->ValidCol(nCol2)) nCol2 = m_pDocument->MaxCol();

core.git: sw/qa

[Mike Kaganski (via logerrit)]

 sw/qa/uitest/writer_tests6/tdf157569.py |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9f428717f97d2d129a4e3e9e9428245b6621c3f7
Author: Mike Kaganski 
AuthorDate: Mon Mar 11 15:49:52 2024 +0600
Commit: Mike Kaganski 
CommitDate: Mon Mar 11 12:58:11 2024 +0100

Fix a UITest on Windows

No idea why the difference. No idea even if it's specific to OS, or
maybe on other factors as well...

Change-Id: Ib1816e7fe3b7350504d3de1a78570b3f789a20db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164652
Reviewed-by: Xisco Fauli 
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/uitest/writer_tests6/tdf157569.py 
b/sw/qa/uitest/writer_tests6/tdf157569.py
index 1a9e3344ac8c..493760ed2fc7 100644
--- a/sw/qa/uitest/writer_tests6/tdf157569.py
+++ b/sw/qa/uitest/writer_tests6/tdf157569.py
@@ -9,6 +9,7 @@
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_url_for_data_file
 from libreoffice.uno.propertyvalue import mkPropertyValues
+import platform
 
 class tdf157569(UITestCase):
 
@@ -22,7 +23,10 @@ class tdf157569(UITestCase):
 # Without the fix in place, this test would have failed with
 # AssertionError: 1663 != 944
 self.assertEqual(1663, nHeight)
-self.assertEqual(2111, nWidth)
+if platform.system() == "Windows":
+self.assertEqual(2145, nWidth) # no idea why
+else:
+self.assertEqual(2111, nWidth)
 
 xDoc = self.xUITest.getTopFocusWindow()
 xEditWin = xDoc.getChild("writer_edit")

core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/unit/uicalc/data/tdf159373.ods |binary
 sc/qa/unit/uicalc/uicalc.cxx |   20 
 2 files changed, 20 insertions(+)

New commits:
commit 36a169c10f0457c30a0d327fda585c4decb33532
Author: Xisco Fauli 
AuthorDate: Mon Mar 11 12:26:46 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 11 13:32:26 2024 +0100

tdf#159373: sc_uicalc: Add unittest

Change-Id: I30e452534e09aa349a85f0862ed09291506203dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164654
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/unit/uicalc/data/tdf159373.ods 
b/sc/qa/unit/uicalc/data/tdf159373.ods
new file mode 100644
index ..6dc7a110e3fa
Binary files /dev/null and b/sc/qa/unit/uicalc/data/tdf159373.ods differ
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 1bf9dfc12883..f792cc0dcd1f 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -1684,6 +1684,26 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf117706)
 CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 2, 0)));
 }
 
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf159373)
+{
+createScDoc("tdf159373.ods");
+ScDocument* pDoc = getScDoc();
+
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pDoc->GetTableCount());
+
+uno::Sequence aArgs(
+comphelper::InitPropertySequence({ { "Index", uno::Any(sal_uInt16(0)) 
} }));
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:Remove", aArgs);
+
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pDoc->GetTableCount());
+
+dispatchCommand(mxComponent, ".uno:Undo", aArgs);
+
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pDoc->GetTableCount());
+}
+
 CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf86166)
 {
 createScDoc("tdf86166.ods");

core.git: Branch 'libreoffice-7-6' - sc/source

[Julien Nabet (via logerrit)]

 sc/source/ui/docshell/docsh3.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 71f62cff7e74f8663052230cf1279d05a9579411
Author: Julien Nabet 
AuthorDate: Mon Mar 4 13:21:06 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 11 12:46:34 2024 +0100

tdf#159373: band-aid for crash in: ScTable::HasAttrib

band-aid because as Eike indicated in 
https://bugs.documentfoundation.org/show_bug.cgi?id=159373#c8
"Question remains why this PostPaint() is called at all for an invalid 
range.."

Change-Id: Ie44378119202addd8ddb46f0be4b0124be9fd48b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164354
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164623

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 789737e5f824..c60bd2964492 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -116,6 +116,9 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
 SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
 
+if (nTab1 < 0 || nTab2 < 0)
+continue;
+
 if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol();
 if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow();
 if (!m_pDocument->ValidCol(nCol2)) nCol2 = m_pDocument->MaxCol();

core.git: 2 commits - static/source unotest/source

[Stephan Bergmann (via logerrit)]

 static/source/unoembindhelpers/PrimaryBindings.cxx |   26 +---
 unotest/source/embindtest/embindtest.js|   44 ++---
 2 files changed, 42 insertions(+), 28 deletions(-)

New commits:
commit 2995a0e0785911322c9d57e98b925073ff6cb6bd
Author: Stephan Bergmann 
AuthorDate: Mon Mar 11 10:13:18 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 11 13:36:24 2024 +0100

Embind construction of UNO Any sequence/struct/exception/interface

Change-Id: I43d924126f4d34e0efbcea61dd5f4bd9be235426
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164650
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/static/source/unoembindhelpers/PrimaryBindings.cxx 
b/static/source/unoembindhelpers/PrimaryBindings.cxx
index 0aadc85f6086..c8d4717aa347 100644
--- a/static/source/unoembindhelpers/PrimaryBindings.cxx
+++ b/static/source/unoembindhelpers/PrimaryBindings.cxx
@@ -282,7 +282,17 @@ EMSCRIPTEN_BINDINGS(PrimaryBindings)
 case TypeClass_TYPE:
 return css::uno::Any(rObject.as());
 case TypeClass_SEQUENCE:
-return {}; //TODO
+case TypeClass_STRUCT:
+case TypeClass_EXCEPTION:
+case TypeClass_INTERFACE:
+{
+emscripten::internal::EM_DESTRUCTORS destructors = nullptr;
+emscripten::internal::EM_GENERIC_WIRE_TYPE result
+= _emval_as(rObject.as_handle(), getTypeId(rUnoType), 
);
+emscripten::internal::DestructorsRunner dr(destructors);
+return css::uno::Any(
+emscripten::internal::fromGenericWireType(result), rUnoType);
+}
 case TypeClass_ENUM:
 {
 emscripten::internal::EM_DESTRUCTORS destructors = nullptr;
@@ -294,12 +304,6 @@ EMSCRIPTEN_BINDINGS(PrimaryBindings)
 
emscripten::internal::fromGenericWireType(result)),
 rUnoType);
 }
-case TypeClass_STRUCT:
-return {}; //TODO
-case TypeClass_EXCEPTION:
-return {}; //TODO
-case TypeClass_INTERFACE:
-return {}; //TODO
 default:
 throw std::invalid_argument("bad type class");
 }
diff --git a/unotest/source/embindtest/embindtest.js 
b/unotest/source/embindtest/embindtest.js
index 21c0e5cf098e..1b0cf8eb5fc6 100644
--- a/unotest/source/embindtest/embindtest.js
+++ b/unotest/source/embindtest/embindtest.js
@@ -258,9 +258,9 @@ Module.addOnPostRun(function() {
 console.assert(test.isAnySequence(v));
 v.delete();
 let s = new Module.uno_Sequence_string(["foo", "barr", "bazzz"]);
-//TODO: let a = new 
Module.uno_Any(Module.uno_Type.Sequence(Module.uno_Type.String()), s);
-//TODO: console.assert(test.isAnySequence(a));
-//TODO: a.delete();
+let a = new 
Module.uno_Any(Module.uno_Type.Sequence(Module.uno_Type.String()), s);
+console.assert(test.isAnySequence(a));
+a.delete();
 s.delete();
 }
 {
@@ -283,11 +283,11 @@ Module.addOnPostRun(function() {
 console.assert(v.get().m3 === 'hä');
 console.assert(test.isAnyStruct(v));
 v.delete();
-//TODO: let a = new Module.uno_Any(
-//TODO: 
Module.uno_Type.Struct('org.libreoffice.embindtest.Struct'),
-//TODO: {m1: -123456, m2: 100.5, m3: 'hä'});
-//TODO: console.assert(test.isAnyStruct(a));
-//TODO: a.delete();
+let a = new Module.uno_Any(
+Module.uno_Type.Struct('org.libreoffice.embindtest.Struct'),
+{m1: -123456, m2: 100.5, m3: 'hä'});
+console.assert(test.isAnyStruct(a));
+a.delete();
 }
 {
 let v = test.getAnyException();
@@ -299,11 +299,11 @@ Module.addOnPostRun(function() {
 console.assert(v.get().m3 === 'hä');
 console.assert(test.isAnyException(v));
 v.delete();
-//TODO: let a = new Module.uno_Any(
-//TODO: 
Module.uno_Type.Exception('org.libreoffice.embindtest.Exception'),
-//TODO: {Message: 'error', Context: null, m1: -123456, m2: 100.5, 
m3: 'hä'});
-//TODO: console.assert(test.isAnyException(a));
-//TODO: a.delete();
+let a = new Module.uno_Any(
+Module.uno_Type.Exception('org.libreoffice.embindtest.Exception'),
+{Message: 'error', Context: null, m1: -123456, m2: 100.5, m3: 
'hä'});
+console.assert(test.isAnyException(a));
+a.delete();
 }
 {
 let v = test.getAnyInterface();
@@ -311,10 +311,10 @@ Module.addOnPostRun(function() {
 console.assert(v.get().$equals(test.$query()));
 console.assert(test.isAnyInterface(v));
 v.delete();
-

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

[Andras Timar (via logerrit)]

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

New commits:
commit 9d1f0984a0d604165c948112369d8c51df428377
Author: Andras Timar 
AuthorDate: Mon Mar 11 13:43:02 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 11 13:43:02 2024 +0100

Bump version to 21.06.41.1

diff --git a/configure.ac b/configure.ac
index cff196ca6e17..af6e05ab3737 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],[21.06.40.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.41.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

core.git: Changes to 'refs/tags/cp-21.06.41-1'

[Andras Timar (via logerrit)]

Tag 'cp-21.06.41-1' created by Andras Timar  at 
2024-03-11 12:43 +

cp-21.06.41-1

Changes since cp-21.06.40-1-1:
---
 0 files changed
---

core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/xhatch.hxx   |   26 +-
 svx/source/xoutdev/xattr.cxx |   16 
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit da6a23840d44c40da3989e7c2372b2b6d9ae95b5
Author: Miklos Vajna 
AuthorDate: Mon Mar 11 08:41:15 2024 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 14:03:30 2024 +0100

svx: prefix members of XHatch

See tdf#94879 for motivation.

Change-Id: I65f69d6fb334b0d376a304cd1bc1437fd116c9a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164643
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx
index 1553141e5950..dc56f20a8107 100644
--- a/include/svx/xhatch.hxx
+++ b/include/svx/xhatch.hxx
@@ -31,27 +31,27 @@
 
 class SVXCORE_DLLPUBLIC XHatch final
 {
-css::drawing::HatchStyle eStyle;
-Color   aColor;
-tools::Long nDistance;
-Degree10nAngle;
+css::drawing::HatchStyle m_eStyle;
+Color   m_aColor;
+tools::Long m_nDistance;
+Degree10m_nAngle;
 
 public:
-XHatch() : eStyle(css::drawing::HatchStyle_SINGLE), 
nDistance(0), nAngle(0) {}
+XHatch() : m_eStyle(css::drawing::HatchStyle_SINGLE), 
m_nDistance(0), m_nAngle(0) {}
 XHatch(const Color& rCol, css::drawing::HatchStyle eStyle 
= css::drawing::HatchStyle_SINGLE,
tools::Long nDistance = 20, Degree10 nAngle = 
0_deg10);
 
 bool operator==(const XHatch& rHatch) const;
 
-voidSetHatchStyle(css::drawing::HatchStyle eNewStyle) { eStyle 
= eNewStyle; }
-voidSetColor(const Color& rColor) { aColor = rColor; }
-voidSetDistance(tools::Long nNewDistance) { nDistance = 
nNewDistance; }
-voidSetAngle(Degree10 nNewAngle) { nAngle = nNewAngle; }
+voidSetHatchStyle(css::drawing::HatchStyle eNewStyle) { 
m_eStyle = eNewStyle; }
+voidSetColor(const Color& rColor) { m_aColor = rColor; }
+voidSetDistance(tools::Long nNewDistance) { m_nDistance = 
nNewDistance; }
+voidSetAngle(Degree10 nNewAngle) { m_nAngle = nNewAngle; }
 
-css::drawing::HatchStyle GetHatchStyle() const { return eStyle; }
-const Color&GetColor() const { return aColor; }
-tools::Long GetDistance() const { return nDistance; }
-Degree10GetAngle() const { return nAngle; }
+css::drawing::HatchStyle GetHatchStyle() const { return m_eStyle; }
+const Color&GetColor() const { return m_aColor; }
+tools::Long GetDistance() const { return m_nDistance; }
+Degree10GetAngle() const { return m_nAngle; }
 };
 
 #endif
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 5db227e9fca7..22f8f62bbeaa 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2649,19 +2649,19 @@ boost::property_tree::ptree 
XFillFloatTransparenceItem::dumpAsJSON() const
 
 XHatch::XHatch(const Color& rCol, css::drawing::HatchStyle eTheStyle, 
tools::Long nTheDistance,
Degree10 nTheAngle) :
-eStyle(eTheStyle),
-aColor(rCol),
-nDistance(nTheDistance),
-nAngle(nTheAngle)
+m_eStyle(eTheStyle),
+m_aColor(rCol),
+m_nDistance(nTheDistance),
+m_nAngle(nTheAngle)
 {
 }
 
 bool XHatch::operator==(const XHatch& rHatch) const
 {
-return ( eStyle == rHatch.eStyle&&
- aColor == rHatch.aColor&&
- nDistance  == rHatch.nDistance &&
- nAngle == rHatch.nAngle );
+return ( m_eStyle == rHatch.m_eStyle&&
+ m_aColor == rHatch.m_aColor&&
+ m_nDistance  == rHatch.m_nDistance &&
+ m_nAngle == rHatch.m_nAngle );
 }
 
 

core.git: chart2/source

[Kurt Nordback (via logerrit)]

 chart2/source/view/charttypes/BarChart.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 46e96625e9dc3c452a7323c8bf231fea3acab606
Author: Kurt Nordback 
AuthorDate: Thu Jan 4 09:17:48 2024 -0700
Commit: Ilmari Lauhakangas 
CommitDate: Mon Mar 11 14:56:28 2024 +0100

tdf#96944: Stacked column chart does not show connection lines

Change-Id: I14727e8a55231b6695c5a59dd495cd03b15d69f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161626
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/chart2/source/view/charttypes/BarChart.cxx 
b/chart2/source/view/charttypes/BarChart.cxx
index cd8ab4e86c48..fcc969b898ad 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -542,8 +542,6 @@ void BarChart::createShapes()
 getSeriesGroupShape(pSeries.get(), xSeriesTarget) );
 rtl::Reference xShape( 
ShapeFactory::createLine2D(
 xSeriesGroupShape_Shapes, aPoly ) );
-PropertyMapper::setMappedProperties( *xShape, 
pSeries->getPropertiesOfSeries()
-, 
PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
 }
 }
 }

core.git: include/svl svl/source

[Keldin Maldonado (KNM) (via logerrit)]

 include/svl/svdde.hxx|2 +-
 svl/source/svdde/ddedata.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2205be28b420b76fa580d5979c051bcdb54bf422
Author: Keldin Maldonado (KNM) 
AuthorDate: Fri Mar 8 23:21:33 2024 -0800
Commit: Ilmari Lauhakangas 
CommitDate: Mon Mar 11 15:04:23 2024 +0100

tdf#114441 use sal_uInt32 instead of sal_uLong

sal_uLong to sal_uInt32 for the clipboard format.
Clipboard enum class uses sal_uInt32, so staying consistent with that.
Clipboard format doesn't exceed unsigned 32-bit int.

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

diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index e8b808ea1159..c54f88059fa8 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -72,7 +72,7 @@ public:
 DdeData&operator=(DdeData&&) noexcept;
 
 static sal_uInt32 GetExternalFormat(SotClipboardFormatId nFmt);
-static SotClipboardFormatId GetInternalFormat(sal_uLong nFmt);
+static SotClipboardFormatId GetInternalFormat(sal_uInt32 nFmt);
 };
 
 
diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index d8e1e1579226..a9ef7f4f7457 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -141,7 +141,7 @@ sal_uInt32 DdeData::GetExternalFormat(SotClipboardFormatId 
nFmt)
 return static_cast(nFmt);
 }
 
-SotClipboardFormatId DdeData::GetInternalFormat(sal_uLong nFmt)
+SotClipboardFormatId DdeData::GetInternalFormat(sal_uInt32 nFmt)
 {
 switch( nFmt )
 {

core.git: solenv/gbuild

[Noel Grandin (via logerrit)]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7206092764496cdd28e20749004667a659a0e4aa
Author: Noel Grandin 
AuthorDate: Mon Mar 11 10:29:20 2024 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 11 15:33:10 2024 +0100

add rpt libs to enable-mergelibs=more

Change-Id: I2b9acf1a897c962a60ec0c955ae6e9c6bea8ff8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164656
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index e558790ed38f..5c4db5957080 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -173,6 +173,9 @@ gb_MERGE_LIBRARY_LIST += \
postgresql-sdbc-impl) \
pricing \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
+   rpt \
+   rptui \
+   rptxml \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
sdbc2 \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \

core.git: Branch 'distro/collabora/co-23.05' - include/tools svx/source tools/source

[Caolán McNamara (via logerrit)]

 include/tools/json_writer.hxx |2 ++
 svx/source/tbxctrls/PaletteManager.cxx|3 +--
 svx/source/theme/ThemeColorPaletteManager.cxx |4 +++-
 tools/source/misc/json_writer.cxx |   14 --
 4 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit c442b3d1aa47eba8c031792f4f14167a760c2e8e
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 13:27:23 2024 +
Commit: Noel Grandin 
CommitDate: Mon Mar 11 15:34:25 2024 +0100

Document Colors do not show any color in the Palette

same is true for "Theme Colors", a problem since:

commit 4ccc2f0e3f45c9d78f74b1848851bedf71f7382d
Date:   Fri Mar 1 22:11:14 2024 +0200

cool#8327 use tools::JsonWriter for theme colors

Change-Id: Ibaab5df197bd8005037e066181e8a50bdda5ceda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164658
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Noel Grandin 

diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index ae9664b2da67..16615517ce75 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -49,6 +49,7 @@ public:
 
 [[nodiscard]] ScopedJsonWriterNode startNode(const char*);
 [[nodiscard]] ScopedJsonWriterArray startArray(const char*);
+[[nodiscard]] ScopedJsonWriterArray startAnonArray();
 [[nodiscard]] ScopedJsonWriterStruct startStruct();
 
 void put(const OUString& pPropName, const OUString& rPropValue);
@@ -84,6 +85,7 @@ public:
 bool isDataEquals(const std::string&) const;
 
 private:
+void startAnonBlock(const char cType);
 void endNode();
 void endArray();
 void endStruct();
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index c52dc549f852..aef5f34b71ae 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -477,8 +477,7 @@ void PaletteManager::generateJSON(tools::JsonWriter& aTree, 
const std::set

core.git: include/svx svx/inc svx/Library_svxcore.mk svx/source svx/uiconfig

[Oliver Specht (via logerrit)]

 include/svx/galctrl.hxx|   10 
 svx/Library_svxcore.mk |1 
 svx/inc/GalleryControl.hxx |4 
 svx/inc/galbrws2.hxx   |  185 
 svx/source/gallery2/GalleryControl.cxx |8 
 svx/source/gallery2/galbrws1.cxx   | 1318 -
 svx/source/gallery2/galbrws1.hxx   |   91 --
 svx/source/gallery2/galbrws2.cxx   | 1243 ---
 svx/source/gallery2/galctrl.cxx|   10 
 svx/source/inc/galbrws1.hxx|  250 ++
 svx/uiconfig/ui/sidebargallery.ui  |   27 
 11 files changed, 1594 insertions(+), 1553 deletions(-)

New commits:
commit 09c6204b6309321aa25c542f918fde9f5f3f7fe2
Author: Oliver Specht 
AuthorDate: Thu Feb 29 17:15:23 2024 +0100
Commit: Gabor Kelemen 
CommitDate: Mon Mar 11 14:39:18 2024 +0100

tdf#81880 Search the Gallery

Adds a search field to the gallery to search for icons titles.
Wildcards '*' and '?' are supported

Change-Id: I7a8ed2addef3031b77c21889cf72b964ca26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164167
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 61fd62927a2d..4e35d5aaae3d 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -28,7 +28,7 @@
 
 class GalleryDragDrop;
 class GalleryTheme;
-class GalleryBrowser2;
+class GalleryBrowser1;
 class INetURLObject;
 
 class GalleryPreview final : public weld::CustomWidgetController
@@ -39,7 +39,7 @@ private:
 std::unique_ptr mxScrolledWindow;
 GraphicObject aGraphicObj;
 tools::Rectangle aPreviewRect;
-GalleryBrowser2* mpParent;
+GalleryBrowser1* mpParent;
 GalleryTheme* mpTheme;
 
 bool ImplGetGraphicCenterRect( const Graphic& rGraphic, 
tools::Rectangle& rResultRect ) const;
@@ -53,7 +53,7 @@ private:
 
 public:
 
-GalleryPreview(GalleryBrowser2* pParent, 
std::unique_ptr xScrolledWindow);
+GalleryPreview(GalleryBrowser1* pParent, 
std::unique_ptr xScrolledWindow);
 void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
 virtual ~GalleryPreview() override;
 
@@ -90,7 +90,7 @@ class GalleryIconView final : public ValueSet
 private:
 std::unique_ptr mxDragDropTargetHelper;
 
-GalleryBrowser2*mpParent;
+GalleryBrowser1*mpParent;
 GalleryTheme*   mpTheme;
 
 // ValueSet
@@ -105,7 +105,7 @@ private:
 
 public:
 
-GalleryIconView(GalleryBrowser2* pParent, 
std::unique_ptr xScrolledWindow);
+GalleryIconView(GalleryBrowser1* pParent, 
std::unique_ptr xScrolledWindow);
 void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
 virtual ~GalleryIconView() override;
 
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 2363f5023bfd..40fad5ea6b4f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -195,7 +195,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 svx/source/form/xfm_addcondition \
 svx/source/gallery2/codec \
 svx/source/gallery2/galbrws1 \
-svx/source/gallery2/galbrws2 \
 svx/source/gallery2/galctrl \
 svx/source/gallery2/galexpl \
 svx/source/gallery2/galini \
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index d5835fb5759b..3b33c034a5b2 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -27,7 +27,7 @@ class SfxBindings;
 
 class Gallery;
 class GalleryBrowser1;
-class GalleryBrowser2;
+//class GalleryBrowser2;
 class FmFormModel;
 class Splitter;
 
@@ -42,7 +42,7 @@ public:
 private:
 Gallery* mpGallery;
 std::unique_ptr mxBrowser1;
-std::unique_ptr mxBrowser2;
+//std::unique_ptr mxBrowser2;
 };
 
 } // end of namespace svx::sidebar
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
deleted file mode 100644
index d5ca8a50a041..
--- a/svx/inc/galbrws2.hxx
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_INC_GALBRWS2_HXX
-#define INCLUDED_SVX_INC_GALBRWS2_HXX
-
-#include 
-#include 
-#include 

core.git: writerfilter/source

[Justin Luth (via logerrit)]

 writerfilter/source/dmapper/GraphicImport.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ccf988d206a47701c81126f23e2bef71fc3db333
Author: Justin Luth 
AuthorDate: Mon Mar 11 08:26:28 2024 -0400
Commit: Justin Luth 
CommitDate: Mon Mar 11 15:34:03 2024 +0100

GraphicImport.cxx: address nit

less emphasis on minimizing "if logic"
and more emphasis on readability
(especially since the comment comes after the logic).

In the most common cases, this version
should actually finish sooner to.

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

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 6ee808355a60..2df2569530a1 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1863,9 +1863,10 @@ uno::Reference 
GraphicImport::createGraphicObject(uno::Refer
 if (m_pImpl->m_rGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
 {
 if (m_pImpl->m_nHoriRelation == text::RelOrientation::FRAME
-&& m_pImpl->m_nHoriOrient > text::HoriOrientation::NONE
-&& m_pImpl->m_nHoriOrient != text::HoriOrientation::CENTER
-&& m_pImpl->m_nHoriOrient < text::HoriOrientation::FULL)
+&& (m_pImpl->m_nHoriOrient == text::HoriOrientation::LEFT
+|| m_pImpl->m_nHoriOrient == 
text::HoriOrientation::RIGHT
+|| m_pImpl->m_nHoriOrient == 
text::HoriOrientation::INSIDE
+|| m_pImpl->m_nHoriOrient == 
text::HoriOrientation::OUTSIDE))
 {
 // before compat15, relative left/right/inside/outside 
honored margins.
 if 
(m_pImpl->m_rDomainMapper.GetSettingsTable()->GetWordCompatibilityMode() < 15)

Re: ESC meeting minutes: 2024-03-07

[Thorsten Behrens]

Hi y'all,

Miklos Vajna wrote:
> On Fri, Mar 08, 2024 at 12:46:47PM +0100, Stephan Bergmann 
>  wrote:
> > Is there any documentation, or anybody able to explain at an adequate level,
> > what is taken into consideration when making those decisions?
> > 
>
Please see https://baolef.github.io/libreoffice-ci/

> > Wondering when I see Gerrit changes like
> >  "Add Embind'ing of UNO Any
> > getter for interfaces", which didn't touch any file that would actually be
> > used by any of the 
> > builds, nevertheless getting channeled through the sequential build.
> 
> My understanding is that it simply looks at what files are touched by
> the gerrit change, has knowledge of what was the 'touched files -> build
> result' connection in the past and tries to guess based on that.
> 
Almost. There's code running over a gerrit commit json export,
extracting 'features' from every commit
(https://github.com/baolef/libreoffice-ci/blob/data/dataset/mining.py). That's
actually looking at much more than just the files touched (though we
did exclude committer/author names, for obvious reasons). Those
feature vectors are then used to train a machine learning model,
combined with the historical CI results of those said commits.

There's no clear causality here, as with any large neural network
training, just statistics and likelihoods. When we had this project
last year, we had anticipated regular needs for re-runs of the
training, since code, tests, and also CI behaviours drift over time.

Cheers,

-- Thorsten


signature.asc
Description: PGP signature

help.git: source/text

[Pierre F (via logerrit)]

 source/text/sbasic/shared/03102100.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e1458853a317d6efbc222e7719e06be10d98817
Author: Pierre F 
AuthorDate: Mon Mar 11 16:52:10 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 11 17:17:34 2024 +0100

fix String limit  text/sbasic/shared/03102100 tdf#157822

Change-Id: I62fb1b238cf03c29ef7ba6d01594d351754cf60b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164674
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/sbasic/shared/03102100.xhp 
b/source/text/sbasic/shared/03102100.xhp
index 163a02f2d3..df950df562 100644
--- a/source/text/sbasic/shared/03102100.xhp
+++ b/source/text/sbasic/shared/03102100.xhp
@@ -74,7 +74,7 @@
  
Long: Long integer variable (-2.147.483.648 - 
2.147.483.647)
  
Object: Object variable (Note: this variable can only subsequently 
be defined with Set!)
  
Single: Single-precision floating-point variable (3,402823 x 10E38 
- 1,401298 x 10E-45).
- 
String: String variable consisting of a maximum of 64,000 ASCII 
characters.
+ 
String: String variable consisting of a maximum of 2,147,483,647 
characters.
  
Variant: Variant variable type (contains all types, specified by 
definition). If a type name is not specified, variables are automatically 
defined as Variant Type, unless a statement from DefBool to 
DefVar is used.
  object: 
Universal Network object (UNO) object or ClassModule object 
instance.
 char: Special character that declares the data 
type of a variable.

core.git: helpcontent2

[Pierre F (via logerrit)]

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

New commits:
commit 4e27934fc1ea47e4f3986c7675d94348a9f23a21
Author: Pierre F 
AuthorDate: Mon Mar 11 17:17:34 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 11 17:17:34 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 4e1458853a317d6efbc222e7719e06be10d98817
  - fix String limit  text/sbasic/shared/03102100 tdf#157822

Change-Id: I62fb1b238cf03c29ef7ba6d01594d351754cf60b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164674
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index dfdacad1658e..4e1458853a31 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dfdacad1658ed67ef45738653a64750e49244020
+Subproject commit 4e1458853a317d6efbc222e7719e06be10d98817

core.git: officecfg/registry sd/inc sd/Library_sd.mk sd/sdi sd/source sd/uiconfig sd/UIConfig_sdraw.mk

[Jim Raykowski (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
14 
 sd/Library_sd.mk |
1 
 sd/UIConfig_sdraw.mk |
1 
 sd/inc/app.hrc   |
2 
 sd/sdi/_drvwsh.sdi   |
5 
 sd/sdi/sdraw.sdi |   
16 +
 sd/source/ui/dlg/SelectLayerDlg.cxx  |   
45 ++
 sd/source/ui/inc/SelectLayerDlg.hxx  |   
37 ++
 sd/source/ui/view/drviews2.cxx   |   
33 ++
 sd/source/ui/view/drviewsj.cxx   |
1 
 sd/uiconfig/sdraw/ui/selectlayerdialog.ui|  
152 ++
 11 files changed, 306 insertions(+), 1 deletion(-)

New commits:
commit 1447900fc5f0d32d8379a95439f524fda9a664c1
Author: Jim Raykowski 
AuthorDate: Thu Nov 16 19:19:36 2023 -0900
Commit: Jim Raykowski 
CommitDate: Mon Mar 11 17:34:27 2024 +0100

tdf#122587 Add uno command to set layer of object(s)

Change-Id: Iabdd0f7059953760a69d82a3810eb8ed20c2fd9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159982
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index b46b7b34fac7..370984a7e5d9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1022,6 +1022,20 @@
   1
 
   
+  
+
+  Set Layer
+
+
+  ~Move to Layer...
+
+
+  Open a dialog to change the layer of the 
object
+
+
+  1
+
+  
   
 
   ~Normal
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index bdf7b146da91..f801a77dbc88 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -245,6 +245,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/dlg/navigatr \
sd/source/ui/dlg/sdabstdlg \
sd/source/ui/dlg/sdtreelb \
+   sd/source/ui/dlg/SelectLayerDlg \
sd/source/ui/dlg/titledockwin \
sd/source/ui/dlg/unchss \
sd/source/ui/dlg/UndoThemeChange \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index f6d42acba7e2..a84f0f286cae 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/notebookbar_online \
sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/queryunlinkimagedialog \
+   sd/uiconfig/sdraw/ui/selectlayerdialog \
sd/uiconfig/sdraw/ui/vectorize \
 ))
 
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index e275e4688258..004b01c6e93d 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -111,7 +111,7 @@
 #define SID_PAGEMODE(SID_SD_START+46)
 #define SID_LAYERMODE   (SID_SD_START+47)
 #define SID_TOGGLELAYERVISIBILITY   (SID_SD_START+48)
-// FREE
+#define SID_SETLAYER(SID_SD_START+49)
 #define SID_MASTERPAGE  (SID_SD_START+50)
 // Navigation between slides
 #define SID_GO_TO_NEXT_PAGE (SID_SD_START+51)
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index d5e1a5f51e8d..0d4bed12a9a7 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -198,6 +198,11 @@ interface DrawView
 ExecMethod = FuTemporary ;
 StateMethod = GetMenuState ;
 ]
+SID_SETLAYER
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 SID_NAVIGATOR // ole : no, status : ?
 [
 ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 7bb752c687ac..ce0eb521e9ec 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -2623,6 +2623,22 @@ SfxBoolItem ToggleLayerVisibility 
SID_TOGGLELAYERVISIBILITY
 GroupId = SfxGroupId::Modify;
 ]
 
+SfxVoidItem SetLayer SID_SETLAYER
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Modify;
+]
+
 SfxVoidItem AssignLayout SID_ASSIGN_LAYOUT
 (SfxUInt32Item WhatPage ID_VAL_WHATPAGE, SfxUInt32Item WhatLayout 
ID_VAL_WHATLAYOUT)
 [
diff --git a/sd/source/ui/dlg/SelectLayerDlg.cxx 
b/sd/source/ui/dlg/SelectLayerDlg.cxx
new file mode 100644
index ..399f9db5d3c0
--- /dev/null
+++ b/sd/source/ui/dlg/SelectLayerDlg.cxx
@@ -0,0 +1,45 @@

help.git: source/text

[Pierre F (via logerrit)]

 source/text/shared/01/05020301.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2694856dafe3e7850b966583e093e62b05dc099d
Author: Pierre F 
AuthorDate: Mon Mar 11 17:08:25 2024 +0100
Commit: Mike Kaganski 
CommitDate: Mon Mar 11 17:38:46 2024 +0100

add paragraph about "AM/PM" tdf#157603 05020301.xhp

Change-Id: I11e6260ef89db28e56ce53dc091479c11e2fc20f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164675
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/source/text/shared/01/05020301.xhp 
b/source/text/shared/01/05020301.xhp
index eb399e1dac..13fd562a5c 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -983,6 +983,7 @@
 To display seconds as fractions, add the decimal 
delimiter to your number format code. For example, enter 
HH:MM:SS.00 to display the time as 
"01:02:03.45".Translators: use the decimal delimiter of your language 
(period or comma) for all number format codes in Calc.
 Minute time formats M and MM 
must be used in combination with hour or second time formats to avoid confusion 
with month date format.
 If a time is entered in the 
form 02:03.45 or 01:02:03.45 or 25:01:02, the following formats are assigned if 
no other time format has been specified: MM:SS.00 or [HH]:MM:SS.00 or 
[HH]:MM:SSTranslators: use the decimal delimiter of your language 
(period or comma) for all number format codes in Calc.
+The time can be suffixed with 
AM/PM to have hours in 0-12 AM/PM format.
 
 Displaying Numbers Using Native Characters
 

core.git: helpcontent2

[Pierre F (via logerrit)]

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

New commits:
commit 851aa4e9338337de79e73fd0784219a855526e94
Author: Pierre F 
AuthorDate: Mon Mar 11 17:38:47 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 11 17:38:47 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2694856dafe3e7850b966583e093e62b05dc099d
  - add paragraph about "AM/PM" tdf#157603 05020301.xhp

Change-Id: I11e6260ef89db28e56ce53dc091479c11e2fc20f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164675
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/helpcontent2 b/helpcontent2
index 4e1458853a31..2694856dafe3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4e1458853a317d6efbc222e7719e06be10d98817
+Subproject commit 2694856dafe3e7850b966583e093e62b05dc099d

core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit ed8a6bf198547b11af7a312ac14faace9d61512d
Author: Christian Lohmaier 
AuthorDate: Mon Mar 11 17:41:07 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 11 17:41:07 2024 +0100

Update git submodules

* Update translations from branch 'master'
  to c662aec6f873e0684d70389be4ec93c76132f79b
  - update translations for master

and force-fix errors using pocheck

Change-Id: Ib7a4e5bd9fa3729e52c7c263db9769eb18b9a023

diff --git a/translations b/translations
index fd5c3f2ec085..c662aec6f873 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit fd5c3f2ec0852b712b34e7e99b4853a016eac72e
+Subproject commit c662aec6f873e0684d70389be4ec93c76132f79b

core.git: drawinglayer/source sc/qa sc/source

[Tibor Nagy (via logerrit)]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |1 
 sc/qa/extras/scpdfexport.cxx   |   14 
 sc/qa/extras/testdocuments/tdf159094.ods   |binary
 sc/source/ui/unoobj/docuno.cxx |  190 -
 4 files changed, 197 insertions(+), 8 deletions(-)

New commits:
commit f3bfe66fb54190fee6ac579835c03c2b4a2735d0
Author: Tibor Nagy 
AuthorDate: Fri Mar 8 00:51:06 2024 +0100
Commit: Nagy Tibor 
CommitDate: Mon Mar 11 15:59:22 2024 +0100

tdf#159094 sc: fix failure when exporting media files to PDF

Change-Id: I948190b31f45cf05ba24d1fbc4a84dfe91eb3876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164557
Tested-by: Jenkins
Reviewed-by: Nagy Tibor 

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 4dc33974189f..0d4ee95470dc 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2576,6 +2576,7 @@ void 
VclMetafileProcessor2D::processStructureTagPrimitive2D(
 case vcl::PDFWriter::TableRow:
 case vcl::PDFWriter::Formula:
 case vcl::PDFWriter::Figure:
+case vcl::PDFWriter::Annot:
 
mpPDFExtOutDevData->SetStructureAttribute(vcl::PDFWriter::Placement,
   
vcl::PDFWriter::Block);
 break;
diff --git a/sc/qa/extras/scpdfexport.cxx b/sc/qa/extras/scpdfexport.cxx
index 6cf93f71ed51..b26c61bdfddd 100644
--- a/sc/qa/extras/scpdfexport.cxx
+++ b/sc/qa/extras/scpdfexport.cxx
@@ -61,6 +61,7 @@ private:
 
 // unit tests
 public:
+void testMediaShapeScreen_Tdf159094();
 void testExportRange_Tdf120161();
 void testExportFitToPage_Tdf103516();
 void testUnoCommands_Tdf120161();
@@ -77,6 +78,7 @@ public:
 void testForcepoint97();
 
 CPPUNIT_TEST_SUITE(ScPDFExportTest);
+CPPUNIT_TEST(testMediaShapeScreen_Tdf159094);
 CPPUNIT_TEST(testExportRange_Tdf120161);
 CPPUNIT_TEST(testExportFitToPage_Tdf103516);
 CPPUNIT_TEST(testUnoCommands_Tdf120161);
@@ -213,6 +215,18 @@ void ScPDFExportTest::setFont(ScFieldEditEngine& rEE, 
sal_Int32 nStart, sal_Int3
 rEE.QuickSetAttribs(aItemSet, aSel);
 }
 
+void ScPDFExportTest::testMediaShapeScreen_Tdf159094()
+{
+loadFromFile(u"tdf159094.ods");
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+
+// A1:B8
+ScRange aRange(0, 0, 0, 1, 7, 0);
+
+// Without the fix, this test would crash on export media file to pdf
+exportToPDF(xModel, aRange);
+}
+
 // Selection was not taken into account during export into PDF
 void ScPDFExportTest::testExportRange_Tdf120161()
 {
diff --git a/sc/qa/extras/testdocuments/tdf159094.ods 
b/sc/qa/extras/testdocuments/tdf159094.ods
new file mode 100644
index ..c267b2152192
Binary files /dev/null and b/sc/qa/extras/testdocuments/tdf159094.ods differ
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index e80a3bbed259..eef74952df9a 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -29,6 +29,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -134,6 +137,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -2147,7 +2151,7 @@ uno::Sequence SAL_CALL 
ScModelObj::getRenderer( sal_Int32
 bWasCellRange = pPrintFunc->GetLastSourceRange( aCellRange );
 Size aTwips = pPrintFunc->GetPageSize();
 
-if (!m_pPrintState)
+if (!m_pPrintState || nRenderer == nTabStart)
 {
 m_pPrintState.reset(new ScPrintState());
 pPrintFunc->GetPrintState(*m_pPrintState, true);
@@ -2343,6 +2347,172 @@ static void lcl_PDFExportBookmarkHelper(OutputDevice* 
pDev, ScDocument& rDoc,
 rBookmarks.clear();
 }
 
+static void lcl_SetMediaScreen(const uno::Reference& 
xMediaShape,
+   const OutputDevice* pDev, tools::Rectangle& 
aRect,
+   sal_Int32 nPageNumb)
+{
+OUString sMediaURL;
+uno::Reference xPropSet(xMediaShape, uno::UNO_QUERY);
+xPropSet->getPropertyValue("MediaURL") >>= sMediaURL;
+if (!sMediaURL.isEmpty())
+{
+OUString sTitle;
+xPropSet->getPropertyValue("Title") >>= sTitle;
+OUString sDescription;
+xPropSet->getPropertyValue("Description") >>= sDescription;
+OUString const altText(sTitle.isEmpty() ? sDescription
+   : sDescription.isEmpty()
+   ? sTitle
+   : OUString::Concat(sTitle) + 
OUString::Concat("
")
+ + OUString::Concat(sDescription));
+
+OUString const 

Re: ESC meeting minutes: 2024-03-07

[Stephan Bergmann]

On 3/11/24 15:46, Thorsten Behrens wrote:

Almost. There's code running over a gerrit commit json export,
extracting 'features' from every commit
(https://github.com/baolef/libreoffice-ci/blob/data/dataset/mining.py). That's
actually looking at much more than just the files touched (though we
did exclude committer/author names, for obvious reasons). Those
feature vectors are then used to train a machine learning model,
combined with the historical CI results of those said commits.


And the


bash ~/libreoffice-ci/scripts/test.sh $WORKSPACE $GERRIT_PATCHSET_REVISION


in the Build Steps of 
 is running 
, I 
assume?

core.git: Branch 'distro/collabora/co-24.04' - include/tools svx/source tools/source

[Caolán McNamara (via logerrit)]

 include/tools/json_writer.hxx |2 ++
 svx/source/tbxctrls/PaletteManager.cxx|3 +--
 svx/source/theme/ThemeColorPaletteManager.cxx |4 +++-
 tools/source/misc/json_writer.cxx |   14 --
 4 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit 3b312ca78533459e529d01e0af90078af4f294eb
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 13:27:23 2024 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 18:08:15 2024 +0100

Document Colors do not show any color in the Palette

same is true for "Theme Colors", a problem since:

commit 4ccc2f0e3f45c9d78f74b1848851bedf71f7382d
Date:   Fri Mar 1 22:11:14 2024 +0200

cool#8327 use tools::JsonWriter for theme colors

Change-Id: Ibaab5df197bd8005037e066181e8a50bdda5ceda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164658
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Noel Grandin 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164664
Reviewed-by: Caolán McNamara 

diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index 8bb8d192d2ff..10a5a6e88681 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -47,6 +47,7 @@ public:
 
 [[nodiscard]] ScopedJsonWriterNode startNode(std::string_view);
 [[nodiscard]] ScopedJsonWriterArray startArray(std::string_view);
+[[nodiscard]] ScopedJsonWriterArray startAnonArray();
 [[nodiscard]] ScopedJsonWriterStruct startStruct();
 
 void put(std::u16string_view pPropName, const OUString& rPropValue);
@@ -83,6 +84,7 @@ public:
 bool isDataEquals(std::string_view) const;
 
 private:
+void startAnonBlock(const char cType);
 void endNode();
 void endArray();
 void endStruct();
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 891a98cdc92f..662d8a4c2a1f 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -482,8 +482,7 @@ void PaletteManager::generateJSON(tools::JsonWriter& aTree, 
const std::set

[Bug 160136] Silent Crash on Windows 11

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160136

--- Comment #4 from m_a_riosv  ---
I have no issues in Windows 11 (yes 11) with
Version: 24.2.2.1 (X86_64) / LibreOffice Community
Build ID: bf759d854b5ab45b6ef0bfd22e51c6dc4fb8b882
CPU threads: 16; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win
Locale: es-ES (es_ES); UI: en-US Calc: CL threaded
neither with
Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: 01067e964a876e38e99a099f62fe514a211a5fca
CPU threads: 16; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win
Locale: es-ES (es_ES); UI: en-US Calc: CL threaded

About Windows version, please take a look in:
https://en.wikipedia.org/wiki/Windows_11_version_history#:~:text=version%2023h2%20(2023%20update)%5Bedit%5D

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 159370] Form based on tabs can not be closed after switching tab

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=159370

--- Comment #3 from Longi  ---
Sorry!
The example in my PC doesn't work

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160160] Spellchecking wavy lines underlining should automatically render with lighter colors when using the system dark theme color scheme for documents

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160160

--- Comment #1 from Jeff Fortin Tam  ---
Created attachment 193070
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193070=edit
Video demonstration

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160141] Status bar shows "Slide 47 of 1" (instead of "47 of 379")

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160141

m_a_riosv  changed:

   What|Removed |Added

 CC||miguelangelrv@libreoffice.o
   ||rg

--- Comment #2 from m_a_riosv  ---
Only one slide with
Microsoft® PowerPoint® para Microsoft 365 MSO (versión 2402 compilación
16.0.17328.20124) de 64 bits

Only one slide with
Version: 24.2.2.1 (X86_64) / LibreOffice Community
Build ID: bf759d854b5ab45b6ef0bfd22e51c6dc4fb8b882
CPU threads: 16; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win
Locale: es-ES (es_ES); UI: en-US Calc: CL threaded 

Only one slide with
Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: 01067e964a876e38e99a099f62fe514a211a5fca
CPU threads: 16; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win
Locale: es-ES (es_ES); UI: en-US Calc: CL threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160136] Silent Crash on Windows 11

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160136

--- Comment #3 from Klaus Fischer  ---
Thanks for your comments.

As I already wrote, loss of user data is a no go. I felt attracted by the
description of of version of 24.0.2 when I first installed it. I do consider
myself as an eraly adopter. However, wasting time with data loss is nothing
that I want to have.

This is the first thing to take care of for a new version. Before that is safe,
I would consider it beta and this should be made clear on the downlaod page.

I switched back to 7.6.5. ...

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160152] High-Unicode-number characters are not handled in GDI metafile images

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160152

m_a_riosv  changed:

   What|Removed |Added

 CC||miguelangelrv@libreoffice.o
   ||rg

--- Comment #6 from m_a_riosv  ---
Please what are the source and destination font?

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160157] QAT and MDI in Libre Office?

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160157

m_a_riosv  changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |DUPLICATE
 CC||miguelangelrv@libreoffice.o
   ||rg

--- Comment #1 from m_a_riosv  ---
Please one question per report.

About the first one:
https://help.libreoffice.org/latest/en-US/text/shared/guide/edit_symbolbar.html?DbPAR=SHARED#bm_id3159201

About the second one, duplicate of tdf#37134

*** This bug has been marked as a duplicate of bug 37134 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 37134] Tabbed UI: Document-per-tab (similar to Firefox, Opera, gedit) MDI

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=37134

m_a_riosv  changed:

   What|Removed |Added

 CC||al...@hotmail.com

--- Comment #104 from m_a_riosv  ---
*** Bug 160157 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 153293] [META] Dark Mode bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=153293

Jeff Fortin Tam  changed:

   What|Removed |Added

 Depends on||160160


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=160160
[Bug 160160] Spellchecking wavy lines underlining should automatically render
with lighter colors when using the system dark theme color scheme for documents
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 151981] Gray background and text color of the fields should change with the dark colour scheme

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=151981

Jeff Fortin Tam  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=16
   ||0160

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 158032] Hyperlinks should automatically render with lighter colors when using the system dark theme color scheme for documents

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=158032

Jeff Fortin Tam  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=16
   ||0160

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 143344] [META] Linux Dark Mode bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=143344

Jeff Fortin Tam  changed:

   What|Removed |Added

 Depends on||160160


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=160160
[Bug 160160] Spellchecking wavy lines underlining should automatically render
with lighter colors when using the system dark theme color scheme for documents
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160160] Spellchecking wavy lines underlining should automatically render with lighter colors when using the system dark theme color scheme for documents

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160160

Jeff Fortin Tam  changed:

   What|Removed |Added

 Blocks||143344, 153293
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=15
   ||1981,
   ||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=15
   ||8032


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=143344
[Bug 143344] [META] Linux Dark Mode bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=153293
[Bug 153293] [META] Dark Mode bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160158] New: Textbox Not Saving Data in form

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160158

Bug ID: 160158
   Summary: Textbox Not Saving Data in form
   Product: LibreOffice
   Version: 7.6.4.1 release
  Hardware: x86-64 (AMD64)
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: galdar1...@gmail.com

Created attachment 193067
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193067=edit
Editing Checklist Form in .docx format

I have created a form for an editing checklist on the .docx format. Once I take
it out of design mode, save it, and enter data, the check boxes all work but
any text I enter is not there in the textboxes when I reopen the form after a
save. It is returned to the default text I have specified in the textbox form
control.

Is this a bug or am I doing something wrong?

I've attached the document.

Thanks!

Michael Boyer

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160120] Starting libreoffice calc by clicking on a *.ods file, it directly goes into Document Recovery with no documents

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160120

Urs Weder  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|UNCONFIRMED |RESOLVED

--- Comment #4 from Urs Weder  ---
today I updated my openSUSE Tumbleweed again.
Now libreoffice calc works again.
Apparently, it seems as it was a problem openSUSE specific.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160159] Spellchecking dialog's main textfield background color does not update on light/dark mode switching

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160159

--- Comment #2 from Jeff Fortin Tam  ---
Note that when fixing this, it would be important to also fix the foreground
text color to match; i.e. "dark red and black on white, light red and white on
black", as this was previously a problem in version 7.5 where you'd get
black-on-black text. See also bug #158032 and bug #160160 regarding the red
color tones.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 155654] Example for function Timer is erroneous

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=155654

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:24.8.0

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 153212] "regular expression in the Replace box" makes no sense

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=153212

Adolfo Jayme Barrientos  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |f...@bger.ch
   |desktop.org |
 Resolution|--- |FIXED
 Status|NEW |RESOLVED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 144479] Export PDF: Radio buttons are not properly grouped if document has more than one page

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=144479

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org, wo...@csumb.edu

--- Comment #6 from Buovjaga  ---
Tested from scratch, still repro like in the description

Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: e939685f9c6918830bd3097062790bfccbce937e
CPU threads: 2; OS: Windows 10.0 Build 22621; UI render: Skia/Raster; VCL: win
Locale: en-US (en_US); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 154525] [sample] Calc is extremely slow (3+ minutes) to open Lenovo's Accessories "Options Compatibility Matrix" spreadsheet

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154525

--- Comment #22 from Caolán McNamara  ---
The flamegraphcs appear to be massively dominated by loading, and next to no
rendering so I think anything around skia vs gtk or wayland doesn't seem to
matter wrt the flamegraph at least

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 154525] [sample] Calc is extremely slow (3+ minutes) to open Lenovo's Accessories "Options Compatibility Matrix" spreadsheet

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154525

--- Comment #23 from Jeff Fortin Tam  ---
That would seem logical to me, because in practice, Calc does not show anything
in the canvas during loading, it only shows the progressbar below the view,
during the whole 1.5 minutes. Once it reaches the end of the progressbar / XML
processing, it then renders the whole document in one pass, as far as I can
tell from casual visual observation.

Apologies for my incorrect previous assumption that maybe something
graphically-related explained the difference between my situation and other
commenters'; I wonder why some people are not experiencing the issue, while
it's still 100% reproducible here on any of my Linux computers. I presumed that
the filters/backends would be the same across platforms…

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 159794] inconsistency in backspacing through indents

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=159794

--- Comment #7 from Dieter  ---
(In reply to Heiko Tietze from comment #6)
> Any objection?
OK for me.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160156] Impossible to filter for lines with empty values, when certain other filters used

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160156

ady  changed:

   What|Removed |Added

 Resolution|--- |DUPLICATE
 Status|UNCONFIRMED |RESOLVED

--- Comment #1 from ady  ---
LO 24.2.2 and 7.6.6 and master branches should solve this.

*** This bug has been marked as a duplicate of bug 159420 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 159794] inconsistency in backspacing through indents

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=159794

--- Comment #7 from Dieter  ---
(In reply to Heiko Tietze from comment #6)
> Any objection?
OK for me.

-- 
You are receiving this mail because:
You are on the CC list for the bug.

[Bug 160152] High-Unicode-number characters are not handled in GDI metafile images

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160152

--- Comment #7 from Piotr Osada  ---
Created attachment 193068
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193068=edit
After set Arial font again.png

(In reply to m_a_riosv from comment #6)
> Please what are the source and destination font?

The font was Arial. The original source of this table was edited many times
through several months by Calc and Excel. And now I don't remember how, so I
can't report how to reproduce such a table.

When "overwriting" font to Arial, it works fine. And also works good in:

Version: 24.2.1.2 (X86_64) / LibreOffice Community
Build ID: db4def46b0453cc22e2d0305797cf981b68ef5ac
CPU threads: 8; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win
Locale: pl-PL (pl_PL); UI: pl-PL
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160159] New: Spellchecking dialog's main textfield background color does not update on light/dark mode switching

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160159

Bug ID: 160159
   Summary: Spellchecking dialog's main textfield background color
does not update on light/dark mode switching
   Product: LibreOffice
   Version: 24.2.0.3 release
  Hardware: All
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: UI
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: nekoh...@gmail.com

Description:
Please see the attached video.

Steps to Reproduce:
1. Open the spellchecking dialog (F7 key)
2. Switch between light/dark operating system color scheme preference

Actual Results:
Lingering background color

Expected Results:
Updated background color


Reproducible: Always


User Profile Reset: No

Additional Info:
Version: 24.2.1.2 (X86_64) / LibreOffice Community
Build ID: db4def46b0453cc22e2d0305797cf981b68ef5ac
CPU threads: 8; OS: Linux 6.7; UI render: default; VCL: gtk3
Locale: en-CA (en_CA.UTF-8); UI: en-US
Flatpak
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 153293] [META] Dark Mode bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=153293

Jeff Fortin Tam  changed:

   What|Removed |Added

 Depends on||160159


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=160159
[Bug 160159] Spellchecking dialog's main textfield background color does not
update on light/dark mode switching
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 143344] [META] Linux Dark Mode bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=143344

Jeff Fortin Tam  changed:

   What|Removed |Added

 Depends on||160159


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=160159
[Bug 160159] Spellchecking dialog's main textfield background color does not
update on light/dark mode switching
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160159] Spellchecking dialog's main textfield background color does not update on light/dark mode switching

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160159

Jeff Fortin Tam  changed:

   What|Removed |Added

 Blocks||143344, 153293


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=143344
[Bug 143344] [META] Linux Dark Mode bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=153293
[Bug 153293] [META] Dark Mode bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 154552] The example of the array formula is not appropriate for Version7.4 or later.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154552

f...@bger.ch changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #1 from f...@bger.ch ---
- your report addresses *Constant* arrays, right ?

- is '|' still supposed to work ?
(no diffrence with ';' on my 7.6.5.2 linux)

- what is "selecting/marking a single cell"

Automatic cell matrix expansion for formula expressions that return an
array/matrix. For formula expressions entered into a cell that obviously return
an array/matrix, the result cell range is expanded as if ⇧ Shift + Ctrl + ↵
Enter was used to close an array formula. The previous behaviour of only one
cell being used to display only the top left element can still be forced by
selecting/marking a single cell prior to input. tdf#149378 (Eike Rathke, Red
Hat)

For reference :
https://wiki.documentfoundation.org/ReleaseNotes/7.4#Calc

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160152] High-Unicode-number characters are not handled in GDI metafile images

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160152

m_a_riosv  changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |NOTABUG

--- Comment #8 from m_a_riosv  ---
So it is an issue, about using a font with the character.

Closed as not a bug, please if you are not agree, reopen it.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 155654] Example for function Timer is erroneous

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=155654

Adolfo Jayme Barrientos  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
   Assignee|libreoffice-b...@lists.free |f...@bger.ch
   |desktop.org |

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160156] New: Impossible to filter for lines with empty values, when certain other filters used

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160156

Bug ID: 160156
   Summary: Impossible to filter for lines with empty values, when
certain other filters used
   Product: LibreOffice
   Version: 24.2.1.2 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: linus.kard...@gmail.com

Description:
Calc blocks you from filtering for only lines with empty cells in a column,
when certain filters are used in other columns.

Steps to Reproduce:
1. Setup a spreadsheet with e.g.:
a,b,c
x,d,
y,,e
z,,
2. Add autofilter (ctrl+shift+l)
3. In column c, show only empty values
4. In column b, try to show only empty values

Actual Results:
When trying to set filters for column b, the value "(empty)" is grayed out. If
you deselect "d", "Ok" will be grayed out.

Expected Results:
Only rows with empty values in column b and c shown (i.e. row "z")


Reproducible: Always


User Profile Reset: Yes

Additional Info:
Version: 24.2.1.2 (X86_64) / LibreOffice Community
Build ID: 420(Build:2)
CPU threads: 16; OS: Linux 6.7; UI render: default; VCL: kf5 (cairo+xcb)
Locale: sv-SE (sv_SE.UTF-8); UI: sv-SE
Calc: CL threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 160160] New: Spellchecking wavy lines underlining should automatically render with lighter colors when using the system dark theme color scheme for documents

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=160160

Bug ID: 160160
   Summary: Spellchecking wavy lines underlining should
automatically render with lighter colors when using
the system dark theme color scheme for documents
   Product: LibreOffice
   Version: 7.5.0.3 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: nekoh...@gmail.com

Description:
In the Options/Preferences, in "LibreOffice > Application Colors", if the color
scheme is "Automatic" with "System Theme", Writer (and other applications, like
Calc) will automatically change the color scheme when the operating system
switches to dark theme mode.

This mostly works, except spelling (grammar and syntax) in contents, that are
still rendered with their traditional dark-red (and sometimes dark green)
colors, instead of adapting them for dark mode (see attached video showing the
issue with the red spelling underlining problem).

Instead, they should use lighter colors specific to the dark theme. Similar
issue to #158032 (hyperlinks) and #151981 (fields backgrounds).

Steps to Reproduce:
1. Write poorly
2. Enable automatic spellchecking
3. Switch to dark theme

Actual Results:
Dark red (or dark green) on black is barely visible.

Expected Results:
Lighter colors for increased contrast.


Reproducible: Always


User Profile Reset: No

Additional Info:
Version: 24.2.1.2 (X86_64) / LibreOffice Community
Build ID: db4def46b0453cc22e2d0305797cf981b68ef5ac
CPU threads: 8; OS: Linux 6.7; UI render: default; VCL: gtk3
Locale: en-US (en_US.UTF-8); UI: en-US
Flatpak
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 153212] "regular expression in the Replace box" makes no sense

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=153212

--- Comment #2 from Commit Notification 
 ---
Pierre F committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/help/commit/3a192b621db3644d50544a64f56ac34909711f92

clarify match/replace. tdf#153212

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 153212] "regular expression in the Replace box" makes no sense

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=153212

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:24.8.0

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 159557] Have stopped responding! (v7.6 & v24.2)

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=159557

--- Comment #16 from Klexus  ---
"Affected users are encouraged to test the fix and report feedback."

Well, have tried 24.2.2.1 for about 5-8 minutes by clicking randomly on
different functions and stuff and it seems to be running better than ever since
the first version of 7.6 was released.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 85677] Dragging on a touchscreen display highlights instead of scrolling

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=85677

--- Comment #34 from r3ckhr...@mozmail.com ---
Same problem on Dell Inspiron 16 7620 2-in-1, Linux Mint 23.1 Cinnamon (x11
session). 

LibreOffice Writer Versions tested: 

Version 24.2.1.2 (X86_64) / LibreOffice Community
Build ID: db4def46b0453cc22e2d0305797cf981b68ef5ac
Flatpak

Version: 7.3.7.2 / LibreOffice Community
Build ID: 30(Build:2)
(This is the version that Mint 23.1 includes by default.)

Both versions show CPU threads: 16; OS: Linux 5.15; UI render: default; VCL:
gtk3; Locale: en-CA (en_CA.UTF-8); UI: en-GB

Cannot scroll vertically by swiping up or down on the touch screen with one or
two fingers. Same problem in Normal or Web view. It works on the touch pad but
that can be difficult to use, due to disabilities or when the laptop is inthe
"easel" configuration (keyboard and touch pad on the bottom, facing the desk,
screen upright, rotated 180 degrees compared to regular laptop configuration). 

Also, cannot move the vertical scroll bar up or down by touch on screen, in
Normal or Web view. Touching and holding the "handle" icon does not allow
dragging it up or down. Tapping above or below the "handle" icon on the
vertical scroll bar works but it's an imprecise way to move through the
document - usually moves more than a few lines at time. 

By comparison, OnlyOffice Document (word processor) and Firefox browser on the
same platform also does not allow one or two finger swipes up/down on the touch
screen to scroll, but at least the vertical slide bar  on the touch screen
works as expected.

The Mint text editor, xed 3.4.5, allows vertical scrolling with one-finger
swipe on the touch screen.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 159907] A11Y sidebar: highlighted text does not show its attributes in the Style inspector

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=159907

Dieter  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1
 CC||dgp-m...@gmx.de

--- Comment #5 from Dieter  ---
I confirm it with

Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: ab95ed2c4b1eddc2188bd455653a77140aa3816c
CPU threads: 4; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win
Locale: de-DE (de_DE); UI: en-GB
Calc: CL threaded

Place cursor in before dash => Style inspector shows DF
Place cursor behind dash => Style inspector doesn't show DF
Select dash from left to right => Style inspector shows DF
Select dash from right to left => Style inspector doesn't show DF

In Accessibility check cursor is before dash and therefore we have the same
result as in Style inspector. So better solution would be, if cursor would be
after dash.

Additional information
I miss the information in LO help [1] that result of Style inspector for
characters depends on location of cursor 


[1]
https://help.libreoffice.org/24.8/en-GB/text/swriter/01/style_inspector.html?DbPAR=WRITER#bm_id44164133922

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 85410] Remove Decimal Space button causes 10 decimals before it decreases one at a time

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=85410

--- Comment #16 from Justin L  ---
Getting what is actually displayed in the cell is not easy. It is NOT one of
these:
rDoc.GetString(nCol, nRow, nTab)
ScCellFormat::GetInputString(aCell, nOldFormat, *rDoc.GetFormatTable(), rDoc)
ScCellFormat::GetOutputString(rDoc, aPos, aCell)

In fact, I think the shortened string just ends up being drawn to a screen
position, and never ends up as an actual string stored anywhere.
mpDev->DrawText(aDrawTextPos, aShort, 0, -1, nullptr, nullptr, ...
in ScOutputData::LayoutStrings

where aDrawTextPos is an X,Y coordinate, and  aShort is
ScDrawStringsVars::GetString where (m_)aString was set in
ScDrawStringsVars::SetTextToWidthOrHash

That pretty much makes this bug impossible to solve without doing massive
edge-casing. It certainly doesn't seem to be a logical flaw...

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 157603] Format Strings documentation misses "AM/PM" specifier

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=157603

Adolfo Jayme Barrientos  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
   Assignee|libreoffice-b...@lists.free |f...@bger.ch
   |desktop.org |
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.