from:"Julien Nabet \(via logerrit\)"

core.git: external/liblangtag

2024-04-26 Thread 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

2024-04-25 Thread 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 \

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

2024-04-22 Thread 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/ma_sha1 \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_string \
@@ -65,6 +70,10 @@ $(eval $(call

core.git: connectivity/source

2024-04-21 Thread 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

2024-04-11 Thread 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

2024-04-01 Thread 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

2024-04-01 Thread 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

2024-04-01 Thread 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

2024-03-26 Thread 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

2024-03-25 Thread 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

2024-03-19 Thread 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

2024-03-19 Thread 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

2024-03-19 Thread 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

2024-03-19 Thread 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

2024-03-18 Thread 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..cbcdc8736e64 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -2856,7

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

2024-03-18 Thread 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.
 
 
 
-Copyright © 2000–2023 LibreOffice

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

2024-03-18 Thread 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..e8cc4a50a5a1 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -2856,7

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

2024-03-18 Thread 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.
 
 
 
-Copyright © 2000–2023 LibreOffice

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

2024-03-18 Thread 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

2024-03-17 Thread 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

2024-03-14 Thread 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

2024-03-13 Thread 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 © 2000–2024 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice

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

2024-03-12 Thread 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

2024-03-11 Thread 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

2024-03-11 Thread 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

2024-03-11 Thread 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

2024-03-11 Thread 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

2024-03-09 Thread 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

2024-03-07 Thread 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;
 }

core.git: helpcontent2

2024-03-06 Thread 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

2024-03-06 Thread 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

2024-03-05 Thread 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

2024-03-04 Thread 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

2024-03-02 Thread 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

2024-03-01 Thread 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

2024-02-28 Thread 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_LUMINANCE );
+m_xBtnTexColor->set_active( objTextKind ==

core.git: basic/source

2024-02-27 Thread 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

2024-02-27 Thread 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;

core.git: include/svx

2024-02-26 Thread 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

2024-02-26 Thread 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;
 }

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

2024-02-25 Thread 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.
+
+--- xmlsec/src/mscng/pbkdf2.c.orig 2024-02-21 19:02:56.539534152 +0100

core.git: include/svx

2024-02-25 Thread 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

2024-02-24 Thread 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

2024-02-22 Thread 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

2024-02-22 Thread 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

2024-02-20 Thread 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

2024-02-20 Thread 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

2024-02-14 Thread 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

2024-02-14 Thread 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

2024-02-10 Thread 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

2024-02-10 Thread 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

2024-02-08 Thread 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

2024-02-06 Thread 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

2024-01-31 Thread 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

2024-01-30 Thread 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

2024-01-23 Thread 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

2024-01-22 Thread 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

2024-01-22 Thread 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

2024-01-19 Thread 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

2024-01-17 Thread 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

2024-01-16 Thread 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

2024-01-16 Thread 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,
   G_DBUS_CALL_FLAGS_NONE,
   -1, nullptr,

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

2024-01-16 Thread 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

2024-01-16 Thread 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

2024-01-15 Thread 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

2024-01-15 Thread 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

2024-01-15 Thread 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

2024-01-14 Thread 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

2024-01-13 Thread 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

2024-01-13 Thread 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

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

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit ef21e36ee580c098a92e493795c412adf8562743
Author: Julien Nabet 
AuthorDate: Sat Jan 13 18:06:14 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 21:19:55 2024 +0100

Add missing g_bytes_unref in GtkSalMenu::AddMenuBarButton

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

diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index 699e0097b358..ddfa5ef36b48 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -831,6 +831,7 @@ bool GtkSalMenu::AddMenuBarButton(const SalMenuButtonItem& 
rNewItem)
 pImage = gtk_image_new_from_gicon(pIcon);
 #endif
 g_object_unref(pIcon);
+g_bytes_unref(pBytes);
 }
 
 GtkWidget* pButton = AddButton(pImage);

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

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit f1e45b80c396f90d763d3e2e5bcd3baf12383127
Author: Julien Nabet 
AuthorDate: Sat Jan 13 17:26:34 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 21:14:10 2024 +0100

Add missing g_object_thaw_notify before an early return (vcl/gtkinst)

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index df54b50368f6..1dafaa04d595 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -15500,7 +15500,10 @@ public:
 GtkTreePath* end_path;
 
 if (!gtk_tree_view_get_visible_range(m_pTreeView, _path, 
_path))
+{
+g_object_thaw_notify(G_OBJECT(m_pTreeModel));
 return;
+}
 
 GtkInstanceTreeIter aGtkIter(nullptr);
 gtk_tree_model_get_iter(m_pTreeModel, , start_path);

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

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit d7e4bb5acd38f4827a8f0d0aade8b44d18a1a2ba
Author: Julien Nabet 
AuthorDate: Sat Jan 13 18:03:53 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 21:01:05 2024 +0100

Add missing g_object_unref (vcl/gtksalmenu)

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

diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index a510473650d6..699e0097b358 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);
 }
 }
 
@@ -1361,7 +1362,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)
 {
@@ -1385,6 +1387,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: vcl/unx

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit 4718a8e7af6df95c143179c7161a19aecade0701
Author: Julien Nabet 
AuthorDate: Sat Jan 13 18:06:14 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 19:53:32 2024 +0100

Add missing g_bytes_unref in GtkSalMenu::AddMenuBarButton

Change-Id: I00b8a73cfe02abc561ddf67c0e6e4ad612c27422
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162018
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 a510473650d6..804c1d017ac9 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -830,6 +830,7 @@ bool GtkSalMenu::AddMenuBarButton(const SalMenuButtonItem& 
rNewItem)
 pImage = gtk_image_new_from_gicon(pIcon);
 #endif
 g_object_unref(pIcon);
+g_bytes_unref(pBytes);
 }
 
 GtkWidget* pButton = AddButton(pImage);

