Re: Build fail in mariadb on fedora 40

[Julien Nabet]

On 18/05/2024 14:51, Dr. David Alan Gilbert wrote:

...
It looks like others started hitting it; see:
   https://gerrit.libreoffice.org/c/core/+/167806
(I believe as a windows user)


Ok.

BTW, I could run a full build on Win10 with master sources updated today 
(but without enable-dbgutil).


I did a make clean and build again with enable-dbgutil.

Exception enable-dbgutil, the autogen.input contains only:

--with-visual-studio=2022

--with-parallelism=1

(this last one is mandatory for me because the build hangs regularly 
without it whereas I disabled Windows Defender on the whole cygwin 
directory).



Hmm I'm using gcc instead, but I don't see how the cast
would be valid:


I'm giving a try right now with gcc instead of clang and with a 
simplified autogen.input (compared with previous one):


-disable-compiler-plugins
--enable-dbus
--enable-werror
--enable-dependency-tracking
--enable-python=fully-internal
--enable-symbols
--with-referenced-git=/home/julien/lo/libreoffice
--with-external-tar=/home/julien/lo/libreoffice/external/tarballs
--enable-avahi
--with-lang=en-US fr



...
so those C_MODE_START/END make me think someone is doing something
funky with the compiler anyway.


Indeed!

Re: Build fail in mariadb on fedora 40

[Julien Nabet]

On 17/05/2024 15:47, Dr. David Alan Gilbert wrote:

Hi,
   I'm getting:

workdir/UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin.c:87:207:
 error: initialization of ‘struct st_mysql_client_plugin *’ from incompatible 
pointer type ‘struct st_mysql_client_plugin_AUTHENTICATION *’ 
[-Wincompatible-pointer-types]
87 |(struct st_mysql_client_plugin *)_socket_client_plugin, (struct 
st_mysql_client_plugin *)_sha2_password_client_plugin, (struct 
st_mysql_client_plugin *)_native_password_client_plugin, (struct 
st_mysql_client_plugin_AUTHENTICATION *)_gssapi_client_client_plugin,
   |

   ^
/discs/fast/core/workdir/UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin.c:87:207:
 note: (near initialization for ‘mysql_client_builtins[3]’)
make[1]: *** [/discs/fast/core/solenv/gbuild/LinkTarget.mk:366: 
/discs/fast/core/workdir/GenCObject/UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin.o]
 Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [Makefile:294: build] Error 2

Host: Fedora 40, x86-64
configured with:
./configure --srcdir=/discs/fast/core --enable-option-checking=fatal 
--enable-debug

using --with-system-mariadb fixed it.


Hello David,

Sorry, I don't  know why you encounter this :-(

If it can help, here's the content of my autogen.input:

CC=clang
CXX=clang++
--enable-ld=lld
--enable-online-update
--enable-dbgutil
--enable-evolution2
--enable-gtk4
--enable-qt5
--enable-kf5
--enable-gtk3-kde5
--enable-skia=debug
--enable-ext-nlpsolver
--enable-ext-numbertext
--enable-ext-wiki-publisher
--enable-dbus
--enable-werror
--enable-dependency-tracking
--enable-python=fully-internal
--without-system-mariadb
--enable-bundle-mariadb
--enable-symbols
--enable-avahi
--enable-eot
--enable-odk
--with-lang=en-US de es fr hu it ja nl pt pt-BR ru nb nn
--with-myspell-dicts

Julien

core.git: Branch 'libreoffice-7-6' - odk/docs

[Julien Nabet (via logerrit)]

 odk/docs/install.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a0801282a0aabc64a15f9afc3aedeac6226a979
Author: Julien Nabet 
AuthorDate: Sat May 4 10:18:15 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 19:49:47 2024 +0200

tdf#160924: SDK: typo SDK_HOME instead of OO_SDK_HOME for linux

Change-Id: I8ec2bc31b19cc6b724a6f7ea3238dda8cf60d4b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167111
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 6aa2e8fe2b0b59e2fe20191decb9bd6202dabcc9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167073
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit ee9f7d31348e917eb8ba5b007a6679e01ecdb37f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167081
Reviewed-by: Christian Lohmaier 

diff --git a/odk/docs/install.html b/odk/docs/install.html
index 3bf36d8a2563..e23fa3a535fe 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -459,7 +459,7 @@
   
 LD_LIBRARY_PATH
 =$OO_SDK_URE_LIB_DIR:
-$SDK_HOME/linux/lib:
+$OO_SDK_HOME/linux/lib:
 $LD_LIBRARY_PATH
   The LD_LIBRARY_PATH will be set or will be
 extended by the office/URE library path, 
the

core.git: Branch 'libreoffice-7-6-7' - 2 commits - cui/source sfx2/source

[Julien Nabet (via logerrit)]

 cui/source/dialogs/SpellDialog.cxx |   13 +
 cui/source/inc/SpellDialog.hxx |3 +++
 sfx2/source/doc/objstor.cxx|6 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit b037311742a31fa8dc8c77c8232d6540c41ded44
Author: Julien Nabet 
AuthorDate: Sun Apr 28 13:16:59 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 6 19:23:34 2024 +0200

tdf#160827: fix crash when retrieving _MarkAsFinal value (docx) (take 2)

Change-Id: I3f2ad56a205877be54b0dbfe361b76db3436f5ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166798
Reviewed-by: Noel Grandin 
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit 45d2d90d2354a6a32297cde52c0041915499b19b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166726
Reviewed-by: Xisco Fauli 
(cherry picked from commit 2ed402dada3b8b64c6f23cf5afc068848ab1a528)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166834
(cherry picked from commit 5c6b34cb3f8651da008c0b78da4211f4ee8f20f2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166840
Tested-by: Xisco Fauli 
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 4dee93d1e917..91e4bb9ff61a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2308,7 +2308,11 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo.is() && 
xPropertySetInfo->hasPropertyByName("_MarkAsFinal"))
 {
-if 
(xPropertySet->getPropertyValue("_MarkAsFinal").get())
+Any anyMarkAsFinal = 
xPropertySet->getPropertyValue("_MarkAsFinal");
+if (
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get()) ) ||
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get() == "true") )
+)
 {
 uno::Reference< lang::XMultiServiceFactory > 
xFactory(GetModel(), uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet > 
xSettings(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);
commit d5349dfd55a0ec0c96fd6c62af34e599cb60e6ce
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 16:22:10 2024 +
Commit: Xisco Fauli 
CommitDate: Mon May 6 19:23:25 2024 +0200

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/+/165476
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165630
(cherry picked from commit 18e17288781f1b974d8b08ec1253271cd42e66ef)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166847
Reviewed-by: Michael Stahl 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 0a50fbfb8cd7..fe2804c81151 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1147,6 +1147,13 @@ void 
SentenceEditWindow_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 // tdf#132288 don't merge equal adjacent attributes
 m_xEditEngine->DisableAttributeExpanding();
 
+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();
@@ -1155,6 +1162,12 @@ void 
SentenceEditWindow_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 m_xEditEngine->SetBackgroundColor(aBgColor);
 }
 
+void SentenceEditWindow_Impl::StyleUpdated()
+{
+SetDocumentColor(GetDrawingArea());
+WeldEditView::StyleUpdated();
+}
+
 SentenceEditWindow_Impl::~SentenceEditWindow_Impl()
 {
 }
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 3b8d2f9fa02f..da3870dad5eb 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -65,6 +65,7 @@ private:
 
 protected:
 virtual boolKeyInput( const KeyEvent& rKEvt ) over

core.git: Branch 'libreoffice-7-6-7' - odk/docs

[Julien Nabet (via logerrit)]

 odk/docs/install.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e128e0b21a1660c59897f22f71851f8a686e3c1d
Author: Julien Nabet 
AuthorDate: Sat May 4 10:18:15 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 6 19:23:06 2024 +0200

tdf#160924: SDK: typo SDK_HOME instead of OO_SDK_HOME for linux

Change-Id: I8ec2bc31b19cc6b724a6f7ea3238dda8cf60d4b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167111
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 6aa2e8fe2b0b59e2fe20191decb9bd6202dabcc9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167073
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit ee9f7d31348e917eb8ba5b007a6679e01ecdb37f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167082
Reviewed-by: Michael Stahl 
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/odk/docs/install.html b/odk/docs/install.html
index 3bf36d8a2563..e23fa3a535fe 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -459,7 +459,7 @@
   
 LD_LIBRARY_PATH
 =$OO_SDK_URE_LIB_DIR:
-$SDK_HOME/linux/lib:
+$OO_SDK_HOME/linux/lib:
 $LD_LIBRARY_PATH
   The LD_LIBRARY_PATH will be set or will be
 extended by the office/URE library path, 
the

core.git: connectivity/Library_mysqlc.mk external/mariadb-connector-c

[Julien Nabet (via logerrit)]

 connectivity/Library_mysqlc.mk  |6 
++
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |   10 
+-
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |8 
++--
 3 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 6d5d9eaa61505cebaf3bde4bfc157d8e19fec8de
Author: Julien Nabet 
AuthorDate: Fri May 3 15:00:22 2024 +0200
Commit: Julien Nabet 
CommitDate: Mon May 6 09:25:48 2024 +0200

tdf#150082: LO Base MariaDB/MySQL connector don't accept auth via gssapi...

take 2 + add sspi support for Windows

Thank you Mike for the suggestion and explanation about error I had done on 
initial commit!

We need to link with Secur32 to have:
- AcquireCredentialsHandleA
- __imp__FreeCredentialsHandle
- _InitializeSecurityContextA
- __imp__DeleteSecurityContext
referenced by function _auth_client
without this, we've got for example on Windows Jenkins:
mariadb-connector-c.lib(sspi_client.o) : error LNK2019: unresolved external 
symbol _AcquireCredentialsHandleA@36 referenced in function _auth_client

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

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 33ffc5cb28b0..99410d2c0ddb 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -31,6 +31,12 @@ $(eval $(call gb_Library_add_libs,mysqlc,\
 
 $(eval $(call gb_Library_use_sdk_api,mysqlc))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_use_system_win32_libs,mysqlc,\
+   Secur32 \
+))
+endif
+
 $(eval $(call gb_Library_use_libraries,mysqlc,\
comphelper \
cppu \
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 4a96ef387533..1849ec3af29a 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -53,11 +53,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_net \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_password \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_pvio \
-   $(ifneq $(filter $(OS),WNT), \
-   
UnpackedTarball/mariadb-connector-c/plugins/auth/auth_gssapi_client \
-   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_client \
-   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_errmsg \
-   ) \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/auth_gssapi_client \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_sha1 \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_string \
@@ -77,8 +73,12 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_npipe \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_shmem \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/sspi_client \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/sspi_errmsg \
, \

UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_client \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_errmsg \
) \
 ))
 
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index f874918de5ee..31515fd4ac7e 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -36,9 +36,7 @@ $(eval $(call 
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
extern struct st_mysql_client_plugin 
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin 
caching_sha2_password_client_plugin\; \
extern struct st_mysql_client_plugin 
mysql_native_password_client_plugin\; \
-   $(ifneq $(filter WNT,$(OS)), \
-   extern struct 
st_mysql_client_plugin_AUTHENTICATION auth_gssapi_client_client_plugin\; \
-   ) \
+   extern struct st_mysql_client_plugin_AUTHENTICATION 
auth_gssapi_client_client_plugin\; \
$(if $(filter WNT,$(OS)), \
extern struct st_mysql_client_plugin

Re: [TDF Community] [Board Discuss] LibreOffice - peer2peer collaboration bits

[Julien Nabet]

Hello,

I'm not against the idea of a collaboration Office but who's gonna work 
on this?
It's not a simple feature where 1 or 2 benevolents can work on it for 
some months and that's all.
There are security issues, integrity of the produced documents, perhaps 
tracking who modified which parts and when, conflict resolving, etc.


Even if the feature is developped by private company, I expect 
bugtrackers would be on TDF. Dealing with these bugs will be more 
complicated:

how to reproduce easily the fact to be behind a company firewall?
how to simulate 2 or more people working on the same doc?

IMHO it required dedicated/paid persons from TDF or from some private 
companies (or both) to work on this. There may be some replacement of 
these people with the time of course, but they always must be identified 
so if there's any problem, we know how to contact and they'll respond in 
a reasonable delay (less than 1 week).
I mean, I expect the target of this feature is mainly companies and 
associations and these can be more picky.
Before talking about technical architecture, is there a real will about 
this? Are there enough financial resources for this?


Julien

core.git: Branch 'libreoffice-24-2' - odk/docs

[Julien Nabet (via logerrit)]

 odk/docs/install.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee9f7d31348e917eb8ba5b007a6679e01ecdb37f
Author: Julien Nabet 
AuthorDate: Sat May 4 10:18:15 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun May 5 08:54:22 2024 +0200

tdf#160924: SDK: typo SDK_HOME instead of OO_SDK_HOME for linux

Change-Id: I8ec2bc31b19cc6b724a6f7ea3238dda8cf60d4b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167111
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 6aa2e8fe2b0b59e2fe20191decb9bd6202dabcc9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167073
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/odk/docs/install.html b/odk/docs/install.html
index 3bf36d8a2563..e23fa3a535fe 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -459,7 +459,7 @@
   
 LD_LIBRARY_PATH
 =$OO_SDK_URE_LIB_DIR:
-$SDK_HOME/linux/lib:
+$OO_SDK_HOME/linux/lib:
 $LD_LIBRARY_PATH
   The LD_LIBRARY_PATH will be set or will be
 extended by the office/URE library path, 
the

core.git: odk/docs

[Julien Nabet (via logerrit)]

 odk/docs/install.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6aa2e8fe2b0b59e2fe20191decb9bd6202dabcc9
Author: Julien Nabet 
AuthorDate: Sat May 4 10:18:15 2024 +0200
Commit: Julien Nabet 
CommitDate: Sat May 4 12:16:29 2024 +0200

tdf#160924: SDK: typo SDK_HOME instead of OO_SDK_HOME for linux

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

diff --git a/odk/docs/install.html b/odk/docs/install.html
index 3bf36d8a2563..e23fa3a535fe 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -459,7 +459,7 @@
   
 LD_LIBRARY_PATH
 =$OO_SDK_URE_LIB_DIR:
-$SDK_HOME/linux/lib:
+$OO_SDK_HOME/linux/lib:
 $LD_LIBRARY_PATH
   The LD_LIBRARY_PATH will be set or will be
 extended by the office/URE library path, 
the

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

[Julien Nabet (via logerrit)]

 extras/source/tipoftheday/formdocuments.svg |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1b1e61ef56b85fd56f39854d2edb52f3c2d8b82
Author: Julien Nabet 
AuthorDate: Fri May 3 08:04:53 2024 +0200
Commit: Julien Nabet 
CommitDate: Fri May 3 16:20:42 2024 +0200

tdf#160916: typo "Checbox"

Change-Id: Ia06bc947cd1788850251b1386977ef02298a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167030
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit 68008d9f0176c43ecc768af8e3539227640d1519)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166905
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Heiko Tietze 
Tested-by: Julien Nabet 

diff --git a/extras/source/tipoftheday/formdocuments.svg 
b/extras/source/tipoftheday/formdocuments.svg
index b6ad08cab3d7..a3d752292fa5 100644
--- a/extras/source/tipoftheday/formdocuments.svg
+++ b/extras/source/tipoftheday/formdocuments.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>PDF Form<
 g fill="#48484a">ChecboxRadio ButtonText 
Box
\ No newline at end of file
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>PDF Form<
 g fill="#48484a">CheckboxRadio ButtonText 
Box

Re: About tdf#150082 gssapi

[Julien Nabet]

Thank you Michael and Mike for your feedback!

About sspi, I've submitted https://gerrit.libreoffice.org/c/core/+/167057

(just for the record, I didn't put "sspi_common" because with it, it 
fails to build complaining about missing "sspi_common.c")

core.git: external/mariadb-connector-c

[Julien Nabet (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit 62b08851dd7866c830124b30d5722b9541cb2d93
Author: Julien Nabet 
AuthorDate: Fri May 3 10:44:03 2024 +0200
Commit: Julien Nabet 
CommitDate: Fri May 3 13:20:51 2024 +0200

Related tdf#150082: remove duplicate gssapi_client/gssapi_errmsg

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

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index a5b485b74d13..4a96ef387533 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -70,10 +70,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
-   $(ifneq $(filter $(OS),WNT), \
-   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_client \
-   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_errmsg \
-   ) \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \

core.git: extras/source

[Julien Nabet (via logerrit)]

 extras/source/tipoftheday/formdocuments.svg |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68008d9f0176c43ecc768af8e3539227640d1519
Author: Julien Nabet 
AuthorDate: Fri May 3 08:04:53 2024 +0200
Commit: Julien Nabet 
CommitDate: Fri May 3 09:51:04 2024 +0200

tdf#160916: typo "Checbox"

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

diff --git a/extras/source/tipoftheday/formdocuments.svg 
b/extras/source/tipoftheday/formdocuments.svg
index b6ad08cab3d7..a3d752292fa5 100644
--- a/extras/source/tipoftheday/formdocuments.svg
+++ b/extras/source/tipoftheday/formdocuments.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>PDF Form<
 g fill="#48484a">ChecboxRadio ButtonText 
Box
\ No newline at end of file
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>PDF Form<
 g fill="#48484a">CheckboxRadio ButtonText 
Box

About tdf#150082 gssapi

[Julien Nabet]

Hello,

I pushed a patch concerning tdf#150082 (LO Base MySQL connector don't 
accept auth via gssapi (missing auth_gssapi_client.dll?) but it 
concerned all OSes except Windows.


Indeed, on Windows, when I enable the build of gss in mk files, I got: 
"gssapi.h file missing"


On Debian, this file can be retrieved from these packages:

bind9-dev
heimdal-multidev
krb5-multidev
libglobus-gssapi-gsi-dev
libgssglue-dev
libkrb5-dev

Reading https://www.gnu.org/software/gss/manual/html_node/Header.html:

"

All standard interfaces (data types and functions) of the official GSS 
API are defined in the header file gss/api.h. The file is taken verbatim 
from the RFC (after correcting a few typos) where it is known as 
gssapi.h. However, to be able to co-exist gracefully with other GSS-API 
implementation, the name gssapi.h was changed.


The header file gss.h includes gss/api.h, and declares a few 
non-standard extensions (by including gss/ext.h), takes care of 
including header files related to all supported mechanisms (e.g., 
gss/krb5.h) and finally adds C++ namespace protection of all 
definitions. Therefore, including gss.h in your project is recommended 
over gss/api.h. If using gss.h instead of gss/api.h causes problems, it 
should be regarded a bug."


When searching about gss/api.h or gss.h, I only find libgss-dev on Debian

So

1) what libs to install on Windows to have one of these files available 
? (and without installing all Kerberos stuff)


2) shouldn't mariadb C connector rather use gss.h instead of gssapi.h ?

Julien

core.git: vcl/source

[Julien Nabet (via logerrit)]

 vcl/source/filter/png/PngImageReader.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e783a1c09093f3dbaf778661b77a2d5872a2029d
Author: Julien Nabet 
AuthorDate: Thu May 2 09:16:26 2024 +0200
Commit: Julien Nabet 
CommitDate: Thu May 2 19:14:38 2024 +0200

Extend silence strange -Wclobbered with GCC <= 14

See 2bcd9fe0fa10339294e6ab820498fa18334e02f3
Silence strange -Wclobbered with recent GCC 14

Change-Id: Id51659cb8cd49b65c55b22ed0ac515a8ab609602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166994
Reviewed-by: Stephan Bergmann 
Tested-by: Julien Nabet 

diff --git a/vcl/source/filter/png/PngImageReader.cxx 
b/vcl/source/filter/png/PngImageReader.cxx
index 61bfb9a0f16d..27e0e5bd766a 100644
--- a/vcl/source/filter/png/PngImageReader.cxx
+++ b/vcl/source/filter/png/PngImageReader.cxx
@@ -322,7 +322,7 @@ bool fcTLbeforeIDAT(SvStream& rStream)
 return false;
 }
 
-#if defined __GNUC__ && __GNUC__ == 14 && !defined __clang__
+#if defined __GNUC__ && __GNUC__ <= 14 && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclobbered"
 #endif
@@ -821,7 +821,7 @@ BinaryDataContainer getMsGifChunk(SvStream& rStream)
 return {};
 }
 }
-#if defined __GNUC__ && __GNUC__ == 14 && !defined __clang__
+#if defined __GNUC__ && __GNUC__ <= 14 && !defined __clang__
 #pragma GCC diagnostic pop
 #endif
 

core.git: sw/source

[Julien Nabet (via logerrit)]

 sw/source/core/doc/doc.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a835b40e05462e9be58cb501aa6b938f3dc998b8
Author: Julien Nabet 
AuthorDate: Wed May 1 15:50:50 2024 +0200
Commit: Julien Nabet 
CommitDate: Wed May 1 18:41:10 2024 +0200

Silence some bogus -Werror=array-bounds etc. also with GCC 13 and -std=c++20

