core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/uibase/utlui/content.cxx  |   26 --
 sw/source/uibase/utlui/glbltree.cxx |   32 +++-
 2 files changed, 35 insertions(+), 23 deletions(-)

New commits:
commit 9376df3c03d361a4c01493066db2a11a770d6cc9
Author: Noel Grandin 
AuthorDate: Mon May 27 21:34:14 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 09:03:24 2024 +0200

no need to dynamic_cast here

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index f462148fa7d8..d044b611eb59 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3664,18 +3664,24 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh)
 
 void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint)
 {
-SfxViewEventHint const*const pVEHint(dynamic_cast(&rHint));
-SwXTextView* pDyingShell = nullptr;
-if (m_pActiveShell && pVEHint && pVEHint->GetEventName() == "OnViewClosed")
-pDyingShell = 
dynamic_cast(pVEHint->GetController().get());
-if (pDyingShell && pDyingShell->GetView() == &m_pActiveShell->GetView())
+if (rHint.GetId() == SfxHintId::ThisIsAnSfxEventHint)
 {
-SetActiveShell(nullptr); // our view is dying, clear our pointers to it
-}
-else
-{
-SfxListener::Notify(rBC, rHint);
+const SfxEventHint* pEventHint = static_cast(&rHint);
+if (pEventHint->GetEventId() == SfxEventHintId::CloseView)
+{
+SfxViewEventHint const*const pVEHint(static_cast(&rHint));
+if (m_pActiveShell)
+{
+SwXTextView* pDyingShell = 
dynamic_cast(pVEHint->GetController().get());
+if (pDyingShell && pDyingShell->GetView() == 
&m_pActiveShell->GetView())
+{
+SetActiveShell(nullptr); // our view is dying, clear our 
pointers to it
+}
+}
+return;
+}
 }
+SfxListener::Notify(rBC, rHint);
 switch (rHint.GetId())
 {
 case SfxHintId::SwNavigatorUpdateTracking:
diff --git a/sw/source/uibase/utlui/glbltree.cxx 
b/sw/source/uibase/utlui/glbltree.cxx
index 448f2655727a..7d7d0104fc7b 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1164,21 +1164,27 @@ IMPL_LINK( SwGlobalTree, DialogClosedHdl, 
sfx2::FileDialogHelper*, _pFileDlg, vo
 
 void SwGlobalTree::Notify(SfxBroadcaster& rBC, SfxHint const& rHint)
 {
-SfxViewEventHint const*const pVEHint(dynamic_cast(&rHint));
-SwXTextView* pDyingShell = nullptr;
-if (m_pActiveShell && pVEHint && pVEHint->GetEventName() == "OnViewClosed")
-pDyingShell = 
dynamic_cast(pVEHint->GetController().get());
-if (pDyingShell && pDyingShell->GetView() == &m_pActiveShell->GetView())
+if (rHint.GetId() == SfxHintId::ThisIsAnSfxEventHint)
 {
-EndListening(*m_pActiveShell->GetView().GetDocShell());
-m_pActiveShell = nullptr;
-}
-else
-{
-SfxListener::Notify(rBC, rHint);
-if (rHint.GetId() == SfxHintId::SwNavigatorUpdateTracking)
-UpdateTracking();
+const SfxEventHint* pEventHint = static_cast(&rHint);
+if (pEventHint->GetEventId() == SfxEventHintId::CloseView)
+{
+SfxViewEventHint const*const pVEHint(static_cast(&rHint));
+if (m_pActiveShell)
+{
+SwXTextView* pDyingShell = 
dynamic_cast(pVEHint->GetController().get());
+if (pDyingShell && pDyingShell->GetView() == 
&m_pActiveShell->GetView())
+{
+EndListening(*m_pActiveShell->GetView().GetDocShell());
+m_pActiveShell = nullptr;
+}
+}
+return;
+}
 }
+SfxListener::Notify(rBC, rHint);
+if (rHint.GetId() == SfxHintId::SwNavigatorUpdateTracking)
+UpdateTracking();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

core.git: sd/source

[Noel Grandin (via logerrit)]

 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx   |  
 10 
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx   |  
 16 -
 sd/source/ui/accessibility/AccessibleOutlineView.cxx|  
  2 
 sd/source/ui/accessibility/AccessiblePageShape.cxx  |  
 24 -
 sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx   |  
  2 
 sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx   |  
  2 
 sd/source/ui/accessibility/AccessiblePresentationShape.cxx  |  
  2 
 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx  |  
  8 
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx|  
 10 
 sd/source/ui/accessibility/SdShapeTypes.cxx |  
 28 -
 sd/source/ui/animations/CustomAnimationDialog.cxx   |  
148 +-
 sd/source/ui/animations/CustomAnimationList.cxx |  
 18 -
 sd/source/ui/animations/CustomAnimationPane.cxx |  
 58 +--
 sd/source/ui/animations/SlideTransitionPane.cxx |  
 32 +-
 sd/source/ui/animations/motionpathtag.cxx   |  
  4 
 sd/source/ui/annotations/annotationmanager.cxx  |  
 16 -
 sd/source/ui/annotations/annotationwindow.cxx   |  
 98 +++---
 sd/source/ui/app/optsitem.cxx   |  
 12 
 sd/source/ui/app/scalectrl.cxx  |  
  4 
 sd/source/ui/app/sddll.cxx  |  
  4 
 sd/source/ui/app/sdmod.cxx  |  
  2 
 sd/source/ui/app/sdmod2.cxx |  
  6 
 sd/source/ui/app/sdpopup.cxx|  
 34 +-
 sd/source/ui/app/sdxfer.cxx |  
  6 
 sd/source/ui/app/tmplctrl.cxx   |  
  4 
 sd/source/ui/controller/displaymodecontroller.cxx   |  
 18 -
 sd/source/ui/controller/slidelayoutcontroller.cxx   |  
 24 -
 sd/source/ui/dlg/BulletAndPositionDlg.cxx   |  
107 +++
 sd/source/ui/dlg/LayerTabBar.cxx|  
  2 
 sd/source/ui/dlg/PaneShells.cxx |  
 12 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx   |  
 76 ++---
 sd/source/ui/dlg/RemoteDialog.cxx   |  
  9 
 sd/source/ui/dlg/RemoteDialogClientBox.cxx  |  
 12 
 sd/source/ui/dlg/SelectLayerDlg.cxx |  
  7 
 sd/source/ui/dlg/TemplateScanner.cxx|  
  4 
 sd/source/ui/dlg/animobjs.cxx   |  
 44 +-
 sd/source/ui/dlg/brkdlg.cxx |  
 10 
 sd/source/ui/dlg/copydlg.cxx|  
 28 -
 sd/source/ui/dlg/custsdlg.cxx   |  
 30 +-
 sd/source/ui/dlg/diactrl.cxx|  
 10 
 sd/source/ui/dlg/dlgchar.cxx|  
 12 
 sd/source/ui/dlg/dlgfield.cxx   |  
 10 
 sd/source/ui/dlg/dlgolbul.cxx   |  
  8 
 sd/source/ui/dlg/dlgpage.cxx|  
 17 -
 sd/source/ui/dlg/dlgsnap.cxx|  
 20 -
 sd/source/ui/dlg/filedlg.cxx|  
 14 
 sd/source/ui/dlg/gluectrl.cxx   |  
  8 
 sd/source/ui/dlg/headerfooterdlg.cxx|  
 56 +--
 sd/source/ui/dlg/ins_paste.cxx  |  
  7 
 sd/source/ui/dlg/inspagob.cxx   |  
  8 
 sd/source/ui/dlg/layeroptionsdlg.cxx|  
 16 -
 sd/source/ui/dlg/masterlayoutdlg.cxx|  
 12 
 sd/source/ui/dlg/morphdlg.cxx   |  
  8 
 sd/source/ui/dlg/navigatr.cxx   |  
 72 ++--
 sd/source/ui/dlg/paragr.cxx |  
 26 -
 sd/source/ui/dlg/present.cxx|  
 62 ++--
 sd/source/ui/dlg/prltempl.cxx   |  
 66 ++--
 sd/source/ui/dlg/prntopts.cxx 

core.git: extras/CustomTarget_tplpresnt.mk extras/source

[Laurent Balland (via logerrit)]

 dev/null|binary
 extras/CustomTarget_tplpresnt.mk|5 
 extras/source/templates/presnt/Freshes/META-INF/manifest.xml|5 
 extras/source/templates/presnt/Freshes/Object_1/content.xml |   73 
 extras/source/templates/presnt/Freshes/Object_1/meta.xml|5 
 extras/source/templates/presnt/Freshes/Object_1/styles.xml  |8 
 extras/source/templates/presnt/Freshes/Object_2/content.xml |   58 
 extras/source/templates/presnt/Freshes/Object_2/meta.xml|5 
 extras/source/templates/presnt/Freshes/Object_2/styles.xml  |8 
 extras/source/templates/presnt/Freshes/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Freshes/content.xml  | 1420 +--
 extras/source/templates/presnt/Freshes/meta.xml |   21 
 extras/source/templates/presnt/Freshes/styles.xml   | 1945 
+++---
 13 files changed, 1013 insertions(+), 2540 deletions(-)

New commits:
commit c2c345a6d61092560b897d1f3a8b9a92a45215e4
Author: Laurent Balland 
AuthorDate: Wed Apr 3 19:45:16 2024 +0200
Commit: Laurent Balland 
CommitDate: Tue May 28 09:47:28 2024 +0200

tdf#160712 Update Freshes template

+ change name of first master to Freshes (see tdf#158496)
+ remove Lato, Freestyle, Nimbus fonts and replace with only one defined
  in top styles: Noto Sans, Noto Sans CJK SC and Noto Sans Devanagari
+ remove ODF validator warning about table:first-row-end-column (and so
  on) attributes that were missing
+ remove unused styles
+ change Thumbnail
+ use placeholders instead of dummy text
+ remove styles.xml and meta.xml of embedded charts
+ table:
   - decrease values below 1000 as thousand separator is language
  specific
   - correct sums on colomns and rows
   - remove preview image
+ reorder master slides in same order as slides
+ use same blue everywhere with styles "Filled Blue" and "Outlined Blue"
+ update description for File > Properties: remove font topic and
  correct chart types
+ update last slide

Change-Id: I53b668bc398b7c85d93e75dfbdbf1f23e42a5c82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166932
Reviewed-by: Laurent Balland 
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Stéphane Guillou 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index a7939f983a86..3d49b0294cd4 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -37,11 +37,7 @@ extras_PRESENTATIONS_XMLFILES := \
Vivid/meta.xml  \
Yellow_Idea/meta.xml  \
Freshes/Object_1/content.xml  \
-   Freshes/Object_1/meta.xml  \
-   Freshes/Object_1/styles.xml  \
Freshes/Object_2/content.xml  \
-   Freshes/Object_2/meta.xml  \
-   Freshes/Object_2/styles.xml  \
Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png  \
Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png  \
Blueprint_Plans/Pictures/1422031A5C2E04AB7C51FB60.png  \
@@ -58,7 +54,6 @@ extras_PRESENTATIONS_XMLFILES := \
Freshes/Pictures/14910359E7B1AC100BA62FBB.jpg  \
Freshes/Pictures/16D703A637B7BBC50EDF4D24.jpg  \
Freshes/Pictures/1B8B067F7C4C059ECC323C6F.jpg  \
-   Freshes/Pictures/TablePreview1.svm  \
Grey_Elegant/Pictures/100700075D9D31963C8C0E25.jpg  \
Grey_Elegant/Pictures/100700076677E5BE1EDAF335.jpg  \
Grey_Elegant/Pictures/1192019230489F7A89351262.jpg  \
diff --git a/extras/source/templates/presnt/Freshes/META-INF/manifest.xml 
b/extras/source/templates/presnt/Freshes/META-INF/manifest.xml
index 570732257077..599842075b95 100644
--- a/extras/source/templates/presnt/Freshes/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Freshes/META-INF/manifest.xml
@@ -1,17 +1,12 @@
 
 
  
- 
- 
  
  
- 
- 
  
  
  
  
- 
  
  
  
diff --git a/extras/source/templates/presnt/Freshes/Object_1/content.xml 
b/extras/source/templates/presnt/Freshes/Object_1/content.xml
index b534f1e6589b..d9aa043d9abd 100644
--- a/extras/source/templates/presnt/Freshes/Object_1/content.xml
+++ b/extras/source/templates/presnt/Freshes/Object_1/content.xml
@@ -4,13 +4,6 @@
 
   
 
-
-  
-  /
-  
-  /
-  
-
 
   
 
@@ -21,10 +14,10 @@
 
   
 
-
+
   
   
-  
+  
 
 
   
@@ -66,7 +59,7 @@
   
 
   
-  
+  
 
   
   
@@ -78,23 +71,13 @@
   
   
 
-
 
   
   
 
-  
-
-  
-  
-Free Users
-

core.git: extras/CustomTarget_tplpresnt.mk extras/source

[Laurent Balland (via logerrit)]

 dev/null|binary
 extras/CustomTarget_tplpresnt.mk|4 
 extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml|4 
 extras/source/templates/presnt/Growing_Liberty/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Growing_Liberty/content.xml  | 2195 
+-
 extras/source/templates/presnt/Growing_Liberty/styles.xml   | 1641 
+++
 6 files changed, 1206 insertions(+), 2638 deletions(-)

New commits:
commit 2ec54f082e27d4b16540a146edde77f4874b8398
Author: Laurent Balland 
AuthorDate: Wed May 1 17:29:42 2024 +0200
Commit: Laurent Balland 
CommitDate: Tue May 28 09:48:17 2024 +0200

tdf#160712 Update Growing Liberty template

+ Use only Noto fonts
+ remove duplicate PNG pictures
+ update Thumbnail.png
+ add date/time, footer and slide # to master slides
+ replace dummy text with placeholders
+ remove object names as they are not translated and there are many 
duplicates
+ remove unused styles

Change-Id: I9982885a87c6f5fa0e33be5eb483d5ce482eea70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167032
Reviewed-by: Laurent Balland 
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Heiko Tietze 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index 3d49b0294cd4..bb58b22c483f 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -71,14 +71,10 @@ extras_PRESENTATIONS_XMLFILES := \
Grey_Elegant/Pictures/1000DC81A5787C20AABC768B7E7ACB30.svg  \
Growing_Liberty/Pictures/1780043801760C0AF0E62E0B.jpg  \
Growing_Liberty/Pictures/1780043827B5F54D1F4F498F.jpg  \
-   Growing_Liberty/Pictures/1201002002D01396E0588E1EBFBA.png  \
-   Growing_Liberty/Pictures/1201002002D04D74467F50F635D0.png  \
Growing_Liberty/Pictures/1201016A029374C9F2B8F26392AD.png  \
Growing_Liberty/Pictures/120101F00351DA39462E363D7ED3.png  \
Growing_Liberty/Pictures/120101F1029333ED1BC48076B5C4.png  \
Growing_Liberty/Pictures/120101F303548E51808DE171DA02.png  \
-   Growing_Liberty/Pictures/1201052010F5D1670B946E0C.png  \
-   Growing_Liberty/Pictures/12010520D23CB52AADBCAD4A.png  \
Growing_Liberty/Pictures/1C1C03424A6A2C92F38BC117DD3C.svg  \
Growing_Liberty/Pictures/1C34844B03422549B923A55839CC.svg  \
Growing_Liberty/Pictures/1C8F03424A6ABD021DA9BD39254C.svg  \
diff --git 
a/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml 
b/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
index bdc5b9b3272c..d8258cce4bc3 100644
--- a/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
@@ -6,15 +6,11 @@
  
  
  
- 
  
  
  
- 
- 
  
  
- 
  
  
  
diff --git 
a/extras/source/templates/presnt/Growing_Liberty/Pictures/1201002002D01396E0588E1EBFBA.png
 
b/extras/source/templates/presnt/Growing_Liberty/Pictures/1201002002D01396E0588E1EBFBA.png
deleted file mode 100644
index 130d89c8d247..
Binary files 
a/extras/source/templates/presnt/Growing_Liberty/Pictures/1201002002D01396E0588E1EBFBA.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Growing_Liberty/Pictures/1201002002D04D74467F50F635D0.png
 
b/extras/source/templates/presnt/Growing_Liberty/Pictures/1201002002D04D74467F50F635D0.png
deleted file mode 100644
index 50c474c43de4..
Binary files 
a/extras/source/templates/presnt/Growing_Liberty/Pictures/1201002002D04D74467F50F635D0.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Growing_Liberty/Pictures/1201052010F5D1670B946E0C.png
 
b/extras/source/templates/presnt/Growing_Liberty/Pictures/1201052010F5D1670B946E0C.png
deleted file mode 100644
index 52deaae5e996..
Binary files 
a/extras/source/templates/presnt/Growing_Liberty/Pictures/1201052010F5D1670B946E0C.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Growing_Liberty/Pictures/12010520D23CB52AADBCAD4A.png
 
b/extras/source/templates/presnt/Growing_Liberty/Pictures/12010520D23CB52AADBCAD4A.png
deleted file mode 100644
index f21dd274c132..
Binary files 
a/extras/source/templates/presnt/Growing_Liberty/Pictures/12010520D23CB52AADBCAD4A.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Growing_Liberty/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Growing_Liberty/Thumbnails/thumbnail.png
index de

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

[Noel Grandin (via logerrit)]

 include/svl/hint.hxx |5 +
 svx/source/form/fmshell.cxx  |2 
 sw/inc/fmtfld.hxx|3 
 sw/source/uibase/docvw/PostItMgr.cxx |7 -
 sw/source/uibase/uiview/view.cxx |  164 +--
 5 files changed, 93 insertions(+), 88 deletions(-)

New commits:
commit 25caf7dfd01534f9cdb044676c05c798fac96917
Author: Noel Grandin 
AuthorDate: Mon May 27 21:13:53 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 09:58:48 2024 +0200

avoid dynamic_cast in PostItMgr

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

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index f93c9196c9a2..98c37e4b7baa 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -157,6 +157,7 @@ enum class SfxHintId {
 SwTableHeadingChange,
 SwVirtPageNumHint,
 SwAutoFormatUsedHint,
+SwFormatField,
 
 ThisIsAnSdrHint,
 ThisIsAnSfxEventHint
@@ -246,6 +247,7 @@ inline std::basic_ostream & operator <<(
 return stream << "SwNavigatorSelectOutlinesWithSelections";
 case SfxHintId::SwCollectTextMarks: return stream << "SwCollectTextMarks";
 case SfxHintId::SwCollectTextTOXMarksForLayout: return stream << 
"SwCollectTextTOXMarksForLayout";
+case SfxHintId::SwFormatField: return stream << "SwFormatField";
 case SfxHintId::ThisIsAnSdrHint: return stream << "SdrHint";
 default: return stream << "unk(" << std::to_string(int(id)) << ")";
 }
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index c9f7d756c0b9..5df4f0beaf57 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -196,7 +196,8 @@ class SW_DLLPUBLIC SwFormatFieldHint final : public SfxHint
 
 public:
 SwFormatFieldHint( const SwFormatField* pField, SwFormatFieldHintWhich 
nWhich, const SwView* pView = nullptr)
-: m_pField(pField)
+: SfxHint(SfxHintId::SwFormatField)
+, m_pField(pField)
 , m_nWhich(nWhich)
 , m_pView(pView)
 {}
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index 95eaea2a5557..8a2ab40317ed 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -355,8 +355,9 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
 }
 }
 }
-else if ( const SwFormatFieldHint * pFormatHint = dynamic_cast(&rHint) )
+else if ( rHint.GetId() == SfxHintId::SwFormatField )
 {
+const SwFormatFieldHint * pFormatHint = static_cast(&rHint);
 SwFormatField* pField = const_cast ( 
pFormatHint->GetField() );
 switch ( pFormatHint->Which() )
 {
@@ -1470,9 +1471,9 @@ class FieldDocWatchingStack : public SfxListener
 
 virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) override
 {
-const SwFormatFieldHint* pHint = dynamic_cast(&rHint);
-if (!pHint)
+if ( rHint.GetId() != SfxHintId::SwFormatField )
 return;
+const SwFormatFieldHint* pHint = static_cast(&rHint);
 
 bool bAllInvalidated = false;
 if (pHint->Which() == SwFormatFieldHintWhich::REMOVED)
commit e7fcca88ce9acc78a402c5929d063e3cfc573be4
Author: Noel Grandin 
AuthorDate: Mon May 27 19:03:28 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 09:58:41 2024 +0200

avoid dynamic_cast in SwView::Notify

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

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index e8971934c7d4..f93c9196c9a2 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -61,6 +61,8 @@ enum class SfxHintId {
 BasicStart,
 BasicStop,
 
+// SVX
+FmDesignModeChanged,
 // SVX edit source
 EditSourceParasMoved,
 EditSourceSelectionChanged,
@@ -195,6 +197,7 @@ inline std::basic_ostream & operator <<(
 case SfxHintId::BasicInfoWanted: return stream << "BasicInfoWanted";
 case SfxHintId::BasicStart: return stream << "BasicStart";
 case SfxHintId::BasicStop: return stream << "BasicStop";
+case SfxHintId::FmDesignModeChanged: return stream << 
"FmDesignModeChanged";
 case SfxHintId::EditSourceParasMoved: return stream << 
"EditSourceParasMoved";
 case SfxHintId::EditSourceSelectionChanged: return stream << 
"EditSourceSelectionChanged";
 case SfxHintId::ScDataChanged: return stream << "ScDataChanged";
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 10616b67d3d0..2cedf38ba9b1 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -119,7 +119,7 @@ using namespace ::com::sun::star::form::runtime;
 using namespace ::svxform;
 
 FmDesignModeChangedHint::FmDesignModeChangedHint( bool bDesMode )
-:m_bDesignMode( bDe

core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/uibase/app/docstyle.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 072bd5d40a149bd50e95d24fc54417094193077e
Author: Noel Grandin 
AuthorDate: Mon May 27 21:23:21 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 11:16:27 2024 +0200

no need to dynamic_cast here

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

diff --git a/sw/source/uibase/app/docstyle.cxx 
b/sw/source/uibase/app/docstyle.cxx
index 7cfd6f24fef1..f71002c09d13 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -136,11 +136,12 @@ public:
 
 void Notify(SfxBroadcaster&, const SfxHint& rHint) override
 {
-auto pHint = dynamic_cast(&rHint);
-if (!pHint)
+auto nId = rHint.GetId();
+if (nId != SfxHintId::StyleSheetModified && nId != 
SfxHintId::StyleSheetModifiedExtended
+&& nId != SfxHintId::StyleSheetErased)
 return;
+auto pHint = static_cast(&rHint);
 
-auto nId = pHint->GetId();
 auto pDocStyleSheet = pHint->GetStyleSheet();
 const SfxStyleSheetModifiedHint* pExtendedHint = nullptr;
 if (nId == SfxHintId::StyleSheetModifiedExtended)
@@ -3367,10 +3368,9 @@ void SwStyleSheetIterator::InvalidateIterator()
 void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
 // search and remove from View-List!!
-const SfxStyleSheetHint* pStyleSheetHint = dynamic_cast(&rHint);
-if( pStyleSheetHint &&
-SfxHintId::StyleSheetErased == pStyleSheetHint->GetId() )
+if( SfxHintId::StyleSheetErased == rHint.GetId() )
 {
+const SfxStyleSheetHint* pStyleSheetHint = static_cast(&rHint);
 SfxStyleSheetBase* pStyle = pStyleSheetHint->GetStyleSheet();
 
 if (pStyle)

core.git: 2 commits - sd/source

[Xisco Fauli (via logerrit)]

 sd/source/ui/inc/ViewShellBase.hxx   |2 +-
 sd/source/ui/table/TableDesignPane.cxx   |   14 +-
 sd/source/ui/view/ViewShellBase.cxx  |4 ++--
 sd/source/ui/view/viewoverlaymanager.cxx |   10 ++
 4 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit b81ff51a8ccac942effdd309f014591604376ecc
Author: Xisco Fauli 
AuthorDate: Mon May 27 20:04:31 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 28 11:18:02 2024 +0200

sd: use SAL_RET_MAYBENULL in GetDrawView()

Directly return nullptr instead of calling SfxViewShell::GetDrawView()
which return nullptr to make it obvious

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

diff --git a/sd/source/ui/inc/ViewShellBase.hxx 
b/sd/source/ui/inc/ViewShellBase.hxx
index cdec6d8a6b02..1e1517eb6550 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -153,7 +153,7 @@ public:
 virtual bool PrepareClose (bool bUI = true) override;
 virtual void WriteUserData (OUString&, bool bBrowse = false) override;
 virtual void ReadUserData (const OUString&, bool bBrowse = false) override;
-virtual SdrView* GetDrawView() const override;
+SAL_RET_MAYBENULL virtual SdrView* GetDrawView() const override;
 
 /** When  is given, then the mouse shape is set to hour glass (or
 whatever the busy shape looks like on the system.)
diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index bf125e126b0d..3672f5655bf6 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -816,8 +816,8 @@ SdrView* ViewShellBase::GetDrawView() const
 ViewShell* pShell = GetMainViewShell().get();
 if (pShell != nullptr)
 return pShell->GetDrawView ();
-else
-return SfxViewShell::GetDrawView();
+
+return nullptr;
 }
 
 void ViewShellBase::SetBusyState (bool bBusy)
commit f60fd89e3d4ee60d9b9d0a02ed96c36ff8667188
Author: Xisco Fauli 
AuthorDate: Mon May 27 22:12:38 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 28 11:17:56 2024 +0200

sd: warning C6011: Dereferencing NULL pointer

Change-Id: Id073e5d340fc91836b4689fb3e7a558ef3263e56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168119
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sd/source/ui/table/TableDesignPane.cxx 
b/sd/source/ui/table/TableDesignPane.cxx
index 1b9262d954e3..54797bb3894c 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -379,9 +379,13 @@ void TableDesignWidget::EditStyle(const OUString& rCommand)
 aBoxInfoItem.SetTable(false);
 aNewAttr.Put(aBoxInfoItem);
 
+SdrView* pDrawView = mrBase.GetDrawView();
+if (!pDrawView)
+return;
+
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
 ScopedVclPtr pDlg(pFact ? 
pFact->CreateSvxFormatCellsDialog(
-mrBase.GetFrameWeld(), aNewAttr, mrBase.GetDrawView()->GetModel(), 
true) : nullptr);
+mrBase.GetFrameWeld(), aNewAttr, pDrawView->GetModel(), true) : 
nullptr);
 if (pDlg && pDlg->Execute() == RET_OK)
 {
 endTextEditForStyle(xTableStyle);
@@ -452,10 +456,9 @@ void TableDesignWidget::ApplyStyle()
 if( sStyleName.isEmpty() )
 return;
 
-SdrView* pView = mrBase.GetDrawView();
 if( mxSelectedTable.is() )
 {
-if( pView )
+if (SdrView* pView = mrBase.GetDrawView())
 {
 if (pView->IsTextEdit())
 pView->SdrEndTextEdit();
@@ -693,8 +696,9 @@ void TableDesignWidget::endTextEditForStyle(const 
Reference& rStyle)
 if (xTableStyle != rStyle)
 return;
 
-if (mrBase.GetDrawView()->IsTextEdit())
-mrBase.GetDrawView()->SdrEndTextEdit();
+SdrView* pDrawView = mrBase.GetDrawView();
+if (pDrawView && pDrawView->IsTextEdit())
+pDrawView->SdrEndTextEdit();
 }
 
 void TableDesignWidget::addListener()
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx 
b/sd/source/ui/view/viewoverlaymanager.cxx
index bd2e6be970f8..dfc6c61759fc 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -479,8 +479,9 @@ IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl, void*, 
void)
 bool bChanges = DisposeTags();
 bChanges |= CreateTags();
 
-if( bChanges && mrBase.GetDrawView() )
-static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles();
+SdrView* pDrawView = mrBase.GetDrawView();
+if( bChanges && pDrawView )
+static_cast< ::sd::View* >( pDrawView )->updateHandles();
 }
 
 bool ViewOverlayManager::CreateTags()
@@ -490,14 +491,15 @@ bool ViewOverlayManager::CreateTags()
 std::shared_ptr 

core.git: tools/source

[Caolán McNamara (via logerrit)]

 tools/source/generic/poly.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 550e50c529f8be00320cfd7ab1c305d9e6912dea
Author: Caolán McNamara 
AuthorDate: Mon May 27 20:42:10 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue May 28 13:10:34 2024 +0200

ofz#69290 Integer-overflow

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

diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 81419f7e70c3..b6b00bc2ca34 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -179,8 +179,7 @@ ImplPolygon::ImplPolygon( const Point& rCenter, tools::Long 
nRadX, tools::Long n
 if (!bOverflow)
 {
 nPoints = std::clamp(
-( M_PI * ( 1.5 * ( nRadX + nRadY ) -
-   sqrt( static_cast(std::abs(nRadXY)) ) ) ),
+( M_PI * ( 1.5 * ( nRadX + nRadY ) - sqrt( std::fabs(nRadXY) ) 
) ),
 32.0, 256.0 );
 }
 else
@@ -245,8 +244,7 @@ ImplPolygon::ImplPolygon(const tools::Rectangle& rBound, 
const Point& rStart, co
 if (!bOverflow)
 {
 nPoints = std::clamp(
-( M_PI * ( 1.5 * ( nRadX + nRadY ) -
-   sqrt( static_cast(std::abs(nRadXY)) ) ) ),
+( M_PI * ( 1.5 * ( nRadX + nRadY ) - sqrt( std::fabs(nRadXY) ) 
) ),
 32.0, 256.0 );
 }
 else

core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx  |  276 +-
 sw/source/filter/ww8/docxexport.cxx   |   82 +++
 sw/source/filter/ww8/docxexportfilter.cxx |2 
 sw/source/filter/ww8/docxsdrexport.cxx|   63 +++--
 sw/source/filter/ww8/docxtableexport.cxx  |6 
 sw/source/filter/ww8/docxtablestyleexport.cxx |7 
 sw/source/filter/ww8/rtfattributeoutput.cxx   |   28 +-
 sw/source/filter/ww8/rtfexport.cxx|8 
 sw/source/filter/ww8/rtfexportfilter.cxx  |7 
 sw/source/filter/ww8/rtfsdrexport.cxx |2 
 sw/source/filter/ww8/writerwordglue.cxx   |2 
 sw/source/filter/ww8/wrtw8esh.cxx |   12 -
 sw/source/filter/ww8/wrtw8nds.cxx |   38 +--
 sw/source/filter/ww8/wrtw8sty.cxx |4 
 sw/source/filter/ww8/wrtww8.cxx   |   36 +--
 sw/source/filter/ww8/wrtww8gr.cxx |4 
 sw/source/filter/ww8/ww8atr.cxx   |   10 
 sw/source/filter/ww8/ww8par.cxx   |   64 +++---
 sw/source/filter/ww8/ww8par2.cxx  |6 
 sw/source/filter/ww8/ww8par3.cxx  |   46 ++--
 sw/source/filter/ww8/ww8par4.cxx  |8 
 sw/source/filter/ww8/ww8par5.cxx  |   28 +-
 sw/source/filter/ww8/ww8scan.cxx  |2 
 sw/source/filter/ww8/ww8toolbar.cxx   |   14 -
 24 files changed, 381 insertions(+), 374 deletions(-)

New commits:
commit 71ce1181942741d0899d9dbbf035632dffe2b323
Author: Noel Grandin 
AuthorDate: Wed May 22 12:45:39 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 13:26:37 2024 +0200

loplugin:ostr in sw/../ww8

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

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 682959b33f33..1532ecf72c81 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -482,7 +482,7 @@ static void 
checkAndWriteFloatingTables(DocxAttributeOutput& rDocxAttributeOutpu
 const SfxGrabBagItem* pTableGrabBag = 
pTableFormat->GetAttrSet().GetItem(RES_FRMATR_GRABBAG);
 const std::map & rTableGrabBag = 
pTableGrabBag->GetGrabBag();
 // no grabbag?
-if (rTableGrabBag.find("TablePosition") == rTableGrabBag.end())
+if (rTableGrabBag.find(u"TablePosition"_ustr) == rTableGrabBag.end())
 {
 if (pFrameFormat->GetFlySplit().GetValue())
 {
@@ -577,7 +577,7 @@ sal_Int32 
DocxAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t p
 {
 const SfxGrabBagItem& rParaGrabBag = static_cast(*pItem);
 const std::map& rMap = 
rParaGrabBag.GetGrabBag();
-bEndParaSdt = m_aParagraphSdt.m_bStartedSdt && 
rMap.contains("ParaSdtEndBefore");
+bEndParaSdt = m_aParagraphSdt.m_bStartedSdt && 
rMap.contains(u"ParaSdtEndBefore"_ustr);
 }
 }
 }
@@ -1110,12 +1110,12 @@ bool DocxAttributeOutput::TextBoxIsFramePr(const 
SwFrameFormat& rFrameFormat)
 return false;
 
 uno::Reference 
xPropSetInfo(xPropertySet->getPropertySetInfo());
-if (!xPropSetInfo.is() || 
!xPropSetInfo->hasPropertyByName("FrameInteropGrabBag"))
+if (!xPropSetInfo.is() || 
!xPropSetInfo->hasPropertyByName(u"FrameInteropGrabBag"_ustr))
 return false;
 
 bool bRet = false;
 uno::Sequence propList;
-xPropertySet->getPropertyValue("FrameInteropGrabBag") >>= propList;
+xPropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= propList;
 auto pProp = std::find_if(std::cbegin(propList), std::cend(propList),
 [](const beans::PropertyValue& rProp) { return rProp.Name == 
"ParaFrameProperties"; });
 if (pProp != std::cend(propList))
@@ -1718,7 +1718,7 @@ void DocxAttributeOutput::EndParagraphProperties(const 
SfxItemSet& rParagraphMar
 SwTextNode* pTextNode = m_rExport.m_pCurPam->GetPointNode().GetTextNode();
 std::map aStatements;
 if (pTextNode)
-aStatements = SwRDFHelper::getTextNodeStatements("urn:bails", 
*pTextNode);
+aStatements = SwRDFHelper::getTextNodeStatements(u"urn:bails"_ustr, 
*pTextNode);
 if (!aStatements.empty())
 {
 m_pSerializer->startElementNS(XML_w, XML_smartTag,
@@ -2042,7 +2042,7 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, 
sal_Int32 nPos, sal_In
 m_pSerializer->startElementNS(XML_w, XML_r);
 if(GetExport().m_bTabInTOC && m_pHyperlinkAttrList.is())
 {
-RunText("  ") ;
+RunText(u" "_ustr) ;
 }
 m_pSerializer->mergeTopMarks(Tag_EndRun_1, 
sax_fastparser::MergeMarks::PREPEND); // merges with "postponed run start", see 
above
 
@@ -2464,15 +2464,15 @@ void DocxAttributeOutput::WriteFFData(  const 
FieldInfos& rInfos )
 FieldMark

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

[Andras Timar (via logerrit)]

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

New commits:
commit 5357f69c271ff0c0a7d10dc3371047f5200f0187
Author: Andras Timar 
AuthorDate: Tue May 28 13:28:27 2024 +0200
Commit: Andras Timar 
CommitDate: Tue May 28 13:28:27 2024 +0200

Bump version to 24.04.3.2

Change-Id: Ic7eeba9c36ab51ea30855b3cf9e4495bd7356a89

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

core.git: Changes to 'distro/collabora/co-24.04.3'

[Andras Timar (via logerrit)]

New branch 'distro/collabora/co-24.04.3' available with the following commits:

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

[László Németh (via logerrit)]

Tag 'co-24.04.3-2' created by Andras Timar  at 
2024-05-28 11:29 +

co-24.04.3-2

Changes since cp-24.04.1-2-3:
---
 0 files changed
---

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

[Juan José González (via logerrit)]

Tag 'co-24.04.3-2' created by Andras Timar  at 
2024-05-28 11:29 +

co-24.04.3-2

Changes since cp-24.04.1-2-1:
---
 0 files changed
---

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

[Christian Lohmaier (via logerrit)]

Tag 'co-24.04.3-2' created by Andras Timar  at 
2024-05-28 11:29 +

co-24.04.3-2

Changes since cp-24.04.1-2-1:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

Tag 'co-24.04.3-2' created by Andras Timar  at 
2024-05-28 11:29 +

co-24.04.3-2

Changes since cp-24.04.3-1-18:
---
 0 files changed
---

core.git: Branch 'feature/cib_contract49c' - 2 commits - sd/source

[Sarper Akdemir (via logerrit)]

 sd/source/ui/func/fuoltext.cxx|   25 +
 sd/source/ui/view/NotesPanelViewShell.cxx |3 +--
 2 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit 4655057fd8fdfe55855bd84daf30d4079012cefa
Author: Sarper Akdemir 
AuthorDate: Fri May 24 12:06:08 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Tue May 28 13:45:40 2024 +0200

related tdf#33603: sd: outlineview: update current page on moving cursor

The "early rejection test" removed here is a historical
artifact when UpdateForKeyPress was created.

in the current state it checked if
pOutlineViewShell->GetActualPage() was different from
itself.

In the OutlineViewShell::UpdatePreview, there's an
additional check if we have actually moved to a new page, so
we can just safely remove this.

Also fixes Notes Pane not properly updating on Outline View Mode

Change-Id: Ic9de2e7302e76260809f90360533f0bfe6e05d2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168017
Reviewed-by: Sarper Akdemir 
Tested-by: Jenkins
(cherry picked from commit 8fc4eb1149e58ed5bcc4bb2b57807cdc92d93785)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168062
Tested-by: allotropia jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 0068f77d4053..6cebc1c55cb4 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -85,30 +85,7 @@ const sal_uInt16 SidArray[] = {
 void FuOutlineText::UpdateForKeyPress (const KeyEvent& rEvent)
 {
 FuSimpleOutlinerText::UpdateForKeyPress(rEvent);
-
-bool bUpdatePreview = true;
-switch (rEvent.GetKeyCode().GetCode())
-{
-// When just the cursor has been moved the preview only changes when
-// it moved to entries of another page.  To prevent unnecessary
-// updates we check this here.  This is an early rejection test, so
-// missing a key is not a problem.
-case KEY_UP:
-case KEY_DOWN:
-case KEY_LEFT:
-case KEY_RIGHT:
-case KEY_HOME:
-case KEY_END:
-case KEY_PAGEUP:
-case KEY_PAGEDOWN:
-{
-SdPage* pCurrentPage = pOutlineViewShell->GetActualPage();
-bUpdatePreview = (pCurrentPage != 
pOutlineViewShell->GetActualPage());
-}
-break;
-}
-if (bUpdatePreview)
-pOutlineViewShell->UpdatePreview (pOutlineViewShell->GetActualPage());
+pOutlineViewShell->UpdatePreview(pOutlineViewShell->GetActualPage());
 }
 
 /**
commit f12701c1642029e614a50f6deabd9ce714b1716b
Author: Sarper Akdemir 
AuthorDate: Fri May 24 10:41:08 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Tue May 28 13:45:32 2024 +0200

tdf#33603: sd: notes pane: properly handle movement keys

Makes it so that notes pane handles some previously
incorrectly handled keys itself. e.g. PageUp & PageDown

Change-Id: I19f73fa2782900a752889544dcc79fc180ee52d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168008
Reviewed-by: Sarper Akdemir 
Tested-by: Jenkins
(cherry picked from commit dc208a0de04b29a53fe8384043f1fc925761a912)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168061
Tested-by: allotropia jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/sd/source/ui/view/NotesPanelViewShell.cxx 
b/sd/source/ui/view/NotesPanelViewShell.cxx
index 7bc46a5464b6..74698092dd2d 100644
--- a/sd/source/ui/view/NotesPanelViewShell.cxx
+++ b/sd/source/ui/view/NotesPanelViewShell.cxx
@@ -1419,7 +1419,7 @@ bool NotesPanelViewShell::KeyInput(const KeyEvent& rKEvt, 
::sd::Window* pWin)
 {
 bool bReturn = false;
 
-if (pWin == nullptr && HasCurrentFunction())
+if (HasCurrentFunction())
 {
 bReturn = GetCurrentFunction()->KeyInput(rKEvt);
 }
@@ -1438,7 +1438,6 @@ bool NotesPanelViewShell::KeyInput(const KeyEvent& rKEvt, 
::sd::Window* pWin)
 Invalidate(SID_STYLE_WATERCAN);
 Invalidate(SID_STYLE_FAMILY5);
 
-vcl::KeyCode aKeyGroup(rKEvt.GetKeyCode().GetGroup());
 return bReturn;
 }
 

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

[Sarper Akdemir (via logerrit)]

 sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx |   30 
--
 1 file changed, 26 insertions(+), 4 deletions(-)

New commits:
commit ef71c6529f694a1714f15b3fb018830211253024
Author: Sarper Akdemir 
AuthorDate: Fri May 24 15:11:24 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Tue May 28 13:45:51 2024 +0200

related tdf#33603: update current page on SlideSorter view

Make SlideSorterView update the current page properly when it is the
MainViewShell.

Also fixes Notes Pane not properly updating on SlideSorter
view mode.

Change-Id: If4fed4e84951cb4a1707874b288ac46e6d5c26da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168022
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir 
(cherry picked from commit a50b13f357ffa403542a09de0552c048d6374011)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168063
Reviewed-by: Thorsten Behrens 
Tested-by: allotropia jenkins 

diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index e8fc847a4a7b..684cb2da5f7e 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -166,7 +168,29 @@ void CurrentSlideManager::SetCurrentSlideAtViewShellBase 
(const SharedPageDescri
 OSL_ASSERT(rpDescriptor);
 
 ViewShellBase* pBase = mrSlideSorter.GetViewShellBase();
-if (pBase != nullptr)
+if(!pBase)
+return;
+
+if (mrSlideSorter.GetViewShell() && 
mrSlideSorter.GetViewShell()->IsMainViewShell())
+{
+SdDrawDocument* pDoc = pBase->GetDocument();
+if (!pDoc)
+return;
+
+// deselect all pages
+for (sal_uInt16 i = 0; i < pDoc->GetSdPageCount(PageKind::Standard); 
i++)
+pDoc->SetSelected(pDoc->GetSdPage(i, PageKind::Standard), false);
+
+// select the given page
+pDoc->SetSelected(rpDescriptor->GetPage(), true);
+DrawController* pDrawController = pBase->GetDrawController();
+if (!pDrawController)
+return;
+
+pDrawController->FireSelectionChangeListener();
+pDrawController->FireSwitchCurrentPage(rpDescriptor->GetPage());
+}
+else
 {
 DrawViewShell* pDrawViewShell = dynamic_cast(
 pBase->GetMainViewShell().get());
@@ -245,9 +269,7 @@ IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback, 
Timer *, void)
 // it does not work always correctly (after some kinds of model
 // changes).  Therefore, we call DrawViewShell::SwitchPage(),
 // too.
-ViewShell* pViewShell = mrSlideSorter.GetViewShell();
-if (pViewShell==nullptr || ! pViewShell->IsMainViewShell())
-SetCurrentSlideAtViewShellBase(mpCurrentSlide);
+SetCurrentSlideAtViewShellBase(mpCurrentSlide);
 SetCurrentSlideAtXController(mpCurrentSlide);
 }
 }

core.git: Makefile.in

[Christian Lohmaier (via logerrit)]

 Makefile.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9ec0fa7ec3a62586f95e38f070b0d95e85fce6c3
Author: Christian Lohmaier 
AuthorDate: Sun May 5 18:43:53 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 28 14:10:02 2024 +0200

use internal python for gbuild-to-ide on windows and python=fully-internal

env python3 likely won't work in that case

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

diff --git a/Makefile.in b/Makefile.in
index ac3e8aafb529..977e70da615e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -522,6 +522,7 @@ define gb_Top_GbuildToIdeIntegration
 $(1)-ide-integration: gbuildtojson $(if $(filter 
MACOSX,$(OS_FOR_BUILD)),python3.allbuild)
cd $(SRCDIR) && \
$(if $(filter 
MACOSX,$(OS_FOR_BUILD)),PATH="$(INSTROOT_FOR_BUILD)/Frameworks/LibreOfficePython.framework/Versions/Current/bin:$(PATH)")
 \
+   $(if $(filter 
WNT,$(OS_FOR_BUILD)$(PYTHON_FOR_BUILD)),$(INSTROOT_FOR_BUILD)/program/python.exe)
 \
bin/gbuild-to-ide --ide $(1) --make $(MAKE)
 
 endef

core.git: odk/settings

[Christian Lohmaier (via logerrit)]

 odk/settings/settings.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9b072ee21a31127b008323749fe343f406da0fe4
Author: Christian Lohmaier 
AuthorDate: Mon May 27 12:16:06 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 28 14:10:29 2024 +0200

odk: don't run compiler -dumpversion for eaach include of settings.mk

VAR=$(shell … ) will run the shell command each time the line is parsed,
i.e. for each include of the settings.mk from the examples. Use
simple/one-time expansion using := avoids that.

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

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 13289c96db6e..a479dd702fae 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -319,7 +319,7 @@ SHAREDLIB_EXT=so
 SHAREDLIB_PRE=lib
 SHAREDLIB_OUT=$(OUT_LIB)
 
-GCC_VERSION=$(shell $(CC) -dumpversion)
+GCC_VERSION:=$(shell $(CC) -dumpversion)
 
 COMID=gcc3
 CPPU_ENV=gcc3
@@ -530,7 +530,7 @@ SHAREDLIB_EXT=so
 SHAREDLIB_PRE=lib
 SHAREDLIB_OUT=$(OUT_LIB)
 
-GCC_VERSION=$(shell $(CC) -dumpversion)
+GCC_VERSION:=$(shell $(CC) -dumpversion)
 
 COMID=gcc3
 CPPU_ENV=gcc3

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

[Bayram Çiçek (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   29 +
 1 file changed, 29 insertions(+)

New commits:
commit a3f4d31783721f61b8436c5f8032321b4c97de1a
Author: Bayram Çiçek 
AuthorDate: Mon May 27 12:14:56 2024 +0300
Commit: Szymon Kłos 
CommitDate: Tue May 28 14:11:23 2024 +0200

add AutoFill menu items - LOK_CALLBACK_CONTEXT_MENU

- added AutoFill menu items "Copy cells" and "Fill series"
- send information with LOK_CALLBACK_CONTEXT_MENU

Signed-off-by: Bayram Çiçek 
Change-Id: I3118f5535f74cfa4ab049e643930df83512b6850
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168086
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1a36f83d88a8..b5cd268e4cc4 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2366,7 +2366,36 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& 
rMEvt )
 }
 }
 else
+{
 mrViewData.GetDispatcher().Execute( FID_FILL_AUTO, 
SfxCallMode::SLOT | SfxCallMode::RECORD );
+
+// prepare AutoFill menu items for "Copy Cells" and "Fill Series"
+ScTabViewShell* pViewShell = mrViewData.GetViewShell();
+boost::property_tree::ptree aMenu;
+boost::property_tree::ptree aItemTree;
+
+aItemTree.put("text", "~Copy Cells");
+aItemTree.put("type", "command");
+aItemTree.put("command", ".uno:AutoFill?Copy:bool=true");
+aItemTree.put("enabled", "true");
+aMenu.push_back(std::make_pair("", aItemTree));
+
+aItemTree.put("text", "~Fill Series");
+aItemTree.put("type", "command");
+aItemTree.put("command", ".uno:AutoFill?Copy:bool=false");
+aItemTree.put("enabled", "true");
+aMenu.push_back(std::make_pair("", aItemTree));
+aItemTree.clear();
+
+boost::property_tree::ptree aRoot;
+aRoot.add_child("menu", aMenu);
+
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aRoot, true);
+
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CONTEXT_MENU,
+   OString(aStream.str()));
+}
 }
 else if (mrViewData.GetFillMode() == ScFillMode::MATRIX)
 {

core.git: sw/source

[Andrea Gelmini (via logerrit)]

 sw/source/writerfilter/dmapper/DomainMapper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6426583d0e73ea3d38c4b3baa80b7b10c020996d
Author: Andrea Gelmini 
AuthorDate: Tue May 28 10:59:47 2024 +0200
Commit: Julien Nabet 
CommitDate: Tue May 28 14:39:49 2024 +0200

Fix typo

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

diff --git a/sw/source/writerfilter/dmapper/DomainMapper.cxx 
b/sw/source/writerfilter/dmapper/DomainMapper.cxx
index 25c262b10ad9..3af9d5d85ff6 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper.cxx
@@ -147,7 +147,7 @@ DomainMapper::DomainMapper( const uno::Reference< 
uno::XComponentContext >& xCon
 
 // Enable only for new documents, since pasting from clipboard can 
influence existing doc
 m_pImpl->SetDocumentSettingsProperty("NoNumberingShowFollowBy", 
uno::Any(true));
-//paint backgound frames after header/footer when anchored in body
+//paint background frames after header/footer when anchored in body
 
m_pImpl->SetDocumentSettingsProperty("PaintHellOverHeaderFooter",uno::Any(true));
 }
 

help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/scalc/01/04060109.xhp |7 +
 source/text/scalc/01/common_func.xhp  |3 
 source/text/scalc/01/ful_func.xhp |3 
 source/text/scalc/01/func_unique.xhp  |4 
 source/text/scalc/01/func_xlookup.xhp |  156 ++
 source/text/scalc/01/func_xmatch.xhp  |   14 +--
 6 files changed, 67 insertions(+), 120 deletions(-)

New commits:
commit 390dd2b9aaf82a2d859224173364ae207c51ba62
Author: Olivier Hallot 
AuthorDate: Sun May 26 14:01:35 2024 -0300
Commit: Olivier Hallot 
CommitDate: Tue May 28 14:44:48 2024 +0200

tdf#159872 Review Help XLOOKUP XMATCH functions

From comments in by Regina and Ady in

https://community.documentfoundation.org/t/comments-on-help-for-new-xlookup-fucntion/12086?u=ohallot
and following.

+ Note on "case sensitive"
+ Details on array and range
+ Fix #N/A to "returns the #N/A error"
+ Reworked examples (re-use HLOOKUP table)
+ Grammar and linguistics here and there
+ Fix syntax definition
+ Fix "Not found" definition
+ Fix MatchType using verb "attempt"
+ Position of optional arguments
+ Longer user cases to be addressed in wiki

Note: the function clones Excel XLOOKUP but it is not a copy. Therefore
the name of the arguments were set to differentiate from Excel. The
Calc function arguments usual naming were mostly mnemonic and
not verbose. The current XLOOKUP names in the function wizard is
verbose and has several words. Review is needed.

Patch set 2: fix xml DTD
Patch set 3: XMATCH
+ Reworked example (re-use HLOOKUP table)
+ Link to MATCH
+ Fix function syntax
+ Refactor
Patch set 4:
+ typos
+ Fix case insensitive

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

diff --git a/source/text/scalc/01/04060109.xhp 
b/source/text/scalc/01/04060109.xhp
index fe95792bbd..c0375dee07 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -446,7 +446,9 @@
  For an explanation on 
the parameters, see: VLOOKUP (columns and rows are 
exchanged)
  
  
- Suppose we 
have built a small database table occupying the cell range A1:DO4 and 
containing basic information about 118 chemical elements. The first column 
contains the row headings “Element”, “Symbol”, “Atomic Number”, and “Relative 
Atomic Mass”. Subsequent columns contain the relevant information for each of 
the elements, ordered left to right by atomic number. For example, cells B1:B4 
contain “Hydrogen”, “H”, “1” and “1.008”, while cells DO1:DO4 contain 
“Oganesson”, “Og”, “118”, and “294”.
+
+ 
+Suppose we have 
built a small database table occupying the cell range A1:DO4 and containing 
basic information about 118 chemical elements. The first column contains the 
row headings “Element”, “Symbol”, “Atomic Number”, and “Relative Atomic Mass”. 
Subsequent columns contain the relevant information for each of the elements, 
ordered left to right by atomic number. For example, cells B1:B4 contain 
“Hydrogen”, “H”, “1” and “1.008”, while cells DO1:DO4 contain “Oganesson”, 
“Og”, “118”, and “294”.
 


@@ -563,7 +565,8 @@
294

 
-
+
+ 
 =HLOOKUP("Lead"; $A$1:$DO$4; 2; 0) 
returns “Pb”, the symbol for lead.
  =HLOOKUP("Gold"; $A$1:$DO$4; 3; 0) 
returns 79, the atomic number for gold.
  =HLOOKUP("Carbon"; $A$1:$DO$4; 4; 0) 
returns 12.011, the relative atomic mass of carbon.
diff --git a/source/text/scalc/01/common_func.xhp 
b/source/text/scalc/01/common_func.xhp
index 8a578b4f46..4a3ac7a323 100644
--- a/source/text/scalc/01/common_func.xhp
+++ b/source/text/scalc/01/common_func.xhp
@@ -36,5 +36,8 @@
 
 This function ignores any text or 
empty cell within a data range. If you suspect wrong results from this 
function, look for text in the data ranges. To highlight text contents in a 
data range, use the value 
highlighting feature.
 
+
+Any of the optional arguments can be 
omitted. An optional argument is required to be preceded by the preceding 
separators.
+
 
 
diff --git a/source/text/scalc/01/ful_func.xhp 
b/source/text/scalc/01/ful_func.xhp
index 1681a65bc6..c31872347b 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -93,5 +93,8 @@
 
 This function 
is always recalculated whenever a recalculation occurs.
 
+
+  The function is always case 
insensitive, independent from the setting of Case sensitive 
checkbox in %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Calc - 
Calculate.
+
 
 
diff --git a/source/text/scalc/01/func_unique.xhp 
b/source/text/scalc/01/func_unique.xhp
index 8c709cfb44..845a64f193 100644
--- a/source/text/scalc/01/func_unique.xhp
+++ b/source/text

core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 59104b191c386198c2c682ed8b650b2bb9a9f60f
Author: Olivier Hallot 
AuthorDate: Tue May 28 09:44:48 2024 -0300
Commit: Gerrit Code Review 
CommitDate: Tue May 28 14:44:48 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 390dd2b9aaf82a2d859224173364ae207c51ba62
  - tdf#159872 Review Help XLOOKUP XMATCH functions

From comments in by Regina and Ady in

https://community.documentfoundation.org/t/comments-on-help-for-new-xlookup-fucntion/12086?u=ohallot
and following.

+ Note on "case sensitive"
+ Details on array and range
+ Fix #N/A to "returns the #N/A error"
+ Reworked examples (re-use HLOOKUP table)
+ Grammar and linguistics here and there
+ Fix syntax definition
+ Fix "Not found" definition
+ Fix MatchType using verb "attempt"
+ Position of optional arguments
+ Longer user cases to be addressed in wiki

Note: the function clones Excel XLOOKUP but it is not a copy. Therefore
the name of the arguments were set to differentiate from Excel. The
Calc function arguments usual naming were mostly mnemonic and
not verbose. The current XLOOKUP names in the function wizard is
verbose and has several words. Review is needed.

Patch set 2: fix xml DTD
Patch set 3: XMATCH
+ Reworked example (re-use HLOOKUP table)
+ Link to MATCH
+ Fix function syntax
+ Refactor
Patch set 4:
+ typos
+ Fix case insensitive

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

diff --git a/helpcontent2 b/helpcontent2
index 8cba63bac083..390dd2b9aaf8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8cba63bac0833eb8af14e507c2f2123a39c4d595
+Subproject commit 390dd2b9aaf82a2d859224173364ae207c51ba62

help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/scalc/01/func_filter.xhp |   42 ++-
 1 file changed, 37 insertions(+), 5 deletions(-)

New commits:
commit 5edd31fd783de27dec830907b18651ec8f8c9261
Author: Olivier Hallot 
AuthorDate: Mon May 27 13:00:49 2024 -0300
Commit: Olivier Hallot 
CommitDate: Tue May 28 14:45:14 2024 +0200

tdf#159872 Review Help for FILTER function

+ Fix syntax definition
+ Fix "Result not found"

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

diff --git a/source/text/scalc/01/func_filter.xhp 
b/source/text/scalc/01/func_filter.xhp
index 35a6622ab4..2fd955f164 100644
--- a/source/text/scalc/01/func_filter.xhp
+++ b/source/text/scalc/01/func_filter.xhp
@@ -22,16 +22,48 @@
 
 
 FILTER
-Filters a data 
range or array based on conditions you specify.
+Filters a data 
range or array based on specified conditions.
 
 
-FILTER(Range, Criteria, 
Return if empty)
+FILTER( Range; Criteria [; 
Return if empty])
 Range: The 
array or range to filter.
 Criteria: 
A boolean array whose height (filtering by columns) or width (filtering by 
rows) is the same as the array, used to select data from the 
Range.
-Return if 
empty: the value to return if all values in the Include array are empty 
(filter return nothing).
+Result if 
empty: (optional) the value to return if all values in the 
Criteria array are empty (filter return nothing).
 
-{=FILTER(A2:C13,A2:A13>50)} returns 
the array {57,49,12|56,33,60|57,,} containing all grades with Maths grade above 
50. Note that this is an array formula.
-{=FILTER(A2:C13,B2:B13>90,"No 
results")}  Returns the string "No results", since no grade on Physics 
is above 90.
+{=FILTER(A2:C13;A2:A13>50)} returns 
the array containing all grades with Maths grade above 50. Note that this is an 
array 
formula.
+
+
+
+57
+
+
+49
+
+
+12
+
+
+
+
+56
+
+
+33
+
+
+60
+
+
+
+
+57
+
+
+
+
+
+{=FILTER(A2:C13;B2:B13>90;"No 
results")}  Returns the string "No results", since no grade on Physics 
is above 90.
+
 
 
 

help.git: 2 commits - source/text

[Olivier Hallot (via logerrit)]

 source/text/scalc/01/func_randarray.xhp |7 ---
 source/text/scalc/01/func_sort.xhp  |   12 ++--
 source/text/scalc/01/func_sortby.xhp|9 +
 3 files changed, 15 insertions(+), 13 deletions(-)

New commits:
commit 7b824f49fb1a71b173ed318241f99aeb7320eac0
Author: Olivier Hallot 
AuthorDate: Mon May 27 14:46:51 2024 -0300
Commit: Olivier Hallot 
CommitDate: Tue May 28 14:45:54 2024 +0200

tdf#159872 Review Help for SORT/SORTBY function

+ Fix syntax definition

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

diff --git a/source/text/scalc/01/func_sort.xhp 
b/source/text/scalc/01/func_sort.xhp
index e0f9b694c8..a771ccbfa2 100644
--- a/source/text/scalc/01/func_sort.xhp
+++ b/source/text/scalc/01/func_sort.xhp
@@ -26,12 +26,12 @@
 
 Enter the formula as an array formula.
 
-SORT(Range [, SortIndex[, 
SortOrder[, ByCol]]])
-Range: 
Required. The range or array to sort.
-SortIndex: 
Optional. The number indicating the row or column to sort by.
-SortOrder: 
Optional. A number indicating the desired sort order; 1 for ascending order 
(default), -1 for descending order.
-ByCol: 
Optional. A logical value indicating the desired sort direction; 
FALSE to sort by row (default), TRUE to sort by 
column.
-
+SORT(Range [; SortIndex [; 
SortOrder [; ByCol] ] ])
+Range: the 
range or array to sort.
+SortIndex: 
(optional). The number indicating the row or column to sort by.
+SortOrder: 
(optional). A number indicating the desired sort order; 1 for ascending order 
(default), -1 for descending order.
+ByCol: 
(optional). A logical value indicating the desired sort direction; 
FALSE to sort by row (default), TRUE to sort by 
column.
+
 
 
 Example with ascending order
diff --git a/source/text/scalc/01/func_sortby.xhp 
b/source/text/scalc/01/func_sortby.xhp
index 332005731a..1f0f045a47 100644
--- a/source/text/scalc/01/func_sortby.xhp
+++ b/source/text/scalc/01/func_sortby.xhp
@@ -25,12 +25,13 @@
 Sorts the contents 
of a range or array based on the values in a corresponding range or 
array.
 
 
-SORTBY(Range, SortByRange1, 
SortOrder1[, SortByRange2, SortOrder2,[...]])
+SORTBY(Range; SortByRange1; 
SortOrder1 [; SortByRange2; SortOrder2,[...] ])
 Range: The 
array or range to sort.
-SortByRange1, 
SortByRange2,... : Range 1, range 2,... are the arrays or ranges to sort 
on.
-SortOrder1, 
SortOrder2,... : Order 1, order 2,... are the orders to use for sorting. 
1 for ascending, -1 for descending. Default is ascending.
+SortByRange1, 
SortByRange2,... : range 1, range 2,... are the arrays or ranges to sort 
on.
+SortOrder1, 
SortOrder2,... : order 1, order 2,... are the orders to use for sorting. 
1 for ascending, -1 for descending. Default is ascending.
+
 
-{=SORTBY(A2:C7,A2:A7,1,C2:C7,-1)}
+{=SORTBY(A2:C7;A2:A7;1;C2:C7;-1)}
 Sort the range A2:C7 
based on the first column in ascending order and third column in descending 
order.
 
 
commit 99ebed65db57abb67aa4765f636de2c3c60c10a9
Author: Olivier Hallot 
AuthorDate: Mon May 27 13:22:38 2024 -0300
Commit: Olivier Hallot 
CommitDate: Tue May 28 14:45:40 2024 +0200

tdf#159872 Review Help for RANDARRAY function

+ Fix syntax definition

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

diff --git a/source/text/scalc/01/func_randarray.xhp 
b/source/text/scalc/01/func_randarray.xhp
index 1a746c97e0..9ec298ad44 100644
--- a/source/text/scalc/01/func_randarray.xhp
+++ b/source/text/scalc/01/func_randarray.xhp
@@ -18,14 +18,14 @@
 
 
 
-RANDARRAY function
+RANDARRAY function
 
 
 RANDARRAY
 Generates an array 
of random numbers between two limit values.
 
 
-RANDARRAY([Rows], [Columns], 
[Min], [Max], [Integers])
+RANDARRAY([Rows [; Columns 
[; Min [; Max [; Integers] ] ] ])
 Rows: 
(optional) the number of rows to return. If omitted, the value is 1.
 Columns: 
(optional) the number of columns to return. If omitted, the value is 
1.
 Min: 
(optional) The lower limit of the generated numbers. If omitted, the minimum 
value is 0.
@@ -33,8 +33,9 @@
 Integers: 
(optional) returns whole numbers (TRUE) or decimal numbers (FALSE). Default is 
FALSE.
 If Rows and Columns 
are greater than 1, the RANDARRAY function must be entered as an array 
formula.
 If Rows or 
Columns are references to the content of other cells, the array 
dimensions do not change when the referenced content changes. The array formula 
must be deleted and re-entered.
+
 
-{=RANDARRAY(10,4,10,50,1)} returns an 
array of 10 rows, 4 columns with minimum value 10 and maximum value of 50 of 
whole numbers (integers).
+{=RANDARRAY(10;4;10;50;1)} returns an 
array of 10 rows, 4 columns with minimum value 10 and maximum value of 50 of 
whole numbers (integers).
 
 
 

core.git: 2 commits - helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit c0593719836f6969262c7ed798ee9e528cf03e4b
Author: Olivier Hallot 
AuthorDate: Tue May 28 09:45:55 2024 -0300
Commit: Gerrit Code Review 
CommitDate: Tue May 28 14:45:55 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7b824f49fb1a71b173ed318241f99aeb7320eac0
  - tdf#159872 Review Help for SORT/SORTBY function

+ Fix syntax definition

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

diff --git a/helpcontent2 b/helpcontent2
index 99ebed65db57..7b824f49fb1a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 99ebed65db57abb67aa4765f636de2c3c60c10a9
+Subproject commit 7b824f49fb1a71b173ed318241f99aeb7320eac0
commit 88aff5815c76b30ecff03891906ffc932b4ec03d
Author: Olivier Hallot 
AuthorDate: Tue May 28 09:45:41 2024 -0300
Commit: Gerrit Code Review 
CommitDate: Tue May 28 14:45:41 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 99ebed65db57abb67aa4765f636de2c3c60c10a9
  - tdf#159872 Review Help for RANDARRAY function

+ Fix syntax definition

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

diff --git a/helpcontent2 b/helpcontent2
index 5edd31fd783d..99ebed65db57 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5edd31fd783de27dec830907b18651ec8f8c9261
+Subproject commit 99ebed65db57abb67aa4765f636de2c3c60c10a9

core.git: sw/inc

[Xisco Fauli (via logerrit)]

 sw/inc/textboxhelper.hxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0753aa966eba18ddf0534abd21ff92edcfdb7982
Author: Xisco Fauli 
AuthorDate: Tue May 28 09:55:09 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 28 15:10:19 2024 +0200

sw: use SAL_RET_MAYBENULL in getOtherTextBoxFormat()

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

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index c4f4c3d8fbbb..4afd6fa9960c 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -122,10 +122,11 @@ public:
  *
  * @see isTextBox
  */
-static SwFrameFormat* getOtherTextBoxFormat(const SwFrameFormat* pFormat, 
sal_uInt16 nType,
-const SdrObject* pObject = 
nullptr);
+SAL_RET_MAYBENULL static SwFrameFormat*
+getOtherTextBoxFormat(const SwFrameFormat* pFormat, sal_uInt16 nType,
+  const SdrObject* pObject = nullptr);
 /// If we have an associated TextFrame, then return that.
-static SwFrameFormat*
+SAL_RET_MAYBENULL static SwFrameFormat*
 getOtherTextBoxFormat(css::uno::Reference const& 
xShape);
 /// If we have an associated TextFrame, then return its XTextFrame.
 static css::uno::Reference

core.git: sw/inc sw/source

[Miklos Vajna (via logerrit)]

 sw/inc/fmtftntx.hxx  |1 +
 sw/source/core/layout/atrfrm.cxx |8 
 2 files changed, 9 insertions(+)

New commits:
commit f4ec4f6068a1ca265dd25c479cc40c546ae9223e
Author: Miklos Vajna 
AuthorDate: Tue May 28 09:51:56 2024 +0200
Commit: Miklos Vajna 
CommitDate: Tue May 28 15:11:34 2024 +0200

sw doc model xml dump: show SwFormatEndAtTextEnd

Decides if endnotes are collected at section end or the normal doc end.
Previously only the pool item name was visible, not the value.

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

diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index a5de432ccad7..16e63657abf7 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -110,6 +110,7 @@ public:
 }
 
 virtual SwFormatEndAtTextEnd* Clone( SfxItemPool *pPool = nullptr ) const 
override;
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool 
bInP) const
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 67047d7b0bf9..0dee2d60520f 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1993,6 +1993,14 @@ SwFormatEditInReadonly* SwFormatEditInReadonly::Clone( 
SfxItemPool* ) const
 return new SwFormatEditInReadonly( *this );
 }
 
+void SwFormatEndAtTextEnd::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+(void)xmlTextWriterStartElement(pWriter, BAD_CAST("SwFormatEndAtTextEnd"));
+(void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), 
BAD_CAST(OString::number(Which()).getStr()));
+(void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), 
BAD_CAST(OString::number(GetValue()).getStr()));
+(void)xmlTextWriterEndElement(pWriter);
+}
+
 SwFormatLayoutSplit* SwFormatLayoutSplit::Clone( SfxItemPool* ) const
 {
 return new SwFormatLayoutSplit( *this );

core.git: desktop/source static/README.wasm.md

[Stephan Bergmann (via logerrit)]

 desktop/source/app/sofficemain.cxx |6 ++
 static/README.wasm.md  |6 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 77129fbb74bcefde4551d494f029169e7c6026e3
Author: Stephan Bergmann 
AuthorDate: Wed May 15 15:24:48 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 28 15:14:12 2024 +0200

Emscripten: Add hack to prepare for --enable-wasm-exceptions

(...which will be beneficial, in turn, to implement exception handling in 
the
work-in-progress bridges/source/cpp_uno/gcc3_wasm UNO bridge).

Once setting --enable-wasm-exceptions, plus the corresponding
-sSUPPORT_LONGJMP=wasm in qt5, I indeed started to see the "RuntimeError: 
null
function or function signature mismatch" that was already mentioned in
static/README.wasm.md.  I could track it down to the early destruction of 
the
aDesktop local variable in soffice_main, as I now explain there.  However, 
it
beats me why that variable gets destroyed early.  The 
desktop::Desktop::~Desktop
dtor claims to be called from within main -> soffice_main ->
desktop::Desktop::~Desktop, but at a time when the call to main -> 
soffice_main
-> SVMain has not yet returned.  There also does not appear to be any C++
exception handling stack unwinding going on.  (It could be related somehow 
to
-sSUPPORT_LONGJMP=wasm, I don't know.)  And everything appears to just work 
fine
after turning that aDesktop local variable into a (leaked) heap instance
instead, so go with that hack for now...

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

diff --git a/desktop/source/app/sofficemain.cxx 
b/desktop/source/app/sofficemain.cxx
index 73ac6e24cfe4..33881784d45c 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -63,7 +63,13 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 #endif
 tools::extendApplicationEnvironment();
 
+#if defined EMSCRIPTEN
+//TODO, see "Experimental (AKA currently broken) WASM exception + SjLj 
build" in
+// static/README.wasm.md:
+new desktop::Desktop();
+#else
 desktop::Desktop aDesktop;
+#endif
 // This string is used during initialization of the Gtk+ VCL module
 Application::SetAppName( u"soffice"_ustr );
 
diff --git a/static/README.wasm.md b/static/README.wasm.md
index 5397e2124d16..97be5a14123b 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -122,7 +122,11 @@ You can build LO with WASM exceptions, which should be 
"much" faster then the JS
 based Emscripten EH handling. For setjmp / longjmp (SjLj) used by the PNG and 
JPEG
 libraries error handling, this needs Emscripten 3.1.3+. That builds, but 
execution
 still fails early with a signature mismatch call to Task::UpdateMinPeriod in 
LO's
-job scheduler code. Unfortunately the build also needs a Qt build with
+job scheduler code (concretely: the call to 
`pSchedulerData->mpTask->UpdateMinPeriod` in
+`Scheduler::CallbackTaskScheduling` in vcl/source/app/scheduler.cxx being a 
pure virtual call on a
+destroyed `desktop::Desktop::m_firstRunTimer` instance, because 
`desktop::Desktop aDesktop` in
+`soffice_main` in desktop/source/app/sofficemain.cxx gets destroyed early, for 
unclear reasons).
+Unfortunately the build also needs a Qt build with
 "-s SUPPORT_LONGJMP=wasm", which is incompatible with the JS EH + SjLj.
 
 The LO configure flag is simply an additional --enable-wasm-exceptions. Qt5 can

core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/uibase/docvw/PostItMgr.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e70b7edfb1bb8bcbde272f0152c51ae193e115d7
Author: Noel Grandin 
AuthorDate: Mon May 27 21:17:39 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 16:13:12 2024 +0200

no need to dynamic_cast here

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

diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index 8a2ab40317ed..ebd1223c586d 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -447,8 +447,9 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
 }
 }
 }
-else if ( const SfxStyleSheetModifiedHint * pStyleHint = 
dynamic_cast(&rHint) )
+else if ( rHint.GetId() == SfxHintId::StyleSheetModifiedExtended )
 {
+const SfxStyleSheetModifiedHint * pStyleHint = static_cast(&rHint);
 for (const auto& postItField : mvPostItFields)
 {
 auto pField = 
static_cast(postItField->GetFormatField().GetField());

core.git: sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/writerfilter/dmapper/SettingsTable.cxx|   22 
 sw/qa/writerfilter/dmapper/data/endnote-at-section-end.docx |binary
 sw/source/writerfilter/dmapper/PropertyMap.cxx  |9 
 sw/source/writerfilter/dmapper/SettingsTable.cxx|   13 +++
 sw/source/writerfilter/dmapper/SettingsTable.hxx|2 +
 5 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit 2d2dd56e0b2dc708f1f758d7fc9a1263ff09b83c
Author: Miklos Vajna 
AuthorDate: Tue May 28 13:26:05 2024 +0200
Commit: Miklos Vajna 
CommitDate: Tue May 28 17:13:08 2024 +0200

tdf#160984 sw continuous endnotes: DOCX: import  pos == sectEnd

Word can have per-section endnotes, but if endnotes are collected at the
end of the section vs document end is a per-document setting.

The DOC import already handles this in wwSectionManager::InsertSection()
when it constructs an SwFormatEndAtTextEnd with FTNEND_ATTXTEND.

Fix the problem by doing the same in writerfilter: in case settings.xml
wants at-section-end endnotes, set EndnoteIsCollectAtTextEnd to true
when applying section properties.

The export side still needs doing.

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

diff --git a/sw/qa/writerfilter/dmapper/SettingsTable.cxx 
b/sw/qa/writerfilter/dmapper/SettingsTable.cxx
index 503b28d45c95..ef94a60fc544 100644
--- a/sw/qa/writerfilter/dmapper/SettingsTable.cxx
+++ b/sw/qa/writerfilter/dmapper/SettingsTable.cxx
@@ -11,6 +11,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -87,6 +88,27 @@ CPPUNIT_TEST_FIXTURE(Test, testAddVerticalFrameOffsetsRTF)
 // i.e. table top should be ~2748, but was less, leading to an overlap.
 CPPUNIT_ASSERT_GREATER(nFlyBottom, nTableTop);
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testEndnoteAtSectionEnd)
+{
+// Given a document with at-section-end endnotes enabled:
+loadFromFile(u"endnote-at-section-end.docx");
+
+// Go to the second paragraph, which is inside Word's second section:
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xTextDocument->getText(),
+  
uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+xParaEnum->nextElement();
+uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+uno::Reference xSection;
+xPara->getPropertyValue("TextSection") >>= xSection;
+bool bEndnoteIsCollectAtTextEnd = false;
+xSection->getPropertyValue("EndnoteIsCollectAtTextEnd") >>= 
bEndnoteIsCollectAtTextEnd;
+// Without the accompanying fix in place, this test would have failed, 
endnotes were always at
+// document end.
+CPPUNIT_ASSERT(bEndnoteIsCollectAtTextEnd);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/writerfilter/dmapper/data/endnote-at-section-end.docx 
b/sw/qa/writerfilter/dmapper/data/endnote-at-section-end.docx
new file mode 100644
index ..cf61262c7d59
Binary files /dev/null and 
b/sw/qa/writerfilter/dmapper/data/endnote-at-section-end.docx differ
diff --git a/sw/source/writerfilter/dmapper/PropertyMap.cxx 
b/sw/source/writerfilter/dmapper/PropertyMap.cxx
index f52d37764402..02951c73cbcd 100644
--- a/sw/source/writerfilter/dmapper/PropertyMap.cxx
+++ b/sw/source/writerfilter/dmapper/PropertyMap.cxx
@@ -74,6 +74,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace com::sun::star;
 
 namespace writerfilter::dmapper {
@@ -756,7 +758,7 @@ void SectionPropertyMap::DontBalanceTextColumns()
 }
 }
 
-void SectionPropertyMap::ApplySectionProperties( const uno::Reference< 
beans::XPropertySet >& xSection, DomainMapper_Impl& /*rDM_Impl*/ )
+void SectionPropertyMap::ApplySectionProperties( const uno::Reference< 
beans::XPropertySet >& xSection, DomainMapper_Impl& rDM_Impl )
 {
 try
 {
@@ -765,6 +767,11 @@ void SectionPropertyMap::ApplySectionProperties( const 
uno::Reference< beans::XP
 std::optional< PropertyMap::Property > pProp = getProperty( 
PROP_WRITING_MODE );
 if ( pProp )
 xSection->setPropertyValue( "WritingMode", pProp->second );
+
+if (rDM_Impl.GetSettingsTable()->GetEndnoteIsCollectAtSectionEnd())
+{
+
xSection->setPropertyValue(UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END, 
uno::Any(true));
+}
 }
 }
 catch ( uno::Exception& )
diff --git a/sw/source/writerfilter/dmapper/SettingsTable.cxx 
b/sw/source/writerfilter/dmapper/SettingsTable.cxx
index 4d6fe6b13441..57f6566c2135 100644
--- a/sw/source/writerfilter/dmapper/SettingsTable.cxx
+++ b/sw/source/writerfilter/dmapper/SettingsTable.cxx
@@ -120,6 +120,8 @@ struct SettingsTable_Impl
 bool m_bGutterAtTop = false;
 bool m_bDoNot

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

[Noel Grandin (via logerrit)]

 include/svl/hint.hxx |2 
 sc/source/ui/dbgui/PivotLayoutDialog.cxx |   56 +--
 sc/source/ui/dbgui/consdlg.cxx   |   36 ++--
 sc/source/ui/dbgui/csvtablebox.cxx   |8 +-
 sc/source/ui/dbgui/dapidata.cxx  |8 +-
 sc/source/ui/dbgui/dapitype.cxx  |   28 -
 sc/source/ui/dbgui/dbnamdlg.cxx  |   38 ++---
 sc/source/ui/dbgui/dpgroupdlg.cxx|   40 ++---
 sc/source/ui/dbgui/filtdlg.cxx   |   86 ++---
 sc/source/ui/dbgui/pfiltdlg.cxx  |   32 +--
 sc/source/ui/dbgui/pvfundlg.cxx  |   90 +++
 sc/source/ui/dbgui/scendlg.cxx   |   24 
 sc/source/ui/dbgui/scuiasciiopt.cxx  |   82 ++--
 sc/source/ui/dbgui/scuiimoptdlg.cxx  |   28 -
 sc/source/ui/dbgui/sfiltdlg.cxx  |   38 ++---
 sc/source/ui/dbgui/sortdlg.cxx   |   18 +++---
 sc/source/ui/dbgui/sortkeydlg.cxx|   12 ++--
 sc/source/ui/dbgui/subtdlg.cxx   |   12 ++--
 sc/source/ui/dbgui/textimportoptions.cxx |   16 ++---
 sc/source/ui/dbgui/tpsort.cxx|   42 +++---
 sc/source/ui/dbgui/tpsubt.cxx|   34 +--
 sc/source/ui/dbgui/validate.cxx  |   40 ++---
 sw/inc/unoredline.hxx|3 -
 sw/source/core/unocore/unoredline.cxx|5 +
 24 files changed, 392 insertions(+), 386 deletions(-)

New commits:
commit aea4dd58521b5621463c653a47275808a315edd6
Author: Noel Grandin 
AuthorDate: Mon May 27 21:45:15 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 18:01:46 2024 +0200

avoid dynamic_cast in SwXRedline

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

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 98c37e4b7baa..31564677dd32 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -158,6 +158,7 @@ enum class SfxHintId {
 SwVirtPageNumHint,
 SwAutoFormatUsedHint,
 SwFormatField,
+SwFindRedline,
 
 ThisIsAnSdrHint,
 ThisIsAnSfxEventHint
@@ -248,6 +249,7 @@ inline std::basic_ostream & operator <<(
 case SfxHintId::SwCollectTextMarks: return stream << "SwCollectTextMarks";
 case SfxHintId::SwCollectTextTOXMarksForLayout: return stream << 
"SwCollectTextTOXMarksForLayout";
 case SfxHintId::SwFormatField: return stream << "SwFormatField";
+case SfxHintId::SwFindRedline: return stream << "SwFindRedline";
 case SfxHintId::ThisIsAnSdrHint: return stream << "SdrHint";
 default: return stream << "unk(" << std::to_string(int(id)) << ")";
 }
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index b0c2dc41cfab..90f9d212a168 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -114,7 +114,8 @@ namespace sw
 {
 const SwRangeRedline& m_rRedline;
 SwXRedline** m_ppXRedline;
-FindRedlineHint(const SwRangeRedline& rRedline, SwXRedline** 
ppXRedline) : m_rRedline(rRedline), m_ppXRedline(ppXRedline) {}
+FindRedlineHint(const SwRangeRedline& rRedline, SwXRedline** 
ppXRedline)
+: SfxHint(SfxHintId::SwFindRedline), m_rRedline(rRedline), 
m_ppXRedline(ppXRedline) {}
 };
 }
 
diff --git a/sw/source/core/unocore/unoredline.cxx 
b/sw/source/core/unocore/unoredline.cxx
index b97cc20028b2..414bebbc1056 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -490,7 +490,10 @@ void SwXRedline::Notify( const SfxHint& rHint )
 {
 m_pDoc = nullptr;
 m_pRedline = nullptr;
-} else if(auto pHint = dynamic_cast(&rHint)) {
+}
+else if(rHint.GetId() == SfxHintId::SwFindRedline)
+{
+auto pHint = static_cast(&rHint);
 if(!*pHint->m_ppXRedline && &pHint->m_rRedline == GetRedline())
 *pHint->m_ppXRedline = this;
 }
commit 57c7269fb48237573a0d2a0429dd6e82fe62fd71
Author: Noel Grandin 
AuthorDate: Tue May 28 11:40:18 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 18:01:34 2024 +0200

loplugin:ostr in sc/../dbgui

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

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx 
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index cd84cf8b248c..db93d6c5cee2 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -72,7 +72,7 @@ ScRange lclGetRangeForNamedRange(OUString const & aName, 
const ScDocument& rDocu
 ScPivotLayoutDialog::ScPivotLayoutDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* 
pChildWindow, weld::Window* pParent,
 ScViewData* pViewData, const ScDPObjec

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

[Noel Grandin (via logerrit)]

 include/svl/hint.hxx|2 
 sc/source/ui/unoobj/ChartRangeSelectionListener.cxx |2 
 sc/source/ui/unoobj/PivotTableDataProvider.cxx  |   12 -
 sc/source/ui/unoobj/PivotTableDataSequence.cxx  |2 
 sc/source/ui/unoobj/PivotTableDataSource.cxx|2 
 sc/source/ui/unoobj/TablePivotChart.cxx |2 
 sc/source/ui/unoobj/TablePivotCharts.cxx|2 
 sc/source/ui/unoobj/addruno.cxx |2 
 sc/source/ui/unoobj/afmtuno.cxx |   10 -
 sc/source/ui/unoobj/appluno.cxx |   12 -
 sc/source/ui/unoobj/celllistsource.cxx  |   18 +-
 sc/source/ui/unoobj/cellsuno.cxx|   34 ++---
 sc/source/ui/unoobj/cellvaluebinding.cxx|   20 +--
 sc/source/ui/unoobj/chart2uno.cxx   |   14 +-
 sc/source/ui/unoobj/chartuno.cxx|   16 +-
 sc/source/ui/unoobj/condformatuno.cxx   |4 
 sc/source/ui/unoobj/confuno.cxx |   18 +-
 sc/source/ui/unoobj/cursuno.cxx |2 
 sc/source/ui/unoobj/dapiuno.cxx |   80 ++--
 sc/source/ui/unoobj/datauno.cxx |   18 +-
 sc/source/ui/unoobj/defltuno.cxx|2 
 sc/source/ui/unoobj/docuno.cxx  |   86 ++---
 sc/source/ui/unoobj/eventuno.cxx|4 
 sc/source/ui/unoobj/exceldetect.cxx |   18 +-
 sc/source/ui/unoobj/fielduno.cxx|   16 +-
 sc/source/ui/unoobj/filtuno.cxx |4 
 sc/source/ui/unoobj/fmtuno.cxx  |8 -
 sc/source/ui/unoobj/funcuno.cxx |2 
 sc/source/ui/unoobj/linkuno.cxx |   28 ++--
 sc/source/ui/unoobj/miscuno.cxx |4 
 sc/source/ui/unoobj/nameuno.cxx |   16 +-
 sc/source/ui/unoobj/notesuno.cxx|2 
 sc/source/ui/unoobj/pageuno.cxx |4 
 sc/source/ui/unoobj/scdetect.cxx|6 
 sc/source/ui/unoobj/servuno.cxx |  130 ++--
 sc/source/ui/unoobj/shapeuno.cxx|6 
 sc/source/ui/unoobj/srchuno.cxx |2 
 sc/source/ui/unoobj/styleuno.cxx|   10 -
 sc/source/ui/unoobj/targuno.cxx |6 
 sc/source/ui/unoobj/textuno.cxx |8 -
 sc/source/ui/unoobj/tokenuno.cxx|2 
 sc/source/ui/unoobj/viewuno.cxx |6 
 sc/source/ui/unoobj/warnpassword.cxx|2 
 sw/inc/calbck.hxx   |2 
 sw/source/core/doc/docftn.cxx   |3 
 sw/source/core/docnode/node.cxx |3 
 sw/source/core/fields/ddetbl.cxx|3 
 sw/source/core/layout/pagedesc.cxx  |3 
 sw/source/core/unocore/unoidx.cxx   |3 
 49 files changed, 334 insertions(+), 327 deletions(-)

New commits:
commit 592947c1a421eae46d6268798cf3eab6bc6f0dc6
Author: Noel Grandin 
AuthorDate: Tue May 28 11:40:58 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 18:02:08 2024 +0200

loplugin:ostr in sc/../unoobj

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

diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx 
b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
index eae58aee6f7a..4f1523d77857 100644
--- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
+++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
-SC_SIMPLE_SERVICE_INFO( ScChartRangeSelectionListener, 
"ScChartRangeSelectionListener",
+SC_SIMPLE_SERVICE_INFO( ScChartRangeSelectionListener, 
u"ScChartRangeSelectionListener"_ustr,
 SC_SERVICENAME_CHRANGEHILIGHT )
 
 ScChartRangeSelectionListener::ScChartRangeSelectionListener( ScTabViewShell * 
pViewShell ) :
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx 
b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index 84178fba6d56..16a8237e391b 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -130,7 +130,7 @@ std::vector lcl_getVisiblePageMembers(const 
uno::Reference xResult = 
newLabeledDataSequence();
 rtl::Reference pSequence(new 
PivotTableDataSequence(m_pDocument,

lcl_identifierForCategories(), std::vector(rCategories)));
-pSequence->setRole("categories");
+pSequence->setRole(u"categories"_ustr);
 
xResult->setValues(uno::Reference(pSequence));

core.git: desktop/inc desktop/source

[Noel Grandin (via logerrit)]

 desktop/inc/app.hxx|1 -
 desktop/source/app/app.cxx |5 +
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 8a5f822897434cffe1991325ea18014734bfa24e
Author: Noel Grandin 
AuthorDate: Tue May 28 12:32:29 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 28 18:02:22 2024 +0200

tdf#161048 Revert "move opencl check at startup inside its own thread"

This reverts commit 7d1242b01d3ad9be1cfcf2bd3fbee9ce63df.

Intel's OpenCL driver gets stuck during shutdown and blocks the process 
from exiting

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

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 7a789b59b55a..0c96240f1b0d 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -169,7 +169,6 @@ class Desktop final : public Application
 std::unique_ptr m_xLockfile;
 Timer   m_firstRunTimer;
 std::thread m_aUpdateThread;
-std::thread m_aOpenCLCheckThread;
 };
 
 OUString GetURL_Impl(
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7075d6afcb89..b00dd75a39e6 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1613,7 +1613,7 @@ int Desktop::Main()
 
 // FIXME: move this somewhere sensible.
 #if HAVE_FEATURE_OPENCL
-m_aOpenCLCheckThread = std::thread(CheckOpenCLCompute, xDesktop);
+CheckOpenCLCompute(xDesktop);
 #endif
 
 #if !defined(EMSCRIPTEN)
@@ -1670,9 +1670,6 @@ int Desktop::doShutdown()
 if (m_aUpdateThread.joinable())
 m_aUpdateThread.join();
 
-if (m_aOpenCLCheckThread.joinable())
-m_aOpenCLCheckThread.join();
-
 if (pExecGlobals->xJVMloadThread.is())
 {
 pExecGlobals->xJVMloadThread->join();

[GSoC .NET Bindings for UNO, Week 1] netmaker and net_basetypes

[Ritobroto Mukherjee]

Hello everyone,

Here's a brief update on this week's progress:
- Decided on a weekly meeting schedule with Mr. Hossein and Mr.
Thorsten, and had the first meeting.
- Some initial work on integrating the .NET SDK with gbuild can be
found here: https://gerrit.libreoffice.org/c/core/+/166380. This was
done before this week, but current and later work will most likely be
merged into the same link.
- Planning and working on the netmaker tool (the upgrade to climaker).
It can generate C# code for IDL enums, constants, and typedefs now.
Working on structs next. No gerrit patch yet, but it should be complete
and up for review by next week's update.
- Also working on the net_basetypes library (the upgrade to
cli_basetypes). Will have the patch for this up along with netmaker.

Best regards,
Ritobroto

core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/filter/jpeg/jpegc.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit f3fc5bfaf902052b9e0a1b6e162f9ed836efd090
Author: Caolán McNamara 
AuthorDate: Mon May 27 21:32:32 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue May 28 20:46:13 2024 +0200

ofz: Use-of-uninitialized-value

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

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index d225d135d5c7..bc8a656c890f 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -51,6 +51,11 @@ struct ErrorManagerStruct
 {
 jpeg_error_mgr pub;
 jmp_buf setjmp_buffer;
+
+ErrorManagerStruct()
+{
+pub.msg_parm = {};
+}
 };
 
 }

help.git: source/text

[Andrea Gelmini (via logerrit)]

 source/text/scalc/01/func_xmatch.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a61cdc9fb845956ccec780550684b3bcf01e4194
Author: Andrea Gelmini 
AuthorDate: Tue May 28 17:36:31 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue May 28 20:58:41 2024 +0200

Fix typo

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

diff --git a/source/text/scalc/01/func_xmatch.xhp 
b/source/text/scalc/01/func_xmatch.xhp
index eaad53c503..6595230a37 100644
--- a/source/text/scalc/01/func_xmatch.xhp
+++ b/source/text/scalc/01/func_xmatch.xhp
@@ -22,7 +22,7 @@
 
 
 XMATCH
-Searches for a 
value in an one-dimensional array and returns the relative position of the 
item.
+Searches for a 
value in a one-dimensional array and returns the relative position of the 
item.
 
 
 XMATCH outperforms 
function MATCH as it 
allows searches according to the search mode.

core.git: helpcontent2

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 281edd0831ab72b19887c64e084ee4f431dd9c4c
Author: Andrea Gelmini 
AuthorDate: Tue May 28 20:58:42 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Tue May 28 20:58:42 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a61cdc9fb845956ccec780550684b3bcf01e4194
  - Fix typo

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

diff --git a/helpcontent2 b/helpcontent2
index 7b824f49fb1a..a61cdc9fb845 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7b824f49fb1a71b173ed318241f99aeb7320eac0
+Subproject commit a61cdc9fb845956ccec780550684b3bcf01e4194

core.git: Branch 'distro/mimo/mimo-7-5' - configure.ac

[Aron Budea (via logerrit)]

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

New commits:
commit 899d5754159b79aa7dad273171a0a605a5ffb1f7
Author: Aron Budea 
AuthorDate: Tue May 28 21:30:08 2024 +0200
Commit: Aron Budea 
CommitDate: Tue May 28 21:30:08 2024 +0200

Bump version to 7.5.9.2.M3

Change-Id: I5aa435f6084956520bf3a7f97276c1d7400bf2c9

diff --git a/configure.ac b/configure.ac
index 1c88358d44a6..805f15aea0f2 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],[7.5.9.2.M2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.9.2.M3],[],[],[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: unotest/source

[Stephan Bergmann (via logerrit)]

 unotest/source/embindtest/embindtest.js |8 
 1 file changed, 8 insertions(+)

New commits:
commit 6b6f18ed52e25df12347057f276712bd95d20fec
Author: Stephan Bergmann 
AuthorDate: Tue May 28 13:26:37 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 28 21:52:42 2024 +0200

Emscripten: Document failing getExceptionMessage

(and add a console.assert(false) to verify that an exception actually gets
thrown)

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

diff --git a/unotest/source/embindtest/embindtest.js 
b/unotest/source/embindtest/embindtest.js
index f6cc71bbc906..87d3d2fc281c 100644
--- a/unotest/source/embindtest/embindtest.js
+++ b/unotest/source/embindtest/embindtest.js
@@ -633,11 +633,19 @@ Module.addOnPostRun(function() {
 
console.assert(test.isDouble(uno.org.libreoffice.embindtest.Constants.Double));
 try {
 test.throwRuntimeException();
+console.assert(false);
 } catch (e) {
 incrementExceptionRefcount(e);
 //TODO, needed when building with JS-based -fexceptions, see
 //  
"[EH] Fix inconsistency
 // of refcounting in Emscripten EH vs. Wasm EH"
+//TODO: The recommended way to obtain the exception's type and message 
would reportedly
+// () be
+//   const [type, message] = getExceptionMessage(e);
+// but that causes a "RuntimeError: memory access out of bounds" from 
within
+// getExceptionMessage -> getExceptionMessageCommon -> 
__get_exception_message at least with
+// emsdk 3.1.46:
 console.assert(e.name === 'com::sun::star::uno::RuntimeException');
 console.assert(e.message === undefined); //TODO
 //TODO: console.assert(e.Message.startsWith('test'));

core.git: Branch 'distro/mimo/mimo-7-3' - configure.ac

[Aron Budea (via logerrit)]

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

New commits:
commit 31005fd29bba4dc38fbaed5ea3865307040b24ab
Author: Aron Budea 
AuthorDate: Tue May 28 21:55:50 2024 +0200
Commit: Aron Budea 
CommitDate: Tue May 28 21:55:50 2024 +0200

Bump version to 7.3.7.2.M10

Change-Id: I1c8481b2397abefcc83b41466c2c2e2b815f996a

diff --git a/configure.ac b/configure.ac
index c0f0d23ba16a..587b6b1a9769 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],[7.3.7.2.M9],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.2.M10],[],[],[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: Branch 'distro/mimo/mimo-7-2' - configure.ac

[Aron Budea (via logerrit)]

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

New commits:
commit 225f20fdc1101b62bd8c4c4985d8a47285e8896d
Author: Aron Budea 
AuthorDate: Tue May 28 22:00:46 2024 +0200
Commit: Aron Budea 
CommitDate: Tue May 28 22:00:46 2024 +0200

Bump version to 7.2.7.2.M17

Change-Id: Ia09a6b6d20a8abe22f2504d19b1288bba698e906

diff --git a/configure.ac b/configure.ac
index 59b390d8c07a..63ca25a5d9b7 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],[7.2.7.2.M16],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.2.M17],[],[],[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: Branch 'distro/mimo/mimo-7-0' - configure.ac

[Aron Budea (via logerrit)]

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

New commits:
commit e778e914171165dc671c158d2bfba3ca57c1a1a9
Author: Aron Budea 
AuthorDate: Tue May 28 22:02:31 2024 +0200
Commit: Aron Budea 
CommitDate: Tue May 28 22:02:31 2024 +0200

Bump version to 7.0.7.0.M15

Change-Id: I061601c833902f599f6d63438f41cbe35d1ec5b6

diff --git a/configure.ac b/configure.ac
index d469483c2a1a..3b86331be522 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],[7.0.7.0.M14],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.7.0.M15],[],[],[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: Branch 'distro/mimo/mimo-6-4' - configure.ac

[Aron Budea (via logerrit)]

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

New commits:
commit 266658425b659623688c2f0d82b8409c8ee9c053
Author: Aron Budea 
AuthorDate: Tue May 28 22:06:00 2024 +0200
Commit: Aron Budea 
CommitDate: Tue May 28 22:06:00 2024 +0200

Bump version to 6.4.7.2.M11

Change-Id: Ie73a4e2c173e6c8eb4c1419ec30d217fbe4032f8

diff --git a/configure.ac b/configure.ac
index 8eeb0760a846..cc54360ef53c 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],[6.4.7.2.M10],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.7.2.M11],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: sw/uiconfig

[Oliver Specht (via logerrit)]

 sw/uiconfig/swriter/ui/fldvarpage.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6084962f93efc005b6827edceae12d3170f17ccd
Author: Oliver Specht 
AuthorDate: Tue May 28 11:46:54 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Tue May 28 22:08:50 2024 +0200

Set minimal size to variable field page

To see the increased height of the name and value fields
the edit field dialog needs a appropriate minimum size

Change-Id: Ic6c4a01bd969247f770f023ec5c368fed5322550
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168147
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui 
b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 9cfb4ce2bf8d..94782577de46 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -46,6 +46,8 @@
   
   
   
+600
+300
 True
 False
 True

core.git: Branch 'distro/mimo/mimo-6-2' - configure.ac

[Aron Budea (via logerrit)]

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

New commits:
commit a31d38b3497d4ebf53dfead97f199639165f123d
Author: Aron Budea 
AuthorDate: Tue May 28 22:08:19 2024 +0200
Commit: Aron Budea 
CommitDate: Tue May 28 22:08:19 2024 +0200

Bump version to 6.2.8.2.M14

Change-Id: Ibdc345ab70b708b23803356e6e8c45f7b23e7f55

diff --git a/configure.ac b/configure.ac
index d71d2b3ad3c0..05ecb1bae5e3 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],[6.2.8.2.M13],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M14],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 

core.git: Branch 'feature/cib_contract49c' - sw/uiconfig

[Oliver Specht (via logerrit)]

 sw/uiconfig/swriter/ui/fldvarpage.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1fe05d5ed9824aca1a2af79570e69e36aff1cfce
Author: Oliver Specht 
AuthorDate: Tue May 28 11:46:54 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Tue May 28 22:10:55 2024 +0200

Set minimal size to variable field page

To see the increased height of the name and value fields
the edit field dialog needs a appropriate minimum size

Change-Id: Ic6c4a01bd969247f770f023ec5c368fed5322550
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168147
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui 
b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 9cfb4ce2bf8d..94782577de46 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -46,6 +46,8 @@
   
   
   
+600
+300
 True
 False
 True

core.git: config_host.mk.in configure.ac solenv/gbuild static/README.wasm.md unotest/source

[Stephan Bergmann (via logerrit)]

 config_host.mk.in  |1 
 configure.ac   |   37 +++--
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |   15 --
 static/README.wasm.md  |   21 --
 unotest/source/embindtest/embindtest.js|   18 ++--
 5 files changed, 11 insertions(+), 81 deletions(-)

New commits:
commit 22ce8ed05be37d676739a578b05cc5217109fd87
Author: Stephan Bergmann 
AuthorDate: Tue May 28 15:16:32 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed May 29 08:01:38 2024 +0200

Emscripten: Unconditional --enable-wasm-exceptions

(...which will be beneficial, in turn, to implement exception handling in 
the
work-in-progress bridges/source/cpp_uno/gcc3_wasm UNO bridge).

As per

,
Wasm exceptions appear to be supported by most if not all relevant engines 
by
now.

* Lets see whether the "Note that to really use WASM exceptions everywhere" 
for
external libraries in solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk does 
have
any practical consequences (but ignoring it for now).

* This change depends on the preceding 
77129fbb74bcefde4551d494f029169e7c6026e3
"Emscripten: Add hack to prepare for --enable-wasm-exceptions" to work 
around
the issue that was mentioned in static/README.wasm.md.

* In unotest/source/embindtest/embindtest.js, getExceptionMessage started to
work now, no longer exhibiting the RuntimeError that had been documented 
there
for non-Wasm-based exceptions.

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 92ae275b43d5..334d9fd53f16 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -230,7 +230,6 @@ export ENABLE_SKIA=@ENABLE_SKIA@
 export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@
 export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
-export ENABLE_WASM_EXCEPTIONS=@ENABLE_WASM_EXCEPTIONS@
 export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP_CALC@
 export ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_WRITER=@ENABLE_WASM_STRIP_WRITER@
diff --git a/configure.ac b/configure.ac
index 22c95079f2d8..900f8227c01f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1431,9 +1431,9 @@ dnl 
===
 dnl Sanity checks for Emscripten SDK setup
 dnl ===
 
-EMSCRIPTEN_MIN_MAJOR=2
-EMSCRIPTEN_MIN_MINOR=0
-EMSCRIPTEN_MIN_TINY=32
+EMSCRIPTEN_MIN_MAJOR=3
+EMSCRIPTEN_MIN_MINOR=1
+EMSCRIPTEN_MIN_TINY=3
 
EMSCRIPTEN_MIN_VERSION="${EMSCRIPTEN_MIN_MAJOR}.${EMSCRIPTEN_MIN_MINOR}.${EMSCRIPTEN_MIN_TINY}"
 
 if test "$_os" = "Emscripten"; then
@@ -2148,13 +2148,6 @@ AC_ARG_WITH(main-module,
 Default value is 'writer'.]),
 ,)
 
-AC_ARG_ENABLE(wasm-exceptions,
-AS_HELP_STRING([--enable-wasm-exceptions],
-[Build with native WASM exceptions (AKA -fwasm-exceptions),
-matter of fact, this is currently not finished by any implementation)
-(see https://webassembly.org/roadmap/ for the current state]),
-,)
-
 AC_ARG_ENABLE(xmlhelp,
 AS_HELP_STRING([--disable-xmlhelp],
 [Disable XML help support]),
@@ -3249,23 +3242,6 @@ if test "$enable_wasm_strip" = "yes"; then
 AC_DEFINE(ENABLE_WASM_STRIP_SCEXPORTS)
 fi
 
-EMSCRIPTEN_NEH_MAJOR=3
-EMSCRIPTEN_NEH_MINOR=1
-EMSCRIPTEN_NEH_TINY=3
-EMSCRIPTEN_NEH_VERSION="${EMSCRIPTEN_NEH_MAJOR}.${EMSCRIPTEN_NEH_MINOR}.${EMSCRIPTEN_NEH_TINY}"
-
-if test "$enable_wasm_exceptions" = yes; then
-AC_MSG_CHECKING([if Emscripten version is at least $EMSCRIPTEN_NEH_VERSION 
for SjLj + native EH])
-check_semantic_version_three_prefixed EMSCRIPTEN NEH
-if test $? -ne 0; then
-AC_MSG_ERROR([no, found $EMSCRIPTEN_VERSION])
-else
-AC_MSG_RESULT([yes ($EMSCRIPTEN_VERSION)])
-fi
-ENABLE_WASM_EXCEPTIONS=TRUE
-fi
-AC_SUBST(ENABLE_WASM_EXCEPTIONS)
-
 # Whether to build "avmedia" functionality or not.
 
 if test "$enable_avmedia" = yes; then
@@ -6407,7 +6383,7 @@ if test -z "$enable_pch"; then
 enable_pch=no
 fi
 fi
-if test "$enable_pch" != no -a "$_os" = Emscripten -a 
"$ENABLE_WASM_EXCEPTIONS" = TRUE; then
+if test "$enable_pch" != no -a "$_os" = Emscripten; then
 AC_MSG_ERROR([PCH currently isn't supported for Emscripten with native EH 
(nEH) because of missing Sj/Lj support with nEH in clang.])
 fi
 if test "$enable_pch" != "no" -a "$_os" != "WINNT" -a "$GCC" != "yes" ; then
@@ -13368,12 +13344,9 @@ then
 AC_MSG_ERROR([No Qt5 WASM libQt5Gui.a in ${qt5_libdir}])
 fi
 QT5_WASM_SJLJ="`${EMSDK_LLVM_NM} "${qt5_libdir}"/l

core.git: include/sfx2 sfx2/source sfx2/uiconfig

[Heiko Tietze (via logerrit)]

 include/sfx2/dinfdlg.hxx|   31 ++-
 sfx2/source/dialog/dinfdlg.cxx  |  130 -
 sfx2/uiconfig/ui/descriptioninfopage.ui |  299 
 sfx2/uiconfig/ui/documentinfopage.ui|   78 
 sfx2/uiconfig/ui/linefragment.ui|  106 +--
 5 files changed, 239 insertions(+), 405 deletions(-)

New commits:
commit 2164406a973fd40fcc56b8839a21854f6b50a53b
Author: Heiko Tietze 
AuthorDate: Tue May 28 10:15:43 2024 +0200
Commit: Heiko Tietze 
CommitDate: Wed May 29 08:59:02 2024 +0200

Resolves tdf#160937 - Improve dialog size for document properties

linefragment.ui and documentinfopage.ui modified to keep
the usual dialog dimension

Change-Id: I1777e4094e584d676a48855717827aaed413e251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168139
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index d4743ed00ef5..c602a940c6f2 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -244,16 +244,31 @@ private:
 std::unique_ptr m_xTitleEd;
 std::unique_ptr m_xThemaEd;
 std::unique_ptr m_xKeywordsEd;
-std::unique_ptr m_xContributorEd;
-std::unique_ptr m_xCoverageEd;
-std::unique_ptr m_xIdentifierEd;
-std::unique_ptr m_xPublisherEd;
-std::unique_ptr m_xRelationEd;
-std::unique_ptr m_xRightsEd;
-std::unique_ptr m_xSourceEd;
-std::unique_ptr m_xTypeEd;
+std::unique_ptr m_xMoreTypes;
+std::unique_ptr m_xMoreValue;
 std::unique_ptr m_xCommentEd;
 
+DECL_LINK(MoreTypesHdl, weld::ComboBox&, void);
+DECL_LINK(MoreValueHdl, weld::Entry&, void);
+
+OUString m_sMoreValue_Contributor;
+OUString m_sMoreValue_Coverage;
+OUString m_sMoreValue_Identifier;
+OUString m_sMoreValue_Publisher;
+OUString m_sMoreValue_Relation;
+OUString m_sMoreValue_Rights;
+OUString m_sMoreValue_Source;
+OUString m_sMoreValue_Type;
+
+OUString m_sMoreValue_Contributor_Stored;
+OUString m_sMoreValue_Coverage_Stored;
+OUString m_sMoreValue_Identifier_Stored;
+OUString m_sMoreValue_Publisher_Stored;
+OUString m_sMoreValue_Relation_Stored;
+OUString m_sMoreValue_Rights_Stored;
+OUString m_sMoreValue_Source_Stored;
+OUString m_sMoreValue_Type_Stored;
+
 virtual boolFillItemSet( SfxItemSet* ) override;
 virtual voidReset( const SfxItemSet* ) override;
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index b1e5dbd92916..80387eacd85e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -624,18 +624,14 @@ SfxDocumentDescPage::SfxDocumentDescPage(weld::Container* 
pPage, weld::DialogCon
 , m_xTitleEd(m_xBuilder->weld_entry(u"title"_ustr))
 , m_xThemaEd(m_xBuilder->weld_entry(u"subject"_ustr))
 , m_xKeywordsEd(m_xBuilder->weld_entry(u"keywords"_ustr))
-, m_xContributorEd(m_xBuilder->weld_entry(u"contributor"_ustr))
-, m_xCoverageEd(m_xBuilder->weld_entry(u"coverage"_ustr))
-, m_xIdentifierEd(m_xBuilder->weld_entry(u"identifier"_ustr))
-, m_xPublisherEd(m_xBuilder->weld_entry(u"publisher"_ustr))
-, m_xRelationEd(m_xBuilder->weld_entry(u"relation"_ustr))
-, m_xRightsEd(m_xBuilder->weld_entry(u"rights"_ustr))
-, m_xSourceEd(m_xBuilder->weld_entry(u"source"_ustr))
-, m_xTypeEd(m_xBuilder->weld_entry(u"type"_ustr))
+, m_xMoreTypes(m_xBuilder->weld_combo_box("cbMoreTypes"))
+, m_xMoreValue(m_xBuilder->weld_entry("edMoreValue"))
 , m_xCommentEd(m_xBuilder->weld_text_view(u"comments"_ustr))
 {
-m_xCommentEd->set_size_request(m_xKeywordsEd->get_preferred_size().Width(),
-   m_xCommentEd->get_height_rows(16));
+m_xCommentEd->set_size_request(-1, 
//m_xKeywordsEd->get_preferred_size().Width(),
+   m_xCommentEd->get_height_rows(8));
+m_xMoreTypes->connect_changed(LINK(this, SfxDocumentDescPage, 
MoreTypesHdl));
+m_xMoreValue->connect_changed(LINK(this, SfxDocumentDescPage, 
MoreValueHdl));
 }
 
 SfxDocumentDescPage::~SfxDocumentDescPage()
@@ -653,14 +649,16 @@ bool SfxDocumentDescPage::FillItemSet(SfxItemSet *rSet)
 const bool bTitleMod = m_xTitleEd->get_value_changed_from_saved();
 const bool bThemeMod = m_xThemaEd->get_value_changed_from_saved();
 const bool bKeywordsMod = m_xKeywordsEd->get_value_changed_from_saved();
-const bool bContributorMod = 
m_xContributorEd->get_value_changed_from_saved();
-const bool bCoverageMod = m_xCoverageEd->get_value_changed_from_saved();
-const bool bIdentifierMod = 
m_xIdentifierEd->get_value_changed_from_saved();
-const bool bPublisherMod = m_xPublisherEd->get_value_changed_from_saved();
-const bool bRelationMod = m_xRelationEd->get_value_changed_from_saved();
-const bool bRightsMod = m_xRightsEd->get_value_changed_from_saved();
-const bool bSourceMod = m_