date:20250128

core.git: sfx2/source

2025-01-28 Thread Caolán McNamara (via logerrit)

 sfx2/source/doc/objmisc.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 815c59104ff2f0a3603471b84132f4786a102fbd
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 14:59:18 2025 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 17:56:39 2025 +0100

Don't broadcast SfxHintId::TitleChanged if title doesn't change

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

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 0a58635a2f7d..a0296194e807 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -865,9 +865,14 @@ void SfxObjectShell::InvalidateName()
 
 {
 pImpl->aTitle.clear();
-SetName( GetTitle( SFX_TITLE_APINAME ) );
 
-Broadcast( SfxHint(SfxHintId::TitleChanged) );
+OUString sOldName = GetName();
+OUString sNewName = GetTitle(SFX_TITLE_APINAME);
+if (sOldName != sNewName)
+{
+SetName(sNewName);
+Broadcast(SfxHint(SfxHintId::TitleChanged));
+}
 }

core.git: helpcontent2

2025-01-28 Thread Olivier Hallot (via logerrit)

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

New commits:
commit 6ca82a321f31a537eef8a334ada4cd751a2a00cd
Author: Olivier Hallot 
AuthorDate: Tue Jan 28 14:10:02 2025 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 18:10:02 2025 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9400a3e9696e67e24560695969877e2e30199918
  - tdf#150880, tdf#150881 WRAPROWS() + WRAPCOLS() Help pages

+ refactor to reuse sample data
+ Adjust data for TOCOL and TOROW

Change-Id: I6d4661a9c044d414d4142aa159900b699ccb2192
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/180811
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index c0ab5d8cbdbf..9400a3e9696e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c0ab5d8cbdbf455565c655539e50dd7669a02b59
+Subproject commit 9400a3e9696e67e24560695969877e2e30199918

How LibreOffice load a service from a Java JAR

2025-01-28 Thread Pierre Vacher

Hi all,

I would like to see the code that allows to load a UNO service that we
added to the UNO API by a Java JAR file through for example an extension.
The goal is to know how the Java JAR archive is loaded.

I searched for *RegistrationHandler* in the source code but it does not
give anything?

Thanks.

Pierre

core.git: sw/inc sw/source

2025-01-28 Thread Caolán McNamara (via logerrit)

 sw/inc/rdfhelper.hxx |2 +-
 sw/source/core/doc/rdfhelper.cxx |   27 +++
 2 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit e54b5b0dfff81d21fa79ca629f66a5bc3cc3745c
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 17:00:19 2025 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 20:53:59 2025 +0100

We already have a SwXTextDocument, don't need to cast

to XDocumentMetadataAccess, it's already available

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

diff --git a/sw/inc/rdfhelper.hxx b/sw/inc/rdfhelper.hxx
index 8152ef6765c5..dd7267758846 100644
--- a/sw/inc/rdfhelper.hxx
+++ b/sw/inc/rdfhelper.hxx
@@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwRDFHelper
 public:
 /// Gets all graph-names in RDF of a given type.
 static css::uno::Sequence>