See 1c3c27bc2e42f70e588ef5dbc769a8a346042e04
Silence some bogus -Werror=array-bounds etc. with GCC 12 and -std=c++20

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

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 62add1d5bae5..c6641fd4580a 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -992,13 +992,13 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
 // just one page is special ...
 if ( 1 == aVec.size() )
 {
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 12 && __cplusplus == 
202002L
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ <= 13 && __cplusplus == 
202002L
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
 #endif
 aVec.insert( aVec.begin() + 1, nullptr ); // insert a second empty page
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 12 && __cplusplus == 
202002L
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ <= 13 && __cplusplus == 
202002L
 #pragma GCC diagnostic pop
 #endif
 }

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

[Julien Nabet (via logerrit)]

 cui/source/tabpages/paragrph.cxx  |   10 ++
 sw/qa/uitest/writer_tests2/formatParagraph.py |2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 467b70a96820c70916015bb3386f219432e9c915
Author: Julien Nabet 
AuthorDate: Sat Apr 27 10:52:29 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 29 20:25:31 2024 +0200

tdf#159625: fix "allow to split paragraph"

2 pbs here:
1) bug described in the bugtracker, the uncheck isn't kept
=> just remove all the buggy GetOldItem stuff
2) after unchecked the option then saving the file and reloading the file, 
the option is still checked
=> change the buggy
rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
to
rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_TRUE, _nWhich ) );

In fact, I just mimicked the code used for "keep paragraphs" which works 
well.

Also change the QA test since "allow to split paragraph" is checked by 
default
so if the QA simulates a click on it, we expect the value to be false when 
dialog is opened again

Change-Id: I947feb02e0c282304621a252ad5e4c168c1d295a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166774
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 83236587bfca52513515b0b7a7dbfa18eed11503)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166725
Reviewed-by: Noel Grandin 
Reviewed-by: Xisco Fauli 
(cherry picked from commit cf370be03dfc6eb2cd4643548f2f25ad3bfc6612)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166843
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 132b125f0293..7675f1f7f0ec 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1774,14 +1774,8 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* 
rOutSet )
 
 if (m_xAllowSplitBox->get_state_changed_from_saved())
 {
-pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
-
-if ( !pOld || static_cast(pOld)->GetValue() 
!=
-  ( eState == TRISTATE_FALSE ) )
-{
-rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, 
_nWhich ) );
-bModified = true;
-}
+rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_TRUE, _nWhich ) );
+bModified = true;
 }
 
 // keep paragraphs
diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py 
b/sw/qa/uitest/writer_tests2/formatParagraph.py
index e90d0fd7f980..bfa6eff48dc9 100644
--- a/sw/qa/uitest/writer_tests2/formatParagraph.py
+++ b/sw/qa/uitest/writer_tests2/formatParagraph.py
@@ -177,7 +177,7 @@ class formatParagraph(UITestCase):
 self.assertEqual(get_state_as_dict(xspinWidow)["Text"], "2")
 self.assertEqual(get_state_as_dict(xcheckWidow)["Selected"], 
"false")
 self.assertEqual(get_state_as_dict(xcheckOrphan)["Selected"], 
"false")
-
self.assertEqual(get_state_as_dict(xcheckSplitPara)["Selected"], "true")
+
self.assertEqual(get_state_as_dict(xcheckSplitPara)["Selected"], "false")
 
self.assertEqual(get_state_as_dict(xcheckKeepPara)["Selected"], "true")
 
 

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

[Julien Nabet (via logerrit)]

 sfx2/source/doc/objstor.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit bb71d3949bbccc6c731933e2cd1e32b9b1080ddc
Author: Julien Nabet 
AuthorDate: Sun Apr 28 13:16:59 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 29 20:22:58 2024 +0200

tdf#160827: fix crash when retrieving _MarkAsFinal value (docx) (take 2)

Change-Id: I3f2ad56a205877be54b0dbfe361b76db3436f5ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166798
Reviewed-by: Noel Grandin 
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit 45d2d90d2354a6a32297cde52c0041915499b19b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166726
Reviewed-by: Xisco Fauli 
(cherry picked from commit 2ed402dada3b8b64c6f23cf5afc068848ab1a528)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166839
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 17ee6bf6217d..a6aaee75ea87 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2428,7 +2428,11 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo.is() && 
xPropertySetInfo->hasPropertyByName("_MarkAsFinal"))
 {
-if 
(xPropertySet->getPropertyValue("_MarkAsFinal").get())
+Any anyMarkAsFinal = 
xPropertySet->getPropertyValue("_MarkAsFinal");
+if (
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get()) ) ||
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get() == "true") )
+)
 {
 uno::Reference< lang::XMultiServiceFactory > 
xFactory(GetModel(), uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet > 
xSettings(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);

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

[Julien Nabet (via logerrit)]

 cui/source/tabpages/paragrph.cxx  |   10 ++
 sw/qa/uitest/writer_tests2/formatParagraph.py |2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit cf370be03dfc6eb2cd4643548f2f25ad3bfc6612
Author: Julien Nabet 
AuthorDate: Sat Apr 27 10:52:29 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 29 18:57:24 2024 +0200

tdf#159625: fix "allow to split paragraph"

2 pbs here:
1) bug described in the bugtracker, the uncheck isn't kept
=> just remove all the buggy GetOldItem stuff
2) after unchecked the option then saving the file and reloading the file, 
the option is still checked
=> change the buggy
rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
to
rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_TRUE, _nWhich ) );

In fact, I just mimicked the code used for "keep paragraphs" which works 
well.

Also change the QA test since "allow to split paragraph" is checked by 
default
so if the QA simulates a click on it, we expect the value to be false when 
dialog is opened again

Change-Id: I947feb02e0c282304621a252ad5e4c168c1d295a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166774
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 83236587bfca52513515b0b7a7dbfa18eed11503)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166725
Reviewed-by: Noel Grandin 
Reviewed-by: Xisco Fauli 

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 132b125f0293..7675f1f7f0ec 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1774,14 +1774,8 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* 
rOutSet )
 
 if (m_xAllowSplitBox->get_state_changed_from_saved())
 {
-pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
-
-if ( !pOld || static_cast(pOld)->GetValue() 
!=
-  ( eState == TRISTATE_FALSE ) )
-{
-rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, 
_nWhich ) );
-bModified = true;
-}
+rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_TRUE, _nWhich ) );
+bModified = true;
 }
 
 // keep paragraphs
diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py 
b/sw/qa/uitest/writer_tests2/formatParagraph.py
index e90d0fd7f980..bfa6eff48dc9 100644
--- a/sw/qa/uitest/writer_tests2/formatParagraph.py
+++ b/sw/qa/uitest/writer_tests2/formatParagraph.py
@@ -177,7 +177,7 @@ class formatParagraph(UITestCase):
 self.assertEqual(get_state_as_dict(xspinWidow)["Text"], "2")
 self.assertEqual(get_state_as_dict(xcheckWidow)["Selected"], 
"false")
 self.assertEqual(get_state_as_dict(xcheckOrphan)["Selected"], 
"false")
-
self.assertEqual(get_state_as_dict(xcheckSplitPara)["Selected"], "true")
+
self.assertEqual(get_state_as_dict(xcheckSplitPara)["Selected"], "false")
 
self.assertEqual(get_state_as_dict(xcheckKeepPara)["Selected"], "true")
 
 

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

[Julien Nabet (via logerrit)]

 sfx2/source/doc/objstor.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5c6b34cb3f8651da008c0b78da4211f4ee8f20f2
Author: Julien Nabet 
AuthorDate: Sun Apr 28 13:16:59 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 29 18:45:13 2024 +0200

tdf#160827: fix crash when retrieving _MarkAsFinal value (docx) (take 2)

Change-Id: I3f2ad56a205877be54b0dbfe361b76db3436f5ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166798
Reviewed-by: Noel Grandin 
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit 45d2d90d2354a6a32297cde52c0041915499b19b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166726
Reviewed-by: Xisco Fauli 
(cherry picked from commit 2ed402dada3b8b64c6f23cf5afc068848ab1a528)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166834

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 4dee93d1e917..91e4bb9ff61a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2308,7 +2308,11 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo.is() && 
xPropertySetInfo->hasPropertyByName("_MarkAsFinal"))
 {
-if 
(xPropertySet->getPropertyValue("_MarkAsFinal").get())
+Any anyMarkAsFinal = 
xPropertySet->getPropertyValue("_MarkAsFinal");
+if (
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get()) ) ||
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get() == "true") )
+)
 {
 uno::Reference< lang::XMultiServiceFactory > 
xFactory(GetModel(), uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet > 
xSettings(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);

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

[Julien Nabet (via logerrit)]

 sfx2/source/doc/objstor.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2ed402dada3b8b64c6f23cf5afc068848ab1a528
Author: Julien Nabet 
AuthorDate: Sun Apr 28 13:16:59 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 29 10:23:51 2024 +0200

tdf#160827: fix crash when retrieving _MarkAsFinal value (docx) (take 2)

Change-Id: I3f2ad56a205877be54b0dbfe361b76db3436f5ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166798
Reviewed-by: Noel Grandin 
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit 45d2d90d2354a6a32297cde52c0041915499b19b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166726
Reviewed-by: Xisco Fauli 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 17ee6bf6217d..a6aaee75ea87 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2428,7 +2428,11 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo.is() && 
xPropertySetInfo->hasPropertyByName("_MarkAsFinal"))
 {
-if 
(xPropertySet->getPropertyValue("_MarkAsFinal").get())
+Any anyMarkAsFinal = 
xPropertySet->getPropertyValue("_MarkAsFinal");
+if (
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get()) ) ||
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get() == "true") )
+)
 {
 uno::Reference< lang::XMultiServiceFactory > 
xFactory(GetModel(), uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet > 
xSettings(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);

core.git: sfx2/source

[Julien Nabet (via logerrit)]

 sfx2/source/doc/objstor.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 45d2d90d2354a6a32297cde52c0041915499b19b
Author: Julien Nabet 
AuthorDate: Sun Apr 28 13:16:59 2024 +0200
Commit: Julien Nabet 
CommitDate: Sun Apr 28 20:10:30 2024 +0200

tdf#160827: fix crash when retrieving _MarkAsFinal value (docx) (take 2)

Change-Id: I3f2ad56a205877be54b0dbfe361b76db3436f5ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166798
Reviewed-by: Noel Grandin 
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 720e939e3885..e7538813cfdd 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2741,7 +2741,11 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo.is() && 
xPropertySetInfo->hasPropertyByName("_MarkAsFinal"))
 {
-if 
(xPropertySet->getPropertyValue("_MarkAsFinal").get())
+Any anyMarkAsFinal = 
xPropertySet->getPropertyValue("_MarkAsFinal");
+if (
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get()) ) ||
+   ( (anyMarkAsFinal.getValueType() == 
cppu::UnoType::get()) && (anyMarkAsFinal.get() == "true") )
+)
 {
 uno::Reference< lang::XMultiServiceFactory > 
xFactory(GetModel(), uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet > 
xSettings(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);

core.git: cui/source sw/qa

[Julien Nabet (via logerrit)]

 cui/source/tabpages/paragrph.cxx  |   10 ++
 sw/qa/uitest/writer_tests2/formatParagraph.py |2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 83236587bfca52513515b0b7a7dbfa18eed11503
Author: Julien Nabet 
AuthorDate: Sat Apr 27 10:52:29 2024 +0200
Commit: Julien Nabet 
CommitDate: Sun Apr 28 13:38:02 2024 +0200

tdf#159625: fix "allow to split paragraph"

2 pbs here:
1) bug described in the bugtracker, the uncheck isn't kept
=> just remove all the buggy GetOldItem stuff
2) after unchecked the option then saving the file and reloading the file, 
the option is still checked
=> change the buggy
rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
to
rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_TRUE, _nWhich ) );

In fact, I just mimicked the code used for "keep paragraphs" which works 
well.

Also change the QA test since "allow to split paragraph" is checked by 
default
so if the QA simulates a click on it, we expect the value to be false when 
dialog is opened again

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

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 11fefa11ed07..98ee3558f0dd 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1799,14 +1799,8 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* 
rOutSet )
 
 if (m_xAllowSplitBox->get_state_changed_from_saved())
 {
-pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
-
-if ( !pOld || static_cast(pOld)->GetValue() 
!=
-  ( eState == TRISTATE_FALSE ) )
-{
-rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, 
_nWhich ) );
-bModified = true;
-}
+rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_TRUE, _nWhich ) );
+bModified = true;
 }
 
 // keep paragraphs
diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py 
b/sw/qa/uitest/writer_tests2/formatParagraph.py
index e90d0fd7f980..bfa6eff48dc9 100644
--- a/sw/qa/uitest/writer_tests2/formatParagraph.py
+++ b/sw/qa/uitest/writer_tests2/formatParagraph.py
@@ -177,7 +177,7 @@ class formatParagraph(UITestCase):
 self.assertEqual(get_state_as_dict(xspinWidow)["Text"], "2")
 self.assertEqual(get_state_as_dict(xcheckWidow)["Selected"], 
"false")
 self.assertEqual(get_state_as_dict(xcheckOrphan)["Selected"], 
"false")
-
self.assertEqual(get_state_as_dict(xcheckSplitPara)["Selected"], "true")
+
self.assertEqual(get_state_as_dict(xcheckSplitPara)["Selected"], "false")
 
self.assertEqual(get_state_as_dict(xcheckKeepPara)["Selected"], "true")
 
 

core.git: sfx2/source

[Julien Nabet (via logerrit)]

 sfx2/source/doc/objstor.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 5158104b9294ab85ab7a675b5b627469e303c345
Author: Julien Nabet 
AuthorDate: Sun Apr 28 13:09:34 2024 +0200
Commit: Julien Nabet 
CommitDate: Sun Apr 28 13:11:21 2024 +0200

Revert "tdf#160827: fix crash when retrieving _MarkAsFinal value (docx)"

As Noel advised in https://gerrit.libreoffice.org/c/core/+/166724, it's 
better to test type this way:
getValueType() == cppu::UnoType::get()

