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

[Aron Budea (via logerrit)]

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

mimo-7.3.7.2.M9

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

core.git: 2 commits - cppuhelper/source cppu/source io/source

[Gabor Kelemen (via logerrit)]

 cppu/source/threadpool/current.cxx  |1 -
 cppuhelper/source/access_control.cxx|1 -
 cppuhelper/source/component_context.cxx |1 -
 cppuhelper/source/exc_thrower.cxx   |1 -
 cppuhelper/source/implbase_ex.cxx   |1 -
 cppuhelper/source/macro_expander.cxx|1 -
 cppuhelper/source/weak.cxx  |1 -
 io/source/TextInputStream/TextInputStream.cxx   |1 -
 io/source/TextOutputStream/TextOutputStream.cxx |1 -
 io/source/stm/odata.cxx |1 -
 io/source/stm/omark.cxx |1 -
 io/source/stm/opump.cxx |1 -
 12 files changed, 12 deletions(-)

New commits:
commit 6d3f6e77e1a21e53343339545502feecc69e6c78
Author: Gabor Kelemen 
AuthorDate: Fri Mar 29 13:18:22 2024 +0100
Commit: Gabor Kelemen 
CommitDate: Fri Mar 29 21:21:02 2024 +0100

tdf#146619 Drop unused 'using namespace' in: io/

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

diff --git a/io/source/TextInputStream/TextInputStream.cxx 
b/io/source/TextInputStream/TextInputStream.cxx
index 1ce12a6e796e..29699e9adf9c 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -36,7 +36,6 @@
 
 namespace com::sun::star::uno { class XComponentContext; }
 
-using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx 
b/io/source/TextOutputStream/TextOutputStream.cxx
index 1271c4d09c96..e8706b407843 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -31,7 +31,6 @@
 
 namespace com::sun::star::uno { class XComponentContext; }
 
-using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 6b19585da942..881b0cda132a 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -39,7 +39,6 @@
 #include 
 
 using namespace ::cppu;
-using namespace ::osl;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 3507eb0a0729..9cc5959f1f13 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -42,7 +42,6 @@
 #include 
 
 using namespace ::cppu;
-using namespace ::osl;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index df3e6132319d..62f6e85c3b95 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -35,7 +35,6 @@
 #include 
 #include 
 
-using namespace osl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
commit b6f5472ea147230b07a04f5677e1de8ea149cea5
Author: Gabor Kelemen 
AuthorDate: Fri Mar 29 13:16:58 2024 +0100
Commit: Gabor Kelemen 
CommitDate: Fri Mar 29 21:20:50 2024 +0100

tdf#146619 Drop unused 'using namespace' in: cppu/ cppuhelper/

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

diff --git a/cppu/source/threadpool/current.cxx 
b/cppu/source/threadpool/current.cxx
index 64e6bfb8f64c..46fdc8c253f3 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -30,7 +30,6 @@
 #include "current.hxx"
 
 
-using namespace ::osl;
 using namespace ::rtl;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
diff --git a/cppuhelper/source/access_control.cxx 
b/cppuhelper/source/access_control.cxx
index da8343648a95..9b8b907df6b6 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 
-using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
diff --git a/cppuhelper/source/component_context.cxx 
b/cppuhelper/source/component_context.cxx
index da070bdf027c..47dbd0b3773e 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -51,7 +51,6 @@ constexpr OUString SMGR_SINGLETON = 
u"/singletons/com.sun.star.lang.theServiceMa
 constexpr OUStringLiteral TDMGR_SINGLETON = 
u"/singletons/com.sun.star.reflection.theTypeDescriptionManager";
 constexpr OUStringLiteral AC_SINGLETON = 
u"/singletons/com.sun.star.security.theAccessController";
 
-using namespace ::osl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
diff --git 

Glen Campbell license statement

[Glen Campbell]

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.

translations.git: Branch 'feature/cib_contract49' - source/de

[Thorsten Behrens (via logerrit)]

 source/de/cui/messages.po |   19 ---
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po |   25 ++
 source/de/sc/messages.po  |   21 +---
 source/de/sd/messages.po  |   19 ---
 source/de/sw/messages.po  |   19 ---
 5 files changed, 14 insertions(+), 89 deletions(-)

New commits:
commit 1c282d924271d964c4e1942254e13f08f253d653
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 22:18:22 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 22:18:22 2024 +0100

Fixup: Update DE translations

Emacs PO mode interfered with conflict resolution, revert back to
previous header content.

Change-Id: I732ec5a82b07cf425772acbf1d0b256741993160

diff --git a/source/de/cui/messages.po b/source/de/cui/messages.po
index a206041d38e..a328143b9ec 100644
--- a/source/de/cui/messages.po
+++ b/source/de/cui/messages.po
@@ -1,23 +1,8 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
+#. extracted from cui/inc
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
-"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE
"
-"Last-Translator: FULL NAME 
"
-"Language-Team: LANGUAGE 
"
-"MIME-Version: 1.0
"
-"Content-Type: text/plain; charset=CHARSET
"
-"Content-Transfer-Encoding: 8bit
"
-
-#~ #. extracted from cui/inc
-#~ msgid ""
-#~ msgstr ""
-#~ "Project-Id-Version: PACKAGE VERSION
"
-#~ "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
+"Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
 "POT-Creation-Date: 2023-07-06 10:56+0200
"
 "PO-Revision-Date: 2024-02-24 15:08+0100
"
 "Last-Translator: Christian Kühl 
"
diff --git a/source/de/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/de/officecfg/registry/data/org/openoffice/Office/UI.po
index 918180f9bee..c8e2282bf4c 100644
--- a/source/de/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/de/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -1,26 +1,11 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
+#. extracted from officecfg/registry/data/org/openoffice/Office/UI
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
-"PO-Revision-Date: 2024-03-29 14:52+0100
"
-"Last-Translator: FULL NAME 
"
-"Language-Team: LANGUAGE 
"
-"MIME-Version: 1.0
"
-"Content-Type: text/plain; charset=CHARSET
"
-"Content-Transfer-Encoding: 8bit
"
-
-#~ #. extracted from officecfg/registry/data/org/openoffice/Office/UI
-#~ msgid ""
-#~ msgstr ""
-#~ "Project-Id-Version: PACKAGE VERSION
"
-#~ "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
-#~ "POT-Creation-Date: 2023-06-19 12:46+0200
"
-"PO-Revision-Date: 2024-02-24 21:23+0100
"
-"Last-Translator: Annabelle Wübbelsmann 
"
+"Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
+"POT-Creation-Date: 2023-05-31 16:28+0200
"
+"PO-Revision-Date: 2024-02-11 17:37+
"
+"Last-Translator: Christian Kühl 
"
 "Language-Team: German 

"
 "Language: de
"
 "MIME-Version: 1.0
"
diff --git a/source/de/sc/messages.po b/source/de/sc/messages.po
index d67a17c8701..bbe625e1f64 100644
--- a/source/de/sc/messages.po
+++ b/source/de/sc/messages.po
@@ -1,24 +1,9 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
+#. extracted from sc/inc
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
-"PO-Revision-Date: 2024-03-29 14:50+0100
"
-"Last-Translator: FULL NAME 
"
-"Language-Team: LANGUAGE 
"
-"MIME-Version: 1.0
"
-"Content-Type: text/plain; charset=CHARSET
"
-"Content-Transfer-Encoding: 8bit
"
-
-#~ #. extracted from sc/inc
-#~ msgid ""
-#~ msgstr ""
-#~ "Project-Id-Version: PACKAGE VERSION
"
-#~ "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
-#~ "POT-Creation-Date: 2023-07-25 11:20+0200
"
+"Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
+"POT-Creation-Date: 2023-07-25 11:20+0200
"
 "PO-Revision-Date: 2024-02-24 14:44+0100
"
 "Last-Translator: Christian Kühl 
"
 "Language-Team: German 

"
diff --git a/source/de/sd/messages.po b/source/de/sd/messages.po
index cb7c65395b7..666a4f8688c 100644
--- a/source/de/sd/messages.po
+++ b/source/de/sd/messages.po
@@ -1,23 +1,8 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR , 

core.git: Branch 'feature/cib_contract49' - translations

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 4f1a2bf7666f4d1194fd32bbbf6098c1cd49e835
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 22:19:59 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Mar 29 22:19:59 2024 +0100

Update git submodules

* Update translations from branch 'feature/cib_contract49'
  to 1c282d924271d964c4e1942254e13f08f253d653
  - Fixup: Update DE translations

Emacs PO mode interfered with conflict resolution, revert back to
previous header content.

Change-Id: I732ec5a82b07cf425772acbf1d0b256741993160

diff --git a/translations b/translations
index 11bb4c5da1e3..1c282d924271 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 11bb4c5da1e34fa087cad36d40dd964560d8e07b
+Subproject commit 1c282d924271d964c4e1942254e13f08f253d653

core.git: Branch 'feature/cib_contract49' - 2 commits - sw/qa writerfilter/source

[Thorsten Behrens (via logerrit)]

 sw/qa/extras/rtfimport/rtfimport.cxx  |7 +--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit f2ba6ef61c8d7f36e8e64344839f2b2e42e86445
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 22:01:08 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 22:20:18 2024 +0100

RTF import result for header now like in master

Same code as in https://gerrit.libreoffice.org/c/core/+/162932 works
now also for libreoffice-7-6.

Change-Id: I10f360d006f4ae4b9b26dabdc2e49ca929d9e3e3

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8d47cb388cfc..a14f3366d520 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1572,12 +1572,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf108947)
 uno::Reference xHeaderTextLeft = 
getProperty>(
 getStyles("PageStyles")->getByName("Default Page Style"), 
"HeaderTextLeft");
 aActual = xHeaderTextLeft->getString();
-CPPUNIT_ASSERT_EQUAL(
-OUString(
-SAL_NEWLINE_STRING
-// note: there should be *one* break here - as it is in the 
24.2 branch - but somehow in the 7.6 branch there are 2; most likely it was 
fixed by commit 4b0fa253a4540f5461397815d290586f9ddabe61 which is a bit large 
to backport
-SAL_NEWLINE_STRING "Header Page 2 ?"),
-aActual);
+CPPUNIT_ASSERT_EQUAL(OUString(SAL_NEWLINE_STRING "Header Page 2 ?"), 
aActual);
 #endif
 }
 
commit d429fe3be052563df4b2070e862ff01e5fa53ba0
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 15:48:23 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 22:20:18 2024 +0100

Fixup: Merge tag 'libreoffice-7.6.6.3' into feature/cib_contract49

Change-Id: Id985c571840f596bb84eb1cbe7108a9585e36265

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 848f7506ad8e..5bf0015c29f8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -911,8 +911,6 @@ public:
 css::uno::Reference PopPendingShape();
 
 void PopPageHeaderFooter(PagePartType ePagePartType, PageType eType);
-void PushPageHeader(SectionPropertyMap::PageType eType);
-void PushPageFooter(SectionPropertyMap::PageType eType);
 
 bool IsInHeaderFooter() const { auto const 
type(m_StreamStateStack.top().eSubstreamType); return type == 
SubstreamType::Header || type == SubstreamType::Footer; }
 void ConvertHeaderFooterToTextFrame(bool, bool);

core.git: xmloff/source

[Gabor Kelemen (via logerrit)]

 xmloff/source/draw/QRCodeContext.cxx|1 -
 xmloff/source/draw/descriptionimp.cxx   |1 -
 xmloff/source/forms/formattributes.cxx  |1 -
 xmloff/source/forms/formcellbinding.cxx |1 -
 xmloff/source/style/DrawAspectHdl.cxx   |1 -
 xmloff/source/style/PageMasterExportPropMapper.cxx  |1 -
 xmloff/source/style/PageMasterPropHdlFactory.cxx|1 -
 xmloff/source/style/PageMasterPropMapper.cxx|2 --
 xmloff/source/style/XMLBackgroundImageContext.cxx   |1 -
 xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx |1 -
 xmloff/source/text/XMLSectionSourceDDEImportContext.cxx |1 -
 xmloff/source/text/XMLTextNumRuleInfo.cxx   |1 -
 xmloff/source/text/txtftne.cxx  |1 -
 xmloff/source/text/txtparae.cxx |1 -
 xmloff/source/transform/Oasis2OOo.cxx   |1 -
 xmloff/source/transform/PersAttrListTContext.cxx|1 -
 16 files changed, 17 deletions(-)

New commits:
commit e2e9eeb822928255b3f2a31dfe98344f6d8e81cd
Author: Gabor Kelemen 
AuthorDate: Sat Mar 16 18:09:20 2024 +0100
Commit: Gabor Kelemen 
CommitDate: Fri Mar 29 21:19:32 2024 +0100

tdf#146619 Recheck xmloff/*cxx with IWYU

after cleaning up unused 'using namespace' clauses

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

diff --git a/xmloff/source/draw/QRCodeContext.cxx 
b/xmloff/source/draw/QRCodeContext.cxx
index 434065b5f203..580e4e8b9a41 100644
--- a/xmloff/source/draw/QRCodeContext.cxx
+++ b/xmloff/source/draw/QRCodeContext.cxx
@@ -10,7 +10,6 @@
 #include "QRCodeContext.hxx"
 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/xmloff/source/draw/descriptionimp.cxx 
b/xmloff/source/draw/descriptionimp.cxx
index c553bb655287..e17980f55baa 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -18,7 +18,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/xmloff/source/forms/formattributes.cxx 
b/xmloff/source/forms/formattributes.cxx
index 0b8b84d0f299..3a979f2599ab 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -20,7 +20,6 @@
 #include "formattributes.hxx"
 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/xmloff/source/forms/formcellbinding.cxx 
b/xmloff/source/forms/formcellbinding.cxx
index 2a7a26bb71b0..9b19d2c3651e 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/xmloff/source/style/DrawAspectHdl.cxx 
b/xmloff/source/style/DrawAspectHdl.cxx
index 10cc762ec954..cc38523c8d06 100644
--- a/xmloff/source/style/DrawAspectHdl.cxx
+++ b/xmloff/source/style/DrawAspectHdl.cxx
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-#include 
 
 using namespace ::com::sun::star;
 
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 9b7ff71874e8..7e5d2bcbee6e 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -19,7 +19,6 @@
 
 #include "PageMasterExportPropMapper.hxx"
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx 
b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index 1cb396803aba..1617584839ab 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/xmloff/source/style/PageMasterPropMapper.cxx 
b/xmloff/source/style/PageMasterPropMapper.cxx
index 40f33139351c..6e7a4be35bba 100644
--- a/xmloff/source/style/PageMasterPropMapper.cxx
+++ b/xmloff/source/style/PageMasterPropMapper.cxx
@@ -23,8 +23,6 @@
 #include 
 #include 
 
-#include 
-
 using namespace ::com::sun::star;
 
 XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper():
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx 
b/xmloff/source/style/XMLBackgroundImageContext.cxx
index fb655d132385..686edd7ed1ed 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include 
 #include 
 #include 
 
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx 
b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index d1e435abc0c8..1be742637df0 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ 

core.git: oox/source sd/qa sd/source

[Tibor Nagy (via logerrit)]

 oox/source/drawingml/shape.cxx  |   11 +++
 sd/qa/unit/data/pptx/tdf157285.pptx |binary
 sd/qa/unit/data/xml/n819614_0.xml   |2 +-
 sd/qa/unit/import-tests2.cxx|   23 +++
 sd/source/ui/unoidl/unopage.cxx |5 +
 5 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit 40d3d510fca99b555381deb74b9915c91c924de5
Author: Tibor Nagy 
AuthorDate: Fri Mar 29 15:19:10 2024 +0100
Commit: Nagy Tibor 
CommitDate: Fri Mar 29 23:38:18 2024 +0100

tdf#157285 PPTX import: fix placeholder height

The "TextAutoGrowHeight" property doesn't shrink the shape automatically
when its content is smaller than the current size.

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

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index bd81fa9b42bf..23be28b546b6 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1251,6 +1251,17 @@ Reference< XShape > const & Shape::createAndInsert(
 {
 xSet->setPropertyValue("Decorative", Any(m_isDecorative));
 }
+
+// set the placeholder height to "0" if it has the 
'TextAutoGrowHeight' property
+// the placeholder height is set later to the correct size.
+bool bAutoGrowHeight = false;
+xSet->getPropertyValue("TextAutoGrowHeight") >>= bAutoGrowHeight;
+if (bAutoGrowHeight && 
mxShape->getShapeType().startsWith("com.sun.star.presentation."))
+{
+awt::Size aSize(mxShape->getSize().Width, 0);
+mxShape->setSize(aSize);
+}
+
 if (aServiceName != "com.sun.star.text.TextFrame")
 rxShapes->add( mxShape );
 
diff --git a/sd/qa/unit/data/pptx/tdf157285.pptx 
b/sd/qa/unit/data/pptx/tdf157285.pptx
new file mode 100644
index ..7fa9ec88f1b0
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf157285.pptx differ
diff --git a/sd/qa/unit/data/xml/n819614_0.xml 
b/sd/qa/unit/data/xml/n819614_0.xml
index c889b00c343a..0fa127c07d9b 100644
--- a/sd/qa/unit/data/xml/n819614_0.xml
+++ b/sd/qa/unit/data/xml/n819614_0.xml
@@ -1,6 +1,6 @@
 
 
- 
+ 
   
   
   
diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx
index bf3cfee14dad..9ade40ad1917 100644
--- a/sd/qa/unit/import-tests2.cxx
+++ b/sd/qa/unit/import-tests2.cxx
@@ -74,6 +74,29 @@ protected:
 bool checkPattern(int nShapeNumber, std::vector& rExpected);
 };
 
+CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf157285)
+{
+createSdImpressDoc("pptx/tdf157285.pptx");
+
+uno::Reference xShape1(getShapeFromPage(0, 0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShape1.is());
+sal_Int32 nHeight1 = xShape1->getSize().Height;
+
+// Without the fix in place, this test would have failed with
+// Expected: placeholder height: 2541
+// Actual  : placeholder height: 3435
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2541), nHeight1);
+
+uno::Reference xShape2(getShapeFromPage(1, 0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShape2.is());
+sal_Int32 nHeight2 = xShape2->getSize().Height;
+
+// Without the fix in place, this test would have failed with
+// Expected: placeholder height: 1169
+// Actual  : placeholder height: 11303
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1169), nHeight2);
+}
+
 CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf152186)
 {
 createSdImpressDoc("pptx/tdf152186.pptx");
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 1462e08e369e..569116c96b61 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -486,6 +486,11 @@ rtl::Reference 
SdGenericDrawPage::CreateSdrObject_( const Reference<
 
 ::tools::Rectangle aRect( eObjKind == PresObjKind::Title ? 
GetPage()->GetTitleRect() : GetPage()->GetLayoutRect()  );
 
+// OOXML placeholder with auto grow height
+// do not set the height here yet
+if (xShape->getSize().Height == 0)
+aRect.setHeight(0);
+
 const awt::Point aPos( aRect.Left(), aRect.Top() );
 xShape->setPosition( aPos );
 

core.git: Branch 'feature/allo_contract45533' - sc/qa sw/qa

[Stephan Bergmann (via logerrit)]

 sc/qa/uitest/inputLine/tdf67346.py  |   50 ---
 sw/qa/uitest/writer_tests7/tdf150443.py |   46 --
 sw/qa/uitest/writer_tests7/tdf90401.py  |  139 
 3 files changed, 235 deletions(-)

New commits:
commit 3c2c10f085eef193d9a5417576d61bb76cea0585
Author: Stephan Bergmann 
AuthorDate: Tue Mar 12 15:14:52 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Mar 30 00:38:32 2024 +0100

Remove known-problematic tests

For unclear reasons:

1  UITest_writer_tests7 kept hanging with python.bin at

> Traceback (most recent call first):
>   
>   File "/home/libo/src/core/uitest/uitest/test.py", line 144, in 
execute_dialog_through_command
> time.sleep(DEFAULT_SLEEP)
>   
>   File 
"/mnt/builddir/instdir/program/python-core-3.8.18/lib/contextlib.py", line 113, 
in __enter__
> return next(self.gen)
>   File "/home/libo/src/core/uitest/uitest/test.py", line 148, in 
execute_modeless_dialog_through_command
> with self.execute_dialog_through_command(command, printNames, 
close_button, "ModelessDialogVisible") as xDialog:
>   
>   File 
"/mnt/builddir/instdir/program/python-core-3.8.18/lib/contextlib.py", line 113, 
in __enter__
> return next(self.gen)
>   File "/home/libo/src/core/sw/qa/uitest/writer_tests7/tdf90401.py", line 
131, in test_tdf142902_remove_personal_info_in_DOCX
> with 
self.ui_test.execute_modeless_dialog_through_command('.uno:AcceptTrackedChanges',
 close_button="close") as xTrackDlg:
>   File 
"/mnt/builddir/instdir/program/python-core-3.8.18/lib/unittest/case.py", line 
633, in _callTestMethod
> method()
>   File 
"/mnt/builddir/instdir/program/python-core-3.8.18/lib/unittest/case.py", line 
1700, in run
>   File 
"/mnt/builddir/instdir/program/python-core-3.8.18/lib/unittest/case.py", line 
736, in __call__
> return self.run(*args, **kwds)
>   File 
"/mnt/builddir/instdir/program/python-core-3.8.18/lib/unittest/suite.py", line 
378, in run
>   File 
"/mnt/builddir/instdir/program/python-core-3.8.18/lib/unittest/suite.py", line 
84, in __call__
> return self.run(*args, **kwds)
>   File 
"/mnt/builddir/instdir/program/python-core-3.8.18/lib/unittest/runner.py", line 
432, in run
>   File "/home/libo/src/core/uitest/test_main.py", line 138, in 
> result = unittest.TextTestRunner(stream=sys.stdout, 
verbosity=2).run(test_suite)

and soffice.bin idling in the main thread.

2  With (1) out of the way, UITest_writer_tests7 kept failing with

> ==
> ERROR: test_tdf150443 (tdf150443.tdf150443)
> --
> Traceback (most recent call last):
>   File "/home/libo/src/core/uitest/uitest/test.py", line 134, in 
execute_dialog_through_command
> yield xDialog
>   File "/home/libo/src/core/uitest/uitest/test.py", line 149, in 
execute_modeless_dialog_through_command
> yield xDialog
>   File "/home/libo/src/core/sw/qa/uitest/writer_tests7/tdf150443.py", 
line 33, in test_tdf150443
> changesList = xTrackDlg.getChild("writerchanges")
> uno.com.sun.star.uno.RuntimeException: Could not find child with id: 
writerchanges children were   writer_edit PageBreak PageBreak   
 ScrollBars vertical horizontal   ScrollBars vertical horizontal  TabBar  
TabBar TabBarContents  menubutton measure button button button button button 
button button button   FixedImageControl image   Deck titlebar grip addonimage 
label toolbar scrolledwindow contents Panel titlebar addonimage expander   
toolbar contents SidebarStylesPanel grid1 fontstyletoolbox  applystyle 
style Panel titlebar addonimage expander   toolbar contents SidebarTextPanel 
grid1 font  fontnamecombobox fontheight  fontsizecombobox fonteffects 
ToolbarPopover container box3 defaultattr resetattr fontadjust box1 
colorbar_writer ToolbarPopover container colorbar_others ToolbarPopover 
container colorbar_background ToolbarPopover container spacingbar 
ToolbarPopover container box2 position Panel titlebar addonimage expander   
toolbar contents P
 araPropertyPanel grid1 box1 horizontalalignment writedirection 
verticalalignment numberbullet ToolbarPopover container ToolbarPopover 
container ToolbarPopover container backgroundcolor ToolbarPopover container 
separator1 box3 spacinglabel paraspacing aboveparaspacingbox 
aboveparaspacingimg  aboveparaspacing  belowparaspacingbox belowparaspacingimg  
belowparaspacing  linespacing ToolbarPopover container indentfieldbox 
indentlabel indent beforetextindentbox beforetextindentimg  beforetextindent  
aftertextindentbox aftertextindentimg  aftertextindent  firstlineindentbox 
firstlineindentimg  firstlineindent  Panel titlebar addonimage expander   
toolbar contents TableEditPanel 

core.git: Branch 'feature/allo_contract45533' - 16 commits - compilerplugins/LICENSE.TXT configure.ac cui/inc dictionaries download.lst helpcontent2 include/svx odk/docs odk/examples odk/index.html od

[Thorsten Behrens (via logerrit)]

 compilerplugins/LICENSE.TXT  |2 
 configure.ac |2 
 cui/inc/strings.hrc  |2 
 dictionaries |2 
 download.lst |4 
 helpcontent2 |2 
 include/svx/sdrmasterpagedescriptor.hxx  |3 
 include/svx/sdrpageuser.hxx  |3 
 include/svx/svdpage.hxx  |1 
 odk/docs/install.html|2 
 odk/docs/tools.html  |2 
 odk/examples/DevelopersGuide/examples.html   |2 
 odk/examples/examples.html   |2 
 odk/index.html   |2 
 odk/index_online.html|2 
 readlicense_oo/license/license.xml   |2 
 sc/source/ui/docshell/docsh3.cxx |3 
 sd/qa/unit/export-tests-ooxml3.cxx   |   47 
 sd/source/filter/eppt/pptx-epptooxml.cxx |   38 ++-
 setup_native/source/packinfo/packinfo_brand.txt  |   16 -
 setup_native/source/packinfo/packinfo_extensions.txt |8 
 setup_native/source/packinfo/packinfo_librelogo_disabled.txt |2 
 setup_native/source/packinfo/packinfo_office.txt |  126 +--
 setup_native/source/packinfo/packinfo_office_help.txt|2 
 setup_native/source/packinfo/packinfo_office_lang.txt|   20 -
 setup_native/source/packinfo/packinfo_sdkoo.txt  |2 
 setup_native/source/packinfo/packinfo_ure.txt|4 
 sfx2/uiconfig/ui/licensedialog.ui|2 
 sw/qa/core/layout/data/floattable-table-join.docx|binary
 sw/qa/core/layout/tabfrm.cxx |   60 +
 sw/source/core/layout/tabfrm.cxx |   14 +
 translations |2 
 vcl/inc/unx/desktops.hxx |1 
 vcl/qt5/QtInstance.cxx   |7 
 vcl/source/app/IconThemeSelector.cxx |1 
 vcl/source/app/salplug.cxx   |4 
 vcl/unx/generic/desktopdetect/desktopdetector.cxx|   11 
 vcl/unx/kf5/KF5SalInstance.cxx   |8 
 writerfilter/source/dmapper/DomainMapper.cxx |3 
 writerfilter/source/dmapper/PropertyIds.cxx  |1 
 writerfilter/source/dmapper/PropertyIds.hxx  |1 
 41 files changed, 293 insertions(+), 125 deletions(-)

New commits:
commit 03c5b1e33b56c083f19956873f2756dd5e7bcaad
Merge: 0bda223a7e5d d97b2716a9a4
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 16:50:28 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 16:50:28 2024 +0100

Merge tag 'libreoffice-7.6.6.3' into feature/allo_contract45533

Tag libreoffice-7.6.6.3

Change-Id: I7acb3592602aa8ab623d2c7692ab694833a09886

commit d97b2716a9a4a2ce1391dee1765565ea469b0ae7
Author: Christian Lohmaier 
AuthorDate: Thu Mar 21 18:20:33 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Mar 21 18:20:33 2024 +0100

Version 7.6.6.3, tag libreoffice-7.6.6.3

diff --git a/dictionaries b/dictionaries
index 5736d6d655ef..9f5af7262cc6 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 5736d6d655ef99f1c8d16d6cfda8f500e905ef73
+Subproject commit 9f5af7262cc641f4388c7beb7c09529551179b5e
diff --git a/helpcontent2 b/helpcontent2
index 3affb7e7199b..39b9f1ce4da8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3affb7e7199bb13613cc4ef47cb64e2ad1d8cdde
+Subproject commit 39b9f1ce4da85e97402720d5687d9a267fefd564
diff --git a/translations b/translations
index 1bfa04948ba5..9f3b6b1abf7c 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1bfa04948ba57c372badcb8880cd2f12533d2db0
+Subproject commit 9f3b6b1abf7cb2dd81631df09a5bd530d6d8d62e
commit f209e7529759e6db5de455f92f1f63e03385dc15
Author: Christian Lohmaier 
AuthorDate: Thu Mar 21 18:20:23 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Mar 21 18:20:23 2024 +0100

bump product version to 7.6.6.3

Change-Id: I573f2c66114fab00b4703458bafa29ae90e0631c

diff --git a/configure.ac b/configure.ac
index 8801f9cb0850..b2abf4c4b6c8 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.
 

core.git: Branch 'feature/allo_contract45533' - xmloff/source

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/eventimp.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4abd916a8e9ca76d63d7ce31df1fc97e7e088501
Author: Caolán McNamara 
AuthorDate: Wed Mar 27 17:07:20 2024 +
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 16:51:48 2024 +0100

add notify for script use

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

diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 2b8921ee27fa..2a6ce1fa2381 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -210,6 +210,9 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,
 
 if( maData.mbValid )
 maData.mbValid = !sEventName.isEmpty();
+
+if (!maData.msMacroName.isEmpty())
+rImp.NotifyMacroEventRead();
 }
 
 css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLEventContext::createFastChildContext(

https://opengrok.libreoffice.org/ has no project "core"

[Regina Henschel]

Hi all,

https://opengrok.libreoffice.org/ has neither in 'Projects' nor in the 
'Repository' list a project 'core'.


The direct link https://opengrok.libreoffice.org/xref/core/ works. But 
that does not allow search.


Is it only for me or do you have the same problem?

I have tested Firefox, Chrome and Edge.


Kind regards,
Regina

Re: https://opengrok.libreoffice.org/ has no project "core"

[Mike Kaganski]

On 29.03.2024 23:31, Regina Henschel wrote:
https://opengrok.libreoffice.org/ has neither in 'Projects' nor in the 
'Repository' list a project 'core'.


Same here.

--
Best regards,
Mike Kaganski

Re: https://opengrok.libreoffice.org/ has no project "core"

[Regina Henschel]

Hi all,
I have written https://redmine.documentfoundation.org/issues/3727

Kind regards,
Regina

Mike Kaganski schrieb am 29.03.2024 um 20:11:

On 29.03.2024 23:31, Regina Henschel wrote:
https://opengrok.libreoffice.org/ has neither in 'Projects' nor in the 
'Repository' list a project 'core'.


Same here.

core.git: sc/CppunitTest_sc_parallelism.mk sc/Module_sc.mk sc/qa sc/source

[Caolán McNamara (via logerrit)]

 sc/CppunitTest_sc_parallelism.mk|   81 +
 sc/Module_sc.mk |1 
 sc/qa/unit/data/ods/tdf160368.ods   |binary
 sc/qa/unit/parallelism.cxx  |   88 
 sc/qa/unit/ucalc_parallelism.cxx|3 +
 sc/source/core/data/formulacell.cxx |   11 +++-
 6 files changed, 182 insertions(+), 2 deletions(-)

New commits:
commit 18d0b7ac865f8d905a8b9afbe56677c89b1f406c
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 10:00:30 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 20:35:00 2024 +0100

Resolves: tdf#160368 crash on save after deleting sheet

to reproduce the underlying problem: data, calc, recalculate hard:

which asserts that cell I367 is dirty during parallel calc

checking the dependencies for a parallel calc is supposed to find what
cells it depends on and either: ensure they are not dirty or detect its
not possible to do the parallel calc

checking starts in J9 where::

J9:  =SUM(H$8:H9)-SUM(I9:I$9)
J10  =SUM(H$8:H10)-SUM(I10:I$9)

for the first sum it detects that the input range is H9:H367 and checks
that for dirty results, but for the second sum it detects a range of
just I9 and the dirty I367 is not detected and the problem arises on
calculation

The code to detect the range is:

// The first row that will be referenced through the doubleref.
SCROW nFirstRefRow = bIsRef1RowRel ? aAbs.aStart.Row() + mnStartOffset : 
aAbs.aStart.Row();
// The last row that will be referenced through the doubleref.
SCROW nLastRefRow =  bIsRef2RowRel ? aAbs.aEnd.Row() + mnEndOffset : 
aAbs.aEnd.Row();

where for the I9 case has nFirstRefRow true and nLastRefRow false so we
just get a range of I9:I9 instead of I9:I367.

Trying to create a doc from scratch to reproduce this case proves
tricky, so trim down the original document to the sheet and subset
of columns that can trigger it.

Change-Id: I44bfd1f6d3a3ee13db9024c5b2efa2588cc30521
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165510
Reviewed-by: Michael Meeks 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/CppunitTest_sc_parallelism.mk b/sc/CppunitTest_sc_parallelism.mk
new file mode 100644
index ..f7f3cc9fa7b3
--- /dev/null
+++ b/sc/CppunitTest_sc_parallelism.mk
@@ -0,0 +1,81 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_parallelism, \
+sc/qa/unit/parallelism \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_parallelism, \
+boost_headers \
+mdds_headers \
+libxml2 \
+$(call gb_Helper_optional,OPENCL, \
+clew) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+i18nlangtag \
+sal \
+sax \
+sc \
+scqahelper \
+sfx \
+subsequenttest \
+svl \
+svx \
+svxcore \
+test \
+tl \
+unotest \
+utl \
+vcl \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_parallelism,\
+   -I$(SRCDIR)/sc/source/ui/inc \
+   -I$(SRCDIR)/sc/inc \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_parallelism,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sc_parallelism,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_use_vcl,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_use_rdb,sc_parallelism,services))
+
+$(eval $(call gb_CppunitTest_use_components,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_add_arguments,sc_parallelism, \
+
-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"{$(gb_Helper_LIBRARY_PATH_VAR)+=$(gb_Helper_LIBRARY_PATH_VAR)}"
 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 71488d5439e6..d966be26e8dc 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_core \
CppunitTest_sc_dataprovider \
CppunitTest_sc_cache_test \
+   CppunitTest_sc_parallelism \
 

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

[Aron Budea (via logerrit)]

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

mimo-7.5.9.2.M2

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

core.git: ucbhelper/source

[Gabor Kelemen (via logerrit)]

 ucbhelper/source/client/commandenvironment.cxx  |1 -
 ucbhelper/source/provider/contentidentifier.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 4f13c6c5cbd958cbd3cb79385335abe512bb6de2
Author: Gabor Kelemen 
AuthorDate: Fri Mar 29 13:19:08 2024 +0100
Commit: Gabor Kelemen 
CommitDate: Fri Mar 29 21:21:23 2024 +0100

tdf#146619 Drop unused 'using namespace' in: ucbhelper/

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

diff --git a/ucbhelper/source/client/commandenvironment.cxx 
b/ucbhelper/source/client/commandenvironment.cxx
index 37956b2c468f..fdde9a2afc6d 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.cxx
@@ -20,7 +20,6 @@
 #include 
 #include 
 
-using namespace com::sun::star::lang;
 using namespace com::sun::star::task;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::uno;
diff --git a/ucbhelper/source/provider/contentidentifier.cxx 
b/ucbhelper/source/provider/contentidentifier.cxx
index 2a5da953d99c..e545adc84983 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -20,7 +20,6 @@
 #include 
 
 using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
 
 

core.git: 2 commits - include/svl include/svx sc/inc sc/source svl/source svx/source

[Noel Grandin (via logerrit)]

 include/svl/itemset.hxx|4 ++
 include/svx/unopage.hxx|   10 +++---
 sc/inc/column.hxx  |4 +-
 sc/inc/patattr.hxx |3 +
 sc/source/core/data/attarray.cxx   |4 +-
 sc/source/filter/excel/xetable.cxx |   10 +++---
 svl/source/items/itemset.cxx   |   29 +
 svx/source/unodraw/unopage.cxx |   60 +++--
 8 files changed, 67 insertions(+), 57 deletions(-)

New commits:
commit 661ed018fabf3c382867b91828fb8e69d359d9cb
Author: Noel Grandin 
AuthorDate: Wed Mar 27 16:25:44 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 29 17:59:56 2024 +0100

convert SvxDrawPage to comphelper::WeakImplHelper

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

diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 82f643e29471..f1b5c81ec516 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -28,13 +28,14 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -48,8 +49,8 @@ class SvxShapeGroup;
 class SvxShapeConnector;
 enum class SdrInventor : sal_uInt32;
 
-class SVXCORE_DLLPUBLIC SvxDrawPage : protected cppu::BaseMutex,
-public ::cppu::WeakImplHelper< 
css::drawing::XDrawPage,
+class SVXCORE_DLLPUBLIC SvxDrawPage :
+public ::comphelper::WeakImplHelper< 
css::drawing::XDrawPage,
css::drawing::XShapeGrouper,
css::drawing::XShapes2,
css::drawing::XShapes3,
@@ -60,8 +61,7 @@ class SVXCORE_DLLPUBLIC SvxDrawPage : protected 
cppu::BaseMutex,
 
 {
  protected:
-cppu::OBroadcastHelper mrBHelper;
-
+comphelper::OInterfaceContainerHelper4 
maEventListeners;
 SdrPage*mpPage; //  should be reference
 SdrModel*   mpModel;//  probably not needed -> use from SdrPage
 std::unique_ptr mpView;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 0dcba14527ec..ffdc551893bc 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -66,8 +66,7 @@ using namespace ::com::sun::star::drawing;
 UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage );
 
 SvxDrawPage::SvxDrawPage(SdrPage* pInPage) //  should be reference
-:   mrBHelper(m_aMutex)
-,mpPage(pInPage)
+:mpPage(pInPage)
 ,mpModel(>getSdrModelFromSdrPage())  // register at broadcaster
 ,mpView(new SdrView(pInPage->getSdrModelFromSdrPage())) // create (hidden) 
view
 {
@@ -76,7 +75,7 @@ SvxDrawPage::SvxDrawPage(SdrPage* pInPage) //  should be 
reference
 
 SvxDrawPage::~SvxDrawPage() noexcept
 {
-if( !mrBHelper.bDisposed )
+if( !m_bDisposed )
 {
 assert(!"SvxDrawPage must be disposed!");
 acquire();
@@ -108,67 +107,44 @@ void SvxDrawPage::dispose()
 
 // Guard dispose against multiple threading
 // Remark: It is an error to call dispose more than once
-bool bDoDispose = false;
 {
-osl::MutexGuard aGuard( mrBHelper.rMutex );
-if( !mrBHelper.bDisposed && !mrBHelper.bInDispose )
-{
-// only one call go into this section
-mrBHelper.bInDispose = true;
-bDoDispose = true;
-}
+std::unique_lock aGuard( m_aMutex );
+if( m_bDisposed )
+return;
+m_bDisposed = true;
 }
 
-// Do not hold the mutex because we are broadcasting
-if( !bDoDispose )
-return;
-
 // Create an event with this as sender
-try
+css::document::EventObject aEvt;
+aEvt.Source.set(uno::Reference::query( 
static_cast(this) ));
+// inform all listeners to release this object
+// The listener container are automatically cleared
 {
-css::document::EventObject aEvt;
-aEvt.Source.set(uno::Reference::query( 
static_cast(this) ));
-// inform all listeners to release this object
-// The listener container are automatically cleared
-mrBHelper.aLC.disposeAndClear( aEvt );
-// notify subclasses to do their dispose
-disposing();
+std::unique_lock aGuard( m_aMutex );
+maEventListeners.disposeAndClear( aGuard, aEvt );
 }
-catch(const css::uno::Exception&)
-{
-// catch exception and throw again but signal that
-// the object was disposed. Dispose should be called
-// only once.
-osl::MutexGuard aGuard( mrBHelper.rMutex );
-mrBHelper.bDisposed = true;
-mrBHelper.bInDispose = false;
-throw;
-}
-
-osl::MutexGuard aGuard( mrBHelper.rMutex );
-mrBHelper.bDisposed = true;
-mrBHelper.bInDispose = false;
-
+

core.git: avmedia/source include/avmedia

[Noel Grandin (via logerrit)]

 avmedia/source/viewer/mediawindow.cxx |   24 +++-
 include/avmedia/mediawindow.hxx   |   11 ++-
 2 files changed, 21 insertions(+), 14 deletions(-)

New commits:
commit 2cc99a2550eac39b9241dec307e66bfdcc005388
Author: Noel Grandin 
AuthorDate: Wed Mar 27 15:48:25 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 29 18:00:06 2024 +0100

convert PlayerListener to comphelper::WeakComponentImplHelper

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

diff --git a/avmedia/source/viewer/mediawindow.cxx 
b/avmedia/source/viewer/mediawindow.cxx
index c034eb98ec5e..2a3162db2c2d 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -461,20 +461,19 @@ void MediaWindow::dispatchInsertAVMedia(const 
css::uno::Reference&)> fn)
-: PlayerListener_BASE(m_aMutex)
-, m_aFn(std::move(fn))
+: m_aFn(std::move(fn))
 {
 }
 
-void PlayerListener::dispose()
+void PlayerListener::disposing(std::unique_lock& rGuard)
 {
-stopListening();
-PlayerListener_BASE::dispose();
+stopListening(rGuard);
+WeakComponentImplHelperBase::disposing(rGuard);
 }
 
 void PlayerListener::startListening(const 
css::uno::Reference& rNotifier)
 {
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
 
 m_xNotifier = rNotifier;
 m_xNotifier->addPlayerListener(this);
@@ -482,7 +481,12 @@ void PlayerListener::startListening(const 
css::uno::Reference&)
+{
 if (!m_xNotifier)
 return;
 m_xNotifier->removePlayerListener(this);
@@ -491,12 +495,14 @@ void PlayerListener::stopListening()
 
 void SAL_CALL PlayerListener::preferredPlayerWindowSizeAvailable(const 
css::lang::EventObject&)
 {
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
 
 css::uno::Reference xPlayer(m_xNotifier, 
css::uno::UNO_QUERY_THROW);
+aGuard.unlock();
 callPlayerWindowSizeAvailable(xPlayer);
+aGuard.lock();
 
-stopListening();
+stopListening(aGuard);
 }
 
 void SAL_CALL PlayerListener::disposing(const css::lang::EventObject&)
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx
index 087054c2244b..78e1d0c66152 100644
--- a/include/avmedia/mediawindow.hxx
+++ b/include/avmedia/mediawindow.hxx
@@ -24,8 +24,7 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
 #include 
 #include 
 
@@ -55,9 +54,9 @@ namespace avmedia
 
 namespace priv { class MediaWindowImpl; }
 
-typedef cppu::WeakComponentImplHelper 
PlayerListener_BASE;
+typedef comphelper::WeakComponentImplHelper 
PlayerListener_BASE;
 
-class AVMEDIA_DLLPUBLIC PlayerListener final : public cppu::BaseMutex, 
public PlayerListener_BASE
+class AVMEDIA_DLLPUBLIC PlayerListener final : public PlayerListener_BASE
 {
 private:
 css::uno::Reference m_xNotifier;
@@ -66,7 +65,7 @@ namespace avmedia
 using WeakComponentImplHelperBase::disposing;
 public:
 PlayerListener(std::function&)> fn);
-virtual void SAL_CALL dispose() override;
+virtual void disposing(std::unique_lock& rGuard) override;
 virtual ~PlayerListener() override;
 
 virtual void SAL_CALL preferredPlayerWindowSizeAvailable(const 
css::lang::EventObject& rSource) override;
@@ -76,6 +75,8 @@ namespace avmedia
 void stopListening();
 
 void callPlayerWindowSizeAvailable(const 
css::uno::Reference& rPlayer) { m_aFn(rPlayer); }
+private:
+void stopListening(std::unique_lock& rGuard);
 };
 
 class AVMEDIA_DLLPUBLIC MediaWindow

core.git: Branch 'feature/allo_contract45533' - external/liborcus

[Thorsten Behrens (via logerrit)]

 external/liborcus/ExternalProject_liborcus.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 55ea8a5098ef1ab0b6eab234890620a5897eb15b
Author: Thorsten Behrens 
AuthorDate: Fri Feb 9 09:53:52 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 21:30:52 2024 +0100

Fix liborcus missing filesystem::file_size linker error

On baseline gcc 8.3.1, liborcus-parser is missing a few of those
experimental stdc++ symbols:

 liborcus-parser-0.18.so.0: undefined symbol: 
_ZNSt10filesystem9file_sizeERKNS_4pathE"

Change-Id: I253d45d5966f0e99143b1fe983bd4d336178cd66

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 7f2e5f24083f..02df2e035a88 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -46,6 +46,11 @@ endif
 ifeq ($(OS),ANDROID)
 liborcus_LIBS+=$(gb_STDLIBS)
 endif
+ifeq ($(COM),GCC)
+# fix std::filesystem linker error:
+# 
https://stackoverflow.com/questions/33149878/experimentalfilesystem-linker-error
+liborcus_LIBS+=-lstdc++fs
+endif
 
 liborcus_CPPFLAGS=$(CPPFLAGS)
 ifeq ($(SYSTEM_ZLIB),)

core.git: include/svtools reportdesign/source svtools/source

[Noel Grandin (via logerrit)]

 include/svtools/statusbarcontroller.hxx |7 +++
 reportdesign/source/ui/misc/statusbarcontroller.cxx |2 --
 svtools/source/uno/statusbarcontroller.cxx  |   17 ++---
 3 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit b6fdbbc1622a929e2699a67496a38431652eebdf
Author: Noel Grandin 
AuthorDate: Wed Mar 27 16:08:15 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 29 16:24:29 2024 +0100

use std::mutex in StatusbarController

remove some locking in reportdesign::OStatusbarController -
those places are already locking using the solar mutex

Change-Id: I76d8e3a7ad60e4a2be1f0aac42967553356e9202
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165548
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/include/svtools/statusbarcontroller.hxx 
b/include/svtools/statusbarcontroller.hxx
index d5b9f9d2e926..d18cfde1b31c 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -22,8 +22,7 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -41,7 +40,6 @@ namespace svt
 
 class SVT_DLLPUBLIC StatusbarController :
 public css::frame::XStatusbarController,
-public ::cppu::BaseMutex,
 public ::cppu::OWeakObject
 {
 public:
@@ -123,9 +121,10 @@ class SVT_DLLPUBLIC StatusbarController :
 css::uno::Reference< css::uno::XComponentContext >m_xContext;
 OUString  
m_aCommandURL;
 URLToDispatchMap  
m_aListenerMap;
-comphelper::OMultiTypeInterfaceContainerHelper2   
m_aListenerContainer;   /// container for ALL Listener
+comphelper::OInterfaceContainerHelper4 
m_aEventListeners;
 mutable css::uno::Reference< css::util::XURLTransformer > 
m_xURLTransformer;
 css::uno::Reference< css::ui::XStatusbarItem >
m_xStatusbarItem;
+std::mutex m_aMutex; // for m_aEventListeners
 };
 
 }
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx 
b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index 22f2d771412e..98310881a099 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -71,7 +71,6 @@ void SAL_CALL OStatusbarController::initialize( const 
Sequence< Any >& _rArgumen
 {
 StatusbarController::initialize(_rArguments);
 SolarMutexGuard aSolarMutexGuard;
-::osl::MutexGuard aGuard(m_aMutex);
 
 VclPtr< StatusBar > pStatusBar = 
static_cast(VCLUnoHelper::GetWindow(m_xParentWindow));
 if ( !pStatusBar )
@@ -117,7 +116,6 @@ void SAL_CALL OStatusbarController::initialize( const 
Sequence< Any >& _rArgumen
 void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& 
_aEvent)
 {
 SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard(m_aMutex);
 
 if ( !m_rController.is() )
 return;
diff --git a/svtools/source/uno/statusbarcontroller.cxx 
b/svtools/source/uno/statusbarcontroller.cxx
index 3bf6de2cf103..59607875ffc6 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -56,7 +56,6 @@ StatusbarController::StatusbarController(
 ,   m_xFrame( xFrame )
 ,   m_xContext( rxContext )
 ,   m_aCommandURL(std::move( aCommandURL ))
-,   m_aListenerContainer( m_aMutex )
 {
 }
 
@@ -65,7 +64,6 @@ StatusbarController::StatusbarController() :
 ,   m_bInitialized( false )
 ,   m_bDisposed( false )
 ,   m_nID( 0 )
-,   m_aListenerContainer( m_aMutex )
 {
 }
 
@@ -182,8 +180,11 @@ void SAL_CALL StatusbarController::dispose()
 return;
 }
 
-css::lang::EventObject aEvent( xThis );
-m_aListenerContainer.disposeAndClear( aEvent );
+{
+std::unique_lock aGuard(m_aMutex);
+css::lang::EventObject aEvent( xThis );
+m_aEventListeners.disposeAndClear( aGuard, aEvent );
+}
 
 SolarMutexGuard aSolarMutexGuard;
 Reference< XStatusListener > xStatusListener = this;
@@ -220,12 +221,14 @@ void SAL_CALL StatusbarController::dispose()
 
 void SAL_CALL StatusbarController::addEventListener( const Reference< 
XEventListener >& xListener )
 {
-m_aListenerContainer.addInterface( cppu::UnoType::get(), 
xListener );
+std::unique_lock aGuard(m_aMutex);
+m_aEventListeners.addInterface( aGuard, xListener );
 }
 
-void SAL_CALL StatusbarController::removeEventListener( const Reference< 
XEventListener >& aListener )
+void SAL_CALL StatusbarController::removeEventListener( const Reference< 
XEventListener >& xListener )
 {
-m_aListenerContainer.removeInterface( 
cppu::UnoType::get(), aListener );
+std::unique_lock aGuard(m_aMutex);
+m_aEventListeners.removeInterface( aGuard, xListener );
 }
 
 // 

core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   30 ++
 1 file changed, 30 insertions(+)

New commits:
commit e94c6761260ae30f1e4b91d65f8a5493dc8a3140
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 17:24:09 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 20:30:44 2024 +0100

Resolves: tdf#160028 Type to select currency in dropdown does not work for 
gtk

LibreOffice embeds RTL/LTR direction markers in currency strings, which
defeats the default gtk search mechanism, so switch in our one instead.

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 495e403d711a..e535e302a09f 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -14841,6 +14841,32 @@ private:
 }
 #endif
 
+static gboolean search_equal_func(GtkTreeModel *model,
+  int   column,
+  const char   *key,
+  GtkTreeIter  *iter,
+  gpointer/*user_data*/)
+{
+GValue aValue = G_VALUE_INIT;
+gtk_tree_model_get_value(model, iter, column, );
+
+GValue aStringValue = G_VALUE_INIT;
+g_value_init(, G_TYPE_STRING);
+const bool fail = !g_value_transform(, );
+g_value_unset();
+if (fail)
+return true;
+
+bool bNoMatch(true);
+if (const char *str = g_value_get_string())
+{
+const vcl::I18nHelper& rI18nHelper = 
Application::GetSettings().GetLocaleI18nHelper();
+bNoMatch = !rI18nHelper.MatchString(OUString::fromUtf8(key), 
OUString::fromUtf8(str));
+}
+g_value_unset();
+return bNoMatch;
+}
+
 public:
 GtkInstanceTreeView(GtkTreeView* pTreeView, GtkInstanceBuilder* pBuilder, 
bool bTakeOwnership)
 : GtkInstanceWidget(GTK_WIDGET(pTreeView), pBuilder, bTakeOwnership)
@@ -14972,6 +14998,10 @@ public:
 
 m_nRowDeletedSignalId = g_signal_connect(m_pTreeModel, "row-deleted", 
G_CALLBACK(signalRowDeleted), this);
 m_nRowInsertedSignalId = g_signal_connect(m_pTreeModel, 
"row-inserted", G_CALLBACK(signalRowInserted), this);
+
+// tdf#160028 LibreOffice embeds RTL/LTR direction markers in currency 
strings, which defeats the
+// default gtk search mechanism, so switch in our one here
+gtk_tree_view_set_search_equal_func(m_pTreeView, search_equal_func, 
nullptr, nullptr);
 }
 
 virtual void connect_query_tooltip(const Link& rLink) override

core.git: 2 commits - cui/source svx/uiconfig

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/SpellDialog.cxx |   13 +
 cui/source/inc/SpellDialog.hxx |3 +++
 svx/uiconfig/ui/currencywindow.ui  |   36 ++--
 3 files changed, 34 insertions(+), 18 deletions(-)

New commits:
commit 8303ffcb807abeeb168e8071778dab5601f1d839
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 16:34:42 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 20:30:37 2024 +0100

resave with latest glade

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

diff --git a/svx/uiconfig/ui/currencywindow.ui 
b/svx/uiconfig/ui/currencywindow.ui
index c58a0c49226d..7f000338 100644
--- a/svx/uiconfig/ui/currencywindow.ui
+++ b/svx/uiconfig/ui/currencywindow.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -11,22 +11,22 @@
 
   
   
-False
-True
-4
+False
+True
+4
 none
 
   
 True
-False
+False
 vertical
 6
 
   
 True
-False
-True
-currency
+False
+True
+currency
 0
   
   
@@ -38,22 +38,22 @@
 
   
 True
-True
+True
 True
 True
-never
-in
+never
+in
 
   
 True
-True
+True
 True
 True
 liststore1
-False
-False
-0
-False
+False
+False
+0
+False
 
   
 
@@ -80,8 +80,8 @@
   
 _OK
 True
-True
-True
+True
+True
 True
   
   
commit 26f6145b9af5738d5d3b8fe641b99b3908d81e55
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 16:22:10 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 20:30:29 2024 +0100

Resolves: tdf#160159 update spellchecking area colors when style changes

so for the case of using "automatic" for the document background the
spelling checking textbox background area updates to match

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

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index dfdad984ec41..9dd877f80cf9 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1152,6 +1152,13 @@ void 
SentenceEditWindow_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 
 m_xEditEngine->SetStatusEventHdl(LINK(this, SentenceEditWindow_Impl, 
EditStatusHdl));
 
+SetDocumentColor(pDrawingArea);
+}
+
+void SentenceEditWindow_Impl::SetDocumentColor(weld::DrawingArea* pDrawingArea)
+{
+if (!pDrawingArea || !m_xEditView || !m_xEditEngine)
+return;
 // tdf#142631 use document background color in this widget
 Color aBgColor = 
svtools::ColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
 OutputDevice& rDevice = pDrawingArea->get_ref_device();
@@ -1160,6 +1167,12 @@ void 
SentenceEditWindow_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 m_xEditEngine->SetBackgroundColor(aBgColor);
 }
 
+void SentenceEditWindow_Impl::StyleUpdated()
+{
+SetDocumentColor(GetDrawingArea());
+WeldEditView::StyleUpdated();
+}
+
 IMPL_LINK_NOARG(SentenceEditWindow_Impl, EditStatusHdl, EditStatus&, void)
 {
 SetScrollBarRange();
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index fdf5e81bcdf3..81d68e214314 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -71,6 +71,7 @@ private:
 
 protected:
 virtual boolKeyInput( const KeyEvent& rKEvt ) override;
+virtual voidStyleUpdated() override;
 
 public:
 SentenceEditWindow_Impl(std::unique_ptr 
xScrolledWindow);
@@ -120,6 +121,8 @@ public:
 voidMoveErrorEnd(tools::Long nOffset);
 
 voidResetIgnoreErrorsAt()   { m_aIgnoreErrorsAt.clear(); }
+
+voidSetDocumentColor(weld::DrawingArea* pDrawingArea);
 };
 
 // class SvxSpellDialog -

core.git: Branch 'libreoffice-24-2' - download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e3b18de8d948782438ae9cc095b3aa07767b1ff
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 10:56:38 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 30 04:45:11 2024 +0100

nss: upgrade to release 3.99

Change-Id: I77ccc45854b2d0aecc288f471d94c81ad9089f85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165273
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit c6d791e3d2577498affec491876a0afa441be002)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165245
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 584efc99baca..245cc68d424b 100644
--- a/download.lst
+++ b/download.lst
@@ -477,8 +477,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed
-NSS_TARBALL := nss-3.98-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31
+NSS_TARBALL := nss-3.99-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Branch 'libreoffice-24-2' - download.lst external/libgpg-error

[Xisco Fauli (via logerrit)]

 download.lst  |4 ++--
 external/libgpg-error/ExternalPackage_libgpg-error.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit efa4104726496c10c1a23b24cbf26edf3f25a6c5
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 12:10:17 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 30 02:46:50 2024 +0100

libgpg-error: upgrade to release 1.48

Change-Id: I3920d10657a91b56f484a5a61017d2e2ba3291b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165457
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 65bee6317eafd4d0e449c779c160e9b3017b57ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165471
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 48e6bc72b088..584efc99baca 100644
--- a/download.lst
+++ b/download.lst
@@ -394,8 +394,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBGPGERROR_SHA256SUM := 
9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
-LIBGPGERROR_TARBALL := libgpg-error-1.47.tar.bz2
+LIBGPGERROR_SHA256SUM := 
89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f
+LIBGPGERROR_TARBALL := libgpg-error-1.48.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk 
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index fd887fb5776d..2c64ba3b5cc6 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.34.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.35.0))
 
 else ifeq ($(OS),MACOSX)
 

core.git: chart2/uiconfig cui/uiconfig sw/uiconfig

[Taichi Haradaguchi (via logerrit)]

 chart2/uiconfig/ui/tp_3D_SceneIllumination.ui |8 
 cui/uiconfig/ui/certdialog.ui |2 +-
 cui/uiconfig/ui/iconselectordialog.ui |2 +-
 sw/uiconfig/swriter/ui/exchangedatabases.ui   |2 +-
 sw/uiconfig/swriter/ui/flddbpage.ui   |2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b5c40d4864b07861e889244834635c8cfc957d6e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 00:57:49 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 30 06:18:15 2024 +0100

Fix extended tips

Fix wrong dialog names in extended tips.

Change-Id: I60a91c6a06afdf0b993bd65dae8a2e3c6413528a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165122
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui 
b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 2187db5ab092..f67f287f68fc 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -276,11 +276,11 @@
 True
 True
 True
-Select a 
color using the color dialog
+Select a 
color using the Pick a Color dialog
 IMG_LIGHTSOURCE_COLOR
 
   
-Select a 
color using the color dialog.
+Select a 
color using the Pick a Color dialog.
   
 
   
@@ -360,11 +360,11 @@
 True
 True
 True
-Select a color 
using the color dialog
+Select a color 
using the Pick a Color dialog
 IMG_AMBIENT_COLOR
 
   
-Select a color 
using the color dialog.
+Select a color 
using the Pick a color dialog.
   
 
   
diff --git a/cui/uiconfig/ui/certdialog.ui b/cui/uiconfig/ui/certdialog.ui
index 8f3545e3176a..29b19e3d3742 100644
--- a/cui/uiconfig/ui/certdialog.ui
+++ b/cui/uiconfig/ui/certdialog.ui
@@ -44,7 +44,7 @@
 True
 
   
-Opens a file picker 
dialog to add a new Network Security Services Certificate directory to the 
list.
+Opens the Select Path 
dialog to add a new Network Security Services Certificate directory to the 
list.
   
 
   
diff --git a/cui/uiconfig/ui/iconselectordialog.ui 
b/cui/uiconfig/ui/iconselectordialog.ui
index f9672c7406fe..9ee6ee8847cb 100644
--- a/cui/uiconfig/ui/iconselectordialog.ui
+++ b/cui/uiconfig/ui/iconselectordialog.ui
@@ -165,7 +165,7 @@
 True
 
   
-Adds 
new icons to the list of icons. You see a file open dialog that imports the 
selected icon or icons into the internal icon directory of the office 
suite.
+Adds 
new icons to the list of icons. You see the Open dialog that imports the 
selected icon or icons into the internal icon directory of the office 
suite.
   
 
   
diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui 
b/sw/uiconfig/swriter/ui/exchangedatabases.ui
index 9d5589d6ce6b..341a2669cf47 100644
--- a/sw/uiconfig/swriter/ui/exchangedatabases.ui
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -153,7 +153,7 @@
 True
 
   
-Opens a file 
open dialog to select a database file (*.odb). The selected file is added to 
the Available Databases list.
+Opens the 
Open dialog to select a database file (*.odb). The selected file is added to 
the Available Databases list.
   
 
   
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui 
b/sw/uiconfig/swriter/ui/flddbpage.ui
index d2e6ec9b7322..f3f94d1e011f 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -329,7 +329,7 @@
 True
 
   
-Opens a file open 
dialog where you can select a database file (*.odb). The selected file is added 
to the Databases Selection list.
+Opens the Open 
dialog where you can select a database file (*.odb). The selected file is added 
to the Databases Selection list.
   
 
   

core.git: sw/uiconfig

[Taichi Haradaguchi (via logerrit)]

 sw/uiconfig/swriter/ui/findentrydialog.ui |  104 ++
 1 file changed, 50 insertions(+), 54 deletions(-)

New commits:
commit 0c5f0e5dbb482bfc62059a0f586efce6e7b292fe
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Mar 23 14:39:52 2024 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 30 03:55:18 2024 +0100

resave latest glade

Change-Id: I9d0bebea5382c297c9e04caa9d9677720d373069
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165198
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/sw/uiconfig/swriter/ui/findentrydialog.ui 
b/sw/uiconfig/swriter/ui/findentrydialog.ui
index d34690b8b762..68ef33185385 100644
--- a/sw/uiconfig/swriter/ui/findentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/findentrydialog.ui
@@ -1,35 +1,34 @@
 
-
+
 
   
   
-True
-6
+True
+6
 Find Entry
-True
-0
-0
-dialog
+0
+0
+dialog
 
   
 True
-False
+False
 vertical
 12
 
   
 True
-False
-end
+False
+end
 
   
 _Find
 True
-True
-True
-True
-True
-True
+True
+True
+True
+True
+True
 
   
 Displays the 
next record that contains the search text.
@@ -46,8 +45,8 @@
   
 _Close
 True
-True
-True
+True
+True
 True
   
   
@@ -60,8 +59,8 @@
   
 _Help
 True
-True
-True
+True
+True
 True
   
   
@@ -74,44 +73,44 @@
   
 False
 True
-end
+end
 0
   
 
 
-  
+  
   
 True
-False
+False
 True
-12
+12
 
-  
+  
   
 True
-False
+False
 True
-12
+12
 
   
 True
-False
+False
 F_ind
-True
-entry
+True
+entry
 0
   
   
-0
-0
+0
+0
   
 
 
   
 True
-True
+True
 True
-True
+True
 True
 
   
@@ -120,30 +119,30 @@
 
   
   
-1
-0
+1
+0
   
 
   
   
-0
-0
+0
+0
   
 
 
-  
+  
   
 True
-False
-6
+False
+6
 
   
 Find _only in
 True
-True
-False
-True
-True
+True
+False
+True
+True
 
   
 
@@ -154,14 +153,14 @@
 
   
   
-0
-0
+0
+0
   
 
 
   
 True
-False
+False
 12
 
   
@@ -173,14 +172,14 @@
 
   
   
-0
-1
+0
+1
   
 
   
   
-0
-1
+0
+1
   
 
   
@@ -197,9 +196,6 @@
   cancel
   help
 
-
-  
-
 
  

core.git: 2 commits - svl/source vcl/source

[Caolán McNamara (via logerrit)]

 svl/source/numbers/zforlist.cxx |2 +-
 vcl/source/gdi/metaact.cxx  |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 64fa566e659112b46d063dc0e0a89fe8f8065235
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 08:57:46 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 11:19:27 2024 +0100

ofz#67699 Integer-overflow

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

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 81d72cdf8dbd..a7e7c01f2936 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -678,6 +678,9 @@ MetaTextArrayAction::~MetaTextArrayAction()
 
 void MetaTextArrayAction::Execute( OutputDevice* pOut )
 {
+if (!AllowPoint(pOut->LogicToPixel(maStartPt)))
+return;
+
 pOut->DrawTextArray( maStartPt, maStr, maDXAry, maKashidaAry, mnIndex, 
mnLen );
 }
 
commit a39399f263c1e791c883c7cf866f9ee377b1a474
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 08:59:24 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 11:19:21 2024 +0100

pre-thread -> per-thread

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

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 7b2bcd4352e7..5939e93bd67a 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3925,7 +3925,7 @@ sal_uInt32 SvNFEngine::GetCLOffsetRO(const 
SvNFFormatData& rFormatData, SvNFLang
 return nCLOffset;
 }
 
-// we can't cache to SvNFFormatData in RO mode, so cache to a temp map which 
we can consult pre-thread in FindFormatRO
+// we can't cache to SvNFFormatData in RO mode, so cache to a per-thread temp 
map which we can consult in FindFormatRO
 // caches can be merged with SvNumberFormatter::MergeDefaultFormatKeys
 void SvNFEngine::CacheFormatRO(SvNFFormatData::DefaultFormatKeysMap& 
rFormatCache, sal_uInt32 nSearch, sal_uInt32 nFormat)
 {

core.git: 2 commits - sccomp/source scripting/source solenv/clang-format

[Noel Grandin (via logerrit)]

 sccomp/source/solver/SwarmSolver.cxx |   21 +-
 scripting/source/basprov/basmethnode.hxx |1 
 scripting/source/basprov/basscript.cxx   |   15 --
 scripting/source/basprov/basscript.hxx   |   13 +++--
 scripting/source/inc/bcholder.hxx|   44 ---
 solenv/clang-format/excludelist  |1 
 6 files changed, 19 insertions(+), 76 deletions(-)

New commits:
commit 973d1d888738ca574f2b288f1d5a25814713c760
Author: Noel Grandin 
AuthorDate: Wed Mar 27 11:33:03 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 29 07:42:32 2024 +0100

convert SwarmSolver to comphelper::WeakImplHelper

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

diff --git a/sccomp/source/solver/SwarmSolver.cxx 
b/sccomp/source/solver/SwarmSolver.cxx
index 01814e6f44ea..6c847d1e561f 100644
--- a/sccomp/source/solver/SwarmSolver.cxx
+++ b/sccomp/source/solver/SwarmSolver.cxx
@@ -25,8 +25,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 #include 
 
 #include 
@@ -96,13 +96,12 @@ enum
 
 } // end anonymous namespace
 
-typedef cppu::WeakImplHelper
+typedef comphelper::WeakImplHelper
 SwarmSolver_Base;
 
 namespace
 {
-class SwarmSolver : public comphelper::OMutexAndBroadcastHelper,
-public comphelper::OPropertyContainer,
+class SwarmSolver : public comphelper::OPropertyContainer2,
 public comphelper::OPropertyArrayUsageHelper,
 public SwarmSolver_Base
 {
@@ -138,8 +137,7 @@ private:
 
 public:
 SwarmSolver()
-: OPropertyContainer(GetBroadcastHelper())
-, mbMaximize(true)
+: mbMaximize(true)
 , mbNonNegative(false)
 , mbInteger(false)
 , mnTimeout(6)
@@ -165,10 +163,7 @@ public:
 return createPropertySetInfo(getInfoHelper());
 }
 // OPropertySetHelper
-virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override
-{
-return *getArrayHelper();
-}
+virtual cppu::IPropertyArrayHelper& getInfoHelper() override { return 
*getArrayHelper(); }
 // OPropertyArrayUsageHelper
 virtual cppu::IPropertyArrayHelper* createArrayHelper() const override
 {
@@ -309,8 +304,8 @@ double SwarmSolver::getValue(const table::CellAddress& 
rPosition)
 return getCell(rPosition)->getValue();
 }
 
-IMPLEMENT_FORWARD_XINTERFACE2(SwarmSolver, SwarmSolver_Base, 
OPropertyContainer)
-IMPLEMENT_FORWARD_XTYPEPROVIDER2(SwarmSolver, SwarmSolver_Base, 
OPropertyContainer)
+IMPLEMENT_FORWARD_XINTERFACE2(SwarmSolver, SwarmSolver_Base, 
comphelper::OPropertyContainer2)
+IMPLEMENT_FORWARD_XTYPEPROVIDER2(SwarmSolver, SwarmSolver_Base, 
comphelper::OPropertyContainer2)
 
 void SwarmSolver::applyVariables(std::vector const& rVariables)
 {
commit 8e048c3c572dc02f1161744278d875c9f842574e
Author: Noel Grandin 
AuthorDate: Wed Mar 27 11:19:16 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 29 07:42:23 2024 +0100

convert BasicScriptImplodNodeImpl to comphelper::WeakImplHelper

and remove OBroadcastHelperHolder, since nothing uses it anymore

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

diff --git a/scripting/source/basprov/basmethnode.hxx 
b/scripting/source/basprov/basmethnode.hxx
index 169d06988f62..d50bb663cefa 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include 
 #include 
 #include 
 #include 
diff --git a/scripting/source/basprov/basscript.cxx 
b/scripting/source/basprov/basscript.cxx
index 148d1877d875..fdb6c5d02d44 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -27,7 +27,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -67,9 +66,8 @@ constexpr OUString BASSCRIPT_PROPERTY_CALLER = u"Caller"_ustr;
 
 
 BasicScriptImpl::BasicScriptImpl( OUString funcName, SbMethodRef xMethod )
-: ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
-,OPropertyContainer( GetBroadcastHelper() )
-,m_xMethod(std::move( xMethod ))
+:
+m_xMethod(std::move( xMethod ))
 ,m_funcName(std::move( funcName ))
 ,m_documentBasicManager( nullptr )
 ,m_xDocumentScriptContext()
@@ -79,9 +77,8 @@ constexpr OUString BASSCRIPT_PROPERTY_CALLER = u"Caller"_ustr;
 
 
 BasicScriptImpl::BasicScriptImpl( OUString funcName, SbMethodRef xMethod,
-BasicManager& documentBasicManager, const Reference< 
XScriptInvocationContext >& documentScriptContext ) : 
::scripting_helper::OBroadcastHelperHolder( m_aMutex )
-,OPropertyContainer( GetBroadcastHelper() )
-,m_xMethod(std::move( xMethod 

core.git: 2 commits - basic/source vcl/source

[Noel Grandin (via logerrit)]

 basic/source/inc/namecont.hxx |   11 +--
 basic/source/uno/namecont.cxx |   42 ++
 vcl/source/app/session.cxx|   34 --
 3 files changed, 47 insertions(+), 40 deletions(-)

New commits:
commit 97c791d42f049763b0d3b01b4d2dc75cede9e858
Author: Noel Grandin 
AuthorDate: Wed Mar 27 15:03:03 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 29 07:42:07 2024 +0100

convert VCLSession to comphelper::WeakComponentImplHelper

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

diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index d61902fcf647..3f1ff9cb2f9b 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -21,8 +21,7 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
 #include 
 
 #include 
@@ -52,8 +51,7 @@ SalSession::~SalSession()
 namespace {
 
 class VCLSession:
-private cppu::BaseMutex,
-public cppu::WeakComponentImplHelper < XSessionManagerClient, 
css::lang::XServiceInfo >
+public comphelper::WeakComponentImplHelper < XSessionManagerClient, 
css::lang::XServiceInfo >
 {
 struct Listener
 {
@@ -100,7 +98,7 @@ class VCLSession:
 return {"com.sun.star.frame.SessionManagerClient"};
 }
 
-void SAL_CALL disposing() override;
+void disposing(std::unique_lock& rGuard) override;
 
 void callSaveRequested( bool bShutdown );
 void callShutdownCancelled();
@@ -114,8 +112,7 @@ public:
 }
 
 VCLSession::VCLSession()
-: WeakComponentImplHelper( m_aMutex ),
-  m_xSession( ImplGetSVData()->mpDefInst->CreateSalSession() ),
+: m_xSession( ImplGetSVData()->mpDefInst->CreateSalSession() ),
   m_bInteractionRequested( false ),
   m_bInteractionGranted( false ),
   m_bInteractionDone( false ),
@@ -133,7 +130,7 @@ void VCLSession::callSaveRequested( bool bShutdown )
 
 std::vector< Listener > aListeners;
 {
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
 // reset listener states
 for (auto & listener : m_aListeners) {
 listener.m_bSaveDone = listener.m_bInteractionRequested = 
listener.m_bInteractionDone = false;
@@ -172,7 +169,7 @@ void VCLSession::callInteractionGranted( bool 
bInteractionGranted )
 
 std::vector< Listener > aListeners;
 {
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
 // copy listener vector since calling a listener may remove it.
 for (auto const & listener: m_aListeners)
 if( listener.m_bInteractionRequested )
@@ -204,7 +201,7 @@ void VCLSession::callShutdownCancelled()
 
 std::vector< Listener > aListeners;
 {
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
 // copy listener vector since calling a listener may remove it.
 aListeners = m_aListeners;
 // set back interaction state
@@ -222,7 +219,7 @@ void VCLSession::callQuit()
 
 std::vector< Listener > aListeners;
 {
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
 // copy listener vector since calling a listener may remove it.
 aListeners = m_aListeners;
 // set back interaction state
@@ -274,7 +271,7 @@ void SAL_CALL VCLSession::addSessionManagerListener( const 
css::uno::ReferencecancelShutdown();
 }
 
-void VCLSession::disposing() {
+void VCLSession::disposing(std::unique_lock& rGuard) {
 SAL_INFO("vcl.se", "VCLSession::disposing");
 
 std::vector vector;
 {
-osl::MutexGuard g(m_aMutex);
 vector.swap(m_aListeners);
 }
 css::lang::EventObject src(getXWeak());
 for (auto const & listener: vector) {
+rGuard.unlock();
 try {
 listener.m_xListener->disposing(src);
 SAL_INFO("vcl.se.debug", "  call Listener disposing");
 } catch (css::uno::RuntimeException &) {
 TOOLS_WARN_EXCEPTION("vcl.se", "ignoring");
 }
+rGuard.lock();
 }
 }
 
commit d547ad77555fc0dce5ecf3c55b44f5ce7eade7cd
Author: Noel Grandin 
AuthorDate: Wed Mar 27 14:35:55 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 29 07:41:58 2024 +0100

convert NameContainer to comphelper::WeakImplHelper

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

diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 9973ab94e815..4db38ac881a4 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -51,19 +51,20 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class BasicManager;
 
 namespace basic
 {
-typedef 

core.git: sccomp/source

[Noel Grandin (via logerrit)]

 sccomp/source/solver/SolverComponent.cxx |7 +++
 sccomp/source/solver/SolverComponent.hxx |   11 +--
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 2b7e49aa5d39aefe20933ce1a6851dbe7675e5f1
Author: Noel Grandin 
AuthorDate: Wed Mar 27 11:35:04 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 29 07:42:41 2024 +0100

convert SolverComponent to comphelper::WeakImplHelper

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

diff --git a/sccomp/source/solver/SolverComponent.cxx 
b/sccomp/source/solver/SolverComponent.cxx
index e31a84073337..318a05703944 100644
--- a/sccomp/source/solver/SolverComponent.cxx
+++ b/sccomp/source/solver/SolverComponent.cxx
@@ -89,7 +89,6 @@ double SolverComponent::GetValue( const 
uno::Reference
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -53,14 +53,13 @@ struct ScSolverCellEqual
 
 typedef std::unordered_map< css::table::CellAddress, std::vector, 
ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
 
-typedef cppu::WeakImplHelper<
+typedef comphelper::WeakImplHelper<
 css::sheet::XSolver,
 css::sheet::XSolverDescription,
 css::lang::XServiceInfo >
 SolverComponent_Base;
 
-class SolverComponent : public comphelper::OMutexAndBroadcastHelper,
-public comphelper::OPropertyContainer,
+class SolverComponent : public comphelper::OPropertyContainer2,
 public comphelper::OPropertyArrayUsageHelper< 
SolverComponent >,
 public SolverComponent_Base
 {
@@ -102,7 +101,7 @@ public:
 DECLARE_XTYPEPROVIDER()
 
 virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL 
getPropertySetInfo() override;
-virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;   
  // from OPropertySetHelper
+virtual ::cppu::IPropertyArrayHelper& getInfoHelper() override; // 
from OPropertySetHelper
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;  
  // from OPropertyArrayUsageHelper
 
 // XSolver

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

[Caolán McNamara (via logerrit)]

 sfx2/source/sidebar/SidebarDockingWindow.cxx |  117 +--
 1 file changed, 60 insertions(+), 57 deletions(-)

New commits:
commit 19ed6ec6bfbe1b4730cfb5f878eed63b0781039b
Author: Caolán McNamara 
AuthorDate: Thu Mar 28 11:23:56 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 09:48:54 2024 +0100

null deref of mpSidebarController

follow the pattern used in the rest of this and skip the branch
that depends on mpSidebarController existing

git show -w

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

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 23c3b459c3be..d0edf8066332 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -136,75 +136,78 @@ SfxChildAlignment SidebarDockingWindow::CheckAlignment (
 
 bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
 {
-NotifyEventType nType = rEvent.GetType();
-if (NotifyEventType::KEYINPUT == nType)
+if (mpSidebarController)
 {
-const vcl::KeyCode& rKeyCode = rEvent.GetKeyEvent()->GetKeyCode();
-switch (rKeyCode.GetCode())
+NotifyEventType nType = rEvent.GetType();
+if (NotifyEventType::KEYINPUT == nType)
 {
-case KEY_UP:
-case KEY_DOWN:
-case KEY_PAGEUP:
-case KEY_PAGEDOWN:
-case KEY_HOME:
-case KEY_END:
-case KEY_LEFT:
-case KEY_RIGHT:
-case KEY_BACKSPACE:
-case KEY_DELETE:
-case KEY_INSERT:
-case KEY_RETURN:
-case KEY_ESCAPE:
+const vcl::KeyCode& rKeyCode = rEvent.GetKeyEvent()->GetKeyCode();
+switch (rKeyCode.GetCode())
 {
+case KEY_UP:
+case KEY_DOWN:
+case KEY_PAGEUP:
+case KEY_PAGEDOWN:
+case KEY_HOME:
+case KEY_END:
+case KEY_LEFT:
+case KEY_RIGHT:
+case KEY_BACKSPACE:
+case KEY_DELETE:
+case KEY_INSERT:
+case KEY_RETURN:
+case KEY_ESCAPE:
+{
+return true;
+}
+default:
+break;
+}
+if (!mpAccel)
+{
+mpAccel = svt::AcceleratorExecute::createAcceleratorHelper();
+mpAccel->init(comphelper::getProcessComponentContext(), 
mpSidebarController->getXFrame());
+}
+const OUString 
aCommand(mpAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode)));
+if (".uno:DesignerDialog" == aCommand)
+{
+std::shared_ptr xPanelDescriptor =
+
mpSidebarController->GetResourceManager()->GetPanelDescriptor( 
u"StyleListPanel" );
+if ( xPanelDescriptor && mpSidebarController->IsDeckVisible( 
xPanelDescriptor->msDeckId ) )
+Close();
+return true;
+}
+if (".uno:Undo" == aCommand || ".uno:Redo" == aCommand)
+{
+comphelper::dispatchCommand(aCommand, {});
 return true;
 }
-default:
-break;
-}
-if (!mpAccel)
-{
-mpAccel = svt::AcceleratorExecute::createAcceleratorHelper();
-mpAccel->init(comphelper::getProcessComponentContext(), 
mpSidebarController->getXFrame());
-}
-const OUString 
aCommand(mpAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode)));
-if (".uno:DesignerDialog" == aCommand)
-{
-std::shared_ptr xPanelDescriptor =
-
mpSidebarController->GetResourceManager()->GetPanelDescriptor( 
u"StyleListPanel" );
-if ( xPanelDescriptor && mpSidebarController->IsDeckVisible( 
xPanelDescriptor->msDeckId ) )
-Close();
-return true;
 }
-if (".uno:Undo" == aCommand || ".uno:Redo" == aCommand)
+else if (NotifyEventType::MOUSEBUTTONDOWN == nType)
 {
-comphelper::dispatchCommand(aCommand, {});
-return true;
+const MouseEvent *mEvt = rEvent.GetMouseEvent();
+if (mEvt->IsLeft())
+{
+tools::Rectangle aGrip = 
mpSidebarController->GetDeckDragArea();
+if ( aGrip.Contains( mEvt->GetPosPixel() ) )
+mbIsReadyToDrag = true;
+}
 }
-}
-else if (NotifyEventType::MOUSEBUTTONDOWN == nType)
-{
-const MouseEvent *mEvt = rEvent.GetMouseEvent();
-if (mEvt->IsLeft())
+   

core.git: include/svl sc/inc sc/source svl/source

[Caolán McNamara (via logerrit)]

 include/svl/nfengine.hxx   |   28 +++--
 include/svl/numformat.hxx  |2 
 sc/inc/interpretercontext.hxx  |7 +
 sc/source/core/data/document.cxx   |1 
 sc/source/core/tool/interpretercontext.cxx |   15 ++
 svl/source/numbers/zforlist.cxx|  162 ++---
 6 files changed, 148 insertions(+), 67 deletions(-)

New commits:
commit e8e0a3b1d7e706330ca343cf9dd5ba062e9ff0c4
Author: Caolán McNamara 
AuthorDate: Thu Mar 28 09:55:06 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 09:51:12 2024 +0100

crashtesting: fix SvNFEngine::CacheFormatRO assert

since:

commit c6c6126aa3e8de256091b829b98b5943db6a8be6
Author: Caolán McNamara 
Date:   Thu Mar 21 17:25:35 2024 +

Related: tdf#160056 refactor SvNumberFormatter

to split it into two constituent parts

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

diff --git a/include/svl/nfengine.hxx b/include/svl/nfengine.hxx
index a4890e074d1a..c0b463c189f3 100644
--- a/include/svl/nfengine.hxx
+++ b/include/svl/nfengine.hxx
@@ -159,10 +159,12 @@ private:
 
 class SVL_DLLPUBLIC SvNFFormatData
 {
+public:
+typedef std::map DefaultFormatKeysMap;
+
 private:
 typedef std::map> 
FormatEntryMap;
 FormatEntryMap aFTable; // Table of format keys to format entries
-typedef std::map DefaultFormatKeysMap;
 DefaultFormatKeysMap aDefaultFormatKeys; // Table of default standard to 
format keys
 sal_uInt32 MaxCLOffset; // Max language/country offset used
 sal_uInt32 nDefaultSystemCurrencyFormat; // NewCurrency matching SYSTEM 
locale
@@ -190,6 +192,8 @@ public:
 bool GetNewCurrencySymbolString(sal_uInt32 nFormat, OUString& rSymbol,
 const NfCurrencyEntry** ppEntry, bool* 
pBank = nullptr) const;
 
+void MergeDefaultFormatKeys(const DefaultFormatKeysMap& 
rDefaultFormatKeys);
+
 private:
 SvNFFormatData(const SvNFFormatData&) = delete;
 SvNFFormatData& operator=(const SvNFFormatData&) = delete;
@@ -262,8 +266,7 @@ private:
 SVL_DLLPRIVATE sal_uInt32 
ImpGetDefaultSystemCurrencyFormat(SvNFLanguageData& rCurrentLanguage,
 const 
NativeNumberWrapper* pNatNum);
 
-SVL_DLLPRIVATE std::pair
-ImpGetDefaultFormat(SvNumFormatType nType, sal_uInt32 nSearch, sal_uInt32 
CLOffset) const;
+SVL_DLLPRIVATE sal_uInt32 FindCachedDefaultFormat(sal_uInt32 nSearch) 
const;
 
 SVL_DLLPRIVATE static sal_Int32
 ImpGetFormatCodeIndex(const SvNFLanguageData& rCurrentLanguage,
@@ -282,6 +285,7 @@ public:
  const NativeNumberWrapper* pNatNum, 
LanguageType eLnge)>
 GetCLOffset;
 typedef std::function 
CacheFormat;
+typedef std::function FindFormat;
 
 typedef std::function mxLanguageData;
+// FormatData can be driven read-only, but may want to cache some data,
+// in RO Mode we can cache per thread to mxAuxFormatKeyMap, and
+// discard or merge after threaded calculation is over
+std::unique_ptr mxAuxFormatKeyMap;
+
 const SvNFFormatData* mpFormatData;
 SvNFEngine::Accessor maROPolicy;
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 04370b62117f..e87d100b36da 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6929,6 +6929,7 @@ void 
ScDocument::MergeContextBackIntoNonThreadedContext(ScInterpreterContext& th
 
std::make_move_iterator(threadedContext.maDelayedSetNumberFormat.begin()),
 
std::make_move_iterator(threadedContext.maDelayedSetNumberFormat.end()));
 // lookup cache is now only in pooled ScInterpreterContext's
+threadedContext.MergeDefaultFormatKeys(*GetFormatTable());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/interpretercontext.cxx 
b/sc/source/core/tool/interpretercontext.cxx
index f4fde3725414..e1fc5fb24252 100644
--- a/sc/source/core/tool/interpretercontext.cxx
+++ b/sc/source/core/tool/interpretercontext.cxx
@@ -46,8 +46,9 @@ ScInterpreterContext::ScInterpreterContext(const ScDocument& 
rDoc, SvNumberForma
 else
 {
 mxLanguageData.reset(new 
SvNFLanguageData(pFormatter->GetROLanguageData()));
+mxAuxFormatKeyMap.reset(new SvNFFormatData::DefaultFormatKeysMap);
 mpFormatData = >GetROFormatData();
-maROPolicy = SvNFEngine::GetROPolicy(*mpFormatData);
+maROPolicy = SvNFEngine::GetROPolicy(*mpFormatData, 
*mxAuxFormatKeyMap);
 }
 }
 
@@ -74,8 +75,9 @@ void ScInterpreterContext::SetDocAndFormatter(const 
ScDocument& rDoc, SvNumberFo
 {
 // formatter has changed
 mxLanguageData.reset(new 
SvNFLanguageData(pFormatter->GetROLanguageData()));
+

Re: error: this member function can be declared static [loplugin:staticmethods] when adding a event function in a dialog

[Caolán McNamara]

On Fri, 2024-03-29 at 09:07 +0100, Heiko Tietze wrote:
> On 28.03.24 6:09 PM, Caolán McNamara wrote:
> > On Fri, 2024-03-29 at 00:16 +0800, Sakura286 wrote:
> > > 
> > > https://gerrit.libreoffice.org/c/core/+/165391
> > 
> > You might want DECL_STATIC_LINK instead of DECL_LINK. The matching
> > IMPL_LINK then needs to be IMPL_STATIC_LINK etc.
> 
> Curious to learn why this needs to be static. What makes the one
> button different from the other?

Nothing special about the button itself, it's the content of the
function that has triggered the warning. The plugin has just detected
that the function doesn't actually use anything from an instance of the
class it is a member of, so the function could be static, not need the
implicit "this" passed as an argument which frees up a register and can
potentially be that tiny little bit more optimized. And/or make it
clearer to the reader that calling it will only have an effect on the
passed-in arg and not an effect on any specific object. These are our
own clang plugins, so this isn't a C++ requirement of any kind, just
our extra stylistic rules.

Taking
https://cgit.freedesktop.org/libreoffice/core/tree/sfx2/source/appl/sfxhelp.cxx#n91
if HelpRequestHdl did something like
m_xErrBox->set_primary_text("hello world")
then HelpRequestHdl couldn't be a static and we would use DECL_LINK and
IMPL_LINK instead, and
m_xErrBox->connect_help(LINK(nullptr, NoHelpErrorBox, HelpRequestHdl));
would instead have to be
m_xErrBox->connect_help(LINK(this, NoHelpErrorBox, HelpRequestHdl));

and vice versa if the code was like this already, and someone dropped
the m_xErrBox->set_primary_text("hello world") line then the plugin
would begin to warn that it could be static instead

Pradyumn R Pai license statement

[Pradyumn Pai]

   All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

core.git: vcl/win

[Mike Kaganski (via logerrit)]

 vcl/win/gdi/DWriteTextRenderer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 20b0ea97b047fb57ceb8afb39bdcf5a428f8f691
Author: Mike Kaganski 
AuthorDate: Fri Mar 29 07:18:02 2024 +0100
Commit: Mike Kaganski 
CommitDate: Fri Mar 29 08:28:17 2024 +0100

Avoid bitwise assignment operators on bool

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

diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx 
b/vcl/win/gdi/DWriteTextRenderer.cxx
index 3d3dac83c6dd..1d5985dfceac 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -230,7 +230,7 @@ bool 
D2DWriteTextOutRenderer::performRender(GenericSalLayout const & rLayout, Sa
 if (succeeded)
 {
 hr = BindDC(hDC, bounds);   // Update the bounding rect.
-succeeded &= SUCCEEDED(hr);
+succeeded = SUCCEEDED(hr);
 }
 
 ID2D1SolidColorBrush* pBrush = nullptr;
@@ -238,7 +238,7 @@ bool 
D2DWriteTextOutRenderer::performRender(GenericSalLayout const & rLayout, Sa
 {
 COLORREF bgrTextColor = GetTextColor(hDC);
 D2D1::ColorF aD2DColor(GetRValue(bgrTextColor) / 255.0f, 
GetGValue(bgrTextColor) / 255.0f, GetBValue(bgrTextColor) / 255.0f);
-succeeded &= SUCCEEDED(CHECKHR(mpRT->CreateSolidColorBrush(aD2DColor, 
)));
+succeeded = SUCCEEDED(CHECKHR(mpRT->CreateSolidColorBrush(aD2DColor, 
)));
 }
 
 if (succeeded)

Re: error: this member function can be declared static [loplugin:staticmethods] when adding a event function in a dialog

[Heiko Tietze]

On 28.03.24 6:09 PM, Caolán McNamara wrote:

On Fri, 2024-03-29 at 00:16 +0800, Sakura286 wrote:


https://gerrit.libreoffice.org/c/core/+/165391


You might want DECL_STATIC_LINK instead of DECL_LINK. The matching
IMPL_LINK then needs to be IMPL_STATIC_LINK etc.


Curious to learn why this needs to be static. What makes the one button 
different from the other?


OpenPGP_signature.asc
Description: OpenPGP digital signature

core.git: vcl/win

[Mike Kaganski (via logerrit)]

 vcl/win/gdi/DWriteTextRenderer.cxx |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 40176bd39c94c32ac0269d9994e8e50518d84467
Author: Mike Kaganski 
AuthorDate: Fri Mar 29 07:57:36 2024 +0100
Commit: Mike Kaganski 
CommitDate: Fri Mar 29 09:30:22 2024 +0100

Simplify a bit

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

diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx 
b/vcl/win/gdi/DWriteTextRenderer.cxx
index 1d5985dfceac..bb0f7e6b7661 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -79,19 +79,15 @@ IDWriteRenderingParams* lclSetRenderingMode(IDWriteFactory* 
pDWriteFactory, DWRI
 }
 
 #ifdef SAL_LOG_WARN
-HRESULT checkResult(HRESULT hr, const char* file, size_t line)
+HRESULT checkResult(HRESULT hr, const char* location)
 {
-if (FAILED(hr))
-{
-OUString sLocationString = OUString::createFromAscii(file) + ":" + 
OUString::number(line) + " ";
-SAL_DETAIL_LOG_STREAM(SAL_DETAIL_ENABLE_LOG_WARN, 
::SAL_DETAIL_LOG_LEVEL_WARN,
-  "vcl.gdi", sLocationString.toUtf8().getStr(),
-  "HRESULT failed with: 0x" << 
OUString::number(hr, 16) << ": " << WindowsErrorStringFromHRESULT(hr));
-}
+SAL_DETAIL_LOG_STREAM(SAL_DETAIL_ENABLE_LOG_WARN && FAILED(hr), 
::SAL_DETAIL_LOG_LEVEL_WARN,
+  "vcl.gdi", location,
+  "HRESULT failed with: 0x" << OUString::number(hr, 
16) << ": " << WindowsErrorStringFromHRESULT(hr));
 return hr;
 }
 
-#define CHECKHR(funct) checkResult(funct, __FILE__, __LINE__)
+#define CHECKHR(funct) checkResult(funct, SAL_WHERE)
 #else
 #define CHECKHR(funct) (funct)
 #endif

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

[Caolán McNamara (via logerrit)]

 sfx2/source/sidebar/SidebarDockingWindow.cxx |  117 +--
 1 file changed, 60 insertions(+), 57 deletions(-)

New commits:
commit b733daec2f03078d9c2df833d5758426885d9963
Author: Caolán McNamara 
AuthorDate: Thu Mar 28 11:23:56 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 09:48:23 2024 +0100

null deref of mpSidebarController

follow the pattern used in the rest of this and skip the branch
that depends on mpSidebarController existing

git show -w

Change-Id: I739754b2af7ad09fa80c36693d8adbf173ece2e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165459
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 23c3b459c3be..d0edf8066332 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -136,75 +136,78 @@ SfxChildAlignment SidebarDockingWindow::CheckAlignment (
 
 bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
 {
-NotifyEventType nType = rEvent.GetType();
-if (NotifyEventType::KEYINPUT == nType)
+if (mpSidebarController)
 {
-const vcl::KeyCode& rKeyCode = rEvent.GetKeyEvent()->GetKeyCode();
-switch (rKeyCode.GetCode())
+NotifyEventType nType = rEvent.GetType();
+if (NotifyEventType::KEYINPUT == nType)
 {
-case KEY_UP:
-case KEY_DOWN:
-case KEY_PAGEUP:
-case KEY_PAGEDOWN:
-case KEY_HOME:
-case KEY_END:
-case KEY_LEFT:
-case KEY_RIGHT:
-case KEY_BACKSPACE:
-case KEY_DELETE:
-case KEY_INSERT:
-case KEY_RETURN:
-case KEY_ESCAPE:
+const vcl::KeyCode& rKeyCode = rEvent.GetKeyEvent()->GetKeyCode();
+switch (rKeyCode.GetCode())
 {
+case KEY_UP:
+case KEY_DOWN:
+case KEY_PAGEUP:
+case KEY_PAGEDOWN:
+case KEY_HOME:
+case KEY_END:
+case KEY_LEFT:
+case KEY_RIGHT:
+case KEY_BACKSPACE:
+case KEY_DELETE:
+case KEY_INSERT:
+case KEY_RETURN:
+case KEY_ESCAPE:
+{
+return true;
+}
+default:
+break;
+}
+if (!mpAccel)
+{
+mpAccel = svt::AcceleratorExecute::createAcceleratorHelper();
+mpAccel->init(comphelper::getProcessComponentContext(), 
mpSidebarController->getXFrame());
+}
+const OUString 
aCommand(mpAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode)));
+if (".uno:DesignerDialog" == aCommand)
+{
+std::shared_ptr xPanelDescriptor =
+
mpSidebarController->GetResourceManager()->GetPanelDescriptor( 
u"StyleListPanel" );
+if ( xPanelDescriptor && mpSidebarController->IsDeckVisible( 
xPanelDescriptor->msDeckId ) )
+Close();
+return true;
+}
+if (".uno:Undo" == aCommand || ".uno:Redo" == aCommand)
+{
+comphelper::dispatchCommand(aCommand, {});
 return true;
 }
-default:
-break;
-}
-if (!mpAccel)
-{
-mpAccel = svt::AcceleratorExecute::createAcceleratorHelper();
-mpAccel->init(comphelper::getProcessComponentContext(), 
mpSidebarController->getXFrame());
-}
-const OUString 
aCommand(mpAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode)));
-if (".uno:DesignerDialog" == aCommand)
-{
-std::shared_ptr xPanelDescriptor =
-
mpSidebarController->GetResourceManager()->GetPanelDescriptor( 
u"StyleListPanel" );
-if ( xPanelDescriptor && mpSidebarController->IsDeckVisible( 
xPanelDescriptor->msDeckId ) )
-Close();
-return true;
 }
-if (".uno:Undo" == aCommand || ".uno:Redo" == aCommand)
+else if (NotifyEventType::MOUSEBUTTONDOWN == nType)
 {
-comphelper::dispatchCommand(aCommand, {});
-return true;
+const MouseEvent *mEvt = rEvent.GetMouseEvent();
+if (mEvt->IsLeft())
+{
+tools::Rectangle aGrip = 
mpSidebarController->GetDeckDragArea();
+if ( aGrip.Contains( mEvt->GetPosPixel() ) )
+mbIsReadyToDrag = true;
+}
 }
-}
-else if (NotifyEventType::MOUSEBUTTONDOWN == nType)
-{
-const MouseEvent *mEvt = rEvent.GetMouseEvent();
-if (mEvt->IsLeft())
+

core.git: Branch 'distro/cib/libreoffice-6-4' - xmloff/source

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/eventimp.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 403d76ad70d2f3ea5f10b11aa8881db9f32b192b
Author: Caolán McNamara 
AuthorDate: Wed Mar 27 17:07:20 2024 +
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 15:36:40 2024 +0100

add notify for script use

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

diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index f9e10c11cf7d..fcc36f946ff1 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -231,6 +231,9 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  
sal_uInt16 nPrfx, cons
 
 if( maData.mbValid )
 maData.mbValid = !sEventName.isEmpty();
+
+if (!maData.msMacroName.isEmpty())
+rImp.NotifyMacroEventRead();
 }
 
 SvXMLImportContextRef SdXMLEventContext::CreateChildContext( sal_uInt16 
nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& 
xAttrList )

core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - xmloff/source

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/eventimp.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8c58736107413ed28149c37d3ac7d27c95294479
Author: Caolán McNamara 
AuthorDate: Wed Mar 27 17:07:20 2024 +
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 15:36:01 2024 +0100

add notify for script use

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

diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index f9e10c11cf7d..fcc36f946ff1 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -231,6 +231,9 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  
sal_uInt16 nPrfx, cons
 
 if( maData.mbValid )
 maData.mbValid = !sEventName.isEmpty();
+
+if (!maData.msMacroName.isEmpty())
+rImp.NotifyMacroEventRead();
 }
 
 SvXMLImportContextRef SdXMLEventContext::CreateChildContext( sal_uInt16 
nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& 
xAttrList )

core.git: Branch 'distro/allotropia/zeta-7-4' - xmloff/source

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/eventimp.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fe1b86e771242812d8ca691d50b2042541e2e163
Author: Caolán McNamara 
AuthorDate: Wed Mar 27 17:07:20 2024 +
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 15:49:26 2024 +0100

add notify for script use

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

diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 29fc94fda272..3461b4495ff8 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -211,6 +211,9 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,
 
 if( maData.mbValid )
 maData.mbValid = !sEventName.isEmpty();
+
+if (!maData.msMacroName.isEmpty())
+rImp.NotifyMacroEventRead();
 }
 
 css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLEventContext::createFastChildContext(

core.git: sw/source

[wilmhit (via logerrit)]

 sw/source/ui/dbui/addresslistdialog.hxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b4134d3554711bfb1c05e8f36f9f4b5bc52aec3f
Author: wilmhit 
AuthorDate: Sun Mar 17 16:38:43 2024 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Fri Mar 29 14:08:29 2024 +0100

tdf#143148: Use pragma once in dbui addresslistdialog

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

diff --git a/sw/source/ui/dbui/addresslistdialog.hxx 
b/sw/source/ui/dbui/addresslistdialog.hxx
index dc0873af000e..6669ad06509e 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -16,8 +16,7 @@
  *   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_SW_SOURCE_UI_DBUI_ADDRESSLISTDIALOG_HXX
-#define INCLUDED_SW_SOURCE_UI_DBUI_ADDRESSLISTDIALOG_HXX
+#pragma once
 
 #include 
 #include 
@@ -96,6 +95,5 @@ public:
 const SwDBData& GetDBData() const   {return m_aDBData;}
 OUString GetFilter() const;
 };
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

core.git: svx/inc svx/source svx/uiconfig

[Gabor Kelemen (via logerrit)]

 svx/inc/helpids.h |5 -
 svx/source/gallery2/galbrws1.cxx  |8 
 svx/source/gallery2/galctrl.cxx   |5 -
 svx/uiconfig/ui/sidebargallery.ui |   25 +++--
 4 files changed, 23 insertions(+), 20 deletions(-)

New commits:
commit 69a8adcc76de2d827d109d2c66e1d0c64a1e6a52
Author: Gabor Kelemen 
AuthorDate: Mon Mar 18 08:43:41 2024 +0100
Commit: Gabor Kelemen 
CommitDate: Fri Mar 29 14:26:47 2024 +0100

Use default HIDs in Gallery, simplify code

and copy relevant help texts from helpcontent to .ui file

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

diff --git a/svx/inc/helpids.h b/svx/inc/helpids.h
index 30e12062db47..01ca23ff058f 100644
--- a/svx/inc/helpids.h
+++ b/svx/inc/helpids.h
@@ -27,11 +27,6 @@ inline constexpr OUString HID_CTRL3D_HSCROLL = 
u"SVX_HID_CTRL3D_HSCROLL"_ustr;
 inline constexpr OUString HID_CTRL3D_SWITCHER = 
u"SVX_HID_CTRL3D_SWITCHER"_ustr;
 inline constexpr OUString HID_CTRL3D_VSCROLL = u"SVX_HID_CTRL3D_VSCROLL"_ustr;
 inline constexpr OUString HID_CTRL_COLOR = u"SVX_HID_CTRL_COLOR"_ustr;
-inline constexpr OUString HID_GALLERY_ICONVIEW = 
u"SVX_HID_GALLERY_ICONVIEW"_ustr;
-inline constexpr OUString HID_GALLERY_LISTVIEW = 
u"SVX_HID_GALLERY_LISTVIEW"_ustr;
-inline constexpr OUString HID_GALLERY_NEWTHEME = 
u"SVX_HID_GALLERY_NEWTHEME"_ustr;
-inline constexpr OUString HID_GALLERY_THEMELIST = 
u"SVX_HID_GALLERY_THEMELIST"_ustr;
-inline constexpr OUString HID_GALLERY_WINDOW = u"SVX_HID_GALLERY_WINDOW"_ustr;
 inline constexpr OUString HID_POPUP_COLOR = u"SVX_HID_POPUP_COLOR"_ustr;
 inline constexpr OUString HID_POPUP_COLOR_CTRL = 
u"SVX_HID_POPUP_COLOR_CTRL"_ustr;
 inline constexpr OUString HID_POPUP_FRAME = u"SVX_HID_POPUP_FRAME"_ustr;
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 443d9be4adec..18c2dae8e39a 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -148,11 +147,9 @@ GalleryBrowser1::GalleryBrowser1(
 , meLastMode  ( GALLERYBROWSERMODE_NONE )
 , m_aCharacterClassficator( ::comphelper::getProcessComponentContext(), 
SvtSysLocale().GetLanguageTag() )
 {
-mxNewTheme->set_help_id(HID_GALLERY_NEWTHEME);
 mxNewTheme->connect_clicked( LINK( this, GalleryBrowser1, ClickNewThemeHdl 
) );
 
 mxThemes->make_sorted();
-mxThemes->set_help_id( HID_GALLERY_THEMELIST );
 mxThemes->connect_changed( LINK( this, GalleryBrowser1, SelectThemeHdl ) );
 mxThemes->connect_popup_menu(LINK(this, GalleryBrowser1, PopupMenuHdl1));
 mxThemes->connect_key_press(LINK(this, GalleryBrowser1, KeyInputHdl1));
@@ -180,9 +177,6 @@ GalleryBrowser1::GalleryBrowser1(
 "com.sun.star.util.URLTransformer", m_xContext ),
 css::uno::UNO_QUERY );
 
-mxIconButton->set_help_id(HID_GALLERY_ICONVIEW);
-mxListButton->set_help_id(HID_GALLERY_LISTVIEW);
-
 mxIconButton->connect_toggled( LINK( this, GalleryBrowser1, SelectTbxHdl ) 
);
 mxListButton->connect_toggled( LINK( this, GalleryBrowser1, SelectTbxHdl ) 
);
 
@@ -197,8 +191,6 @@ GalleryBrowser1::GalleryBrowser1(
 mxListView->connect_drag_begin(LINK(this, GalleryBrowser1, DragBeginHdl));
 mxSearchField->connect_changed( LINK( this, GalleryBrowser1, SearchHdl));
 
-mxListView->set_help_id(HID_GALLERY_WINDOW);
-
 SetMode( ( GALLERYBROWSERMODE_PREVIEW != GalleryBrowser1::meInitMode ) ? 
GalleryBrowser1::meInitMode : GALLERYBROWSERMODE_ICON );
 
 FillThemeEntries();
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 05b64117577e..b753dbfac069 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -66,8 +65,6 @@ void GalleryPreview::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
 SetOutputSizePixel(aSize);
 
-pDrawingArea->set_help_id(HID_GALLERY_WINDOW);
-
 mxDragDropTargetHelper.reset(new GalleryDragDrop(mpParent, 
pDrawingArea->get_drop_target()));
 }
 
@@ -227,7 +224,6 @@ void 
DialogGalleryPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 CustomWidgetController::SetDrawingArea(pDrawingArea);
 Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(70, 88), 
MapMode(MapUnit::MapAppFont)));
 pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
-pDrawingArea->set_help_id(HID_GALLERY_WINDOW);
 }
 
 bool DialogGalleryPreview::SetGraphic( const INetURLObject& _aURL )
@@ -302,7 +298,6 @@ void GalleryIconView::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 SetStyle(GetStyle() | WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_ITEMBORDER 

core.git: Branch 'feature/cib_contract49' - helpcontent2

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 48d80d8b755e231727d78ec53eaefb70ce1a7dad
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 14:44:40 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Mar 29 14:44:40 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'feature/cib_contract49'
  to 65a33b1caa2bd9b6a2ed5f95a1ddc6d2a49256a2
  - Merge tag 'libreoffice-7.6.6.3' into HEAD

Tag libreoffice-7.6.6.3

Change-Id: I14323f906d0a1af6b349c6e489699bde74a3c58f

  - Version 7.6.6.3, tag libreoffice-7.6.6.3

Change-Id: Icb8a0d1d5599e492f50d3253b6ed49b0bcc51ade

  - Branch libreoffice-7-6-6

This is 'libreoffice-7-6-6' - the stable branch for the 7.6.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I192d0b205e01ef02bd253118f8fb3276634b8b19

diff --git a/helpcontent2 b/helpcontent2
index cfa40f1e278a..65a33b1caa2b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cfa40f1e278a0403264c5e496f3c0b79b7bf2aa4
+Subproject commit 65a33b1caa2bd9b6a2ed5f95a1ddc6d2a49256a2

help.git: Changes to 'feature/cib_contract49'

[Thorsten Behrens (via logerrit)]

New branch 'feature/cib_contract49' available with the following commits:
commit 65a33b1caa2bd9b6a2ed5f95a1ddc6d2a49256a2
Merge: cfa40f1e27 39b9f1ce4d
Author: Thorsten Behrens 
Date:   Fri Mar 29 14:42:06 2024 +0100

Merge tag 'libreoffice-7.6.6.3' into HEAD

Tag libreoffice-7.6.6.3

Change-Id: I14323f906d0a1af6b349c6e489699bde74a3c58f

translations.git: Branch 'feature/cib_contract49' - 28 commits - source/ab source/af source/am source/an source/ar source/as source/ast source/az source/be source/bg source/bn source/bn-IN source/bo s

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit 11bb4c5da1e34fa087cad36d40dd964560d8e07b
Author: Thorsten Behrens 
AuthorDate: Sat Feb 24 21:32:35 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 14:53:06 2024 +0100

Update DE translations

* remove duplicate entries from presentation dlg
* add a few more missing strings
* fix two typos

Change-Id: Iaf4183a2ec477940d5a4d71c765ac6400d69ae5e

diff --git a/source/de/cui/messages.po b/source/de/cui/messages.po
index 3973f2c8a08..a206041d38e 100644
--- a/source/de/cui/messages.po
+++ b/source/de/cui/messages.po
@@ -19638,7 +19638,7 @@ msgstr "Daten zur Änderungsverfolgung beibehalten"
 #. sVYE5
 #: cui/uiconfig/ui/securityoptionsdialog.ui:433
 msgctxt "securityoptionsdialog|docproperties"
-msgid "Keep document user information"
+msgid "Keep document user informations"
 msgstr "Benutzerdefinierte Informationen am Dokument beibehalten"
 
 #. UVEPx
diff --git a/source/de/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/de/officecfg/registry/data/org/openoffice/Office/UI.po
index 416fb0200be..918180f9bee 100644
--- a/source/de/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/de/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -1,11 +1,26 @@
-#. extracted from officecfg/registry/data/org/openoffice/Office/UI
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
-"Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
-"POT-Creation-Date: 2023-06-19 12:46+0200
"
-"PO-Revision-Date: 2024-03-05 10:37+
"
-"Last-Translator: Christian Kühl 
"
+"PO-Revision-Date: 2024-03-29 14:52+0100
"
+"Last-Translator: FULL NAME 
"
+"Language-Team: LANGUAGE 
"
+"MIME-Version: 1.0
"
+"Content-Type: text/plain; charset=CHARSET
"
+"Content-Transfer-Encoding: 8bit
"
+
+#~ #. extracted from officecfg/registry/data/org/openoffice/Office/UI
+#~ msgid ""
+#~ msgstr ""
+#~ "Project-Id-Version: PACKAGE VERSION
"
+#~ "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
+#~ "POT-Creation-Date: 2023-06-19 12:46+0200
"
+"PO-Revision-Date: 2024-02-24 21:23+0100
"
+"Last-Translator: Annabelle Wübbelsmann 
"
 "Language-Team: German 

"
 "Language: de
"
 "MIME-Version: 1.0
"
@@ -8096,6 +8111,16 @@ msgctxt ""
 msgid "S~lide"
 msgstr "Fol~ie"
 
+#. zciFf
+#: DrawImpressCommands.xcu
+msgctxt ""
+"DrawImpressCommands.xcu
"
+"..DrawImpressCommands.UserInterface.Commands..uno:NotesChildWindow
"
+"Label
"
+"value.text"
+msgid "Notes Panel"
+msgstr "Notizenbereich"
+
 #. q5YwD
 #: DrawImpressCommands.xcu
 msgctxt ""
diff --git a/source/de/sd/messages.po b/source/de/sd/messages.po
index e0582a2b1ba..cb7c65395b7 100644
--- a/source/de/sd/messages.po
+++ b/source/de/sd/messages.po
@@ -19,7 +19,7 @@ msgstr ""
 #~ "Project-Id-Version: PACKAGE VERSION
"
 #~ "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI
"
 "POT-Creation-Date: 2023-05-31 16:29+0200
"
-"PO-Revision-Date: 2024-02-24 15:13+0100
"
+"PO-Revision-Date: 2024-02-24 21:38+0100
"
 "Last-Translator: Christian Kühl 
"
 "Language-Team: German 

"
 "Language: de
"
@@ -2161,6 +2161,12 @@ msgctxt "STR_PRESOBJ_NOTESTEXT"
 msgid "Click to add Notes"
 msgstr "Notizen durch Klicken hinzufügen"
 
+#. EdPZC
+#: sd/inc/strings.hrc:292
+msgctxt "STR_PRESOBJ_NOTESTEXT_MISSING"
+msgid "Notes placeholder object is missing for the current slide."
+msgstr "Notizen-Platzhalterobjekt fehlt auf aktueller Folie"
+
 #. js2X9
 #: sd/inc/strings.hrc:318
 msgctxt "STR_PRESOBJ_TITLE_MOBILE"
@@ -8555,7 +8561,7 @@ msgstr "P_räsentationsanzeige:"
 #: sd/uiconfig/simpress/ui/presentationdialog.ui:316
 msgctxt "presentationdialog|console_cb"
 msgid "Full screen"
-msgstr "Vollbildmodus"
+msgstr "Vollbild"
 
 #. 4k2RM
 #: sd/uiconfig/simpress/ui/presentationdialog.ui:317
@@ -8767,22 +8773,6 @@ msgctxt "presentationdialog|shownavigationbutton"
 msgid "Show navigation panel"
 msgstr "Navigationsbereich anzeigen"
 
-msgctxt "presentationdialog|console_label"
-msgid "Presenter console:"
-msgstr "Presenter-Konsole:"
-
-msgctxt "presentationdialog|console_cb"
-msgid "Full screen"
-msgstr "Vollbild"
-
-msgctxt "presentationdialog|console_cb"
-msgid "Windowed"
-msgstr "Im Fenster"
-
-msgctxt "presentationdialog|console_cb"
-msgid "Disabled"
-msgstr "Deaktiviert"
-
 #. PoTBC
 #: sd/uiconfig/simpress/ui/presentationdialog.ui:674
 msgctxt "presentationdialog|extended_tip|shownavigationbutton"
diff --git a/source/de/svtools/messages.po b/source/de/svtools/messages.po
index 9c5574494c2..f6e011501d5 100644
--- 

core.git: oox/source

[Aaron Bourdeaux (via logerrit)]

 oox/source/drawingml/customshapeproperties.cxx |2 +-
 oox/source/helper/propertymap.cxx  |2 +-
 oox/source/shape/WpsContext.cxx|8 
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6c358c28c5cc2d1d8d8bb9d1238e3546a9bf3ce8
Author: Aaron Bourdeaux 
AuthorDate: Thu Mar 28 14:32:45 2024 -0400
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Mar 29 14:58:23 2024 +0100

tdf#158237 Use C++20 contains() instead of find() and end()

Change-Id: I529096d97991a89bdc68ec7f5d490ec21744fc6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165499
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 862ffd8624a3..a3e2dd5e10bb 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -111,7 +111,7 @@ void CustomShapeProperties::pushToPropSet(
 PropertyMap aPropertyMap;
 PropertySet aPropSet( xPropSet );
 
-if (maPresetDataMap.find(mnShapePresetType) != maPresetDataMap.end())
+if (maPresetDataMap.contains(mnShapePresetType))
 {
 SAL_INFO(
 "oox.drawingml",
diff --git a/oox/source/helper/propertymap.cxx 
b/oox/source/helper/propertymap.cxx
index d5a89e6f2388..d93fb41209bf 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -171,7 +171,7 @@ Property SAL_CALL GenericPropertySet::getPropertyByName( 
const OUString& rProper
 
 sal_Bool SAL_CALL GenericPropertySet::hasPropertyByName( const OUString& 
rPropertyName )
 {
-return maPropMap.find( rPropertyName ) != maPropMap.end();
+return maPropMap.contains(rPropertyName);
 }
 
 } // namespace
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 6d7b3d117fc4..37c58d25029e 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -203,7 +203,7 @@ void lcl_getFillDetailsFromPropSeq(const 
uno::Sequence& rT
 if (!rTextFillSeq.hasElements())
 return;
 comphelper::SequenceAsHashMap aTextFillMap(rTextFillSeq);
-if (aTextFillMap.find(u"noFill"_ustr) != aTextFillMap.end())
+if (aTextFillMap.contains(u"noFill"_ustr))
 {
 rFillProperties.moFillType = oox::XML_noFill;
 return;
@@ -308,11 +308,11 @@ void lcl_getLineDetailsFromPropSeq(const 
uno::Sequence& rT
 
 // LineJoint
 comphelper::SequenceAsHashMap aTextOutlineMap(rTextOutlineSeq);
-if (aTextOutlineMap.find(u"bevel"_ustr) != aTextOutlineMap.end())
+if (aTextOutlineMap.contains(u"bevel"_ustr))
 rLineProperties.moLineJoint = oox::XML_bevel;
-else if (aTextOutlineMap.find(u"round"_ustr) != aTextOutlineMap.end())
+else if (aTextOutlineMap.contains(u"round"_ustr))
 rLineProperties.moLineJoint = oox::XML_round;
-else if (aTextOutlineMap.find(u"miter"_ustr) != aTextOutlineMap.end())
+else if (aTextOutlineMap.contains(u"miter"_ustr))
 {
 // LineProperties has no member to store a miter limit. Therefore some 
heuristic is
 // added here. 0 is default for attribute "lim" in MS Office. It is 
rendered same as bevel.

core.git: Branch 'feature/cib_contract49' - translations

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 96214ca7aed537655b3b9e2a10fbcc0077d3e046
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 14:57:50 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Mar 29 14:57:50 2024 +0100

Update git submodules

* Update translations from branch 'feature/cib_contract49'
  to 11bb4c5da1e34fa087cad36d40dd964560d8e07b
  - Update DE translations

* remove duplicate entries from presentation dlg
* add a few more missing strings
* fix two typos

Change-Id: Iaf4183a2ec477940d5a4d71c765ac6400d69ae5e

  - Update DE translations

Change-Id: Ibcf9c09d2413c4931697449619e7a8fbe6940016

  - Version 7.6.5.2, tag libreoffice-7.6.5.2-hotfix1

Change-Id: I96cd6667819e3ff617ab7c7cb7fdc4a17562ec47

  - Version 7.6.5.2, tag libreoffice-7.6.5.2

Change-Id: Iee78b7547cfa59d396438242a20716813ba8814b

  - Branch libreoffice-7-6-5

This is 'libreoffice-7-6-5' - the stable branch for the 7.6.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I83e01542d7224395619e60cc69d0eb7b248b3303

  - Better translation for hidden info warndialog

Change-Id: Ia873da1405f9c7f6b72d940585c9f1633498ba10

  - Adjust tooltip translations

Change-Id: I8c0d78f554ff5ca6bd8441506a2f270c9f9f8e6e

  - Add missing fr translations

Follow-up to 79f9243e81eda3ab113d75538686ab81770c2c5d

Change-Id: I83351fe0d0ef6c1c17b48e99d1e80ab2cdb03e05

  - Add fr translations for f950036a89c46ce50bd7d62896cb6e4a690d323a

Change-Id: I497f6270322380d2d05716e81949434f75df8602

  - Backport fr translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d

Change-Id: I955422a5fd582c6ff9909d89fda76dbbd956a1c5

  - Version 7.6.3.2, tag libreoffice-7.6.3.2

Change-Id: I4772fc0f2abffbb8015ee096bb9a4fc6d257d7cb

  - Branch libreoffice-7-6-3

This is 'libreoffice-7-6-3' - the stable branch for the 7.6.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I145b9af8d0a5c8319c63b139562c86caa94670e2

  - Add translations for f950036a89c46ce50bd7d62896cb6e4a690d323a

Change-Id: Ida57eb3b5034ec57266e8b95928c59a1d5efd065

  - Backport translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d

Change-Id: I597ba186fb8736a50e141da34aea5dbc475f8652

  - Version 7.6.6.3, tag libreoffice-7.6.6.3

Change-Id: I69b619c678c7db929901daa3e1cf3fbc20affde3

  - update translations for 7.6.6 rc3

and force-fix errors using pocheck

Change-Id: I27666de13601bf7a1fa144f13385426b3d16dbf8
(cherry picked from commit ee46af8eb1eeef8147c439b7b89b1779be2d1bbe)

  - update translations for 7.6.6 rc2

and force-fix errors using pocheck

Change-Id: If460e6afafc42b7f06e2e2a32b1f0da45ee9d7ab
(cherry picked from commit 2c72d6fd1b7800164baf7a3d5afbeb53b7734e49)

  - bump copyright year for sl translation

Change-Id: I9049de5b88eb4d152dc780c08cba7098ec7ae77f
(cherry picked from commit 3ba99bccf07e93a335cdbc2f7e3cc75ed7069e99)

  - update translations for 7-6

and force-fix errors using pocheck

Change-Id: Iad1f83ec403dfc7a9b3ca30a4b50530d8d38b6f6
(cherry picked from commit e81a0a24256108bc0ecd90d33615362ba958cf43)

  - Branch libreoffice-7-6-6

This is 'libreoffice-7-6-6' - the stable branch for the 7.6.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ia6d20cf71faf3f3dd7307620beca25c1e29a8b7c

  - update translations for 7.6.6 rc1

and force-fix errors using pocheck

Change-Id: Ic01ba3a9ba7c2d63ab2db1892779305cc8942098

  - update translations for 7.6.5 rc2

and force-fix errors using pocheck

Change-Id: Ie92e7273a69b81df9bdcc4f7f08a7443fd2f6144

  - update translations for 7.6.5 rc1

and force-fix errors using pocheck

Change-Id: 

core.git: Branch 'feature/cib_contract49' - 80 commits - android/source basic/source canvas/source compilerplugins/LICENSE.TXT configure.ac cui/inc dictionaries download.lst external/boost external/li

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit 8b2f9f5f2daca81dd25334be82e236c44368f09e
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 14:57:50 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 15:08:54 2024 +0100

Update git submodules

* Update translations from branch 'feature/cib_contract49'
  to 11bb4c5da1e34fa087cad36d40dd964560d8e07b
  - Update DE translations

* remove duplicate entries from presentation dlg
* add a few more missing strings
* fix two typos

Change-Id: Iaf4183a2ec477940d5a4d71c765ac6400d69ae5e

  - Update DE translations

Change-Id: Ibcf9c09d2413c4931697449619e7a8fbe6940016

  - Version 7.6.5.2, tag libreoffice-7.6.5.2-hotfix1

Change-Id: I96cd6667819e3ff617ab7c7cb7fdc4a17562ec47

  - Version 7.6.5.2, tag libreoffice-7.6.5.2

Change-Id: Iee78b7547cfa59d396438242a20716813ba8814b

  - Branch libreoffice-7-6-5

This is 'libreoffice-7-6-5' - the stable branch for the 7.6.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I83e01542d7224395619e60cc69d0eb7b248b3303

  - Better translation for hidden info warndialog

Change-Id: Ia873da1405f9c7f6b72d940585c9f1633498ba10

  - Adjust tooltip translations

Change-Id: I8c0d78f554ff5ca6bd8441506a2f270c9f9f8e6e

  - Add missing fr translations

Follow-up to 79f9243e81eda3ab113d75538686ab81770c2c5d

Change-Id: I83351fe0d0ef6c1c17b48e99d1e80ab2cdb03e05

  - Add fr translations for f950036a89c46ce50bd7d62896cb6e4a690d323a

Change-Id: I497f6270322380d2d05716e81949434f75df8602

  - Backport fr translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d

Change-Id: I955422a5fd582c6ff9909d89fda76dbbd956a1c5

  - Version 7.6.3.2, tag libreoffice-7.6.3.2

Change-Id: I4772fc0f2abffbb8015ee096bb9a4fc6d257d7cb

  - Branch libreoffice-7-6-3

This is 'libreoffice-7-6-3' - the stable branch for the 7.6.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I145b9af8d0a5c8319c63b139562c86caa94670e2

  - Add translations for f950036a89c46ce50bd7d62896cb6e4a690d323a

Change-Id: Ida57eb3b5034ec57266e8b95928c59a1d5efd065

  - Backport translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d

Change-Id: I597ba186fb8736a50e141da34aea5dbc475f8652

  - Version 7.6.6.3, tag libreoffice-7.6.6.3

Change-Id: I69b619c678c7db929901daa3e1cf3fbc20affde3

  - update translations for 7.6.6 rc3

and force-fix errors using pocheck

Change-Id: I27666de13601bf7a1fa144f13385426b3d16dbf8
(cherry picked from commit ee46af8eb1eeef8147c439b7b89b1779be2d1bbe)

  - update translations for 7.6.6 rc2

and force-fix errors using pocheck

Change-Id: If460e6afafc42b7f06e2e2a32b1f0da45ee9d7ab
(cherry picked from commit 2c72d6fd1b7800164baf7a3d5afbeb53b7734e49)

  - bump copyright year for sl translation

Change-Id: I9049de5b88eb4d152dc780c08cba7098ec7ae77f
(cherry picked from commit 3ba99bccf07e93a335cdbc2f7e3cc75ed7069e99)

  - update translations for 7-6

and force-fix errors using pocheck

Change-Id: Iad1f83ec403dfc7a9b3ca30a4b50530d8d38b6f6
(cherry picked from commit e81a0a24256108bc0ecd90d33615362ba958cf43)

  - Branch libreoffice-7-6-6

This is 'libreoffice-7-6-6' - the stable branch for the 7.6.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ia6d20cf71faf3f3dd7307620beca25c1e29a8b7c

  - update translations for 7.6.6 rc1

and force-fix errors using pocheck

Change-Id: Ic01ba3a9ba7c2d63ab2db1892779305cc8942098

  - update translations for 7.6.5 rc2

and force-fix errors using pocheck

Change-Id: Ie92e7273a69b81df9bdcc4f7f08a7443fd2f6144

  - update translations for 7.6.5 rc1

and force-fix errors using pocheck

Change-Id: Ie40ba4e69f02dec41db1c7690375460110ae25d0

core.git: sd/source

[U-Aarons_LaptopAaron (via logerrit)]

 sd/source/console/PresenterAccessibility.hxx   |5 +
 sd/source/console/PresenterBitmapContainer.hxx |5 +
 sd/source/console/PresenterCanvasHelper.hxx|5 +
 3 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit cd72cefbc7b8abbdc5a66366e59ec81681d74aba
Author: U-Aarons_Laptop\Aaron 
AuthorDate: Mon Mar 25 17:04:13 2024 -0400
Commit: Ilmari Lauhakangas 
CommitDate: Fri Mar 29 13:58:05 2024 +0100

tdf#143148 replace include guards with pragma once

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

diff --git a/sd/source/console/PresenterAccessibility.hxx 
b/sd/source/console/PresenterAccessibility.hxx
index 12015d0938d0..350f0995fc56 100644
--- a/sd/source/console/PresenterAccessibility.hxx
+++ b/sd/source/console/PresenterAccessibility.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERACCESSIBILITY_HXX
-#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERACCESSIBILITY_HXX
+#pragma once
 
 #include "PresenterPaneContainer.hxx"
 
@@ -110,6 +109,4 @@ private:
 
 } // end of namespace ::sd::presenter
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/console/PresenterBitmapContainer.hxx 
b/sd/source/console/PresenterBitmapContainer.hxx
index 7a9de89a7f13..ee87a5be23db 100644
--- a/sd/source/console/PresenterBitmapContainer.hxx
+++ b/sd/source/console/PresenterBitmapContainer.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERBITMAPCONTAINER_HXX
-#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERBITMAPCONTAINER_HXX
+#pragma once
 
 #include 
 #include 
@@ -141,6 +140,4 @@ typedef 
std::shared_ptr SharedBitmap
 
 } // end of namespace ::sdext::presenter
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/console/PresenterCanvasHelper.hxx 
b/sd/source/console/PresenterCanvasHelper.hxx
index 8902a9712bf6..9f5ce96ab3b6 100644
--- a/sd/source/console/PresenterCanvasHelper.hxx
+++ b/sd/source/console/PresenterCanvasHelper.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERCANVASHELPER_HXX
-#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERCANVASHELPER_HXX
+#pragma once
 
 #include "PresenterBitmapContainer.hxx"
 #include 
@@ -102,6 +101,4 @@ private:
 
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

core.git: Branch 'libreoffice-24-2' - download.lst external/libassuan

[Xisco Fauli (via logerrit)]

 download.lst|4 ++--
 external/libassuan/ExternalPackage_libassuan.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 904501114d8b6754ab65bb11c08c145f02fab8fe
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 11:49:58 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Mar 29 14:23:23 2024 +0100

libassuan: upgrade to 2.5.7

Change-Id: I6114c7a77395f14e83d2315ac6f9b6829ddb1c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165456
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit 0343d7153e77ba79a59bc5f6c51159af9010813e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165472
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 19286d1d0e32..48e6bc72b088 100644
--- a/download.lst
+++ b/download.lst
@@ -369,8 +369,8 @@ LCMS2_TARBALL := lcms2-2.15.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBASSUAN_SHA256SUM := 
e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
-LIBASSUAN_TARBALL := libassuan-2.5.6.tar.bz2
+LIBASSUAN_SHA256SUM := 
0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76
+LIBASSUAN_TARBALL := libassuan-2.5.7.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libassuan/ExternalPackage_libassuan.mk 
b/external/libassuan/ExternalPackage_libassuan.mk
index 2df7b562d584..77dc05a665f1 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.6))
+$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.7))
 
 else ifeq ($(OS),MACOSX)
 

dictionaries.git: Changes to 'feature/cib_contract49'

[Thorsten Behrens (via logerrit)]

New branch 'feature/cib_contract49' available with the following commits:
commit a5bb9a84cdad6443993b83a16da3926be228af5e
Merge: 96d4139 9f5af72
Author: Thorsten Behrens 
Date:   Fri Mar 29 14:39:40 2024 +0100

Merge tag 'libreoffice-7.6.6.3' into HEAD

Tag libreoffice-7.6.6.3

Change-Id: I451a114ed45b11d24e0ac952f5ee55e80337c95b

core.git: Branch 'feature/cib_contract49' - dictionaries

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 52a529a714b3887c854eb466b7e0a0a603f4efee
Author: Thorsten Behrens 
AuthorDate: Fri Mar 29 14:40:53 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Mar 29 14:40:53 2024 +0100

Update git submodules

* Update dictionaries from branch 'feature/cib_contract49'
  to a5bb9a84cdad6443993b83a16da3926be228af5e
  - Merge tag 'libreoffice-7.6.6.3' into HEAD

Tag libreoffice-7.6.6.3

Change-Id: I451a114ed45b11d24e0ac952f5ee55e80337c95b

  - Version 7.6.6.3, tag libreoffice-7.6.6.3

Change-Id: I97d861e9f65029f0331324b79eafeec0e698f852

  - Branch libreoffice-7-6-6

This is 'libreoffice-7-6-6' - the stable branch for the 7.6.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I62319de3cbb911d57724951c66af7673356ce01b

diff --git a/dictionaries b/dictionaries
index 96d4139d0fea..a5bb9a84cdad 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 96d4139d0fea2ebefcae2cc459429386620a24b9
+Subproject commit a5bb9a84cdad6443993b83a16da3926be228af5e

translations.git: Changes to 'refs/tags/cib_contract49-7.6.5.3.M1'

[Thorsten Behrens (via logerrit)]

Tag 'cib_contract49-7.6.5.3.M1' created by Thorsten Behrens 
 at 2024-03-29 14:16 +

cib_contract49-7.6.5.3.M1
-BEGIN PGP SIGNATURE-

iNUEABYKAH0WIQRV78SO268/dhkw1IIeB5amgXyR5gUCZgbNRV8UgAAuAChp
c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NTVF
RkM0OEVEQkFGM0Y3NjE5MzBENDgyMUUwNzk2QTY4MTdDOTFFNgAKCRAeB5amgXyR
5kZcAQDmMtwaaK7Mf4E0hs2PBQmMG4BM5Qkr6nlJhmv+fBoY/wEA3dgcko9A0Oj4
ZOSOYgz/Y1lfQq5y+3FU05J5eDwARQk=
=45H/
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-40:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/cib_contract49-7.6.5.2.M2'

[Thorsten Behrens (via logerrit)]

Tag 'cib_contract49-7.6.5.2.M2' created by Thorsten Behrens 
 at 2024-03-29 14:16 +

cib_contract49-7.6.5.2.M2
-BEGIN PGP SIGNATURE-

iNUEABYKAH0WIQRV78SO268/dhkw1IIeB5amgXyR5gUCZgbNL18UgAAuAChp
c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NTVF
RkM0OEVEQkFGM0Y3NjE5MzBENDgyMUUwNzk2QTY4MTdDOTFFNgAKCRAeB5amgXyR
5k7NAP9lwoP55sKpfzOlPyVSG65h8X72myxFEm8FoJbtFIwYbgEA04T4i2hfT1v0
Tl0h6g/5eDUwtnHwmkdp++VPvroV2Qc=
=CLPd
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-39:
---
 0 files changed
---

core.git: Branch 'feature/cib_contract49' - xmloff/source

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/eventimp.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 91439b4a8220e2c1b660795611aa0d17ba344e15
Author: Caolán McNamara 
AuthorDate: Wed Mar 27 17:07:20 2024 +
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 15:19:05 2024 +0100

add notify for script use

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

diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 2b8921ee27fa..2a6ce1fa2381 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -210,6 +210,9 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,
 
 if( maData.mbValid )
 maData.mbValid = !sEventName.isEmpty();
+
+if (!maData.msMacroName.isEmpty())
+rImp.NotifyMacroEventRead();
 }
 
 css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLEventContext::createFastChildContext(

core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/rtf/eeimpars.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 454da7750db671c1f82fec4706de9a44c29b3e2e
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 13:21:33 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 29 15:23:06 2024 +0100

cid#67704 Integer-overflow

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

diff --git a/sc/source/filter/rtf/eeimpars.cxx 
b/sc/source/filter/rtf/eeimpars.cxx
index 6e588ffdc30d..38f3f73e89aa 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -309,7 +309,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, 
double nOutputFactor, SvNu
 ScMF::Hor );
 if ( pE->nRowOverlap > 1 )
 {
-nRO = nRow + pE->nRowOverlap - 1;
+nRO = nRow + (pE->nRowOverlap - 1);
 mpDoc->ApplyFlagsTab( nCol, nRow+1,
 nCol, nRO , nTab,
 ScMF::Ver );

[Bug 160100] Pasting a callout shape into a chart in edit mode loses formatting

[bugzilla-daemon]

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

--- Comment #15 from Ian Eales  ---
Created attachment 193389
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193389=edit
Paste line on Left

Line hidden under border

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

[Bug 160100] Pasting a callout shape into a chart in edit mode loses formatting

[bugzilla-daemon]

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

--- Comment #16 from Ian Eales  ---
Created attachment 193390
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193390=edit
Move pasted left

Line end remains hidden under border

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

[Bug 160418] New: the Turkish spelling does not work

[bugzilla-daemon]

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

Bug ID: 160418
   Summary: the Turkish spelling does not work
   Product: LibreOffice
   Version: 24.2.1.2 release
  Hardware: x86-64 (AMD64)
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: dp.k...@t-online.de

Description:
Loaded languages: German, French,Turkish, Russian. The Turkish language pack
was loaded last.
When I check the spelling of a document in Turkish, I select Turkish in the
menu. After checking the first word, the language to be checked automatically
switches to Russian. Therefore, it is not possible to check the entire document
written in Turkish for spelling errors. 
See example in the picture.

Actual Results:
Write a document in Turkish. Then go to spell check and check for spelling
mistakes.

Expected Results:
After checking the first word, the language to be checked automatically
switches to Russian.
Therefore, it is not possible to check the entire document written in Turkish
for spelling errors. 


Reproducible: Always


User Profile Reset: No

Additional Info:
The whole document should be checked for errors without changing the language
to be checked.

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

[Bug 160005] Windows installer Online Update component option: description misleading/unclear on role/purpose

[bugzilla-daemon]

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

--- Comment #4 from Philippe Cloutier  ---
(In reply to Stephan Bergmann from comment #2)
> [...]

Thank you Stephan

> (In reply to Philippe Cloutier from comment #0)
> > I am skeptical that I did opt out from Online Update, but if I did, that
> > could have been due to its description (STR_DESC_MODULE_OPT_ONLINEUPDATE):
> > > Get automatically notified when a new update of %PRODUCTNAME becomes 
> > > available.(English)
> > > Recevez une notification automatique lorsqu'une nouvelle mise à jour de 
> > > %PRODUCTNAME est disponible. (French)
> > 
> > The phrasing implies one cannot opt out from these notifications. In
> > reality, options allow to disable these checks even if the component is
> > installed.
> > 
> > I suggest to rectify by indicating the behavior is optional, with a label
> > like:
> > 
> > 
> > > Allows to be notified when a new update of %PRODUCTNAME becomes available.
> 
> I personally don't think such a rewording would be useful, neither in light
> of that optional component potentially going away anyway (see above), nor in
> making it more clear what that option does (many things can be turned off in
> LO's options pages, still we don't generally phrase the corresponding
> features as "allows to have this feature available, unless you switch it
> off").

The quoted fragment is basically nonsensical, and I hope no one suggested
anything like that.


> I'll thus tentatively close as WONTFIX.  If you disagree, please reopen and
> add the "needsUXEval" keyword.

Can you clarify what you mean by "close as WONTFIX"?

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

[Bug 160100] Pasting a callout shape into a chart in edit mode loses formatting

[bugzilla-daemon]

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

--- Comment #18 from Buovjaga  ---
Might be specific to a spreadsheet, so you could attach an example one that
shows the bug.

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

[Bug 35694] "Page number" automatic field stops counting before last page if offset >0 (see comment 22)

[bugzilla-daemon]

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

--- Comment #80 from Eyal Rozenberg  ---
(In reply to Mike Kaganski from comment #77)
> I strongly believe, that there must *not* be any mechanics that allow *that*
> outside of the normal page break mechanism. OTOH, any improvements in the
> page breaks properties in that regards are welcome.

Ok, so I guess we're having this discussion here after all...

Users should not, and in fact I claim will not, insert page breaks as a
mechanism of setting page numbers or page number progression logic.

They should not, because they don't want page breaks, and we should not force
them to break pages. I realize that we have a problem of sorts, due to the fact
that pages aren't first-class citizens in ODT documents and are derived from
paginating non-page content. But that is a challenge for us (or rather, for you
the developers) to contend with, not a burden to shift onto users by forcing
them to break pages when they don't want a break.

They will not, because when a user wants to change the page number value,
that's not because they want empty pages (which they get today with breaks
anyways). And since they don't want empty pages, they will not consider trying
inserting page breaks as the way to get to page number control UI; and I also
doubt they will tolerate page breaks being inserted for them when they try to
control the page numbers.

> The current page field may be changed e.g. like this: remove the offset from
> the field completely; and introduce another field kind, "page reference",
> which would have the offset.

That would make the UI consistent with the implemented feature, but it's a bad
idea, because page references don't belong in the [Insert | Page Number]
dialog. And it would make things worse for our users: Right now, they have a
mostly-working implementation of:

ApplyOffset(GetNumberOf(CurrentPage()), N)

with a bug. If we did what you suggest, many/most users will now not realize
they can abuse the page reference offset to get a simple value offset most of
the time. And that practice - ugly and broken as it is - is important. 

Instead, let's do one of the following, by decreasing order of my preference:

1. 
(If we can actually insert a formula field)
Change the semantics of the [Insert | Page Number] so that it always inserts a
formula based on the number of the current page, and if an offset was specified
- the formula includes that offset.

2
(If we can actually insert a formula field)
Change the semantics of the [Insert | Page Number] so that if an offset was
specified, it inserts a formula based on the number of the current page with
that offset (and otherwise, inserts a 'plain' page number field).

3.
(If we cannot actually insert a formula field)
Do nothing for now, work towards enabling formula field insertion.

4.
(If we cannot actually insert a formula field)
Define a non-standardized/extension attribute for applying an offset to a
(page) number; let's call it, say, text:page-number-offset. When the user sets
a non-zero offset, apply that attribute instead of the text:page-adjust
attribute.

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

[Bug 146619] Remove unused #includes from C/C++ files

[bugzilla-daemon]

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

--- Comment #33 from Commit Notification 
 ---
Gabor Kelemen committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/commit/b6f5472ea147230b07a04f5677e1de8ea149cea5

tdf#146619 Drop unused 'using namespace' in: cppu/ cppuhelper/

It will be available in 24.8.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

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

[Bug 160419] Extraneous text inserted in TOC

[bugzilla-daemon]

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

--- Comment #3 from Dave Nadler  ---
You're right - no idea how that paragraph was formatted thus.

The fact its hard to see in UI is precisely why there are so many discussions
about this!

Thanks!

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

[Bug 152110] LanguageTool extension (version <6.0) prevents adding words to dictionaries via context menu with 2+ dictionaries present

[bugzilla-daemon]

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

--- Comment #14 from Caolán McNamara  ---
Created attachment 193396
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193396=edit
recording

I'm a bit confused, I went back to language tool 5.6 and installed it in todays
(gtk3+linux) trunk version. And did as seen in this recording. Is the problem
visible here and I'm missing it, or do I need to do something different?

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

[Bug 41180] VIEWING: Wordart 3D and color effect missing when FILEOPEN particular pptx

[bugzilla-daemon]

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

Regina Henschel  changed:

   What|Removed |Added

 CC||rb.hensc...@t-online.de

--- Comment #12 from Regina Henschel  ---
The example file has these problems:

(1) The shadow in the title is on the text. That is not implemented in LO. But
LO could use the shadow of the text box as workaround in case the text box has
no fill and no stroke.

(2) The title uses 'Bevel' on the text. 'Bevel' is currently not implemented,
neither for shapes nor for text and it cannot be expressed in ODF.

(3) The yellow text has a gradient fill. Gradient for text is not implemented
and cannot be expressed in ODF. But in case of gradient text an average color
or the center color could be used as workaround. That would result in a similar
color instead of the color White.

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

[Bug 158231] With Skia enabled: insert place marker frame missing when drag & drop (with or without )

[bugzilla-daemon]

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

--- Comment #3 from ady  ---
I am assuming that bugs 159214, 159751, 160036 and this bug 158231 are all
based on the same issue.

Please test with latest master build while using
 "Use Skia for all rendering" ENABLED.

My guess is that the original problem won't be seen anymore.

It would remain to see whether the problem remains when "UI render: default" as
in comment 0, because the same comment 0 contradicts itself regarding the use
of Skia.

-- 
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 (Linux)

[bugzilla-daemon]

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

Caolán McNamara  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |caolan.mcnamara@collabora.c
   |desktop.org |om

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

[Bug 35694] "Page number" automatic field stops counting before last page if offset >0 (see comment 22)

[bugzilla-daemon]

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

--- Comment #80 from Eyal Rozenberg  ---
(In reply to Mike Kaganski from comment #77)
> I strongly believe, that there must *not* be any mechanics that allow *that*
> outside of the normal page break mechanism. OTOH, any improvements in the
> page breaks properties in that regards are welcome.

Ok, so I guess we're having this discussion here after all...

Users should not, and in fact I claim will not, insert page breaks as a
mechanism of setting page numbers or page number progression logic.

They should not, because they don't want page breaks, and we should not force
them to break pages. I realize that we have a problem of sorts, due to the fact
that pages aren't first-class citizens in ODT documents and are derived from
paginating non-page content. But that is a challenge for us (or rather, for you
the developers) to contend with, not a burden to shift onto users by forcing
them to break pages when they don't want a break.

They will not, because when a user wants to change the page number value,
that's not because they want empty pages (which they get today with breaks
anyways). And since they don't want empty pages, they will not consider trying
inserting page breaks as the way to get to page number control UI; and I also
doubt they will tolerate page breaks being inserted for them when they try to
control the page numbers.

> The current page field may be changed e.g. like this: remove the offset from
> the field completely; and introduce another field kind, "page reference",
> which would have the offset.

That would make the UI consistent with the implemented feature, but it's a bad
idea, because page references don't belong in the [Insert | Page Number]
dialog. And it would make things worse for our users: Right now, they have a
mostly-working implementation of:

ApplyOffset(GetNumberOf(CurrentPage()), N)

with a bug. If we did what you suggest, many/most users will now not realize
they can abuse the page reference offset to get a simple value offset most of
the time. And that practice - ugly and broken as it is - is important. 

Instead, let's do one of the following, by decreasing order of my preference:

1. 
(If we can actually insert a formula field)
Change the semantics of the [Insert | Page Number] so that it always inserts a
formula based on the number of the current page, and if an offset was specified
- the formula includes that offset.

2
(If we can actually insert a formula field)
Change the semantics of the [Insert | Page Number] so that if an offset was
specified, it inserts a formula based on the number of the current page with
that offset (and otherwise, inserts a 'plain' page number field).

3.
(If we cannot actually insert a formula field)
Do nothing for now, work towards enabling formula field insertion.

4.
(If we cannot actually insert a formula field)
Define a non-standardized/extension attribute for applying an offset to a
(page) number; let's call it, say, text:page-number-offset. When the user sets
a non-zero offset, apply that attribute instead of the text:page-adjust
attribute.

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

[Bug 146619] Remove unused #includes from C/C++ files

[bugzilla-daemon]

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

--- Comment #32 from Commit Notification 
 ---
Gabor Kelemen committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/commit/e2e9eeb822928255b3f2a31dfe98344f6d8e81cd

tdf#146619 Recheck xmloff/*cxx with IWYU

It will be available in 24.8.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

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

[Bug 160423] Base table design does not handle zoned time type correctly

[bugzilla-daemon]

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

--- Comment #3 from prrv...@gmail.com ---
If you want to be able to declare types such as: TIME, TIMESTAMP,
TIME_WITH_TIMEZONE and TIMESTAMP_WITH_TIMEZONE, with the possibility of
entering the precision (ie: from 0 to 9) you must:
- Have a database managing its types.
- Have a getTypeInfo() method of DatabaseMetData that should return the correct
information.

If the underlying database does not produce a satisfactory ResultSet for
getTypeInfo() then there is a possibility to patch the ResultSet with the
TypeInfoSettings[1] property in order to obtain the correct ResultSet (ie: you
can set min and max value of the precision)

[1]
https://www.openoffice.org/api/docs/common/ref/com/sun/star/sdbc/JDBCConnectionProperties.html#TypeInfoSettings

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

[Bug 157420] Allow setting a default Date and Time subtype (fixed vs non-fixed) and format so they can be inserted with shortcuts

[bugzilla-daemon]

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

--- Comment #10 from Philippe Cloutier  ---
I am afraid I don't understand the problem FaithfulScuff. In version 24.2.1.2,
Insert → Date (fixed) and Insert → Date (variable) are different functions,
which can have their own shortcuts. Are you saying that was not the case in
7.6.1.2?

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

[Bug 157285] FILEOPEN PPTX: Textbox too tall - import needs to look at the shape on the slide instead of the master page

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:24.8.0

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

[Bug 160421] A flipped extruded custom shape is wrongly illuminated

[bugzilla-daemon]

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

Regina Henschel  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |rb.hensc...@t-online.de
   |desktop.org |

--- Comment #3 from Regina Henschel  ---
https://gerrit.libreoffice.org/c/core/+/165562

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

[Bug 160399] Print Preview freezes with whole row merged in large spreadsheet

[bugzilla-daemon]

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

--- Comment #8 from Telesto  ---
Thanks for the patch

List of observations

A) It's loading faster now, however still a lag +/- 10 seconds
B) A single press on + or - is already slow (same 10 seconds). It freezes when
using the scale slider of the print preview. 
C) The render print preview simply stops on macOS (at least) when switching
tasks (goes to idle). Process continuing when LibreOffice has focus again; so
you're forced to actively wait
D) Delete row 1 takes 22 seconds; but this surely a different bug based on
instruments perf profile

Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: aef28c23adc87b8e26eacb56c7dbcf652e907fb9
CPU threads: 8; OS: macOS 14.3; UI render: Skia/Raster; VCL: osx
Locale: nl-NL (nl_NL.UTF-8); UI: en-US
Calc: threaded

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

[Bug 41180] VIEWING: Wordart 3D and color effect missing when FILEOPEN particular pptx

[bugzilla-daemon]

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

Regina Henschel  changed:

   What|Removed |Added

 Blocks||120388


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=120388
[Bug 120388] [META] PPTX 3D model issues
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 120388] [META] PPTX 3D model issues

[bugzilla-daemon]

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

Regina Henschel  changed:

   What|Removed |Added

 Depends on||41180


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=41180
[Bug 41180] VIEWING: Wordart 3D and color effect missing when FILEOPEN
particular  pptx
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 123345] FILEOPEN | DOCX, 3D shape loses reverts back to 2D in LO.

[bugzilla-daemon]

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

--- Comment #5 from Regina Henschel  ---
I think the rendering is good now after the work on bug 70039.

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

[Bug 160028] Type to select currency in split button dropdown does not work for gtk3

[bugzilla-daemon]

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

Caolán McNamara  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |caolan.mcnamara@collabora.c
   |desktop.org |om
 Status|NEW |ASSIGNED
  Regression By||Caolán McNamara

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

[Bug 160421] A flipped extruded custom shape is wrongly illuminated

[bugzilla-daemon]

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

--- Comment #1 from Regina Henschel  ---
Created attachment 193394
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193394=edit
Own shapes to be mirrored

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

[Bug 35694] "Page number" automatic field stops counting before last page if offset >0 (see comment 22)

[bugzilla-daemon]

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

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org
 Ever confirmed|1   |0
 Status|NEW |UNCONFIRMED

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

[Bug 35694] "Page number" automatic field stops counting before last page if offset >0 (see comment 22)

[bugzilla-daemon]

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

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org
 Ever confirmed|1   |0
 Status|NEW |UNCONFIRMED

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

[Bug 160005] Windows installer Online Update component option: description misleading/unclear on role/purpose

[bugzilla-daemon]

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

--- Comment #3 from Philippe Cloutier  ---
Thank you, but could someone clarify how this was resolved?

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

[Bug 160100] Pasting a callout shape into a chart in edit mode loses formatting

[bugzilla-daemon]

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

--- Comment #21 from Buovjaga  ---
(In reply to Ian Eales from comment #19)
> Trust me, it's not.

What matters here is reproducibility, so please attach a file that will make it
easier for testers.

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

[Bug 160424] New: Poor keyboard mnemonic ("access key") for field insertion in French

[bugzilla-daemon]

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

Bug ID: 160424
   Summary: Poor keyboard mnemonic ("access key") for field
insertion in French
   Product: LibreOffice
   Version: 24.2.1.2 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: trivial
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: chea...@gmail.com

LibreOffice offers inserting fields via the Insert → Field
(..GenericCommands.UserInterface.Popups..uno:FieldMenu) submenu. In French, the
labels are Insertion → Champ (
https://translations.documentfoundation.org/translate/libo_ui-24-2/officecfgregistrydataorgopenofficeofficeui/fr/?checksum=dafb349d93f99e6f
), and the first letter of "Champ" ("C") is the mnemonic.

While this works (reasonably) well in most applications, that choice is very
poor in Writer, where 2 other items of the Insert menu share the same mnemonic
("Section…" and "Cadre"), including a submenu (Frame). This means that for
example, to insert a Date with Writer using keyboard shortcuts, one would need
to type:
Alt + I, C, C, Left arrow, C, D, D, Enter
This is time-consuming *and* non-trivial to discover.

I suppose that field insertion must also consider Calc, but I think the
mnemonic should be changed. Choosing "p" as the mnemonic may be better,
although imperfect. As things stand, it would have a much lesser conflict with
"Repère de texte" (WriterCommands.UserInterface.Commands..uno:InsertBookmark),
which could itself use a different mnemonic.

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

[Bug 160425] New: Property "Filter proposal" fails

[bugzilla-daemon]

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

Bug ID: 160425
   Summary: Property "Filter proposal" fails
   Product: LibreOffice
   Version: 24.2.1.2 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Base
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: ville...@t-online.de

Created attachment 193397
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193397=edit
Database document with 2 forms for testing the form based filter

There is a property "Filter proposal" in the properties dialog of a data form's
text box. With this property is set, the text box turns into a listbox when the
form is in form based filter mode.

Open the members form in the attached database.
Start the form based filter.
Below the "Member Name" label there is a listbox which should show the distinct
names to be selected as filter criterion, but the list is empty.

Work-around: Open the other form with the combo box where the same procedure
does work, because I replaced the text box with a combo box.

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

[Bug 160426] New: Pressing Alt key doesn't highlight menus.

[bugzilla-daemon]

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

Bug ID: 160426
   Summary: Pressing Alt key doesn't highlight menus.
   Product: LibreOffice
   Version: unspecified
  Hardware: Other
OS: Windows (All)
Status: UNCONFIRMED
  Severity: minor
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: luedri...@gmail.com

Description:
Press Alt.
This would highlight/select your menus.
Press D.
This would select "Data".
Press S.
This would select "Sort".


And right now, you have to do:

keep alt key Pressed down and then press D.
Press S.

Steps to Reproduce:
1.Press Alt.
2.Press D.
3.Press S.

Actual Results:
doesn't open menu, instead just writes ds in cell

Expected Results:
Press Alt.
This would highlight/select your menus.
Press D.
This would select "Data".
Press S.
This would select "Sort".


Reproducible: Always


User Profile Reset: No

Additional Info:
Version: 24.2.2.2 (X86_64) / LibreOffice Community
Build ID: d56cc158d8a96260b836f100ef4b4ef25d6f1a01
CPU threads: 8; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win
Locale: en-AU (en_AU); UI: en-US
Calc: threaded

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

[Bug 160100] Pasting a callout shape into a chart in edit mode loses formatting

[bugzilla-daemon]

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

--- Comment #22 from Ian Eales  ---
Created attachment 193398
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193398=edit
Example file

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

[Bug 160408] Time Format does not accept 1234 and returns 0000

[bugzilla-daemon]

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

m_a_riosv  changed:

   What|Removed |Added

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

--- Comment #9 from m_a_riosv  ---
At most a request for enhancement, but certainly not a bug.

BTW the same issue could be to introduce dates. And what if you need to enter a
number that is right as number / date / time with those four digits?. And maybe
other issues, no easy to anticipate.

And to enter 0400 you can use 4: two keystrokes.
I know in several keyboards. It is a shift key, but also you can modify some
key on the keyboard to have it without shift.

OTOH, 'Date acceptance pattern' doesn't accept 'DDMM' as such, always needs the
separator.

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

[Bug 160419] Extraneous text inserted in TOC

[bugzilla-daemon]

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

m_a_riosv  changed:

   What|Removed |Added

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

--- Comment #2 from m_a_riosv  ---
To the paragraph 'Clock: Actual period 12.5us, frequency 80kHz.' with the
paragraph format 'Default ...' you have assigned level 2 and that is why it
appears in the table of contents.

There is a chapter 15 in the LibreOffice guide dedicated to tables of contents
and indexes.
https://documentation.libreoffice.org/assets/Uploads/Documentation/en/WG7.6/WG76-WriterGuide.pdf

The discussion forum ask.libreoffice.org has many posts on this topic.

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

[Bug 160420] Editing table trashes table formatting

[bugzilla-daemon]

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

m_a_riosv  changed:

   What|Removed |Added

 CC||miguelangelrv@libreoffice.o
   ||rg

--- Comment #2 from m_a_riosv  ---
Created attachment 193395
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193395=edit
Screenshot on how it work for me with 7.6.6

Please what is wrong in my screenshot.

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

[Bug 159498] Items in Template Manager's "Manage" dropdown should be left-aligned (gtk3)

[bugzilla-daemon]

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

Caolán McNamara  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |caolan.mcnamara@collabora.c
   |desktop.org |om
 Status|NEW |ASSIGNED

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

[Bug 160422] New: SLIDESHOW: Define Cursor per Slide, e.g. Arrow, Cross, Laser

[bugzilla-daemon]

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

Bug ID: 160422
   Summary: SLIDESHOW: Define Cursor per Slide, e.g. Arrow, Cross,
Laser
   Product: LibreOffice
   Version: 24.2.1.2 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: enhancement
  Priority: medium
 Component: Impress
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: leo.m...@syonic.eu

Description:
1. Implement various cursor types: e.g. Arrow (up, left, etc), Cross,
Laserpointer, etc;
2. Allow users to set specific cursor on each slide (including size and color
of the cursor);

During slide-show: change the cursor on that slide to the specified cursor.

Default: NO cursor (invisible).

Other Issues:
Somewhat related: https://bugs.documentfoundation.org/show_bug.cgi?id=96886
Meta: https://bugs.documentfoundation.org/show_bug.cgi?id=103610

Steps to Reproduce:
1. Enhancement
2. Request for different Cursor types
3. Set specific cursor types on certain slides

Actual Results:
Functionality is unavailable. Should be possible to select the cursor also
during the presentation.

Expected Results:
Specific cursor (e.g. Arrow or Cross or Laserpointer) displayed on the given
slide.


Reproducible: Always


User Profile Reset: No

Additional Info:
Version: 24.2.1.2 (X86_64) / LibreOffice Community
Build ID: db4def46b0453cc22e2d0305797cf981b68ef5ac
CPU threads: 4; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win
Locale: en-US (en_US); UI: en-US
Calc: CL threaded

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

[Bug 126710] fileopen: Calc can not open xlsx, consuming tens gigs of RAM (memory leak)

[bugzilla-daemon]

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

--- Comment #9 from Pavel Kysilka  ---
I am able to open the document. LibreOffice consume about 185 GB RAM.


The application log contains this interesting line:

warn:sc.core:115048:115048:sc/source/core/data/dptabsrc.cxx:2590:
ScDPMember::GetItemData: what data? nDim 18, mnDataId 0


Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: 454da7750db671c1f82fec4706de9a44c29b3e2e
CPU threads: 128; OS: Linux 6.1; UI render: default; VCL: gtk3
Locale: cs-CZ (cs_CZ.UTF-8); UI: en-US
Calc: threaded

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

[Bug 160426] Pressing Alt key doesn't highlight menus.

[bugzilla-daemon]

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

Tex2002ans  changed:

   What|Removed |Added

 CC||mikekagan...@hotmail.com,
   ||Tex2002ans+LibreOffice@gmai
   ||l.com
   Keywords||bibisected, bisected,
   ||regression
 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1
Version|unspecified |24.2.1.2 release

--- Comment #1 from Tex2002ans  ---
I verified this bug in:

Version: 24.2.2.2 (X86_64) / LibreOffice Community
Build ID: d56cc158d8a96260b836f100ef4b4ef25d6f1a01
CPU threads: 8; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win
Locale: en-US (en_US); UI: en-US
Calc: CL threaded

= = = = = = =

I bibisected it using:

- win64-24.2

down to this exact commit:

-
https://cgit.freedesktop.org/libreoffice/core/commit/?id=45023ae9619cdc4332afb8f743d1695a23e8d866

author  Mike Kaganski  2024-01-10 19:48:16
+0600
committer   Xisco Fauli 2024-01-12
19:30:52 +0100
commit  45023ae9619cdc4332afb8f743d1695a23e8d866 (patch)
tree39d2091f4f727df85e5a9e6aec8a8e8329389f4b
parent  6ed4050f16265bfb02090592c6e88813796ac68d (diff)
tdf#156443, tdf#159079, tdf#158112: support Windows Alt codes >=256

So I am CCing Mike Kaganski to this one.

= = = = = = =

In slightly earlier LO Calc, it worked as:

1. Press "Alt"
   - Selects menus.
2. Press "D"
   - Selects "Data" menu.
3. Press "S"
   - Selects "Sort" menu.

Now, you have to:

1. Press "Alt+D"
2. Press "S"

- - -

Is this an accessibility issue? I always thought "Alt" quickly let you "go into
menus", then you can press arrows / extra keys from there to move through menus
as needed.

(At least that's how I recall it working in almost every program I've ever
tried it in...)

- - -

Side Note: This user first submitted the bug on the LibreOffice subreddit:

-
https://www.reddit.com/r/libreoffice/comments/1bqk254/alt_key_doesnt_work_in_calc_after_update/kx6fypq/

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

[Bug 160100] Pasting a callout shape into a chart in edit mode loses formatting

[bugzilla-daemon]

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

--- Comment #14 from Ian Eales  ---
Created attachment 193388
  --> https://bugs.documentfoundation.org/attachment.cgi?id=193388=edit
Paste w line on Right

Line remains extended to right

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

[Bug 158841] Numbering and level of chapter headings is wrong in ODM master document

[bugzilla-daemon]

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

--- Comment #12 from fran...@atlas.cz ---
The problem still remains, the table of contents has the chapter numbers
correctly, but the chapter headings do not. Do I have a build
https://git.libreoffice.org/core/+log/d56cc158d8a96260b836f100ef4b4ef25d6f1a01

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

[Bug 160100] Pasting a callout shape into a chart in edit mode loses formatting

[bugzilla-daemon]

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

--- Comment #20 from Ian Eales  ---
Also happens on Window XI on a different machine

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