core.git: vcl/unx

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit f021d5eb645efaf749d97ad26471ef8ddf607db9
Author: Julien Nabet 
AuthorDate: Sat Jan 13 17:26:34 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 19:49:10 2024 +0100

Add missing g_object_thaw_notify before an early return (vcl/gtkinst)

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 7f79efee094b..3288b635f0ef 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -15517,7 +15517,10 @@ public:
 GtkTreePath* end_path;
 
 if (!gtk_tree_view_get_visible_range(m_pTreeView, _path, 
_path))
+{
+g_object_thaw_notify(G_OBJECT(m_pTreeModel));
 return;
+}
 
 GtkInstanceTreeIter aGtkIter(nullptr);
 gtk_tree_model_get_iter(m_pTreeModel, , start_path);

core.git: vcl/unx

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit dcf778c85c84edea74e71c11faed9a5c22557a80
Author: Julien Nabet 
AuthorDate: Sat Jan 13 15:38:28 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 19:48:16 2024 +0100

Add missing gdk_event_free (vcl/gtkinst)

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index e80098630919..7f79efee094b 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -11098,10 +11098,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);
 }
@@ -9,6 +11125,7 @@ private:
 {
 gdk_event_get_button(pEvent, );
 nTime = gdk_event_get_time(pEvent);
+gdk_event_free(pEvent);
 }
 else
 {
@@ -11460,8 +11467,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);
 
@@ -11479,6 +11490,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);
 }
@@ -11501,6 +11514,7 @@ public:
 if (!gdk_event_get_button(pEvent, ))
 nButton = 0;
 nTime = gdk_event_get_time(pEvent);
+gdk_event_free(pEvent);
 }
 else
 {
@@ -14137,6 +14151,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

core.git: vcl/unx

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit 154573770de9658de828ea3b666c0a0a64ed249b
Author: Julien Nabet 
AuthorDate: Sat Jan 13 17:43:03 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 19:45:16 2024 +0100

Add missing g_list_free in GtkInstanceComboBox ctr

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 760c95b00543..e80098630919 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -20343,6 +20343,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: Branch 'libreoffice-24-2' - vcl/unx

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit 491465696ae47e1f30c315e5e1845b8d978dfb0d
Author: Julien Nabet 
AuthorDate: Fri Jan 12 21:37:43 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 19:41:33 2024 +0100

Add missing gtk_tree_path_free (vcl/gtkinst)

Change-Id: If178d41cd65cce3d07357fadb532059cc4d1c1a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161983
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 90cac17d5299e0d7e1b73f4bc34fc089fd8cdd3f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161997

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index c76d6291cedf..df54b50368f6 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -16963,6 +16963,8 @@ private:
 atk_object_set_description(pChild,
OUStringToOString(sTooltipText, 
RTL_TEXTENCODING_UTF8).getStr());
 g_object_unref(pChild);
+gtk_tree_path_free(pPath);
+
 #endif
 }

core.git: vcl/unx

2024-01-13 Thread Julien Nabet (via logerrit)

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

New commits:
commit 5ac343044fc24ff1f680740d541fc57ed3a9c065
Author: Julien Nabet 
AuthorDate: Fri Jan 12 21:37:43 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 13 12:43:10 2024 +0100

Add missing gtk_tree_path_free (vcl/gtkinst)

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 2bd6b384ce9c..760c95b00543 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -16964,6 +16964,8 @@ private:
 atk_object_set_description(pChild,
OUStringToOString(sTooltipText, 
RTL_TEXTENCODING_UTF8).getStr());
 g_object_unref(pChild);
+gtk_tree_path_free(pPath);
+
 #endif
 }

core.git: include/svtools include/vcl

2024-01-12 Thread Julien Nabet (via logerrit)

 include/svtools/genericasyncunodialog.hxx |7 +++
 include/vcl/abstdlg.hxx   |6 ++
 2 files changed, 13 insertions(+)

New commits:
commit 8f215fab5593070556e903121cc195660e16105c
Author: Julien Nabet 
AuthorDate: Fri Jan 5 13:50:34 2024 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 12 11:40:58 2024 +0100

Document a bit async methods

Retrieved from Miklos' feedback in
https://lists.freedesktop.org/archives/libreoffice/2024-January/091377.html
Thank you to him!

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

diff --git a/include/svtools/genericasyncunodialog.hxx 
b/include/svtools/genericasyncunodialog.hxx
index 058c37b00cdb..64fe80d5f9eb 100644
--- a/include/svtools/genericasyncunodialog.hxx
+++ b/include/svtools/genericasyncunodialog.hxx
@@ -32,6 +32,13 @@ typedef cppu::ImplInheritanceHelper<::svt::OGenericUnoDialog,
 OGenericUnoAsyncDialogBase;
 
 /** abstract base class for implementing UNO objects representing asynchronous 
dialogs
+
+Contrary to StartExecuteAsync in VclAbstractDialog from 
include/vcl/abstdlg.hxx,
+the different methods are used in a special case when an import or export 
action
+wants to show a dialog, as part of a synchronous filter() API call.
+
+In this case it's not possible to move the "rest of the code" to an async
+callback, so that needs special handling. Luckily these dialogs are rather 
rare.
 */
 template  class OGenericUnoAsyncDialog : public 
OGenericUnoAsyncDialogBase
 {
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 793d8cdd36a9..9fbe53529cff 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -65,6 +65,12 @@ public:
 bool isSet() const { return !!maEndDialogFn; }
 };
 