-getGraphNames(const 
css::uno::Reference& xDocumentMetadataAccess,
+getGraphNames(const rtl::Reference& xModel,
   const css::uno::Reference& xType);
 
 /// Gets all graph-names in RDF of a given type.
diff --git a/sw/source/core/doc/rdfhelper.cxx b/sw/source/core/doc/rdfhelper.cxx
index c5374b7b24a6..aad999761445 100644
--- a/sw/source/core/doc/rdfhelper.cxx
+++ b/sw/source/core/doc/rdfhelper.cxx
@@ -27,12 +27,12 @@
 using namespace com::sun::star;
 
 css::uno::Sequence> 
SwRDFHelper::getGraphNames(
-const css::uno::Reference& 
xDocumentMetadataAccess,
+const rtl::Reference& xModel,
 const css::uno::Reference& xType)
 {
 try
 {
-return xDocumentMetadataAccess->getMetadataGraphsWithType(xType);
+return xModel->getMetadataGraphsWithType(xType);
 }
 catch (const uno::RuntimeException&)
 {
@@ -103,8 +103,7 @@ void SwRDFHelper::addStatement(const 
rtl::Reference& xModel,
 {
 const uno::Reference& 
xComponentContext(comphelper::getProcessComponentContext());
 uno::Reference xType = rdf::URI::create(xComponentContext, 
rType);
-uno::Reference 
xDocumentMetadataAccess(xModel);
-const uno::Sequence< uno::Reference > aGraphNames = 
getGraphNames(xDocumentMetadataAccess, xType);
+const uno::Sequence< uno::Reference > aGraphNames = 
getGraphNames(xModel, xType);
 uno::Reference xGraphName;
 if (aGraphNames.hasElements())
 xGraphName = aGraphNames[0];
@@ -123,8 +122,7 @@ bool SwRDFHelper::hasMetadataGraph(const 
rtl::Reference& xModel
 {
 const uno::Reference& 
xComponentContext(comphelper::getProcessComponentContext());
 uno::Reference xType = rdf::URI::create(xComponentContext, 
rType);
-uno::Reference 
xDocumentMetadataAccess(xModel);
-return getGraphNames(xDocumentMetadataAccess, xType).hasElements();
+return getGraphNames(xModel, xType).hasElements();
 }
 
 void SwRDFHelper::removeStatement(const rtl::Reference& 
xModel,
@@ -134,12 +132,11 @@ void SwRDFHelper::removeStatement(const 
rtl::Reference& xModel,
 {
 const uno::Reference& 
xComponentContext(comphelper::getProcessComponentContext());
 uno::Reference xType = rdf::URI::create(xComponentContext, 
rType);
-uno::Reference 
xDocumentMetadataAccess(xModel);
-const uno::Sequence< uno::Reference > aGraphNames = 
getGraphNames(xDocumentMetadataAccess, xType);
+const uno::Sequence< uno::Reference > aGraphNames = 
getGraphNames(xModel, xType);
 if (!aGraphNames.hasElements())
 return;
 
-uno::Reference xGraph = 
xDocumentMetadataAccess->getRDFRepository()->getGraph(aGraphNames[0]);
+uno::Reference xGraph = 
xModel->getRDFRepository()->getGraph(aGraphNames[0]);
 uno::Reference xKey = rdf::URI::create(xComponentContext, rKey);
 uno::Reference xValue = 
rdf::Literal::create(xComponentContext, rValue);
 xGraph->removeStatements(xSubject, xKey, xValue);
@@ -195,13 +192,12 @@ void SwRDFHelper::removeTextNodeStatement(const OUString& 
rType, SwTextNode& rTe
 if (!pShell)
 return;
 rtl::Reference xModel(pShell->GetBaseModel());
-uno::Reference 
xDocumentMetadataAccess(xModel);
-const uno::Sequence< uno::Reference > aGraphNames = 
getGraphNames(xDocumentMetadataAccess, xType);
+const uno::Sequence< uno::Reference > aGraphNames = 
getGraphNames(xModel, xType);
 if (!aGraphNames.hasElements())
 return;
 
 const uno::Reference& xGraphName = aGraphNames[0];
-uno::Reference xGraph = 
xDocumentMetadataAccess->getRDFRepository()->getGraph(xGraphName);
+uno::Reference xGraph = 
xModel->getRDFRepository()->getGraph(xGraphName);
 uno::Reference 
xSubject(SwXParagraph::CreateXParagraph(rTextNode.GetDoc(), &rTextNode, 
nullptr));
 uno::Reference xKey = rdf::URI::create(xComponentContext, rKey);
 uno::Reference xValue = 
rdf::Literal::create(xComponentContext, rValue);
@@ -216,8 +212,7 @@ void SwRDFHelper::updateTextNodeStatement(const OUString& 
rType, const OU

core.git: vcl/qt5

2025-01-28 Thread Stephan Bergmann (via logerrit)

 vcl/qt5/QtFrame.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit eabe32cb1822f1150abdb4c44a9ca19d551c2ecf
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 08:21:20 2025 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 09:28:49 2025 +0100

Fix "Remove a hack at least for Emscripten --enable-qt6"

...following up on 862e86d187c53ab077b672997ca8d9623396b962, where I had 
screwed
up (and thanks to Michael Weghorn for spotting)

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

diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index a8debeff5a8e..d717886f464e 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -272,7 +272,6 @@ QWindow* QtFrame::windowHandle() const
 case SystemEnvData::Platform::WASM:
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 // no idea, why Qt::WA_NativeWindow breaks the menubar for 
EMSCRIPTEN
-pChild->setAttribute(Qt::WA_NativeWindow);
 break;
 #endif
 case SystemEnvData::Platform::Wayland:

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

2025-01-28 Thread Caolán McNamara (via logerrit)

 sc/inc/lookupcache.hxx  |3 ++-
 sc/source/core/tool/lookupcache.cxx |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9cc43189ecc9720e3e88175c2a06affa44d3d40a
Author: Caolán McNamara 
AuthorDate: Sat Jan 25 20:20:52 2025 +
Commit: Miklos Vajna 
CommitDate: Tue Jan 28 10:51:16 2025 +0100

Resolves: tdf#164853 find_if causing copy

the pred param of:
  const std::pair&
doesn't exactly match what the arg should be, which is
  const std::pair&
so an unecessary copy is silently created, add and use some typedefs
to make this more straightforward.

seen with:

perf record -e mem_load_l3_hit_retired.xsnp_fwd -e 
mem_load_l3_hit_retired.xsnp_miss

on profiling specifically for contested accesses, see 
tma_contested_accesses in perf -v

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

diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index ca1d333880fa..2f39192149fc 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -189,7 +189,8 @@ private:
 }
 };
 
-std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash > 
maQueryMap;
+typedef std::unordered_map QueryMap;
+QueryMap maQueryMap;
 ScRange maRange;
 ScDocument *mpDoc;
 ScLookupCacheMap & mCacheMap;
diff --git a/sc/source/core/tool/lookupcache.cxx 
b/sc/source/core/tool/lookupcache.cxx
index 70e19ec20d86..24f5acf6abbb 100644
--- a/sc/source/core/tool/lookupcache.cxx
+++ b/sc/source/core/tool/lookupcache.cxx
@@ -88,7 +88,7 @@ SCROW ScLookupCache::lookup( const QueryCriteria & rCriteria 
) const
 {
 // try to find the row index for which we have already performed lookup
 auto it = std::find_if(maQueryMap.begin(), maQueryMap.end(),
-[&rCriteria](const std::pair& 
rEntry) {
+[&rCriteria](const QueryMap::value_type& rEntry) {
 return rEntry.second.maCriteria == rCriteria;
 });
 if (it != maQueryMap.end())

core.git: sw/source

2025-01-28 Thread Caolán McNamara (via logerrit)

 sw/source/core/unocore/unoobj2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3271cf5adfbe2e00d02417d85ff320763d7e9a5
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 19:56:25 2025 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 22:42:58 2025 +0100

SwXTextDocument::getBodyText can be used instead of getText here

and that's already a rtl::Reference to SwXBodyText which is
derived from SwXText

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

diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index 5875a17c8e90..0327e13c6161 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1378,7 +1378,7 @@ CreateParentXText(SwDoc & rDoc, const SwPosition& rPos)
 {
 // then it is the body text
 const rtl::Reference xModel = 
pDocSh->GetBaseModel();
-xParentText = dynamic_cast(xModel->getText().get());
+xParentText = xModel->getBodyText();
 }
 }
 }

translations.git: Changes to 'refs/tags/co-24.04.12-2'

2025-01-28 Thread Andras Timar (via logerrit)

Tag 'co-24.04.12-2' created by Andras Timar  at 
2025-01-28 20:37 +

co-24.04.12-2

Changes since cp-24.04.11-4:
Andras Timar (1):
  [cp] French translation of STR_FI_TOOLTIP_COFFICE

---
 source/fr/scp2/source/ooo.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: config_host.mk.in configure.ac solenv/gbuild

2025-01-28 Thread Stephan Bergmann (via logerrit)

 config_host.mk.in|1 +
 configure.ac |1 +
 solenv/gbuild/platform/unxgcc.mk |2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 795e6f6f3e5ab8201dabde65e9b3b939293d34a4
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 09:37:31 2025 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 13:20:25 2025 +0100

Introduce EMSCRIPTEN_EXTRA_QTLOADER_CONFIG

for use in Emscripten --enable-qt6 builds, to e.g. add command line 
arguments
(like --writer) into qt_soffice.html.

For standard --enable-qt5 Emscripten builds, it works to specify an

> EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS=/path/to/include.js

containing

> Module.arguments = ['--writer'];

to make qt_soffice.html open a Writer document.  Due to how the Qt loading 
has
changed in Qt6, that no longer works for --enable-qt6 Emscripten builds.  
But
what works there now is to instead specify an

> EMSCRIPTEN_EXTRA_QTLOADER_CONFIG=arguments:['--writer']

(The sed -z option that is necessary to replace text spanning a newline is a
non-standard GNU extension, but lets assume that this is only executed for
cross-builds from Linux that use GNU sed.)

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 5cd8b0dbcede..cdf47d5072b9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -148,6 +148,7 @@ export DPKG=@DPKG@
 export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
 export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
 export EMSDK_FILE_PACKAGER=@EMSDK_FILE_PACKAGER@
+export EMSCRIPTEN_EXTRA_QTLOADER_CONFIG=@EMSCRIPTEN_EXTRA_QTLOADER_CONFIG@
 export EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS=@EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS@
 export EMSCRIPTEN_WORKERJS=@EMSCRIPTEN_WORKERJS@
 export ENABLE_ANDROID_LOK=@ENABLE_ANDROID_LOK@
diff --git a/configure.ac b/configure.ac
index 303c445453d6..b00228c511b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1505,6 +1505,7 @@ if test "$_os" = "Emscripten"; then
 fi
 fi
 AC_SUBST(EMSDK_FILE_PACKAGER)
+AC_SUBST(EMSCRIPTEN_EXTRA_QTLOADER_CONFIG)
 AC_SUBST(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS)
 AC_SUBST(EMSCRIPTEN_WORKERJS)
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 1c289b193d4e..2bc51aa28799 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -185,7 +185,7 @@ $(if $(filter TRUE,$(ENABLE_QT5)), \
 sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(basename $(notdir 
$(1))).html && \
 cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js 
$(dir $(1)) && \
 ,$(if $(filter TRUE,$(ENABLE_QT6)), \
-sed -e 's/@APPNAME@/$(basename $(notdir $(1)))/g' -e 
's/@APPEXPORTNAME@/$(basename $(notdir $(1)))_entry/g' -e 's/@PRELOAD@//g' -e 
's/}$(CLOSE_PAREN);$$/}$(CLOSE_PAREN); window.Module = instance;/' 
$(QT6_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(basename $(notdir 
$(1))).html && \
+sed -z -e 's/@APPNAME@/$(basename $(notdir $(1)))/g' -e 
's/@APPEXPORTNAME@/$(basename $(notdir $(1)))_entry/g' -e 's/@PRELOAD@
}/}$(COMMA)$(subst 
','\'',$(EMSCRIPTEN_EXTRA_QTLOADER_CONFIG))/' -e 
's/}$(CLOSE_PAREN);$$/}$(CLOSE_PAREN); window.Module = instance;/' 
$(QT6_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(basename $(notdir 
$(1))).html && \
 cp $(QT6_PLATFORMS_SRCDIR)/qtlogo.svg $(QT6_PLATFORMS_SRCDIR)/qtloader.js 
$(dir $(1)) && \
 )) \
 cp $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data 
$(dir $(1))/soffice.data && \

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

2025-01-28 Thread Gülşah Köse (via logerrit)

 sc/source/filter/xcl97/xcl97esc.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit ab62d75141192a73dcd6862e37753bc1c3f82576
Author: Gülşah Köse 
AuthorDate: Fri Jan 17 16:57:59 2025 +0300
Commit: Szymon Kłos 
CommitDate: Tue Jan 28 09:21:08 2025 +0100

tdf#164141 Fix command button xls to xlsx convert problem.

MSO has two type controls. ActiveX and normal. ControlTypeinMSO
specifies the form control object is ActiveX or not.

2: ActiveX form control
1: Normal form control

Current case is simple ActiveX button created by MSO can not be exported by
LibreOffice properly. It was triggering the repair dialog on MSO. And we
even lost the button in LibreOffice.

If the pCurrXclObj is failed, we need to give a chance to export button
by using XclExpTbxControlObj instead of directly XclObjAny

This patch just fixes the Command button xls to xlsx convertion problem.
Not all the form controls.

Signed-off-by: Gülşah Köse 
Change-Id: Ifabf4d0e16bd620f8201a2143d8af7c64d8859a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180414
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 

diff --git a/sc/source/filter/xcl97/xcl97esc.cxx 
b/sc/source/filter/xcl97/xcl97esc.cxx
index 43538de6c889..84317f706010 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -240,7 +240,11 @@ EscherExHostAppData* XclEscherEx::StartShape( const 
Reference< XShape >& rxShape
 SAL_WARN("sc", "XclEscherEx::StartShape, this control can't 
get the property ControlTypeinMSO!");
 }
 if( nMsCtlType == 2 )  //OCX Form Control
+{
 pCurrXclObj = CreateOCXCtrlObj( rxShape, pChildAnchor 
).release();
+if(!pCurrXclObj) // Give a chance to handle control object 
with XclExpTbxControlObj instead of XclObjAny
+pCurrXclObj = CreateTBXCtrlObj( rxShape, pChildAnchor 
).release();
+}
 else  //TBX Form Control
 pCurrXclObj = CreateTBXCtrlObj( rxShape, pChildAnchor 
).release();
 if( !pCurrXclObj )

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

2025-01-28 Thread Noel Grandin (via logerrit)

 sw/inc/node.hxx |6 +++---
 sw/source/core/crsr/pam.cxx |   28 ++--
 sw/source/core/doc/docruby.cxx  |2 +-
 sw/source/core/docnode/node.cxx |   29 ++---
 sw/source/core/edit/edattr.cxx  |2 +-
 sw/source/core/inc/pamtyp.hxx   |6 +++---
 6 files changed, 36 insertions(+), 37 deletions(-)

New commits:
commit ba928d7589ab78f81aea20e7ce9a1e6fa928def5
Author: Noel Grandin 
AuthorDate: Sat Jan 18 19:19:14 2025 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jan 28 12:27:26 2025 +0100

pass param by reference in GoNext/GoPrevious

to enforce that they are never nullptr

Change-Id: I973dcc143b5334c3060a0f815474e569deae4c27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180459
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian 
(cherry picked from commit f60995e97f50152aca57305a0f13e708265186a6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180766
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index b1e3309d596f..e42b6e80e53c 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -434,9 +434,9 @@ public:
 bool CanJoinNext( SwPosition* pIdx ) const;
 bool CanJoinPrev( SwNodeIndex* pIdx =nullptr ) const;
 
-bool GoNext(SwContentIndex *, SwCursorSkipMode nMode ) const;
-bool GoNext(SwPosition*, SwCursorSkipMode nMode ) const;
-bool GoPrevious(SwContentIndex *, SwCursorSkipMode nMode ) const;
+bool GoNext(SwContentIndex&, SwCursorSkipMode nMode ) const;
+bool GoNext(SwPosition&, SwCursorSkipMode nMode ) const;
+bool GoPrevious(SwContentIndex&, SwCursorSkipMode nMode ) const;
 
 /// @see GetFrameOfModify
 SwContentFrame *getLayoutFrame( const SwRootFrame*,
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index c5e2a1cc3557..f4dffd98418f 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -378,17 +378,17 @@ bool CheckNodesRange( const SwNode& rStt,
 return false; // somewhere in between => error
 }
 
-bool GoNext(SwNode* pNd, SwContentIndex * pIdx, SwCursorSkipMode nMode )
+bool GoNext(SwNode& rNd, SwContentIndex& rIdx, SwCursorSkipMode nMode )
 {
-if( pNd->IsContentNode() )
-return static_cast(pNd)->GoNext( pIdx, nMode );
+if( rNd.IsContentNode() )
+return static_cast(rNd).GoNext( rIdx, nMode );
 return false;
 }
 
-bool GoPrevious( SwNode* pNd, SwContentIndex * pIdx, SwCursorSkipMode nMode )
+bool GoPrevious( SwNode& rNd, SwContentIndex& rIdx, SwCursorSkipMode nMode )
 {
-if( pNd->IsContentNode() )
-return static_cast(pNd)->GoPrevious( pIdx, nMode );
+if( rNd.IsContentNode() )
+return static_cast(rNd).GoPrevious( rIdx, nMode );
 return false;
 }
 
@@ -1201,32 +1201,32 @@ bool GoInNode( SwPaM & rPam, SwMoveFnCollection const & 
fnMove )
 
 bool GoInContent( SwPaM & rPam, SwMoveFnCollection const & fnMove )
 {
-if( (*fnMove.fnNd)( &rPam.GetPoint()->GetNode(),
-&rPam.GetPoint()->nContent, SwCursorSkipMode::Chars ))
+if( (*fnMove.fnNd)( rPam.GetPoint()->GetNode(),
+rPam.GetPoint()->nContent, SwCursorSkipMode::Chars ))
 return true;
 return GoInNode( rPam, fnMove );
 }
 
 bool GoInContentCells( SwPaM & rPam, SwMoveFnCollection const & fnMove )
 {
-if( (*fnMove.fnNd)( &rPam.GetPoint()->GetNode(),
- &rPam.GetPoint()->nContent, SwCursorSkipMode::Cells ))
+if( (*fnMove.fnNd)( rPam.GetPoint()->GetNode(),
+rPam.GetPoint()->nContent, SwCursorSkipMode::Cells ))
 return true;
 return GoInNode( rPam, fnMove );
 }
 
 bool GoInContentSkipHidden( SwPaM & rPam, SwMoveFnCollection const & fnMove )
 {
-if( (*fnMove.fnNd)( &rPam.GetPoint()->GetNode(),
-&rPam.GetPoint()->nContent, SwCursorSkipMode::Chars | 
SwCursorSkipMode::Hidden ) )
+if( (*fnMove.fnNd)( rPam.GetPoint()->GetNode(),
+rPam.GetPoint()->nContent, SwCursorSkipMode::Chars | 
SwCursorSkipMode::Hidden ) )
 return true;
 return GoInNode( rPam, fnMove );
 }
 
 bool GoInContentCellsSkipHidden( SwPaM & rPam, SwMoveFnCollection const & 
fnMove )
 {
-if( (*fnMove.fnNd)( &rPam.GetPoint()->GetNode(),
- &rPam.GetPoint()->nContent, SwCursorSkipMode::Cells | 
SwCursorSkipMode::Hidden ) )
+if( (*fnMove.fnNd)( rPam.GetPoint()->GetNode(),
+rPam.GetPoint()->nContent, SwCursorSkipMode::Cells | 
SwCursorSkipMode::Hidden ) )
 return true;
 return GoInNode( rPam, fnMove );
 }
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 1a1b84ffd7f4..f51a49a224fe 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -303,7 +303,7 @@ bool SwDoc::SelectNextRubyChars( SwPaM& rPam, 
SwRubyListEntry& rEntry )
 nWordEn

translations.git: Branch 'libreoffice-24-8' - source/ast source/bg source/ca source/da source/de source/dsb source/es source/fr source/gug source/hsb source/hu source/it source/nb source/nl source/nn

2025-01-28 Thread Christian Lohmaier (via logerrit)

 source/ast/helpcontent2/source/text/scalc.po   |   
10 -
 source/ast/helpcontent2/source/text/scalc/01.po|   
10 -
 source/ast/helpcontent2/source/text/shared/00.po   |   
10 -
 source/ast/helpcontent2/source/text/shared/02.po   |   
 8 
 source/ast/helpcontent2/source/text/shared/guide.po|   
14 -
 source/ast/helpcontent2/source/text/shared/optionen.po |   
 6 
 source/ast/helpcontent2/source/text/smath/04.po|   
10 -
 source/ast/sw/messages.po  |   
 7 
 source/bg/helpcontent2/source/text/shared/help.po  |   
 8 
 source/ca/helpcontent2/source/text/scalc/01.po |   
 6 
 source/ca/helpcontent2/source/text/shared/optionen.po  |   
 6 
 source/da/helpcontent2/source/text/sbasic/shared.po|   
12 -
 source/da/helpcontent2/source/text/shared/help.po  |   
 6 
 source/de/helpcontent2/source/text/shared/help.po  |   
10 -
 source/dsb/helpcontent2/source/text/shared/guide.po|   
84 +-
 source/dsb/helpcontent2/source/text/shared/help.po |   
 8 
 source/es/helpcontent2/source/text/scalc/01.po |   
46 ++---
 source/es/helpcontent2/source/text/shared/help.po  |   
 6 
 source/es/helpcontent2/source/text/shared/optionen.po  |   
 6 
 source/es/helpcontent2/source/text/swriter/01.po   |   
 6 
 source/es/sfx2/messages.po |   
 8 
 source/fr/helpcontent2/source/text/scalc/01.po |   
44 ++---
 source/fr/helpcontent2/source/text/shared/01.po|   
12 -
 source/fr/helpcontent2/source/text/shared/help.po  |   
 8 
 source/fr/svtools/messages.po  |   
 8 
 source/gug/helpcontent2/source/text/scalc/01.po|   
46 ++---
 source/gug/helpcontent2/source/text/shared/help.po |   
 6 
 source/gug/helpcontent2/source/text/shared/optionen.po |   
 6 
 source/gug/helpcontent2/source/text/swriter/01.po  |   
 6 
 source/hsb/helpcontent2/source/text/shared/guide.po|   
 6 
 source/hsb/helpcontent2/source/text/shared/help.po |   
 8 
 source/hu/connectivity/registry/ado/org/openoffice/Office/DataAccess.po|   
12 -
 source/hu/dictionaries/en/dialog/registry/data/org/openoffice/Office.po|   
12 -
 source/hu/dictionaries/hu_HU/dialog/registry/data/org/openoffice/Office.po |   
12 -
 source/hu/dictionaries/pt_BR/dialog.po |   
10 -
 source/hu/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po |   
12 -
 source/hu/dictionaries/ru_RU/dialog/registry/data/org/openoffice/Office.po |   
12 -
 source/hu/officecfg/registry/data/org/openoffice/Office/UI.po  |   
12 -
 source/hu/sc/messages.po   |   
24 +-
 source/hu/sfx2/messages.po |   
10 -
 source/hu/sw/messages.po   |   
12 -
 source/hu/uui/messages.po  |   
11 -
 source/hu/xmlsecurity/messages.po  |   
10 -
 source/it/helpcontent2/source/text/shared/help.po  |   
 6 
 source/it/helpcontent2/source/text/swriter/01.po   |   
 5 
 source/nb/helpcontent2/source/text/shared/help.po  |   
 8 
 source/nl/sc/messages.po   |   
10 -
 source/nl/scp2/source/ooo.po   |   
14 -
 source/nl/svtools/messages.po  |   
 8 
 source/nl/sw/messages.po   |   
 8 
 source/nn/helpcontent2/source/text/shared/help.po  |   
 8 
 source/pl/helpcontent2/source/text/shared/help.po  |   
 8 
 source/pt-BR/helpcontent2/source/text/shared/help.po   |   
 8 
 source/pt/cui/messages.po  |   
28 +--
 source/tl/helpcontent2/source/text/shared/help.po  |   
 6 
 55 files changed, 352 insertions(+), 351 deletions(-)

New commits:
commit 5b3d9fdd3767be331e982533ec6852d09822b9e7
Author: Christian Lohmaier 
AuthorDate: Tue Jan 28 11:54:22 2025 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Jan 28 11:55:18 2025 +0100

u

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

2025-01-28 Thread Miklos Vajna (via logerrit)

 sfx2/source/view/viewfrm.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a05728a67b85ace24df87292cd8d3110358dcdb8
Author: Miklos Vajna 
AuthorDate: Thu Jan 23 17:00:07 2025 +0100
Commit: Xisco Fauli 
CommitDate: Tue Jan 28 09:23:39 2025 +0100

cool#11002 sfx2: fix crash in SfxViewFrame::StateReload_Impl()

Now that the scheduler no longer calls std::abort(), we crashed with:

#5  
(gdb)
#6  std::__uniq_ptr_impl >::_M_ptr (this=0x10) at 
/usr/include/c++/12/bits/unique_ptr.h:191
191   pointer_M_ptr() const noexcept { return 
std::get<0>(_M_t); }
(gdb)
#7  0x7ff37cdaf9da in std::unique_ptr >::get (this=0x10) at 
/usr/include/c++/12/bits/unique_ptr.h:462
462   { return _M_t._M_ptr(); }
(gdb)
#8  0x7ff37cdab888 in std::unique_ptr >::operator-> (this=0x10) at 
/usr/include/c++/12/bits/unique_ptr.h:455
455 return get();
(gdb)
#9  0x7ff37cd989e3 in SfxMedium::GetItemSet (this=0x0) at 
sfx2/source/doc/docfile.cxx:3810
3810if (!pImpl->m_pSet)
(gdb) up
#10 0x7ff37d082c50 in SfxViewFrame::StateReload_Impl 
(this=0x1ba830c0, rSet=SfxItemSet of pool 0x18ba4d60 with parent 0x0 and Which 
ranges: [(6312, 6312)] = {...})
at sfx2/source/view/viewfrm.cxx:944
944 const SfxBoolItem* pItem = 
pSh->GetMedium()->GetItemSet().GetItem(SID_EDITDOC, false);
(gdb) print pSh->GetMedium()
$1 = (SfxMedium *) 0x0

So just check for that case when the shell doesn't have a medium.

Change-Id: I0198121853d283253b782c7e526ef8ef9436eed7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180685
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 7ce3ff3edefe7f4540f37754d789035286634b9b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180687
Reviewed-by: Xisco Fauli 

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 8df6931536de..6c7f41239cf8 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -943,7 +943,8 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
 rSet.DisableItem( nWhich );
 else
 {
-const SfxBoolItem* pItem = 
pSh->GetMedium()->GetItemSet().GetItem(SID_EDITDOC, false);
+SfxMedium* pMedium = pSh->GetMedium();
+const SfxBoolItem* pItem = pMedium ? 
pMedium->GetItemSet().GetItem(SID_EDITDOC, false) : nullptr;
 if ( pItem && !pItem->GetValue() )
 rSet.DisableItem( nWhich );
 else

core.git: sd/source

2025-01-28 Thread Balazs Varga (via logerrit)

 sd/source/ui/view/drtxtob1.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 4354919a9e5bea6182b23c7fbc93ce082111a44c
Author: Balazs Varga 
AuthorDate: Tue Jan 28 01:37:07 2025 +0100
Commit: Balazs Varga 
CommitDate: Tue Jan 28 09:33:26 2025 +0100

tdf#164855 sd - fix crash while centering table contents

regression from: 1d9ce0a67a71e51569cd33c26270eeece587a354
(tdf#162571 - sd: Text box expands or shrinks on left or right...)

Change-Id: I75425dc15f40a32c353284f0a1338e117b8db018
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180809
Reviewed-by: Balazs Varga 
Tested-by: Jenkins

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index b0fbe31bc984..370fa9dffb06 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -616,14 +616,17 @@ SET_ADJUST:
 {
 aNewAttr.Put(SvxAdjustItem(eAdjst, EE_PARA_JUST));
 // set anchor
-ESelection aSel = pOLV->GetSelection();
-aSel.Adjust();
-sal_Int32 nStartPara = aSel.start.nPara;
-if (!aSel.HasRange())
-nStartPara = 0;
-
-if (nStartPara == 0)
-aNewAttr.Put(SdrTextHorzAdjustItem(eAnchor));
+if (pOLV)
+{
+ESelection aSel = pOLV->GetSelection();
+aSel.Adjust();
+sal_Int32 nStartPara = aSel.start.nPara;
+if (!aSel.HasRange())
+nStartPara = 0;
+
+if (nStartPara == 0)
+aNewAttr.Put(SdrTextHorzAdjustItem(eAnchor));
+}
 }
 break;

core.git: Branch 'libreoffice-24-8' - translations

2025-01-28 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 6ad2c3ef81301cb9a168d187e0af3d042b0b3c75
Author: Christian Lohmaier 
AuthorDate: Tue Jan 28 11:57:00 2025 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 11:57:00 2025 +0100

Update git submodules

* Update translations from branch 'libreoffice-24-8'
  to 5b3d9fdd3767be331e982533ec6852d09822b9e7
  - update translations for 24.8.5 rc1

and force-fix errors using pocheck

Change-Id: Id85feaf2e12bf62a7551c4ab05ede09d8f518734

diff --git a/translations b/translations
index dcdab8953fe9..5b3d9fdd3767 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit dcdab8953fe901a914c95a55fd30f740c22d6f8d
+Subproject commit 5b3d9fdd3767be331e982533ec6852d09822b9e7

dictionaries.git: Changes to 'libreoffice-24-8-5'

2025-01-28 Thread Christian Lohmaier (via logerrit)

New branch 'libreoffice-24-8-5' available with the following commits:
commit 08536ae84e6c8d0cddf7150e055ccf174a421295
Author: Christian Lohmaier 
Date:   Tue Jan 28 12:04:59 2025 +0100

Branch libreoffice-24-8-5

This is 'libreoffice-24-8-5' - the stable branch for the 24.8.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 24.8.x release,
please use the 'libreoffice-24-8' branch.

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

Change-Id: I5bfa6b4335fb0918dd4b073e01fc88a71e6ee5e3

help.git: Changes to 'libreoffice-24-8-5'

2025-01-28 Thread Christian Lohmaier (via logerrit)

New branch 'libreoffice-24-8-5' available with the following commits:
commit a8a612c7f3a42b13f9b4c7c1f4354f83fbf0a666
Author: Christian Lohmaier 
Date:   Tue Jan 28 12:04:59 2025 +0100

Branch libreoffice-24-8-5

This is 'libreoffice-24-8-5' - the stable branch for the 24.8.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 24.8.x release,
please use the 'libreoffice-24-8' branch.

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

Change-Id: I8a93b11347c6a15f76135f12016ed1c710daebd0

core.git: Changes to 'libreoffice-24-8-5'

2025-01-28 Thread Christian Lohmaier (via logerrit)

New branch 'libreoffice-24-8-5' available with the following commits:
commit d0d2b127d162d69365ce3b59ba3178fa43c66ffe
Author: Christian Lohmaier 
Date:   Tue Jan 28 12:05:18 2025 +0100

Branch libreoffice-24-8-5

This is 'libreoffice-24-8-5' - the stable branch for the 24.8.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 24.8.x release,
please use the 'libreoffice-24-8' branch.

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

translations.git: Changes to 'libreoffice-24-8-5'

2025-01-28 Thread Christian Lohmaier (via logerrit)

New branch 'libreoffice-24-8-5' available with the following commits:
commit 3b3ebf9281af545da9a5c58e42f91a4327822324
Author: Christian Lohmaier 
Date:   Tue Jan 28 12:04:59 2025 +0100

Branch libreoffice-24-8-5

This is 'libreoffice-24-8-5' - the stable branch for the 24.8.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 24.8.x release,
please use the 'libreoffice-24-8' branch.

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

Change-Id: I3575c83967445d8b9fc94c304318eb123b421d4a

core.git: Branch 'libreoffice-24-8' - configure.ac

2025-01-28 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 35819d5a7c9c4a5750a456a310a5174900d21484
Author: Christian Lohmaier 
AuthorDate: Tue Jan 28 12:05:48 2025 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Jan 28 12:05:48 2025 +0100

bump product version to 24.8.6.0.0+

Change-Id: Icebc243227a84c3a699fb3c96a3b078fc8dffd70

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

core.git: sw/source

2025-01-28 Thread László Németh (via logerrit)

 sw/source/core/text/porrst.cxx |   27 ---
 1 file changed, 16 insertions(+), 11 deletions(-)

New commits:
commit a4af3948e9212ef46149f906e5880f77693cca4b
Author: László Németh 
AuthorDate: Tue Jan 28 02:29:16 2025 +0100
Commit: László Németh 
CommitDate: Tue Jan 28 12:09:30 2025 +0100

tdf#163309 sw: clean-up bookmark boundary mark labels

Add white background to the labels for better visibility on
colored page/background.

Maximize the size of the label in 3 pt to support very
narrow fixed line spacing of headings.

Follow-up to commit 3393e52be0900ad63ceee0a43cd44d473ec8248a
"tdf#163309 sw: show rdf:type as labels on bookmark boundary marks".

Change-Id: I986b73892f2caca9ea0c97918db4c45577ada0eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180810
Reviewed-by: László Németh 
Tested-by: Jenkins

diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 0a8bab3d66ea..9331add1e58c 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -877,11 +877,6 @@ void SwBookmarkPortion::Paint( const SwTextPaintInfo &rInf 
) const
 nTypePos = mnHalfCharWidth * 2; // start label after the opening 
bracket
 }
 
-// vertical rdf:type label position for the opening and closing 
brackets
-sal_Int32 fPos = std::get<0>(it) == SwScriptInfo::MarkKind::Start
-? -0.6 * nHeight
-: 0.3 * nHeight;
-
 // MarkKind::Point: drawn I-beam (e.g. U+2336) as overlapping ][
 if ( std::get<0>(it) == SwScriptInfo::MarkKind::Point )
 {
@@ -908,34 +903,44 @@ void SwBookmarkPortion::Paint( const SwTextPaintInfo 
&rInf ) const
 auto origSize = aTmpSz;
 
 // calculate label size
-aTmpSz.setHeight( ( 100 * aTmpSz.Height() ) / 250 );
-aTmpSz.setWidth( ( 100 * aTmpSz.Width() ) / 250 );
+aTmpSz.setHeight( std::min( tools::Long(60), 100 * aTmpSz.Height() 
/ 250 ) );
+aTmpSz.setWidth( std::min( tools::Long(60), 100 * aTmpSz.Width() / 
250 ) );
+
+// vertical rdf:type label position for the opening and closing 
brackets
+sal_Int32 fPos = std::get<0>(it) == SwScriptInfo::MarkKind::Start
+? -0.65 * nHeight
+: aTmpSz.Height();
 
 if ( aTmpSz.Width() || aTmpSz.Height() )
 {
 aTmpFont.SetSize( aTmpSz, SwFontScript::Latin );
+auto aTextSize =  rInf.GetTextSize(sType);
 
 aNewPos.AdjustY(fPos);
 if ( nDirection == -1 )
 {
 if (bStart)
 {
-nTypePos += rInf.GetTextSize( sType ).Width();
+nTypePos += aTextSize.Width();
 bStart = false;
 }
 else
-nTypePos += rInf.GetTextSize( sType + " " ).Width() + 
2 * mnHalfCharWidth;
+nTypePos += aTextSize.Width() +
+rInf.GetTextSize( " " ).Width() + 2 * 
mnHalfCharWidth;
 }
 aNewPos.AdjustX( nDirection * nTypePos );
 
 const_cast< SwTextPaintInfo& >( rInf ).SetPos( aNewPos );
 
-rInf.DrawText( sType, *this );
+SwRect aRect( rInf.GetPos(), Size(aTextSize.Width(), 
-aTextSize.Height() * 0.8) );
+rInf.DrawRect( aRect, true );  // white background
+rInf.DrawText( sType, *this ); // label
 
 // restore original position
 aNewPos.AdjustX( -nDirection * nTypePos );
 if ( nDirection == 1 )
-nTypePos += rInf.GetTextSize( sType + " " ).Width() - 
mnHalfCharWidth * 2;
+nTypePos += aTextSize.Width() +
+rInf.GetTextSize( " " ).Width() - 
mnHalfCharWidth * 2;
 
 aNewPos.AdjustY(-fPos);
 }

core.git: Branch 'libreoffice-24-8-5' - configure.ac

2025-01-28 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 1f3496d9c28fb5a88da05f38a5bade4443e063ea
Author: Christian Lohmaier 
AuthorDate: Tue Jan 28 12:10:03 2025 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Jan 28 12:10:03 2025 +0100

bump product version to 24.8.5.1.0+

Change-Id: I35914ced7f3d7fa43be4d70d8596a788540da432

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

core.git: Changes to 'refs/tags/libreoffice-24.8.5.1'

2025-01-28 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-24.8.5.1' created by Christian Lohmaier 
 at 2025-01-28 11:09 +

Tag libreoffice-24.8.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmeYuvUACgkQ9DSh76/u
rqMKRQ/+JfVUaVC/1Zc6qvXl+EEN6dzg+JiwKNyF4nOdNruTzILZZMz/ondcNnqb
oZZ650tkeiCPSZpuSDGdIa83+h4zi7P4lXlSHVfRU9QSUOWn+UTT2VjIFSIttNyC
u6G4CllUn4eigg6jIJf1qbIaA/cQRGnmGxGZkwQSV2EwpmOUihB8pw4TkzDNoV1A
L2XowROOaFQH2cSklianrhliVBsQP7Z+I18LnGB9+tupFp/Y2Icyy/T6WHychBP1
f9FrfnreoyQooCODKt0GqCx5zdTrfR/rugpt7stk/dwaIzxRIJ1kSX/DIDCibSJV
1pbLQOjybcHqI6RLraJtpKN24MfiSNvjDbEztwvAylZemhnskWymxRiPRT5SJZ7q
Gn14mXKZqrs1+TCzKATiKgd0sRntnRukZgvup5MWX+L7GGHMatHu7+Pxxow7eMqu
w5jJgjE/9e4K+CzC3EAP7HDThDgO3j4bbIYLQjW4sK1WEYXD+ADf2cRWRh7ptDfx
dlb67EEOzkD5T2r3Kd8MWudVJcouWqxoa5+8arR5RTfwKxCByoIvX1KD0TDKgtQV
mtsmxaBXeU0TRASI7VtUQGu2MSEqSoOrYsWKEgJTUGiQ5cq9xYv0sKjMimVtagYx
LqCkvC5xqvt2d0SZozLx+lKWcJ5TSCQ1ik8/YO2BouNCIHVlyEA=
=XRAu
-END PGP SIGNATURE-

Changes since libreoffice-24-8-branch-point-1071:
---
 0 files changed
---

help.git: Changes to 'refs/tags/libreoffice-24.8.5.1'

2025-01-28 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-24.8.5.1' created by Christian Lohmaier 
 at 2025-01-28 11:09 +

Tag libreoffice-24.8.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmeYuvUACgkQ9DSh76/u
rqNL4Q/+PLuQFyEdYWplR3Hdl0de2CO+6iFqAFR/F5RNdMW+aEYjT4ouqhnoCuzE
/xTxk+S9z0O3TVjfBI+3xu8NRuFW3Quo/iE4QwejHDjb1tHk2QRXoMH/cHvg+y1q
7XK2DWFdZQ+zbdAP/nArdtTLggNlk2pwBR/hhEyINW0tNorgmthLE9S0+EK2lzK3
VoooQnxVpzdwH/tEoBRm5FQxwXWkzpb+Tozt6kx+2Jb/Xe8haykgDvE5RKJs6wCE
UIVLa+aFLmrx1S/Fde3JW7E4EpWARFOPOxvoOrAAHlLv+1/fjk4zfVKNvUFqnFlf
dkvjlKljVyqX6sTwectqTXvpo1mul4wJfCli2T7xhhj9OXWDYuP2joSCeuYKK+jr
IfcACzvOhiBRf66vnfRmbzOUlYoRQDk2S4uenPhiWzXE+wwro5AzukrrHCn5j4lS
apoYmA0kOLcF8gR2zD8iI6VkByI5/eD9KSdySTbJ3j//eBHlHogUVML8gmQPmDpA
ct99nSQyx4M4HiHBs1AkDungLYkGb5Z1xzgg03a4FW7ULspkjL4q2LmH9ZqLwGf/
KrnMbELAVvVvXprF01UXDVVsCE1O61l2wL9+TAANbGt5sJRAfAM+HGd+CYXe9zvk
fi2/3p73focvT29b/YZ8xoAAiYZhGXyV81C02KgYFFz7cHnZjZc=
=yGbG
-END PGP SIGNATURE-

Changes since libreoffice-24-8-branch-point-22:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/libreoffice-24.8.5.1'

2025-01-28 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-24.8.5.1' created by Christian Lohmaier 
 at 2025-01-28 11:09 +

Tag libreoffice-24.8.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmeYuvEACgkQ9DSh76/u
rqPvgxAAnBWQPqyI7ldFih8XCo39PBxMwbUT+lkZVxdMO4ZmqohAtGVmnmvRVZof
CSiW0ZR3yyhMw3c9GSOw5T81Jiob6WZv67yqipMxGa1h3LceHosXb0nEdfReMzBR
pIwsQdFBw9WVMZWTd1mi3zmAPYjmyglh965K7v8KtberEgPQLAllzuFrYMGc/Ioy
kW80g30zHChm0E+O9EIzYgzcfhL6asdKBWNBjx1LJ7Ra5eNTKeVp+THAdLlycuqq
qJBNTLJQXFUQgoVEZH7Qw6LnO2ztlYCWjpEC1rzDJvscvElradvWmZReqOFuWCHL
Fvb/8ZxUKCGWqpxFmvS86DTdu7Fqi9ZkCmzcc1l7lMzqsRmEptbyVlajOxXUGx5H
KHi4jenzAl0MjHMsl3OjRSF7iRPfrTCaFuJes7V7fry/aA9b+HruvrMzxXe/NZbV
Pv0eoNYmk83yzFYzavzyFfLChvXiSIncsedVXHCILdiJelJSGULvmeXx2McWCvIc
ss4lTkbSwRON268XPMUxU/XzNrqNsrTbzeX6RV76+g/UjMeAz5hFg7VmI2L+Cl7/
y8FXidIK0MfmZmV6NZdGwCiELULAHSeRdFbRxRzduQZKy+HSqzgXiGuFMQr3A02X
1YRpBOnhFZSCeBZDGpltb2gCe/74p4cEbhIiQnRf/XM01v8EJBo=
=h8Ch
-END PGP SIGNATURE-

Changes since libreoffice-24-8-branch-point-16:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/libreoffice-24.8.5.1'

2025-01-28 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-24.8.5.1' created by Christian Lohmaier 
 at 2025-01-28 11:09 +

Tag libreoffice-24.8.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmeYuvUACgkQ9DSh76/u
rqMDZxAAhPfBx+BUpqCh+x3hlexSLk/Smf6GTd4OY3rKuF7kSz3u5plWNb3Eivyg
VWyG//l1yPSIqKHx+gMhLaYgaT+s7bopUqGFhMYx8m/bH0DuTQsf0rdFeSMFtEt/
3UjOW4V2AV4njzfETLGw0V422m134Q79vcmzoExv/2AvXhWT+i7NWZVvzqE2oJrS
fySKEkXOsvrcwAYG+zo5PI3ynVJWpVrahqn/Kh6UlRx+GaHiMsudUbNjGdVpved1
3RMk/QDH+8QcDNJNvVdsR+x+DImDLBvn3oWyWsxM5E1fwZuzvru9rLiYbReoN0YR
qp/yN5JFRpaAfHj4q2pBMYWOP+V/wMRQGWUyugUStNj3XhZLvOvtWQOuF7oF2J00
xSuRRIwp79cgoJylUk9raxiTlJcgnV3MGU3C3WRQX6/PJ90WufVb4lm5lpllDA4Q
AeNz4CvbhdqgjLDOT5Sid6/YylfXgSG9HGeuWNiO5Ocj8u8iFjD/bvmc9u4f52t7
feAa46qr3w8/pYIICDeeB7875TEz6zrYuWcQdWXpzGmGixKoRjpixUkBYQXno1iw
ZJwB46MoAN35diwrCGn2+PFlSL4DbL8JjhnGg5n5eTjlsYt4/rO71OUpm4rbQ2vA
WaPQGvJ0OBnju9lx3R9diR7/Hp0udwpEm8yWIbghF2iI8S7QhZY=
=Nb3s
-END PGP SIGNATURE-

Changes since libreoffice-24-8-branch-point-26:
---
 0 files changed
---

dictionaries.git: Branch 'libreoffice-24-8' - mn_MN/description.xml mn_MN/mn_MN.aff mn_MN/mn_MN.dic

2025-01-28 Thread Xisco Fauli (via logerrit)

 mn_MN/description.xml |2 
 mn_MN/mn_MN.aff   |  180 +
 mn_MN/mn_MN.dic   | 1553 +-
 3 files changed, 1307 insertions(+), 428 deletions(-)

New commits:
commit 0f295bfc00204baea05b013b187848428346b10a
Author: Xisco Fauli 
AuthorDate: Thu Dec 26 13:05:10 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Jan 28 11:19:28 2025 +0100

Upgrade Mongolian dictionary to 2024.12.26

Downloaded from 
https://codeload.github.com/bataak/dict-mn/zip/refs/tags/2024.12.26

Change-Id: I336665091832e67a7c27fe602f8cc9fd98e87e7c
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179426
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit 9e21ef7309e336a0f8f623c54a4dda49f9d043b6)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179428
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/mn_MN/description.xml b/mn_MN/description.xml
index 6e45a31..0fde8c2 100644
--- a/mn_MN/description.xml
+++ b/mn_MN/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 Mongolian spelling and hyphenation 
dictionaries
diff --git a/mn_MN/mn_MN.aff b/mn_MN/mn_MN.aff
index 300c07b..ad7151e 100644
--- a/mn_MN/mn_MN.aff
+++ b/mn_MN/mn_MN.aff
@@ -1,5 +1,5 @@
 # mn_MN.aff
-# Version: 2024.11.08
+# Version: 2024.12.26
 # Copyright 2020-2024, Batmunkh Dorjgotov 
 #   https://zuv.bichig.dev
 # Special thanks to Guntevsuren Nanzad for your great professional assistance.
@@ -46,7 +46,7 @@ COMPOUNDRULE (nn)*[o0,o1,o2,o3]
 COMPOUNDRULE (nn)*%?
 COMPOUNDRULE (nn)*.(nn)*%?
 
-REP 3621
+REP 3753
 REP a а
 REP c с
 REP e е
@@ -115,10 +115,13 @@ REP аатай аалттай
 REP ав б
 REP ав ба
 REP ав уу
+REP авб вав
 REP авч агч
 REP авч айвч
 REP аг га
 REP аг ийг
+REP аг лаг
+REP аг лага
 REP агаа аа
 REP агаас оос
 REP агоос оос
@@ -127,6 +130,7 @@ REP аган г
 REP агийн ийн
 REP агийн ын
 REP агд д
+REP агдса огдсо
 REP агла гал
 REP агн г
 REP агний гийн
@@ -136,6 +140,7 @@ REP агнуур гар
 REP агны гийн
 REP агт гад
 REP агт ганд
+REP агч г
 REP ад даг
 REP ад нууд
 REP ад онд
@@ -150,6 +155,7 @@ REP ажла жил
 REP ай иа
 REP айлал айл
 REP айлл айл
+REP ал агла
 REP ал алал
 REP ал алла
 REP ал ла
@@ -163,6 +169,8 @@ REP алгаанд лагт
 REP алгааны лагын
 REP алганд лагад
 REP алганы лагын
+REP алгы гий
+REP алгы лагий
 REP алн л
 REP алнууд лууд
 REP алны лын
@@ -176,9 +184,11 @@ REP амн м
 REP амны мын
 REP амчих мачих
 REP амчих мачх
+REP амы мыг
 REP ан йг
 REP ан ын
 REP ана на
+REP ана энэ
 REP анаа ээ
 REP анаараа ноороо
 REP анаасаа ноосоо
@@ -190,6 +200,7 @@ REP ангид инганд
 REP ангий ы
 REP ангий$ ыг
 REP ангийн ны
+REP ангийх ынх
 REP ангийх ных
 REP ангиуд нууд
 REP ангууд нууд
@@ -244,6 +255,7 @@ REP ахад оход
 REP ахдаа охдоо
 REP ахиас хаас
 REP ахий хы
+REP ахы ы
 REP ач чи
 REP аш ши
 REP ашла шил
@@ -260,6 +272,7 @@ REP егийн ын
 REP егоо оо
 REP ей егий
 REP ендий анды
+REP ерээ ороо
 REP еэ ёо
 REP ёо еэ
 REP ёо яа
@@ -277,6 +290,7 @@ REP и н
 REP и о
 REP и ү
 REP й ү
+REP йнын ины
 REP и ха
 REP и ь
 REP и э
@@ -380,15 +394,20 @@ REP иддоо додоо
 REP иддөө дөдөө
 REP иддээ дэдээ
 REP идн д
+REP иж эжг
+REP ий аа
 REP ий агийн
 REP ий игий
 REP ий иягий
 REP ий огийн
+REP ий оо
 REP ий өгийн
+REP ий өө
 REP ий ы
 REP ий эгийн
 REP ий ээ
 REP ийг г
+REP ийг эг
 REP ийгөө ыгаа
 REP ийгөө ыгоо
 REP ийгээ ийгөө
@@ -472,6 +491,7 @@ REP ийнхээрээ ынхаараа
 REP ийнхээрээ ынхоороо
 REP ийнхээсээ ынхаасаа
 REP ийнхээсээ ынхоосоо
+REP ийс иш
 REP ийхний өгийнхний
 REP ийхний эгийнхний
 REP ийхтэй ыхтай
@@ -502,6 +522,10 @@ REP ил ли
 REP ил ло
 REP ил лө
 REP ил лэ
+REP ил лал
+REP ил лол
+REP ил лөл
+REP ил лэл
 REP йла али
 REP ила ли
 REP илб иллав
@@ -559,6 +583,7 @@ REP ингийн ний
 REP ингийн ны
 REP ингонд онгид
 REP ингөнд өнгид
+REP ингуудаа доо
 REP ингэнд энгид
 REP инд д
 REP инд т
@@ -577,6 +602,7 @@ REP инчлэ энчил
 REP ины ий
 REP ины ийн
 REP ины енийн
+REP ины нийн
 REP йны йн
 REP инэ ни
 REP ио ё
@@ -620,6 +646,7 @@ REP исн сон
 REP исн сөн
 REP исн сэн
 REP исны сын
+REP ист сэд
 REP исчи ьсчхо
 REP ит та
 REP ит то
@@ -666,8 +693,10 @@ REP ов уу
 REP овч огч
 REP овч ойвч
 REP ог го
+REP ог ийг
 REP огаа аа
 REP огаа оо
+REP огдсо агдса
 REP огийн ийн
 REP огийн ын
 REP огло гол
@@ -706,6 +735,7 @@ REP олдирл улдрал
 REP олдирлоо улдралаа
 REP олдиро улдра
 REP олдри улдра
+REP олий илы
 REP олн л
 REP олнууд лууд
 REP олны лын
@@ -713,6 +743,7 @@ REP олро лор
 REP олт л
 REP олчи лоч
 REP олъё лоё
+REP оль ил
 REP оль йл
 REP ольдир улдра
 REP ольдирлоо улдралаа
@@ -729,6 +760,7 @@ REP онг ыг
 REP онгид ингонд
 REP онгий ы
 REP онгийн ны
+REP онгийх ынх
 REP онгийх ных
 REP онгиуд нууд
 REP онгоо ноо
@@ -894,6 +926,7 @@ REP өнг нийг
 REP өнгид ингөнд
 REP өнгий ий
 REP өнги

core.git: Branch 'libreoffice-24-8' - dictionaries

2025-01-28 Thread Xisco Fauli (via logerrit)

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

New commits:
commit 1ba3a8e1360cb0e5dcf0a4049f2488141b579451
Author: Xisco Fauli 
AuthorDate: Tue Jan 28 11:19:28 2025 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 11:19:28 2025 +0100

Update git submodules

* Update dictionaries from branch 'libreoffice-24-8'
  to 0f295bfc00204baea05b013b187848428346b10a
  - Upgrade Mongolian dictionary to 2024.12.26

Downloaded from 
https://codeload.github.com/bataak/dict-mn/zip/refs/tags/2024.12.26

Change-Id: I336665091832e67a7c27fe602f8cc9fd98e87e7c
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179426
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit 9e21ef7309e336a0f8f623c54a4dda49f9d043b6)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179428
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/dictionaries b/dictionaries
index faa01827f566..0f295bfc0020 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit faa01827f566ff1f0a31a4d4f4511f2591fe98f9
+Subproject commit 0f295bfc00204baea05b013b187848428346b10a

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

2025-01-28 Thread Balazs Varga (via logerrit)

 sd/source/ui/view/drtxtob1.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit a2309c06c6e9205b837387335a76af6533826e8a
Author: Balazs Varga 
AuthorDate: Tue Jan 28 01:37:07 2025 +0100
Commit: Xisco Fauli 
CommitDate: Tue Jan 28 11:18:01 2025 +0100

tdf#164855 sd - fix crash while centering table contents

regression from: 1d9ce0a67a71e51569cd33c26270eeece587a354
(tdf#162571 - sd: Text box expands or shrinks on left or right...)

Change-Id: I75425dc15f40a32c353284f0a1338e117b8db018
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180809
Reviewed-by: Balazs Varga 
Tested-by: Jenkins
(cherry picked from commit 4354919a9e5bea6182b23c7fbc93ce082111a44c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180814
Reviewed-by: Xisco Fauli 

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index c4763de8dd3f..f6a0762835bf 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -616,14 +616,17 @@ SET_ADJUST:
 {
 aNewAttr.Put(SvxAdjustItem(eAdjst, EE_PARA_JUST));
 // set anchor
-ESelection aSel = pOLV->GetSelection();
-aSel.Adjust();
-sal_Int32 nStartPara = aSel.start.nPara;
-if (!aSel.HasRange())
-nStartPara = 0;
-
-if (nStartPara == 0)
-aNewAttr.Put(SdrTextHorzAdjustItem(eAnchor));
+if (pOLV)
+{
+ESelection aSel = pOLV->GetSelection();
+aSel.Adjust();
+sal_Int32 nStartPara = aSel.start.nPara;
+if (!aSel.HasRange())
+nStartPara = 0;
+
+if (nStartPara == 0)
+aNewAttr.Put(SdrTextHorzAdjustItem(eAnchor));
+}
 }
 break;

dictionaries.git: Branch 'libreoffice-24-8' - hi_IN/hi_IN.aff hi_IN/hi_IN.dic

2025-01-28 Thread Shantanu Oak (via logerrit)

 hi_IN/hi_IN.aff |  659 
 hi_IN/hi_IN.dic |223302 

 2 files changed, 208161 insertions(+), 15800 deletions(-)

New commits:
commit faa01827f566ff1f0a31a4d4f4511f2591fe98f9
Author: Shantanu Oak 
AuthorDate: Sun Jan 5 06:28:32 2025 +
Commit: Christian Lohmaier 
CommitDate: Tue Jan 28 11:17:15 2025 +0100

update hindi

Change-Id: I8abbeeca2e3dab5b4f75e5c0ec0c44b87e2fd678
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179779
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 2bb5f4cd04b2a0a3cba85ce9879c99ace1b10221)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179875
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/hi_IN/hi_IN.aff b/hi_IN/hi_IN.aff
index 67f0967..6fca3ed 100644
--- a/hi_IN/hi_IN.aff
+++ b/hi_IN/hi_IN.aff
@@ -1,2 +1,659 @@
-SET UTF-8
+SET UTF-8
+# Hindi Spellcheking Dictionary in Hunspell format - SPELLCHECKERVERSION
+# Last Update by ShreeDevi Kumar on SPELLCHECKERDATE
+# Files available from http://github.com/Shreeshrii/hindi-hunspell
+#
 TRY ़ािीुूृॅेैॉोौ्ज़य़ँंःअआइईउऊऋएऐऑओऔकखगघङचछजझञटठडढणतथदधनपफबभमयरऱलवशषसह
+KEY इई|उऊ|आऑऒओऔॵ|ऄऍऎएऐ|िी|ुू|ॅॆेै|ाॉॊोौॏ|डङ|धघ|मभय|बव|ंँ
+MAXNGRAMSUGS 10
+MAXDIFF 5
+
+# convert internally for checking spelling
+ICONV 2
+ICONV । .
+ICONV ॥ .
+
+MAP 1
+MAP लळ
+
+
+# offer replacement as suggestion
+REP 99
+REP ि ी
+REP ी ि
+REP ु ू
+REP ू ु
+REP ो ौ
+REP ौ ो
+REP ॉं ाँ
+REP ॅं ँ
+REP ाॅ ॉ
+REP अॉ ऑ
+REP अॅ ॲ
+REP ये$ ए
+REP या$ आ
+REP यी$ ई
+REP : ः
+REP क़ क़
+REP ख़ ख़
+REP ग़ ग़
+REP ज़ ज़
+REP ड़ ड़
+REP ढ़ ढ़
+REP फ़ फ़
+REP य़ य़
+REP ऴ ऴ
+REP ऩ ऩ
+REP ऱ ऱ
+REP क़ क
+REP ख़ ख
+REP ग़ ग
+REP ज़ ज
+REP ड़ ड
+REP ढ़ ढ
+REP फ़ फ
+REP य़ य
+REP क़ क
+REP ख़ ख
+REP ग़ ग
+REP ड़ ड
+REP ढ़ ढ
+REP ज़ ज
+REP फ़ फ
+REP ऴ ळ
+REP ऩ न
+REP ऱ र
+REP क क़
+REP ख ख़
+REP ग ग़
+REP ड ड़
+REP ढ ढ़
+REP ज ज़
+REP फ फ़
+REP र् र
+REP र्‍ र्
+REP श ष
+REP ष श
+REP म् ं
+REP ं म्
+REP ंम म्म
+REP ंम न्म
+REP ंन न्न
+REP न्क ंक
+REP न्ख ंख
+REP न्ग ंग
+REP न्घ ंघ
+REP न्च ंच
+REP न्छ ंछ
+REP न्ज ंज
+REP न्झ ंझ
+REP न्ट ण्ट
+REP न्ठ ण्ठ
+REP न्ड ण्ड
+REP न्ढ ण्ढ
+REP ंट ण्ट
+REP ंठ ण्ठ
+REP ंड ण्ड
+REP ंढ ण्ढ
+REP ंत न्त
+REP ंथ न्थ
+REP ंद न्द
+REP ंध न्ध
+REP ङ्क ंक
+REP ङ्ख ंख
+REP ङ्ग ंग
+REP ङ्घ ंघ
+REP ञ्च ंच
+REP ञ्छ ंछ
+REP ञ्ज ंज
+REP ञ्झ ंझ
+REP ण्ट ंट
+REP ण्ठ ंठ
+REP ण्ड ंड
+REP ण्ढ ंढ
+REP न्त ंत
+REP न्थ ंथ
+REP न्द ंद
+REP न्ध ंध
+REP ध्द द्ध
+REP ग्य ज्ञ
+REP रि ऋ
+
+BREAK 4
+BREAK _
+BREAK -
+BREAK ˆ-
+BREAK -$
+
+WORDCHARS ०१२३४५६७८९।-.,॥‰§%°0123456789–'
+
+# hi-verb1.dic - verb forms for o-kaaraanta kriyaa-pada
+SFX 1 Y 18
+SFX 1 0 कर .
+SFX 1 0 ना .
+SFX 1 0 ने .
+SFX 1 0 ता .
+SFX 1 0 ती .
+SFX 1 0 ते .
+SFX 1 0 ए .
+SFX 1 0 एगा .
+SFX 1 0 एगी .
+SFX 1 0 एँगे .
+SFX 1 0 इए .
+SFX 1 0 इएगा .
+SFX 1 0 इएगी .
+SFX 1 0 इएँगी .
+SFX 1 0 ऊँ .
+SFX 1 0 ऊँगा .
+SFX 1 0 ऊँगी .
+SFX 1 0 या [^हो]
+
+
+# hi-verb2.dic - verb forms for o-kaaraanta kriyaa-pada
+SFX 2 Y 2
+SFX 2 0 /1 .
+SFX 2 ो ुला/7 [^हप]ो
+
+
+# hi-verb3.dic - verb forms for ii-kaaranta kriyaa-pada eg  पी, जी, सी
+SFX 3 Y 16
+SFX 3 0 कर .
+SFX 3 0 ना .
+SFX 3 0 ने .
+SFX 3 0 ता .
+SFX 3 0 ती .
+SFX 3 0 ते .
+SFX 3 ी िए ी
+SFX 3 ी िएगा ी
+SFX 3 ी िएगी ी
+SFX 3 ी िएँगे ी
+SFX 3 ी िऊँ ी
+SFX 3 ी िऊँगा ी
+SFX 3 ी िऊँगी ी
+SFX 3 ी िआ ी
+SFX 3 ी िला/7 ी
+SFX 3 ी िलवा/7 ी
+
+
+#  verb forms for u-kaaranta kriyaa-pada
+SFX 4 Y 14
+SFX 4 0 कर .
+SFX 4 0 ना .
+SFX 4 0 ने .
+SFX 4 0 ता .
+SFX 4 0 ती .
+SFX 4 0 ते .
+SFX 4 ू ुएगा ू
+SFX 4 ू ुएगी ू
+SFX 4 ू ुएँगे ू
+SFX 4 ू ुऊँगा ू
+SFX 4 ू ुऊँगी ू
+SFX 4 ू ुऊँ ू
+SFX 4 ू ुला/7 [^च]ू
+SFX 4 ू ुलवा/7 [^च]ू
+
+
+
+# hi-verb5.dic - verb forms for e-kaaranta kriyaa-pada eg. ले, दे, खे?
+SFX 5 Y 15
+SFX 5 0 कर .
+SFX 5 0 ना .
+SFX 5 0 ने .
+SFX 5 0 ता .
+SFX 5 0 ती .
+SFX 5 0 ते .
+SFX 5 े ीजिए े
+SFX 5 0 गा .
+SFX 5 0 गी .
+SFX 5 0 ँगे .
+SFX 5 0 ऊँ .
+SFX 5 0 ऊँगा .
+SFX 5 0 ऊँगी .
+SFX 5 े िला/7 [^ल]े
+SFX 5 े िलवा/7 [^ल]े
+
+
+# hi-verb6.dic - irregular past participles - जाना, करना, मरना, होना, देना, 
लेना
+SFX 6 Y 20
+SFX 6 ेना िया ेना
+SFX 6 ेना िए ेना
+SFX 6 ेना ी ेना
+SFX 6 ेना ीं ेना
+SFX 6 ोना ुआ होना
+SFX 6 ोना ुए होना
+SFX 6 ोना ुई होना
+SFX 6 ोना ुईं होना
+SFX 6 जाना गया जाना
+SFX 6 जाना गए जाना
+SFX 6 जाना गई जाना
+SFX 6 जाना गईं जाना
+SFX 6 रना िया करना
+SFX 6 रना िए करना
+SFX 6 रना ी करना
+SFX 6 रना ीं करना
+SFX 6 रना ुआ मरना
+SFX 6 रना ुए मरना
+SFX 6 रना ुई मरना
+SFX 6 रना ुईं मरना
+
+# hi-verb7.dic - verb forms for aa-kaaranta kriyaa-pada -
+SFX 7 Y 24
+SFX 7 0 इयो .
+SFX 7 0 वे .
+SFX 7 0 ई .
+SFX 7 0 कर .
+SFX 7 0 ना .
+SFX 7 0 ने .
+SFX 7 0 ता .
+SFX 7 0 ती .
+SFX 7 0 ते .
+SFX 7 0 ए .
+SFX 7 0 एगा .
+SFX 7 0 एगी .
+SFX 7 0 एँगीं .
+SFX 7 0 एँगे .
+SFX 7 0 ऊँ .
+SFX 7 0 ऊँगा .
+SFX 7 0 ऊँगी .
+SFX 7 0 ऊँगीं .
+SFX 7 0 इए .
+SFX 7 0 इएगा .
+SFX 7 0 इएगी .
+SFX 7 0 ओ .
+SFX 7 0 ओगे .
+SFX 7 0 ओगी .
+
+
+# verb forms for a-kaaranta kriyaa-pada
+SFX 8 Y 27
+SFX 8 0 ियो .
+SFX

core.git: Branch 'libreoffice-24-8' - dictionaries

2025-01-28 Thread Shantanu Oak (via logerrit)

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

New commits:
commit e2473aeff2a68d84f4c994fee2cbd1dc1828312a
Author: Shantanu Oak 
AuthorDate: Tue Jan 28 10:17:15 2025 +
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 11:17:15 2025 +0100

Update git submodules

* Update dictionaries from branch 'libreoffice-24-8'
  to faa01827f566ff1f0a31a4d4f4511f2591fe98f9
  - update hindi

Change-Id: I8abbeeca2e3dab5b4f75e5c0ec0c44b87e2fd678
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179779
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 2bb5f4cd04b2a0a3cba85ce9879c99ace1b10221)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179875
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/dictionaries b/dictionaries
index 301b18671cc8..faa01827f566 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 301b18671cc899c0a1593f00880573ce6e8a6604
+Subproject commit faa01827f566ff1f0a31a4d4f4511f2591fe98f9

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

2025-01-28 Thread Caolán McNamara (via logerrit)

 sw/source/filter/ww8/wrtw8nds.cxx |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 4c1c507e5efffdf076ff21b5d49f70ec550a9c5e
Author: Caolán McNamara 
AuthorDate: Fri Jan 24 15:49:03 2025 +
Commit: Miklos Vajna 
CommitDate: Tue Jan 28 09:59:20 2025 +0100

We can use the PoolItem SetAttr rather than create an entire SfxItemSet

presumably at least

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

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index e33e8708f453..28dc8ade91b0 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3489,12 +3489,8 @@ void 
MSWordExportBase::UpdateTocSectionNodeProperties(const SwSectionNode& rSect
 SfxGrabBagItem aGrabBag(RES_PARATR_GRABBAG);
 aGrabBag.GetGrabBag()["SdtPr"] <<= aSdtPrPropertyValues;
 
-// create temp attr set
-SwAttrSet aSet(pNode->GetSwAttrSet());
-aSet.Put(aGrabBag);
-
 // set new attr to node
-const_cast(pNode)->SetAttr(aSet);
+const_cast(pNode)->SetAttr(aGrabBag);
 }
 
 // set flag for the next node after TOC
@@ -3509,12 +3505,8 @@ void 
MSWordExportBase::UpdateTocSectionNodeProperties(const SwSectionNode& rSect
 SfxGrabBagItem aGrabBag(RES_PARATR_GRABBAG);
 aGrabBag.GetGrabBag()["ParaSdtEndBefore"] <<= true;
 
-// create temp attr set
-SwAttrSet aSet(pNodeAfterToc->GetSwAttrSet());
-aSet.Put(aGrabBag);
-
 // set new attr to node
-const_cast(pNodeAfterToc)->SetAttr(aSet);
+const_cast(pNodeAfterToc)->SetAttr(aGrabBag);
 }
 }
 }

core.git: Branch 'libreoffice-24-8' - editeng/inc editeng/source

2025-01-28 Thread Oliver Specht (via logerrit)

 editeng/inc/outleeng.hxx |2 ++
 editeng/source/editeng/impedit2.cxx  |   10 +-
 editeng/source/outliner/outleeng.cxx |5 +
 3 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 2462064fc3e7d82141470a2ce51998c4f5d2364d
Author: Oliver Specht 
AuthorDate: Wed Dec 11 14:24:17 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Jan 28 11:31:26 2025 +0100

tdf#163634 Format empty paragraph if they have a bullet/numbering

Some optimization in commit 52abeff6d5836b29dbefe69f284bbd89f6672ae2
ignores paragph attributes if the paragraph is empty.
But it is not empty if it has an active list.

Change-Id: I8885d0f201fc48279263a3d41ec6d660b534ded2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178311
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit fdb13df0cb759e65e48bb65b1513e8add429d4d6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178553
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 054c2946a130a1acea91140f4e7c3e4a0f93a170)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178748
Reviewed-by: Christian Lohmaier 

diff --git a/editeng/inc/outleeng.hxx b/editeng/inc/outleeng.hxx
index 36194c3d0f6f..79495bb07899 100644
--- a/editeng/inc/outleeng.hxx
+++ b/editeng/inc/outleeng.hxx
@@ -77,6 +77,8 @@ public:
 
 virtual tools::Rectangle   GetBulletArea( sal_Int32 nPara ) override;
 
+sal_Int16   GetDepth( sal_Int32 nPara ) const;
+
 /// @returns state of the SdrCompatibilityFlag
 std::optional GetCompatFlag(SdrCompatibilityFlag eFlag) const;
 
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 3e9240a92c96..76a344334507 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -75,6 +75,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -4396,10 +4397,17 @@ bool 
ImpEditEngine::isInEmptyClusterAtTheEnd(ParaPortion& rPortion)
 return false;
 
 sal_Int32 nCurrent = rParagraphs.lastIndex();
+
 while (nCurrent > 0 && rParagraphs.getRef(nCurrent).IsEmpty())
 {
 if (nCurrent == nPortion)
-return true;
+{
+OutlinerEditEng* pOutlEditEng{ 
dynamic_cast(mpEditEngine)};
+if (pOutlEditEng)
+return pOutlEditEng->GetDepth(nCurrent) < 0;
+else
+return true;
+}
 nCurrent--;
 }
 return false;
diff --git a/editeng/source/outliner/outleeng.cxx 
b/editeng/source/outliner/outleeng.cxx
index 1136ef37b9e2..ff9e0e725299 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -200,4 +200,9 @@ void OutlinerEditEng::SetParaAttribs( sal_Int32 nPara, 
const SfxItemSet& rSet )
 pOwner->UndoActionEnd();
 }
 
+sal_Int16 OutlinerEditEng::GetDepth(sal_Int32 nPara) const
+{
+return pOwner->GetDepth(nPara);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

core.git: cui/source cui/uiconfig include/vcl officecfg/registry svtools/source vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win

2025-01-28 Thread Sahil Gautam (via logerrit)

 cui/source/options/appearance.cxx  |   79 ++---
 cui/source/options/appearance.hxx  |4 
 cui/uiconfig/ui/appearance.ui  |   17 ++
 include/vcl/settings.hxx   |9 -
 include/vcl/themecolors.hxx|   11 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 -
 svtools/source/config/colorcfg.cxx |   20 ++-
 vcl/osx/salframe.cxx   |1 
 vcl/qt5/QtFrame.cxx|1 
 vcl/source/app/settings.cxx|   15 ++
 vcl/unx/gtk3/salnativewidgets-gtk.cxx  |1 
 vcl/win/window/salframe.cxx|1 
 12 files changed, 114 insertions(+), 52 deletions(-)

New commits:
commit 924c7de80afa47a93705e5d073c35f2d81f4ed5a
Author: Sahil Gautam 
AuthorDate: Wed Dec 25 23:13:47 2024 +0530
Commit: Sahil Gautam 
CommitDate: Tue Jan 28 14:02:56 2025 +0100

tdf#164393 [API CHANGE] Make the "Automatic" theme Customizable

+ enable the "Customizations" section for the "Default" theme.
  by default the system colors will be used. If the system theme
  changes then only those colors will persist which were set explicitly
  by the user. (well explained in the comments near colorcfg.cxx changes)

+ add a "Reset all" button to reset all the theme colors to
  system colors. Pressing this button sets all the values to Automatic
  (system colors) irrespective of which theme is being used.

  We have plans for integrating the ExtensionManger with Themes so that
  we can reload the extension when the colors are reset.

Change-Id: Ic811415b24a353b9cfcf7c633a5621b595ec27d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179406
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Sahil Gautam 

diff --git a/cui/source/options/appearance.cxx 
b/cui/source/options/appearance.cxx
index 46c80fd61bbe..999f9e0f268e 100644
--- a/cui/source/options/appearance.cxx
+++ b/cui/source/options/appearance.cxx
@@ -104,6 +104,7 @@ SvxAppearanceTabPage::SvxAppearanceTabPage(weld::Container* 
pPage,
 , m_xColorChangeBtn((new 
ColorListBox(m_xBuilder->weld_menu_button(u"colorsdropdownbtn"_ustr),
   [this] { return GetFrameWeld(); })))
 , 
m_xShowInDocumentChkBtn(m_xBuilder->weld_check_button(u"showindocumentchkbtn"_ustr))
+, m_xResetAllBtn(m_xBuilder->weld_button(u"resetallbtn"_ustr))
 , m_xColorRadioBtn(m_xBuilder->weld_radio_button(u"colorradiobtn"_ustr))
 , m_xImageRadioBtn(m_xBuilder->weld_radio_button(u"imageradiobtn"_ustr))
 , 
m_xStretchedRadioBtn(m_xBuilder->weld_radio_button(u"stretchedradiobtn"_ustr))
@@ -113,18 +114,6 @@ 
SvxAppearanceTabPage::SvxAppearanceTabPage(weld::Container* pPage,
 InitThemes();
 InitAppearance();
 InitCustomization();
-UpdateControlsState();
-}
-
-void SvxAppearanceTabPage::UpdateControlsState()
-{
-// in case of AUTOMATIC_COLOR_SCHEME, disable all the controls
-bool bEnableControls = m_xSchemeList->get_active_id() != 
AUTOMATIC_COLOR_SCHEME;
-m_xColorEntryBtn->set_sensitive(bEnableControls);
-m_xColorChangeBtn->set_sensitive(bEnableControls);
-m_xShowInDocumentChkBtn->set_sensitive(bEnableControls);
-m_xColorRadioBtn->set_sensitive(bEnableControls);
-EnableImageControls(bEnableControls && GetActiveEntry() == APPBACKGROUND);
 }
 
 void SvxAppearanceTabPage::LoadSchemeList()
@@ -176,32 +165,19 @@ OUString SvxAppearanceTabPage::GetAllStrings()
 
 bool SvxAppearanceTabPage::FillItemSet(SfxItemSet* /* rSet */)
 {
-// commit appearance value
+// commit appearance value if changed
 if (eCurrentAppearanceMode != 
static_cast(MiscSettings::GetAppColorMode()))
 {
 
MiscSettings::SetAppColorMode(static_cast(eCurrentAppearanceMode));
-m_bRestartRequired = true;
-// for automatic scheme, restart is not required as customizations 
section is disabled
-if (pColorConfig->GetCurrentSchemeName() == AUTOMATIC_COLOR_SCHEME)
-{
-UpdateOldAppearance();
-m_bRestartRequired = false;
-}
+// if themes disabled then change the document colors as per the new 
appearance mode.
+if (ThemeColors::IsThemeDisabled())
+UpdateDocumentAppearance();
 }
 
 // commit ColorConfig
 if (pColorConfig->IsModified())
 pColorConfig->Commit();
 
-// commit LibreOfficeTheme, enable it if the current scheme is not 
Automatic
-if (m_xSchemeList->get_value_changed_from_saved())
-{
-ThemeState eLibreOfficeThemeState = m_xSchemeList->get_active_id() != 
AUTOMATIC_COLOR_SCHEME
-? ThemeState::ENABLED
-

core.git: sw/source

2025-01-28 Thread Tomaž Vajngerl (via logerrit)

 sw/source/writerfilter/dmapper/DomainMapper.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 76324a5c75b04c0288d8636b3e270f0273ce4e65
Author: Tomaž Vajngerl 
AuthorDate: Mon Jan 27 23:13:48 2025 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Jan 28 14:11:56 2025 +0100

Set an empty ComplexColor, or the previous one could be used

In some OOXML documents it can happen the ComplexColor is set to
elements that shouldn't be set, so set one in all cases so we can
be sure it is set to the ComplexColor we want.

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

diff --git a/sw/source/writerfilter/dmapper/DomainMapper.cxx 
b/sw/source/writerfilter/dmapper/DomainMapper.cxx
index 86e785a0dd4c..1f48a0eb2b00 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper.cxx
@@ -2426,11 +2426,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 if (aAnyComplexColor.has_value())
 return;
 
+model::ComplexColor aComplexColor;
+
 auto eType = 
TDefTableHandler::getThemeColorTypeIndex(pThemeColorHandler->mnIndex);
 if (eType != model::ThemeColorType::Unknown)
 {
-
-model::ComplexColor aComplexColor;
 aComplexColor.setThemeColor(eType);
 
 auto eUsage = 
TDefTableHandler::getThemeColorUsage(pThemeColorHandler->mnIndex);
@@ -2446,11 +2446,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 sal_Int16 nShade = sal_Int16((255 - 
pThemeColorHandler->mnShade) * 1 / 255);
 
aComplexColor.addTransformation({model::TransformationType::Shade, nShade});
 }
-
-auto xComplexColor = 
model::color::createXComplexColor(aComplexColor);
-m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMPLEX_COLOR, 
uno::Any(xComplexColor));
 }
 
+auto xComplexColor = 
model::color::createXComplexColor(aComplexColor);
+m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMPLEX_COLOR, 
uno::Any(xComplexColor));
+
 uno::Any 
aColorAny(msfilter::util::ConvertColorOU(Color(ColorTransparency, 
pThemeColorHandler->mnColor)));
 
m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_ORIGINAL_COLOR, aColorAny, 
true, CHAR_GRAB_BAG);

core.git: Branch 'feature/cib_contract49d' - sw/qa sw/source

2025-01-28 Thread Oliver Specht (via logerrit)

 sw/qa/extras/uiwriter/data/tdf163340_2.odt  |binary
 sw/qa/extras/uiwriter/uiwriter9.cxx |   27 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +--
 3 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 61a27bda71d40a63cbfaf64d49d060c132e5f8a1
Author: Oliver Specht 
AuthorDate: Tue Jan 21 09:25:21 2025 +0100
Commit: Gabor Kelemen 
CommitDate: Tue Jan 28 18:15:05 2025 +0100

tdf#163340 fixes regression

Pasting a single paragraph with a list into an empty paragraph
with a different list should keep that target list and not apply
the source list.

Change-Id: Ife81aa9553bb2396082d23cc86336ad773b83a16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180618
Tested-by: allotropia jenkins 
Reviewed-by: Gabor Kelemen 

diff --git a/sw/qa/extras/uiwriter/data/tdf163340_2.odt 
b/sw/qa/extras/uiwriter/data/tdf163340_2.odt
new file mode 100644
index ..c58a181a0846
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf163340_2.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx 
b/sw/qa/extras/uiwriter/uiwriter9.cxx
index ec6e29db4061..c8d145e3a034 100644
--- a/sw/qa/extras/uiwriter/uiwriter9.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter9.cxx
@@ -790,6 +790,33 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf163340)
 CPPUNIT_ASSERT_EQUAL(u"A."_ustr, getProperty(xParaCursor, 
u"ListLabelString"_ustr));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf163340_2)
+{
+//selects and copies a single paragraph with a list (bullets)
+//and pastes it into an empty paragraph with a different list (numbers)
+//checks that the resulting paragraph keeps that different list
+createSwDoc("tdf163340_2.odt");
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xText = xTextDocument->getText();
+uno::Reference 
xSelSupplier(xModel->getCurrentController(),
+  
uno::UNO_QUERY_THROW);
+uno::Reference 
xParaCursor(xTextDocument->getText()->createTextCursor(),
+   uno::UNO_QUERY);
+
+for (int i = 0; i < 2; i++)
+xParaCursor->gotoNextParagraph(false);
+xParaCursor->gotoEndOfParagraph(true);
+xSelSupplier->select(uno::Any(xParaCursor));
+
+xParaCursor = 
uno::Reference(xText->createTextCursor(), 
uno::UNO_QUERY);
+for (int i = 0; i < 10; i++)
+xParaCursor->gotoNextParagraph(false);
+xParaCursor->gotoEndOfParagraph(true);
+dispatchCommand(mxComponent, u".uno:Paste"_ustr, {});
+CPPUNIT_ASSERT_EQUAL(u"5."_ustr, getProperty(xParaCursor, 
u"ListLabelString"_ustr));
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf162326_Pargraph)
 {
 createSwDoc("tdf162326.odt");
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 62c929f6f469..3d743c949458 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -489,9 +489,9 @@ namespace
 const SwTextNode* pTextNd = rPam.Start()->GetNode().GetTextNode();
 const SwTextNode* pEndTextNd = rPam.End()->GetNode().GetTextNode();
 bool bRet = pTextNd->IsInListFromStyle();
-//prefer list if it's a single paragraph with list from style
-if (pTextNd == pEndTextNd && bRet)
-return true;
+//single paragraphs are preferred only if it's a has a list from style
+if (pTextNd == pEndTextNd)
+return bRet;
 
 if (pTextNd && pTextNd->IsInList() && !pTextNd->IsInListFromStyle() &&
  pEndTextNd && pEndTextNd->IsInList() && 
!pEndTextNd->IsInListFromStyle())

core.git: xmlsecurity/source

2025-01-28 Thread Miklos Vajna (via logerrit)

 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1817760f56b74e47120c1b4d7641fbaebcf378ad
Author: Miklos Vajna 
AuthorDate: Tue Jan 28 16:38:10 2025 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jan 28 18:14:02 2025 +0100

tdf#161872 xmlsecurity nss: don't require trusted signing certs

Configure your signing cert in Firefox, (unusually) don't trust the CA
that you would use to issue your signing cert, try to sign a document,
error.

This is reportedly wrong since commit
bfd479abf0d1d8ce36c3b0dcc6c824216f88a95b (Update libxmlsec to 1.3.1,
2023-06-09), for some reason our usage of libxmlsec-1.2 didn't trigger
this problem.

Given that we already disable libxmlsec-side cert verify while
verifying a signature (and have our own logic there), it's consistent to
do the same while creating the signature, and that fixes the bug, too.

The Windows / MSCNG backend is not yet changed here.

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

diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index ce61942dda27..feb31594f5d4 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -150,6 +150,7 @@ SAL_CALL XMLSignature_NssImpl::generate(
 }
 
 //Sign the template
+pDsigCtx->keyInfoReadCtx.flags |= 
XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS;
 if( xmlSecDSigCtxSign( pDsigCtx.get() , pNode ) == 0 )
 {
 if (pDsigCtx->status == xmlSecDSigStatusSucceeded)

help.git: AllLangHelp_scalc.mk source/text

2025-01-28 Thread Olivier Hallot (via logerrit)

 AllLangHelp_scalc.mk |2 
 source/text/scalc/01/func_tocol.xhp  |  145 +---
 source/text/scalc/01/func_torow.xhp  |   97 ++--
 source/text/scalc/01/func_wrapcols.xhp   |   83 +
 source/text/scalc/01/func_wraprows.xhp   |   76 
 source/text/scalc/01/stat_data.xhp   |  162 +--
 source/text/scalc/01/statistics_sampling.xhp |1 
 7 files changed, 383 insertions(+), 183 deletions(-)

New commits:
commit 9400a3e9696e67e24560695969877e2e30199918
Author: Olivier Hallot 
AuthorDate: Mon Jan 27 22:26:10 2025 -0300
Commit: Olivier Hallot 
CommitDate: Tue Jan 28 18:10:01 2025 +0100

tdf#150880, tdf#150881 WRAPROWS() + WRAPCOLS() Help pages

+ refactor to reuse sample data
+ Adjust data for TOCOL and TOROW

Change-Id: I6d4661a9c044d414d4142aa159900b699ccb2192
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/180811
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 4581269333..52e514fd62 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -322,6 +322,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_weeknum_ooo \
 helpcontent2/source/text/scalc/01/func_weeknumadd \
 helpcontent2/source/text/scalc/01/func_workday \
+helpcontent2/source/text/scalc/01/func_wrapcols \
+helpcontent2/source/text/scalc/01/func_wraprows \
 helpcontent2/source/text/scalc/01/func_year \
 helpcontent2/source/text/scalc/01/func_yearfrac \
 helpcontent2/source/text/scalc/01/HandleDuplicateRecords \
diff --git a/source/text/scalc/01/func_tocol.xhp 
b/source/text/scalc/01/func_tocol.xhp
index a6c93b517f..f2bc5ed733 100644
--- a/source/text/scalc/01/func_tocol.xhp
+++ b/source/text/scalc/01/func_tocol.xhp
@@ -40,89 +40,10 @@
 
 
 
-
- Consider the array 
A1:E3 below.
-
-
-
-
-
-A
-
-
-B
-
-
-C
-
-
-D
-
-
-E
-
-
-
-
-1
-
-
-AAA
-
-
-BBB
-
-
-CCC
-
-
-DDD
-
-
-FFF
-
-
-
-
-2
-
-
-GGG
-
-
-
-
-
-
-JJJ
-
-
-KKK
-
-
-
-
-3
-
-
-LLL
-
-
-MMM
-
-
-NNN
-
-
-OOO
-
-
-PPP
-
-
-
-
-The formula 
=TOCOL(A1:E3) returns the column
+
+
+
+The formula 
{=TOCOL(A1:E3)} returns the column
 
 
 
@@ -138,10 +59,10 @@
 DDD
 
 
-FFF
+EEE
 
 
-GGG
+FFF
 
 
  
@@ -150,25 +71,25 @@
  
 
 
-JJJ
+III
 
 
-KKK
+JJJ
 
 
-LLL
+KKK
 
 
-MMM
+LLL
 
 
-NNN
+MMM
 
 
-OOO
+NNN
 
 
-PPP
+OOO
 
 
 The formula 
=TOCOL(A1:E3;1) returns the column below without the blank 
cells.
@@ -187,31 +108,31 @@
 DDD
 
 
-FFF
+EEE
 
 
-GGG
+FFF
 
 
-JJJ
+III
 
 
-KKK
+JJJ
 
 
-LLL
+KKK
 
 
-MMM
+LLL
 
 
-NNN
+MMM
 
 
-OOO
+NNN
 
 
-PPP
+OOO
 
 
 
@@ -222,40 +143,40 @@
 AAA
 
 
-GGG
+FFF
 
 
-LLL
+KKK
 
 
 BBB
 
 
-MMM
+LLL
 
 
 CCC
 
 
-NNN
+MMM
 
 
 DDD
 
 
-JJJ
+III
 
 
-OOO
+NNN
 
 
-FFF
+EEE
 
 
-KKK
+JJJ
 
 
-PPP
+OOO

core.git: sw/qa sw/source

2025-01-28 Thread Oliver Specht (via logerrit)

 sw/qa/extras/uiwriter/data/tdf163340_2.odt  |binary
 sw/qa/extras/uiwriter/uiwriter9.cxx |   27 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +--
 3 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 875bb514b9d50bae02c2999f3be071e654c0d10d
Author: Oliver Specht 
AuthorDate: Tue Jan 21 09:25:21 2025 +0100
Commit: Gabor Kelemen 
CommitDate: Tue Jan 28 18:14:47 2025 +0100

tdf#163340 fixes regression

Pasting a single paragraph with a list into an empty paragraph
with a different list should keep that target list and not apply
the source list.

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

diff --git a/sw/qa/extras/uiwriter/data/tdf163340_2.odt 
b/sw/qa/extras/uiwriter/data/tdf163340_2.odt
new file mode 100644
index ..c58a181a0846
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf163340_2.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx 
b/sw/qa/extras/uiwriter/uiwriter9.cxx
index 66ef51e47102..666f3aefe5dc 100644
--- a/sw/qa/extras/uiwriter/uiwriter9.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter9.cxx
@@ -855,6 +855,33 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf163340)
 CPPUNIT_ASSERT_EQUAL(u"A."_ustr, getProperty(xParaCursor, 
u"ListLabelString"_ustr));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf163340_2)
+{
+//selects and copies a single paragraph with a list (bullets)
+//and pastes it into an empty paragraph with a different list (numbers)
+//checks that the resulting paragraph keeps that different list
+createSwDoc("tdf163340_2.odt");
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xText = xTextDocument->getText();
+uno::Reference 
xSelSupplier(xModel->getCurrentController(),
+  
uno::UNO_QUERY_THROW);
+uno::Reference 
xParaCursor(xTextDocument->getText()->createTextCursor(),
+   uno::UNO_QUERY);
+
+for (int i = 0; i < 2; i++)
+xParaCursor->gotoNextParagraph(false);
+xParaCursor->gotoEndOfParagraph(true);
+xSelSupplier->select(uno::Any(xParaCursor));
+
+xParaCursor = 
uno::Reference(xText->createTextCursor(), 
uno::UNO_QUERY);
+for (int i = 0; i < 10; i++)
+xParaCursor->gotoNextParagraph(false);
+xParaCursor->gotoEndOfParagraph(true);
+dispatchCommand(mxComponent, u".uno:Paste"_ustr, {});
+CPPUNIT_ASSERT_EQUAL(u"5."_ustr, getProperty(xParaCursor, 
u"ListLabelString"_ustr));
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf159023)
 {
 createSwDoc();
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 2efcf0f94493..c2eca8469588 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -491,9 +491,9 @@ namespace
 if (pTextNd == nullptr || pEndTextNd == nullptr)
 return false;
 bool bRet = pTextNd->IsInListFromStyle();
-//prefer list if it's a single paragraph with list from style
-if (pTextNd == pEndTextNd && bRet)
-return true;
+//single paragraphs are preferred only if it's a has a list from style
+if (pTextNd == pEndTextNd)
+return bRet;
 
 if (pTextNd && pTextNd->IsInList() && !pTextNd->IsInListFromStyle() &&
  pEndTextNd && pEndTextNd->IsInList() && 
!pEndTextNd->IsInListFromStyle())

help.git: source/text

2025-01-28 Thread Olivier Hallot (via logerrit)

 source/text/scalc/01/statistics_anova.xhp   |   64 
 source/text/scalc/01/statistics_descriptive.xhp |1 
 2 files changed, 13 insertions(+), 52 deletions(-)

New commits:
commit b1c6f6063d9174be03a4ed9485b802dab26c4ffc
Author: Olivier Hallot 
AuthorDate: Mon Jan 27 23:29:45 2025 -0300
Commit: Olivier Hallot 
CommitDate: Tue Jan 28 18:45:36 2025 +0100

Fix some tables layout for statistics examples

Change-Id: Ib4b8dd3e489199928a151e7348b129b7690515f6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/180812
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/statistics_anova.xhp 
b/source/text/scalc/01/statistics_anova.xhp
index f7b100974e..00abb3c307 100644
--- a/source/text/scalc/01/statistics_anova.xhp
+++ b/source/text/scalc/01/statistics_anova.xhp
@@ -50,19 +50,9 @@
 The following table displays 
the results of the analysis of variance (ANOVA) of the sample data 
above.
 
 
-
+
 ANOVA - Single 
Factor
 
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -71,27 +61,12 @@
 
 0.05
 
-
-
-
-
-
-
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
+
+   
 
 
 
@@ -110,7 +85,7 @@
 
 Variance
 
-
+
 
 
 
@@ -129,7 +104,7 @@
 
 139.4909090909
 
-
+
 
 
 
@@ -148,7 +123,7 @@
 
 287.12
 
-
+
 
 
 
@@ -167,21 +142,12 @@
 
 227.34
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
+
+   
 
 
 
@@ -243,9 +209,7 @@
 
 215.1824675325
 
-
-
-
+
 
 
 
@@ -258,11 +222,7 @@
 
 30
 
-
-
-
-
-
+
 
 
 
diff --git a/source/text/scalc/01/statistics_descriptive.xhp 
b/source/text/scalc/01/statistics_descriptive.xhp
index f8760f6201..1ca64ebb69 100644
--- a/source/text/scalc/01/statistics_descriptive.xhp
+++ b/source/text/scalc/01/statistics_descriptive.xhp
@@ -42,6 +42,7 @@
 
 
 
+ 
 
 
 Maths

core.git: helpcontent2

2025-01-28 Thread Olivier Hallot (via logerrit)

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

New commits:
commit c66e2cdbb4358c90807f00ba989b5c1905bebd40
Author: Olivier Hallot 
AuthorDate: Tue Jan 28 14:45:36 2025 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 18:45:36 2025 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to b1c6f6063d9174be03a4ed9485b802dab26c4ffc
  - Fix some tables layout for statistics examples

Change-Id: Ib4b8dd3e489199928a151e7348b129b7690515f6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/180812
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 9400a3e9696e..b1c6f6063d91 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9400a3e9696e67e24560695969877e2e30199918
+Subproject commit b1c6f6063d9174be03a4ed9485b802dab26c4ffc

help.git: AllLangHelp_scalc.mk source/text

2025-01-28 Thread Olivier Hallot (via logerrit)

 AllLangHelp_scalc.mk |1 
 source/text/scalc/01/func_expand.xhp |   90 +++
 2 files changed, 91 insertions(+)

New commits:
commit 5d84a00730dc742b4a3aad3da9e5fc4ef0ec82fd
Author: Olivier Hallot 
AuthorDate: Tue Jan 28 16:32:34 2025 -0300
Commit: Olivier Hallot 
CommitDate: Tue Jan 28 21:06:51 2025 +0100

tdf#151001 EXPAND() Help page

Change-Id: I345b2866343ba3f56795af3428c2fc749e487844
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/180858
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 52e514fd62..cebb19ab7c 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -228,6 +228,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_edate \
 helpcontent2/source/text/scalc/01/func_eomonth \
 helpcontent2/source/text/scalc/01/func_error_type \
+helpcontent2/source/text/scalc/01/func_expand \
 helpcontent2/source/text/scalc/01/func_filter \
 helpcontent2/source/text/scalc/01/func_findb \
 helpcontent2/source/text/scalc/01/func_floor \
diff --git a/source/text/scalc/01/func_expand.xhp 
b/source/text/scalc/01/func_expand.xhp
new file mode 100644
index 00..8058c054c3
--- /dev/null
+++ b/source/text/scalc/01/func_expand.xhp
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+EXPAND function
+/text/scalc/01/func_expand.xhp
+
+
+
+
+
+EXPAND function
+
+
+EXPAND
+Expand an array by 
adding rows or columns.
+
+Enter the formula as an array formula.
+
+=EXPAND(Array;Rows;[Columns];[Pad_with])
 
+Array: the 
array or range to expand by the number of rows and/or columns.
+Rows: the 
final number of rows the array will expand. Default is total rows.
+Columns: 
(optional) The final number of columns the array will expand. Default is total 
columns.
+Pad_with: 
(optional) a specified value to pad in new cells. By default, #N/A is used to 
fill the new cells.
+
+
+
+
+The formula 
{=EXPAND(A1:E3;4;7;"@@@")} expands the array 
A1:E3 to 7 columns and 4 rows, padding the extra cells with 
the string "@@@".
+
+
+AAA
+BBB
+CCC
+DDD
+EEE
+@@@
+@@@
+
+
+FFF
+ 
+ 
+III
+JJJ
+@@@
+@@@
+
+
+KKK
+LLL
+MMM
+NNN
+OOO
+@@@
+@@@
+
+
+@@@
+@@@
+@@@
+@@@
+@@@
+@@@
+@@@
+
+
+
+
+
+
+COM.MICROSOFT.EXPAND
+
+
+
+
+
+https://wiki.documentfoundation.org/Documentation/Calc_Functions/EXPAND";>EXPAND
 wiki page.
+
+
+

core.git: helpcontent2

2025-01-28 Thread Olivier Hallot (via logerrit)

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

New commits:
commit 86cc183b5d8080b7ea1b1c96e827875b2a322034
Author: Olivier Hallot 
AuthorDate: Tue Jan 28 17:06:51 2025 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 21:06:51 2025 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5d84a00730dc742b4a3aad3da9e5fc4ef0ec82fd
  - tdf#151001 EXPAND() Help page

Change-Id: I345b2866343ba3f56795af3428c2fc749e487844
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/180858
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index b1c6f6063d91..5d84a00730dc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b1c6f6063d9174be03a4ed9485b802dab26c4ffc
+Subproject commit 5d84a00730dc742b4a3aad3da9e5fc4ef0ec82fd

Re: Mac Silicon removed from download page

2025-01-28 Thread Alexander Thurgood


Le 17/01/2025 à 16:40, Patrick Luby a écrit :

So I saw the 25.2 RC2 announcement and went to download and to my surprise the 
Mac Silicon option has been removed. Only Mac Intel is there (see attached 
screen snapshot in Safari).



Hi Patrick,

Just FYI, I had the same problem at the same time.

Alex

core.git: Branch 'distro/collabora/co-24.04' - officecfg/registry

2025-01-28 Thread Andras Timar (via logerrit)

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

New commits:
commit deb448458dee1c5e6ad1d2560a1db1b74f5809fb
Author: Andras Timar 
AuthorDate: Tue Jan 28 13:07:10 2025 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 28 21:34:25 2025 +0100

Ctrl+F should focus to the Find bar in German UI, too.

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

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 71dbd7c1c391..031971562b5b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1062,18 +1062,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:RepeatSearch
   
 
-
-  
-L10N SHORTCUTS - NO 
TRANSLATE
-.uno:Navigator
-  
-
-
-  
-L10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 L10N SHORTCUTS - NO 
TRANSLATE

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

2025-01-28 Thread Tomaž Vajngerl (via logerrit)

 writerfilter/source/dmapper/DomainMapper.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c28388326083bf509af4db9ace980b3e4a0dea5c
Author: Tomaž Vajngerl 
AuthorDate: Mon Jan 27 23:13:48 2025 +0900
Commit: Andras Timar 
CommitDate: Tue Jan 28 21:35:46 2025 +0100

Set an empty ComplexColor, or the previous one could be used

In some OOXML documents it can happen the ComplexColor is set to
elements that shouldn't be set, so set one in all cases so we can
be sure it is set to the ComplexColor we want.

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

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 44d9132c0bca..479373de6660 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2415,11 +2415,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 {
 m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, 
uno::Any(pThemeColorHandler->mnColor));
 
+model::ComplexColor aComplexColor;
+
 auto eType = 
TDefTableHandler::getThemeColorTypeIndex(pThemeColorHandler->mnIndex);
 if (eType != model::ThemeColorType::Unknown)
 {
-
-model::ComplexColor aComplexColor;
 aComplexColor.setThemeColor(eType);
 
 auto eUsage = 
TDefTableHandler::getThemeColorUsage(pThemeColorHandler->mnIndex);
@@ -2435,11 +2435,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 sal_Int16 nShade = sal_Int16((255 - 
pThemeColorHandler->mnShade) * 1 / 255);
 
aComplexColor.addTransformation({model::TransformationType::Shade, nShade});
 }
-
-auto xComplexColor = 
model::color::createXComplexColor(aComplexColor);
-m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMPLEX_COLOR, 
uno::Any(xComplexColor));
 }
 
+auto xComplexColor = 
model::color::createXComplexColor(aComplexColor);
+m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMPLEX_COLOR, 
uno::Any(xComplexColor));
+
 uno::Any 
aColorAny(msfilter::util::ConvertColorOU(Color(ColorTransparency, 
pThemeColorHandler->mnColor)));
 
m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_ORIGINAL_COLOR, aColorAny, 
true, CHAR_GRAB_BAG);

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

2025-01-28 Thread Andras Timar (via logerrit)

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

New commits:
commit d8e3e34c43e019b1ba1433495c541968a2092f3e
Author: Andras Timar 
AuthorDate: Tue Jan 28 21:37:04 2025 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 28 21:37:04 2025 +0100

Bump version to 24.04.12.2

Change-Id: I8e100a93fcca0a514e4c5432253383f632ce6b81

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

core.git: Changes to 'refs/tags/co-24.04.12-2'

2025-01-28 Thread Andras Timar (via logerrit)

Tag 'co-24.04.12-2' created by Andras Timar  at 
2025-01-28 20:37 +

co-24.04.12-2

Changes since cp-24.04.12-1-17:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/cp-24.04.12-2'

2025-01-28 Thread Andras Timar (via logerrit)

Tag 'cp-24.04.12-2' created by Andras Timar  at 
2025-01-28 20:37 +

cp-24.04.12-2

Changes since cp-24.04.11-4:
Andras Timar (1):
  [cp] French translation of STR_FI_TOOLTIP_COFFICE

---
 source/fr/scp2/source/ooo.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Changes to 'refs/tags/cp-24.04.12-2'

2025-01-28 Thread Andras Timar (via logerrit)

Tag 'cp-24.04.12-2' created by Andras Timar  at 
2025-01-28 20:37 +

cp-24.04.12-2

Changes since cp-24.04.12-1-17:
---
 0 files changed
---

help.git: Changes to 'refs/tags/co-24.04.12-2'

2025-01-28 Thread Taichi Haradaguchi (via logerrit)

Tag 'co-24.04.12-2' created by Andras Timar  at 
2025-01-28 20:37 +

co-24.04.12-2

Changes since cp-24.04.3-6:
Taichi Haradaguchi (1):
  Fix bad links in help page

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

help.git: Changes to 'refs/tags/cp-24.04.12-2'

2025-01-28 Thread Taichi Haradaguchi (via logerrit)

Tag 'cp-24.04.12-2' created by Andras Timar  at 
2025-01-28 20:37 +

cp-24.04.12-2

Changes since cp-24.04.3-6:
Taichi Haradaguchi (1):
  Fix bad links in help page

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

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

2025-01-28 Thread Xisco Fauli (via logerrit)

Tag 'cp-24.04.12-2' created by Andras Timar  at 
2025-01-28 20:37 +

cp-24.04.12-2

Changes since cp-24.04.8-5-1:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/co-24.04.12-2'

2025-01-28 Thread Xisco Fauli (via logerrit)

Tag 'co-24.04.12-2' created by Andras Timar  at 
2025-01-28 20:37 +

co-24.04.12-2

Changes since cp-24.04.8-5-1:
---
 0 files changed
---

core.git: 3 commits - toolkit/inc toolkit/source vcl/inc vcl/source

2025-01-28 Thread Michael Weghorn (via logerrit)

 toolkit/inc/controls/table/AccessibleGridControl.hxx  |8 
 toolkit/inc/controls/table/AccessibleGridControlBase.hxx  |   43 ---
 toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx|9 
 toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx |2 
 toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx |   10 
 toolkit/source/controls/table/AccessibleGridControl.cxx   |   10 
 toolkit/source/controls/table/AccessibleGridControlBase.cxx   |   33 --
 toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx |   10 
 toolkit/source/controls/table/AccessibleGridControlTableCell.cxx  |   12 
 toolkit/source/controls/table/tablecontrol.cxx|6 
 vcl/inc/accessibility/accessiblelistboxentry.hxx  |   32 --
 vcl/source/accessibility/accessiblelistboxentry.cxx   |  122 
--
 12 files changed, 35 insertions(+), 262 deletions(-)

New commits:
commit 735b2109f0cfb7f8f5fe2188a8e3ed6a71aa123d
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 12:40:14 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:26:19 2025 +0100

a11y: Use OAccessibleComponentHelper for AccessibleListBoxEntry

Similar to how

commit 7107db3fe773629cc511eb5922bc9c28c9c5c60a
Author: Michael Weghorn 
Date:   Fri Jan 24 18:57:58 2025 +0100

toolkit a11y: Use OAccessibleComponentHelper for grid control

did for AccessibleGridControlBase, also derive
from OAccessibleComponentHelper for AccessibleListBoxEntry,
to make use of the logic already implemented there
instead of having to implement all the XAccessibleComponent
and XAccessibleEventBroadcaster methods  manually

AccessibleListBoxEntry::GetBoundingBox_Impl already
provides what is needed to implement
AccessibleListBoxEntry::implGetBounds, just needs
to convert to awt::Rectangle.

Drop all of the other overrides that are no longer
needed as the implementation is now provided by
the OAccessibleComponentHelper base class.

No change in behavior intended or observed when
testing this with Accerciser and Orca and the qt6
VCL plugin with the "Tools" -> "AutoText" dialog
in Writer, where this code path is used for
items in the treeview.

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

diff --git a/vcl/inc/accessibility/accessiblelistboxentry.hxx 
b/vcl/inc/accessibility/accessiblelistboxentry.hxx
index 050dc948d9c4..9330c4da2e84 100644
--- a/vcl/inc/accessibility/accessiblelistboxentry.hxx
+++ b/vcl/inc/accessibility/accessiblelistboxentry.hxx
@@ -54,10 +54,8 @@ namespace accessibility
 class AccessibleListBox;
 
 // class AccessibleListBoxEntry --
-typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible
-, 
css::accessibility::XAccessibleContext
-, 
css::accessibility::XAccessibleComponent
-, 
css::accessibility::XAccessibleEventBroadcaster
+typedef cppu::ImplInheritanceHelper 
AccessibleListBoxEntry_BASE;
 
 /** the class AccessibleListBoxEntry represents the class for an 
accessible object of a listbox entry */
-class AccessibleListBoxEntry final : public ::cppu::BaseMutex
-,public AccessibleListBoxEntry_BASE
+class AccessibleListBoxEntry final : public AccessibleListBoxEntry_BASE
 ,public 
::comphelper::OCommonAccessibleText
 {
 friend class AccessibleListBox;
@@ -77,32 +74,20 @@ namespace accessibility
 std::deque< sal_Int32 >   m_aEntryPath;
 SvTreeListEntry*m_pSvLBoxEntry; // Needed for a11y 
focused item...
 
-
-/// client id in the AccessibleEventNotifier queue
-sal_uInt32  m_nClientId;
-
 unotools::WeakReference m_wListBox;
 
 tools::Rectangle   GetBoundingBox_Impl() const;
-tools::Rectangle   GetBoundingBoxOnScreen_Impl() const;
 boolIsAlive_Impl() const;
 boolIsShowing_Impl() const;
 
 /// @throws css::lang::DisposedException
 /// @throws css::uno::RuntimeException
 tools::Rectangle   GetBoundingBox();
-/// @throws css::lang::DisposedException
-/// @throws css::uno::RuntimeException
-tools::Rectangle   GetBoundingBoxOnScreen();
 /// @throws css::lang::IndexOutOfBoundsException
 void CheckActionIndex(sal_Int32 nIndex);
 /// @throws css::lang::DisposedException
 void

core.git: 3 commits - toolkit/inc toolkit/source

2025-01-28 Thread Michael Weghorn (via logerrit)

 toolkit/inc/controls/table/AccessibleGridControl.hxx |   84 
+-
 toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx|   22 --
 toolkit/source/controls/table/AccessibleGridControl.cxx  |   67 +--
 toolkit/source/controls/table/AccessibleGridControlTableCell.cxx |   34 
 toolkit/source/controls/table/tablecontrol_impl.cxx  |   30 +--
 toolkit/source/controls/table/tablecontrol_impl.hxx  |4 
 6 files changed, 53 insertions(+), 188 deletions(-)

New commits:
commit cf8a59f258d10d1bc9b2eb27dbea91d26e2a1b84
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 10:55:54 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:25:57 2025 +0100

uno grid a11y: Use cppu::ImplInheritanceHelper

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

diff --git a/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx 
b/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx
index 57d5118cb87e..334b1ffdaba9 100644
--- a/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx
@@ -61,13 +61,12 @@ namespace accessibility
 AccessibleGridControlCell& operator=( const AccessibleGridControlCell& 
) = delete;
 };
 
-typedef ::cppu::ImplHelper2 <   css::accessibility::XAccessibleText
-,   css::accessibility::XAccessible
->   AccessibleTextHelper_BASE;
 // implementation of a table cell of GridControl
-class AccessibleGridControlTableCell final   :public 
AccessibleGridControlCell
-,public AccessibleTextHelper_BASE
-,public 
::comphelper::OCommonAccessibleText
+class AccessibleGridControlTableCell final
+: public cppu::ImplInheritanceHelper,
+  public ::comphelper::OCommonAccessibleText
 {
 private:
 // OCommonAccessibleText
@@ -82,17 +81,6 @@ namespace accessibility
 sal_Int32 _nRowId,
 sal_uInt16 _nColId);
 
-// XInterface 
-
-
-/** Queries for a new interface. */
-css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) 
override;
-
-/** Acquires the object (calls acquire() on base class). */
-virtual void SAL_CALL acquire() noexcept override;
-
-/** Releases the object (calls release() on base class). */
-virtual void SAL_CALL release() noexcept override;
-
 /** @return  The index of this object among the parent's children. */
 virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
diff --git a/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx 
b/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx
index 0d80a6977a29..1145a79b2f7c 100644
--- a/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx
@@ -96,38 +96,14 @@ namespace accessibility
 nEndIndex = 0;
 }
 
-AccessibleGridControlTableCell::AccessibleGridControlTableCell(const 
css::uno::Reference& _rxParent,
-svt::table::TableControl& _rTable,
-sal_Int32 _nRowPos,
-sal_uInt16 _nColPos)
-:AccessibleGridControlCell(_rxParent, _rTable, _nRowPos, _nColPos, 
AccessibleTableControlObjType::TABLECELL)
+AccessibleGridControlTableCell::AccessibleGridControlTableCell(
+const css::uno::Reference& _rxParent, 
svt::table::TableControl& _rTable,
+sal_Int32 _nRowPos, sal_uInt16 _nColPos)
+: ImplInheritanceHelper(_rxParent, _rTable, _nRowPos, _nColPos,
+AccessibleTableControlObjType::TABLECELL)
 {
 }
 
-// XInterface
-
-/** Queries for a new interface. */
-css::uno::Any SAL_CALL AccessibleGridControlTableCell::queryInterface(
-const css::uno::Type& rType )
-{
-Any aRet = AccessibleGridControlCell::queryInterface(rType);
-if ( !aRet.hasValue() )
-aRet = AccessibleTextHelper_BASE::queryInterface(rType);
-return aRet;
-}
-
-/** Acquires the object (calls acquire() on base class). */
-void SAL_CALL AccessibleGridControlTableCell::acquire() noexcept
-{
-AccessibleGridControlCell::acquire();
-}
-
-/** Releases the object (calls release() on base class). */
-void SAL_CALL AccessibleGridControlTableCell::release() noexcept
-{
-AccessibleGridControlCell::release();
-}
-
 css::awt::Rectangle SAL_CALL 
AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nI

core.git: 3 commits - vcl/inc vcl/source

2025-01-28 Thread Michael Weghorn (via logerrit)

 vcl/inc/accessibility/AccessibleBrowseBoxBase.hxx|3 --
 vcl/inc/accessibility/accessiblelistboxentry.hxx |6 
 vcl/source/accessibility/AccessibleBrowseBoxBase.cxx |   24 +--
 vcl/source/accessibility/accessiblelistboxentry.cxx  |   19 +--
 4 files changed, 14 insertions(+), 38 deletions(-)

New commits:
commit f94c211a2185dc3b949bce34e3cb5e0b61a22044
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 12:57:30 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:26:41 2025 +0100

a11y: Drop AccessibleBrowseBoxBase::{g,s}etCliendId

Use the m_aClientId member directly.

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

diff --git a/vcl/inc/accessibility/AccessibleBrowseBoxBase.hxx 
b/vcl/inc/accessibility/AccessibleBrowseBoxBase.hxx
index f75aa59c2b16..43d03d42a906 100644
--- a/vcl/inc/accessibility/AccessibleBrowseBoxBase.hxx
+++ b/vcl/inc/accessibility/AccessibleBrowseBoxBase.hxx
@@ -291,9 +291,6 @@ protected:
 css::uno::Reference< css::awt::XWindow > m_xFocusWindow;
 
 private:
-::comphelper::AccessibleEventNotifier::TClientId getClientId() const { 
return m_aClientId; }
-void setClientId(::comphelper::AccessibleEventNotifier::TClientId 
_aNewClientId) { m_aClientId = _aNewClientId; }
-
 /** Localized name. */
 OUString maName;
 /** Localized description text. */
diff --git a/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx 
b/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
index 396e95a10161..9ba89b3d2b2b 100644
--- a/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
@@ -98,10 +98,10 @@ void SAL_CALL AccessibleBrowseBoxBase::disposing()
 m_xFocusWindow->removeFocusListener( this );
 }
 