This reverts commit f49d74edf76097d014ed891d0025cb2e9b197c5a.

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

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 441641d1c65c..720e939e3885 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2741,13 +2741,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo.is() && 
xPropertySetInfo->hasPropertyByName("_MarkAsFinal"))
 {
-Any anyMarkAsFinal = 
xPropertySet->getPropertyValue("_MarkAsFinal");
-const OUString strValueTypeName = 
anyMarkAsFinal.getValueTypeName();
-
-if (
-   ( (strValueTypeName == "boolean") && 
(anyMarkAsFinal.get()) ) ||
-   ( (strValueTypeName == "string") && 
(anyMarkAsFinal.get() == "true") )
-)
+if 
(xPropertySet->getPropertyValue("_MarkAsFinal").get())
 {
 uno::Reference< lang::XMultiServiceFactory > 
xFactory(GetModel(), uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet > 
xSettings(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);

core.git: sfx2/source

[Julien Nabet (via logerrit)]

 sfx2/source/doc/objstor.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f49d74edf76097d014ed891d0025cb2e9b197c5a
Author: Julien Nabet 
AuthorDate: Fri Apr 26 23:20:31 2024 +0200
Commit: Julien Nabet 
CommitDate: Sun Apr 28 11:39:38 2024 +0200

tdf#160827: fix crash when retrieving _MarkAsFinal value (docx)

xPropertySet->getPropertyValue("_MarkAsFinal") can retrieve an Any
containing a boolean or a string

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

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 720e939e3885..441641d1c65c 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2741,7 +2741,13 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo.is() && 
xPropertySetInfo->hasPropertyByName("_MarkAsFinal"))
 {
-if 
(xPropertySet->getPropertyValue("_MarkAsFinal").get())
+Any anyMarkAsFinal = 
xPropertySet->getPropertyValue("_MarkAsFinal");
+const OUString strValueTypeName = 
anyMarkAsFinal.getValueTypeName();
+
+if (
+   ( (strValueTypeName == "boolean") && 
(anyMarkAsFinal.get()) ) ||
+   ( (strValueTypeName == "string") && 
(anyMarkAsFinal.get() == "true") )
+)
 {
 uno::Reference< lang::XMultiServiceFactory > 
xFactory(GetModel(), uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet > 
xSettings(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);

core.git: external/liblangtag

[Julien Nabet (via logerrit)]

 external/liblangtag/ExternalProject_liblangtag.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 73229b441f0f0aa6ab4e3ae051f9d09f683361fc
Author: Julien Nabet 
AuthorDate: Thu Apr 25 21:56:45 2024 +0200
Commit: Julien Nabet 
CommitDate: Fri Apr 26 08:45:59 2024 +0200

Typo gb_Trace_ liblangtrag instead of liblangtag

Change-Id: Ib4b66549725c6010b1c9b9baf11674f86ac5f1ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166652
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/external/liblangtag/ExternalProject_liblangtag.mk 
b/external/liblangtag/ExternalProject_liblangtag.mk
index 0f005e27b355..a682250ebe8e 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,liblangtag,\
 ))
 
 $(call gb_ExternalProject_get_state_target,liblangtag,build):
-   $(call gb_Trace_StartRange,liblangtrag,EXTERNAL)
+   $(call gb_Trace_StartRange,liblangtag,EXTERNAL)
$(call gb_ExternalProject_run,build,\
MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure --disable-modules 
--disable-test --disable-introspection --with-pic \
$(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \
@@ -44,6 +44,6 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):

$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \
) \
)
-   $(call gb_Trace_EndRange,liblangtrag,EXTERNAL)
+   $(call gb_Trace_EndRange,liblangtag,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:

core.git: static/CustomTarget_wasm-qt5-mandelbrot_moc.mk

[Julien Nabet (via logerrit)]

 static/CustomTarget_wasm-qt5-mandelbrot_moc.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe3b209596c065395c6589deb886fa1449c04540
Author: Julien Nabet 
AuthorDate: Thu Apr 25 22:11:08 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 26 07:29:53 2024 +0200

gb_Trace_EndRange MOC instead of CXX (CustomTarget_wasm-qt5-mandelbrot_moc)

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

diff --git a/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk 
b/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
index d3da8235c5f9..afd28784eb96 100644
--- a/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
+++ b/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
@@ -24,7 +24,7 @@ $(qt5_mandelbrot_MOCDEFS_H): $(qt5_mandelbrot_MOCDEFS_CXX) | 
$(qt5_mandelbrot_WO
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CXX)
$(CXX) -pipe -O2 -std=gnu++11 -fno-exceptions $(gb_EMSCRIPTEN_CPPFLAGS) 
-dM -E -o $@ $<
-   $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MOC)
+   $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CXX)
 
 $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/%.moc : \
$(SRCDIR)/static/source/qt5-mandelbrot/%.h \

Re: Windows installer errors and warnings

[Julien Nabet]

You're welcome! :-)

Unless I missed it, don't forget license part! (see 
https://wiki.documentfoundation.org/Development/GetInvolved#License_statement).


Julien

Re: Windows installer errors and warnings

[Julien Nabet]

Hello

I can't tell about your comment but since you seem to have some 
knowledge on this part and you even attached a patch, I propose you to 
follow https://wiki.documentfoundation.org/Development/GetInvolved.


You'll be able to submit the patch directly on the gerrit so it'll be 
easier for review.


Julien

core.git: configure.ac connectivity/Library_mysqlc.mk external/mariadb-connector-c

[Julien Nabet (via logerrit)]

 configure.ac|   22 
++
 connectivity/Library_mysqlc.mk  |1 
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |9 
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |6 ++
 4 files changed, 38 insertions(+)

New commits:
commit 53ab6269215d4e37af3f9dfaae2a306e040c5b88
Author: Julien Nabet 
AuthorDate: Sat Nov 25 15:04:07 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Apr 22 19:56:48 2024 +0200

tdf#150082: LO Base MariaDB/MySQL connector don't accept auth via gssapi

Exclude Windows since we're not sure gssapi.h is available (at least 
Jenkins Windows machine doesn't have it)

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

diff --git a/configure.ac b/configure.ac
index 8c434dd5243e..b1ace35b8d1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2725,6 +2725,7 @@ AC_ARG_WITH(locales,
 ,)
 
 # Kerberos and GSSAPI used only by PostgreSQL as of LibO 3.5
+# and also by Mariadb/Mysql since LibO 24.8
 libo_FUZZ_ARG_WITH(krb5,
 AS_HELP_STRING([--with-krb5],
 [Enable MIT Kerberos 5 support in modules that support it.
@@ -10229,6 +10230,11 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
 dnl ===
 dnl Check for system MariaDB
 dnl ===
+
+if test "$with_gssapi" = "yes" -a "$enable_openssl" = "no"; then
+AC_MSG_ERROR([GSSAPI needs OpenSSL, but --disable-openssl was given.])
+fi
+
 AC_MSG_CHECKING([which MariaDB to use])
 if test "$with_system_mariadb" = "yes"; then
 AC_MSG_RESULT([external])
@@ -10277,10 +10283,26 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
 /g' | grep -E '(mysqlclient|mariadb)')
 if test "$_os" = "Darwin"; then
 LIBMARIADB=${LIBMARIADB}.dylib
+if test "$with_gssapi" != "no"; then
+WITH_GSSAPI=TRUE
+save_LIBS=$LIBS
+AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 
'gssapi -lkrb5 -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
+GSSAPI_LIBS=$LIBS
+LIBS=$save_LIBS
+fi
 elif test "$_os" = "WINNT"; then
 LIBMARIADB=${LIBMARIADB}.dll
 else
 LIBMARIADB=${LIBMARIADB}.so
+if test "$with_gssapi" != "no"; then
+WITH_GSSAPI=TRUE
+save_LIBS=$LIBS
+AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 
'gssapi -lkrb5 -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
+GSSAPI_LIBS=$LIBS
+LIBS=$save_LIBS
+fi
 fi
 LIBMARIADB_PATH=$($MARIADBCONFIG --variable=pkglibdir)
 AC_MSG_CHECKING([for $LIBMARIADB in $LIBMARIADB_PATH])
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index af46fb9ba137..33ffc5cb28b0 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\
 ))
 
 $(eval $(call gb_Library_add_libs,mysqlc,\
+   $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
$(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\
-lz -lm,-rdynamic -lz -lcrypt -lm)) \
$(if $(filter LINUX,$(OS)),-ldl,) \
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index b8802e16695e..a5b485b74d13 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -53,6 +53,11 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_net \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_password \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_pvio \
+   $(ifneq $(filter $(OS),WNT), \
+   
UnpackedTarball/mariadb-connector-c/plugins/auth/auth_gssapi_client \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_client \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_errmsg \
+   ) \
UnpackedTarball/mariadb-connector-c/libmariadb/

core.git: connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/cpool/ZPoolCollection.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 0cb63cd392a9ee7b355028722121ac1ccead7336
Author: Julien Nabet 
AuthorDate: Sat Apr 20 12:18:24 2024 +0200
Commit: Noel Grandin 
CommitDate: Sun Apr 21 20:58:13 2024 +0200

tdf#144256: Missing destruction of FirebirdDriver, OSDBCDriverManager

... , OPoolCollection

However destruction is called when closing LO, not when just closing the 
file.

Change-Id: Iacb09b73de49b9635240d3b43e721b8b02d35afd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166370
Tested-by: Julien Nabet 
Reviewed-by: Noel Grandin 

diff --git a/connectivity/source/cpool/ZPoolCollection.cxx 
b/connectivity/source/cpool/ZPoolCollection.cxx
index 47167ed5700a..16f415fc4f4e 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -76,7 +76,6 @@ OPoolCollection::OPoolCollection(const Reference< 
XComponentContext >& _rxContex
 m_xManager = DriverManager::create( m_xContext );
 
 m_xProxyFactory = ProxyFactory::create( m_xContext );
-
 Reference xProp(getConfigPoolRoot(),UNO_QUERY);
 if ( xProp.is() )
 xProp->addPropertyChangeListener(getEnablePoolingNodeName(),this);
@@ -371,9 +370,9 @@ void SAL_CALL OPoolCollection::queryTermination( const 
EventObject& /*Event*/ )
 {
 }
 
-void SAL_CALL OPoolCollection::notifyTermination( const EventObject& /*Event*/ 
)
+void SAL_CALL OPoolCollection::notifyTermination( const EventObject& Event )
 {
-clearDesktop();
+disposing(Event);
 }
 
 void SAL_CALL OPoolCollection::disposing( const EventObject& Source )
@@ -402,6 +401,10 @@ void SAL_CALL OPoolCollection::disposing( const 
EventObject& Source )
 TOOLS_WARN_EXCEPTION("connectivity.cpool", "");
 }
 }
+m_xConfigNode.clear();
+m_xProxyFactory.clear();
+m_xManager.clear();
+m_xContext.clear();
 }
 
 void SAL_CALL OPoolCollection::propertyChange( const 
css::beans::PropertyChangeEvent& evt )

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

[Julien Nabet (via logerrit)]

 oox/source/core/filterbase.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe9beede27ce613f01fe51d0c7cc894878d4b31e
Author: Julien Nabet 
AuthorDate: Thu Mar 14 12:20:05 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Apr 11 19:15:22 2024 +0200

tdf#160192: fix crash when trying to overwrite file in RO dir+lock file

Bug exposed with:
5259ab8104cfba60c40748ed0cd59d93df038c5b
sfx2 store: create temp files next to local files

bt:
6  0x7faac67ad9b5 in 
sax_fastparser::FastSaxSerializer::FastSaxSerializer(com::sun::star::uno::Reference
 const&) (this=0x559f316f0e70, xOutputStream=empty uno::Reference)
at sax/source/tools/fastserializer.cxx:68
7  0x7faac67c46e0 in 
sax_fastparser::FastSerializerHelper::FastSerializerHelper(com::sun::star::uno::Reference
 const&, bool)
(this=0x559f31721400, xOutputStream=empty uno::Reference, 
bWriteHeader=true) at sax/source/tools/fshelper.cxx:30
8  0x7fa9bfa1b4cc in 
std::_Construct, bool 
const&>(sax_fastparser::FastSerializerHelper*, 
com::sun::star::uno::Reference&&, bool 
const&) (__p=0x559f31721400, __args=..., __args=@0x7ffecd609207: true)
at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/stl_construct.h:119
...
15 0x7fa9bfa04087 in 
oox::core::XmlFilterBase::openFragmentStreamWithSerializer(rtl::OUString 
const&, rtl::OUString const&)
(this=0x559f318ed5f0, rStreamName="docProps/core.xml", 
rMediaType="application/vnd.openxmlformats-package.core-properties+xml") at 
oox/source/core/xmlfilterbase.cxx:511
16 0x7fa9bfa04999 in 
oox::core::writeCoreProperties(oox::core::XmlFilterBase&, 
com::sun::star::uno::Reference 
const&)
(rSelf=..., xProperties=uno::Reference to ((anonymous 
namespace)::SfxDocumentMetaData *) 0x559f2d673e28) at 
oox/source/core/xmlfilterbase.cxx:645
17 0x7fa9bfa047c2 in 
oox::core::XmlFilterBase::exportDocumentProperties(com::sun::star::uno::Reference
 const&, bool)
(this=0x559f318ed5f0, xProperties=uno::Reference to ((anonymous 
namespace)::SfxDocumentMetaData *) 0x559f2d673e28, 
bSecurityOptOpenReadOnly=false) at oox/source/core/xmlfilterbase.cxx:981
18 0x7fa9bee21bd4 in DocxExport::WriteProperties() 
(this=0x7ffecd609d78) at sw/source/filter/ww8/docxexport.cxx:952
19 0x7fa9bee24b0b in DocxExport::DocxExport(DocxExportFilter&, SwDoc&, 
std::shared_ptr&, SwPaM&, bool, bool)
(this=0x7ffecd609d78, rFilter=..., rDocument=..., 
pCurrentPam=std::shared_ptr (use count 1, weak count 1) = {...}, 
rOriginalPam=SwPaM = {...}, bDocm=false, bTemplate=false)
at sw/source/filter/ww8/docxexport.cxx:2149
20 0x7fa9bee4438e in DocxExportFilter::exportDocument() 
(this=0x559f318ed5f0) at sw/source/filter/ww8/docxexportfilter.cxx:112
21 0x7fa9bf9d6b8b in 
oox::core::FilterBase::filter(com::sun::star::uno::Sequence
 const&) (this=0x559f318ed5f0, rMediaDescSeq=uno::Sequence of length 12 = {...})
at oox/source/core/filterbase.cxx:494

full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=193113

Patch prevents LO from crashing + make LO displays error message:
Error saving the document :
Write Error.
The file could not be written

Change-Id: I41a94eeb17bb6568b586d89755bce330154d1dad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164808
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 2887ffbf240aa70330cb50bf810170cf9c896405)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164821
Reviewed-by: Christian Lohmaier 

diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index ac2c1f5c7e0a..9252e88759e4 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -492,7 +492,7 @@ sal_Bool SAL_CALL FilterBase::filter( const Sequence< 
PropertyValue >& rMediaDes
 if( mxImpl->mxOutStream.is() )
 {
 mxImpl->mxStorage = implCreateStorage( mxImpl->mxOutStream 
);
-bRet = mxImpl->mxStorage && exportDocument() && 
implFinalizeExport( getMediaDescriptor() );
+bRet = mxImpl->mxStorage && mxImpl->mxStorage->isStorage() 
&& exportDocument() && implFinalizeExport( getMediaDescriptor() );
 }
 break;
 }

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

[Julien Nabet (via logerrit)]

 sw/source/ui/index/cnttab.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87ef871a777b1d44486ae51e536c95a0b5c49e67
Author: Julien Nabet 
AuthorDate: Mon Mar 25 13:59:06 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Apr 2 03:38:02 2024 +0200

Related tdf#160351: the field name can be shorter than two symbols