+/**
+* Usual codepath for modal dialogs. Some uno command decides to open a 
dialog,
+  we call StartExecuteAsync() with a callback to handle the dialog result
+  and that handler will be executed at some stage in the future,
+  instead of right now.
+*/
 bool StartExecuteAsync(const std::function )
 {
 AsyncContext aCtx;

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

2024-01-10 Thread Julien Nabet (via logerrit)

 chart2/source/controller/dialogs/ChartResourceGroups.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5e38bc81655ef24c2ddd26bf1a7f1f1870a184b9
Author: Julien Nabet 
AuthorDate: Wed Dec 13 21:23:30 2023 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 10 19:29:12 2024 +0100

tdf#158684: CHART XY Scatter Chart: line type "stepped" ignores parameters

Regression from 65752e649872edfd98915035b61aca510ae8f271
Date:   Fri Mar 24 10:52:13 2023 +0100
jsdialog: enable and make async chart line prop dialog

Change-Id: I1532c45ae72d2c45ace72bcc099fcc8baa265b99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160715
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 4eb875d95622fb4346d3f8b24327a1b84230eca1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161675
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx 
b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
index 3cf5996ed300..e1550d2766c7 100644
--- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx
+++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
@@ -328,7 +328,7 @@ IMPL_LINK_NOARG(SplineResourceGroup, 
SteppedDetailsDialogHdl, weld::Button&, voi
 weld::GenericDialogController::runAsync(
 xDlg, [this, xDlg, aOldParameter, iOldLineTypePos](sal_Int32 nResult) {
 m_xSteppedPropertiesDialog = nullptr;
-auto xNewDlg = getSplinePropertiesDialog();
+auto xNewDlg = getSteppedPropertiesDialog();
 
 if (nResult == RET_OK)
 {

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

2024-01-10 Thread Julien Nabet (via logerrit)

 sw/source/ui/misc/num.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f6e5f36f1070735a975dc527226b78e5ff81bf77
Author: Julien Nabet 
AuthorDate: Mon Jan 1 22:40:09 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Jan 10 11:11:27 2024 +0100

tdf#155649: EDITING Writer some position parameters cannot go beyond 17 mm

Change-Id: I70a80527dcc1c714fbe8783d1c4594bcc26b0624
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161528
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit a254bb2d4fe269a63ccfc1811331272ac88b2523)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161630
Reviewed-by: Xisco Fauli 
(cherry picked from commit 24f2ee76dad2bf92d5ed07d278c72d1c82e2a5dc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161755

diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 15848bf98c4b..480caf4fb47a 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -81,6 +81,10 @@ SwNumPositionTabPage::SwNumPositionTabPage(weld::Container* 
pPage, weld::DialogC
 {
 SetExchangeSupport();
 
+m_xAlignedAtMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+m_xListtabMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+m_xIndentAtMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+
 m_xLevelLB->set_selection_mode(SelectionMode::Multiple);
 
 m_xRelativeCB->set_active(true);
@@ -494,9 +498,6 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
 m_xDistBorderMF->set_max(m_xDistBorderMF->normalize( nWidth ), 
FieldUnit::TWIP );
 m_xDistNumMF->set_max(m_xDistNumMF->normalize( nWidth ), FieldUnit::TWIP);
 m_xIndentMF->set_max(m_xIndentMF->normalize( nWidth ), FieldUnit::TWIP );
-m_xListtabMF->set_max(m_xListtabMF->normalize( nWidth ), FieldUnit::TWIP );
-m_xAlignedAtMF->set_max(m_xAlignedAtMF->normalize( nWidth ), 
FieldUnit::TWIP );
-m_xIndentAtMF->set_max(m_xIndentAtMF->normalize( nWidth ), FieldUnit::TWIP 
);
 
 const SwRect& rPrtRect = m_pWrtSh->GetAnyCurRect(CurRectType::Page);
 m_aPreviewWIN.SetPageWidth(rPrtRect.Width());

core.git: vcl/skia

2024-01-08 Thread Julien Nabet (via logerrit)

 vcl/skia/skia_denylist_vulkan.xml |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4f1b9d79c0467dbc0b49eb62bf56f83392a9d33f
Author: Julien Nabet 
AuthorDate: Sun Dec 31 17:35:41 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 8 15:00:01 2024 +0100

Related tdf#158945: blacklist Intel Iris XE for Skia hardware rendering

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

diff --git a/vcl/skia/skia_denylist_vulkan.xml 
b/vcl/skia/skia_denylist_vulkan.xml
index 8da86069fc46..5d5ff41cc008 100644
--- a/vcl/skia/skia_denylist_vulkan.xml
+++ b/vcl/skia/skia_denylist_vulkan.xml
@@ -30,6 +30,9 @@
  
 
 
+ 
+
+

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

2024-01-08 Thread Julien Nabet (via logerrit)

 sw/source/ui/misc/num.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b7e68d467f99c7db357685adad13f738799009be
Author: Julien Nabet 
AuthorDate: Mon Jan 1 22:40:09 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Jan 8 09:48:33 2024 +0100

tdf#155649: EDITING Writer some position parameters cannot go beyond 17 mm

Change-Id: I70a80527dcc1c714fbe8783d1c4594bcc26b0624
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161528
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit a254bb2d4fe269a63ccfc1811331272ac88b2523)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161630
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 91e075d26124..fadef2466205 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -81,6 +81,10 @@ SwNumPositionTabPage::SwNumPositionTabPage(weld::Container* 
pPage, weld::DialogC
 {
 SetExchangeSupport();
 
+m_xAlignedAtMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+m_xListtabMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+m_xIndentAtMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+
 m_xLevelLB->set_selection_mode(SelectionMode::Multiple);
 
 m_xRelativeCB->set_active(true);
@@ -494,9 +498,6 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
 m_xDistBorderMF->set_max(m_xDistBorderMF->normalize( nWidth ), 
FieldUnit::TWIP );
 m_xDistNumMF->set_max(m_xDistNumMF->normalize( nWidth ), FieldUnit::TWIP);
 m_xIndentMF->set_max(m_xIndentMF->normalize( nWidth ), FieldUnit::TWIP );
-m_xListtabMF->set_max(m_xListtabMF->normalize( nWidth ), FieldUnit::TWIP );
-m_xAlignedAtMF->set_max(m_xAlignedAtMF->normalize( nWidth ), 
FieldUnit::TWIP );
-m_xIndentAtMF->set_max(m_xIndentAtMF->normalize( nWidth ), FieldUnit::TWIP 
);
 
 const SwRect& rPrtRect = m_pWrtSh->GetAnyCurRect(CurRectType::Page);
 m_aPreviewWIN.SetPageWidth(rPrtRect.Width());

core.git: sw/qa sw/source

2024-01-08 Thread Julien Nabet (via logerrit)

 sw/source/core/docnode/ndtbl.cxx|5 +
 sw/source/uibase/shells/basesh.cxx  |3 +++
 sw/source/uibase/shells/textsh1.cxx |3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 08c4ed96cc94df4a3859aa167e92e6f6da9c2ce7
Author: Julien Nabet 
AuthorDate: Mon Jan 8 09:28:07 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 8 09:28:26 2024 +0100

Revert "Related tdf#76007: Make it possible to insert a Table in a Footnote 
or Endnote"

This reverts commit 75680dd751062b7ca34ff91e03de3add3fc973c6.

I won't be able to debug layout problems indicated by Miklos.

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

diff --git a/sw/qa/core/data/html/pass/ofz5909-1.html 
b/sw/qa/core/data/html/fail/ofz5909-1.html
similarity index 100%
rename from sw/qa/core/data/html/pass/ofz5909-1.html
rename to sw/qa/core/data/html/fail/ofz5909-1.html
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c6aa9ddb67c5..a7a2bee478da 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -347,6 +347,11 @@ const SwTable* SwDoc::InsertTable( const 
SwInsertTableOptions& rInsTableOpts,
 assert(nCols && "Table without rows?");
 
 {
+// Do not copy into Footnotes!
+if( rPos.GetNode() < GetNodes().GetEndOfInserts() &&
+rPos.GetNode().GetIndex() >= 
GetNodes().GetEndOfInserts().StartOfSectionIndex() )
+return nullptr;
+
 // If the ColumnArray has a wrong count, ignore it!
 if( pColArr &&
 static_cast(nCols + ( text::HoriOrientation::NONE == 
eAdjust ? 2 : 1 )) != pColArr->size() )
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 7ab234a80044..c96945ccdf30 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -3066,6 +3066,9 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
 const SfxItemSet* pArgs = _rRequest.GetArgs();
 SwWrtShell& rSh = GetShell();
 
+if ( rSh.GetFrameType( nullptr, true ) & FrameTypeFlags::FOOTNOTE )
+return;
+
 SwView  = GetView(); // Because GetView() does not work after 
the shell exchange
 bool bHTMLMode = 0 != (::GetHtmlMode(rTempView.GetDocShell())_ON);
 bool bCallEndUndo = false;
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index c8c83fc29115..f23d5a229ec9 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2337,7 +2337,8 @@ void SwTextShell::GetState( SfxItemSet  )
 
 case FN_INSERT_TABLE:
 if ( rSh.CursorInsideInputField()
- || rSh.GetTableFormat() )
+ || rSh.GetTableFormat()
+ || (rSh.GetFrameType(nullptr,true) & 
FrameTypeFlags::FOOTNOTE) )
 {
 rSet.DisableItem( nWhich );
 }

core.git: sw/qa sw/source

2024-01-07 Thread Julien Nabet (via logerrit)

 sw/source/core/docnode/ndtbl.cxx|5 -
 sw/source/uibase/shells/basesh.cxx  |3 ---
 sw/source/uibase/shells/textsh1.cxx |3 +--
 3 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 75680dd751062b7ca34ff91e03de3add3fc973c6
Author: Julien Nabet 
AuthorDate: Wed Dec 20 22:50:59 2023 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 7 11:44:55 2024 +0100

Related tdf#76007: Make it possible to insert a Table in a Footnote or 
Endnote

There's still layout refresh pb.

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

diff --git a/sw/qa/core/data/html/fail/ofz5909-1.html 
b/sw/qa/core/data/html/pass/ofz5909-1.html
similarity index 100%
rename from sw/qa/core/data/html/fail/ofz5909-1.html
rename to sw/qa/core/data/html/pass/ofz5909-1.html
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index a7a2bee478da..c6aa9ddb67c5 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -347,11 +347,6 @@ const SwTable* SwDoc::InsertTable( const 
SwInsertTableOptions& rInsTableOpts,
 assert(nCols && "Table without rows?");
 
 {
-// Do not copy into Footnotes!
-if( rPos.GetNode() < GetNodes().GetEndOfInserts() &&
-rPos.GetNode().GetIndex() >= 
GetNodes().GetEndOfInserts().StartOfSectionIndex() )
-return nullptr;
-
 // If the ColumnArray has a wrong count, ignore it!
 if( pColArr &&
 static_cast(nCols + ( text::HoriOrientation::NONE == 
eAdjust ? 2 : 1 )) != pColArr->size() )
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index c96945ccdf30..7ab234a80044 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -3066,9 +3066,6 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
 const SfxItemSet* pArgs = _rRequest.GetArgs();
 SwWrtShell& rSh = GetShell();
 
-if ( rSh.GetFrameType( nullptr, true ) & FrameTypeFlags::FOOTNOTE )
-return;
-
 SwView  = GetView(); // Because GetView() does not work after 
the shell exchange
 bool bHTMLMode = 0 != (::GetHtmlMode(rTempView.GetDocShell())_ON);
 bool bCallEndUndo = false;
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index f23d5a229ec9..c8c83fc29115 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2337,8 +2337,7 @@ void SwTextShell::GetState( SfxItemSet  )
 
 case FN_INSERT_TABLE:
 if ( rSh.CursorInsideInputField()
- || rSh.GetTableFormat()
- || (rSh.GetFrameType(nullptr,true) & 
FrameTypeFlags::FOOTNOTE) )
+ || rSh.GetTableFormat() )
 {
 rSet.DisableItem( nWhich );
 }

core.git: reportdesign/source

2024-01-07 Thread Julien Nabet (via logerrit)

 reportdesign/source/ui/report/ReportController.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 39bad5d9f695972dbccd66d971c1d5df4cfe9a99
Author: Julien Nabet 
AuthorDate: Sun Dec 31 11:50:57 2023 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 7 11:43:54 2024 +0100

tdf#150490: ReportBuilder: Wizards starts showing two different data sources

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

diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 351d28fc9e71..3047fd404642 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2218,8 +2218,6 @@ void SAL_CALL OReportController::propertyChange( const 
beans::PropertyChangeEven
 m_xColumns.clear();
 m_xHoldAlive.clear();
 InvalidateFeature(SID_FM_ADD_FIELD);
-if ( !getDesignView()->isAddFieldVisible() && isUiVisible() )
-getDesignView()->toggleAddField();
 }
 /// TODO: check what we need to notify here TitleHelper
 /*else if (   evt.PropertyName.equals( PROPERTY_CAPTION ) )

core.git: sc/source

2024-01-07 Thread Julien Nabet (via logerrit)

 sc/source/core/data/patattr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dca19993a4c78ba7f7d61b254763909c0e5831b9
Author: Julien Nabet 
AuthorDate: Sat Jan 6 14:40:28 2024 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 7 11:38:45 2024 +0100

tdf#159042: crash after changing cell style (if direct formatting done)

bt part:
1  0x7f1fdd439356 in rtl::OUString::operator 
std::basic_string_view >() const 
(this=0x0) at include/rtl/ustring.hxx:
2  0x7f1fddaf1927 in CellAttributeHelper::CellStyleCreated(ScDocument&, 
std::basic_string_view >) 
(this=0x55edd85576a0, rDoc=..., rName=u"Default")
   at /home/julien/lo/libreoffice/sc/source/core/data/patattr.cxx:193
3  0x7f1fdeed225b in ScTabViewShell::ExecStyle(SfxRequest&) 
(this=0x55edd8674190, rReq=...) at 
/home/julien/lo/libreoffice/sc/source/ui/view/tabvwsha.cxx:1601

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

Regression from:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=2e1f9da8a6359c8909e087a92239aefd4851b116
Decouple ScPatternAttr from SfxItemPool

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

diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 4092dab7fff5..4d44e744d807 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -190,7 +190,7 @@ void CellAttributeHelper::CellStyleCreated(ScDocument& 
rDoc, std::u16string_view
 // for undo or clipboard content.
 for (const ScPatternAttr* pCheck : maRegisteredCellAttributes)
 {
-if (nullptr == pCheck->GetStyleSheet() && rName == 
*pCheck->GetStyleName())
+if (nullptr == pCheck->GetStyleSheet() && pCheck->GetStyleName() && 
rName == *pCheck->GetStyleName())
 const_cast(pCheck)->UpdateStyleSheet(rDoc); // 
find and store style pointer
 }
 }

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

2024-01-05 Thread Julien Nabet (via logerrit)

 chart2/source/controller/dialogs/ChartResourceGroups.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b26ea56c61773808b6641ffa14aa8092e57d271c
Author: Julien Nabet 
AuthorDate: Wed Dec 13 21:23:30 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jan 5 16:01:54 2024 +0100

tdf#158684: CHART XY Scatter Chart: line type "stepped" ignores parameters

Regression from 65752e649872edfd98915035b61aca510ae8f271
Date:   Fri Mar 24 10:52:13 2023 +0100
jsdialog: enable and make async chart line prop dialog

Change-Id: I1532c45ae72d2c45ace72bcc099fcc8baa265b99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160715
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 4eb875d95622fb4346d3f8b24327a1b84230eca1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160700
Reviewed-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx 
b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
index 3cf5996ed300..e1550d2766c7 100644
--- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx
+++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
@@ -328,7 +328,7 @@ IMPL_LINK_NOARG(SplineResourceGroup, 
SteppedDetailsDialogHdl, weld::Button&, voi
 weld::GenericDialogController::runAsync(
 xDlg, [this, xDlg, aOldParameter, iOldLineTypePos](sal_Int32 nResult) {
 m_xSteppedPropertiesDialog = nullptr;
-auto xNewDlg = getSplinePropertiesDialog();
+auto xNewDlg = getSteppedPropertiesDialog();
 
 if (nResult == RET_OK)
 {

core.git: sw/source

2024-01-04 Thread Julien Nabet (via logerrit)

 sw/source/ui/misc/num.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 109e5e54a159b07314429dc004256c6ae2e799b1
Author: Julien Nabet 
AuthorDate: Mon Jan 1 22:40:09 2024 +0100
Commit: Julien Nabet 
CommitDate: Thu Jan 4 14:38:34 2024 +0100

tdf#155649: EDITING Writer some position parameters cannot go beyond 17 mm

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

diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 91e075d26124..fadef2466205 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -81,6 +81,10 @@ SwNumPositionTabPage::SwNumPositionTabPage(weld::Container* 
pPage, weld::DialogC
 {
 SetExchangeSupport();
 
+m_xAlignedAtMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+m_xListtabMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+m_xIndentAtMF->set_range(0, SAL_MAX_INT32, FieldUnit::NONE);
+
 m_xLevelLB->set_selection_mode(SelectionMode::Multiple);
 
 m_xRelativeCB->set_active(true);
@@ -494,9 +498,6 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
 m_xDistBorderMF->set_max(m_xDistBorderMF->normalize( nWidth ), 
FieldUnit::TWIP );
 m_xDistNumMF->set_max(m_xDistNumMF->normalize( nWidth ), FieldUnit::TWIP);
 m_xIndentMF->set_max(m_xIndentMF->normalize( nWidth ), FieldUnit::TWIP );
-m_xListtabMF->set_max(m_xListtabMF->normalize( nWidth ), FieldUnit::TWIP );
-m_xAlignedAtMF->set_max(m_xAlignedAtMF->normalize( nWidth ), 
FieldUnit::TWIP );
-m_xIndentAtMF->set_max(m_xIndentAtMF->normalize( nWidth ), FieldUnit::TWIP 
);
 
 const SwRect& rPrtRect = m_pWrtSh->GetAnyCurRect(CurRectType::Page);
 m_aPreviewWIN.SetPageWidth(rPrtRect.Width());

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

2024-01-02 Thread Julien Nabet (via logerrit)

 vcl/skia/skia_denylist_vulkan.xml |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 9558616fdac9e58282c5d07d8345410b5479dc2b
Author: Julien Nabet 
AuthorDate: Mon Jan 1 12:28:23 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Jan 2 15:43:27 2024 +0100

Revert "Related tdf#158739: blacklist Nvidia RTX 4050 for Skia hardware"

This reverts commit bc00fb6de3ffd3949a3cdb524f49dac7e32258a9.

Reason: the real pb has been fixed thanks to Mike with:

https://git.libreoffice.org/core/+/025a49a40a3c0c1be5bf4383e87a1cc60014b7f4%5E%21
tdf#158942: renderMethodToUseForSize may force raster surface

Change-Id: I66602d607d3ea933b4035d616ebed7fedebfb9a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161515
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit a3f21172fdb7fed6eb61be9199980421bad71101)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161417
Reviewed-by: Xisco Fauli 

diff --git a/vcl/skia/skia_denylist_vulkan.xml 
b/vcl/skia/skia_denylist_vulkan.xml
index 668aa87713d9..8da86069fc46 100644
--- a/vcl/skia/skia_denylist_vulkan.xml
+++ b/vcl/skia/skia_denylist_vulkan.xml
@@ -48,9 +48,6 @@
  
 
 
- 
-
-

core.git: dbaccess/source

2024-01-01 Thread Julien Nabet (via logerrit)

 dbaccess/source/ui/app/AppController.cxx|6 --
 dbaccess/source/ui/app/AppControllerDnD.cxx |3 ++-
 dbaccess/source/ui/app/AppControllerGen.cxx |9 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 13a40e9c8e1d505565bd4742cf72bb33b99f
Author: Julien Nabet 
AuthorDate: Mon Jan 1 19:05:44 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 1 20:02:36 2024 +0100

Remove OApplicationController::getStrippedDatabaseName which only adds a 
layer

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

diff --git a/dbaccess/source/ui/app/AppController.cxx 
b/dbaccess/source/ui/app/AppController.cxx
index 9d548a138139..fbe2c395633f 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -362,11 +362,12 @@ void SAL_CALL OApplicationController::disposing()
 if ( pFilter )
 aFilter = pFilter->GetFilterName();
 
+OUString sDatabaseName;
 // add to svtool history options
 SvtHistoryOptions::AppendItem( EHistoryType::PickList,
 aURL.GetURLNoPass( 
INetURLObject::DecodeMechanism::NONE ),
 aFilter,
-getStrippedDatabaseName(),
+::dbaui::getStrippedDatabaseName(m_xDataSource, 
sDatabaseName),
 std::nullopt, std::nullopt);
 
 // add to recent document list
@@ -504,7 +505,8 @@ sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool 
bSuspend)
 )
 )
 {
-switch (ExecuteQuerySaveDocument(getFrameWeld(), 
getStrippedDatabaseName()))
+OUString sDatabaseName;
+switch (ExecuteQuerySaveDocument(getFrameWeld(), 
::dbaui::getStrippedDatabaseName(m_xDataSource, sDatabaseName)))
 {
 case RET_YES:
 Execute(ID_BROWSER_SAVEDOC,Sequence());
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx 
b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 76525cf8f8bd..11ee8a621381 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -314,7 +314,8 @@ const SharedConnection& 
OApplicationController::ensureConnection( ::dbtools::SQL
 SolarMutexGuard aSolarGuard;
 
 OUString sConnectingContext(DBA_RES(STR_COULDNOTCONNECT_DATASOURCE));
-sConnectingContext = sConnectingContext.replaceFirst("$name$", 
getStrippedDatabaseName());
+OUString sDatabaseName;
+sConnectingContext = sConnectingContext.replaceFirst("$name$", 
::dbaui::getStrippedDatabaseName(m_xDataSource, sDatabaseName));
 
 // do the connection *without* holding getMutex() to avoid deadlock
 // when we are not in the main thread and we need username/password
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx 
b/dbaccess/source/ui/app/AppControllerGen.cxx
index 8712f6386879..0f6eda11de7b 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -321,7 +321,8 @@ void SAL_CALL OApplicationController::connect(  )
 
 // no particular error, but nonetheless could not connect -> throw a 
generic exception
 OUString sConnectingContext( DBA_RES( STR_COULDNOTCONNECT_DATASOURCE ) 
);
-::dbtools::throwGenericSQLException( sConnectingContext.replaceFirst( 
"$name$", getStrippedDatabaseName() ), *this );
+OUString sDatabaseName;
+::dbtools::throwGenericSQLException( sConnectingContext.replaceFirst( 
"$name$", ::dbaui::getStrippedDatabaseName(m_xDataSource, sDatabaseName) ), 
*this );
 }
 }
 
@@ -550,12 +551,6 @@ OUString OApplicationController::getDatabaseName() const
 return sDatabaseName;
 }
 
-OUString OApplicationController::getStrippedDatabaseName() const
-{
-OUString sDatabaseName;
-return ::dbaui::getStrippedDatabaseName( m_xDataSource, sDatabaseName );
-}
-
 void OApplicationController::onDocumentOpened( const OUString& _rName, const 
sal_Int32 _nType,
 const ElementOpenMode _eMode, const Reference< XComponent >& 
_xDocument, const Reference< XComponent >& _rxDefinition )
 {

core.git: sc/source

2024-01-01 Thread Julien Nabet (via logerrit)

 sc/source/core/data/markmulti.cxx |2 +-
 sc/source/ui/view/gridwin4.cxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a28b1dfb2dec7ece83280232941d9d2e2b72b557
Author: Julien Nabet 
AuthorDate: Mon Jan 1 14:59:51 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 1 17:20:18 2024 +0100

Replace "size() == 0 with empty()" (sc/part2)

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

diff --git a/sc/source/core/data/markmulti.cxx 
b/sc/source/core/data/markmulti.cxx
index 4c92f5f25a47..9cfcd19f8819 100644
--- a/sc/source/core/data/markmulti.cxx
+++ b/sc/source/core/data/markmulti.cxx
@@ -264,7 +264,7 @@ void ScMultiSel::SetMarkArea( SCCOL nStartCol, SCCOL 
nEndCol, SCROW nStartRow, S
 void ScMultiSel::Set( ScRangeList const & rList )
 {
 Clear();
-if (rList.size() == 0)
+if (rList.empty())
 return;
 
 // sort by row to make the combining/merging faster
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 218c98b12a6c..95ed4d0c7600 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1423,7 +1423,7 @@ void ScGridWindow::SetupInitialPageBreaks(const 
ScDocument& rDoc, SCTAB nTab)
 std::set aRowBreaks;
 rDoc.GetAllColBreaks(aColBreaks, nTab, true, false);
 rDoc.GetAllRowBreaks(aRowBreaks, nTab, true, false);
-if (aColBreaks.size() == 0 || aRowBreaks.size() == 0)
+if (aColBreaks.empty() || aRowBreaks.empty())
 {
 maShowPageBreaksTimer.SetPriority(TaskPriority::DEFAULT_IDLE);
 maShowPageBreaksTimer.Start();

core.git: vcl/skia

2024-01-01 Thread Julien Nabet (via logerrit)

 vcl/skia/skia_denylist_vulkan.xml |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit a3f21172fdb7fed6eb61be9199980421bad71101
Author: Julien Nabet 
AuthorDate: Mon Jan 1 12:28:23 2024 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 1 13:20:51 2024 +0100

Revert "Related tdf#158739: blacklist Nvidia RTX 4050 for Skia hardware"

This reverts commit bc00fb6de3ffd3949a3cdb524f49dac7e32258a9.

Reason: the real pb has been fixed thanks to Mike with:

https://git.libreoffice.org/core/+/025a49a40a3c0c1be5bf4383e87a1cc60014b7f4%5E%21
tdf#158942: renderMethodToUseForSize may force raster surface

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

diff --git a/vcl/skia/skia_denylist_vulkan.xml 
b/vcl/skia/skia_denylist_vulkan.xml
index 668aa87713d9..8da86069fc46 100644
--- a/vcl/skia/skia_denylist_vulkan.xml
+++ b/vcl/skia/skia_denylist_vulkan.xml
@@ -48,9 +48,6 @@
  
 
 
- 
-
-

core.git: desktop/source

2024-01-01 Thread Julien Nabet (via logerrit)

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 968cb673eb353bd5d19d96498c0d38c00801c8a0
Author: Julien Nabet 
AuthorDate: Sun Dec 31 12:23:51 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 1 13:19:17 2024 +0100

Replace "size() != 0 with !empty()" (desktop)

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4b1658d95e20..cc3139fcd22e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4564,7 +4564,7 @@ static void doc_registerCallback(LibreOfficeKitDocument* 
pThis,
 
pViewShell->setLibreOfficeKitViewCallback(pDocument->mpCallbackFlushHandlers[nView].get());
 }
 
-if (pDocument->maFontsMissing.size() != 0)
+if (!pDocument->maFontsMissing.empty())
 {
 OString sPayload = "{ \"fontsmissing\": [ "_ostr;
 bool bFirst = true;

core.git: sw/source

2024-01-01 Thread Julien Nabet (via logerrit)

 sw/source/core/doc/textboxhelper.cxx |2 +-
 sw/source/core/table/swnewtable.cxx  |2 +-
 sw/source/core/unocore/unotbl.cxx|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3f6396291a044274fd3238c797f3aff4a458fa37
Author: Julien Nabet 
AuthorDate: Sun Dec 31 12:29:03 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 1 12:13:25 2024 +0100

Replace "size() != 0 with !empty()" (sw)

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

diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 253e39a29383..4a1dfc6ead43 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -1686,7 +1686,7 @@ SwTextBoxNode::SwTextBoxNode(SwFrameFormat* pOwnerShape)
 
 SwTextBoxNode::~SwTextBoxNode()
 {
-if (m_pTextBoxes.size() != 0)
+if (!m_pTextBoxes.empty())
 {
 SAL_WARN("sw.core", "SwTextBoxNode::~SwTextBoxNode(): Text-Box-Vector 
still not empty!");
 assert(false);
diff --git a/sw/source/core/table/swnewtable.cxx 
b/sw/source/core/table/swnewtable.cxx
index 3cc2e3670711..1a21a9e0354b 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -2383,7 +2383,7 @@ bool SwTable::CanConvertSubtables() const
 {
 return false; // no formulas in fields yet
 }
-if (pDoc->GetAttrPool().GetItemSurrogates(RES_BOXATR_FORMULA).size() != 0)
+if (!pDoc->GetAttrPool().GetItemSurrogates(RES_BOXATR_FORMULA).empty())
 {
 return false; // no table box formulas yet
 }
diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index eb683b0b1c69..70c1849df7e9 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -503,7 +503,7 @@ static const SwTableBox* lcl_FindCornerTableBox(const 
SwTableLines& rTableLines,
 const SwTableLine* pLine(i_bTopLeft ? pLines->front() : 
pLines->back());
 assert(pLine);
 const SwTableBoxes& rBoxes(pLine->GetTabBoxes());
-assert(rBoxes.size() != 0);
+assert(!rBoxes.empty());
 const SwTableBox* pBox = i_bTopLeft ? rBoxes.front() : rBoxes.back();
 assert(pBox);
 if (pBox->GetSttNd())

core.git: chart2/source

2024-01-01 Thread Julien Nabet (via logerrit)

 chart2/source/view/main/VLegend.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77585439438d9ccfd77534341178a948a575edee
Author: Julien Nabet 
AuthorDate: Sun Dec 31 12:08:04 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Jan 1 12:10:15 2024 +0100

Replace "size() == 0 with empty()" (chart2)

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

diff --git a/chart2/source/view/main/VLegend.cxx 
b/chart2/source/view/main/VLegend.cxx
index 8a4935e9b058..72c0165a69f5 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -449,7 +449,7 @@ awt::Size lcl_placeLegendEntries(
 else
 --nNewLen;
 }
-if (aTextShapes.size() == 0)
+if (aTextShapes.empty())
 {
 DrawModelWrapper::removeShape(rEntries[0].xSymbol);
 rEntries.pop_back();

core.git: ucb/source

2024-01-01 Thread Julien Nabet (via logerrit)

 ucb/source/ucp/webdav-curl/CurlUri.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff07799606ff0d2405225d818c4fbbaf30c4a10f
Author: Julien Nabet 
AuthorDate: Sat Dec 30 18:01:10 2023 +0100
Commit: Noel Grandin 
CommitDate: Mon Jan 1 10:25:38 2024 +0100

cid#1545411 Resource leak

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

diff --git a/ucb/source/ucp/webdav-curl/CurlUri.cxx 
b/ucb/source/ucp/webdav-curl/CurlUri.cxx
index 3ee218d5aca3..1b478cce8a45 100644
--- a/ucb/source/ucp/webdav-curl/CurlUri.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlUri.cxx
@@ -290,7 +290,7 @@ CurlUri 
CurlUri::CloneWithRelativeRefPathAbsolute(std::u16string_view rRelativeR
 SAL_WARN("ucb.ucp.webdav.curl", "curl_url_set failed: " << uc);
 throw DAVException(DAVException::DAV_INVALID_ARG);
 }
-return CurlUri(*pUrl.release());
+return CurlUri(*pUrl);
 }
 
 OUString EncodeSegment(OUString const& rSegment)

core.git: sfx2/source

2023-12-31 Thread Julien Nabet (via logerrit)

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

New commits:
commit 0d5bd921a5a08607ec0b240463eff143f0b52fd0
Author: Julien Nabet 
AuthorDate: Sun Dec 31 12:16:03 2023 +0100
Commit: Julien Nabet 
CommitDate: Sun Dec 31 18:52:18 2023 +0100

Replace "size() == 0 with empty()" (sfx2)

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

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b94d72307176..ff0fa9bf30c3 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -4928,7 +4928,7 @@ void CheckReadOnlyTask::doWork()
 g_existingReadOnlyDocs[pMed] = roEntry;
 it = g_newReadOnlyDocs.erase(it);
 }
-if (g_existingReadOnlyDocs.size() == 0)
+if (g_existingReadOnlyDocs.empty())
 {
 g_bChkReadOnlyTaskRunning = false;
 return;

core.git: dbaccess/source

2023-12-31 Thread Julien Nabet (via logerrit)

 dbaccess/source/core/api/RowSet.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 393171f473870a0790b0ebe7fac3922d7d5ff5d1
Author: Julien Nabet 
AuthorDate: Sun Dec 31 12:10:20 2023 +0100
Commit: Julien Nabet 
CommitDate: Sun Dec 31 18:35:48 2023 +0100

Replace "size() == 0 with empty()" (dbaccess)

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

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index eccaa6af525b..e9bf6012b229 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1221,7 +1221,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
 
 void ORowSet::impl_restoreDataColumnsWriteable_throw()
 {
-assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || 
m_aReadOnlyDataColumns.size() == 0 );
+assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || 
m_aReadOnlyDataColumns.empty());
 TDataColumns::const_iterator aIter = m_aDataColumns.begin();
 for (bool readOnlyDataColumn : m_aReadOnlyDataColumns)
 {

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1776 matches

Mail list logo