-if ( getClientId( ) )
+if (m_aClientId)
 {
-AccessibleEventNotifier::TClientId nId( getClientId( ) );
-setClientId( 0 );
+AccessibleEventNotifier::TClientId nId(m_aClientId);
+m_aClientId = 0;
 AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
 }
 
@@ -252,21 +252,21 @@ void SAL_CALL 
AccessibleBrowseBoxBase::addAccessibleEventListener(
 if ( _rxListener.is() )
 {
 ::osl::MutexGuard aGuard( getMutex() );
-if ( !getClientId( ) )
-setClientId( AccessibleEventNotifier::registerClient( ) );
+if (!m_aClientId)
+m_aClientId = AccessibleEventNotifier::registerClient();
 
-AccessibleEventNotifier::addEventListener( getClientId( ), _rxListener 
);
+AccessibleEventNotifier::addEventListener(m_aClientId, _rxListener);
 }
 }
 
 void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener(
 const css::uno::Reference< 
css::accessibility::XAccessibleEventListener>& _rxListener )
 {
-if( !(_rxListener.is() && getClientId( )) )
+if (!(_rxListener.is() && m_aClientId))
 return;
 
 ::osl::MutexGuard aGuard( getMutex() );
-sal_Int32 nListenerCount = AccessibleEventNotifier::removeEventListener( 
getClientId( ), _rxListener );
+sal_Int32 nListenerCount = 
AccessibleEventNotifier::removeEventListener(m_aClientId, _rxListener );
 if ( !nListenerCount )
 {
 // no listeners anymore
@@ -274,8 +274,8 @@ void SAL_CALL 
AccessibleBrowseBoxBase::removeAccessibleEventListener(
 // and at least to us not firing any events anymore, in case somebody 
calls
 // NotifyAccessibleEvent, again
 
-AccessibleEventNotifier::TClientId nId( getClientId( ) );
-setClientId( 0 );
+AccessibleEventNotifier::TClientId nId(m_aClientId);
+m_aClientId = 0;
 AccessibleEventNotifier::revokeClient( nId );
 }
 }
@@ -409,7 +409,7 @@ void AccessibleBrowseBoxBase::commitEvent(
 sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )
 {
 osl::MutexGuard aGuard( getMutex() );
-if ( !getClientId( ) )
+if (!m_aClientId)
 // if we don't have a client id for the notifier, then we don't 
have listeners, then
 // we don't need to notify anything
 return;
@@ -419,7 +419,7 @@ void AccessibleBrowseBoxBase::commitEvent(
 
 // let the notifier handle this event
 
-AccessibleEventNotifier::addEvent( getClientId( ), aEvent );
+AccessibleEventNotifier::addEvent(m_aClientId, aEvent );
 }
 
 sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
commit a3cbbe9a885a72ae7addb8e06f62a5365a6de415
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 12:49:11 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:26:35 2025 +0100

a11y: Drop AccessibleListBoxEntry::getImplementationId override

The base class implementation
ImplInheritanceHelper::getImplementationId does the same.

Change-Id: I81c550366c50e2

core.git: 3 commits - toolkit/inc toolkit/source

2025-01-28 Thread Michael Weghorn (via logerrit)

 toolkit/inc/controls/table/AccessibleGridControl.hxx|2 
 toolkit/inc/controls/table/tablecontrol.hxx |4 -
 toolkit/source/controls/svtxgridcontrol.cxx |   10 +-
 toolkit/source/controls/table/AccessibleGridControl.cxx |5 -
 toolkit/source/controls/table/tablecontrol.cxx  |   55 ++--
 toolkit/source/controls/table/tablecontrol_impl.cxx |   13 ---
 toolkit/source/controls/table/tablecontrol_impl.hxx |2 
 7 files changed, 33 insertions(+), 58 deletions(-)

New commits:
commit 33a7e6910f7075c3b24b56feba4e6318caeb4952
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 09:23:53 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:25:36 2025 +0100

uno grid a11y: Drop check for a11y context disposed from outside

AccessibleGridControlAccess owns its
AccessibleGridControl (`m_xContext` member)
and is responsible for disposing it.

It does that in AccessibleGridControlAccess::DisposeAccessImpl
where it also clears `m_xContext` to nullptr.

Therefore, this

// if the context died meanwhile (we're no listener, so it won't tell 
us explicitly when this happens),
// then reset and re-create.

check looks very suspicious and should never be reached,
as anything "from outside", i.e. something not
owning the AccessibleGridControl should never
dispose it.

Drop that check.

(In case there actually *is* something disposing the
accessible context from elsewhere, that should most likely
be changed in the first place.)

See also

Change-Id: Id16dd7dbf8264d887f52e2fe304b0568079cb924
Author: Michael Weghorn 
Date:   Tue Jan 28 09:17:10 2025 +0100

uno grid a11y: Replace alive check by simple null check

TableControl_Impl owns its accessible (`m_pAccessibleTable`)
and disposes it in TableControl_Impl::disposeAccessible
which gets called from TableControl::dispose.

TableControl_Impl::disposeAccessible also sets
`m_pAccessibleTable` to nullptr.

As `m_pAccessibleTable` should only ever be disposed by
its owner, I can't think of any (valid) scenario where
`m_pAccessibleTable` could be non-null but disposed,
so simply use a null check instead of
TableControl_Impl::isAccessibleAlive that was checking
for it being non-null and not diposed.

for a similar commit elsewhere.

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

diff --git a/toolkit/source/controls/table/AccessibleGridControl.cxx 
b/toolkit/source/controls/table/AccessibleGridControl.cxx
index 35ce22d2e798..0e0a9dab1af5 100644
--- a/toolkit/source/controls/table/AccessibleGridControl.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControl.cxx
@@ -255,11 +255,6 @@ css::uno::Reference< 
css::accessibility::XAccessibleContext > SAL_CALL Accessibl
 {
 SolarMutexGuard g;
 
-// if the context died meanwhile (we're no listener, so it won't tell us 
explicitly when this happens),
-// then reset and re-create.
-if ( m_xContext.is() && !m_xContext->isAlive() )
-m_xContext = nullptr;
-
 if (!m_xContext.is() && m_xTable)
 m_xContext = new AccessibleGridControl(m_xParent, this, *m_xTable);
 
commit 6b94a653b763655b09032e8b2964bf3eb03a8f7a
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 09:17:10 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:25:28 2025 +0100

uno grid a11y: Replace alive check by simple null check

TableControl_Impl owns its accessible (`m_pAccessibleTable`)
and disposes it in TableControl_Impl::disposeAccessible
which gets called from TableControl::dispose.

TableControl_Impl::disposeAccessible also sets
`m_pAccessibleTable` to nullptr.

As `m_pAccessibleTable` should only ever be disposed by
its owner, I can't think of any (valid) scenario where
`m_pAccessibleTable` could be non-null but disposed,
so simply use a null check instead of
TableControl_Impl::isAccessibleAlive that was checking
for it being non-null and not diposed.

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

diff --git a/toolkit/inc/controls/table/AccessibleGridControl.hxx 
b/toolkit/inc/controls/table/AccessibleGridControl.hxx
index a50f03d30f66..c1f1a649d2a3 100644
--- a/toolkit/inc/controls/table/AccessibleGridControl.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControl.hxx
@@ -162,8 +162,6 @@ public:
 
 void DisposeAccessImpl();
 
-bool isAlive() const { return m_xContext.is() && m_xContext->isAlive(); }
-
 v

core.git: 3 commits - toolkit/source

2025-01-28 Thread Michael Weghorn (via logerrit)

 toolkit/source/controls/table/tablecontrol_impl.cxx |   51 +++-
 toolkit/source/controls/table/tablecontrol_impl.hxx |3 -
 2 files changed, 20 insertions(+), 34 deletions(-)

New commits:
commit 2f574de08b5c4c009c1e3880f548e79d380bcc4f
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 08:59:30 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:25:15 2025 +0100

uno grid a11y: Merge TableControl_Impl::{impl_,isAccessibleAlive}

Move logic from TableControl_Impl::isAccessibleAlive
to TableControl_Impl::isAccessibleAlive, which was
previously just calling the latter.

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

diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx 
b/toolkit/source/controls/table/tablecontrol_impl.cxx
index f4e47156a926..fd64b459fa1e 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.cxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.cxx
@@ -2268,14 +2268,14 @@ namespace svt::table
 
 void TableControl_Impl::commitCellEvent( sal_Int16 const i_eventID, const 
Any& i_newValue, const Any& i_oldValue )
 {
-if ( impl_isAccessibleAlive() )
+if (isAccessibleAlive())
  m_pAccessibleTable->commitCellEvent( i_eventID, i_newValue, 
i_oldValue );
 }
 
 
 void TableControl_Impl::commitTableEvent( sal_Int16 const i_eventID, const 
Any& i_newValue, const Any& i_oldValue )
 {
-if ( impl_isAccessibleAlive() )
+if (isAccessibleAlive())
  m_pAccessibleTable->commitTableEvent( i_eventID, i_newValue, 
i_oldValue );
 }
 
@@ -2366,7 +2366,7 @@ namespace svt::table
 }
 
 