Change-Id: Ieb6b78b3f9802e66de642a9e708b11c55c0d9a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165285
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 02609da5ee8188cb00fc0b97052d2cc8d2576900)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165249
Reviewed-by: Xisco Fauli 
(cherry picked from commit b94108edce1ea90044dba46156ab935410cd71ca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165312
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 61aeb63080d1..3435e59820b8 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3126,7 +3126,7 @@ void SwTokenWindow::InsertAtSelection(const SwFormToken& 
rToken)
 //use the first two chars as symbol
 OUString sTmp(SwAuthorityFieldType::GetAuthFieldName(
 
static_cast(aToInsertToken.nAuthorityField)));
-pButton->SetText(sTmp.copy(0, 2));
+pButton->SetText(sTmp.copy(0, std::min(sTmp.getLength(), 
sal_Int32(2;
 }
 
 pButton->Check();

core.git: svx/uiconfig

[Julien Nabet (via logerrit)]

 svx/uiconfig/ui/docking3deffects.ui |   12 
 1 file changed, 12 insertions(+)

New commits:
commit d75979503b738ca3233b12f9442394f2fc2ff528
Author: Julien Nabet 
AuthorDate: Sun Mar 31 22:31:30 2024 +0200
Commit: Julien Nabet 
CommitDate: Mon Apr 1 11:11:28 2024 +0200

gtk_label_set_label: assertion 'GTK_IS_LABEL (label)' failed 
(docking3deffects)

Change-Id: I9c9cb39716ff99808db66404853252295fda6336
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165601
Reviewed-by: Julien Nabet 
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins

diff --git a/svx/uiconfig/ui/docking3deffects.ui 
b/svx/uiconfig/ui/docking3deffects.ui
index a49a138b389e..ad63300e3689 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -1231,6 +1231,7 @@
 center
 0
 True
+
 
   
 
@@ -1469,6 +1470,7 @@
 start
 0
 True
+
 
   
 
@@ -1492,6 +1494,7 @@
 start
 0
 True
+
 
   
 
@@ -1510,6 +1513,7 @@
 start
 0
 True
+
 
   
 
@@ -1528,6 +1532,7 @@
 start
 0
 True
+
 
   
 
@@ -1546,6 +1551,7 @@
 start
 0
 True
+
 
   
 
@@ -1564,6 +1570,7 @@
 start
 0
 True
+
 
   
 
@@ -1582,6 +1589,7 @@
 start
 0
 True
+
 
   
 
@@ -1600,6 +1608,7 @@
 start
 0
 True
+
 
   
 
@@ -2082,6 +2091,7 @@
 True
 0
 True
+
 
   
 
@@ -2105,6 +2115,7 @@
 True
 0
 True
+
 
   
 
@@ -2249,6 +2260,7 @@
 True
 0
 True
+
 
   
 

core.git: 2 commits - sd/source solenv/sanitizers

[Julien Nabet (via logerrit)]

 sd/source/ui/app/optsitem.cxx  |2 +-
 solenv/sanitizers/ui/svx.suppr |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4317a448cf4b5bb0d64acddd178c89f6a8effd5d
Author: Julien Nabet 
AuthorDate: Sun Mar 31 22:42:55 2024 +0200
Commit: Julien Nabet 
CommitDate: Mon Apr 1 10:00:56 2024 +0200

remove unused suppression

since fe4cd0cebdbf9412e26f8182e79f97bb844d94af
Date:   Thu Feb 22 14:09:12 2024 +0100
Set button label directly in ui file

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

diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 43bfe21038c0..0c952e5dc460 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -62,7 +62,6 @@ svx/uiconfig/ui/mediawindow.ui://GtkScale[@id='timeslider'] 
no-labelled-by
 svx/uiconfig/ui/mediawindow.ui://GtkScale[@id='volumeslider'] no-labelled-by
 svx/uiconfig/ui/metricfieldbox.ui://GtkSpinButton[@id='metricfield'] 
no-labelled-by
 svx/uiconfig/ui/navigationbar.ui://GtkEntry[@id='entry-noframe'] no-labelled-by
-svx/uiconfig/ui/numberingwindow.ui://GtkButton[@id='more'] button-no-label
 svx/uiconfig/ui/optgridpage.ui://GtkLabel[@id='label4'] orphan-label
 svx/uiconfig/ui/optgridpage.ui://GtkLabel[@id='label5'] orphan-label
 svx/uiconfig/ui/paralinespacingcontrol.ui://GtkSpinButton[@id='percent_box'] 
no-labelled-by
commit 1731c3fb2084c02cb0882a5c8d72fc040644c278
Author: Julien Nabet 
AuthorDate: Sun Mar 31 23:08:40 2024 +0200
Commit: Julien Nabet 
CommitDate: Mon Apr 1 10:00:47 2024 +0200

NewDoc/AutoPilot is for Impress only

Fix this log:

warn:unotools.config:582397:582397:unotools/source/config/configitem.cxx:423:
ignoring XHierarchicalNameAccess NewDoc/AutoPilot 
com.sun.star.container.NoSuchElementException
message: "NewDoc/AutoPilot at 
/home/julien/lo/libreoffice/configmgr/source/access.cxx:442"
context: configmgr::RootAccess

Since 0e14912af0c449396f10c2ae4be3c7f2a3a98bc2
tdf#157788 Saving the "Show navigation panel" setting for a device

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

diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 9fd8d453bbcd..925cfaa15662 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -500,7 +500,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& 
ppNames, sal_uLong& rCount )
 "TabBarVisible"
 };
 
-rCount = ( IsImpress() ? SAL_N_ELEMENTS(aPropNames) : 16 );
+rCount = ( IsImpress() ? SAL_N_ELEMENTS(aPropNames) : 15 );
 ppNames = aPropNames;
 }
 

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

[Julien Nabet (via logerrit)]

 sw/source/ui/index/cnttab.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81fdf964bec1c4555db2f08c300c7b3f09130fbc
Author: Julien Nabet 
AuthorDate: Mon Mar 25 13:59:06 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Mar 26 14:17:35 2024 +0100

Related tdf#160351: the field name can be shorter than two symbols

Change-Id: Ieb6b78b3f9802e66de642a9e708b11c55c0d9a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165285
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 02609da5ee8188cb00fc0b97052d2cc8d2576900)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165249
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index f07cf8ab2883..535dc298dd5a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3140,7 +3140,7 @@ void SwTokenWindow::InsertAtSelection(const SwFormToken& 
rToken)
 //use the first two chars as symbol
 OUString sTmp(SwAuthorityFieldType::GetAuthFieldName(
 
static_cast(aToInsertToken.nAuthorityField)));
-pButton->SetText(sTmp.copy(0, 2));
+pButton->SetText(sTmp.copy(0, std::min(sTmp.getLength(), 
sal_Int32(2;
 }
 
 pButton->Check();

core.git: sw/source

[Julien Nabet (via logerrit)]

 sw/source/ui/index/cnttab.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02609da5ee8188cb00fc0b97052d2cc8d2576900
Author: Julien Nabet 
AuthorDate: Mon Mar 25 13:59:06 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 25 22:43:20 2024 +0100

Related tdf#160351: the field name can be shorter than two symbols

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

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index f07cf8ab2883..535dc298dd5a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3140,7 +3140,7 @@ void SwTokenWindow::InsertAtSelection(const SwFormToken& 
rToken)
 //use the first two chars as symbol
 OUString sTmp(SwAuthorityFieldType::GetAuthFieldName(
 
static_cast(aToInsertToken.nAuthorityField)));
-pButton->SetText(sTmp.copy(0, 2));
+pButton->SetText(sTmp.copy(0, std::min(sTmp.getLength(), 
sal_Int32(2;
 }
 
 pButton->Check();

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 40f6e9a45edae06556e1d1a26237dc2ab12bc0ca
Author: Julien Nabet 
AuthorDate: Mon Mar 4 13:21:06 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Mar 19 22:22:45 2024 +0100

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

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

Change-Id: Ie44378119202addd8ddb46f0be4b0124be9fd48b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164354
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164644
(cherry picked from commit 2bb8b6df61d3fd27d38a9ac1724295b885e5e919)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164627
Reviewed-by: Michael Weghorn 
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

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

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 545179ee711381b641dd6a34e46722353f2b2488
Author: Julien Nabet 
AuthorDate: Fri Mar 8 17:35:00 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Mar 19 18:51:18 2024 +0100

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

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

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

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

[Julien Nabet (via logerrit)]

 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 2c11aa68477e957fb298605baca08ec48acffcd7
Author: Julien Nabet 
AuthorDate: Sun Mar 17 09:31:22 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Mar 19 18:47:41 2024 +0100

tdf#160225, related tdf#92768: hide axis title not taken into account 
when...

duplicating sheet or when saving a file and reopen it.

When creating a title for an axis, "createTitle" is called.
Before tdf#92768 "support hiding title objects", when unchecking "axis 
title" in sidebar,
the title was removed (via "removeTitle")
But since tdf#92768, "hideTitle" is called instead.

The pb is "Visible" attribute wasn't registered in 
StaticTitleWrapperPropertyArray.
So when duplicating sheet after having created a title and hidden it,
when duplicating sheet, the new sheet had the title visible.
In the same way if, after having created a title and hidden it,
you save the file and reopen it, the title is displayed.

Change-Id: I980505ec02906e673dd60a60e4d9837928bf8876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164938
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 6aac5b2c96b42e8204a10def52df1b85ebebeb46)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164878
(cherry picked from commit b97348107831c5699e679dc8d2c36d626122ae0c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164995
Reviewed-by: Xisco Fauli 

diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 75d6c9e98f1f..9c802462ff09 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -127,6 +127,7 @@ namespace
 enum
 {
 PROP_TITLE_STRING,
+PROP_TITLE_VISIBLE,
 PROP_TITLE_TEXT_ROTATION,
 PROP_TITLE_TEXT_STACKED
 };
@@ -140,6 +141,12 @@ void lcl_AddPropertiesToVector(
   beans::PropertyAttribute::BOUND
   | beans::PropertyAttribute::MAYBEVOID );
 
+rOutProperties.emplace_back( "Visible",
+  PROP_TITLE_VISIBLE,
+  cppu::UnoType::get(),
+  beans::PropertyAttribute::BOUND
+  | beans::PropertyAttribute::MAYBEVOID );
+
 rOutProperties.emplace_back( "TextRotation",
   PROP_TITLE_TEXT_ROTATION,
   cppu::UnoType::get(),

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

[Julien Nabet (via logerrit)]

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

New commits:
commit b2f5db9d7c590a0dbbb6062008520a84854d582c
Author: Julien Nabet 
AuthorDate: Mon Mar 4 13:21:06 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Mar 19 17:59:57 2024 +0100

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

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

Change-Id: Ie44378119202addd8ddb46f0be4b0124be9fd48b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164354
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164623
(cherry picked from commit 4d2338ef6ac34ce248c868b05f6fcbf45e6428c2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164628
Reviewed-by: Michael Weghorn 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

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

core.git: Branch 'libreoffice-7-6-6' - compilerplugins/LICENSE.TXT cui/inc odk/docs odk/examples odk/index.html odk/index_online.html readlicense_oo/license setup_native/source sfx2/uiconfig

[Julien Nabet (via logerrit)]

 compilerplugins/LICENSE.TXT  |2 
 cui/inc/strings.hrc  |2 
 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 
 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 
 18 files changed, 100 insertions(+), 100 deletions(-)

New commits:
commit 3d9c55e7a45fdd06bb4e00c62a9f3bbc81197e94
Author: Julien Nabet 
AuthorDate: Wed Mar 13 21:50:45 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Mar 18 16:53:25 2024 +0100

tdf#160180: bump copyright year to 2024

Change-Id: I466b8f86e8a53a238ed2ce2d2b053dc519ff8eed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164794
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Julien Nabet 
(cherry picked from commit 94da114cd86e3bcd8b6235566ca5f926f09d4b18)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164884
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 5889cecd2e7b805f5d268820e7c2817725990a34)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164885
Tested-by: Christian Lohmaier 

diff --git a/compilerplugins/LICENSE.TXT b/compilerplugins/LICENSE.TXT
index 1e8587c1cce9..860092aee87e 100644
--- a/compilerplugins/LICENSE.TXT
+++ b/compilerplugins/LICENSE.TXT
@@ -1,7 +1,7 @@
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2012-2023 The Document Foundation
+Copyright (c) 2012-2024 The Document Foundation
 All rights reserved.
 
 Developed by:
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 84a2c9f859a1..143435c4f1ce 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -368,7 +368,7 @@
 
 #define RID_CUISTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2023 LibreOffice contributors.")
+#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2024 LibreOffice contributors.")
 #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_CUISTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_CUISTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
diff --git a/odk/docs/install.html b/odk/docs/install.html
index aaafae6ce9c3..3bf36d8a2563 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -534,7 +534,7 @@
 
 
   
-Copyright © 2000–2023 LibreOffice contributors. All rights
+Copyright © 2000–2024 LibreOffice contributors. All rights
   reserved.
   LibreOffice was created by The Document Foundation, based on 
OpenOffice.org.
   The Document Foundation acknowledges all community members, 
please
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index d71d36f2401d..d639a5f393d8 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -881,7 +881,7 @@ types the specified types depend on.
 
 
 
-Copyright © 2000–2023 LibreOffice contributors. 
All rights reserved.
+Copyright © 2000–2024 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 
2011,
diff --git a/odk/examples/DevelopersGuide/examples.html 
b/odk/examples/DevelopersGuide/examples.html
index df5a83fdd1d9..cb

core.git: Branch 'libreoffice-7-6' - compilerplugins/LICENSE.TXT cui/inc odk/docs odk/examples odk/index.html odk/index_online.html readlicense_oo/license setup_native/source sfx2/uiconfig

[Julien Nabet (via logerrit)]

 compilerplugins/LICENSE.TXT  |2 
 cui/inc/strings.hrc  |2 
 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 
 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 
 18 files changed, 100 insertions(+), 100 deletions(-)

New commits:
commit a53e0079fa771c53106948fcacf6262cb2dad008
Author: Julien Nabet 
AuthorDate: Wed Mar 13 21:50:45 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Mar 18 16:51:57 2024 +0100

tdf#160180: bump copyright year to 2024

Change-Id: I466b8f86e8a53a238ed2ce2d2b053dc519ff8eed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164794
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Julien Nabet 
(cherry picked from commit 94da114cd86e3bcd8b6235566ca5f926f09d4b18)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164884
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/compilerplugins/LICENSE.TXT b/compilerplugins/LICENSE.TXT
index 1e8587c1cce9..860092aee87e 100644
--- a/compilerplugins/LICENSE.TXT
+++ b/compilerplugins/LICENSE.TXT
@@ -1,7 +1,7 @@
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2012-2023 The Document Foundation
+Copyright (c) 2012-2024 The Document Foundation
 All rights reserved.
 
 Developed by:
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 84a2c9f859a1..143435c4f1ce 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -368,7 +368,7 @@
 
 #define RID_CUISTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2023 LibreOffice contributors.")
+#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2024 LibreOffice contributors.")
 #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_CUISTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_CUISTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
diff --git a/odk/docs/install.html b/odk/docs/install.html
index aaafae6ce9c3..3bf36d8a2563 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -534,7 +534,7 @@
 
 
   
-Copyright © 2000–2023 LibreOffice contributors. All rights
+Copyright © 2000–2024 LibreOffice contributors. All rights
   reserved.
   LibreOffice was created by The Document Foundation, based on 
OpenOffice.org.
   The Document Foundation acknowledges all community members, 
please
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index d71d36f2401d..d639a5f393d8 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -881,7 +881,7 @@ types the specified types depend on.
 
 
 
-Copyright © 2000–2023 LibreOffice contributors. 
All rights reserved.
+Copyright © 2000–2024 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 
2011,
diff --git a/odk/examples/DevelopersGuide/examples.html 
b/odk/examples/DevelopersGuide/examples.html
index df5a83fdd1d9..cbcdc8736e64 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -2856,7 +2856,7 @@ for the Office application.
  

core.git: Branch 'libreoffice-24-2-2' - compilerplugins/LICENSE.TXT cui/inc odk/docs odk/examples odk/index.html odk/index_online.html readlicense_oo/license setup_native/source sfx2/uiconfig

[Julien Nabet (via logerrit)]

 compilerplugins/LICENSE.TXT  |2 
 cui/inc/strings.hrc  |2 
 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 
 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 
 18 files changed, 100 insertions(+), 100 deletions(-)

New commits:
commit 32db1b0cc61c9457411accf2e7832507c2836fdd
Author: Julien Nabet 
AuthorDate: Wed Mar 13 21:50:45 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Mar 18 13:52:08 2024 +0100

tdf#160180: bump copyright year to 2024

Change-Id: I466b8f86e8a53a238ed2ce2d2b053dc519ff8eed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164794
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Julien Nabet 
(cherry picked from commit 94da114cd86e3bcd8b6235566ca5f926f09d4b18)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164748
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 52084113d5c284e2eca364191a96d38490580b49)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164883
Tested-by: Christian Lohmaier 

diff --git a/compilerplugins/LICENSE.TXT b/compilerplugins/LICENSE.TXT
index 1e8587c1cce9..860092aee87e 100644
--- a/compilerplugins/LICENSE.TXT
+++ b/compilerplugins/LICENSE.TXT
@@ -1,7 +1,7 @@
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2012-2023 The Document Foundation
+Copyright (c) 2012-2024 The Document Foundation
 All rights reserved.
 
 Developed by:
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index f5252694459c..52c4a7e4244a 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -358,7 +358,7 @@
 
 #define RID_CUISTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2023 LibreOffice contributors.")
+#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2024 LibreOffice contributors.")
 #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_CUISTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_CUISTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
diff --git a/odk/docs/install.html b/odk/docs/install.html
index aaafae6ce9c3..3bf36d8a2563 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -534,7 +534,7 @@
 
 
   
-Copyright © 2000–2023 LibreOffice contributors. All rights
+Copyright © 2000–2024 LibreOffice contributors. All rights
   reserved.
   LibreOffice was created by The Document Foundation, based on 
OpenOffice.org.
   The Document Foundation acknowledges all community members, 
please
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index f9edc69c9394..d17542825537 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -881,7 +881,7 @@ types the specified types depend on.
 
 
 
-Copyright © 2000–2023 LibreOffice contributors. 
All rights reserved.
+Copyright © 2000–2024 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 
2011,
diff --git a/odk/examples/DevelopersGuide/examples.html 
b/odk/examples/DevelopersGuide/examples.html
index 7112439f4fac..e8

core.git: Branch 'libreoffice-24-2' - compilerplugins/LICENSE.TXT cui/inc odk/docs odk/examples odk/index.html odk/index_online.html readlicense_oo/license setup_native/source sfx2/uiconfig

[Julien Nabet (via logerrit)]

 compilerplugins/LICENSE.TXT  |2 
 cui/inc/strings.hrc  |2 
 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 
 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 
 18 files changed, 100 insertions(+), 100 deletions(-)

New commits:
commit 697dbd9a708e73f6e83a76baf0541dcaf1489a68
Author: Julien Nabet 
AuthorDate: Wed Mar 13 21:50:45 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Mar 18 13:49:42 2024 +0100

tdf#160180: bump copyright year to 2024

Change-Id: I466b8f86e8a53a238ed2ce2d2b053dc519ff8eed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164794
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Julien Nabet 
(cherry picked from commit 94da114cd86e3bcd8b6235566ca5f926f09d4b18)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164748
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/compilerplugins/LICENSE.TXT b/compilerplugins/LICENSE.TXT
index 1e8587c1cce9..860092aee87e 100644
--- a/compilerplugins/LICENSE.TXT
+++ b/compilerplugins/LICENSE.TXT
@@ -1,7 +1,7 @@
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2012-2023 The Document Foundation
+Copyright (c) 2012-2024 The Document Foundation
 All rights reserved.
 
 Developed by:
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index f5252694459c..52c4a7e4244a 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -358,7 +358,7 @@
 
 #define RID_CUISTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2023 LibreOffice contributors.")
+#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2024 LibreOffice contributors.")
 #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_CUISTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_CUISTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
diff --git a/odk/docs/install.html b/odk/docs/install.html
index aaafae6ce9c3..3bf36d8a2563 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -534,7 +534,7 @@
 
 
   
-Copyright © 2000–2023 LibreOffice contributors. All rights
+Copyright © 2000–2024 LibreOffice contributors. All rights
   reserved.
   LibreOffice was created by The Document Foundation, based on 
OpenOffice.org.
   The Document Foundation acknowledges all community members, 
please
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index f9edc69c9394..d17542825537 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -881,7 +881,7 @@ types the specified types depend on.
 
 
 
-Copyright © 2000–2023 LibreOffice contributors. 
All rights reserved.
+Copyright © 2000–2024 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 
2011,
diff --git a/odk/examples/DevelopersGuide/examples.html 
b/odk/examples/DevelopersGuide/examples.html
index 7112439f4fac..e8cc4a50a5a1 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -2856,7 +2856,7 @@ for the Office application.
  

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

[Julien Nabet (via logerrit)]

 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit b97348107831c5699e679dc8d2c36d626122ae0c
Author: Julien Nabet 
AuthorDate: Sun Mar 17 09:31:22 2024 +0100
Commit: Noel Grandin 
CommitDate: Mon Mar 18 07:46:25 2024 +0100

tdf#160225, related tdf#92768: hide axis title not taken into account 
when...

duplicating sheet or when saving a file and reopen it.

When creating a title for an axis, "createTitle" is called.
Before tdf#92768 "support hiding title objects", when unchecking "axis 
title" in sidebar,
the title was removed (via "removeTitle")
But since tdf#92768, "hideTitle" is called instead.

The pb is "Visible" attribute wasn't registered in 
StaticTitleWrapperPropertyArray.
So when duplicating sheet after having created a title and hidden it,
when duplicating sheet, the new sheet had the title visible.
In the same way if, after having created a title and hidden it,
you save the file and reopen it, the title is displayed.

Change-Id: I980505ec02906e673dd60a60e4d9837928bf8876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164938
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 6aac5b2c96b42e8204a10def52df1b85ebebeb46)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164878

diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 75d6c9e98f1f..9c802462ff09 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -127,6 +127,7 @@ namespace
 enum
 {
 PROP_TITLE_STRING,
+PROP_TITLE_VISIBLE,
 PROP_TITLE_TEXT_ROTATION,
 PROP_TITLE_TEXT_STACKED
 };
@@ -140,6 +141,12 @@ void lcl_AddPropertiesToVector(
   beans::PropertyAttribute::BOUND
   | beans::PropertyAttribute::MAYBEVOID );
 
+rOutProperties.emplace_back( "Visible",
+  PROP_TITLE_VISIBLE,
+  cppu::UnoType::get(),
+  beans::PropertyAttribute::BOUND
+  | beans::PropertyAttribute::MAYBEVOID );
+
 rOutProperties.emplace_back( "TextRotation",
   PROP_TITLE_TEXT_ROTATION,
   cppu::UnoType::get(),

core.git: chart2/source

[Julien Nabet (via logerrit)]

 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 9661b094e10602148c3cf68bcce01f4a6714bedd
Author: Julien Nabet 
AuthorDate: Sun Mar 17 09:31:22 2024 +0100
Commit: Julien Nabet 
CommitDate: Sun Mar 17 11:14:23 2024 +0100

tdf#160225, related tdf#92768: hide axis title not taken into account 
when...

duplicating sheet or when saving a file and reopen it.

When creating a title for an axis, "createTitle" is called.
Before tdf#92768 "support hiding title objects", when unchecking "axis 
title" in sidebar,
the title was removed (via "removeTitle")
But since tdf#92768, "hideTitle" is called instead.

The pb is "Visible" attribute wasn't registered in 
StaticTitleWrapperPropertyArray.
So when duplicating sheet after having created a title and hidden it,
when duplicating sheet, the new sheet had the title visible.
In the same way if, after having created a title and hidden it,
you save the file and reopen it, the title is displayed.

Change-Id: I980505ec02906e673dd60a60e4d9837928bf8876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164938
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 75d6c9e98f1f..9c802462ff09 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -127,6 +127,7 @@ namespace
 enum
 {
 PROP_TITLE_STRING,
+PROP_TITLE_VISIBLE,
 PROP_TITLE_TEXT_ROTATION,
 PROP_TITLE_TEXT_STACKED
 };
@@ -140,6 +141,12 @@ void lcl_AddPropertiesToVector(
   beans::PropertyAttribute::BOUND
   | beans::PropertyAttribute::MAYBEVOID );
 
+rOutProperties.emplace_back( "Visible",
+  PROP_TITLE_VISIBLE,
+  cppu::UnoType::get(),
+  beans::PropertyAttribute::BOUND
+  | beans::PropertyAttribute::MAYBEVOID );
+
 rOutProperties.emplace_back( "TextRotation",
   PROP_TITLE_TEXT_ROTATION,
   cppu::UnoType::get(),

core.git: oox/source

[Julien Nabet (via logerrit)]

 oox/source/core/filterbase.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2887ffbf240aa70330cb50bf810170cf9c896405
Author: Julien Nabet 
AuthorDate: Thu Mar 14 12:20:05 2024 +0100
Commit: Miklos Vajna 
CommitDate: Thu Mar 14 15:33:15 2024 +0100

tdf#160192: fix crash when trying to overwrite file in RO dir+lock file

Bug exposed with:
5259ab8104cfba60c40748ed0cd59d93df038c5b
sfx2 store: create temp files next to local files

bt:
6  0x7faac67ad9b5 in 
sax_fastparser::FastSaxSerializer::FastSaxSerializer(com::sun::star::uno::Reference
 const&) (this=0x559f316f0e70, xOutputStream=empty uno::Reference)
at sax/source/tools/fastserializer.cxx:68
7  0x7faac67c46e0 in 
sax_fastparser::FastSerializerHelper::FastSerializerHelper(com::sun::star::uno::Reference
 const&, bool)
(this=0x559f31721400, xOutputStream=empty uno::Reference, 
bWriteHeader=true) at sax/source/tools/fshelper.cxx:30
8  0x7fa9bfa1b4cc in 
std::_Construct, bool 
const&>(sax_fastparser::FastSerializerHelper*, 
com::sun::star::uno::Reference&&, bool 
const&) (__p=0x559f31721400, __args=..., __args=@0x7ffecd609207: true)
at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/stl_construct.h:119
...
15 0x7fa9bfa04087 in 
oox::core::XmlFilterBase::openFragmentStreamWithSerializer(rtl::OUString 
const&, rtl::OUString const&)
(this=0x559f318ed5f0, rStreamName="docProps/core.xml", 
rMediaType="application/vnd.openxmlformats-package.core-properties+xml") at 
oox/source/core/xmlfilterbase.cxx:511
16 0x7fa9bfa04999 in 
oox::core::writeCoreProperties(oox::core::XmlFilterBase&, 
com::sun::star::uno::Reference 
const&)
(rSelf=..., xProperties=uno::Reference to ((anonymous 
namespace)::SfxDocumentMetaData *) 0x559f2d673e28) at 
oox/source/core/xmlfilterbase.cxx:645
17 0x7fa9bfa047c2 in 
oox::core::XmlFilterBase::exportDocumentProperties(com::sun::star::uno::Reference
 const&, bool)
(this=0x559f318ed5f0, xProperties=uno::Reference to ((anonymous 
namespace)::SfxDocumentMetaData *) 0x559f2d673e28, 
bSecurityOptOpenReadOnly=false) at oox/source/core/xmlfilterbase.cxx:981
18 0x7fa9bee21bd4 in DocxExport::WriteProperties() 
(this=0x7ffecd609d78) at sw/source/filter/ww8/docxexport.cxx:952
19 0x7fa9bee24b0b in DocxExport::DocxExport(DocxExportFilter&, SwDoc&, 
std::shared_ptr&, SwPaM&, bool, bool)
(this=0x7ffecd609d78, rFilter=..., rDocument=..., 
pCurrentPam=std::shared_ptr (use count 1, weak count 1) = {...}, 
rOriginalPam=SwPaM = {...}, bDocm=false, bTemplate=false)
at sw/source/filter/ww8/docxexport.cxx:2149
20 0x7fa9bee4438e in DocxExportFilter::exportDocument() 
(this=0x559f318ed5f0) at sw/source/filter/ww8/docxexportfilter.cxx:112
21 0x7fa9bf9d6b8b in 
oox::core::FilterBase::filter(com::sun::star::uno::Sequence
 const&) (this=0x559f318ed5f0, rMediaDescSeq=uno::Sequence of length 12 = {...})
at oox/source/core/filterbase.cxx:494

full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=193113

Patch prevents LO from crashing + make LO displays error message:
Error saving the document :
Write Error.
The file could not be written

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

diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 6a2a51e47577..1fafb6ac9e4f 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -491,7 +491,7 @@ sal_Bool SAL_CALL FilterBase::filter( const Sequence< 
PropertyValue >& rMediaDes
 if( mxImpl->mxOutStream.is() )
 {
 mxImpl->mxStorage = implCreateStorage( mxImpl->mxOutStream 
);
-bRet = mxImpl->mxStorage && exportDocument() && 
implFinalizeExport( getMediaDescriptor() );
+bRet = mxImpl->mxStorage && mxImpl->mxStorage->isStorage() 
&& exportDocument() && implFinalizeExport( getMediaDescriptor() );
 }
 break;
 }

core.git: compilerplugins/LICENSE.TXT cui/inc odk/docs odk/examples odk/index.html odk/index_online.html readlicense_oo/license setup_native/source sfx2/uiconfig

[Julien Nabet (via logerrit)]

 compilerplugins/LICENSE.TXT  |2 
 cui/inc/strings.hrc  |2 
 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 
 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 
 18 files changed, 100 insertions(+), 100 deletions(-)

New commits:
commit 94da114cd86e3bcd8b6235566ca5f926f09d4b18
Author: Julien Nabet 
AuthorDate: Wed Mar 13 21:50:45 2024 +0100
Commit: Julien Nabet 
CommitDate: Wed Mar 13 22:55:18 2024 +0100

tdf#160180: bump copyright year to 2024

Change-Id: I466b8f86e8a53a238ed2ce2d2b053dc519ff8eed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164794
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Julien Nabet 

diff --git a/compilerplugins/LICENSE.TXT b/compilerplugins/LICENSE.TXT
index 1e8587c1cce9..860092aee87e 100644
--- a/compilerplugins/LICENSE.TXT
+++ b/compilerplugins/LICENSE.TXT
@@ -1,7 +1,7 @@
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2012-2023 The Document Foundation
+Copyright (c) 2012-2024 The Document Foundation
 All rights reserved.
 
 Developed by:
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 953f67b25342..96f67c5fe8f3 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -355,7 +355,7 @@
 
 #define RID_CUISTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2023 LibreOffice contributors.")
+#define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2024 LibreOffice contributors.")
 #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_CUISTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_CUISTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
diff --git a/odk/docs/install.html b/odk/docs/install.html
index aaafae6ce9c3..3bf36d8a2563 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -534,7 +534,7 @@
 
 
   
-Copyright © 2000–2023 LibreOffice contributors. All rights
+Copyright © 2000–2024 LibreOffice contributors. All rights
   reserved.
   LibreOffice was created by The Document Foundation, based on 
OpenOffice.org.
   The Document Foundation acknowledges all community members, 
please
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index f9edc69c9394..d17542825537 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -881,7 +881,7 @@ types the specified types depend on.
 
 
 
-Copyright © 2000–2023 LibreOffice contributors. 
All rights reserved.
+Copyright © 2000–2024 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 
2011,
diff --git a/odk/examples/DevelopersGuide/examples.html 
b/odk/examples/DevelopersGuide/examples.html
index 7112439f4fac..e8cc4a50a5a1 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -2856,7 +2856,7 @@ for the Office application.
 
 
 
-Copyright © 2000–2023 LibreOffice contributors. 
All rights reserved.
+Copyright © 20

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 3980cd484b00737d2e954bc16a7df31c42481bf5
Author: Julien Nabet 
AuthorDate: Mon Mar 4 13:21:06 2024 +0100
Commit: Miklos Vajna 
CommitDate: Tue Mar 12 08:35:48 2024 +0100

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

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

Change-Id: Ie44378119202addd8ddb46f0be4b0124be9fd48b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164354
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164586
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 18db9d334e1cafddeef53ddff435d6c059aaf803)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164676

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

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

[Julien Nabet (via logerrit)]

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

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

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

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

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

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

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

[Julien Nabet (via logerrit)]

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

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

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

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

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

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

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

[Julien Nabet (via logerrit)]

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

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

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

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

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

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

[Julien Nabet (via logerrit)]

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

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

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

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

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

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

core.git: sw/source

[Julien Nabet (via logerrit)]

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

New commits:
commit 82e6236cd6ba6f45aa913a3be606e6b00f81fe07
Author: Julien Nabet 
AuthorDate: Fri Mar 8 17:35:00 2024 +0100
Commit: Julien Nabet 
CommitDate: Sat Mar 9 09:53:51 2024 +0100

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

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

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

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

[Julien Nabet (via logerrit)]

 sw/source/uibase/uiview/view2.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit c899c2e463c61d056e68efd180e0a596c7569a1e
Author: Julien Nabet 
AuthorDate: Fri Mar 1 12:14:52 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 7 12:17:59 2024 +0100

tdf#159955: fix custom page number

Change-Id: I1a56a4ba266dfb3c21e3b77263ecaa44b4e6dad5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164210
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit d440dcfcaf688544a7a6d8bc478048159e5200f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164197
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index cc6faf78a3c5..f7a10a49f747 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -286,14 +286,21 @@ OUString SwView::GetPageStr(sal_uInt16 nPhyNum, 
sal_uInt16 nVirtNum, const OUStr
 ? SwResId(STR_PAGE_COUNT_PRINTED)
 : (extra.isEmpty() ? SwResId(STR_PAGE_COUNT) : 
SwResId(STR_PAGE_COUNT_CUSTOM)));
 aStr = aStr.replaceFirst("%1", OUString::number(nPhyNum));
-aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
 if (nPageCount != nPrintedPageCount)
 {
+aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
 aStr = aStr.replaceFirst("%3", OUString::number(nPrintedPhyNum));
 aStr = aStr.replaceFirst("%4", OUString::number(nPrintedPageCount));
 }
-else
-aStr = aStr.replaceFirst("%3", extra);
+else {
+if (extra.isEmpty())
+aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
+else
+{
+aStr = aStr.replaceFirst("%2", extra);
+aStr = aStr.replaceFirst("%3", OUString::number(nPageCount));
+}
+}
 
 return aStr;
 }

Re: VCL selection

[Julien Nabet]

Hello

I suppose "get_desktop_environment" in 
vcl/unx/generic/desktopdetect/desktopdetector.cxx may be a good start


(see 
https://opengrok.libreoffice.org/xref/core/vcl/unx/generic/desktopdetect/desktopdetector.cxx?r=6361a939=4425=127#127)


Julien

core.git: helpcontent2

[Julien Nabet (via logerrit)]

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

New commits:
commit 6c92e46875988bad3850e7e3a917f42eb8c7b322
Author: Julien Nabet 
AuthorDate: Wed Mar 6 09:06:55 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Mar 6 09:06:55 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to cd7186fc1b3f63bc941f61fe95116da060bdb5da
  - Revert "Related tdf#155723: "Cube" is in fact "Cuboid""

This reverts commit d13c501f790c5130fa5b23da99be6b92770a08d4.

Reason for revert: "Cuboid" is one of the Basic shapes, "3D Objects" 
still uses "Cube" (and it's right).
My fault here, sorry for this.

Thanks to Stanislav Horacek for having spotted this.

Change-Id: I0ff1ed73cb6e6915034adf7949f8a4799fc0d3b0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164381
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/helpcontent2 b/helpcontent2
index 2db4af6e13fc..cd7186fc1b3f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2db4af6e13fc373fecc4c04fb362a1ff26da738a
+Subproject commit cd7186fc1b3f63bc941f61fe95116da060bdb5da

help.git: source/text

[Julien Nabet (via logerrit)]

 source/text/simpress/02/1009.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cd7186fc1b3f63bc941f61fe95116da060bdb5da
Author: Julien Nabet 
AuthorDate: Tue Mar 5 20:25:01 2024 +0100
Commit: Julien Nabet 
CommitDate: Wed Mar 6 09:06:54 2024 +0100

Revert "Related tdf#155723: "Cube" is in fact "Cuboid""

This reverts commit d13c501f790c5130fa5b23da99be6b92770a08d4.

Reason for revert: "Cuboid" is one of the Basic shapes, "3D Objects" still 
uses "Cube" (and it's right).
My fault here, sorry for this.

Thanks to Stanislav Horacek for having spotted this.

Change-Id: I0ff1ed73cb6e6915034adf7949f8a4799fc0d3b0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164381
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/source/text/simpress/02/1009.xhp 
b/source/text/simpress/02/1009.xhp
index ec5735f760..f1828eb81f 100644
--- a/source/text/simpress/02/1009.xhp
+++ b/source/text/simpress/02/1009.xhp
@@ -59,15 +59,15 @@
   
 To rotate a 3D 
object around any of its three axes, click to select the object, and then click 
again to display its rotation handles. Drag a handle in the direction you want 
to rotate the object.
 
-Cuboid
-Draws a filled cuboid where you drag in the slide. To draw a 3D 
rectangle, hold down Shift while you 
drag.
+Cube
+Draws a filled cube where you drag in the slide. To draw a 3D 
rectangle, hold down Shift while you 
drag.
   
 
   
-Icon Cuboid
+Icon Cube
   
   
-Cuboid
+Cube
   
 
   

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

[Julien Nabet (via logerrit)]

 sw/source/uibase/uiview/view2.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit ba23eadc772ad983a810addd4df068fd43a7f7d5
Author: Julien Nabet 
AuthorDate: Fri Mar 1 12:14:52 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Mar 5 18:35:01 2024 +0100

tdf#159955: fix custom page number

Change-Id: I1a56a4ba266dfb3c21e3b77263ecaa44b4e6dad5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164210
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit d440dcfcaf688544a7a6d8bc478048159e5200f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164281
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 585f38b7cae1..28a096f67a84 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -284,14 +284,21 @@ OUString SwView::GetPageStr(sal_uInt16 nPhyNum, 
sal_uInt16 nVirtNum, const OUStr
 ? SwResId(STR_PAGE_COUNT_PRINTED)
 : (extra.isEmpty() ? SwResId(STR_PAGE_COUNT) : 
SwResId(STR_PAGE_COUNT_CUSTOM)));
 aStr = aStr.replaceFirst("%1", OUString::number(nPhyNum));
-aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
 if (nPageCount != nPrintedPageCount)
 {
+aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
 aStr = aStr.replaceFirst("%3", OUString::number(nPrintedPhyNum));
 aStr = aStr.replaceFirst("%4", OUString::number(nPrintedPageCount));
 }
-else
-aStr = aStr.replaceFirst("%3", extra);
+else {
+if (extra.isEmpty())
+aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
+else
+{
+aStr = aStr.replaceFirst("%2", extra);
+aStr = aStr.replaceFirst("%3", OUString::number(nPageCount));
+}
+}
 
 return aStr;
 }

core.git: sc/source

[Julien Nabet (via logerrit)]

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

New commits:
commit e19340d13ca40ede3fe671b7d2b710e0a53a0d31
Author: Julien Nabet 
AuthorDate: Mon Mar 4 13:21:06 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 4 18:00:27 2024 +0100

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

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

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

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

core.git: vcl/skia

[Julien Nabet (via logerrit)]

 vcl/skia/skia_denylist_vulkan.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09f19a4c06dc389fde11fc79cf3f912a5199ed48
Author: Julien Nabet 
AuthorDate: Fri Mar 1 11:45:51 2024 +0100
Commit: Julien Nabet 
CommitDate: Sat Mar 2 09:14:50 2024 +0100

Related tdf#158945: Calc: crash when entering text in a cell

Fixed from driver version 0.405.1237

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

diff --git a/vcl/skia/skia_denylist_vulkan.xml 
b/vcl/skia/skia_denylist_vulkan.xml
index 5d5ff41cc008..22d60c45389a 100644
--- a/vcl/skia/skia_denylist_vulkan.xml
+++ b/vcl/skia/skia_denylist_vulkan.xml
@@ -30,7 +30,7 @@
  
 
 
- 
+ 
 
 
  

core.git: sw/source

[Julien Nabet (via logerrit)]

 sw/source/uibase/uiview/view2.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 4e060f854cd175ff7ef8f3c2dd3f0dbf5cc48ad2
Author: Julien Nabet 
AuthorDate: Fri Mar 1 12:14:52 2024 +0100
Commit: Julien Nabet 
CommitDate: Fri Mar 1 21:01:12 2024 +0100

tdf#159955: fix custom page number

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

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 1845b99441bd..4957ba03c522 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -289,14 +289,21 @@ OUString SwView::GetPageStr(sal_uInt16 nPhyNum, 
sal_uInt16 nVirtNum, const OUStr
 ? SwResId(STR_PAGE_COUNT_PRINTED)
 : (extra.isEmpty() ? SwResId(STR_PAGE_COUNT) : 
SwResId(STR_PAGE_COUNT_CUSTOM)));
 aStr = aStr.replaceFirst("%1", OUString::number(nPhyNum));
-aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
 if (nPageCount != nPrintedPageCount)
 {
+aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
 aStr = aStr.replaceFirst("%3", OUString::number(nPrintedPhyNum));
 aStr = aStr.replaceFirst("%4", OUString::number(nPrintedPageCount));
 }
-else
-aStr = aStr.replaceFirst("%3", extra);
+else {
+if (extra.isEmpty())
+aStr = aStr.replaceFirst("%2", OUString::number(nPageCount));
+else
+{
+aStr = aStr.replaceFirst("%2", extra);
+aStr = aStr.replaceFirst("%3", OUString::number(nPageCount));
+}
+}
 
 return aStr;
 }

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

[Julien Nabet (via logerrit)]

 include/svx/svx3ditems.hxx   |4 +-
 include/svx/unoshprp.hxx |4 +-
 svx/source/engine3d/float3d.cxx  |   27 ---
 svx/source/engine3d/svx3ditems.cxx   |6 ++--
 svx/source/sdr/primitive3d/sdrattributecreator3d.cxx |   15 ++
 xmloff/source/draw/sdpropls.cxx  |   11 ---
 6 files changed, 34 insertions(+), 33 deletions(-)

New commits:
commit 458f4c9b489d92947c4122e7c450f65f90aa4efe
Author: Julien Nabet 
AuthorDate: Tue Feb 27 08:16:00 2024 +0100
Commit: Julien Nabet 
CommitDate: Wed Feb 28 10:55:45 2024 +0100

tdf#159874: Inspection of 3D object in Dev Tools crashes LO (take 2)

To not trigger tdf#159911 (FILEOPEN: 3D object is displayed as black/white)
Let's initialize Svx3DTextureKindItem to 2 which corresponds to COLOR in 
TextureKind2.idl
(see 
https://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/drawing/TextureKind2.idl?r=5687eba4)

but now to avoid the crash, we must replace all uses of TextureKind by 
TextureKind2
Anyway, TextureKind has been deprecated since 2000
(see 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=4f9e6d84feb36ab3072dafbab0ba4ae46d264f9b
"#80594# added a new TextureKind2 enum because of missing value in 
TextureKind")

+ use css::drawing::TextureKind2_LUMINANCE + 
css::drawing::TextureKind2_COLOR instead of wrong numbers

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

diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx
index 7cb5eae6e399..c749b7eab112 100644
--- a/include/svx/svx3ditems.hxx
+++ b/include/svx/svx3ditems.hxx
@@ -119,9 +119,9 @@ inline SfxUInt16Item 
makeSvx3DMaterialSpecularIntensityItem(sal_uInt16 nVal) {
 
 class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureKindItem final : public 
SfxUInt16Item {
 public:
-Svx3DTextureKindItem(sal_uInt16 nVal = 3);
+Svx3DTextureKindItem(sal_uInt16 nVal = 2);
 
-// use drawing::TextureKind
+// use drawing::TextureKind2
 SVX_DLLPRIVATE virtual  bool QueryValue( css::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const override;
 SVX_DLLPRIVATE virtual  bool PutValue( const css::uno::Any& rVal, 
sal_uInt8 nMemberId ) override;
 SVX_DLLPRIVATE virtual Svx3DTextureKindItem* Clone(SfxItemPool* pPool = 
nullptr) const override;
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 53561015804b..0bf49b7a3e8c 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -55,7 +55,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -529,7 +529,7 @@
 { UNO_NAME_3D_NORMALS_KIND ,SDRATTR_3DOBJ_NORMALS_KIND 
   , ::cppu::UnoType::get(), 0, 0}, \
 { UNO_NAME_3D_SHADOW_3D,SDRATTR_3DOBJ_SHADOW_3D
   , cppu::UnoType::get(), 0, 0}, \
 { UNO_NAME_3D_TEXTURE_FILTER   ,SDRATTR_3DOBJ_TEXTURE_FILTER   
   , cppu::UnoType::get(), 0, 0}, \
-{ UNO_NAME_3D_TEXTURE_KIND ,SDRATTR_3DOBJ_TEXTURE_KIND 
   , ::cppu::UnoType::get(), 0, 0}, \
+{ UNO_NAME_3D_TEXTURE_KIND ,SDRATTR_3DOBJ_TEXTURE_KIND 
   , ::cppu::UnoType::get(), 0, 0}, \
 { UNO_NAME_3D_TEXTURE_MODE ,SDRATTR_3DOBJ_TEXTURE_MODE 
   , ::cppu::UnoType::get(), 0, 0}, \
 { UNO_NAME_3D_TEXTURE_PROJ_X   ,SDRATTR_3DOBJ_TEXTURE_PROJ_X   
   , ::cppu::UnoType::get(), 0, 0}, \
 { UNO_NAME_3D_TEXTURE_PROJ_Y   ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y   
   , ::cppu::UnoType::get(), 0, 0}, \
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 035ca293faa6..aa27d5319a3c 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -50,6 +50,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
@@ -1349,12 +1350,13 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs )
 if( eState != SfxItemState::DONTCARE )
 {
 sal_uInt16 nValue = 
rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND).GetValue();
+drawing::TextureKind2 objTextKind = 
static_cast(nValue);
 
-if( ( !m_xBtnTexLuminance->get_active() && nValue == 1 ) ||
-( !m_xBtnTexColor->get_active() && nValue == 3 ) )
+if( ( !m_xBtnTexLuminance->get_active() && objTextKind == 
css::drawing::TextureKind2_LUMINANCE ) ||
+( !m_xBtnTexColor->get_active() && objTextKind == 
css::drawing::TextureKind2_COLOR ) )
 {
-m_xBtnTexLuminance->set_active( nValue == 1 );
-m_xBtnTexColor->set_active( nValue == 3 );
+m_xBtnTexLuminance->set_active( objTextKind == 
css::drawing::TextureKind2_LU

core.git: basic/source

[Julien Nabet (via logerrit)]

 basic/source/comp/loops.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd8fc8e24bae35ad392482d797e7db994ca03ac8
Author: Julien Nabet 
AuthorDate: Tue Feb 27 11:02:26 2024 +0100
Commit: Julien Nabet 
CommitDate: Tue Feb 27 11:02:51 2024 +0100

Typo: alredy->already

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

diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index f903f650a2bf..2a756b6fb3a5 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -213,7 +213,7 @@ void SbiParser::For()
 if (!aLvalue.IsVariable())
 {
 bAbort = true;
-return; // the error is alredy set in SbiExpression ctor
+return; // the error is already set in SbiExpression ctor
 }
 aLvalue.Gen();  // variable on the Stack
 

core.git: sd/source

[Julien Nabet (via logerrit)]

 sd/source/ui/slideshow/slideshowimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5e012b85a20d467fd8c0e86689039eb8c79457e
Author: Julien Nabet 
AuthorDate: Tue Feb 27 09:22:18 2024 +0100
Commit: Julien Nabet 
CommitDate: Tue Feb 27 11:00:54 2024 +0100

cid#1592380 COPY_PASTE_ERROR

Change-Id: Ib5c57ba2118531449908600b22fd49f52277159b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164005
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 31418cdcd2ef..095c4436965f 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3436,7 +3436,7 @@ void SlideshowImpl::Notify(SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint)
 {
 case SdrHintKind::ObjectInserted:
 {
-if (nullptr != mnEventObjectChange)
+if (nullptr != mnEventObjectInserted)
 // avoid multiple events
 return;
 

[RESOLVED] Re: TextureKind deprecated since 2000, should we use TextureKind2 everywhere?

[Julien Nabet]

I've just submitted a new patch concerning tdf#159874 since first 
attempt generated tdf#159911 (FILEOPEN: 3D object is displayed as 
black/white)


see https://gerrit.libreoffice.org/c/core/+/163998

core.git: include/svx

[Julien Nabet (via logerrit)]

 include/svx/svx3ditems.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87109270ce08a1f50bb1b791ff6c5a0abc8db891
Author: Julien Nabet 
AuthorDate: Mon Feb 26 17:13:19 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Feb 26 21:55:10 2024 +0100

Revert "tdf#159874: Inspection of 3D object in Development Tools crashes 
LibreOffice"

This reverts commit ff197bf1a9a8a6cd73fe0e1cc03c4424d9e1dc2e.

Reason for revert: generates regression, see tdf#159911 (FILEOPEN: 3D 
object is displayed as black/white)

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

diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx
index a7da4b1e861f..7cb5eae6e399 100644
--- a/include/svx/svx3ditems.hxx
+++ b/include/svx/svx3ditems.hxx
@@ -119,7 +119,7 @@ inline SfxUInt16Item 
makeSvx3DMaterialSpecularIntensityItem(sal_uInt16 nVal) {
 
 class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureKindItem final : public 
SfxUInt16Item {
 public:
-Svx3DTextureKindItem(sal_uInt16 nVal = 0);
+Svx3DTextureKindItem(sal_uInt16 nVal = 3);
 
 // use drawing::TextureKind
 SVX_DLLPRIVATE virtual  bool QueryValue( css::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const override;

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

[Julien Nabet (via logerrit)]

 svl/source/items/srchitem.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e803a23b8a1c4c66cdd3cef00252867ba9a1193
Author: Julien Nabet 
AuthorDate: Sat Feb 24 09:40:14 2024 +0100
Commit: Eike Rathke 
CommitDate: Mon Feb 26 17:56:04 2024 +0100

tdf#159862: set SearchWildcard to false changes SearchRegularExpression 
value

Like this since 2016 with 3a0abd3019ec3ca29b8f1378cdb32ebf741e6306
add SvxSearchItem::GetWildcard() SetWildcard()

Change-Id: Id988a6e58488af6b1f274a318e9d1f52c7a8b169
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163876
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit d05e863c69b5611964a4a2eb242ee9566cfb659e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163836
Reviewed-by: Eike Rathke 

diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 1300bf744afa..6aa7c36ddca2 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -364,7 +364,7 @@ void SvxSearchItem::SetWildcard( bool bVal )
 {
 m_aSearchOpt.AlgorithmType2 = SearchAlgorithms2::WILDCARD;
 }
-else if ( SearchAlgorithms2::REGEXP == m_aSearchOpt.AlgorithmType2 )
+else if ( SearchAlgorithms2::WILDCARD == m_aSearchOpt.AlgorithmType2 )
 {
 m_aSearchOpt.AlgorithmType2 = SearchAlgorithms2::ABSOLUTE;
 }

TextureKind deprecated since 2000, should we use TextureKind2 everywhere?

[Julien Nabet]

Hello,

When investigating about tdf#159874 (Inspection of 3D object in 
Development Tools crashes LibreOffice), I noticed there were 
TextureKind.idl and TextureKind2.idl


Taking a look at git history, I noticed first one was deprecated since 
4f9e6d84feb36ab3072dafbab0ba4ae46d264f9b


"#80594# added a new TextureKind2 enum because of missing value in 
TextureKind"


in 2000!

=> should we only use TextureKind2.idl now?

Also, in svx/source/sdr/primitive3d/sdrattributecreator3d.cxx, we can 
read this comment:
// TextureKind: 1 == Base3DTextureLuminance, 2 == 
Base3DTextureIntensity, 3 == Base3DTextureColor
See 
https://opengrok.libreoffice.org/xref/core/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx?r=05416682#88

but TextureKind2.idl defines LUMINANCE, INTENSITY and COLOR with no number,
so I expect they take by default values 0, 1 and 2
See 
https://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/drawing/TextureKind2.idl?r=5687eba4


Same pb too with this line:
// TextureMode: 1 == Base3DTextureReplace, 2 == Base3DTextureModulate, 3 
== Base3DTextureBlend

TextureMode.idl just indicates: REPLACE, MODULATE and BLEND

=> should we change comments and related code?

Julien

core.git: Branch 'libreoffice-24-2-1' - 2 commits - external/xmlsec sfx2/source

[Julien Nabet (via logerrit)]

 external/xmlsec/BCryptKeyDerivation.patch.1 |   51 
 external/xmlsec/UnpackedTarball_xmlsec.mk   |2 +
 sfx2/source/doc/sfxbasemodel.cxx|2 -
 3 files changed, 54 insertions(+), 1 deletion(-)

New commits:
commit 6d69bfd42eb5ecb06a0a2b4dec8819fb6d1561f2
Author: Julien Nabet 
AuthorDate: Wed Feb 14 10:21:20 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Sun Feb 25 14:30:46 2024 +0100

tdf#159707: fix crash when changing to edit mode (calc)

bt:
0x7f9eb4b902f2 in 
com::sun::star::uno::Reference::operator->() 
const (this=0x55b8c2b54888) at include/com/sun/star/uno/Reference.h:387
0x7f9eb4c03584 in 
ScVbaEventsHelper::notifyEvent(com::sun::star::document::EventObject const&) 
(this=0x55b8c2b54840, rEvent=...) at 
/home/julien/lo/libreoffice/sc/source/ui/vba/vbaeventshelper.cxx:605
0x7f9ef464bd3c in (anonymous 
namespace)::NotifySingleListenerIgnoreRE::operator()(com::sun::star::uno::Reference
 const&) const (this=0x7ffc5044dfc0, listener=uno::Reference to 
(ScVbaEventsHelper *) 0x55b8c2b54870) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:3293
0x7f9ef463b8aa in 
comphelper::OInterfaceContainerHelper3::forEach<(anonymous
 
namespace)::NotifySingleListenerIgnoreRE >((anonymous 
namespace)::NotifySingleListenerIgnoreRE const&)
(this=0x55b8c2735c18, func=...) at 
include/comphelper/interfacecontainer3.hxx:279
0x7f9ef463b010 in SfxBaseModel::postEvent_Impl(rtl::OUString const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Any const&)
(this=0x55b8c2308ae0, aName="OnUnload", xController=empty uno::Reference, 
supplement=uno::Any(void)) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:3338
0x7f9ef463a089 in SfxBaseModel::Notify(SfxBroadcaster&, SfxHint const&) 
(this=0x55b8c2308ae0, rBC=..., rHint=...) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:2960

See full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=192546

Regression from:

https://git.libreoffice.org/core/+/d2fccf0117a37f8aab8bb50ece419987f06af6b9%5E%21
"cool#6893 improve listeners in SfxBaseModel"

Change-Id: I372808dade20c47275ab599054d8e9572dc3da4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163356
Reviewed-by: Julien Nabet 
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
(cherry picked from commit 6c6b580428bc527da9af82da743616787617b39b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163345
Reviewed-by: Xisco Fauli 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 985af531358d..062c594f2c4f 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2510,7 +2510,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const 
Reference< document::XEve
 {
 SfxModelGuard aGuard( *this );
 
-m_pData->m_aEventListeners.removeInterface( aListener );
+m_pData->m_aDocumentEventListeners1.removeInterface( aListener );
 }
 
 //  XShapeEventBroadcaster
commit 016b75f8289276468cde320067ae3519fdeb94f4
Author: Michael Stahl 
AuthorDate: Wed Feb 21 19:14:27 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Sun Feb 25 14:30:31 2024 +0100

tdf#159519 libxmlsec: avoid linking function not existent in Windows 7

xsec_xmlsec.dll is linked to libxmlsec-mscng.dll, which is
linked to Win32 bcrypt.dll, which doesn't have BCryptKeyDerivation on
Windows 7.

Use GetProcAddress() to retrieve BCryptKeyDerivation at runtime; the
function is not used by LibreOffice.

(regression from commit 26bf26272bf525b59b4a4ce18b3ce14c1febfd7b
 and (due to revert) commit bfd479abf0d1d8ce36c3b0dcc6c824216f88a95b)

Change-Id: I0c0c94ee0cdfd48ae7506d9dfb51fcaf8289d460
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163709
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0690f3b7b981417a7b1f2fffd87c593a2a2a15d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163740
Reviewed-by: Xisco Fauli 
(cherry picked from commit aacb4fce006b537dade0417c0637fd584f7f2c2a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163761
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/external/xmlsec/BCryptKeyDerivation.patch.1 
b/external/xmlsec/BCryptKeyDerivation.patch.1
new file mode 100644
index ..3747915f87d2
--- /dev/null
+++ b/external/xmlsec/BCryptKeyDerivation.patch.1
@@ -0,0 +1,51 @@
+tdf#159519 Windows 7 does not have BCryptKeyDerivation
+
+It just occurred to me that these functions would of course not be called
+by LibreOffice so this is untested.
+
+--- 

core.git: include/svx

[Julien Nabet (via logerrit)]

 include/svx/svx3ditems.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff197bf1a9a8a6cd73fe0e1cc03c4424d9e1dc2e
Author: Julien Nabet 
AuthorDate: Sun Feb 25 11:18:14 2024 +0100
Commit: Julien Nabet 
CommitDate: Sun Feb 25 13:34:04 2024 +0100

tdf#159874: Inspection of 3D object in Development Tools crashes LibreOffice

See bt:
https://bugs.documentfoundation.org/attachment.cgi?id=192752

2 remarks here:
- there are TextureKind.idl and TextureKind2.idl but first one is indicated 
as deprecated since 2000!
(see 4f9e6d84feb36ab3072dafbab0ba4ae46d264f9b #80594# added a new 
TextureKind2 enum because of missing value in TextureKind)
=> should we only use TextureKind2.idl now?

- in svx/source/sdr/primitive3d/sdrattributecreator3d.cxx, we can read this 
comment:
// TextureKind: 1 == Base3DTextureLuminance, 2 == Base3DTextureIntensity, 3 
== Base3DTextureColor
See 
https://opengrok.libreoffice.org/xref/core/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx?r=05416682#88
but TextureKind2.idl defines LUMINANCE, INTENSITY and COLOR with no number,
so I expect they take by default values 0, 1 and 2
See 
https://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/drawing/TextureKind2.idl?r=5687eba4

BTW, same pb with this line:
// TextureMode: 1 == Base3DTextureReplace, 2 == Base3DTextureModulate, 3 == 
Base3DTextureBlend
TextureMode.idl just indicates: REPLACE, MODULATE and BLEND

=> should we change comments and related code?

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

diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx
index 7cb5eae6e399..a7da4b1e861f 100644
--- a/include/svx/svx3ditems.hxx
+++ b/include/svx/svx3ditems.hxx
@@ -119,7 +119,7 @@ inline SfxUInt16Item 
makeSvx3DMaterialSpecularIntensityItem(sal_uInt16 nVal) {
 
 class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureKindItem final : public 
SfxUInt16Item {
 public:
-Svx3DTextureKindItem(sal_uInt16 nVal = 3);
+Svx3DTextureKindItem(sal_uInt16 nVal = 0);
 
 // use drawing::TextureKind
 SVX_DLLPRIVATE virtual  bool QueryValue( css::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const override;

core.git: svl/source

[Julien Nabet (via logerrit)]

 svl/source/items/srchitem.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd5710a8dd4e05059ac248243d950e28d830905d
Author: Julien Nabet 
AuthorDate: Sat Feb 24 09:40:14 2024 +0100
Commit: Julien Nabet 
CommitDate: Sat Feb 24 11:23:20 2024 +0100

tdf#159862: set SearchWildcard to false changes SearchRegularExpression 
value

Like this since 2016 with 3a0abd3019ec3ca29b8f1378cdb32ebf741e6306
add SvxSearchItem::GetWildcard() SetWildcard()

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

diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 1300bf744afa..6aa7c36ddca2 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -364,7 +364,7 @@ void SvxSearchItem::SetWildcard( bool bVal )
 {
 m_aSearchOpt.AlgorithmType2 = SearchAlgorithms2::WILDCARD;
 }
-else if ( SearchAlgorithms2::REGEXP == m_aSearchOpt.AlgorithmType2 )
+else if ( SearchAlgorithms2::WILDCARD == m_aSearchOpt.AlgorithmType2 )
 {
 m_aSearchOpt.AlgorithmType2 = SearchAlgorithms2::ABSOLUTE;
 }

core.git: helpcontent2

[Julien Nabet (via logerrit)]

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

New commits:
commit b42fdd100afb3ab1243150aec1b63eb580f32baf
Author: Julien Nabet 
AuthorDate: Thu Feb 22 19:31:23 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 22 19:31:23 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to d13c501f790c5130fa5b23da99be6b92770a08d4
  - Related tdf#155723: "Cube" is in fact "Cuboid"

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

diff --git a/helpcontent2 b/helpcontent2
index 6dfa12485814..d13c501f790c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6dfa12485814931cf7161b53561940cb976116df
+Subproject commit d13c501f790c5130fa5b23da99be6b92770a08d4

help.git: source/text

[Julien Nabet (via logerrit)]

 source/text/simpress/02/1009.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d13c501f790c5130fa5b23da99be6b92770a08d4
Author: Julien Nabet 
AuthorDate: Thu Feb 22 16:41:08 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Feb 22 19:31:23 2024 +0100

Related tdf#155723: "Cube" is in fact "Cuboid"

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

diff --git a/source/text/simpress/02/1009.xhp 
b/source/text/simpress/02/1009.xhp
index f1828eb81f..ec5735f760 100644
--- a/source/text/simpress/02/1009.xhp
+++ b/source/text/simpress/02/1009.xhp
@@ -59,15 +59,15 @@
   
 To rotate a 3D 
object around any of its three axes, click to select the object, and then click 
again to display its rotation handles. Drag a handle in the direction you want 
to rotate the object.
 
-Cube
-Draws a filled cube where you drag in the slide. To draw a 3D 
rectangle, hold down Shift while you 
drag.
+Cuboid
+Draws a filled cuboid where you drag in the slide. To draw a 3D 
rectangle, hold down Shift while you 
drag.
   
 
   
-Icon Cube
+Icon Cuboid
   
   
-Cube
+Cuboid
   
 
   

core.git: oox/source

[Julien Nabet (via logerrit)]

 oox/source/drawingml/scene3dhelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff516105c2df13cc71629b5a7156e16ec16b6988
Author: Julien Nabet 
AuthorDate: Tue Feb 20 18:40:13 2024 +0100
Commit: Julien Nabet 
CommitDate: Wed Feb 21 08:48:10 2024 +0100

Fix potentially uninitialized local variable 'fY' used in Windows TB

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

diff --git a/oox/source/drawingml/scene3dhelper.cxx 
b/oox/source/drawingml/scene3dhelper.cxx
index 3bb537bbd7d7..b72ca4a38f78 100644
--- a/oox/source/drawingml/scene3dhelper.cxx
+++ b/oox/source/drawingml/scene3dhelper.cxx
@@ -392,8 +392,8 @@ bool Scene3DHelper::setExtrusionProperties(const 
oox::drawingml::Shape3DProperti
 // or if there is no such rotation but we have a perspective projection 
with true depth,
 // or we have a parallel projection other than a 'front' type.
 // In other cases the rendering as normal shape is better than any current 
extrusion.
-double fX;
-double fY;
+double fX = 0.0;
+double fY = 0.0;
 Scene3DHelper::getAPIAnglesFrom3DProperties(p3DProperties, 
rnMSOShapeRotation, fX, fY, rRotZ);
 sal_Int32 nDepthAmount = (*p3DProperties).mnExtrusionH.value_or(0);
 bool bIsParallel = aPrstCameraValuesArray[mnPrstCameraIndex].mbIsParallel;

core.git: 2 commits - officecfg/registry svx/source

[Julien Nabet (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 
++--
 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx |4 
++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a5ad209d33b35958b40a7e2444ba0d9f061055ec
Author: Julien Nabet 
AuthorDate: Mon Feb 19 22:57:49 2024 +0100
Commit: Julien Nabet 
CommitDate: Tue Feb 20 19:28:45 2024 +0100

tdf#155723: Wrong Tooltips for some of the Basic Shapes (cuboid)

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index d8b7166d7046..6da4532d2687 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -401,7 +401,7 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Cube
+  Cuboid
 
 
   1
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx 
b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index aa8d2d32bd98..472e5f265753 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -327,7 +327,7 @@ const ACCNameTypeTable pACCNameTypeTableArray[] =
 { "right-arrow", "Right Arrow" },
 //{ "mso-spt14", mso_sptThickArrow },
 { "pentagon-right", "Pentagon" },
-{ "cube", "Cube" },
+{ "cube", "Cuboid" },
 { "mso-spt21", "Doorplate" },
 /*{ "mso-spt17", mso_sptBalloon },
 { "mso-spt18", mso_sptSeal },
commit a67286aa0cf9c3bc5919343c428bb5485091104c
Author: Julien Nabet 
AuthorDate: Mon Feb 19 22:44:20 2024 +0100
Commit: Julien Nabet 
CommitDate: Tue Feb 20 19:28:32 2024 +0100

tdf#155723: Wrong Tooltips for some of the Basic Shapes (pentagon)

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 6c52720340a1..d8b7166d7046 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -345,7 +345,7 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Regular Pentagon
+  Pentagon
 
 
   1
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx 
b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 70c15ca66f6d..aa8d2d32bd98 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -368,7 +368,7 @@ const ACCNameTypeTable pACCNameTypeTableArray[] =
 { "mso-spt53", mso_sptRibbon },
 { "mso-spt54", mso_sptRibbon2 },*/
 { "chevron", "Chevron" },
-{ "pentagon", "Regular Pentagon" },
+{ "pentagon", "Pentagon" },
 { "forbidden", "'No' Symbol" },
 { "star8", "8-Point Star" },
 /*{ "mso-spt59", mso_sptSeal16 },

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

[Julien Nabet (via logerrit)]

 sfx2/source/doc/sfxbasemodel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39fa034db32fa07a7f2a7afe77f7d1c047b5cad8
Author: Julien Nabet 
AuthorDate: Wed Feb 14 10:21:20 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Feb 14 17:37:42 2024 +0100

tdf#159707: fix crash when changing to edit mode (calc)

bt:
0x7f9eb4b902f2 in 
com::sun::star::uno::Reference::operator->() 
const (this=0x55b8c2b54888) at include/com/sun/star/uno/Reference.h:387
0x7f9eb4c03584 in 
ScVbaEventsHelper::notifyEvent(com::sun::star::document::EventObject const&) 
(this=0x55b8c2b54840, rEvent=...) at 
/home/julien/lo/libreoffice/sc/source/ui/vba/vbaeventshelper.cxx:605
0x7f9ef464bd3c in (anonymous 
namespace)::NotifySingleListenerIgnoreRE::operator()(com::sun::star::uno::Reference
 const&) const (this=0x7ffc5044dfc0, listener=uno::Reference to 
(ScVbaEventsHelper *) 0x55b8c2b54870) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:3293
0x7f9ef463b8aa in 
comphelper::OInterfaceContainerHelper3::forEach<(anonymous
 
namespace)::NotifySingleListenerIgnoreRE >((anonymous 
namespace)::NotifySingleListenerIgnoreRE const&)
(this=0x55b8c2735c18, func=...) at 
include/comphelper/interfacecontainer3.hxx:279
0x7f9ef463b010 in SfxBaseModel::postEvent_Impl(rtl::OUString const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Any const&)
(this=0x55b8c2308ae0, aName="OnUnload", xController=empty uno::Reference, 
supplement=uno::Any(void)) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:3338
0x7f9ef463a089 in SfxBaseModel::Notify(SfxBroadcaster&, SfxHint const&) 
(this=0x55b8c2308ae0, rBC=..., rHint=...) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:2960

See full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=192546

Regression from:

https://git.libreoffice.org/core/+/d2fccf0117a37f8aab8bb50ece419987f06af6b9%5E%21
"cool#6893 improve listeners in SfxBaseModel"

Change-Id: I372808dade20c47275ab599054d8e9572dc3da4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163356
Reviewed-by: Julien Nabet 
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
(cherry picked from commit 6c6b580428bc527da9af82da743616787617b39b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163344
Reviewed-by: Xisco Fauli 

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 985af531358d..062c594f2c4f 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2510,7 +2510,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const 
Reference< document::XEve
 {
 SfxModelGuard aGuard( *this );
 
-m_pData->m_aEventListeners.removeInterface( aListener );
+m_pData->m_aDocumentEventListeners1.removeInterface( aListener );
 }
 
 //  XShapeEventBroadcaster

core.git: sfx2/source

[Julien Nabet (via logerrit)]

 sfx2/source/doc/sfxbasemodel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c0c8a3ae258808012c3514dadeb02fc0c6fc43b
Author: Julien Nabet 
AuthorDate: Wed Feb 14 10:21:20 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Feb 14 14:19:47 2024 +0100

tdf#159707: fix crash when changing to edit mode (calc)

bt:
0x7f9eb4b902f2 in 
com::sun::star::uno::Reference::operator->() 
const (this=0x55b8c2b54888) at include/com/sun/star/uno/Reference.h:387
0x7f9eb4c03584 in 
ScVbaEventsHelper::notifyEvent(com::sun::star::document::EventObject const&) 
(this=0x55b8c2b54840, rEvent=...) at 
/home/julien/lo/libreoffice/sc/source/ui/vba/vbaeventshelper.cxx:605
0x7f9ef464bd3c in (anonymous 
namespace)::NotifySingleListenerIgnoreRE::operator()(com::sun::star::uno::Reference
 const&) const (this=0x7ffc5044dfc0, listener=uno::Reference to 
(ScVbaEventsHelper *) 0x55b8c2b54870) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:3293
0x7f9ef463b8aa in 
comphelper::OInterfaceContainerHelper3::forEach<(anonymous
 
namespace)::NotifySingleListenerIgnoreRE >((anonymous 
namespace)::NotifySingleListenerIgnoreRE const&)
(this=0x55b8c2735c18, func=...) at 
include/comphelper/interfacecontainer3.hxx:279
0x7f9ef463b010 in SfxBaseModel::postEvent_Impl(rtl::OUString const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Any const&)
(this=0x55b8c2308ae0, aName="OnUnload", xController=empty uno::Reference, 
supplement=uno::Any(void)) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:3338
0x7f9ef463a089 in SfxBaseModel::Notify(SfxBroadcaster&, SfxHint const&) 
(this=0x55b8c2308ae0, rBC=..., rHint=...) at 
/home/julien/lo/libreoffice/sfx2/source/doc/sfxbasemodel.cxx:2960

See full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=192546

Regression from:

https://git.libreoffice.org/core/+/d2fccf0117a37f8aab8bb50ece419987f06af6b9%5E%21
"cool#6893 improve listeners in SfxBaseModel"

Change-Id: I372808dade20c47275ab599054d8e9572dc3da4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163356
Reviewed-by: Julien Nabet 
Reviewed-by: Noel Grandin 
Tested-by: Jenkins

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index b1862799b6b7..5de773ac01e2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2509,7 +2509,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const 
Reference< document::XEve
 {
 SfxModelGuard aGuard( *this );
 
-m_pData->m_aEventListeners.removeInterface( aListener );
+m_pData->m_aDocumentEventListeners1.removeInterface( aListener );
 }
 
 //  XShapeEventBroadcaster

core.git: static/CustomTarget_emscripten_fs_image.mk

[Julien Nabet (via logerrit)]

 static/CustomTarget_emscripten_fs_image.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c4556bc19ca6da0032b9a43cc64f6a76966121d2
Author: Julien Nabet 
AuthorDate: Sat Feb 10 14:54:22 2024 +0100
Commit: Julien Nabet 
CommitDate: Sat Feb 10 15:09:29 2024 +0100

Fix WASM TB following ace21b4b2537a3cf2301fca2ac6f78d0612e911f

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

diff --git a/static/CustomTarget_emscripten_fs_image.mk 
b/static/CustomTarget_emscripten_fs_image.mk
index dd2dcc5d6535..fdae208b5e88 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -647,7 +647,6 @@ gb_emscripten_fs_image_files += \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/frmaddpage.ui
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/frmtypepage.ui
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/frmurlpage.ui
 \
-
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/gotopagedialog.ui
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/hfmenubutton.ui
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/indentpage.ui
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/indexentry.ui
 \
@@ -1267,6 +1266,7 @@ gb_emscripten_fs_image_files += \
 $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svx/ui/gallerymenu2.ui 
\
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svx/ui/genericcheckdialog.ui
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svx/ui/genericcheckentry.ui 
\
+
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svx/ui/gotopagedialog.ui \
 $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svx/ui/grafctrlbox.ui \
 $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svx/ui/grafmodebox.ui \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svx/ui/headfootformatpage.ui
 \

core.git: connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/parse/sqlbison.y |   21 -
 1 file changed, 4 insertions(+), 17 deletions(-)

New commits:
commit 9530664d07f400f4d8dcbe54d0e82d69168844de
Author: Julien Nabet 
AuthorDate: Wed Feb 7 18:40:38 2024 +0100
Commit: Julien Nabet 
CommitDate: Sat Feb 10 12:50:46 2024 +0100

tdf#159588: Query-GUI: LOWER isnt supported in Query-GUI if condition is 
LIKE

Let's consider "SQL_TOKEN_LOWER" and "SQL_TOKEN_UPPER" as 
"string_function_1Argument"
like "SQL_TOKEN_LCASE" and "SQL_TOKEN_UCASE"

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

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index 00666ed87a09..23de1cb772ab 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -233,12 +233,12 @@ using namespace connectivity;
 %type  datetime_primary datetime_value_fct time_zone 
time_zone_specifier /*interval_term*/ interval_qualifier
 %type  start_field non_second_datetime_field end_field 
single_datetime_field extract_field datetime_field time_zone_field
 %type  char_length_exp octet_length_exp bit_length_exp 
select_sublist string_value_exp
-%type  char_value_exp concatenation char_factor char_primary 
string_value_fct char_substring_fct fold
+%type  char_value_exp concatenation char_factor char_primary 
string_value_fct char_substring_fct
 %type  form_conversion char_translation trim_fct trim_operands 
trim_spec bit_value_fct bit_substring_fct op_column_commalist
 %type  /*bit_concatenation*/ bit_value_exp bit_factor bit_primary 
collate_clause char_value_fct unique_spec value_exp_commalist 
in_predicate_value unique_test update_source
 %type  function_arg_commalist3 string_function_3Argument 
function_arg_commalist4 string_function_4Argument function_arg_commalist2 
string_function_1Argument string_function_2Argument
 %type  date_function_0Argument date_function_1Argument 
function_name12 function_name23 function_name1 function_name2 function_name3 
function_name0 numeric_function_0Argument numeric_function_1Argument 
numeric_function_2Argument
-%type  all query_primary sql_not for_length upper_lower comparison 
column_val  cross_union /*opt_schema_element_list*/
+%type  all query_primary sql_not for_length comparison column_val  
cross_union /*opt_schema_element_list*/
 %type  /*op_authorization op_schema*/ nil_fkt schema_element 
base_table_def base_table_element base_table_element_commalist
 %type  column_def odbc_fct_specodbc_call_spec odbc_fct_type 
op_parameter union_statement
 %type  op_odbc_call_parameter odbc_parameter_commalist 
odbc_parameter function_args_commalist function_arg
@@ -1929,10 +1929,12 @@ string_function_1Argument:
SQL_TOKEN_LENGTH
|   SQL_TOKEN_ASCII
|   SQL_TOKEN_LCASE
+   |   SQL_TOKEN_LOWER
|   SQL_TOKEN_LTRIM
|   SQL_TOKEN_RTRIM
|   SQL_TOKEN_SPACE
|   SQL_TOKEN_UCASE
+   |   SQL_TOKEN_UPPER
;
 
 string_function_2Argument:
@@ -3249,7 +3251,6 @@ bit_primary:
;
 char_value_fct:
char_substring_fct
- | fold
  | form_conversion
{
$$ = SQL_NEW_RULE;
@@ -3296,20 +3297,6 @@ char_substring_fct:
$$->append(newNode(")", SQLNodeType::Punctuation));
}
;
-upper_lower:
-   SQL_TOKEN_UPPER
-   |   SQL_TOKEN_LOWER
-   ;
-fold:
-   upper_lower '(' value_exp ')'
-   {
-   $$ = SQL_NEW_RULE;
-   $$->append($1);
-   $$->append(newNode("(", SQLNodeType::Punctuation));
-   $$->append($3);
-   $$->append(newNode(")", SQLNodeType::Punctuation));
-   }
-   ;
 form_conversion:
SQL_TOKEN_CONVERT '(' string_value_exp SQL_TOKEN_USING 
table_node ')'
{

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

[Julien Nabet (via logerrit)]

 sc/source/core/data/validat.cxx |3 +++
 sc/source/ui/app/inputhdl.cxx   |3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b7a1ff456629549f66c93a5258073f1394598174
Author: Julien Nabet 
AuthorDate: Tue Feb 6 21:42:06 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 8 23:28:58 2024 +0100

tdf#159595: Data validation without error check allows to enter wrong data

Change-Id: If5660f462a07ca571e05a44abcb0e378b6de613e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163064
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 9925937bb6b9be70befb8886ccc5665eff4ef227)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163020
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index a46b09986b3d..5a569ef94487 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -381,6 +381,9 @@ bool ScValidationData::DoError(weld::Window* pParent, const 
OUString& rInput,
 if ( eErrorStyle == SC_VALERR_MACRO )
 return DoMacro(rPos, rInput, nullptr, pParent);
 
+if (!bShowError)
+return true;
+
 //  Output error message
 
 OUString aTitle = aErrorTitle;
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 809ba8520e33..a640d71cb2df 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3159,7 +3159,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 {
 ScDocument& rDoc = pActiveViewSh->GetViewData().GetDocument();
 const ScValidationData* pData = rDoc.GetValidationEntry( nValidation );
-if (pData && pData->HasErrMsg())
+if (pData)
 {
 // #i67990# don't use pLastPattern in EnterHandler
 const ScPatternAttr* pPattern = rDoc.GetPattern( aCursorPos.Col(), 
aCursorPos.Row(), aCursorPos.Tab() );
@@ -3200,6 +3200,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 
 if (pData->DoError(pActiveViewSh->GetFrameWeld(), aString, 
aCursorPos))
 bForget = true; // Do not take over input
+
 }
 }
 }

core.git: sc/source

[Julien Nabet (via logerrit)]

 sc/source/core/data/validat.cxx |3 +++
 sc/source/ui/app/inputhdl.cxx   |3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c869fb5ea2fa1dbbfa7c17754aeac48ed7f77cc4
Author: Julien Nabet 
AuthorDate: Tue Feb 6 21:42:06 2024 +0100
Commit: Julien Nabet 
CommitDate: Wed Feb 7 08:30:06 2024 +0100

tdf#159595: Data validation without error check allows to enter wrong data

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

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 09757b88d180..30980b11d2fa 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -381,6 +381,9 @@ bool ScValidationData::DoError(weld::Window* pParent, const 
OUString& rInput,
 if ( eErrorStyle == SC_VALERR_MACRO )
 return DoMacro(rPos, rInput, nullptr, pParent);
 
+if (!bShowError)
+return true;
+
 //  Output error message
 
 OUString aTitle = aErrorTitle;
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index af4e01fec9ec..ce397be3f6cd 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3158,7 +3158,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 {
 ScDocument& rDoc = pActiveViewSh->GetViewData().GetDocument();
 const ScValidationData* pData = rDoc.GetValidationEntry( nValidation );
-if (pData && pData->HasErrMsg())
+if (pData)
 {
 // #i67990# don't use pLastPattern in EnterHandler
 const ScPatternAttr* pPattern = rDoc.GetPattern( aCursorPos.Col(), 
aCursorPos.Row(), aCursorPos.Tab() );
@@ -3199,6 +3199,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 
 if (pData->DoError(pActiveViewSh->GetFrameWeld(), aString, 
aCursorPos))
 bForget = true; // Do not take over input
+
 }
 }
 }

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

[Julien Nabet (via logerrit)]

 chart2/source/tools/CharacterProperties.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dea542e3b4216b41b3593485caa7d21cd2195041
Author: Julien Nabet 
AuthorDate: Tue Jan 30 10:22:15 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Jan 31 11:15:04 2024 +0100

tdf#159288: Assertion on insert trend line

5  0x7fd6780533a2 in __assert_fail
   (assertion=0x7fd66de41177 
"ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && \"SolarMutex 
not owned!\"", file=0x7fd66df2c58b 
"/home/julien/lo/libreoffice/vcl/source/app/dbggui.cxx", line=35, 
function=0x7fd66de5d0c6 "void ImplDbgTestSolarMutex()") at ./assert/assert.c:101
6  0x7fd66f0dd6a2 in ImplDbgTestSolarMutex() () at 
/home/julien/lo/libreoffice/vcl/source/app/dbggui.cxx:35
7  0x7fd677522f10 in DbgTestSolarMutex() () at 
/home/julien/lo/libreoffice/tools/source/debug/debug.cxx:54
8  0x7fd66f3aea88 in 
ImplFontCache::GetFontInstance(vcl::font::PhysicalFontCollection const*, 
vcl::font::FontSelectPattern&) (this=0x564a8f77e0c0, pFontList=0x564a8f7783d0, 
aFontSelData=...)
   at /home/julien/lo/libreoffice/vcl/source/font/fontcache.cxx:117
9  0x7fd66f3ae987 in 
ImplFontCache::GetFontInstance(vcl::font::PhysicalFontCollection const*, 
vcl::Font const&, Size const&, float, bool)
   (this=0x564a8f77e0c0, pFontList=0x564a8f7783d0, rFont=..., rSize=Size = 
{...}, fExactHeight=12, bNonAntialias=false) at 
/home/julien/lo/libreoffice/vcl/source/font/fontcache.cxx:111
10 0x7fd66eb905f6 in OutputDevice::GetDefaultFont(DefaultFontType, 
o3tl::strong_int, GetDefaultFontFlags, 
OutputDevice const*)
   (nType=DefaultFontType::CJK_SPREADSHEET, eLang=..., 
nFlags=GetDefaultFontFlags::OnlyOne, pOutDev=0x564a8f6bfca0) at 
/home/julien/lo/libreoffice/vcl/source/outdev/font.cxx:573
11 0x7fd62e86669d in 
chart::CharacterProperties::AddDefaultsToMap(std::__debug::unordered_map, std::equal_to, 
std::allocator > >&) 
(rOutMap=std::__debug::unordered_map with 19 elements = {...}) at 
/home/julien/lo/libreoffice/chart2/source/tools/CharacterProperties.cxx:358
12 0x7fd62e951686 in (anonymous 
namespace)::GetStaticRegressionEquationDefaults()::$_0::operator()() const 
(this=0x7ffe3f9b6b80)
   at 
/home/julien/lo/libreoffice/chart2/source/tools/RegressionEquation.cxx:121
13 0x7fd62e9500e7 in (anonymous 
namespace)::GetStaticRegressionEquationDefaults() () at 
/home/julien/lo/libreoffice/chart2/source/tools/RegressionEquation.cxx:117
14 0x7fd62e94ff98 in chart::RegressionEquation::GetDefaultValue(int, 
com::sun::star::uno::Any&) const (this=0x564a90aa2870, nHandle=4, 
rAny=uno::Any(void))
   at 
/home/julien/lo/libreoffice/chart2/source/tools/RegressionEquation.cxx:196

See full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=192072

Change-Id: I8048b9a69761dba618ef556335c2cadab6647627
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162737
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit dd5e179f0fd7c9bf37872acf53301be28bb71cfc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162722
Reviewed-by: Xisco Fauli 

diff --git a/chart2/source/tools/CharacterProperties.cxx 
b/chart2/source/tools/CharacterProperties.cxx
index 7669d3245a27..bf44c6a4c08f 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -340,6 +341,7 @@ void CharacterProperties::AddPropertiesToVector(
 void CharacterProperties::AddDefaultsToMap(
 ::chart::tPropertyValueMap & rOutMap )
 {
+SolarMutexGuard aGuard;
 const float fDefaultFontHeight = 13.0;
 
 SvtLinguConfig aLinguConfig;

core.git: chart2/source

[Julien Nabet (via logerrit)]

 chart2/source/tools/CharacterProperties.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dd5e179f0fd7c9bf37872acf53301be28bb71cfc
Author: Julien Nabet 
AuthorDate: Tue Jan 30 10:22:15 2024 +0100
Commit: Noel Grandin 
CommitDate: Tue Jan 30 13:18:28 2024 +0100

tdf#159288: Assertion on insert trend line

5  0x7fd6780533a2 in __assert_fail
   (assertion=0x7fd66de41177 
"ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && \"SolarMutex 
not owned!\"", file=0x7fd66df2c58b 
"/home/julien/lo/libreoffice/vcl/source/app/dbggui.cxx", line=35, 
function=0x7fd66de5d0c6 "void ImplDbgTestSolarMutex()") at ./assert/assert.c:101
6  0x7fd66f0dd6a2 in ImplDbgTestSolarMutex() () at 
/home/julien/lo/libreoffice/vcl/source/app/dbggui.cxx:35
7  0x7fd677522f10 in DbgTestSolarMutex() () at 
/home/julien/lo/libreoffice/tools/source/debug/debug.cxx:54
8  0x7fd66f3aea88 in 
ImplFontCache::GetFontInstance(vcl::font::PhysicalFontCollection const*, 
vcl::font::FontSelectPattern&) (this=0x564a8f77e0c0, pFontList=0x564a8f7783d0, 
aFontSelData=...)
   at /home/julien/lo/libreoffice/vcl/source/font/fontcache.cxx:117
9  0x7fd66f3ae987 in 
ImplFontCache::GetFontInstance(vcl::font::PhysicalFontCollection const*, 
vcl::Font const&, Size const&, float, bool)
   (this=0x564a8f77e0c0, pFontList=0x564a8f7783d0, rFont=..., rSize=Size = 
{...}, fExactHeight=12, bNonAntialias=false) at 
/home/julien/lo/libreoffice/vcl/source/font/fontcache.cxx:111
10 0x7fd66eb905f6 in OutputDevice::GetDefaultFont(DefaultFontType, 
o3tl::strong_int, GetDefaultFontFlags, 
OutputDevice const*)
   (nType=DefaultFontType::CJK_SPREADSHEET, eLang=..., 
nFlags=GetDefaultFontFlags::OnlyOne, pOutDev=0x564a8f6bfca0) at 
/home/julien/lo/libreoffice/vcl/source/outdev/font.cxx:573
11 0x7fd62e86669d in 
chart::CharacterProperties::AddDefaultsToMap(std::__debug::unordered_map, std::equal_to, 
std::allocator > >&) 
(rOutMap=std::__debug::unordered_map with 19 elements = {...}) at 
/home/julien/lo/libreoffice/chart2/source/tools/CharacterProperties.cxx:358
12 0x7fd62e951686 in (anonymous 
namespace)::GetStaticRegressionEquationDefaults()::$_0::operator()() const 
(this=0x7ffe3f9b6b80)
   at 
/home/julien/lo/libreoffice/chart2/source/tools/RegressionEquation.cxx:121
13 0x7fd62e9500e7 in (anonymous 
namespace)::GetStaticRegressionEquationDefaults() () at 
/home/julien/lo/libreoffice/chart2/source/tools/RegressionEquation.cxx:117
14 0x7fd62e94ff98 in chart::RegressionEquation::GetDefaultValue(int, 
com::sun::star::uno::Any&) const (this=0x564a90aa2870, nHandle=4, 
rAny=uno::Any(void))
   at 
/home/julien/lo/libreoffice/chart2/source/tools/RegressionEquation.cxx:196

See full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=192072

Change-Id: I8048b9a69761dba618ef556335c2cadab6647627
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162737
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/tools/CharacterProperties.cxx 
b/chart2/source/tools/CharacterProperties.cxx
index 7669d3245a27..bf44c6a4c08f 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -340,6 +341,7 @@ void CharacterProperties::AddPropertiesToVector(
 void CharacterProperties::AddDefaultsToMap(
 ::chart::tPropertyValueMap & rOutMap )
 {
+SolarMutexGuard aGuard;
 const float fDefaultFontHeight = 13.0;
 
 SvtLinguConfig aLinguConfig;

core.git: Branch 'libreoffice-24-2-0' - officecfg/registry

[Julien Nabet (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 781e8620a2c48d541c80f82fdfc122881eee4bc5
Author: Julien Nabet 
AuthorDate: Mon Jan 22 18:50:31 2024 +0100
Commit: Patrick Luby 
CommitDate: Tue Jan 23 19:40:07 2024 +0100

tdf#159326: Command-F assigned to both Find and Find and Replace in Calc

Regression from e651d9e657f9b61fb45777d6e7edeb5cb95f8d27
German shortcut improvements for Calc
(2023-09-27)

Change-Id: I4440663025e3eb85c8c73a624769ceec527daa1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162413
Tested-by: Jenkins
Reviewed-by: Patrick Luby 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162382
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Patrick Luby 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 231d10612750..b6178a1d9f70 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1059,7 +1059,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:SearchDialog
 .uno:Navigator
   
 

core.git: Branch 'libreoffice-24-2' - officecfg/registry

[Julien Nabet (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 06726e12cad769a2b28c3598792f08f0c8cb4ea1
Author: Julien Nabet 
AuthorDate: Mon Jan 22 18:50:31 2024 +0100
Commit: Noel Grandin 
CommitDate: Tue Jan 23 07:05:36 2024 +0100

tdf#159326: Command-F assigned to both Find and Find and Replace in Calc

Regression from e651d9e657f9b61fb45777d6e7edeb5cb95f8d27
German shortcut improvements for Calc
(2023-09-27)

Change-Id: I4440663025e3eb85c8c73a624769ceec527daa1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162413
Tested-by: Jenkins
Reviewed-by: Patrick Luby 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162376
Reviewed-by: Noel Grandin 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 231d10612750..b6178a1d9f70 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1059,7 +1059,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:SearchDialog
 .uno:Navigator
   
 

core.git: officecfg/registry

[Julien Nabet (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 20f122eb7b0d301d4e937c346f4c3c824690882d
Author: Julien Nabet 
AuthorDate: Mon Jan 22 18:50:31 2024 +0100
Commit: Patrick Luby 
CommitDate: Mon Jan 22 20:43:33 2024 +0100

tdf#159326: Command-F assigned to both Find and Find and Replace in Calc

Regression from e651d9e657f9b61fb45777d6e7edeb5cb95f8d27
German shortcut improvements for Calc
(2023-09-27)

Change-Id: I4440663025e3eb85c8c73a624769ceec527daa1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162413
Tested-by: Jenkins
Reviewed-by: Patrick Luby 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 00e6b566f345..2265ec7c436a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1059,7 +1059,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:SearchDialog
 .uno:Navigator
   
 

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

[Julien Nabet (via logerrit)]

 svtools/source/brwbox/editbrowsebox.cxx |2 +-
 vcl/qt5/QtAccessibleEventListener.cxx   |   10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit e5a0d2f48893af6480f5539208ee202ee536a033
Author: Julien Nabet 
AuthorDate: Tue Jan 16 19:24:56 2024 +0100
Commit: Michael Weghorn 
CommitDate: Fri Jan 19 10:09:19 2024 +0100

tdf#159213: fix Base crash when choosing "Help" in relations design (kf5)

There are 2 parts here:
1) in vcl/qt5:
- for release versions: avoid to call QtAccessibleRegistry::getQObject on a 
null object
- for debug version: add an assertion on object to check it's not null

2) in svtools:
the specific root cause  was in EditBrowseBox::DeactivateCell,
we must check m_aImpl->m_xActiveCell in addition to isAccessibleAlive()

Import remark: I had a very naive/bandaid patch at the beginning
this one is entirely thanks to Michael Weghorn

Change-Id: I90214e9c5b7c0aa45481915d7be6020a7dc8c42e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162182
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins
(cherry picked from commit 1a637a07a0fb23f4d4bfac69378caff7ee965737)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162141
(cherry picked from commit 491fb3b8723d6d2725326b145b35328cb89a118a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162149
Reviewed-by: Xisco Fauli 
Reviewed-by: Hossein 
Tested-by: Michael Weghorn 

diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index 927e203dd14a..515c102379b3 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -967,7 +967,7 @@ namespace svt
 if (!IsEditing())
 return;
 
-if ( isAccessibleAlive() )
+if ( isAccessibleAlive() && m_aImpl->m_xActiveCell)
 {
 commitBrowseBoxEvent( CHILD, Any(), Any( m_aImpl->m_xActiveCell ) 
);
 m_aImpl->clearActiveCell();
diff --git a/vcl/qt5/QtAccessibleEventListener.cxx 
b/vcl/qt5/QtAccessibleEventListener.cxx
index d6a404e6947e..0bf4dcddbf2d 100644
--- a/vcl/qt5/QtAccessibleEventListener.cxx
+++ b/vcl/qt5/QtAccessibleEventListener.cxx
@@ -213,12 +213,22 @@ void QtAccessibleEventListener::notifyEvent(const 
css::accessibility::Accessible
 Reference xChild;
 if (aEvent.NewValue >>= xChild)
 {
+assert(xChild.is()
+   && "AccessibleEventId::CHILD event NewValue without 
valid child set");
+// tdf#159213 for now, workaround invalid events being sent 
and don't crash in release builds
+if (!xChild.is())
+return;
 QAccessible::updateAccessibility(new QAccessibleEvent(
 QtAccessibleRegistry::getQObject(xChild), 
QAccessible::ObjectCreated));
 return;
 }
 if (aEvent.OldValue >>= xChild)
 {
+assert(xChild.is()
+   && "AccessibleEventId::CHILD event OldValue without 
valid child set");
+// tdf#159213 for now, workaround invalid events being sent 
and don't crash in release builds
+if (!xChild.is())
+return;
 QAccessible::updateAccessibility(new QAccessibleEvent(
 QtAccessibleRegistry::getQObject(xChild), 
QAccessible::ObjectDestroyed));
 return;

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

[Julien Nabet (via logerrit)]

 svtools/source/brwbox/editbrowsebox.cxx |2 +-
 vcl/qt5/QtAccessibleEventListener.cxx   |   10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 2797c7f803792f3539fc86ac5af06da23ec7cc2e
Author: Julien Nabet 
AuthorDate: Tue Jan 16 19:24:56 2024 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 17 12:51:26 2024 +0100

tdf#159213: fix Base crash when choosing "Help" in relations design (kf5)

There are 2 parts here:
1) in vcl/qt5:
- for release versions: avoid to call QtAccessibleRegistry::getQObject on a 
null object
- for debug version: add an assertion on object to check it's not null

2) in svtools:
the specific root cause  was in EditBrowseBox::DeactivateCell,
we must check m_aImpl->m_xActiveCell in addition to isAccessibleAlive()

Import remark: I had a very naive/bandaid patch at the beginning
this one is entirely thanks to Michael Weghorn

Change-Id: I90214e9c5b7c0aa45481915d7be6020a7dc8c42e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162182
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins
(cherry picked from commit 1a637a07a0fb23f4d4bfac69378caff7ee965737)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162141

diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index 927e203dd14a..515c102379b3 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -967,7 +967,7 @@ namespace svt
 if (!IsEditing())
 return;
 
-if ( isAccessibleAlive() )
+if ( isAccessibleAlive() && m_aImpl->m_xActiveCell)
 {
 commitBrowseBoxEvent( CHILD, Any(), Any( m_aImpl->m_xActiveCell ) 
);
 m_aImpl->clearActiveCell();
diff --git a/vcl/qt5/QtAccessibleEventListener.cxx 
b/vcl/qt5/QtAccessibleEventListener.cxx
index d6a404e6947e..0bf4dcddbf2d 100644
--- a/vcl/qt5/QtAccessibleEventListener.cxx
+++ b/vcl/qt5/QtAccessibleEventListener.cxx
@@ -213,12 +213,22 @@ void QtAccessibleEventListener::notifyEvent(const 
css::accessibility::Accessible
 Reference xChild;
 if (aEvent.NewValue >>= xChild)
 {
+assert(xChild.is()
+   && "AccessibleEventId::CHILD event NewValue without 
valid child set");
+// tdf#159213 for now, workaround invalid events being sent 
and don't crash in release builds
+if (!xChild.is())
+return;
 QAccessible::updateAccessibility(new QAccessibleEvent(
 QtAccessibleRegistry::getQObject(xChild), 
QAccessible::ObjectCreated));
 return;
 }
 if (aEvent.OldValue >>= xChild)
 {
+assert(xChild.is()
+   && "AccessibleEventId::CHILD event OldValue without 
valid child set");
+// tdf#159213 for now, workaround invalid events being sent 
and don't crash in release builds
+if (!xChild.is())
+return;
 QAccessible::updateAccessibility(new QAccessibleEvent(
 QtAccessibleRegistry::getQObject(xChild), 
QAccessible::ObjectDestroyed));
 return;

core.git: svtools/source vcl/qt5

[Julien Nabet (via logerrit)]

 svtools/source/brwbox/editbrowsebox.cxx |2 +-
 vcl/qt5/QtAccessibleEventListener.cxx   |   10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 1a637a07a0fb23f4d4bfac69378caff7ee965737
Author: Julien Nabet 
AuthorDate: Tue Jan 16 19:24:56 2024 +0100
Commit: Julien Nabet 
CommitDate: Tue Jan 16 23:27:46 2024 +0100

tdf#159213: fix Base crash when choosing "Help" in relations design (kf5)

There are 2 parts here:
1) in vcl/qt5:
- for release versions: avoid to call QtAccessibleRegistry::getQObject on a 
null object
- for debug version: add an assertion on object to check it's not null

2) in svtools:
the specific root cause  was in EditBrowseBox::DeactivateCell,
we must check m_aImpl->m_xActiveCell in addition to isAccessibleAlive()

Import remark: I had a very naive/bandaid patch at the beginning
this one is entirely thanks to Michael Weghorn

Change-Id: I90214e9c5b7c0aa45481915d7be6020a7dc8c42e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162182
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins

diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index 927e203dd14a..515c102379b3 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -967,7 +967,7 @@ namespace svt
 if (!IsEditing())
 return;
 
-if ( isAccessibleAlive() )
+if ( isAccessibleAlive() && m_aImpl->m_xActiveCell)
 {
 commitBrowseBoxEvent( CHILD, Any(), Any( m_aImpl->m_xActiveCell ) 
);
 m_aImpl->clearActiveCell();
diff --git a/vcl/qt5/QtAccessibleEventListener.cxx 
b/vcl/qt5/QtAccessibleEventListener.cxx
index d6a404e6947e..0bf4dcddbf2d 100644
--- a/vcl/qt5/QtAccessibleEventListener.cxx
+++ b/vcl/qt5/QtAccessibleEventListener.cxx
@@ -213,12 +213,22 @@ void QtAccessibleEventListener::notifyEvent(const 
css::accessibility::Accessible
 Reference xChild;
 if (aEvent.NewValue >>= xChild)
 {
+assert(xChild.is()
+   && "AccessibleEventId::CHILD event NewValue without 
valid child set");
+// tdf#159213 for now, workaround invalid events being sent 
and don't crash in release builds
+if (!xChild.is())
+return;
 QAccessible::updateAccessibility(new QAccessibleEvent(
 QtAccessibleRegistry::getQObject(xChild), 
QAccessible::ObjectCreated));
 return;
 }
 if (aEvent.OldValue >>= xChild)
 {
+assert(xChild.is()
+   && "AccessibleEventId::CHILD event OldValue without 
valid child set");
+// tdf#159213 for now, workaround invalid events being sent 
and don't crash in release builds
+if (!xChild.is())
+return;
 QAccessible::updateAccessibility(new QAccessibleEvent(
 QtAccessibleRegistry::getQObject(xChild), 
QAccessible::ObjectDestroyed));
 return;

core.git: Branch 'distro/collabora/co-24.04' - 5 commits - distro-configs/LibreOfficeFlatpak.conf sc/source solenv/flatpak-manifest.in sw/qa vcl/unx writerfilter/source

[Julien Nabet (via logerrit)]

 distro-configs/LibreOfficeFlatpak.conf|1 
 sc/source/core/data/table2.cxx|7 
 solenv/flatpak-manifest.in|7 
 sw/qa/extras/rtfexport/data/tdf158830.rtf |  237 
 sw/qa/extras/rtfexport/data/tdf158978.rtf |  350 ++
 sw/qa/extras/rtfexport/data/tdf158982.rtf |  281 
 sw/qa/extras/rtfexport/rtfexport8.cxx |   45 +++
 vcl/unx/generic/printer/cpdmgr.cxx|5 
 vcl/unx/gtk3/glomenu.cxx  |2 
 vcl/unx/gtk3/salnativewidgets-gtk.cxx |1 
 writerfilter/source/rtftok/rtfsprm.cxx|2 
 11 files changed, 932 insertions(+), 6 deletions(-)

New commits:
commit 1be2495ab0b2ff531988294c692d639b9af40d34
Author: Julien Nabet 
AuthorDate: Mon Jan 15 18:16:03 2024 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 16 11:01:08 2024 +0100

Fix location of an g_object_unref in vcl/glomenu

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

diff --git a/vcl/unx/gtk3/glomenu.cxx b/vcl/unx/gtk3/glomenu.cxx
index a391649bbb6d..779d20f9b879 100644
--- a/vcl/unx/gtk3/glomenu.cxx
+++ b/vcl/unx/gtk3/glomenu.cxx
@@ -560,8 +560,8 @@ g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu,
 
 g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
 
-g_object_unref (model);
 }
+g_object_unref (model);
 }
 
 GLOMenu *
commit f5bbf242e30d1f1f52275e40fc2b9c2ea1bb28a2
Author: Mike Kaganski 
AuthorDate: Mon Jan 15 17:22:35 2024 +0600
Commit: Andras Timar 
CommitDate: Tue Jan 16 11:01:08 2024 +0100

tdf#140330: do not deduplicate conditional formatting in undo context

Change-Id: If9c64a7af46ca601b3c47a80642d914facafdc62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162084
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit dc75960fdee6cac2d9dd6b45ac3090f30f92b3ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162104
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index afe2216b1abe..a871a1fb82c8 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -638,6 +638,9 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCRO
 {
 ScRange aOldRange( nCol1 - nDx, nRow1 - nDy, pTable->nTab, nCol2 - nDx, 
nRow2 - nDy, pTable->nTab);
 ScRange aNewRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab );
+// Don't deduplicate when undoing or creating an Undo document! It would 
disallow correct undo
+bool bUndoContext = rDocument.IsUndo() || pTable->rDocument.IsUndo();
+// Note that Undo documents use same pool as the original document
 bool bSameDoc = rDocument.GetStyleSheetPool() == 
pTable->rDocument.GetStyleSheetPool();
 
 for(const auto& rxCondFormat : *pTable->mpCondFormatList)
@@ -658,7 +661,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCRO
 aRefCxt.mnTabDelta = nTab - pTable->nTab;
 pNewFormat->UpdateReference(aRefCxt, true);
 
-if (bSameDoc && pTable->nTab == nTab && 
CheckAndDeduplicateCondFormat(rDocument, 
mpCondFormatList->GetFormat(rxCondFormat->GetKey()), pNewFormat.get(), nTab))
+if (!bUndoContext && bSameDoc && pTable->nTab == nTab && 
CheckAndDeduplicateCondFormat(rDocument, 
mpCondFormatList->GetFormat(rxCondFormat->GetKey()), pNewFormat.get(), nTab))
 {
 continue;
 }
@@ -668,7 +671,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCRO
 {
 // Check if there is the same format in the destination
 // If there is, then simply expand its range
-if (CheckAndDeduplicateCondFormat(rDocument, rxCond.get(), 
pNewFormat.get(), nTab))
+if (!bUndoContext && CheckAndDeduplicateCondFormat(rDocument, 
rxCond.get(), pNewFormat.get(), nTab))
 {
 bDuplicate = true;
 break;
commit 3b359cee6888f9241987bf12161a84afe6a30deb
Author: Julien Nabet 
AuthorDate: Mon Jan 15 19:42:05 2024 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 16 11:01:08 2024 +0100

Add missing g_free in salnativewidgets-gtk + reorder ones in cpdmgr (vcl)

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

diff --git a/vcl/unx/generic/printer/cpdmgr.cxx 
b/vcl/unx/generic/printer/cpdmgr.cxx
index 834c1383efba..03cf85a7b75b 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -81,9 +81,9 @@ void CPDManager::onNameAcquired (GDBusConnection *connection,
  

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

[Julien Nabet (via logerrit)]

 vcl/unx/gtk3/glomenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18f4c113329855f71b7084c3ad9983e04f54b2de
Author: Julien Nabet 
AuthorDate: Mon Jan 15 18:16:03 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jan 16 09:38:29 2024 +0100

Fix location of an g_object_unref in vcl/glomenu

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

diff --git a/vcl/unx/gtk3/glomenu.cxx b/vcl/unx/gtk3/glomenu.cxx
index a391649bbb6d..779d20f9b879 100644
--- a/vcl/unx/gtk3/glomenu.cxx
+++ b/vcl/unx/gtk3/glomenu.cxx
@@ -560,8 +560,8 @@ g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu,
 
 g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
 
-g_object_unref (model);
 }
+g_object_unref (model);
 }
 
 GLOMenu *

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

[Julien Nabet (via logerrit)]

 vcl/unx/generic/printer/cpdmgr.cxx|5 +++--
 vcl/unx/gtk3/salnativewidgets-gtk.cxx |1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0d00a60fdfb22765dcc30e42a987186436099c35
Author: Julien Nabet 
AuthorDate: Mon Jan 15 19:42:05 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Jan 16 09:27:41 2024 +0100

Add missing g_free in salnativewidgets-gtk + reorder ones in cpdmgr (vcl)

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

diff --git a/vcl/unx/generic/printer/cpdmgr.cxx 
b/vcl/unx/generic/printer/cpdmgr.cxx
index 834c1383efba..03cf85a7b75b 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -81,9 +81,9 @@ void CPDManager::onNameAcquired (GDBusConnection *connection,
   G_DBUS_CALL_FLAGS_NONE,
   -1, nullptr, nullptr, nullptr);
 
-g_free(contents);
 g_object_unref(proxy);
 g_dbus_node_info_unref(introspection_data);
+g_free(contents);
 }
 g_free(backend.second);
 }
@@ -122,10 +122,10 @@ void CPDManager::printerAdded (GDBusConnection 
*connection,
nullptr,
nullptr);
 
-g_free(contents);
 g_dbus_node_info_unref(introspection_data);
 std::pair new_backend (sender_name, 
proxy);
 current->addBackend(std::move(new_backend));
+g_free(contents);
 }
 }
 CPDPrinter *pDest = static_cast(malloc(sizeof(CPDPrinter)));
@@ -262,6 +262,7 @@ CPDManager* CPDManager::tryLoadCPD()
 {
 std::pair new_tbackend (filename, 
contents);
 pManager->addTempBackend(new_tbackend);
+g_free(contents);
 }
 }
 g_dir_close(dir);
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index a3a82edaa1ac..bfdeed423846 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -2332,6 +2332,7 @@ bool GtkSalGraphics::updateSettings(AllSettings& 
rSettings)
 gchar* pFontname = nullptr;
 g_object_get(pSettings, "gtk-font-name", , nullptr);
 PangoFontDescription* pFontDesc = 
pango_font_description_from_string(pFontname);
+g_free(pFontname);
 vcl::Font aFont(pango_to_vcl(pFontDesc, 
rSettings.GetUILanguageTag().getLocale()));
 pango_font_description_free(pFontDesc);
 #else

core.git: vcl/unx

[Julien Nabet (via logerrit)]

 vcl/unx/generic/printer/cpdmgr.cxx|5 +++--
 vcl/unx/gtk3/salnativewidgets-gtk.cxx |1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 877014b0b7050ba3fce1c0126279125640117313
Author: Julien Nabet 
AuthorDate: Mon Jan 15 19:42:05 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 15 22:07:52 2024 +0100

Add missing g_free in salnativewidgets-gtk + reorder ones in cpdmgr (vcl)

Change-Id: I2608a2fe238d124f3a158438e8219fbc63f750d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162126
Reviewed-by: Julien Nabet 
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins

diff --git a/vcl/unx/generic/printer/cpdmgr.cxx 
b/vcl/unx/generic/printer/cpdmgr.cxx
index 834c1383efba..03cf85a7b75b 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -81,9 +81,9 @@ void CPDManager::onNameAcquired (GDBusConnection *connection,
   G_DBUS_CALL_FLAGS_NONE,
   -1, nullptr, nullptr, nullptr);
 
-g_free(contents);
 g_object_unref(proxy);
 g_dbus_node_info_unref(introspection_data);
+g_free(contents);
 }
 g_free(backend.second);
 }
@@ -122,10 +122,10 @@ void CPDManager::printerAdded (GDBusConnection 
*connection,
nullptr,
nullptr);
 
-g_free(contents);
 g_dbus_node_info_unref(introspection_data);
 std::pair new_backend (sender_name, 
proxy);
 current->addBackend(std::move(new_backend));
+g_free(contents);
 }
 }
 CPDPrinter *pDest = static_cast(malloc(sizeof(CPDPrinter)));
@@ -262,6 +262,7 @@ CPDManager* CPDManager::tryLoadCPD()
 {
 std::pair new_tbackend (filename, 
contents);
 pManager->addTempBackend(new_tbackend);
+g_free(contents);
 }
 }
 g_dir_close(dir);
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index a3a82edaa1ac..bfdeed423846 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -2332,6 +2332,7 @@ bool GtkSalGraphics::updateSettings(AllSettings& 
rSettings)
 gchar* pFontname = nullptr;
 g_object_get(pSettings, "gtk-font-name", , nullptr);
 PangoFontDescription* pFontDesc = 
pango_font_description_from_string(pFontname);
+g_free(pFontname);
 vcl::Font aFont(pango_to_vcl(pFontDesc, 
rSettings.GetUILanguageTag().getLocale()));
 pango_font_description_free(pFontDesc);
 #else

core.git: vcl/unx

[Julien Nabet (via logerrit)]

 vcl/unx/gtk3/gtkdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2ee028d0f805124d823a32aed70bcaf63377757
Author: Julien Nabet 
AuthorDate: Mon Jan 15 18:16:26 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jan 15 20:42:04 2024 +0100

Replace deprecated "gdk_cursor_unref" by "g_object_unref"

Change-Id: I593f5d8f0775e07e67cce66432bab52723f3afff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162116
    Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx
index f595369f8b53..4c97e74aec01 100644
--- a/vcl/unx/gtk3/gtkdata.cxx
+++ b/vcl/unx/gtk3/gtkdata.cxx
@@ -69,7 +69,7 @@ GtkSalDisplay::~GtkSalDisplay()
 
 for(GdkCursor* & rpCsr : m_aCursors)
 if( rpCsr )
-gdk_cursor_unref( rpCsr );
+g_object_unref(rpCsr);
 #endif
 }
 

core.git: vcl/unx

[Julien Nabet (via logerrit)]

 vcl/unx/gtk3/glomenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1ca7f0abc04f7b6bfa098c305481cb6ae4cd5443
Author: Julien Nabet 
AuthorDate: Mon Jan 15 18:16:03 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jan 15 20:41:48 2024 +0100

Fix location of an g_object_unref in vcl/glomenu

Change-Id: Icef8e74867758c815e1a55ae0906dead9b70ae6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162115
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/glomenu.cxx b/vcl/unx/gtk3/glomenu.cxx
index a391649bbb6d..779d20f9b879 100644
--- a/vcl/unx/gtk3/glomenu.cxx
+++ b/vcl/unx/gtk3/glomenu.cxx
@@ -560,8 +560,8 @@ g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu,
 
 g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
 
-g_object_unref (model);
 }
+g_object_unref (model);
 }
 
 GLOMenu *

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 86549619dfe7457da34d712372e34cc467ef027b
Author: Julien Nabet 
AuthorDate: Sat Jan 13 17:43:03 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jan 14 12:13:00 2024 +0100

Add missing g_list_free in GtkInstanceComboBox ctr

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 8bdeb8621549..b8da4f7b7a27 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -20361,6 +20361,7 @@ public:
 bFindButtonTextRenderer = false;
 }
 }
+g_list_free(cells);
 
 // Seeing as GtkCellRendererPixbuf no longer takes a surface, then 
insert our own replacement
 // to render that instead here

core.git: vcl/unx

[Julien Nabet (via logerrit)]

 vcl/unx/gtk3/gtksalmenu.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d3963918544888608da149c3f0206d7a96828361
Author: Julien Nabet 
AuthorDate: Sat Jan 13 18:03:53 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 22:29:03 2024 +0100

Add missing g_object_unref (vcl/gtksalmenu)

Change-Id: I07db3d7a03da94b53ad49188c229c134dc2f663c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162017
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index 804c1d017ac9..ddfa5ef36b48 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -125,6 +125,7 @@ static void RemoveDisabledItemsFromNativeMenu(GLOMenu* 
pMenu, GList** pOldComman
 g_free(pSubCommand);
 }
 }
+g_object_unref(pSubMenuModel);
 }
 }
 
@@ -1362,7 +1363,8 @@ bool GtkSalMenu::NativeSetItemCommand( unsigned nSection,
 
 if ( aCurrentCommand == nullptr || g_strcmp0( aCurrentCommand, aCommand ) 
!= 0 )
 {
-bool bOldHasSubmenu = 
g_lo_menu_get_submenu_from_item_in_section(pMenu, nSection, nItemPos) != 
nullptr;
+GLOMenu* pSubMenuModel = 
g_lo_menu_get_submenu_from_item_in_section(pMenu, nSection, nItemPos);
+bool bOldHasSubmenu = pSubMenuModel != nullptr;
 bSubMenuAddedOrRemoved = bOldHasSubmenu != bIsSubmenu;
 if (bSubMenuAddedOrRemoved)
 {
@@ -1386,6 +1388,8 @@ bool GtkSalMenu::NativeSetItemCommand( unsigned nSection,
 g_lo_menu_set_action_and_target_value_to_item_in_section( pMenu, 
nSection, nItemPos, aItemCommand, pTarget );
 pTarget = nullptr;
 }
+if (bOldHasSubmenu)
+g_object_unref(pSubMenuModel);
 
 g_free( aItemCommand );
 }

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

[Julien Nabet (via logerrit)]

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

New commits:
commit f2155b5c6051d68659bea45c0331b53eaaced45d
Author: Julien Nabet 
AuthorDate: Sat Jan 13 15:38:28 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 22:28:45 2024 +0100

Add missing gdk_event_free (vcl/gtkinst)

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 1dafaa04d595..8bdeb8621549 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -11097,10 +11097,16 @@ private:
 gtk_main_do_event(pKeyEvent);
 
 GdkEvent *pTriggerEvent = gtk_get_current_event();
+bool bEventOwnership = true;
 if (!pTriggerEvent)
+{
 pTriggerEvent = pKeyEvent;
+bEventOwnership = false;
+}
 
 gtk_menu_popup_at_widget(m_pMenu, pWidget, GDK_GRAVITY_SOUTH_WEST, 
GDK_GRAVITY_NORTH_WEST, pTriggerEvent);
+if (bEventOwnership)
+gdk_event_free(pTriggerEvent);
 
 gdk_event_free(pKeyEvent);
 }
@@ -8,6 +11124,7 @@ private:
 {
 gdk_event_get_button(pEvent, );
 nTime = gdk_event_get_time(pEvent);
+gdk_event_free(pEvent);
 }
 else
 {
@@ -11459,8 +11466,12 @@ public:
 gtk_main_do_event(pKeyEvent);
 
 GdkEvent *pTriggerEvent = gtk_get_current_event();
+bool bEventOwnership = true;
 if (!pTriggerEvent)
+{
 pTriggerEvent = pKeyEvent;
+bEventOwnership = false;
+}
 
 bool bSwapForRTL = SwapForRTL(pWidget);
 
@@ -11478,6 +11489,8 @@ public:
 else
 gtk_menu_popup_at_rect(m_pMenu, 
widget_get_surface(pWidget), , GDK_GRAVITY_NORTH_EAST, 
GDK_GRAVITY_NORTH_WEST, pTriggerEvent);
 }
+if (bEventOwnership)
+gdk_event_free(pTriggerEvent);
 
 gdk_event_free(pKeyEvent);
 }
@@ -11500,6 +11513,7 @@ public:
 if (!gdk_event_get_button(pEvent, ))
 nButton = 0;
 nTime = gdk_event_get_time(pEvent);
+gdk_event_free(pEvent);
 }
 else
 {
@@ -14136,6 +14150,8 @@ private:
 #if !GTK_CHECK_VERSION(4, 0, 0)
 GdkEvent *pEvent = gtk_get_current_event();
 m_bChangedByMouse = pEvent && categorizeEvent(pEvent) == 
VclInputFlags::MOUSE;
+if (pEvent)
+gdk_event_free(pEvent);
 #else
 //TODO maybe iterate over gtk_widget_observe_controllers looking for a 
motion controller
 #endif