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

[Caolán McNamara (via logerrit)]

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

New commits:
commit c09f4f2b6f835eca81d71bfe39400bf1ccee5b88
Author: Caolán McNamara 
AuthorDate: Wed Nov 27 09:40:32 2024 +
Commit: Miklos Vajna 
CommitDate: Thu Dec 12 09:33:23 2024 +0100

make calc Grid config listen for changes

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

diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 25f7db7d8527..c56966469fc9 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -162,6 +162,9 @@ class ScViewCfg : public ScViewOptions
 DECL_LINK( LayoutCommitHdl, ScLinkConfigItem&, void );
 DECL_LINK( DisplayCommitHdl, ScLinkConfigItem&, void );
 DECL_LINK( GridCommitHdl, ScLinkConfigItem&, void );
+DECL_LINK( GridNotifyHdl, ScLinkConfigItem&, void );
+
+void ReadGridCfg();
 
 static css::uno::Sequence GetLayoutPropertyNames();
 static css::uno::Sequence GetDisplayPropertyNames();
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 0a505408e6bf..b54760ede15f 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -408,51 +408,10 @@ ScViewCfg::ScViewCfg() :
 }
 aDisplayItem.SetCommitLink( LINK( this, ScViewCfg, DisplayCommitHdl ) );
 