-bool TableControl_Impl::impl_isAccessibleAlive() const
+bool TableControl_Impl::isAccessibleAlive() const
 {
 return m_pAccessibleTable && m_pAccessibleTable->isAlive();
 }
@@ -2374,7 +2374,7 @@ namespace svt::table
 
 void TableControl_Impl::impl_commitAccessibleEvent( sal_Int16 const 
i_eventID, Any const & i_newValue )
 {
-if ( impl_isAccessibleAlive() )
+if (isAccessibleAlive())
  m_pAccessibleTable->commitEvent( i_eventID, i_newValue );
 }
 
diff --git a/toolkit/source/controls/table/tablecontrol_impl.hxx 
b/toolkit/source/controls/table/tablecontrol_impl.hxx
index 96a7490c6204..cc53602671ac 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.hxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.hxx
@@ -293,7 +293,7 @@ namespace svt::table
 getAccessible(vcl::Window& i_parentWindow);
 voiddisposeAccessible();
 
-bool isAccessibleAlive() const { return impl_isAccessibleAlive(); }
+bool isAccessibleAlive() const;
 
 // ITableModelListener
 virtual voidrowsInserted( RowPos first, RowPos last ) override;
@@ -306,7 +306,6 @@ namespace svt::table
 virtual voidtableMetricsChanged() override;
 
 private:
-boolimpl_isAccessibleAlive() const;
 voidimpl_commitAccessibleEvent(
 sal_Int16 const i_eventID,
 css::uno::Any const & i_newValue
commit b3a60c9d07a80f7e70fafaca7561b7fa5df36ecb
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 08:53:42 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:25:08 2025 +0100

uno grid a11y: Drop duplicate check whether alive

TableControl_Impl::commitTableEvent and
TableControl_Impl::impl_commitAccessibleEvent
check whether the accessible is alive before
doing anything, so there's no need to do that
manually before calling those methods in addition.

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

diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx 
b/toolkit/source/controls/table/tablecontrol_impl.cxx
index f6dc5c161f5f..f4e47156a926 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.cxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.cxx
@@ -321,12 +321,10 @@ namespace svt::table
 impl_ni_relayout();
 
 // notify A1YY events
-if ( impl_isAccessibleAlive() )
-{
-impl_commitAccessibleEvent( AccessibleEventId::TABLE_MODEL_CHANGED,
-Any( AccessibleTableModelChange( 
AccessibleTableModelChangeType::ROWS_INSERTED, i_first, i_last, -1, -1 ) )
-);
-}
+impl_commitAccessibleEvent(
+AccessibleEventId::TABLE_MODEL_CHANGED,
+
Any(AccessibleTableModelChange(AccessibleTableModelChangeType::ROWS_INSERTED, 
i_first,
+   i_last, -1, -1)));
 
 // schedule repaint
 invalidateRowRange( i_first, ROW_INVALID );

core.git: vcl/source

2025-01-28 Thread Michael Weghorn (via logerrit)

 vcl/source/treelist/svtabbx.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a92113830e8980aa2f4973b25d42712aad6fb049
Author: Michael Weghorn 
AuthorDate: Tue Jan 28 13:38:06 2025 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 29 08:26:47 2025 +0100

a11y: Drop unnecessary null check

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

diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 853a531d7f4a..4fc5a1b5d838 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -1166,8 +1166,7 @@ Reference< XAccessible > 
SvHeaderTabListBox::CreateAccessible()
 if ( xAccParent.is() )
 {
 m_pAccessible = new 
accessibility::AccessibleTabListBox(xAccParent, *this);
-if ( m_pAccessible )
-xAccessible = m_pAccessible->getMyself();
+xAccessible = m_pAccessible->getMyself();
 }
 }
 return xAccessible;

60 matches

Mail list logo