-ScGridOptions aGrid = GetGridOptions(); //TODO: initialization 
necessary?
-aNames = GetGridPropertyNames();
-aValues = aGridItem.GetProperties(aNames);
-aGridItem.EnableNotification(aNames);
-pValues = aValues.getConstArray();
-OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties 
failed");
-if(aValues.getLength() == aNames.getLength())
-{
-for(int nProp = 0; nProp < aNames.getLength(); nProp++)
-{
-OSL_ENSURE(pValues[nProp].hasValue(), "property value missing");
-if(pValues[nProp].hasValue())
-{
-switch(nProp)
-{
-case SCGRIDOPT_RESOLU_X:
-if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawX( 
nIntVal );
-break;
-case SCGRIDOPT_RESOLU_Y:
-if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawY( 
nIntVal );
-break;
-case SCGRIDOPT_SUBDIV_X:
-if (pValues[nProp] >>= nIntVal) 
aGrid.SetFieldDivisionX( nIntVal );
-break;
-case SCGRIDOPT_SUBDIV_Y:
-if (pValues[nProp] >>= nIntVal) 
aGrid.SetFieldDivisionY( nIntVal );
-break;
-case SCGRIDOPT_SNAPTOGRID:
-aGrid.SetUseGridSnap( 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
-break;
-case SCGRIDOPT_SYNCHRON:
-aGrid.SetSynchronize( 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
-break;
-case SCGRIDOPT_VISIBLE:
-aGrid.SetGridVisible( 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
-break;
-case SCGRIDOPT_SIZETOGRID:
-aGrid.SetEqualGrid( 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
-break;
-}
-}
-}
-}
-SetGridOptions( aGrid );
+aGridItem.EnableNotification(GetGridPropertyNames());
+ReadGridCfg();
 aGridItem.SetCommitLink( LINK( this, ScViewCfg, GridCommitHdl ) );
+aGridItem.SetNotifyLink( LINK( this, ScViewCfg, GridNotifyHdl ) );
 }
 
 IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void)
@@ -548,6 +507,59 @@ IMPL_LINK_NOARG(ScViewCfg, DisplayCommitHdl, 
ScLinkConfigItem&, void)
 aDisplayItem.PutProperties(aNames, aValues);
 }
 
+void ScViewCfg::ReadGridCfg()
+{
+const Sequence aNames = GetGridPropertyNames();
+const Sequence aValues = aGridItem.GetProperties(aNames);
+OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties 
failed");
+if (aValues.getLength() != aNames.getLength())
+return;
+
+sal_Int32 nIntVal = 0;
+
+ScGridOptions aGrid = GetGridOptions(); //TODO: initialization 
necessary?
+const Any* pValues = aValues.getConstArray();
+
+for(int nProp = 0; nProp < aNames.getLength(); nProp++)
+{
+OSL_ENSURE(pValues[nProp].hasValue(), "property value missing");
+if(pValues[nProp].hasValue())
+{
+switch(nProp)
+{
+case SCGRIDOPT_RESOLU_X:
+if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawX( 
nIntVal );
+break;

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

[Michael Weghorn (via logerrit)]

 sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx |   28 ++
 sw/qa/core/accessibilitycheck/data/ContrastTestFail.odt  |binary
 sw/qa/core/accessibilitycheck/data/ContrastTestOK.odt|binary
 sw/source/core/access/AccessibilityCheck.cxx |   29 ++-
 4 files changed, 56 insertions(+), 1 deletion(-)

New commits:
commit 99c04ba30e5dbc8bdc7a3e920536b0c432c39797
Author: Michael Weghorn 
AuthorDate: Mon Dec 9 10:11:59 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 09:52:15 2024 +0100

tdf#164247 sw a11y check: Adhere to WCAG contrast threshold for large text

Quoting WCAG 2.2 "Success Criterion 1.4.3 Contrast (Minimum)" [1]:

> The visual presentation of text and images of text has a contrast
> ratio of at least 4.5:1, except for the following:
>
> Large Text
>
> Large-scale text and images of large-scale text have a contrast
> ratio of at least 3:1;

Regarding large text, the corresponding "Understanding SC 1.4.3" [2]
clarifies:

> Text that is larger and has wider character strokes is easier to read at
> lower contrast. The contrast requirement for larger text is therefore
> lower. This allows authors to use a wider range of color choices for
> large text, which is helpful for design of pages, particularly titles.
> 18 point text or 14 point bold text is judged to be large enough to
> require a lower contrast ratio.

Therefore, lower the text contrast requirement in
Writer's accessibility check from 4.5 to 3.0 for
text that is considered large according to that
specification.

Add a unit test with 2 test documents:

* one that adheres to the requirements and would have triggered false
  positives without this change in place
  (sw/qa/core/accessibilitycheck/data/ContrastTestOK.odt)
* one that doesn't adhere to the requirements and still fails the
  check, as it should
  (sw/qa/core/accessibilitycheck/data/ContrastTestFail.odt)

[1] https://www.w3.org/TR/WCAG22/#contrast-minimum
[2] https://www.w3.org/WAI/WCAG22/Understanding/contrast-minimum.html

Change-Id: I398f72aa5bdcd77c42834632575d6465a5ecd586
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178127
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins
Reviewed-by: Balazs Varga 
(cherry picked from commit a4b03fce93fce7672be40b57d30797ac36ca67c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178169

diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx 
b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index d15eeaf70da9..fc0aa008f4b3 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -306,6 +306,34 @@ CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, 
testStylesWithHeader)
 CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::DIRECT_FORMATTING, 
aIssues[4]->m_eIssueID);
 }
 
+// Text contrast tests
+// see https://www.w3.org/WAI/WCAG22/Understanding/contrast-minimum.html
+CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheckTextContrast)
+{
+// first test doc has these issues:
+// * normal text with contrast < 4.5
+// * large text with contrast < 3.0
+// * bold text with font size 13 (i.e. not considered large) with contrast 
< 4.5
+createSwDoc("ContrastTestFail.odt");
+SwDoc* pDoc = getSwDoc();
+sw::AccessibilityCheck aCheck(pDoc);
+aCheck.check();
+auto& aIssues = aCheck.getIssueCollection().getIssues();
+CPPUNIT_ASSERT_EQUAL(size_t(3), aIssues.size());
+
+// second test doc has large text with contrast between 3.0 and 4.5,
+// which is sufficient for large text
+// both of these are considered large text according to the spec:
+// * non-bold text font with size 18
+// * bold text with font size 14
+createSwDoc("ContrastTestOK.odt");
+SwDoc* pDocOK = getSwDoc();
+sw::AccessibilityCheck aCheckOK(pDocOK);
+aCheckOK.check();
+auto& aIssuesOK = aCheckOK.getIssueCollection().getIssues();
+CPPUNIT_ASSERT_EQUAL(size_t(0), aIssuesOK.size());
+}
+
 namespace
 {
 std::vector>
diff --git a/sw/qa/core/accessibilitycheck/data/ContrastTestFail.odt 
b/sw/qa/core/accessibilitycheck/data/ContrastTestFail.odt
new file mode 100644
index ..4f898942e37f
Binary files /dev/null and 
b/sw/qa/core/accessibilitycheck/data/ContrastTestFail.odt differ
diff --git a/sw/qa/core/accessibilitycheck/data/ContrastTestOK.odt 
b/sw/qa/core/accessibilitycheck/data/ContrastTestOK.odt
new file mode 100644
index ..2f47148838a2
Binary files /dev/null and 
b/sw/qa/core/accessibilitycheck/data/ContrastTestOK.odt differ
diff --git a/sw/source/core/access/AccessibilityCheck.cxx 
b/sw/source/core/access/AccessibilityCheck.cxx
index 0d63ed192696..f54f348786f3 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/

core.git: Branch 'libreoffice-24-8-4' - external/skia

[Patrick Luby (via logerrit)]

 external/skia/macosmetal.patch.0 |   35 ---
 1 file changed, 32 insertions(+), 3 deletions(-)

New commits:
commit 055029ef8c0c5936ff3faecbfe89fb58fcecefee
Author: Patrick Luby 
AuthorDate: Thu Dec 5 17:51:33 2024 -0500
Commit: Michael Stahl 
CommitDate: Thu Dec 12 10:36:37 2024 +0100

Related: tdf#152703 Reuse existing CAMetalLayer to stop flicker

When live resizing a window, replacing the CAMetalLayer with each
resize event repaints the window's background which causes a
noticeable flicker. So reuse any existing CAMetalLayer already
assigned to the native view.

Change-Id: I03bda5f0d40b84606b6602961e5f0d3b0dfcc6ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177921
Tested-by: Jenkins
Reviewed-by: Patrick Luby 
(cherry picked from commit cd983f0af4d0d2a187e30f070bc96241d362302f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177983
Reviewed-by: Christian Lohmaier 
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/external/skia/macosmetal.patch.0 b/external/skia/macosmetal.patch.0
index 3da9fc693fe9..63a3e0df8c04 100644
--- a/external/skia/macosmetal.patch.0
+++ b/external/skia/macosmetal.patch.0
@@ -89,7 +89,32 @@
  using sk_app::DisplayParams;
  using sk_app::window_context_factory::MacWindowInfo;
  using sk_app::MetalWindowContext;
-@@ -66,8 +68,7 @@
+@@ -53,7 +55,23 @@
+ 
+ SkASSERT(nil != fMainView);
+ 
+-fMetalLayer = [CAMetalLayer layer];
++// Related: tdf#152703 Reuse existing CAMetalLayer to stop flicker
++// When live resizing a window, replacing the CAMetalLayer with each
++// resize event repaints the window's background which causes a
++// noticeable flicker. So reuse any existing CAMetalLayer already
++// assigned to the native view.
++BOOL reuseMetalLayer = NO;
++if (fMainView.wantsLayer)
++{
++CALayer *pLayer = fMainView.layer;
++if (pLayer && [pLayer isKindOfClass:[CAMetalLayer class]])
++{
++fMetalLayer = (__bridge CAMetalLayer*)pLayer;
++reuseMetalLayer = YES;
++}
++}
++if (!reuseMetalLayer)
++fMetalLayer = [CAMetalLayer layer];
+ fMetalLayer.device = fShared->fDevice.get();
+ fMetalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm;
+ 
+@@ -66,10 +84,10 @@
  fMetalLayer.autoresizingMask = kCALayerHeightSizable | 
kCALayerWidthSizable;
  fMetalLayer.contentsGravity = kCAGravityTopLeft;
  fMetalLayer.magnificationFilter = kCAFilterNearest;
@@ -97,9 +122,13 @@
 -fMetalLayer.colorspace = cs.CGColorSpace;
 +fMetalLayer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
  
- fMainView.layer = fMetalLayer;
+-fMainView.layer = fMetalLayer;
++if (!reuseMetalLayer)
++fMainView.layer = fMetalLayer;
  fMainView.wantsLayer = YES;
-@@ -86,6 +87,18 @@
+ 
+ return true;
+@@ -86,6 +104,18 @@
  fMetalLayer.drawableSize = backingSize;
  fMetalLayer.contentsScale = backingScaleFactor;
  

core.git: Branch 'libreoffice-24-8-4' - vcl/osx

[Patrick Luby (via logerrit)]

 vcl/osx/salframe.cxx |   62 +++
 vcl/osx/salnativewidgets.cxx |   16 ---
 2 files changed, 58 insertions(+), 20 deletions(-)

New commits:
commit 344fafb3bce380418ffa5b2910c8662bbc0a9f28
Author: Patrick Luby 
AuthorDate: Thu Nov 28 19:56:45 2024 -0500
Commit: Michael Stahl 
CommitDate: Thu Dec 12 10:42:43 2024 +0100

Related: tdf#163945 don't directly flush graphics with Skia/Metal

When dragging a selection box on an empty background in
Impress and only with Skia/Metal, the selection box
would not keep up with the pointer. The selection box
would repaint sporadically or not at all if the pointer
was dragged rapidly and the status bar was visible.

Apparently, flushing a graphics doesn't actually do much
of anything with Skia/Raster and Skia disabled so the
selection box repaints without any noticeable delay.
However, with Skia/Metal every flush of a graphics
creates and queues a new CAMetalLayer drawable. During
rapid dragging, this can lead to creating and queueing
up to 200 drawables per second leaving no spare time for
the Impress selection box painting timer to fire.

So with Skia/Metal, throttle the rate of flushing by
calling display on the view.

Also, with the reduced Skia/Metal flushing load from this
fix, the color conversion when drawing to an NSBox appears
to be no longer needed. The converted color appeared less
saturated, at least to me, so accept the (hopefully now
imperceptible) performance hit of drawing an NSBox with
native colors.

Change-Id: I55b4ab763bf20c6c2acad65587b703fc6f645264
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177530
Reviewed-by: Patrick Luby 
Tested-by: Jenkins
(cherry picked from commit c585b697b583fa0f8cdadeab594c31d270367ba7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177732
Reviewed-by: Christian Lohmaier 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 81aae45457a7..bbce8d566dce 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -55,6 +55,9 @@
 #include 
 #include 
 
+#if HAVE_FEATURE_SKIA
+#include 
+#endif
 
 const int nMinBlinkCursorDelay = 500;
 
@@ -1005,6 +1008,15 @@ void AquaSalFrame::SetPointerPos( tools::Long nX, 
tools::Long nY )
 CGDisplayMoveCursorToPoint( mainDisplayID, aPoint );
 }
 
+static bool lcl_ShouldDisplayInsteadOFFlush()
+{
+bool bRet = false;
+#if HAVE_FEATURE_SKIA
+bRet = SkiaHelper::isVCLSkiaEnabled() && SkiaHelper::renderMethodToUse() 
!= SkiaHelper::RenderRaster;
+#endif
+return bRet;
+}
+
 void AquaSalFrame::Flush()
 {
 if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
@@ -1020,11 +1032,31 @@ void AquaSalFrame::Flush()
 if( mbForceFlush || ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
 {
 mbForceFlush = false;
-mpGraphics->Flush();
+
+// Related: tdf#163945 don't directly flush graphics with Skia/Metal
+// When dragging a selection box on an empty background in
+// Impress and only with Skia/Metal, the selection box
+// would not keep up with the pointer. The selection box
+// would repaint sporadically or not at all if the pointer
+// was dragged rapidly and the status bar was visible.
+// Apparently, flushing a graphics doesn't actually do much
+// of anything with Skia/Raster and Skia disabled so the
+// selection box repaints without any noticeable delay.
+// However, with Skia/Metal every flush of a graphics
+// creates and queues a new CAMetalLayer drawable. During
+// rapid dragging, this can lead to creating and queueing
+// up to 200 drawables per second leaving no spare time for
+// the Impress selection box painting timer to fire.
+// So with Skia/Metal, throttle the rate of flushing by
+// calling display on the view.
+bool bDisplay = lcl_ShouldDisplayInsteadOFFlush();
+if (!bDisplay)
+mpGraphics->Flush();
+
 // Related: tdf#155266 skip redisplay of the view when forcing flush
 // It appears that calling -[NSView display] overwhelms some Intel Macs
 // so only flush the graphics and skip immediate redisplay of the view.
-if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
+if( bDisplay || ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
 [mpNSView display];
 }
 }
@@ -1046,12 +1078,32 @@ void AquaSalFrame::Flush( const tools::Rectangle& rRect 
)
 if( mbForceFlush || ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
 {
 mbForceFlush = false;
-mpGraphics->Flush( rRect );
+
+// Related: tdf#163945 don't directly flush graphics with Skia/Metal
+// When dragging a selection box on an empty background in
+// Impre

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

[Noel Grandin (via logerrit)]

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

New commits:
commit baa997a412f1f87e4fe55af3927a685934dbcaba
Author: Noel Grandin 
AuthorDate: Wed Dec 11 20:00:33 2024 +0200
Commit: Michael Stahl 
CommitDate: Thu Dec 12 10:27:05 2024 +0100

fix ruby style name handling in SwXStyle::SetPropertyValue

code dates back to
  commit 023a58b5fbbf3b30692f4b66d5f5b07c28270934
  Author: Oliver Specht 
  Date:   Mon Feb 19 07:04:57 2001 +
  ruby properties added
Both the other places in sw/ that CharFormatName from
SwFormatRuby expect it to be a UIName not a programmatic name.

Change-Id: Ic02670f6c7ca7bacc6cd30cd48642f32eb9beb29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178331
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Noel Grandin 
(cherry picked from commit f15c86221b41739a578c8a9b15046b20b43cb8c1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178342

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 2913c0bc548e..68e632fac5c7 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1923,11 +1923,11 @@ void 
SwXStyle::SetPropertyValue(const SfxItemPr
 pRuby.reset(new SwFormatRuby(OUString()));
 OUString sStyle;
 SwStyleNameMapper::FillUIName(sValue, sStyle, SwGetPoolIdFromName::ChrFmt);
-pRuby->SetCharFormatName(sValue);
+pRuby->SetCharFormatName(sStyle);
 pRuby->SetCharFormatId(0);
 if(!sValue.isEmpty())
 {
-const sal_uInt16 nId(SwStyleNameMapper::GetPoolIdFromUIName(sValue, 
SwGetPoolIdFromName::ChrFmt));
+const sal_uInt16 nId(SwStyleNameMapper::GetPoolIdFromUIName(sStyle, 
SwGetPoolIdFromName::ChrFmt));
 pRuby->SetCharFormatId(nId);
 }
 rStyleSet.Put(std::move(pRuby));

core.git: offapi/UnoApi_offapi.mk Repository.mk unotest/Module_unotest.mk unotest/source

[Stephan Bergmann (via logerrit)]

 Repository.mk|2 
 offapi/UnoApi_offapi.mk  |2 
 unotest/Module_unotest.mk|2 
 unotest/source/embindtest/embindtest.cxx |  239 ---
 4 files changed, 129 insertions(+), 116 deletions(-)

New commits:
commit 10a5c3162a7b0a6b5c6c5d1bb62808dfe870b49a
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 14:50:32 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 16:02:22 2024 +0100

Include the org.libreoffice.embindtest infrastructure in all Emscripten 
builds

...not just --enable-dbgutil ones, which gives more flexibility in using 
that
infrastructure downstream.  (The unotest/source/embindtest/embindtest.js 
code is
still only included in desktop/Executable_soffice_bin.mk for 
--enable-dbgutil
builds, though.)

Building unotest/source/embindtest/embindtest.cxx also outside of
--enable-dbgutil, and thus implicitly --enable-assert-always-abort, builds
required moving from assert() to some hand-crafted verify().

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

diff --git a/Repository.mk b/Repository.mk
index 70e2cf6eee51..c67abb0e6171 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -414,7 +414,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
drawinglayercore \
drawinglayer \
editeng \
-   $(if $(filter EMSCRIPTEN,$(OS)),$(if $(ENABLE_DBGUTIL),embindtest)) \
+   $(if $(filter EMSCRIPTEN,$(OS)),embindtest) \
$(if $(filter WNT,$(OS)),emser) \
evtatt \
$(call gb_Helper_optional,DBCONNECTIVITY, \
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 34c1d2bfdf9c..8d2a99822bc3 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4451,7 +4451,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,org/freedesktop/PackageKit,\
 SyncDbusSessionHelper \
 ))
 
-ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE)
+ifeq ($(OS),EMSCRIPTEN)
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,org/libreoffice/embindtest, \
 Constants \
 Enum \
diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
index 196d6cd1af7f..43fb67e2e8fc 100644
--- a/unotest/Module_unotest.mk
+++ b/unotest/Module_unotest.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,unotest,\
 endif
 endif
 
-ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE)
+ifeq ($(OS),EMSCRIPTEN)
 $(eval $(call gb_Module_add_targets,unotest, \
 Library_embindtest \
 ))
diff --git a/unotest/source/embindtest/embindtest.cxx 
b/unotest/source/embindtest/embindtest.cxx
index 4a335f6f6be3..02a5a39c3016 100644
--- a/unotest/source/embindtest/embindtest.cxx
+++ b/unotest/source/embindtest/embindtest.cxx
@@ -9,7 +9,9 @@
 
 #include 
 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -49,6 +51,17 @@ class XComponentContext;
 
 namespace
 {
+void verify(bool value, std::source_location const& location = 
std::source_location::current())
+{
+if (!value)
+{
+std::cerr << "Verification failed in " << location.function_name() << 
" at "
+  << location.file_name() << ":" << location.line() << ":" << 
location.column()
+  << "
";
+std::abort();
+}
+}
+
 class TestThread : public salhelper::Thread
 {
 public:
@@ -903,11 +916,11 @@ class Test : public 
cppu::WeakImplHelper
 css::uno::Reference const& 
object) override
 {
 auto const ok1 = object->getLongAttribute() == 789;
-assert(ok1);
+verify(ok1);
 auto const ok2 = object->getStringAttribute() == u"foo"_ustr;
-assert(ok2);
+verify(ok2);
 auto const ok3 = object->getReadOnlyAttribute();
-assert(ok3);
+verify(ok3);
 return ok1 && ok2 && ok3;
 }
 
@@ -978,146 +991,146 @@ private:
 }
 {
 auto const val = ifcCpp->getBoolean();
-assert(val);
+verify(val);
 auto const ok = ifcCpp->isBoolean(val);
-assert(ok);
+verify(ok);
 }
 {
 auto const val = ifcCpp->getByte();
-assert(val == -12);
+verify(val == -12);
 auto const ok = ifcCpp->isByte(val);
-assert(ok);
+verify(ok);
 }
 {
 auto const val = ifcCpp->getShort();
-assert(val == -1234);
+verify(val == -1234);
 auto const ok = ifcCpp->isShort(val);
-assert(ok);
+verify(ok);
 }
 {
 auto const val = ifcCpp->getUnsignedShort();
-assert(val == 54321);
+verify(val == 54321);
 auto const ok = ifcCpp->isUnsignedShort(val);
-assert(ok);
+verify(ok);
 }
 {
 

core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/writerfilter/ooxml/ShadowContext.hxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 5c243654727b26e3a29dfbc6daca477e04c48b71
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 13:43:18 2024 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 16:08:44 2024 +0100

cid#1636677 Uninitialized scalar field

and

cid#1636678 Uninitialized scalar field
cid#1636679 Uninitialized scalar variable
cid#1636680 Uninitialized scalar variable
cid#1636681 Uninitialized scalar variable
cid#1636682 Uninitialized scalar variable
cid#1636683 Uninitialized scalar field

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

diff --git a/sw/source/writerfilter/ooxml/ShadowContext.hxx 
b/sw/source/writerfilter/ooxml/ShadowContext.hxx
index 458e3133d971..fc25445f7c1c 100644
--- a/sw/source/writerfilter/ooxml/ShadowContext.hxx
+++ b/sw/source/writerfilter/ooxml/ShadowContext.hxx
@@ -61,6 +61,7 @@ public:
  CallDataType eType)
 : m_nLevel(nLevel)
 , m_eType(eType)
+, m_nElement(0)
 , m_aAttributes(new sax_fastparser::FastAttributeList(rAttributes))
 , m_sNameSpace(rNameSpace)
 , m_sElement(rElement)
@@ -71,6 +72,7 @@ public:
 CallData(sal_uInt32 nLevel, const ::rtl::OUString& rNameSpace, const 
::rtl::OUString& rElement)
 : m_nLevel(nLevel)
 , m_eType(CallDataType::EndUnknown)
+, m_nElement(0)
 , m_sNameSpace(rNameSpace)
 , m_sElement(rElement)
 {
@@ -99,6 +101,7 @@ public:
 CallData(sal_uInt32 nLevel, const ::rtl::OUString& rChars)
 : m_nLevel(nLevel)
 , m_eType(CallDataType::Char)
+, m_nElement(0)
 , m_aChars(rChars)
 {
 }
@@ -154,3 +157,5 @@ private:
 bool m_bImportAsWriterFrame;
 };
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

core.git: vcl/source

[Patrick Luby (via logerrit)]

 vcl/source/control/scrbar.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 94508506e7f6b9e53c77b631c5d7de1e06ff78d9
Author: Patrick Luby 
AuthorDate: Thu Dec 12 10:45:21 2024 -0500
Commit: Patrick Luby 
CommitDate: Thu Dec 12 17:51:55 2024 +0100

tdf#147067 Jump to clicked spot if left mouse click with Option key

Most macOS applications such as TextEdit and Safari jump to the
clicked spot if the Option key is pressed during a left mouse click.

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

diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 7218b1485bbb..fc56cc4be24a 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -834,6 +834,13 @@ void ScrollBar::ImplDragThumb( const Point& rMousePos )
 void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
 bool bPrimaryWarps = 
GetSettings().GetStyleSettings().GetPrimaryButtonWarpsSlider();
+#ifdef MACOSX
+// tdf#147067 Jump to clicked spot if left mouse click with Option key
+// Most macOS applications such as TextEdit and Safari jump to the
+// clicked spot if the Option key is pressed during a left mouse click.
+if (!bPrimaryWarps && rMEvt.IsLeft() && rMEvt.GetModifier() == KEY_MOD2)
+bPrimaryWarps = true;
+#endif
 bool bWarp = bPrimaryWarps ? rMEvt.IsLeft() : rMEvt.IsMiddle();
 bool bPrimaryWarping = bWarp && rMEvt.IsLeft();
 bool bPage = bPrimaryWarps ? rMEvt.IsRight() : rMEvt.IsLeft();

core.git: sd/source

[Sarper Akdemir (via logerrit)]

 sd/source/ui/view/ViewShellManager.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c1473de894b17f113fcb6c81f82592434e272a8c
Author: Sarper Akdemir 
AuthorDate: Thu Dec 12 10:55:50 2024 +0100
Commit: Sarper Akdemir 
CommitDate: Thu Dec 12 11:52:04 2024 +0100

sd: keep a non-owning pointer to the OverridingShell

... instead of keeping an owning shared_ptr

To fix the ubsan build error


Which appears to be caused from EventMultiplexer::CallListeners
triggering a NotesPanelView to be deleted, and then notifying
that just-deleted NotesPanelView, see



Change-Id: I05e67dfeab093e7549e9b2ec4caf4a95dc743627
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178348
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-by: Sarper Akdemir 

diff --git a/sd/source/ui/view/ViewShellManager.cxx 
b/sd/source/ui/view/ViewShellManager.cxx
index a82a1be2dc82..0e6076efb1ce 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -117,7 +117,7 @@ public:
 void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId);
 void RemoveOverridingMainShell();
 void SetOverridingShell(const std::shared_ptr& pViewShell);
-const std::shared_ptr & GetOverridingShell();
+std::shared_ptr GetOverridingShell();
 void MoveToTop (const SfxShell& rParentShell);
 SfxShell* GetShell (ShellId nId) const;
 SfxShell* GetTopShell() const;
@@ -194,7 +194,7 @@ private:
 SfxShell* mpTopShell;
 SfxShell* mpTopViewShell;
 
-std::shared_ptr mpOverridingShell;
+std::weak_ptr mpOverridingShell;
 
 void UpdateShellStack();
 
@@ -626,9 +626,9 @@ void ViewShellManager::Implementation::DeactivateSubShell (
 DestroySubShell(aDescriptor);
 }
 
-const std::shared_ptr & 
ViewShellManager::Implementation::GetOverridingShell()
+std::shared_ptr 
ViewShellManager::Implementation::GetOverridingShell()
 {
-return mpOverridingShell;
+return mpOverridingShell.lock();
 }
 
 void ViewShellManager::Implementation::RemoveOverridingMainShell()

core.git: Branch 'distro/collabora/co-24.04' - compilerplugins/clang vcl/inc vcl/jsdialog

[Szymon Kłos (via logerrit)]

 compilerplugins/clang/badstatics.cxx |4 +---
 vcl/inc/jsdialog/jsdialogbuilder.hxx |   24 +---
 vcl/jsdialog/jsdialogregister.cxx|4 +---
 3 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 41a2c9894e40cfb9ed99081b5c5cb1d6016b9ed5
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 09:37:42 2024 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Dec 12 13:08:08 2024 +0100

jsdialog: use single static register

followup for commit 13af671fda1317175a93fd747e5455ce897ed167
jsdialog: share code for widget registry

this way we avoid modyfying compilerplugins every time we add new
thing we need to remember

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

diff --git a/compilerplugins/clang/badstatics.cxx 
b/compilerplugins/clang/badstatics.cxx
index 6f6a99b535f6..0d9929fb4f68 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -209,9 +209,7 @@ public:
 .Class("ScDocument").GlobalNamespace()) // not owning
 || name == "s_aLOKWindowsMap" // LOK only, guarded by assert, 
and LOK never tries to perform a VCL cleanup
 // vcl/inc/jsdialog/jsdialogbuilder.hxx
-|| name == "m_aWidgets" // LOK only, similar case as above
-|| name == "m_aPopups" // LOK only, similar case as above
-|| name == "m_aMenus" // LOK only, similar case as above
+|| name == "m_aWidgetRegister" // LOK only, similar case as 
above
 //
 || name == "gNotebookBarManager" // LOK only case, when 
notebookbar is closed - VclPtr instance is removed
 || name == "gStaticManager" // vcl/source/graphic/Manager.cxx 
- stores non-owning pointers
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index fc8f13fdd502..4bcc839f07fb 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -83,6 +83,14 @@ class JSInstanceBuilder final : public SalInstanceBuilder, 
public JSDialogSender
 Menu,
 };
 
+struct JSDialogRegister
+{
+jsdialog::WidgetRegister> aWidgets;
+jsdialog::WidgetRegister> aPopups;
+jsdialog::WidgetRegister aMenus;
+};
+static JSDialogRegister m_aWidgetRegister;
+
 void initializeDialogSender();
 void initializePopupSender();
 void initializeSidebarSender(sal_uInt64 nLOKWindowId, const 
std::u16string_view& rUIFile);
@@ -91,10 +99,6 @@ class JSInstanceBuilder final : public SalInstanceBuilder, 
public JSDialogSender
 vcl::Window* pVclParent);
 void initializeMenuSender(weld::Widget* pParent);
 
-static jsdialog::WidgetRegister> m_aWidgets;
-static jsdialog::WidgetRegister> m_aPopups;
-static jsdialog::WidgetRegister m_aMenus;
-
 sal_uInt64 m_nWindowId;
 /// used in case of tab pages where dialog is not a direct top level
 VclPtr m_aParentDialog;
@@ -208,13 +212,19 @@ public:
 const vcl::ILibreOfficeKitNotifier* pNotifier = 
nullptr);
 
 // regular widgets
-static jsdialog::WidgetRegister>& Widgets() { 
return m_aWidgets; };
+static jsdialog::WidgetRegister>& Widgets()
+{
+return m_aWidgetRegister.aWidgets;
+};
 
 // we need to remember original popup window to close it properly (its 
handled by vcl)
-static jsdialog::WidgetRegister>& Popups() { return 
m_aPopups; }
+static jsdialog::WidgetRegister>& Popups()
+{
+return m_aWidgetRegister.aPopups;
+}
 
 // menus in separate container as they don't share base class with 
weld::Widget
-static jsdialog::WidgetRegister& Menus() { return m_aMenus; }
+static jsdialog::WidgetRegister& Menus() { return 
m_aWidgetRegister.aMenus; }
 
 private:
 const OUString& GetTypeOfJSON() const;
diff --git a/vcl/jsdialog/jsdialogregister.cxx 
b/vcl/jsdialog/jsdialogregister.cxx
index 66f4d21fa349..fc2ceb845dc9 100644
--- a/vcl/jsdialog/jsdialogregister.cxx
+++ b/vcl/jsdialog/jsdialogregister.cxx
@@ -10,9 +10,7 @@
 #include 
 #include 
 
-jsdialog::WidgetRegister> 
JSInstanceBuilder::m_aWidgets;
-jsdialog::WidgetRegister> JSInstanceBuilder::m_aPopups;
-jsdialog::WidgetRegister JSInstanceBuilder::m_aMenus;
+JSInstanceBuilder::JSDialogRegister JSInstanceBuilder::m_aWidgetRegister;
 
 OUString JSInstanceBuilder::getMapIdFromWindowId() const
 {

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

[Marco Cecchetti (via logerrit)]

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

New commits:
commit 546a703dae9c0d57bee163d7cb086a4f9a7ba65d
Author: Marco Cecchetti 
AuthorDate: Wed Dec 11 13:50:51 2024 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Dec 12 13:08:45 2024 +0100

slideshow: map motion animation to the correct animation node on export

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

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index d6d9c39027ad..ca5fc33a08f4 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -425,7 +425,7 @@ constexpr auto constTransitionSubTypeToString = 
mapEnumToString({
 constexpr auto constAnimationNodeTypeToString = mapEnumToString({
 { AnimationNodeType::ANIMATE, "Animate" },
 { AnimationNodeType::ANIMATECOLOR, "AnimateColor" },
-{ AnimationNodeType::ANIMATEMOTION, "Animate" },
+{ AnimationNodeType::ANIMATEMOTION, "AnimateMotion" },
 { AnimationNodeType::ANIMATEPHYSICS, "Animate" },
 { AnimationNodeType::ANIMATETRANSFORM, "AnimateTransform" },
 { AnimationNodeType::AUDIO, "Audio" },

core.git: Branch 'libreoffice-24-8-4' - starmath/source

[Caolán McNamara (via logerrit)]

 starmath/source/mathtype.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a4cc73f644f3cb85a5ae4a62b23f7a6b088143a6
Author: Caolán McNamara 
AuthorDate: Tue Dec 3 12:54:24 2024 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 17:08:35 2024 +0100

crashtesting: fix failure of forum-en-13617.odt to reload from .doc

Change-Id: I907e282c9e7b75abca9a4c91ba12a2c57fc45f40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177733
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
(cherry picked from commit 63594c62024b894251e1c88d5f65980c553dec4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177752
Reviewed-by: Xisco Fauli 
(cherry picked from commit 0ded71cc45edd4fb372f1c77857178597f949fbe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177761
Reviewed-by: Michael Stahl 
Tested-by: Caolán McNamara 
Reviewed-by: Michael Weghorn 

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 64989e7993ca..d9b805630502 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -3147,6 +3147,7 @@ void MathType::HandleMath(SmNode *pNode)
 
 void MathType::HandleAttributes(SmNode *pNode,int nLevel)
 {
+sal_uInt64 nOldInsertion = nInsertion;
 int nOldPending = 0;
 SmNode *pTemp   = nullptr;
 SmTextNode *pIsText = nullptr;
@@ -3220,8 +3221,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel)
 if ((nInsertion != 0) && nullptr != (pTemp = pNode->GetSubNode(0)))
 {
 auto nPos = pS->Tell();
-nInsertion--;
-pS->Seek(nInsertion);
+pS->Seek(nInsertion - 1);
 switch(pTemp->GetToken().eType)
 {
 case TACUTE: //Not Exportable
@@ -3274,6 +3274,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel)
 pS->Seek(nPos);
 }
 }
+nInsertion = nOldInsertion;
 }
 
 void MathType::HandleText(SmNode *pNode)

Minutes from the UX/design meeting 2024-Dec-12

[Heiko Tietze]

Present: Sahil, Heiko
Comments: Regina, Stuart, Eyal

Tickets/Topics

 * Wrap text + Resize to fit text in drawing object doesn't do what it says
   + https://bugs.documentfoundation.org/show_bug.cgi?id=163990
   + several kind of drawing objects that handle text differently (Regina)
   + duplicate of bug 114924 (Stuart)
   => make it a duplicate

 * No access to a selection of colors widely-used in the document
   + https://bugs.documentfoundation.org/show_bug.cgi?id=164011
   + document color are sufficient, WF (Heiko)
   + MSO-like themed color palette is supposed to structure (Stuart)
   => resolve WF

 * Default choice in Change-master-slide dialog should be last similar
   + https://bugs.documentfoundation.org/show_bug.cgi?id=164015
   => NAB (Stuart, Eyal)

 * Add shortcut key combination for change from one document to another
   + https://bugs.documentfoundation.org/show_bug.cgi?id=164115
   + window management is up to the OS (Heiko, Cor)
   + Window menu lists each document; ability to manipulate the
 instance as listed in the main menu would be useful UI (Stuart)
 + it is but mnemonics are assigned automatically instead of
   something like _1: Doc1, _2: Doc2, etc. (Heiko)
   => comment in favor of a naming change - or resolve WF


OpenPGP_signature.asc
Description: OpenPGP digital signature

core.git: configure.ac solenv/bin

[Christian Lohmaier (via logerrit)]

 configure.ac|   11 
 solenv/bin/modules/installer/windows/mergemodule.pm |  252 
 solenv/bin/modules/installer/windows/update.pm  |   22 -
 3 files changed, 118 insertions(+), 167 deletions(-)

New commits:
commit 1cabb20fad8303d16e25957ee245970f37ad2f82
Author: Christian Lohmaier 
AuthorDate: Fri Dec 6 12:22:30 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 15:29:30 2024 +0100

replace a couple manual calls to cygpath with PathFormat

this fixes using the MSM merge modules in the wsl-as-helper case and
avoids "cygpath not found" error lines when doing the compiler tests
when running configure.

Also capture and report the output of failed msidb calls in the
isntaller code and simplify the path-mangling to windows-style

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

diff --git a/configure.ac b/configure.ac
index db7a8e901626..fb7369f6e806 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4435,10 +4435,10 @@ test_cl_exe()
 AC_MSG_ERROR([No mspdb${mspdbnum}.dll in $2, Visual Studio 
installation broken?])
 fi
 
-# The compiles has to find its shared libraries
+# The compiler has to find its shared libraries
 OLD_PATH="$PATH"
-TEMP_PATH=`cygpath -d "$2"`
-PATH="`cygpath -u "$TEMP_PATH"`:$PATH"
+PathFormat "$2"
+PATH="$formatted_path_unix:$PATH"
 
 if ! "$CL_EXE_PATH" -? /dev/null 2>&1; then
 AC_MSG_ERROR([no compiler (cl.exe) in $2])
@@ -7101,7 +7101,8 @@ find_msms()
 esac
 
 if test -n "$msmdir"; then
-msmdir=`cygpath -m "$msmdir"`
+PathFormat "$msmdir"
+msmdir="$formatted_path"
 AC_MSG_RESULT([$msmdir])
 else
 if test "$ENABLE_RELEASE_BUILD" = "TRUE" ; then
@@ -8959,7 +8960,7 @@ if test $_os = "WINNT"; then
 if test "$i" = msi; then
 find_msms "$with_redist"
 if test -n "$msmdir"; then
-MSM_PATH=`win_short_path_for_make "$msmdir"`
+MSM_PATH=`win_short_path_for_make "$msmdir"`/
 SCPDEFS="$SCPDEFS -DWITH_VC_REDIST=$with_redist"
 fi
 break
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm 
b/solenv/bin/modules/installer/windows/mergemodule.pm
index f737c2b905c6..2fc8a98c0211 100644
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -57,7 +57,11 @@ sub merge_mergemodules_into_msi_database
 my $cabinetfile = "MergeModule.CABinet"; # the name of each cabinet 
file in a merge file
 my $infoline = "";
 my $systemcall = "";
+my $systemcall_output = "";
 my $returnvalue = "";
+# in cygwin the * glob needs to be escaped when passing it to msidb
+my $globescape = "";
+$globescape = "\" if ( $^O =~ /cygwin/i );
 
 # 1. Analyzing the MergeModule (has only to be done once)
 #   a. -> Extracting cabinet file: msidb.exe -d  -x 
MergeModule.CABinet
@@ -103,16 +107,14 @@ sub merge_mergemodules_into_msi_database
 # remove an existing cabinet file
 if ( -f $cabinetfile ) { unlink($cabinetfile); }
 
-# exclude cabinet file
+# export cabinet file
 $systemcall = $msidb . " -d " . $filename . " -x " . 
$cabinetfile;
-$returnvalue = system($systemcall);
-
-$infoline = "Systemcall: $systemcall
";
-push( @installer::globals::logfileinfo, $infoline);
+$systemcall_output = `$systemcall`;
+$returnvalue = $? >> 8;
 
 if ($returnvalue)
 {
-$infoline = "ERROR: Could not execute $systemcall !
";
+$infoline = "ERROR: Could not execute $systemcall - 
returncode: $returnvalue - output: $systemcall_output
";
 push( @installer::globals::logfileinfo, $infoline);
 installer::exiter::exit_program("ERROR: Could not extract 
cabinet file from merge file: $completedest !", 
"merge_mergemodules_into_msi_database");
 }
@@ -122,34 +124,25 @@ sub merge_mergemodules_into_msi_database
 push( @installer::globals::logfileinfo, $infoline);
 }
 
-# exclude tables from mergefile
+# export tables from mergefile
 # Attention: All listed tables have to exist in the database. 
If they not exist, an error window pops up
 # and the return value of msidb.exe is not zero. The error 
window makes it impossible to check the existence
 # of a table with the help of the return value.
 # Solution: Export of all tables by using "*" . Some tables 

Easier initiation of Gerrit editing from Gitiles

[Ilmari Lauhakangas]

A while ago I created a Gitiles improvement with the help of more 
experienced hackers (my first time using Java). It adds an [edit] link 
to file views when you are browsing files at a branch. Clicking this 
link will immediately create a new patch in Gerrit (a warning dialog 
would be nice and I will look into this later).


I have updated our Gerrit editing wiki article which is based around 
Help, but can of course be applied to any of our repos: 
https://wiki.documentfoundation.org/Documentation/GerritEditing#Inline_Editing_of_Help_pages


I made another improvement to Gitiles which Guilhem kindly applied to 
our instance while it's not yet in an official release: the ability to 
view the source of Markdown files had disappeared 6 years ago and I 
restored it. While viewing something like 
https://git.libreoffice.org/core/+/master/README.md you will now see 
"source log blame" links at the bottom. This also allows easy quick 
edits to the content of our Hugo-based sites such as 
https://git.libreoffice.org/infra/documentfoundationorg/ and 
https://git.libreoffice.org/infra/libreofficeorg/


Ilmari

ESC meeting minutes: 2024-12-12

[Miklos Vajna]

* Present:
  + Olivier, Caolan, Gabriel, Heiko, Ilmari, Jonathan, Michael W, Michael S, 
Regina, Stephan, Thorsten, Cloph, Eike, Miklos

* Completed Action Items:
  + Upgrade the wiki template for the release pages to specify when the MAR 
update can be expected (Hossein)
   + Done: https://wiki.documentfoundation.org/ReleasePlan
Template updated to calculate +1 week, based on:
+ update checker: +1 week after announce (Cloph)
  + intention: same for the MAR updates
https://lists.freedesktop.org/archives/libreoffice/2024-November/092704.html

* Pending Action Items:

* Release Engineering update (Cloph)
  + 24.8.4 rc2 this week
+ cross-update will be enabled (from 24.2.x; after 1 week delay)
+ pending patches: 
https://gerrit.libreoffice.org/q/branch:libreoffice-24-8-4+status:open
+ plan to tag later today
  + 25.2 rc1 + UI freeze in 1 week
+ branch rules: https://wiki.documentfoundation.org/Development/Branches
  + self-review is OK for now
+ late features:
  + Sahil is working on the application colors (Heiko)
+ expect it'll be a distruptive change -- probably defer to the next 
release
+ the extension side looks good, it's more about the VCL backends
  + Quick Look plugin for macOS (Patrick)
+ see 
https://lists.freedesktop.org/archives/libreoffice/2024-December/092765.html

* Documentation (Olivier)
   * Helpcontents2
  + Updates and fixes for Help pages (ohallot, B. Buzea, Ilmari, Dione)
 + (rushing to add them on 25.2 branch).
  + Fixes in Help for Scriptforge (A. Romedenne)
   * Guides
  + Work on Calc Guide (ohallot, D. Maddern)
  + Math Guide (P. Schofield)
   * Latam conference:
  + it was interesting, good to see people from the local comunity
  + not ideal timing, but otherwise nice
  + lot of discussions
+ Bugzilla Documentation statistics
229(229) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 10(7)20(5)  48(-1) 265(3)
 commented 22(10)   56(21)168(-14)   1010(7)
  resolved  4(3) 7(2)  21(-1) 174(1)
+ top 10 contributors:
  Ilmari Lauhakangas made 22 changes in 1 month, and 150 changes in 1 
year
  Bogdan B made 14 changes in 1 month, and 36 changes in 1 year
  Heiko Tietze made 10 changes in 1 month, and 87 changes in 1 year
  Kaganski, Mike made 8 changes in 1 month, and 84 changes in 1 year
  Olivier Hallot made 8 changes in 1 month, and 348 changes in 1 year
  Eyal Rozenberg made 5 changes in 1 month, and 8 changes in 1 year
  Timur Gadzo made 3 changes in 1 month, and 14 changes in 1 year
  Vernon, Stuart Foote made 3 changes in 1 month, and 167 changes in 1 
year
  Dione Maddern made 2 changes in 1 month, and 114 changes in 1 year
  Pierre F made 2 changes in 1 month, and 225 changes in 1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
227(227) (topicUI) bugs open, 21(21) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
 added  3(1) 11(1) 15(-1)  21(-2)
 commented 42(18)   117(5)310(-18)   1519(-53)
   removed  0(0)  1(-2) 5(-1)  12(-1)
  resolved  6(4) 15(1) 47(1)  250(0)
+ top 10 contributors:
  Heiko Tietze made 72 changes in 1 month, and 838 changes in 1 year
  Eyal Rozenberg made 55 changes in 1 month, and 215 changes in 1 year
  Vernon, Stuart Foote made 30 changes in 1 month, and 398 changes in 1 
year
  *UNKNOWN* made 20 changes in 1 month, and 20 changes in 1 year
  Roman Kuznetsov made 15 changes in 1 month, and 27 changes in 1 year
  Cor Nouws made 8 changes in 1 month, and 36 changes in 1 year
  Bogdan B made 7 changes in 1 month, and 22 changes in 1 year
  *UNKNOWN* made 7 changes in 1 month, and 7 changes in 1 year
  Ilmari Lauhakangas made 6 changes in 1 month, and 172 changes in 1 
year
  lol made 6 changes in 1 month, and 6 changes in 1 year
+ [Bug 164142] Replace button wall with a context menu in new Macro manager
+ [Bug 164199] Control of inter-paragraph spacing for same-style paragraphs
   - beyond suppression
+ [Bug 164183] Add hyperlink entries to context menu in tables

* Crash testing (Caolan)
+ 270(+15) import failure, 14(-12) export failures
  - https://wiki.documentfoundation.org/Development/Crashtesting
  - small enough number that we don't run out of space with core dumps
  - sample issue, likely low hanging calc ORG.OPENOFFICE.EASTERSUNDAY thing
- https://bugs.documentfoundation.org/show_bug.cgi?id=164249
+ 14 coverity issues
+ 1 ossfuzz issue
  - 1 int overflow in emf
+ coverity access, LO page is empty (Stephan)

core.git: Branch 'libreoffice-24-8-4' - oox/source sd/qa

[Mike Kaganski (via logerrit)]

 oox/source/export/shapes.cxx   |   38 ++---
 sd/qa/unit/data/odp/formula.fodp   |   41 
 sd/qa/unit/export-tests-ooxml4.cxx |   47 -
 3 files changed, 121 insertions(+), 5 deletions(-)

New commits:
commit a77747d763d9e21469d1a55e1d9f1e5d62acf017
Author: Mike Kaganski 
AuthorDate: Sat Nov 30 01:17:14 2024 +0500
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 16:41:02 2024 +0100

tdf#163483: implement export of Math formula's fallback image to PPTX

This was left as a TODO in commit cb890ae43bacd2be24bc74fad2e2e5cce8910995
(oox: export Math objects to PPTX files, 2016-01-15). Now after commit
7cfff4751befd678b3db4b6f16b020d38f4e9c32 (Related: tdf#129061 Avoid formula
import and use fallback for now, 2024-09-11), that relied on the fallback
being present, our exported documents lost the formulas completely on load.
So the fallback export became a necessity.

Change-Id: I52d4ef0400ce72ee10fda10a1131b4ba29ea56be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177564
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177653
(cherry picked from commit e425b6e0d270b1a315dfecc1ec6571bd5c7a6b52)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177665
Reviewed-by: Michael Stahl 
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 35541bb3c721..e57dc6699f00 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -77,6 +77,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2573,6 +2574,8 @@ void ShapeExport::WriteMathShape(Reference const& 
xShape)
 assert(xMathModel.is());
 assert(GetDocumentType() != DOCUMENT_DOCX); // should be written in 
DocxAttributeOutput
 SAL_WARN_IF(GetDocumentType() == DOCUMENT_XLSX, "oox.shape", "Math export 
to XLSX isn't tested, should it happen here?");
+const OString cNvPr_id = OString::number(GetNewShapeID(xShape));
+const OUString shapeName = GetShapeName(xShape);
 
 // ECMA standard does not actually allow oMath outside of
 // WordProcessingML so write a MCE like PPT 2010 does
@@ -2582,9 +2585,7 @@ void ShapeExport::WriteMathShape(Reference const& 
xShape)
 XML_Requires, "a14");
 mpFS->startElementNS(mnXmlNamespace, XML_sp);
 mpFS->startElementNS(mnXmlNamespace, XML_nvSpPr);
-mpFS->startElementNS(mnXmlNamespace, XML_cNvPr,
- XML_id, OString::number(GetNewShapeID(xShape)),
- XML_name, GetShapeName(xShape));
+mpFS->startElementNS(mnXmlNamespace, XML_cNvPr, XML_id, cNvPr_id, 
XML_name, shapeName);
 AddExtLst(mpFS, xPropSet);
 mpFS->endElementNS(mnXmlNamespace, XML_cNvPr);
 mpFS->singleElementNS(mnXmlNamespace, XML_cNvSpPr, XML_txBox, "1");
@@ -2612,7 +2613,36 @@ void ShapeExport::WriteMathShape(Reference 
const& xShape)
 mpFS->endElementNS(mnXmlNamespace, XML_sp);
 mpFS->endElementNS(XML_mc, XML_Choice);
 mpFS->startElementNS(XML_mc, XML_Fallback);
-// TODO: export bitmap shape as fallback
+
+svt::EmbeddedObjectRef ref(
+
xPropSet->getPropertyValue(u"EmbeddedObject"_ustr).query(),
+embed::Aspects::MSOLE_CONTENT);
+if (auto* graphic = ref.GetGraphic(); graphic && graphic->GetType() != 
GraphicType::NONE)
+{
+if (OUString r_id = writeGraphicToStorage(*graphic); !r_id.isEmpty())
+{
+mpFS->startElementNS(mnXmlNamespace, XML_sp);
+mpFS->startElementNS(mnXmlNamespace, XML_nvSpPr);
+mpFS->startElementNS(mnXmlNamespace, XML_cNvPr, XML_id, cNvPr_id, 
XML_name, shapeName);
+AddExtLst(mpFS, xPropSet);
+mpFS->endElementNS(mnXmlNamespace, XML_cNvPr);
+mpFS->singleElementNS(mnXmlNamespace, XML_cNvSpPr, XML_txBox, "1");
+mpFS->singleElementNS(mnXmlNamespace, XML_nvPr);
+mpFS->endElementNS(mnXmlNamespace, XML_nvSpPr);
+mpFS->startElementNS(mnXmlNamespace, XML_spPr);
+WriteShapeTransformation(xShape, XML_a);
+WritePresetShape("rect"_ostr);
+mpFS->startElementNS(XML_a, XML_blipFill);
+mpFS->singleElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), 
r_id);
+mpFS->startElementNS(XML_a, XML_stretch);
+mpFS->singleElementNS(XML_a, XML_fillRect);
+mpFS->endElementNS(XML_a, XML_stretch);
+mpFS->endElementNS(XML_a, XML_blipFill);
+mpFS->endElementNS(mnXmlNamespace, XML_spPr);
+mpFS->endElementNS(mnXmlNamespace, XML_sp);
+}
+}
+
 mpFS->endElementNS(XML_mc, XML_Fallback);
 mpFS->endElementNS(XML_mc, XML_AlternateContent);
 }
diff --git a/sd/qa/unit/data/odp/formula.fodp b/sd/qa/unit/data/odp/formula.fodp
new file mode 100644

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

[Xisco Fauli (via logerrit)]

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

New commits:
commit 8e561b4380580e3c1feafbb88b5ef2d0f8e479db
Author: Xisco Fauli 
AuthorDate: Thu Dec 12 02:11:12 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 16:41:37 2024 +0100

curl: upgrade to 8.11.1

Downloaded from https://curl.se/download/curl-8.11.1.tar.xz

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

diff --git a/download.lst b/download.lst
index 38cb06964f53..dd0f5ef4b514 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb
-CURL_TARBALL := curl-8.11.0.tar.xz
+CURL_SHA256SUM := 
c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56
+CURL_TARBALL := curl-8.11.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: vcl/skia

[Mike Kaganski (via logerrit)]

 vcl/skia/win/gdiimpl.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 02c7a9bec769aaa0256bfe4ed8f9a323732e83b6
Author: Mike Kaganski 
AuthorDate: Thu Dec 12 16:36:29 2024 +0500
Commit: Mike Kaganski 
CommitDate: Thu Dec 12 13:25:14 2024 +0100

Use correct object

Fix an error in commit a1b18eba354dc773c214fc3b7ee92c3473ec4a5e
(Implement Custom Font Collections on pre-Windows 10 systems, 2024-01-11),
where the wrong object used in the call to CreateFontSetBuilder resulted
in the empty return from the initializer, overwriting the just-created
reference. Before commit 93350f4694ef8606150a95786c760bb2efd43979 (Drop
pre-Win10 code from WinSkiaSalGraphicsImpl, 2024-12-07), it was checked,
and the pre-Win10 path was used. After the said commit, it results in a
nullptr dereference.

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

diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index 2f257594b668..8de57dba2b89 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -56,8 +56,7 @@ getDWritePrivateFontCollection(IDWriteFontFace* fontFace)
 
 static sal::systools::COMReference 
dwriteFontSetBuilder = [] {
 sal::systools::COMReference builder;
-
sal::systools::ThrowIfFailed(dwriteFactory3->CreateFontSetBuilder(&dwriteFontSetBuilder),
- SAL_WHERE);
+
sal::systools::ThrowIfFailed(dwriteFactory3->CreateFontSetBuilder(&builder), 
SAL_WHERE);
 return builder;
 }();
 

core.git: Branch 'libreoffice-24-8-4' - download.lst

[Xisco Fauli (via logerrit)]

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

New commits:
commit 565605f791bea50abf5fd07855882b1a445b28fd
Author: Xisco Fauli 
AuthorDate: Thu Dec 12 02:11:12 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 16:58:55 2024 +0100

curl: upgrade to 8.11.1

Downloaded from https://curl.se/download/curl-8.11.1.tar.xz

Change-Id: Id6ac29867e0f09daf239f8585c870181e606cd02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178340
Reviewed-by: Michael Weghorn 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index b8c129662897..54bed396e91e 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb
-CURL_TARBALL := curl-8.11.0.tar.xz
+CURL_SHA256SUM := 
c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56
+CURL_TARBALL := curl-8.11.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Branch 'feature/cib_contract49d' - sd/source

[Sarper Akdemir (via logerrit)]

 sd/source/ui/view/ViewShellManager.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4d5554b24da27ec9694e6396b32f27a2bc2aa153
Author: Sarper Akdemir 
AuthorDate: Thu Dec 12 10:55:50 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Dec 12 15:44:41 2024 +0100

sd: keep a non-owning pointer to the OverridingShell

... instead of keeping an owning shared_ptr

To fix the ubsan build error


Which appears to be caused from EventMultiplexer::CallListeners
triggering a NotesPanelView to be deleted, and then notifying
that just-deleted NotesPanelView, see



Change-Id: I05e67dfeab093e7549e9b2ec4caf4a95dc743627
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178348
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-by: Sarper Akdemir 
(cherry picked from commit c1473de894b17f113fcb6c81f82592434e272a8c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178352
Reviewed-by: Thorsten Behrens 
Tested-by: allotropia jenkins 

diff --git a/sd/source/ui/view/ViewShellManager.cxx 
b/sd/source/ui/view/ViewShellManager.cxx
index d7e05a8d03c2..19d8614007d4 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -194,7 +194,7 @@ private:
 SfxShell* mpTopShell;
 SfxShell* mpTopViewShell;
 
-std::shared_ptr mpOverridingShell;
+std::weak_ptr mpOverridingShell;
 
 void UpdateShellStack();
 
@@ -624,7 +624,7 @@ void ViewShellManager::Implementation::DeactivateSubShell (
 
 std::shared_ptr 
ViewShellManager::Implementation::GetOverridingShell()
 {
-return mpOverridingShell;
+return mpOverridingShell.lock();
 }
 
 void ViewShellManager::Implementation::RemoveOverridingMainShell()

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

[Rashesh (via logerrit)]

 sw/source/uibase/docvw/AnnotationWin.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a551c0eb433075b4970a54f1778af328fe2b9b9d
Author: Rashesh 
AuthorDate: Wed Dec 11 15:40:11 2024 +0530
Commit: Andras Timar 
CommitDate: Thu Dec 12 15:44:01 2024 +0100

sw: lokit: make sure to read annotation html with utf-8

- its online specific patch where the we pass html for annotation
- to test:
  1. Open document in online
  2. Use "pt" keyboard to type comment "légend" and save
  3. Before: légend; After: légend

Change-Id: Ibd32fbd70c780938e8036362313067e8c1bc8f61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178296
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 676d31297652f4a8c72a31b0d5e1a97a448a7d65)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178363
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx 
b/sw/source/uibase/docvw/AnnotationWin.cxx
index 0f23e3c7f396..9aa505850f6c 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -97,6 +97,7 @@ void ImportHTML(Outliner& rOutliner, const OUString& rHtml)
 // Insert newlines for divs, not normally done, so to keep things simple
 // only enable that for this case.
 xValues->Append(SvKeyValue("newline-on-div", "true"));
+xValues->Append(SvKeyValue("content-type", "text/html;charset=utf-8"));
 rOutliner.Read(aHTMLStream, "", EETextFormat::Html, xValues.get());
 }
 

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

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdedxv.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0650a115b6e2897255ba815267cdbc3ee082b3ed
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 12:13:49 2024 +
Commit: Miklos Vajna 
CommitDate: Thu Dec 12 15:56:40 2024 +0100

Hold vcl::Window by VclPtr

suspicious that there is "delete pOLV" after retrieving a bare pointer,
holdinf this by VclPtr looks sensible in any case.

program/libmergedlo.so
OutputDevice::LogicToPixel(tools::Rectangle const&) const

/home/collabora/online-buildscripts/staging/builddir/libreoffice/vcl/source/outdev/map.cxx:906
program/libmergedlo.so
vcl::Window::LogicToPixel(tools::Rectangle const&, MapMode const&) 
const

/home/collabora/online-buildscripts/staging/builddir/libreoffice/vcl/source/window/window3.cxx:158
program/libmergedlo.so
SdrObjEditView::SdrEndTextEdit(bool)

/home/collabora/online-buildscripts/staging/builddir/libreoffice/svx/source/svdraw/svdedxv.cxx:1796
program/../program/libsdlo.so
sd::View::SdrEndTextEdit(bool)

/home/collabora/online-buildscripts/staging/builddir/libreoffice/sd/source/ui/view/sdview.cxx:780
program/../program/libsdlo.so
sd::FuText::MouseButtonDown(MouseEvent const&)

/home/collabora/online-buildscripts/staging/builddir/libreoffice/sd/source/ui/func/futext.cxx:290

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

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index bc410669546c..3339028ba2dc 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1782,7 +1782,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool 
bDontDeleteReally)
 i--;
 OutlinerView* pOLV = pTEOutliner->GetView(i);
 sal_uInt16 nMorePix = pOLV->GetInvalidateMore() + 10;
-vcl::Window* pWin = pOLV->GetWindow();
+VclPtr pWin = pOLV->GetWindow();
 tools::Rectangle aRect(pOLV->GetOutputArea());
 pTEOutliner->RemoveView(i);
 if (!mbTextEditDontDelete || i != 0)

core.git: sd/source

[Hubert Figuière (via logerrit)]

 sd/source/ui/unoidl/unomodel.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 6fb8d0b7d696e0bc8e53ad5bcd8aee429e1294af
Author: Hubert Figuière 
AuthorDate: Wed Sep 18 17:22:14 2024 -0400
Commit: Miklos Vajna 
CommitDate: Thu Dec 12 15:58:24 2024 +0100

lok: getSlideShowInfo: return the slide names

This allow finding slides by bookmark

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

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index d456ef494dd8..70fbbd52c2a4 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -4337,13 +4337,19 @@ OString SdXImpressDocument::getPresentationInfo() const
 }
 else
 {
-SdrPage* pPage = pSlide->GetSdrPage();
+SdPage* pPage = SdPage::getImplementation(pSlide);
 
 auto aSlideNode = aJsonWriter.startStruct();
 std::string sSlideHash = 
GetInterfaceHash(cppu::getXWeak(pSlide));
 aJsonWriter.put("hash", sSlideHash);
 aJsonWriter.put("index", i);
 
+if (pPage)
+{
+auto aName = 
SdDrawPage::getPageApiNameFromUiName(pPage->GetName());
+aJsonWriter.put("name", aName);
+}
+
 bool bIsDrawPageEmpty = pSlide->getCount() == 0;
 aJsonWriter.put("empty", bIsDrawPageEmpty);
 

core.git: Branch 'distro/allotropia/zeta-24-2' - offapi/UnoApi_offapi.mk Repository.mk unotest/Module_unotest.mk unotest/source

[Stephan Bergmann (via logerrit)]

 Repository.mk|2 
 offapi/UnoApi_offapi.mk  |2 
 unotest/Module_unotest.mk|2 
 unotest/source/embindtest/embindtest.cxx |  239 ---
 4 files changed, 129 insertions(+), 116 deletions(-)

New commits:
commit 57ff9b422005bf6aa9ecdfcde45f09a35731ea2b
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 14:50:32 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 20:01:38 2024 +0100

Include the org.libreoffice.embindtest infrastructure in all Emscripten 
builds

...not just --enable-dbgutil ones, which gives more flexibility in using 
that
infrastructure downstream.  (The unotest/source/embindtest/embindtest.js 
code is
still only included in desktop/Executable_soffice_bin.mk for 
--enable-dbgutil
builds, though.)

Building unotest/source/embindtest/embindtest.cxx also outside of
--enable-dbgutil, and thus implicitly --enable-assert-always-abort, builds
required moving from assert() to some hand-crafted verify().

Change-Id: I3f0fa00feee25b4ea6e7866c22a5b4a4d40cb3d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178361
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 10a5c3162a7b0a6b5c6c5d1bb62808dfe870b49a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178368
Tested-by: allotropia jenkins 

diff --git a/Repository.mk b/Repository.mk
index c062f1e41fc0..c1d882f802a3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -407,7 +407,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
drawinglayercore \
drawinglayer \
editeng \
-   $(if $(filter EMSCRIPTEN,$(OS)),$(if $(ENABLE_DBGUTIL),embindtest)) \
+   $(if $(filter EMSCRIPTEN,$(OS)),embindtest) \
$(if $(filter WNT,$(OS)),emser) \
evtatt \
$(call gb_Helper_optional,DBCONNECTIVITY, \
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 860b8b65515b..3a80eb8d95a5 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4431,7 +4431,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,org/freedesktop/PackageKit,\
 SyncDbusSessionHelper \
 ))
 
-ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE)
+ifeq ($(OS),EMSCRIPTEN)
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,org/libreoffice/embindtest, \
 Constants \
 Enum \
diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
index 196d6cd1af7f..43fb67e2e8fc 100644
--- a/unotest/Module_unotest.mk
+++ b/unotest/Module_unotest.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,unotest,\
 endif
 endif
 
-ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE)
+ifeq ($(OS),EMSCRIPTEN)
 $(eval $(call gb_Module_add_targets,unotest, \
 Library_embindtest \
 ))
diff --git a/unotest/source/embindtest/embindtest.cxx 
b/unotest/source/embindtest/embindtest.cxx
index 4a335f6f6be3..02a5a39c3016 100644
--- a/unotest/source/embindtest/embindtest.cxx
+++ b/unotest/source/embindtest/embindtest.cxx
@@ -9,7 +9,9 @@
 
 #include 
 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -49,6 +51,17 @@ class XComponentContext;
 
 namespace
 {
+void verify(bool value, std::source_location const& location = 
std::source_location::current())
+{
+if (!value)
+{
+std::cerr << "Verification failed in " << location.function_name() << 
" at "
+  << location.file_name() << ":" << location.line() << ":" << 
location.column()
+  << "
";
+std::abort();
+}
+}
+
 class TestThread : public salhelper::Thread
 {
 public:
@@ -903,11 +916,11 @@ class Test : public 
cppu::WeakImplHelper
 css::uno::Reference const& 
object) override
 {
 auto const ok1 = object->getLongAttribute() == 789;
-assert(ok1);
+verify(ok1);
 auto const ok2 = object->getStringAttribute() == u"foo"_ustr;
-assert(ok2);
+verify(ok2);
 auto const ok3 = object->getReadOnlyAttribute();
-assert(ok3);
+verify(ok3);
 return ok1 && ok2 && ok3;
 }
 
@@ -978,146 +991,146 @@ private:
 }
 {
 auto const val = ifcCpp->getBoolean();
-assert(val);
+verify(val);
 auto const ok = ifcCpp->isBoolean(val);
-assert(ok);
+verify(ok);
 }
 {
 auto const val = ifcCpp->getByte();
-assert(val == -12);
+verify(val == -12);
 auto const ok = ifcCpp->isByte(val);
-assert(ok);
+verify(ok);
 }
 {
 auto const val = ifcCpp->getShort();
-assert(val == -1234);
+verify(val == -1234);
 auto const ok = ifcCpp->isShort(val);
-assert(ok);
+verify(ok);
 }
 {
 auto const val = ifcCpp->getUnsignedShort();
-assert(val == 543

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

[Sarper Akdemir (via logerrit)]

 sd/source/ui/framework/factories/ChildWindowPane.cxx |4 ++
 sd/source/ui/inc/ViewShellManager.hxx|5 +++
 sd/source/ui/view/ViewShellManager.cxx   |   28 +++
 3 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit f0551cd1ad33cc115a29353d14d9d510613bfe39
Author: Sarper Akdemir 
AuthorDate: Mon Dec 2 12:45:27 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 19:27:56 2024 +0100

tdf#163948: fix crash when NotesPane is enabled on Tabbed UI

Pane shells (BottomImpressPane, LeftImpressPane etc.) do not implement any 
slot
handling, so make sure they are not activated on the top of the shellstack.

Another solution for this could have been getting ChildWindowPanes properly
dispose instead of Hide() at BasicPaneFactory::releaseResource, and 
adapting the
rest of the code which assumes these Panes are recycled.

This is since ConfigurationUpdater::UpdateCore attempts at releasing via
ConfigurationUpdater::CheckPureAnchors and
ConfigurationControllerResourceManager::DeactivateResources calls.

But in the end the ChildWindowPane is hidden on the DeactivateResource call
instead of being diposed, so the "PureAnchor"'s Shell stays at the 
shellstack.

Change-Id: I52788d350b66ae22875683f57d87326f4a9a77de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177686
Reviewed-by: Sarper Akdemir 
Tested-by: Jenkins
(cherry picked from commit ae281b51456196246a5b21929f6624bf6c030294)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177712
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 379857ddce35cf20d489a05e7aed73fb61d6cbf6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177753
Reviewed-by: Christian Lohmaier 
Reviewed-by: Michael Stahl 
Reviewed-by: Michael Weghorn 
Tested-by: Christian Lohmaier 

diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx 
b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 1eaf0f0aeeb2..6e9e237c166f 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -48,7 +48,9 @@ ChildWindowPane::ChildWindowPane (
   mpShell(std::move(pShell)),
   mbHasBeenActivated(false)
 {
-mrViewShellBase.GetViewShellManager()->ActivateShell(mpShell.get());
+// ChildWindowPane shells don't implement dispatch slots, so activate them
+// at the bottom of the shellstack.
+
mrViewShellBase.GetViewShellManager()->ActivateLowPriorityShell(mpShell.get());
 
 SfxViewFrame& rViewFrame = mrViewShellBase.GetViewFrame();
 
diff --git a/sd/source/ui/inc/ViewShellManager.hxx 
b/sd/source/ui/inc/ViewShellManager.hxx
index 1ad4f138d8ae..1ea01466d58d 100644
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -88,6 +88,11 @@ public:
 */
 void ActivateShell(SfxShell* pShell);
 
+/** Activate the given shell, putting it at the bottom of the stack 
instead of
+the top.
+ */
+void ActivateLowPriorityShell(SfxShell* pShell);
+
 /** Deactivate the specified shell, i.e. take it and all of its
 object bars from the shell stack.
 @param pShell
diff --git a/sd/source/ui/view/ViewShellManager.cxx 
b/sd/source/ui/view/ViewShellManager.cxx
index f158e32e3296..d7e05a8d03c2 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -108,8 +108,10 @@ public:
 ViewShell* pViewShell);
 void DeactivateViewShell (const ViewShell& rShell);
 void ActivateShell (SfxShell& rShell);
+void ActivateLowPriorityShell (SfxShell& rShell);
 void DeactivateShell (const SfxShell& rShell);
 void ActivateShell (const ShellDescriptor& rDescriptor);
+void ActivateLowPriorityShell (const ShellDescriptor& rDescriptor);
 void SetFormShell (const ViewShell* pViewShell, FmFormShell* pFormShell, 
bool bAbove);
 void ActivateSubShell (const SfxShell& rParentShell, ShellId nId);
 void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId);
@@ -317,6 +319,12 @@ void ViewShellManager::ActivateShell (SfxShell* pShell)
 mpImpl->ActivateShell(*pShell);
 }
 
+void ViewShellManager::ActivateLowPriorityShell (SfxShell* pShell)
+{
+if (mbValid && pShell!=nullptr)
+mpImpl->ActivateLowPriorityShell(*pShell);
+}
+
 void ViewShellManager::DeactivateShell (const SfxShell* pShell)
 {
 if (mbValid && pShell!=nullptr)
@@ -496,6 +504,17 @@ void ViewShellManager::Implementation::ActivateShell 
(SfxShell& rShell)
 ActivateShell(aDescriptor);
 }
 
+void ViewShellManager::Implementation::ActivateLowPriorityShell (SfxShell& 
rShell)
+{
+::osl::MutexGuard aGuard (maMutex);
+
+// Create a new shell or recycle on in the cache.
+ShellDescriptor aDescriptor;
+aDescriptor.mpShell = &rShell;
+
+ActivateLowPriorityShell(aDescriptor);
+}
+
 v

core.git: Branch 'libreoffice-24-8-4' - vcl/source

[Patrick Luby (via logerrit)]

 vcl/source/control/scrbar.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7a74370a82fa0abd69556634ce54f7d84cf684e5
Author: Patrick Luby 
AuthorDate: Thu Dec 12 10:45:21 2024 -0500
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 19:28:27 2024 +0100

tdf#147067 Jump to clicked spot if left mouse click with Option key

Most macOS applications such as TextEdit and Safari jump to the
clicked spot if the Option key is pressed during a left mouse click.

Change-Id: I56149e42daf1825cfebde8be8cfbb53645b31928
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178369
Tested-by: Jenkins
Reviewed-by: Patrick Luby 
(cherry picked from commit 94508506e7f6b9e53c77b631c5d7de1e06ff78d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178382
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 7218b1485bbb..fc56cc4be24a 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -834,6 +834,13 @@ void ScrollBar::ImplDragThumb( const Point& rMousePos )
 void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
 bool bPrimaryWarps = 
GetSettings().GetStyleSettings().GetPrimaryButtonWarpsSlider();
+#ifdef MACOSX
+// tdf#147067 Jump to clicked spot if left mouse click with Option key
+// Most macOS applications such as TextEdit and Safari jump to the
+// clicked spot if the Option key is pressed during a left mouse click.
+if (!bPrimaryWarps && rMEvt.IsLeft() && rMEvt.GetModifier() == KEY_MOD2)
+bPrimaryWarps = true;
+#endif
 bool bWarp = bPrimaryWarps ? rMEvt.IsLeft() : rMEvt.IsMiddle();
 bool bPrimaryWarping = bWarp && rMEvt.IsLeft();
 bool bPage = bPrimaryWarps ? rMEvt.IsRight() : rMEvt.IsLeft();

core.git: Branch 'libreoffice-24-8-4' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3705 ++--
 1 file changed, 1881 insertions(+), 1824 deletions(-)

New commits:
commit d08dba1a0070a2b8df1a84e98ac93c488b78086e
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:21:01 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 22:23:40 2024 +0100

update credits

Change-Id: Ic661fad279ad26f8aebc9ca1a2c8b271090e7d62
(cherry picked from commit 2976e22f7a6740bb17933f67895ecbdbbe48cbd6)
(cherry picked from commit bc0779ff918f44ef57720981d5818f56e501eb2b)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eb1a3b27437a..a0aae5afb2de 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.8.2.1$Linux_X86_64
 
LibreOffice_project/0f794b6e29741098670a3b95d60478a65d05ef132012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.8.3.2$Linux_X86_64
 
LibreOffice_project/48a6bac9e7e268aeb4c3483fcf825c94556d9f922012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   586
+   1958
501
59357
28771
@@ -16,9 +16,9 @@
  3560
  3434
  501
- 586
+ 1958
  59856
- 29355
+ 30727
  0
  0
  false
@@ -42,6 +42,7 @@
false
false
false
+   false
true
false
true
@@ -66,6 +67,7 @@
true
false
false
+   true
true
false
false
@@ -112,9 +114,6 @@
false
false
false
-   false
-   false
-   true
false

false
@@ -142,16 +141,19 @@
false
false
false
+   false
+   false
+   true
+   false
false
false
false

true
-   14022563
+   14094486
true
false
false
-   true
   
  
  
@@ -177,7 +179,7 @@
  
   

-   
+   
 


@@ -371,24 +373,24 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -455,26 +457,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   


@@ -845,7 +844,7 @@


 Credits
-2005 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-11-08 10:32:48.
+2017 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-12-12 16:45:21.
 * marks developers whose f

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.8.4.2' created by Christian Lohmaier 
 at 2024-12-12 21:46 +

Tag libreoffice-24.8.4.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmdbWdAACgkQ9DSh76/u
rqPYpxAAmM5DdQ7dZVpRNrzdwevgOXTYuaOFFrViOWSL0k2pVoUP7wY6fiRz4H5y
OBrAW519kTgddsmxB7l3S5FrH6i9uSsrJKaWzfUbwRTr9tOQx67BY63kGPkfSVet
uU2tPH1PnRQpIVs7rN06t7fH+bn4WpuIRZOpW9auAZejx243hZDFffRzfPxl/aE8
iBMghYqPfOAzVHq8S/rmDM+pL7gL62ZO6Nla2Kn3tAZ18eh1M8KSSh+NjQuOBgAx
PPLhPBwebiXRldX65dVW9lwZnX0cQO88r4SL/+YmJANbeem6qhqtxoiHQ9lQh6QL
SNir8mjzAcRnmjq5ogKxLdhTsBt/SdQRfNDtZi/CO2ZJoJMgyZdZVcKvFvEftkFO
NFpavRazAN8sMIJbCD0U6iJZc29VH9h26BkBQLim5tLGcEpg5yHmJos4o6mUHJ8D
mUMTiwNOpwpkBW48qBbyon7/lx9w7WmzpcFj55YHH8y1R0Ns20HPVOaIYJ9/CKp7
YGJ1Rcd3SzqYGXnoX6Qjx6+9uTUP949PVACaLReVhnZZ77JqvmhGBiskrVhvDX6a
eK6CU75fbVpQEX82ka15+C43twpp1CRTvfiZ5ElVY0L9kJIb0SjJUU5QzZP4OSau
DVGnQAm/Jo/xlfH0O5Tj6+kmlo2elNd37L9mXjc2SCxDVEpWGK8=
=xE4o
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.8.4.2' created by Christian Lohmaier 
 at 2024-12-12 21:46 +

Tag libreoffice-24.8.4.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmdbWdAACgkQ9DSh76/u
rqO3Qw/8CMb2oKd6BlC2uIoYNkbXg0+1c2ERdodTJvbL6nye1qlgDYhJSPOAyVp0
puMTNPUMY0uWU7T57HqylzE1tyseT1lr143yEr5qAc4jh7C0CW3EF0XL2d5YdNUi
iPp3zzoHCFrNchvBMhsvG4EJnLSjjD93QxJjTNv1yJ0bxwUkf+sU1Z9FUBw2TsrW
BqKTNTXnwuOknaDwSXYVKx41aDSWQYxo+wIoYfU48vjCc5GCWgSZep0RWbaQ96Rh
Dio9zLSfnK/nsQtDeM2q+r26ry0vM8/o3FharxZOfFW651VVmpHWpjD1A29DbdoR
3MSxEX4BWzuqhfMjbtZSXadq0MPVIO6o1Zp65wN/xOYh7MRuJ6yFAcpd+GTWnW1N
sTZNli4beDmTs5yjE3tAoIDpyuz8VTHNeW2N1z5QS8ChpCUBw/kCC+qc7HAnOjS5
cuZRI7WBO8bCEv86n0T7T1qJcZHdxKhZyO7m06FovCZFi7M6AyrFSdhsQpSwnilZ
sPbdaukMJgCLmIfc+TRv6RB+T+Q9c/hPZVgovDNFe6okLmcGjeXSW6bT6O5uFMoX
oLB1Dx1MWFuZ8SxrdEM9hNdz/pm+D4CFH+dG9N1mQeEhMCKLkNFCdB03C1nZCy2C
KN5/OUZqYb5qTT14OzlNNZC3dwk4G9qSAfxQXZ57ezyCFTtlyRI=
=txGj
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.8.4.2' created by Christian Lohmaier 
 at 2024-12-12 21:46 +

Tag libreoffice-24.8.4.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmdbWcwACgkQ9DSh76/u
rqOhyBAAuwZ8U1nYIsVhM+/YHudgVF33HKWerfDDTiQEDlFJVt9b/bBTInFn3EcL
J4pD0seT3pEp4+Q/8j1cM2c+sGGz1EqemeJqVRCXqaCRP6hicanYslaRdMZYd3Nm
lynPxdS/q5HKR8USNTgtknUbzkiEGA0Sh8zwpw8FzvlZetBaR6NvZChIU3uPRZLb
dPqntpp1josl9G7I+MjL0UgTwUQsOgGZznxwr+A3CBZ7OOKYui1JjJa7evMYSzT7
zJ6RkcB4y5dRHYO5Bn/ZTSqhLyVznQWbhFBvEaeaCMovM3aczXiMfVOdgJQ/WwJY
EUu/fUD3vpKcYAFW8PcwcTlX7rBHOpY3WF2QNNqFX667MJgZUkHqGYZVUak/XCMX
T4cq8z0eAZuAFQpGAG0TWuBiqBYyptpYjZvuHMRHbslBiqrWXJKiF+XSmxkImgVG
Y0qLIEeetauRfAjTrqSJH/8qwHHLlef7pLxDgaJTZAJqIZHk/qDDqZZBzedUpAhr
hdzvyybZOLlU5/ixkdlxzAMyF2Q7lhqfTXHVP6LvdKqNu3swEbNZmW8rc5BpHqiF
ktSMqHtDkt0LoRETYFQkIh0qpxGAwPtsvqEmo/tfIcV8sM1F12Utl3hL5m7GOaC2
rVcEU8gEvvvA8UlZQCzMyYZ/lAqZoT2rpBoCY6ou4kpUBvWryF0=
=RXYo
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit d2b87f30ffb611729b287b4c9140548ef62bccf6
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:47:19 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 22:47:19 2024 +0100

bump product version to 24.8.4.2.0+

Change-Id: Iee10e42349a3225a21b64f5d64c4b98b769d62c9

diff --git a/configure.ac b/configure.ac
index 44ce8a520bef..28c48f696307 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.4.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.8.4.2.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.4.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.8.4.2' created by Christian Lohmaier 
 at 2024-12-12 21:46 +

Tag libreoffice-24.8.4.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmdbWdAACgkQ9DSh76/u
rqMxvA/+OGo8xhPbOMWzuXzz12LF/U06zJz5OTiGfLiphSYqDacS9/eogh4ZbNjk
l+UddChBc7PwuM6HIGFpEuY53QzLu+K5w2gtFIHfJ3eeYxmHhykbdg5NagIjA09H
C9/WbP7reO1mh3zSuRgbKeEA0R4KkXgROO2fexAD2y0wqzcs5011pjXxmWFqDI3g
RGbOwRqpFH9Sf6qHijPonrrBxpjTxdO6HR89T1opys2/1uvbiJmyBoV4sJY/Vowo
iazH4/26Q6zmJZi/Ij6u5C5Mms1sE1kQgGUs3SWUUBboP6vwjLtzmyGW06rznqTx
UeUqyj9EIKCgA6HAvkUxusrwtobU9GN5ixLulTX/RcktS/4jhFfFpdACmxy3iokb
hutwM04x66TovbCEfk2fJzoYEU/rjH3HvB3IPrXNSa3kAzNTNzsG6m6DI2JbzVGX
RzjFhjfiZhlUBk2K5n7ra7d/C73YRgiuJ91CpXljUS8G/akPksUTie+ZNvE2k2a9
5tDkKMGXZAC1NzyAw5BhLV7tjwEZbME12Cia5pO2gWAKPR9cM4fZQ3WnABC0ogIL
q88I6CKQB77BxCYd8Uu3Fy9rohhKTirGunIcYHNKkAKqL6BaQ8pUUNPdMtp4l8Qg
n+UceINfT9hbeNPyNhUY+ijvNYdZySP7kXi0mpM+AvsdC5i7Xlo=
=a5AY
-END PGP SIGNATURE-

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

core.git: Branch 'distro/cib/libreoffice-6-4' - 15 commits - download.lst external/libpng svgio/source sw/source

[Caolán McNamara (via logerrit)]

 download.lst   
   |4 
 external/libpng/0001-ACES-AP0-adjusted-fixes.patch.1   
   |  246 ++
 
external/libpng/0001-fix-Avoid-integer-overflows-in-function-png_xy_from_.patch.1
 |   99 
 
external/libpng/0001-libpng16-fix-Correct-the-function-png_fp_sub-in-png.patch.1
  |   35 +
 external/libpng/UnpackedTarball_libpng.mk  
   |4 
 external/libpng/libpng-osx.patch.1 
   |2 
 svgio/source/svgreader/svgstyleattributes.cxx  
   |9 
 sw/source/core/fields/ddetbl.cxx   
   |6 
 sw/source/core/layout/sortedobjs.cxx   
   |6 
 sw/source/filter/ww8/ww8par.cxx
   |   13 
 sw/source/filter/ww8/ww8par5.cxx   
   |2 
 11 files changed, 417 insertions(+), 9 deletions(-)

New commits:
commit 38cdc0405fdb8bd602b9c2121f280de9ea3cb71c
Author: Caolán McNamara 
AuthorDate: Thu Dec 5 20:05:43 2024 +
Commit: Michael Stahl 
CommitDate: Wed Dec 11 21:01:17 2024 +0100

crashtesting: HLINK_MARK embedded null import from forum-mso-en4-7137.doc

which causes problems on export to docx. Sanitize at the original
import.

Change-Id: I8b9fa86465c455fe872c41386889dc54e38eb9ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177904
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit f232952e727c50cc3a5927ff3b082f88e36c9bed)

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 5db85865ab81..c7854c7a1d96 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -347,6 +347,8 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, 
SwDocShell const * pDocS
 if( ::get_flag( nFlags, WW8_HLINK_MARK ) )
 {
 xTextMark.reset(new 
OUString(read_uInt32_lenPrefixed_uInt16s_ToOUString(rStrm)));
+if (clipToFirstNull(*xTextMark))
+SAL_WARN("sw.ww8", "HLINK_MARK with embedded null, truncating to: 
" << *xTextMark);
 }
 
 if (!xLongName && xShortName.get())
commit e9fed693f41514b1b84334f9db1c035bd286c097
Author: Caolán McNamara 
AuthorDate: Thu Dec 5 12:56:34 2024 +
Commit: Michael Stahl 
CommitDate: Wed Dec 11 21:01:17 2024 +0100

crashtesting: HLINK embedded null import from ooo98294-1.doc

which causes problems on export to docx. Sanitize at the original
import.

Change-Id: I3b5521dac6a2b6926db6362d33500b11f0a69098
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177869
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit acd9e2165c42f0d6977e1ffd883983fe33c5d073)

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 41beb52670ff..5db85865ab81 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -220,6 +220,15 @@ namespace
 }
 }
 
+// returns true if an embedded null was found
+static bool clipToFirstNull(OUString& rStr)
+{
+sal_Int32 nEmbeddedNullIdx = rStr.indexOf(0);
+if (nEmbeddedNullIdx != -1)
+rStr = rStr.copy(0, nEmbeddedNullIdx);
+return nEmbeddedNullIdx != -1;
+}
+
 void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell const * 
pDocShell, struct HyperLinksTable& hlStr)
 {
 // (0x01B8) HLINK
@@ -350,6 +359,8 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, 
SwDocShell const * pDocS
 
 if (xLongName)
 {
+if (clipToFirstNull(*xLongName))
+SAL_WARN("sw.ww8", "HLINK with embedded null, truncating to: " << 
*xLongName);
 if (xTextMark)
 {
 if (xLongName->isEmpty())
commit f0e14b2323f7fcc799211544edae635bd1088beb
Author: Caolán McNamara 
AuthorDate: Sun Dec 1 19:17:49 2024 +
Commit: Michael Stahl 
CommitDate: Wed Dec 11 21:01:17 2024 +0100

crashtesting: crash on load of forum-en-40508.odt + F9 to update fields

seems to already exist in oldest version I have

Change-Id: I3f3652952476678c121cbe3f800b7adf7f7aa1a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177626
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 9a81a5272196d6ba00551dd7ee0e4dab807e4052)

diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index d42b387cb44e..68ab08de9d18 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -147,7 +147,11 @@ void SwDDETable::ChangeContent()
 OSL_ENSURE( pBox->GetSttIdx(), "no content box" );
 SwNodeIndex aNdIdx( *pBox->GetSttNd(), 1 );
 SwTextNode* pTextNode = aNdIdx.GetNode().GetTextNode();
-OSL_ENSURE( pTextNode, "No Node

core.git: Branch 'distro/allotropia/zeta-24-2' - 52 commits - compilerplugins/clang drawinglayer/source external/libcmis external/libpng external/more_fonts g include/unotest sc/source svgio/source sw

[Michael Stahl (via logerrit)]

 compilerplugins/clang/ostr.cxx 
   |   26 
 drawinglayer/source/processor2d/vclprocessor2d.cxx 
   |   20 
 external/libcmis/UnpackedTarball_libcmis.mk
   |2 
 external/libcmis/factory-no-retry-ssl.patch.1  
   |   17 
 external/libcmis/sharepoint-auth.patch.1   
   |   13 
 external/libpng/0001-ACES-AP0-adjusted-fixes.patch.1   
   |  246 
 
external/libpng/0001-fix-Avoid-integer-overflows-in-function-png_xy_from_.patch.1
 |   99 +++
 
external/libpng/0001-libpng16-fix-Correct-the-function-png_fp_sub-in-png.patch.1
  |   35 +
 external/libpng/UnpackedTarball_libpng.mk  
   |6 
 external/more_fonts/ExternalPackage_noto_sans_arabic.mk
   |4 
 g  
   |  104 +--
 include/unotest/macros_test.hxx
   |6 
 sc/source/core/tool/address.cxx
   |   15 
 sc/source/filter/html/htmlpars.cxx 
   |   38 -
 sc/source/filter/xml/xmlcelli.cxx  
   |7 
 sc/source/filter/xml/xmlexprt.cxx  
   |   13 
 svgio/source/svgreader/svgstyleattributes.cxx  
   |8 
 sw/qa/extras/layout/data/hidden-para-as-char-fly.fodt  
   |  279 ++
 sw/qa/extras/layout/data/hidden-para-follow-frame.fodt 
   |  113 
 sw/qa/extras/layout/data/i94666.odt
   |binary
 sw/qa/extras/layout/data/section-nested-with-pagebreaks.fodt   
   |  148 +
 sw/qa/extras/layout/layout.cxx 
   |   46 +
 sw/qa/extras/layout/layout3.cxx
   |  270 +
 sw/qa/extras/odfimport/data/tdf159549.fodt 
   |  121 
 sw/qa/extras/odfimport/odfimport.cxx   
   |   22 
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx  
   |4 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   
   |2 
 sw/qa/extras/rtfexport/rtfexport4.cxx  
   |2 
 sw/qa/extras/uiwriter/data/IndexElementsInHiddenSections.fodt  
   |   63 ++
 sw/qa/extras/uiwriter/uiwriter2.cxx
   |2 
 sw/qa/extras/uiwriter/uiwriter9.cxx
   |   43 +
 sw/qa/uitest/data/tdf163325.odt
   |binary
 sw/qa/uitest/writer_tests5/tdf163325.py
   |   35 +
 sw/source/core/doc/SwStyleNameMapper.cxx   
   |   28 -
 sw/source/core/doc/doctxm.cxx  
   |   79 +-
 sw/source/core/docnode/section.cxx 
   |4 
 sw/source/core/fields/ddetbl.cxx   
   |6 
 sw/source/core/inc/flowfrm.hxx 
   |3 
 sw/source/core/inc/txtfrm.hxx  
   |3 
 sw/source/core/layout/calcmove.cxx 
   |   93 ++-
 sw/source/core/layout/flowfrm.cxx  
   |   53 +
 sw/source/core/layout/fly.cxx  
   |5 
 sw/source/core/layout/frmtool.cxx  
   |2 
 sw/source/core/layout/layact.cxx   
   |2 
 sw/source/core/layout/objectformattertxtfrm.cxx
   |2 
 sw/source/core/layout/paintfrm.cxx 
   |5 
 sw/source/core/layout/sectfrm.cxx  
   |   23 
 sw/source/core/layout/sortedobjs.cxx   
   |6 
 sw/source/core/layout/tabfrm.cxx   
   |   24 
 sw/source/core/layout/trvlfrm.cxx  
   |1 
 sw/source/core/layout/wsfrm.cxx
   |5 
 sw/source/core/text/guess.cxx  
   |   26 
 sw/source/core/text/txtfrm.cxx 
   |   21 
 sw/source/core/tox/tox.cxx  

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

[Patrick Luby (via logerrit)]

 vcl/source/control/scrbar.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit b4541590a6d5d41e92b9274727d6da887410a344
Author: Patrick Luby 
AuthorDate: Thu Dec 12 10:45:21 2024 -0500
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 19:23:44 2024 +0100

tdf#147067 Jump to clicked spot if left mouse click with Option key

Most macOS applications such as TextEdit and Safari jump to the
clicked spot if the Option key is pressed during a left mouse click.

Change-Id: I56149e42daf1825cfebde8be8cfbb53645b31928
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178369
Tested-by: Jenkins
Reviewed-by: Patrick Luby 
(cherry picked from commit 94508506e7f6b9e53c77b631c5d7de1e06ff78d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178380
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 7218b1485bbb..fc56cc4be24a 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -834,6 +834,13 @@ void ScrollBar::ImplDragThumb( const Point& rMousePos )
 void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
 bool bPrimaryWarps = 
GetSettings().GetStyleSettings().GetPrimaryButtonWarpsSlider();
+#ifdef MACOSX
+// tdf#147067 Jump to clicked spot if left mouse click with Option key
+// Most macOS applications such as TextEdit and Safari jump to the
+// clicked spot if the Option key is pressed during a left mouse click.
+if (!bPrimaryWarps && rMEvt.IsLeft() && rMEvt.GetModifier() == KEY_MOD2)
+bPrimaryWarps = true;
+#endif
 bool bWarp = bPrimaryWarps ? rMEvt.IsLeft() : rMEvt.IsMiddle();
 bool bPrimaryWarping = bWarp && rMEvt.IsLeft();
 bool bPage = bPrimaryWarps ? rMEvt.IsRight() : rMEvt.IsLeft();

translations.git: Branch 'libreoffice-24-8-4' - source/af source/ast source/bg source/cs source/da source/dsb source/es source/fr source/hsb source/ka source/nl source/nn source/pl source/pt-BR source

[Christian Lohmaier (via logerrit)]

 source/af/svtools/messages.po |8 
 source/ast/helpcontent2/source/text/smath/01.po   |   22 
 source/bg/basctl/messages.po  |4 
 source/bg/svtools/messages.po |8 
 source/cs/svtools/messages.po |8 
 source/da/basctl/messages.po  |4 
 source/da/helpcontent2/source/text/scalc/01.po|4 
 source/da/helpcontent2/source/text/shared/01.po   |4 
 source/da/helpcontent2/source/text/shared/optionen.po |   18 
 source/da/svtools/messages.po |8 
 source/dsb/helpcontent2/source/text/shared/guide.po   |  522 +-
 source/dsb/svtools/messages.po|8 
 source/es/sc/messages.po  |4 
 source/fr/helpcontent2/source/text/scalc/00.po|   48 
 source/hsb/helpcontent2/source/text/shared/guide.po   |   16 
 source/hsb/svtools/messages.po|8 
 source/ka/svtools/messages.po |8 
 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po |4 
 source/nl/starmath/messages.po|4 
 source/nn/cui/messages.po |   12 
 source/nn/svtools/messages.po |8 
 source/pl/sc/messages.po  |6 
 source/pl/svtools/messages.po |8 
 source/pt-BR/helpcontent2/source/text/scalc/01.po |6 
 source/pt-BR/svtools/messages.po  |8 
 source/ro/dbaccess/messages.po|   14 
 source/ro/officecfg/registry/data/org/openoffice/Office/UI.po |4 
 source/ro/sc/messages.po  |   10 
 source/tl/sc/messages.po  |6 
 source/tl/svtools/messages.po |8 
 source/tl/sw/messages.po  |4 
 source/zh-CN/svtools/messages.po  |8 
 32 files changed, 406 insertions(+), 406 deletions(-)

New commits:
commit fda60c9b20d87333ac44afb54fc8c5e9cbc78ed9
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:11:55 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 22:13:20 2024 +0100

update translations for 24.8.4 rc2

and force-fiix errors using pocheck

Change-Id: Ia8ab38902787b6c054ff427064cc0e5bf2fc0443
(cherry picked from commit 06f2f2e19bd7140228a2b028592c4058e9190044)

diff --git a/source/af/svtools/messages.po b/source/af/svtools/messages.po
index 8e32a68f0b3..34fa78974e5 100644
--- a/source/af/svtools/messages.po
+++ b/source/af/svtools/messages.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI
"
 "POT-Creation-Date: 2024-12-10 16:23+0100
"
-"PO-Revision-Date: 2024-10-25 08:53+
"
+"PO-Revision-Date: 2024-12-11 16:53+
"
 "Last-Translator: Paul Roos 
"
 "Language-Team: Afrikaans 

"
 "Language: af
"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit
"
 "Plural-Forms: nplurals=2; plural=n != 1;
"
 "X-Accelerator-Marker: ~
"
-"X-Generator: LibreOffice
"
+"X-Generator: Weblate 5.4.3
"
 "X-POOTLE-MTIME: 1560975732.00
"
 
 #. fLdeV
@@ -4160,7 +4160,7 @@ msgstr "Maithili"
 #: svtools/inc/langtab.hrc:291
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Santali, Devanagari"
-msgstr ""
+msgstr "Santali, Devanagari"
 
 #. C7EGu
 #: svtools/inc/langtab.hrc:292
@@ -5102,7 +5102,7 @@ msgstr "Mauritiaanse Kreool"
 #: svtools/inc/langtab.hrc:448
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Santali, Ol Chiki"
-msgstr ""
+msgstr "Santali, Ol Chiki"
 
 #. fXSja
 #: svtools/uiconfig/ui/addresstemplatedialog.ui:8
diff --git a/source/ast/helpcontent2/source/text/smath/01.po 
b/source/ast/helpcontent2/source/text/smath/01.po
index 36eae3e8dc6..e4cff25aafb 100644
--- a/source/ast/helpcontent2/source/text/smath/01.po
+++ b/source/ast/helpcontent2/source/text/smath/01.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI
"
 "POT-Creation-Date: 2023-05-22 12:01+0200
"
-"PO-Revision-Date: 2024-11-25 15:52+
"
+"PO-Revision-Date: 2024-12-11 17:52+
"
 "Last-Translator: Adolfo Jayme Barrientos 
"
 "Language-Team: Asturian 

"
 "Language: ast
"
@@ -59,7 +59,7 @@ msgctxt ""
 "par_id3149051
"
 "help.text"
 msgid "

translations.git: Branch 'libreoffice-24-8' - source/af source/ast source/bg source/cs source/da source/dsb source/es source/fr source/hsb source/ka source/nl source/nn source/pl source/pt-BR source/r

[Christian Lohmaier (via logerrit)]

 source/af/svtools/messages.po |8 
 source/ast/helpcontent2/source/text/smath/01.po   |   22 
 source/bg/basctl/messages.po  |4 
 source/bg/svtools/messages.po |8 
 source/cs/svtools/messages.po |8 
 source/da/basctl/messages.po  |4 
 source/da/helpcontent2/source/text/scalc/01.po|4 
 source/da/helpcontent2/source/text/shared/01.po   |4 
 source/da/helpcontent2/source/text/shared/optionen.po |   18 
 source/da/svtools/messages.po |8 
 source/dsb/helpcontent2/source/text/shared/guide.po   |  522 +-
 source/dsb/svtools/messages.po|8 
 source/es/sc/messages.po  |4 
 source/fr/helpcontent2/source/text/scalc/00.po|   48 
 source/hsb/helpcontent2/source/text/shared/guide.po   |   16 
 source/hsb/svtools/messages.po|8 
 source/ka/svtools/messages.po |8 
 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po |4 
 source/nl/starmath/messages.po|4 
 source/nn/cui/messages.po |   12 
 source/nn/svtools/messages.po |8 
 source/pl/sc/messages.po  |6 
 source/pl/svtools/messages.po |8 
 source/pt-BR/helpcontent2/source/text/scalc/01.po |6 
 source/pt-BR/svtools/messages.po  |8 
 source/ro/dbaccess/messages.po|   14 
 source/ro/officecfg/registry/data/org/openoffice/Office/UI.po |4 
 source/ro/sc/messages.po  |   10 
 source/tl/sc/messages.po  |6 
 source/tl/svtools/messages.po |8 
 source/tl/sw/messages.po  |4 
 source/zh-CN/svtools/messages.po  |8 
 32 files changed, 406 insertions(+), 406 deletions(-)

New commits:
commit 06f2f2e19bd7140228a2b028592c4058e9190044
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:11:55 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 22:11:55 2024 +0100

update translations for 24.8.4 rc2

and force-fiix errors using pocheck

Change-Id: Ia8ab38902787b6c054ff427064cc0e5bf2fc0443

diff --git a/source/af/svtools/messages.po b/source/af/svtools/messages.po
index 8e32a68f0b3..34fa78974e5 100644
--- a/source/af/svtools/messages.po
+++ b/source/af/svtools/messages.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI
"
 "POT-Creation-Date: 2024-12-10 16:23+0100
"
-"PO-Revision-Date: 2024-10-25 08:53+
"
+"PO-Revision-Date: 2024-12-11 16:53+
"
 "Last-Translator: Paul Roos 
"
 "Language-Team: Afrikaans 

"
 "Language: af
"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit
"
 "Plural-Forms: nplurals=2; plural=n != 1;
"
 "X-Accelerator-Marker: ~
"
-"X-Generator: LibreOffice
"
+"X-Generator: Weblate 5.4.3
"
 "X-POOTLE-MTIME: 1560975732.00
"
 
 #. fLdeV
@@ -4160,7 +4160,7 @@ msgstr "Maithili"
 #: svtools/inc/langtab.hrc:291
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Santali, Devanagari"
-msgstr ""
+msgstr "Santali, Devanagari"
 
 #. C7EGu
 #: svtools/inc/langtab.hrc:292
@@ -5102,7 +5102,7 @@ msgstr "Mauritiaanse Kreool"
 #: svtools/inc/langtab.hrc:448
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Santali, Ol Chiki"
-msgstr ""
+msgstr "Santali, Ol Chiki"
 
 #. fXSja
 #: svtools/uiconfig/ui/addresstemplatedialog.ui:8
diff --git a/source/ast/helpcontent2/source/text/smath/01.po 
b/source/ast/helpcontent2/source/text/smath/01.po
index 36eae3e8dc6..e4cff25aafb 100644
--- a/source/ast/helpcontent2/source/text/smath/01.po
+++ b/source/ast/helpcontent2/source/text/smath/01.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI
"
 "POT-Creation-Date: 2023-05-22 12:01+0200
"
-"PO-Revision-Date: 2024-11-25 15:52+
"
+"PO-Revision-Date: 2024-12-11 17:52+
"
 "Last-Translator: Adolfo Jayme Barrientos 
"
 "Language-Team: Asturian 

"
 "Language: ast
"
@@ -59,7 +59,7 @@ msgctxt ""
 "par_id3149051
"
 "help.text"
 msgid "\"Markers\" are placeholders. They take the form of  in the 
Commands win

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 6ffe90f8ab1eedbe69cdb10ecacd2b0156def89d
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:13:01 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 12 22:13:01 2024 +0100

Update git submodules

* Update translations from branch 'libreoffice-24-8'
  to 06f2f2e19bd7140228a2b028592c4058e9190044
  - update translations for 24.8.4 rc2

and force-fiix errors using pocheck

Change-Id: Ia8ab38902787b6c054ff427064cc0e5bf2fc0443

diff --git a/translations b/translations
index 824f5a25cc06..06f2f2e19bd7 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 824f5a25cc0662a509b3717f7b2f3c7940e09dd8
+Subproject commit 06f2f2e19bd7140228a2b028592c4058e9190044

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 04e68e26231b2e40cadb1ad54515803ddcaec36b
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:13:26 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 12 22:13:26 2024 +0100

Update git submodules

* Update translations from branch 'libreoffice-24-8-4'
  to fda60c9b20d87333ac44afb54fc8c5e9cbc78ed9
  - update translations for 24.8.4 rc2

and force-fiix errors using pocheck

Change-Id: Ia8ab38902787b6c054ff427064cc0e5bf2fc0443
(cherry picked from commit 06f2f2e19bd7140228a2b028592c4058e9190044)

diff --git a/translations b/translations
index 88cfd4539991..fda60c9b20d8 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 88cfd45399919efd1b9346fdd4cd27676a81f5bc
+Subproject commit fda60c9b20d87333ac44afb54fc8c5e9cbc78ed9

core.git: readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3705 ++--
 1 file changed, 1881 insertions(+), 1824 deletions(-)

New commits:
commit 2976e22f7a6740bb17933f67895ecbdbbe48cbd6
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:21:01 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 22:21:01 2024 +0100

update credits

Change-Id: Ic661fad279ad26f8aebc9ca1a2c8b271090e7d62

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eb1a3b27437a..a0aae5afb2de 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.8.2.1$Linux_X86_64
 
LibreOffice_project/0f794b6e29741098670a3b95d60478a65d05ef132012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.8.3.2$Linux_X86_64
 
LibreOffice_project/48a6bac9e7e268aeb4c3483fcf825c94556d9f922012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   586
+   1958
501
59357
28771
@@ -16,9 +16,9 @@
  3560
  3434
  501
- 586
+ 1958
  59856
- 29355
+ 30727
  0
  0
  false
@@ -42,6 +42,7 @@
false
false
false
+   false
true
false
true
@@ -66,6 +67,7 @@
true
false
false
+   true
true
false
false
@@ -112,9 +114,6 @@
false
false
false
-   false
-   false
-   true
false

false
@@ -142,16 +141,19 @@
false
false
false
+   false
+   false
+   true
+   false
false
false
false

true
-   14022563
+   14094486
true
false
false
-   true
   
  
  
@@ -177,7 +179,7 @@
  
   

-   
+   
 


@@ -371,24 +373,24 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -455,26 +457,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   


@@ -845,7 +844,7 @@


 Credits
-2005 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-11-08 10:32:48.
+2017 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-12-12 16:45:21.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -858,7 +857,7 @@
Ruediger 
TimmC

core.git: Branch 'libreoffice-24-8' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3705 ++--
 1 file changed, 1881 insertions(+), 1824 deletions(-)

New commits:
commit bc0779ff918f44ef57720981d5818f56e501eb2b
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:21:01 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 22:22:00 2024 +0100

update credits

Change-Id: Ic661fad279ad26f8aebc9ca1a2c8b271090e7d62
(cherry picked from commit 2976e22f7a6740bb17933f67895ecbdbbe48cbd6)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eb1a3b27437a..a0aae5afb2de 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.8.2.1$Linux_X86_64
 
LibreOffice_project/0f794b6e29741098670a3b95d60478a65d05ef132012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.8.3.2$Linux_X86_64
 
LibreOffice_project/48a6bac9e7e268aeb4c3483fcf825c94556d9f922012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   586
+   1958
501
59357
28771
@@ -16,9 +16,9 @@
  3560
  3434
  501
- 586
+ 1958
  59856
- 29355
+ 30727
  0
  0
  false
@@ -42,6 +42,7 @@
false
false
false
+   false
true
false
true
@@ -66,6 +67,7 @@
true
false
false
+   true
true
false
false
@@ -112,9 +114,6 @@
false
false
false
-   false
-   false
-   true
false

false
@@ -142,16 +141,19 @@
false
false
false
+   false
+   false
+   true
+   false
false
false
false

true
-   14022563
+   14094486
true
false
false
-   true
   
  
  
@@ -177,7 +179,7 @@
  
   

-   
+   
 


@@ -371,24 +373,24 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -455,26 +457,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   


@@ -845,7 +844,7 @@


 Credits
-2005 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-11-08 10:32:48.
+2017 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-12-12 16:45:21.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committin

core.git: Branch 'libreoffice-25-2' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3705 ++--
 1 file changed, 1881 insertions(+), 1824 deletions(-)

New commits:
commit df8ea0e16f392bd6d1c78d308cbb1d60c08d7687
Author: Christian Lohmaier 
AuthorDate: Thu Dec 12 22:21:01 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 12 22:21:33 2024 +0100

update credits

Change-Id: Ic661fad279ad26f8aebc9ca1a2c8b271090e7d62
(cherry picked from commit 2976e22f7a6740bb17933f67895ecbdbbe48cbd6)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eb1a3b27437a..a0aae5afb2de 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.8.2.1$Linux_X86_64
 
LibreOffice_project/0f794b6e29741098670a3b95d60478a65d05ef132012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.8.3.2$Linux_X86_64
 
LibreOffice_project/48a6bac9e7e268aeb4c3483fcf825c94556d9f922012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   586
+   1958
501
59357
28771
@@ -16,9 +16,9 @@
  3560
  3434
  501
- 586
+ 1958
  59856
- 29355
+ 30727
  0
  0
  false
@@ -42,6 +42,7 @@
false
false
false
+   false
true
false
true
@@ -66,6 +67,7 @@
true
false
false
+   true
true
false
false
@@ -112,9 +114,6 @@
false
false
false
-   false
-   false
-   true
false

false
@@ -142,16 +141,19 @@
false
false
false
+   false
+   false
+   true
+   false
false
false
false

true
-   14022563
+   14094486
true
false
false
-   true
   
  
  
@@ -177,7 +179,7 @@
  
   

-   
+   
 


@@ -371,24 +373,24 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -455,26 +457,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   


@@ -845,7 +844,7 @@


 Credits
-2005 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-11-08 10:32:48.
+2017 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-12-12 16:45:21.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committin

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

1 new defect(s) introduced to LibreOffice found with Coverity Scan.
8 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)


** CID 1636690:  Null pointer dereferences  (FORWARD_NULL)



*** CID 1636690:  Null pointer dereferences  (FORWARD_NULL)
/sd/source/ui/unoidl/unomodel.cxx: 4357 in 
SdXImpressDocument::getPresentationInfo() const()
4351 }
4352 
4353 bool bIsDrawPageEmpty = pSlide->getCount() == 0;
4354 aJsonWriter.put("empty", bIsDrawPageEmpty);
4355 
4356 // Notes
>>> CID 1636690:  Null pointer dereferences  (FORWARD_NULL)
>>> Passing null pointer "pPage" to "GetPageNum", which dereferences it.
4357 SdPage* pNotesPage = 
mpDoc->GetSdPage((pPage->GetPageNum() - 1) >> 1, PageKind::Notes);
4358 if (pNotesPage)
4359 {
4360 SdrObject* pNotes = 
pNotesPage->GetPresObj(PresObjKind::Notes);
4361 if (pNotes)
4362 {



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=u001.AxU2LYlgjL6eX23u9ErQy-2BKADyCpvUKOL6EWmZljiu6VvXBlQRUbS683tC8265rGNPXqJ1ffcoLZCnTuJFQbNcTEkb4XaEQkzovKhJ5DB3c-3D-gFZ_A9M4dSy7guk8NP6DcfgslOyvJRzavztVIKj6nRqYjYpWom7SJFyX0y710bz0kUGtteEIxDgH07G7NPVHIAeBNlcIFWtquMGQP0EKzwE95U-2FP3RcBjvPlbb3dUH6M0ciGxrwuhCOeVZIUuBeT1iIEdMuHSiSAqpaUQTFOhjdEh6zUv1htz8oalEVdtAo5RUJzH4y1KiXaBdRinj1BDF6BgaUHsV-2FeXVhJoAGx-2F0gbp0E-3D

core.git: toolkit/inc toolkit/source

[Michael Weghorn (via logerrit)]

 toolkit/inc/controls/accessiblecontrolcontext.hxx|9 -
 toolkit/source/controls/accessiblecontrolcontext.cxx |   32 +--
 2 files changed, 11 insertions(+), 30 deletions(-)

New commits:
commit 7abcb501e14a4cd4159b17f8365bb86c9c8eb302
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 10:55:30 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 22:59:03 2024 +0100

a11y: Merge OAccessibleControlContext::Init into ctor

Instead of calling a default ctor without arguments
and then calling OAccessibleControlContext::Init
with the arguments directly afterwards, move
the OAccessibleControlContext::Init logic into
the ctor right away.

There's no need for using such a "late ctor" as the
comment calls it. (No virtual methods involved.)

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

diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx 
b/toolkit/inc/controls/accessiblecontrolcontext.hxx
index 31d5cf132a66..a61cf8a30227 100644
--- a/toolkit/inc/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx
@@ -86,16 +86,9 @@ namespace toolkit
 
 vcl::Window* implGetWindow( css::uno::Reference< css::awt::XWindow >* 
_pxUNOWindow = nullptr ) const;
 
-/// ctor. @see Init
-OAccessibleControlContext();
+OAccessibleControlContext(const 
css::uno::Reference& rxCreator);
 virtual ~OAccessibleControlContext() override;
 
-/** late ctor
-*/
-void Init(
-const css::uno::Reference< css::accessibility::XAccessible >& 
_rxCreator
-);
-
 // OCommonAccessibleComponent overridables
 virtual css::awt::Rectangle implGetBounds(  ) override;
 
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx 
b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 9a070da4e9e7..220383037f47 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -46,26 +46,9 @@ namespace toolkit
 //= OAccessibleControlContext
 
 
-OAccessibleControlContext::OAccessibleControlContext()
+OAccessibleControlContext::OAccessibleControlContext(const Reference< 
XAccessible >& rxCreator)
 {
-// nothing to do here, we have a late ctor
-}
-
-
-OAccessibleControlContext::~OAccessibleControlContext()
-{
-ensureDisposed();
-}
-
-
-void OAccessibleControlContext::Init( const Reference< XAccessible >& 
_rxCreator )
-{
-OContextEntryGuard aGuard( this );
-
-// retrieve the model of the control
-OSL_ENSURE( !m_xControlModel.is(), "OAccessibleControlContext::Init: 
already know a control model...!???" );
-
-Reference< awt::XControl > xControl( _rxCreator, UNO_QUERY );
+Reference xControl(rxCreator, UNO_QUERY);
 if ( xControl.is() )
 m_xControlModel.set(xControl->getModel(), css::uno::UNO_QUERY);
 OSL_ENSURE( m_xControlModel.is(), "OAccessibleControlContext::Init: 
invalid creator (no control, or control without model!" );
@@ -76,7 +59,13 @@ namespace toolkit
 startModelListening();
 
 // announce the XAccessible to our base class
-comphelper::OAccessibleComponentHelper::lateInit( _rxCreator );
+comphelper::OAccessibleComponentHelper::lateInit(rxCreator);
+}
+
+
+OAccessibleControlContext::~OAccessibleControlContext()
+{
+ensureDisposed();
 }
 
 
@@ -85,8 +74,7 @@ namespace toolkit
 rtl::Reference pNew;
 try
 {
-pNew = new OAccessibleControlContext;
-pNew->Init( _rxCreator );
+pNew = new OAccessibleControlContext(_rxCreator);
 }
 catch( const Exception& )
 {

core.git: comphelper/source include/comphelper svx/source toolkit/inc toolkit/source

[Michael Weghorn (via logerrit)]

 comphelper/source/misc/accessiblecomponenthelper.cxx |   13 -
 include/comphelper/accessiblecomponenthelper.hxx |   16 
 svx/source/accessibility/charmapacc.cxx  |   10 --
 toolkit/inc/controls/accessiblecontrolcontext.hxx|2 ++
 toolkit/source/awt/vclxaccessiblecomponent.cxx   |3 ---
 toolkit/source/controls/accessiblecontrolcontext.cxx |5 ++---
 6 files changed, 4 insertions(+), 45 deletions(-)

New commits:
commit bbc2823f58aa2deab47be4951a43379d1228d251
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 11:39:59 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:00:05 2024 +0100

a11y: Move OCommonAccessibleComponent::m_aCreator to subclass

Move this member holding a weak reference to the XAccessible
that created the context to the OAccessibleControlContext
subclass, which is the only one making use of it now after
previous commit

Change-Id: I29fb7cd42512a02fc1cc56835bb83f847e9ec0fd
Author: Michael Weghorn 
Date:   Thu Dec 12 11:08:54 2024 +0100

tdf#164294 a11y: Don't rely on "creator" to determine child index

This also removes the need to call OCommonAccessibleComponent::lateInit
in those subclasses that did so previously.

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

diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx 
b/comphelper/source/misc/accessiblecomponenthelper.cxx
index e9b7ae39818e..de523cbbda55 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.cxx
@@ -151,19 +151,6 @@ namespace comphelper
 }
 }
 
-
-void OCommonAccessibleComponent::lateInit( const Reference< XAccessible >& 
_rxAccessible )
-{
-m_aCreator = _rxAccessible;
-}
-
-
-Reference< XAccessible > OCommonAccessibleComponent::getAccessibleCreator( 
) const
-{
-return m_aCreator;
-}
-
-
 OUString SAL_CALL OCommonAccessibleComponent::getAccessibleId(  )
 {
 return OUString();
diff --git a/include/comphelper/accessiblecomponenthelper.hxx 
b/include/comphelper/accessiblecomponenthelper.hxx
index 3adf81c9c97f..55cb5703d596 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -50,7 +50,6 @@ namespace comphelper
 {
 friend class OContextEntryGuard;
 private:
-css::uno::WeakReference< css::accessibility::XAccessible > m_aCreator; 
// the XAccessible which created our XAccessibleContext
 AccessibleEventNotifier::TClientId m_nClientId;
 
 protected:
@@ -58,21 +57,6 @@ namespace comphelper
 
 OCommonAccessibleComponent( );
 
-/** late construction
-@param _rxAccessible
-the Accessible object which created this context.
-If your derived implementation implements the XAccessible (and 
does not follow the proposed
-separation of XAccessible from XAccessibleContext), you may pass 
this here.
-
-The object is hold weak, so its life time is not affected.
-*/
-voidlateInit( const css::uno::Reference< 
css::accessibility::XAccessible >& _rxAccessible );
-
-/** retrieves the creator previously set with lateInit
-*/
-css::uno::Reference< css::accessibility::XAccessible >
-getAccessibleCreator( ) const;
-
 public:
 // XAccessibleEventBroadcaster
 virtual void SAL_CALL addAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) override final;
diff --git a/svx/source/accessibility/charmapacc.cxx 
b/svx/source/accessibility/charmapacc.cxx
index 0f1fbf2b7f42..616e3af9a23a 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -68,11 +68,6 @@ const rtl::Reference & 
SvxShowCharSetItem::GetAccessible(
 SvxShowCharSetAcc::SvxShowCharSetAcc(SvxShowCharSet* pParent)
 : m_pParent(pParent)
 {
-osl_atomic_increment(&m_refCount);
-{
-lateInit(this);
-}
-osl_atomic_decrement(&m_refCount);
 }
 
 SvxShowCharSetAcc::~SvxShowCharSetAcc()
@@ -365,11 +360,6 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( 
sal_Int64 nChildIndex
 SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : 
mpParent( pParent )
 {
 OSL_ENSURE(pParent,"NO parent supplied!");
-osl_atomic_increment(&m_refCount);
-{ // #b6211265 #
-lateInit(this);
-}
-osl_atomic_decrement(&m_refCount);
 }
 
 
diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx 
b/toolkit/inc/controls/accessiblecontrolcontext.hxx
index a61cf8a30227..e68236823113 100644
--- a/toolkit/inc/controls/accessiblecontrolcontext.hx

core.git: comphelper/source include/comphelper

[Michael Weghorn (via logerrit)]

 comphelper/source/misc/accessiblecomponenthelper.cxx |   15 +--
 include/comphelper/accessiblecomponenthelper.hxx |8 ++--
 2 files changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 6a68b96c6a449f3861cda5af8e77dbe15dcce5d6
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 11:08:54 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 22:59:35 2024 +0100

tdf#164294 a11y: Don't rely on "creator" to determine child index

In OCommonAccessibleComponent::getAccessibleIndexInParent,
no longer rely on OCommonAccessibleComponent::m_aCreator
to have been set to the "creator" (i.e. the XAccessible whose
XAccessible::getAccessibleContext() created this object)
in order to determine the index of the object in its parent.

Instead, call XAccessible::getAccessibleContext on
the parent's child XAccessible objects and compare
that to `this`.

At least for SvxPixelCtlAccessible (and most likely other
child classes), OCommonAccessibleComponent::m_aCreator
isn't set (by a call to OCommonAccessibleComponent::lateInit),
so the logic would fail, and an incorrect index of -1
was returned.

Simplify the logic and no longer depend on
OCommonAccessibleComponent::m_aCreator in that
method. This also prepares for further decoupling
VCLXAccessibleComponent from the VCLXWindow toolkit/UNO class.
(The VCLXAccessibleComponent ctor currently calls
OCommonAccessibleComponent::lateInit with its VCLXWindow,
but overrides VCLXAccessibleComponent::getAccessibleIndexInParent
without making use of the "creator" there.)

Comments suggest that the previous logic was there to
avoid calling XAccessible::getAccessibleContext for
performance reasons.
If that's a concern for a particular subclass, overriding
OCommonAccessibleComponent::getAccessibleIndexInParent
in that subclass (and making use of whatever internal
details help to efficiently implement the method) seems
like a better and more reliable solution to me.

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

diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx 
b/comphelper/source/misc/accessiblecomponenthelper.cxx
index 5d5ca53286ff..e9b7ae39818e 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.cxx
@@ -181,24 +181,11 @@ namespace comphelper
 return -1;
 
 //  iterate over parent's children and search for this object
-
-// our own XAccessible for comparing with the children of our 
parent
-Reference< XAccessible > xCreator( m_aCreator);
-
-OSL_ENSURE( xCreator.is(), 
"OCommonAccessibleComponent::getAccessibleIndexInParent: invalid creator!" );
-// two ideas why this could be NULL:
-// * nobody called our late ctor (init), so we never had a 
creator at all -> bad
-// * the creator is already dead. In this case, we should have 
been disposed, and
-//   never survived the above OContextEntryGuard.
-// in all other situations the creator should be non-NULL
-if (!xCreator.is())
-return -1;
-
 sal_Int64 nChildCount = xParentContext->getAccessibleChildCount();
 for (sal_Int64 nChild = 0; nChild < nChildCount; ++nChild)
 {
 Reference< XAccessible > xChild( 
xParentContext->getAccessibleChild( nChild ) );
-if ( xChild.get() == xCreator.get() )
+if (xChild.is() && xChild->getAccessibleContext().get() == 
this)
 return nChild;
 }
 }
diff --git a/include/comphelper/accessiblecomponenthelper.hxx 
b/include/comphelper/accessiblecomponenthelper.hxx
index 3774baf683d5..3adf81c9c97f 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -65,11 +65,6 @@ namespace comphelper
 separation of XAccessible from XAccessibleContext), you may pass 
this here.
 
 The object is hold weak, so its life time is not affected.
-
-The object is needed for performance reasons: for 
getAccessibleIndexInParent,
-all children (which are XAccessible's theirself) of our parent 
have to be asked. If we know our
-XAccessible, we can compare it with all the children, instead of 
asking all children for their
-context and comparing this context with ourself.
 */
 voidlateInit( const css::uno::Reference< 
css::accessibility::XAccessible >& _rxAccessible );
 
@@ -99,7 +94,8 @@ namespace comphelper
 // XAccessibleContext - default implementations
 /** default implementation for ret

core.git: toolkit/inc toolkit/source

[Michael Weghorn (via logerrit)]

 toolkit/inc/controls/accessiblecontrolcontext.hxx|   14 +++---
 toolkit/source/controls/accessiblecontrolcontext.cxx |   17 -
 2 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit add40b532e004048f17d3f3e3b9f63dcc039e938
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 11:58:34 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:00:23 2024 +0100

toolkit a11y: Pass the XControl ref right away

Instead of passing/using a Reference
and querying that one for the XControl interface
in the OAccessibleControlContext ctor and in
OAccessibleControlContext::implGetWindow, pass
(and remember) the control via a Reference
right away.

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

diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx 
b/toolkit/inc/controls/accessiblecontrolcontext.hxx
index e68236823113..4ab60f8be207 100644
--- a/toolkit/inc/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx
@@ -25,6 +25,7 @@
 #include 
 
 namespace vcl { class Window; }
+namespace com::sun::star::awt { class XControl; }
 namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::beans { class XPropertySetInfo; }
@@ -46,12 +47,11 @@ namespace toolkit
 {
 public:
 /** creates an accessible context for a uno control
-@param _rxCreator
-the uno control's XAccessible interface. This must be an XControl, 
from which an XControlModel
-can be retrieved.
+@param rxControl
+the uno control. This must be an XControl from which an 
XControlModel can be retrieved.
 */
 static rtl::Reference create(
-const css::uno::Reference< css::accessibility::XAccessible >& 
_rxCreator
+const css::uno::Reference& rxControl
 );
 
 private:
@@ -86,7 +86,7 @@ namespace toolkit
 
 vcl::Window* implGetWindow( css::uno::Reference< css::awt::XWindow >* 
_pxUNOWindow = nullptr ) const;
 
-OAccessibleControlContext(const 
css::uno::Reference& rxCreator);
+OAccessibleControlContext(const 
css::uno::Reference& rxControl);
 virtual ~OAccessibleControlContext() override;
 
 // OCommonAccessibleComponent overridables
@@ -96,8 +96,8 @@ namespace toolkit
 m_xControlModel;// the model of the control 
which's context we implement
 css::uno::Reference< css::beans::XPropertySetInfo >
 m_xModelPropsInfo;  // the cached property set info of 
the model
-// the XAccessible which created our XAccessibleContext
-css::uno::WeakReference m_aCreator;
+// the XControl whose XAccessibleContext this 
OAccessibleControlContext is
+css::uno::WeakReference m_aControl;
 };
 
 
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx 
b/toolkit/source/controls/accessiblecontrolcontext.cxx
index c15876e8247d..28c25e3058f4 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -46,11 +46,10 @@ namespace toolkit
 //= OAccessibleControlContext
 
 
-OAccessibleControlContext::OAccessibleControlContext(const Reference< 
XAccessible >& rxCreator)
+OAccessibleControlContext::OAccessibleControlContext(const 
css::uno::Reference& rxControl)
 {
-Reference xControl(rxCreator, UNO_QUERY);
-if ( xControl.is() )
-m_xControlModel.set(xControl->getModel(), css::uno::UNO_QUERY);
+if (rxControl.is())
+m_xControlModel.set(rxControl->getModel(), css::uno::UNO_QUERY);
 OSL_ENSURE( m_xControlModel.is(), "OAccessibleControlContext::Init: 
invalid creator (no control, or control without model!" );
 if ( !m_xControlModel.is() )
 throw DisposedException();  // caught by the caller (the create 
method)
@@ -58,7 +57,7 @@ namespace toolkit
 // start listening at the model
 startModelListening();
 
-m_aCreator = rxCreator;
+m_aControl = rxControl;
 }
 
 
@@ -68,16 +67,16 @@ namespace toolkit
 }
 
 
-rtl::Reference 
OAccessibleControlContext::create( const Reference< XAccessible >& _rxCreator )
+rtl::Reference 
OAccessibleControlContext::create(const Reference& rXControl)
 {
 rtl::Reference pNew;
 try
 {
-pNew = new OAccessibleControlContext(_rxCreator);
+pNew = new OAccessibleControlContext(rXControl);
 }
 catch( const Exception& )
 {
-TOOLS_WARN_EXCEPTION( "toolkit", 
"OAccessibleControlContext::create: caught an exception from the late ctor!" );
+TOOLS_WARN_EXCEPTION( "toolkit", 
"OAccessibleControlContex

core.git: accessibility/inc accessibility/source

[Michael Weghorn (via logerrit)]

 accessibility/inc/extended/accessibleiconchoicectrl.hxx|5 +++--
 accessibility/source/extended/accessibleiconchoicectrl.cxx |7 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 843a772dbbe6864045be421f8e45276645f1f16a
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 13:22:42 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:00:56 2024 +0100

a11y: Pass non-const ref in AccessibleIconChoiceCtrl ctor

Pass a non-const SvtIconChoiceCtrl& instead of a const one,
in preparation of switching the base class VCLXAccessibleComponent
ctor to taking a vcl::Window* instead of a VCLXWindow* in an
upcoming commit.

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

diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx 
b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index 99adb175f8e8..e83946a19135 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -57,8 +57,9 @@ namespace accessibility
 @param  _xParent
 is our parent accessible object
 */
-AccessibleIconChoiceCtrl( SvtIconChoiceCtrl const & _rIconCtrl,
-  const css::uno::Reference< 
css::accessibility::XAccessible >& _xParent );
+AccessibleIconChoiceCtrl(
+SvtIconChoiceCtrl& _rIconCtrl,
+const css::uno::Reference& 
_xParent);
 
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx 
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 612ef43a105a..e0780143ea83 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -41,9 +41,10 @@ namespace accessibility
 
 // Ctor() and Dtor()
 
-AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl 
const & _rIconCtrl, const Reference< XAccessible >& _xParent ) :
-ImplInheritanceHelper( _rIconCtrl.GetWindowPeer() ),
-m_xParent   ( _xParent )
+AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl(SvtIconChoiceCtrl& 
_rIconCtrl,
+   const 
Reference& _xParent)
+: ImplInheritanceHelper(_rIconCtrl.GetWindowPeer())
+, m_xParent(_xParent)
 {
 }
 

core.git: 2 commits - accessibility/inc accessibility/source sw/source

[Michael Weghorn (via logerrit)]

 accessibility/inc/extended/AccessibleIconView.hxx|2 
 accessibility/inc/extended/accessiblelistbox.hxx |2 
 accessibility/source/extended/AccessibleIconView.cxx |3 
 accessibility/source/extended/accessiblelistbox.cxx  |5 -
 sw/source/uibase/docvw/SidebarWinAcc.cxx |   84 +++
 sw/source/uibase/docvw/SidebarWinAcc.hxx |   19 
 6 files changed, 58 insertions(+), 57 deletions(-)

New commits:
commit e9a6ed092df2a0bd761b2f459fc2179682666c90
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 15:32:12 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:01:47 2024 +0100

sw a11y: Move SidebarWinAccessibleContext declaration to header

This is in preparation of reworking the
SidebarWinAccessible logic in upcoming commits.

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

diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx 
b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index 3b2b4c758e93..d51d6848b429 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -22,73 +22,57 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include 
 
 namespace sw::sidebarwindows {
 
-namespace {
-
-// declaration and implementation of accessible context for 
 instance
-class SidebarWinAccessibleContext : public VCLXAccessibleComponent
+// implementation of accessible context for  instance
+SidebarWinAccessibleContext::SidebarWinAccessibleContext(
+sw::annotation::SwAnnotationWin& rSidebarWin, SwViewShell& rViewShell,
+const SwFrame* pAnchorFrame)
+: 
VCLXAccessibleComponent(dynamic_cast(rSidebarWin.CreateAccessible().get()))
+, mrViewShell(rViewShell)
+, mpAnchorFrame(pAnchorFrame)
 {
-public:
-explicit SidebarWinAccessibleContext( sw::annotation::SwAnnotationWin& 
rSidebarWin,
-  SwViewShell& rViewShell,
-  const SwFrame* pAnchorFrame )
-: VCLXAccessibleComponent( 
dynamic_cast(rSidebarWin.CreateAccessible().get()) )
-, mrViewShell( rViewShell )
-, mpAnchorFrame( pAnchorFrame )
-{
-rSidebarWin.SetAccessibleRole( 
css::accessibility::AccessibleRole::COMMENT );
-}
-
-void ChangeAnchor( const SwFrame* pAnchorFrame )
-{
-SolarMutexGuard aGuard;
-
-mpAnchorFrame = pAnchorFrame;
-}
+rSidebarWin.SetAccessibleRole(css::accessibility::AccessibleRole::COMMENT);
+}
 
-virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-getAccessibleParent() override
-{
-SolarMutexGuard aGuard;
+void SidebarWinAccessibleContext::ChangeAnchor(const SwFrame* pAnchorFrame)
+{
+SolarMutexGuard aGuard;
 
-css::uno::Reference< css::accessibility::XAccessible > xAccParent;
+mpAnchorFrame = pAnchorFrame;
+}
 
-if ( mpAnchorFrame &&
- mrViewShell.GetAccessibleMap() )
-{
-xAccParent = mrViewShell.GetAccessibleMap()->GetContext( 
mpAnchorFrame, false );
-}
+css::uno::Reference
+SidebarWinAccessibleContext::getAccessibleParent()
+{
+SolarMutexGuard aGuard;
 
-return xAccParent;
-}
+css::uno::Reference xAccParent;
 
-virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override
-{
-SolarMutexGuard aGuard;
+if (mpAnchorFrame && mrViewShell.GetAccessibleMap())
+{
+xAccParent = mrViewShell.GetAccessibleMap()->GetContext(mpAnchorFrame, 
false);
+}
 
-sal_Int64 nIndex( -1 );
+return xAccParent;
+}
 
-if ( mpAnchorFrame && GetWindow() &&
- mrViewShell.GetAccessibleMap() )
-{
-nIndex = mrViewShell.GetAccessibleMap()->GetChildIndex( 
*mpAnchorFrame,
-
*GetWindow() );
-}
+sal_Int64 SAL_CALL SidebarWinAccessibleContext::getAccessibleIndexInParent()
+{
+SolarMutexGuard aGuard;
 
-return nIndex;
-}
+sal_Int64 nIndex(-1);
 
-private:
-SwViewShell& mrViewShell;
-const SwFrame* mpAnchorFrame;
-};
+if (mpAnchorFrame && GetWindow() && mrViewShell.GetAccessibleMap())
+{
+nIndex = mrViewShell.GetAccessibleMap()->GetChildIndex(*mpAnchorFrame, 
*GetWindow());
+}
 
+return nIndex;
 }
 
 // implementation of accessible for  instance
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx 
b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index 5453a42c9abf..b3c7dfa79700 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include 
 #include 
 
 class SwViewShell;
@

core.git: include/toolkit toolkit/source

[Michael Weghorn (via logerrit)]

 include/toolkit/awt/vclxaccessiblecomponent.hxx |2 -
 toolkit/source/awt/vclxaccessiblecomponent.cxx  |   31 +++-
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit dd8c7d034271b15a6bfa8f48338dbee268757e66
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 12:55:57 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:00:39 2024 +0100

a11y: Rename VCLXAccessibleComponent::m_x{EventSource -> Window}

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

diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx 
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 551c7dcb607b..0afe07d9df70 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -47,7 +47,7 @@ class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
 {
 private:
 rtl::Reference  m_xVCLXWindow;
-VclPtr m_xEventSource;
+VclPtr m_xWindow;
 
 DECL_DLLPRIVATE_LINK( WindowEventListener, VclWindowEvent&, void );
 DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclWindowEvent&, void );
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx 
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index ba136aac3360..a42cab94d83f 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -47,11 +47,12 @@ VCLXAccessibleComponent::VCLXAccessibleComponent( 
VCLXWindow* pVCLXWindow )
 m_xVCLXWindow = pVCLXWindow;
 
 DBG_ASSERT( pVCLXWindow->GetWindow(), "VCLXAccessibleComponent - no 
window!" );
-m_xEventSource = pVCLXWindow->GetWindow();
-if ( m_xEventSource )
+m_xWindow = pVCLXWindow->GetWindow();
+if (m_xWindow)
 {
-m_xEventSource->AddEventListener( LINK( this, VCLXAccessibleComponent, 
WindowEventListener ) );
-m_xEventSource->AddChildEventListener( LINK( this, 
VCLXAccessibleComponent, WindowChildEventListener ) );
+m_xWindow->AddEventListener(LINK(this, VCLXAccessibleComponent, 
WindowEventListener));
+m_xWindow->AddChildEventListener(
+LINK(this, VCLXAccessibleComponent, WindowChildEventListener));
 }
 }
 
@@ -62,11 +63,12 @@ VCLXWindow* VCLXAccessibleComponent::GetVCLXWindow() const
 
 void VCLXAccessibleComponent::DisconnectEvents()
 {
-if ( m_xEventSource )
+if (m_xWindow)
 {
-m_xEventSource->RemoveEventListener( LINK( this, 
VCLXAccessibleComponent, WindowEventListener ) );
-m_xEventSource->RemoveChildEventListener( LINK( this, 
VCLXAccessibleComponent, WindowChildEventListener ) );
-m_xEventSource.clear();
+m_xWindow->RemoveEventListener(LINK(this, VCLXAccessibleComponent, 
WindowEventListener));
+m_xWindow->RemoveChildEventListener(
+LINK(this, VCLXAccessibleComponent, WindowChildEventListener));
+m_xWindow.clear();
 }
 }
 
@@ -98,7 +100,7 @@ IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, 
VclWindowEvent&, rEvent
  * might have been destroyed by the previous VCLEventListener (if no AT 
tool
  * is running), e.g. sub-toolbars in impress.
  */
-if (m_xEventSource && (rEvent.GetId() != VclEventId::WindowEndPopupMode))
+if (m_xWindow && (rEvent.GetId() != VclEventId::WindowEndPopupMode))
 {
 DBG_ASSERT( rEvent.GetWindow(), "Window???" );
 if( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( 
rEvent.GetId() == VclEventId::ObjectDying ) )
@@ -110,7 +112,7 @@ IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, 
VclWindowEvent&, rEvent
 
 IMPL_LINK( VCLXAccessibleComponent, WindowChildEventListener, VclWindowEvent&, 
rEvent, void )
 {
-if (m_xEventSource)
+if (m_xWindow)
 {
 DBG_ASSERT( rEvent.GetWindow(), "Window???" );
 if( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() )
@@ -375,10 +377,7 @@ void VCLXAccessibleComponent::disposing()
 m_xVCLXWindow.clear();
 }
 
-vcl::Window* VCLXAccessibleComponent::GetWindow() const
-{
-return m_xEventSource;
-}
+vcl::Window* VCLXAccessibleComponent::GetWindow() const { return m_xWindow; }
 
 void VCLXAccessibleComponent::FillAccessibleRelationSet( 
utl::AccessibleRelationSetHelper& rRelationSet )
 {
@@ -750,8 +749,8 @@ void VCLXAccessibleComponent::grabFocus(  )
 OExternalLockGuard aGuard( this );
 
 sal_Int64 nStates = getAccessibleStateSet();
-if (m_xEventSource && (nStates & 
accessibility::AccessibleStateType::FOCUSABLE))
-m_xEventSource->GrabFocus();
+if (m_xWindow && (nStates & accessibility::AccessibleStateType::FOCUSABLE))
+m_xWindow->GrabFocus();
 }
 
 sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(  )

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

[Michael Weghorn (via logerrit)]

 solenv/clang-format/excludelist  |2 
 sw/source/uibase/docvw/SidebarWinAcc.cxx |   64 ++-
 sw/source/uibase/docvw/SidebarWinAcc.hxx |   43 +++-
 3 files changed, 36 insertions(+), 73 deletions(-)

New commits:
commit 33b2abf2cd31ef75b9d8a17e021489159b4cfa3c
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 19:01:19 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:02:45 2024 +0100

sw a11y: clang-format SidebarWinAccessible code

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

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 9e53e862a91f..7a6c09e66031 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -13075,8 +13075,6 @@ sw/source/uibase/docvw/ShadowOverlayObject.cxx
 sw/source/uibase/docvw/ShadowOverlayObject.hxx
 sw/source/uibase/docvw/SidebarTxtControl.cxx
 sw/source/uibase/docvw/SidebarTxtControl.hxx
-sw/source/uibase/docvw/SidebarWinAcc.cxx
-sw/source/uibase/docvw/SidebarWinAcc.hxx
 sw/source/uibase/docvw/edtdd.cxx
 sw/source/uibase/docvw/edtwin.cxx
 sw/source/uibase/docvw/edtwin2.cxx
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx 
b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index 41842f25ee97..646abbb782d6 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -26,8 +26,8 @@
 
 #include 
 
-namespace sw::sidebarwindows {
-
+namespace sw::sidebarwindows
+{
 SidebarWinAccessible::SidebarWinAccessible(sw::annotation::SwAnnotationWin& 
rSidebarWin,
SwViewShell& rViewShell,
const SwSidebarItem& rSidebarItem)
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx 
b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index 89ea901936d2..8dc4463e5824 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -25,31 +25,33 @@
 class SwViewShell;
 class SwSidebarItem;
 class SwFrame;
-namespace sw::annotation { class SwAnnotationWin; }
-
-namespace sw::sidebarwindows {
+namespace sw::annotation
+{
+class SwAnnotationWin;
+}
 
+namespace sw::sidebarwindows
+{
 class SidebarWinAccessible
 : public cppu::ImplInheritanceHelper
 {
-public:
-explicit SidebarWinAccessible( sw::annotation::SwAnnotationWin& 
rSidebarWin,
-   SwViewShell& rViewShell,
-   const SwSidebarItem& rSidebarItem );
-virtual ~SidebarWinAccessible() override;
+public:
+explicit SidebarWinAccessible(sw::annotation::SwAnnotationWin& rSidebarWin,
+  SwViewShell& rViewShell, const 
SwSidebarItem& rSidebarItem);
+virtual ~SidebarWinAccessible() override;
 
-virtual css::uno::Reference
-SAL_CALL getAccessibleContext() override;
+virtual css::uno::Reference
+SAL_CALL getAccessibleContext() override;
 
-virtual css::uno::Reference
-SAL_CALL getAccessibleParent() override;
-virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
+virtual css::uno::Reference
+SAL_CALL getAccessibleParent() override;
+virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
-void ChangeSidebarItem( const SwSidebarItem& rSidebarItem );
+void ChangeSidebarItem(const SwSidebarItem& rSidebarItem);
 
-private:
-SwViewShell& mrViewShell;
-const SwFrame* mpAnchorFrame;
+private:
+SwViewShell& mrViewShell;
+const SwFrame* mpAnchorFrame;
 };
 
 } // end of namespace sw::sidebarwindows
commit 12dd2f6b3c1b42e099f9ea599887346cd3516c99
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 18:50:14 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:02:39 2024 +0100

sw a11y: Merge SidebarWinAccessible and SidebarWinAccessibleContext

Instead of having two separate classes to implement
the XAccessible and the XAccessibleContext interfaces,
let SidebarWinAccessible implement both and
merge the corresponding logic from SidebarWinAccessibleContext
into SidebarWinAccessible.

This also reduces duplication.

In SidebarWinAccessible::getAccessibleContext,
simply return a reference to the object itself
(after checking that the object is still alive).

After

Change-Id: If0894e733273eecad268c6a932ecee7c2e34b4c2
Author: Michael Weghorn 
Date:   Thu Dec 12 18:06:13 2024 +0100

a11y: Stop using VCLXWindow in vcl a11y classes

, there's also no more need for SidebarWinAccessible to
subclass VCLXWindow, so drop that inheritance.

Change-Id: I5688ced4f83a0291de49741dc1b9df8c8f256099
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178386

core.git: sw/source

[Michael Weghorn (via logerrit)]

 sw/source/uibase/docvw/SidebarWinAcc.cxx |   10 --
 sw/source/uibase/docvw/SidebarWinAcc.hxx |5 -
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit e2cd6cd7cb4457b07471c52533b73b155aa98198
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 16:55:01 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:02:04 2024 +0100

sw a11y: Pass the VCLXWindow to SidebarWinAccessibleContext ctor

SwAnnotationWin::CreateAccessible returns the very
object that is calling the SidebarWinAccessibleContext
ctor.

Make that more obvious by passing it as a param instead
of calling SwAnnotationWin::CreateAccessible and then
dynamic_casting that to a VCLXWindow.

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

diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx 
b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index d51d6848b429..0e3ad3a69e6f 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -31,8 +31,8 @@ namespace sw::sidebarwindows {
 // implementation of accessible context for  instance
 SidebarWinAccessibleContext::SidebarWinAccessibleContext(
 sw::annotation::SwAnnotationWin& rSidebarWin, SwViewShell& rViewShell,
-const SwFrame* pAnchorFrame)
-: 
VCLXAccessibleComponent(dynamic_cast(rSidebarWin.CreateAccessible().get()))
+const SwFrame* pAnchorFrame, SidebarWinAccessible* pSidebarWinAccessible)
+: VCLXAccessibleComponent(pSidebarWinAccessible)
 , mrViewShell(rViewShell)
 , mpAnchorFrame(pAnchorFrame)
 {
@@ -111,10 +111,8 @@ void SidebarWinAccessible::ChangeSidebarItem( const 
SwSidebarItem& rSidebarItem
 
 css::uno::Reference< css::accessibility::XAccessibleContext > 
SidebarWinAccessible::CreateAccessibleContext()
 {
-rtl::Reference pAccContext =
-new SidebarWinAccessibleContext( mrSidebarWin,
- mrViewShell,
- mpAnchorFrame 
);
+rtl::Reference pAccContext
+= new SidebarWinAccessibleContext(mrSidebarWin, mrViewShell, 
mpAnchorFrame, this);
 m_bAccContextCreated = true;
 return pAccContext;
 }
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx 
b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index b3c7dfa79700..189905f7d5fa 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -29,11 +29,14 @@ namespace sw::annotation { class SwAnnotationWin; }
 
 namespace sw::sidebarwindows {
 
+class SidebarWinAccessible;
+
 class SidebarWinAccessibleContext : public VCLXAccessibleComponent
 {
 public:
 explicit SidebarWinAccessibleContext(sw::annotation::SwAnnotationWin& 
rSidebarWin,
- SwViewShell& rViewShell, const 
SwFrame* pAnchorFrame);
+ SwViewShell& rViewShell, const 
SwFrame* pAnchorFrame,
+ SidebarWinAccessible* 
pSidebarWinAccessible);
 
 void ChangeAnchor(const SwFrame* pAnchorFrame);
 

core.git: 2 commits - accessibility/inc accessibility/source dbaccess/source include/toolkit sw/source toolkit/source

[Michael Weghorn (via logerrit)]

 accessibility/inc/standard/svtaccessiblenumericfield.hxx |3 
 accessibility/inc/standard/vclxaccessiblebox.hxx |3 
 accessibility/inc/standard/vclxaccessiblebutton.hxx  |4 
 accessibility/inc/standard/vclxaccessiblecheckbox.hxx|5 
 accessibility/inc/standard/vclxaccessiblecombobox.hxx|4 
 accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx|4 
 accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx |2 
 accessibility/inc/standard/vclxaccessibleedit.hxx|5 
 accessibility/inc/standard/vclxaccessibleheaderbar.hxx   |3 
 accessibility/inc/standard/vclxaccessiblelist.hxx|5 
 accessibility/inc/standard/vclxaccessiblelistbox.hxx |2 
 accessibility/inc/standard/vclxaccessibleradiobutton.hxx |6 
 accessibility/inc/standard/vclxaccessiblescrollbar.hxx   |6 
 accessibility/inc/standard/vclxaccessiblestatusbar.hxx   |2 
 accessibility/inc/standard/vclxaccessibletabcontrol.hxx  |2 
 accessibility/inc/standard/vclxaccessibletabpagewindow.hxx   |2 
 accessibility/inc/standard/vclxaccessibletextcomponent.hxx   |2 
 accessibility/inc/standard/vclxaccessibletextfield.hxx   |4 
 accessibility/inc/standard/vclxaccessibletoolbox.hxx |2 
 accessibility/source/extended/accessibleiconchoicectrl.cxx   |2 
 accessibility/source/extended/accessiblelistbox.cxx  |2 
 accessibility/source/extended/textwindowaccessibility.cxx|2 
 accessibility/source/helper/acc_factory.cxx  |  114 
--
 accessibility/source/standard/svtaccessiblenumericfield.cxx  |5 
 accessibility/source/standard/vclxaccessiblebox.cxx  |9 
 accessibility/source/standard/vclxaccessiblecheckbox.cxx |5 
 accessibility/source/standard/vclxaccessiblecombobox.cxx |4 
 accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |4 
 accessibility/source/standard/vclxaccessibledropdownlistbox.cxx  |4 
 accessibility/source/standard/vclxaccessibleedit.cxx |5 
 accessibility/source/standard/vclxaccessibleheaderbar.cxx|6 
 accessibility/source/standard/vclxaccessiblelist.cxx |6 
 accessibility/source/standard/vclxaccessiblelistbox.cxx  |4 
 accessibility/source/standard/vclxaccessibleradiobutton.cxx  |1 
 accessibility/source/standard/vclxaccessiblescrollbar.cxx|1 
 accessibility/source/standard/vclxaccessiblestatusbar.cxx|4 
 accessibility/source/standard/vclxaccessibletabcontrol.cxx   |4 
 accessibility/source/standard/vclxaccessibletabpagewindow.cxx|4 
 accessibility/source/standard/vclxaccessibletextcomponent.cxx|5 
 accessibility/source/standard/vclxaccessibletextfield.cxx|7 
 accessibility/source/standard/vclxaccessibletoolbox.cxx  |6 
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx  |2 
 dbaccess/source/ui/querydesign/JAccess.cxx   |2 
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx |2 
 include/toolkit/awt/vclxaccessiblecomponent.hxx  |4 
 include/toolkit/helper/accessiblefactory.hxx |   65 ++---
 sw/source/uibase/docvw/AnnotationWin2.cxx|3 
 sw/source/uibase/docvw/SidebarWinAcc.cxx |   32 --
 sw/source/uibase/docvw/SidebarWinAcc.hxx |   11 
 toolkit/source/awt/vclxaccessiblecomponent.cxx   |   16 -
 toolkit/source/awt/vclxwindow.cxx|4 
 toolkit/source/awt/vclxwindows.cxx   |   56 +++-
 52 files changed, 218 insertions(+), 249 deletions(-)

New commits:
commit 168512dce7f1f1453c045584d47bd78a0a6c73f7
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 18:06:13 2024 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 23:02:33 2024 +0100

a11y: Stop using VCLXWindow in vcl a11y classes

Adjust VCLXAccessibleComponent and subclasses to take
a vcl::Window arg instead of a VCLXWindow in the ctor
and drop the VCLXAccessibleComponent::m_xVCLXWindow member
that used to hold a reference to the VCLXWindow.
(VCLXAccessibleComponent still holds a VclPtr
to the corresponding vcl::Window.)

Instead of passing the UNO/toolkit peer (VCLXWindow
and subclasses) to the AccessibleFactory to create
an XAccessibleContext context for the underlying VCL
widget, pass the underlying vcl widget, which can
now be passed as is to the corresponding ctors
of VCLXAccessibleComponent and specialized subclasses.

This follows earlier commits replacing the use of the
VCLXWindow classes by direct uses of the vcl::Window
subclasses inside VCLXAcces

core.git: Branch 'libreoffice-25-2' - cui/uiconfig

[Bogdan Buzea (via logerrit)]

 cui/uiconfig/ui/numberingpositionpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6848adb5de8abef993fb4836c3031765b419e960
Author: Bogdan Buzea 
AuthorDate: Thu Dec 5 20:51:32 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Dec 12 23:12:32 2024 +0100

tdf#161915 Wrong extended tip

Change-Id: I3c7be8f877f6ae0a505d6ec9a8bd786a0bd76745
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177902
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit a80b04058084826f28cfe58a66a96116383b1146)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178185
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/numberingpositionpage.ui 
b/cui/uiconfig/ui/numberingpositionpage.ui
index 8b6cb954bccb..566c4a52f251 100644
--- a/cui/uiconfig/ui/numberingpositionpage.ui
+++ b/cui/uiconfig/ui/numberingpositionpage.ui
@@ -203,7 +203,7 @@
 2
 
   
-Enter the distance from 
the left page margin to the start of all lines in the numbered paragraph that 
follow the first line.
+Enter the distance from 
the left page margin at which the numbering symbol will be aligned.
   
 
   
@@ -275,7 +275,7 @@
 
 
   
-Enter the distance 
from the left page margin at which the numbering symbol will be 
aligned.
+Enter the distance 
from the left page margin to the start of all lines in the numbered paragraph 
that follow the first line.