core.git: sw/source

2024-05-22 Thread Noel Grandin (via logerrit) 
 sw/source/ui/vba/vbaaddin.cxx|6 
 sw/source/ui/vba/vbaaddins.cxx   |4 
 sw/source/ui/vba/vbaapplication.cxx  |   14 +-
 sw/source/ui/vba/vbaautotextentry.cxx|   20 +--
 sw/source/ui/vba/vbabookmark.cxx |6 
 sw/source/ui/vba/vbabookmarks.cxx|6 
 sw/source/ui/vba/vbaborders.cxx  |   18 +-
 sw/source/ui/vba/vbacell.cxx |4 
 sw/source/ui/vba/vbacells.cxx|4 
 sw/source/ui/vba/vbacolumn.cxx   |4 
 sw/source/ui/vba/vbacolumns.cxx  |8 -
 sw/source/ui/vba/vbacontentcontrol.cxx   |  124 +--
 sw/source/ui/vba/vbacontentcontrollistentries.cxx|4 
 sw/source/ui/vba/vbacontentcontrollistentry.cxx  |6 
 sw/source/ui/vba/vbacontentcontrols.cxx  |4 
 sw/source/ui/vba/vbadialog.cxx   |4 
 sw/source/ui/vba/vbadialogs.cxx  |4 
 sw/source/ui/vba/vbadocument.cxx |   38 ++---
 sw/source/ui/vba/vbadocumentproperties.cxx   |   14 +-
 sw/source/ui/vba/vbadocuments.cxx|4 
 sw/source/ui/vba/vbaeventshelper.cxx |6 
 sw/source/ui/vba/vbafield.cxx|   18 +-
 sw/source/ui/vba/vbafilterpropsfromformat.hxx|   12 -
 sw/source/ui/vba/vbafind.cxx |   38 ++---
 sw/source/ui/vba/vbafont.cxx |6 
 sw/source/ui/vba/vbaformfield.cxx|   16 +-
 sw/source/ui/vba/vbaformfieldcheckbox.cxx|6 
 sw/source/ui/vba/vbaformfielddropdown.cxx|6 
 sw/source/ui/vba/vbaformfielddropdownlistentries.cxx |4 
 sw/source/ui/vba/vbaformfielddropdownlistentry.cxx   |4 
 sw/source/ui/vba/vbaformfields.cxx   |4 
 sw/source/ui/vba/vbaformfieldtextinput.cxx   |8 -
 sw/source/ui/vba/vbaframe.cxx|4 
 sw/source/ui/vba/vbaframes.cxx   |4 
 sw/source/ui/vba/vbaglobals.cxx  |8 -
 sw/source/ui/vba/vbaheaderfooter.cxx |4 
 sw/source/ui/vba/vbaheaderfooterhelper.cxx   |   12 -
 sw/source/ui/vba/vbaheadersfooters.cxx   |4 
 sw/source/ui/vba/vbainformationhelper.cxx|2 
 sw/source/ui/vba/vbalistformat.cxx   |   68 +-
 sw/source/ui/vba/vbalistgalleries.cxx|6 
 sw/source/ui/vba/vbalistgallery.cxx  |4 
 sw/source/ui/vba/vbalisthelper.cxx   |   18 +-
 sw/source/ui/vba/vbalistlevel.cxx|   50 +++
 sw/source/ui/vba/vbalistlevels.cxx   |6 
 sw/source/ui/vba/vbalisttemplate.cxx |6 
 sw/source/ui/vba/vbalisttemplates.cxx|6 
 sw/source/ui/vba/vbamailmerge.cxx|4 
 sw/source/ui/vba/vbaoptions.cxx  |4 
 sw/source/ui/vba/vbapagesetup.cxx|   82 ++--
 sw/source/ui/vba/vbapane.cxx |6 
 sw/source/ui/vba/vbapanes.cxx|4 
 sw/source/ui/vba/vbaparagraph.cxx|   12 -
 sw/source/ui/vba/vbaparagraphformat.cxx  |   74 +--
 sw/source/ui/vba/vbarange.cxx|   20 +--
 sw/source/ui/vba/vbarange.hxx|2 
 sw/source/ui/vba/vbareplacement.cxx  |4 
 sw/source/ui/vba/vbarevision.cxx |4 
 sw/source/ui/vba/vbarevisions.cxx|4 
 sw/source/ui/vba/vbarow.cxx  |   12 -
 sw/source/ui/vba/vbarows.cxx |   40 +++---
 sw/source/ui/vba/vbasection.cxx  |4 
 sw/source/ui/vba/vbasections.cxx |8 -
 sw/source/ui/vba/vbaselection.cxx|   62 -
 sw/source/ui/vba/vbastyle.cxx|   32 ++--
 sw/source/ui/vba/vbastyle.hxx|2 
 sw/source/ui/vba/vbastyles.cxx   |   12 -
 sw/source/ui/vba/vbasystem.cxx   |   10 -
 sw/source/ui/vba/vbatable.cxx|   20 +--
 sw/source/ui/vba/vbatablehelper.cxx  |6 
 sw/source/ui/vba/vbatableofcontents.cxx  |   16 +-
 sw/source/ui/vba/vbatables.cxx   |6 
 sw/source/ui/vba/vbatablesofcontents.cxx |8 -
 sw/source/ui/vba/vbatabstop.cxx  |4 
 sw/source/ui/vba/vbatabstops.cxx |8 -
 sw/source/ui/vba/vbatemplate.cxx |8 -
 sw/source/ui/vba/vbavariable.cxx |6 
 sw/source/ui/vba/vbavariables.cxx|4 
 sw/source/ui/vba/vbaview.cxx

core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

2024-05-22 Thread Rizal Muttaqin (via logerrit) 
 icon-themes/sifr/chart2/res/barofpie_52x60.png  |binary
 icon-themes/sifr/chart2/res/pieofpie_52x60.png  |binary
 icon-themes/sifr_dark/chart2/res/barofpie_52x60.png |binary
 icon-themes/sifr_dark/chart2/res/pieofpie_52x60.png |binary
 icon-themes/sifr_dark_svg/chart2/res/barofpie_52x60.svg |1 +
 icon-themes/sifr_dark_svg/chart2/res/pieofpie_52x60.svg |1 +
 icon-themes/sifr_svg/chart2/res/barofpie_52x60.svg  |1 +
 icon-themes/sifr_svg/chart2/res/pieofpie_52x60.svg  |1 +
 8 files changed, 4 insertions(+)

New commits:
commit b1f4a39a326bcaf06068914c03c3dea6f9aeebd8
Author: Rizal Muttaqin 
AuthorDate: Thu May 23 09:56:24 2024 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu May 23 08:15:10 2024 +0200

tdf#161092 Sifr: Graphics for bar-of-pie and pie-of-pie chart type

Change-Id: I10dafbcee04f51babb965ba8d7ddf1d1894dee8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167977
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sifr/chart2/res/barofpie_52x60.png 
b/icon-themes/sifr/chart2/res/barofpie_52x60.png
index 2992d878ad4a..1a063b61850d 100644
Binary files a/icon-themes/sifr/chart2/res/barofpie_52x60.png and 
b/icon-themes/sifr/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/sifr/chart2/res/pieofpie_52x60.png 
b/icon-themes/sifr/chart2/res/pieofpie_52x60.png
index 7e110f088feb..98f3f93fd679 100644
Binary files a/icon-themes/sifr/chart2/res/pieofpie_52x60.png and 
b/icon-themes/sifr/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/barofpie_52x60.png 
b/icon-themes/sifr_dark/chart2/res/barofpie_52x60.png
index 2992d878ad4a..d5365b46866b 100644
Binary files a/icon-themes/sifr_dark/chart2/res/barofpie_52x60.png and 
b/icon-themes/sifr_dark/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/pieofpie_52x60.png 
b/icon-themes/sifr_dark/chart2/res/pieofpie_52x60.png
index 7e110f088feb..af4c28697bd0 100644
Binary files a/icon-themes/sifr_dark/chart2/res/pieofpie_52x60.png and 
b/icon-themes/sifr_dark/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/sifr_dark_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/sifr_dark_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..f47d47cd4a7f
--- /dev/null
+++ b/icon-themes/sifr_dark_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sifr_dark_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/sifr_dark_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..f3cf9b8f5da4
--- /dev/null
+++ b/icon-themes/sifr_dark_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sifr_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/sifr_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..96ed2adc671b
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sifr_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/sifr_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..f7c57c5277f3
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file

core.git: icon-themes/elementary icon-themes/elementary_svg

2024-05-22 Thread Rizal Muttaqin (via logerrit) 
 icon-themes/elementary/chart2/res/barofpie_52x60.png |binary
 icon-themes/elementary/chart2/res/pieofpie_52x60.png |binary
 icon-themes/elementary_svg/chart2/res/barofpie_52x60.svg |1 +
 icon-themes/elementary_svg/chart2/res/pieofpie_52x60.svg |1 +
 4 files changed, 2 insertions(+)

New commits:
commit 87734c11fd634b3123559b1994b179e96810dd7c
Author: Rizal Muttaqin 
AuthorDate: Thu May 23 10:39:54 2024 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu May 23 08:14:52 2024 +0200

tdf#161092 elementary: Graphics for bar-of-pie and pie-of-pie chart type

Change-Id: I70cef278536b3a64551d0b0e4548f666bbdac373
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167978
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/chart2/res/barofpie_52x60.png 
b/icon-themes/elementary/chart2/res/barofpie_52x60.png
index 2992d878ad4a..6c9446ef5695 100644
Binary files a/icon-themes/elementary/chart2/res/barofpie_52x60.png and 
b/icon-themes/elementary/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/elementary/chart2/res/pieofpie_52x60.png 
b/icon-themes/elementary/chart2/res/pieofpie_52x60.png
index 7e110f088feb..85c62300fb78 100644
Binary files a/icon-themes/elementary/chart2/res/pieofpie_52x60.png and 
b/icon-themes/elementary/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/elementary_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/elementary_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..7a5e072049bb
--- /dev/null
+++ b/icon-themes/elementary_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/elementary_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..b3e18d6d27ee
--- /dev/null
+++ b/icon-themes/elementary_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file

core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

2024-05-22 Thread Rizal Muttaqin (via logerrit) 
 icon-themes/breeze/chart2/res/barofpie_52x60.png  |binary
 icon-themes/breeze/chart2/res/pieofpie_52x60.png  |binary
 icon-themes/breeze_dark/chart2/res/barofpie_52x60.png |binary
 icon-themes/breeze_dark/chart2/res/pieofpie_52x60.png |binary
 icon-themes/breeze_dark_svg/chart2/res/barofpie_52x60.svg |1 +
 icon-themes/breeze_dark_svg/chart2/res/pieofpie_52x60.svg |1 +
 icon-themes/breeze_svg/chart2/res/barofpie_52x60.svg  |1 +
 icon-themes/breeze_svg/chart2/res/pieofpie_52x60.svg  |1 +
 8 files changed, 4 insertions(+)

New commits:
commit f45270827c8bb32c58790a75e3fec3770be6b16f
Author: Rizal Muttaqin 
AuthorDate: Thu May 23 08:36:22 2024 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu May 23 08:14:30 2024 +0200

tdf#161092 Breeze: Graphics for bar-of-pie and pie-of-pie chart type

Change-Id: I6f0f794abe567020f4e7e0d758ac9132b57611fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167976
Tested-by: Rizal Muttaqin 
Reviewed-by: Rizal Muttaqin 
Tested-by: Jenkins

diff --git a/icon-themes/breeze/chart2/res/barofpie_52x60.png 
b/icon-themes/breeze/chart2/res/barofpie_52x60.png
index 2992d878ad4a..5dbde0d3cf03 100644
Binary files a/icon-themes/breeze/chart2/res/barofpie_52x60.png and 
b/icon-themes/breeze/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/breeze/chart2/res/pieofpie_52x60.png 
b/icon-themes/breeze/chart2/res/pieofpie_52x60.png
index 7e110f088feb..78a7887f9fec 100644
Binary files a/icon-themes/breeze/chart2/res/pieofpie_52x60.png and 
b/icon-themes/breeze/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/breeze_dark/chart2/res/barofpie_52x60.png 
b/icon-themes/breeze_dark/chart2/res/barofpie_52x60.png
index 2992d878ad4a..2868e4ab7653 100644
Binary files a/icon-themes/breeze_dark/chart2/res/barofpie_52x60.png and 
b/icon-themes/breeze_dark/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/breeze_dark/chart2/res/pieofpie_52x60.png 
b/icon-themes/breeze_dark/chart2/res/pieofpie_52x60.png
index 7e110f088feb..26e44089c5f9 100644
Binary files a/icon-themes/breeze_dark/chart2/res/pieofpie_52x60.png and 
b/icon-themes/breeze_dark/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/breeze_dark_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/breeze_dark_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..17137a119498
--- /dev/null
+++ b/icon-themes/breeze_dark_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/breeze_dark_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/breeze_dark_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..c2a266f51714
--- /dev/null
+++ b/icon-themes/breeze_dark_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/breeze_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/breeze_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..0494764c842c
--- /dev/null
+++ b/icon-themes/breeze_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/breeze_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/breeze_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..54142e627a63
--- /dev/null
+++ b/icon-themes/breeze_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file

core.git: android/source

2024-05-22 Thread Weblate (via logerrit) 
 android/source/res/values-iw/strings.xml |2 ++
 android/source/res/values-ja/strings.xml |4 
 android/source/res/values-ka/strings.xml |2 ++
 3 files changed, 8 insertions(+)

New commits:
commit 15e60dfeacbc7acf4ccaabe2b3e062a01d18f658
Author: Weblate 
AuthorDate: Wed May 22 10:48:14 2024 +0200
Commit: Michael Weghorn 
CommitDate: Thu May 23 08:07:50 2024 +0200

Added translation for android-viewer using Weblate (Georgian)

Change-Id: I4058a4698582256a31ebb21379c0a66b22e2a1cc

android-viewer translated using Weblate

Japanese currently translated at 65.5% (76 of 116 strings)

Change-Id: I74e48d5d605e25ebf39e2a8bd73495274ee94855

Added translation for android-viewer using Weblate (Hebrew)

Change-Id: I491b69291975d22c0552cc20e93f2042cc70e4b0

Update translation files for android-viewer

Updated by "Cleanup translation files" hook in Weblate.

Change-Id: Iea28e4d8bf859accdb1c16bb4c6836237a4d2b26

android-viewer translated using Weblate

Japanese currently translated at 61.0% (72 of 118 strings)

Change-Id: I741c23b1048d4857605d73aad34668c29234dd6f

android-viewer translated using Weblate

Catalan currently translated at 100.0% (118 of 118 strings)

Change-Id: I9cbcf579a5c634adf0686e43aa4dca069c2dd577

Added translation for android-viewer using Weblate (Esperanto)

Change-Id: Ibcf6e82a860c5e789d6ee89dace30d1457a60c22

android-viewer translated using Weblate

Japanese currently translated at 39.8% (47 of 118 strings)

Change-Id: I9efdbae451a5313cb5b8ef4a1abca6969696969b
Co-authored-by: Adolfo Jayme Barrientos 
Co-authored-by: Ekaterine Papava 
Co-authored-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Co-authored-by: Weblate 
Co-authored-by: Yaron Shahrabani 
Translate-URL: 
https://translations.documentfoundation.org/projects/android-viewer/android-strings/
Translate-URL: 
https://translations.documentfoundation.org/projects/android-viewer/android-strings/ca/
Translate-URL: 
https://translations.documentfoundation.org/projects/android-viewer/android-strings/ja/
Translation: android-viewer/android-strings
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167895
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/android/source/res/values-iw/strings.xml 
b/android/source/res/values-iw/strings.xml
new file mode 100644
index ..a6b3daec9354
--- /dev/null
+++ b/android/source/res/values-iw/strings.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/android/source/res/values-ja/strings.xml 
b/android/source/res/values-ja/strings.xml
index 7d56fc41c752..0454aa3575a2 100644
--- a/android/source/res/values-ja/strings.xml
+++ b/android/source/res/values-ja/strings.xml
@@ -72,4 +72,8 @@
 表の挿入
 スライドを追加
 文字
+PDFにエクスポートできません
+スタイル
+値
+ファイルを保存できません
 
\ No newline at end of file
diff --git a/android/source/res/values-ka/strings.xml 
b/android/source/res/values-ka/strings.xml
new file mode 100644
index ..a6b3daec9354
--- /dev/null
+++ b/android/source/res/values-ka/strings.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file

core.git: icon-themes/sukapura icon-themes/sukapura_dark icon-themes/sukapura_dark_svg icon-themes/sukapura_svg

2024-05-22 Thread Rizal Muttaqin (via logerrit) 
 icon-themes/sukapura/chart2/res/barofpie_52x60.png  |binary
 icon-themes/sukapura/chart2/res/pieofpie_52x60.png  |binary
 icon-themes/sukapura_dark/chart2/res/barofpie_52x60.png |binary
 icon-themes/sukapura_dark/chart2/res/pieofpie_52x60.png |binary
 icon-themes/sukapura_dark_svg/chart2/res/barofpie_52x60.svg |1 +
 icon-themes/sukapura_dark_svg/chart2/res/pieofpie_52x60.svg |1 +
 icon-themes/sukapura_svg/chart2/res/barofpie_52x60.svg  |1 +
 icon-themes/sukapura_svg/chart2/res/pieofpie_52x60.svg  |1 +
 8 files changed, 4 insertions(+)

New commits:
commit a46736cfe6b5188e840129b6aa26fc2970893474
Author: Rizal Muttaqin 
AuthorDate: Thu May 23 08:01:13 2024 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu May 23 05:08:09 2024 +0200

tdf#161092 Sukapura: Graphics for bar-of-pie and pie-of-pie chart type

Change-Id: Ib28fb1e40c76c951cb7bec4a98b2aecefb3c83ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167974
Tested-by: Rizal Muttaqin 
Reviewed-by: Rizal Muttaqin 
Tested-by: Jenkins

diff --git a/icon-themes/sukapura/chart2/res/barofpie_52x60.png 
b/icon-themes/sukapura/chart2/res/barofpie_52x60.png
index 2992d878ad4a..e76852f030f6 100644
Binary files a/icon-themes/sukapura/chart2/res/barofpie_52x60.png and 
b/icon-themes/sukapura/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/sukapura/chart2/res/pieofpie_52x60.png 
b/icon-themes/sukapura/chart2/res/pieofpie_52x60.png
index 7e110f088feb..bdfaf19f598d 100644
Binary files a/icon-themes/sukapura/chart2/res/pieofpie_52x60.png and 
b/icon-themes/sukapura/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/sukapura_dark/chart2/res/barofpie_52x60.png 
b/icon-themes/sukapura_dark/chart2/res/barofpie_52x60.png
index 2992d878ad4a..a42d48702aad 100644
Binary files a/icon-themes/sukapura_dark/chart2/res/barofpie_52x60.png and 
b/icon-themes/sukapura_dark/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/sukapura_dark/chart2/res/pieofpie_52x60.png 
b/icon-themes/sukapura_dark/chart2/res/pieofpie_52x60.png
index 7e110f088feb..4d3dde6bcd36 100644
Binary files a/icon-themes/sukapura_dark/chart2/res/pieofpie_52x60.png and 
b/icon-themes/sukapura_dark/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/sukapura_dark_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/sukapura_dark_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..7abcfba20803
--- /dev/null
+++ b/icon-themes/sukapura_dark_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_dark_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/sukapura_dark_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..618524b9a936
--- /dev/null
+++ b/icon-themes/sukapura_dark_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/sukapura_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..34bdd70603f6
--- /dev/null
+++ b/icon-themes/sukapura_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/sukapura_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..494bba2e9280
--- /dev/null
+++ b/icon-themes/sukapura_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file

core.git: icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg

2024-05-22 Thread Rizal Muttaqin (via logerrit) 
 icon-themes/colibre/chart2/res/barofpie_52x60.png  |binary
 icon-themes/colibre/chart2/res/pieofpie_52x60.png  |binary
 icon-themes/colibre_dark/chart2/res/barofpie_52x60.png |binary
 icon-themes/colibre_dark/chart2/res/pieofpie_52x60.png |binary
 icon-themes/colibre_dark_svg/chart2/res/barofpie_52x60.svg |1 +
 icon-themes/colibre_dark_svg/chart2/res/pieofpie_52x60.svg |1 +
 icon-themes/colibre_svg/chart2/res/barofpie_52x60.svg  |1 +
 icon-themes/colibre_svg/chart2/res/pieofpie_52x60.svg  |1 +
 8 files changed, 4 insertions(+)

New commits:
commit eb3ae3234e098e1ee605624b0cac4c90436628d0
Author: Rizal Muttaqin 
AuthorDate: Thu May 23 06:43:47 2024 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu May 23 03:14:11 2024 +0200

tdf#161092 Colibre: Graphics for bar-of-pie and pie-of-pie chart type

Change-Id: I6af94e0792b17c58dc673732a0c96a844143315b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167972
Tested-by: Jenkins
Tested-by: Rizal Muttaqin 
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/chart2/res/barofpie_52x60.png 
b/icon-themes/colibre/chart2/res/barofpie_52x60.png
index 2992d878ad4a..977599cbec8a 100644
Binary files a/icon-themes/colibre/chart2/res/barofpie_52x60.png and 
b/icon-themes/colibre/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/colibre/chart2/res/pieofpie_52x60.png 
b/icon-themes/colibre/chart2/res/pieofpie_52x60.png
index 7e110f088feb..5d54b93133c9 100644
Binary files a/icon-themes/colibre/chart2/res/pieofpie_52x60.png and 
b/icon-themes/colibre/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/colibre_dark/chart2/res/barofpie_52x60.png 
b/icon-themes/colibre_dark/chart2/res/barofpie_52x60.png
index 2992d878ad4a..3d3e95b8a1a6 100644
Binary files a/icon-themes/colibre_dark/chart2/res/barofpie_52x60.png and 
b/icon-themes/colibre_dark/chart2/res/barofpie_52x60.png differ
diff --git a/icon-themes/colibre_dark/chart2/res/pieofpie_52x60.png 
b/icon-themes/colibre_dark/chart2/res/pieofpie_52x60.png
index 7e110f088feb..5b14f4ece8cd 100644
Binary files a/icon-themes/colibre_dark/chart2/res/pieofpie_52x60.png and 
b/icon-themes/colibre_dark/chart2/res/pieofpie_52x60.png differ
diff --git a/icon-themes/colibre_dark_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/colibre_dark_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..f503e82d0086
--- /dev/null
+++ b/icon-themes/colibre_dark_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_dark_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/colibre_dark_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..67814dcf878a
--- /dev/null
+++ b/icon-themes/colibre_dark_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/chart2/res/barofpie_52x60.svg 
b/icon-themes/colibre_svg/chart2/res/barofpie_52x60.svg
new file mode 100644
index ..1a576ae7edad
--- /dev/null
+++ b/icon-themes/colibre_svg/chart2/res/barofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/chart2/res/pieofpie_52x60.svg 
b/icon-themes/colibre_svg/chart2/res/pieofpie_52x60.svg
new file mode 100644
index ..63891ac05574
--- /dev/null
+++ b/icon-themes/colibre_svg/chart2/res/pieofpie_52x60.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file

core.git: sd/source

2024-05-22 Thread Justin Luth (via logerrit) 
 sd/source/ui/view/ToolBarManager.cxx |   71 ---
 1 file changed, 34 insertions(+), 37 deletions(-)

New commits:
commit cdbd4139790383052f004def482f32fdec604fbb
Author: Justin Luth 
AuthorDate: Wed May 22 17:50:55 2024 -0400
Commit: Justin Luth 
CommitDate: Thu May 23 02:26:26 2024 +0200

Revert "tdf#126095 sd notebookbar: don't force table/media toolbar"

This reverts my 24.2 commit e58e251756ecb0312cb6891d4df23e17ef8f6fcb.

Unintended side affect in Draw (not Writer) sidebar.

Change-Id: I948263c1e8be1202e0504f109d84ce4469ddf45d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167970
Reviewed-by: Justin Luth 
Tested-by: Jenkins

diff --git a/sd/source/ui/view/ToolBarManager.cxx 
b/sd/source/ui/view/ToolBarManager.cxx
index 5296b7bd94ef..afb5c135e1d6 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1045,49 +1045,46 @@ void ToolBarRules::SelectionHasChanged (
 
 mpToolBarManager->ResetToolBars(ToolBarManager::ToolBarGroup::Function);
 
-if (!sfx2::SfxNotebookBar::IsActive())
+switch (rView.GetContext())
 {
-switch (rView.GetContext())
-{
-case SdrViewContext::Graphic:
-if (!bTextEdit)
-
mpToolBarManager->SetToolBarShell(ToolBarManager::ToolBarGroup::Function,
-  
ToolbarId::Draw_Graf_Toolbox);
-break;
-
-case SdrViewContext::Media:
-if (!bTextEdit)
-
mpToolBarManager->SetToolBarShell(ToolBarManager::ToolBarGroup::Function,
-  
ToolbarId::Draw_Media_Toolbox);
-break;
+case SdrViewContext::Graphic:
+if (!bTextEdit)
+
mpToolBarManager->SetToolBarShell(ToolBarManager::ToolBarGroup::Function,
+  
ToolbarId::Draw_Graf_Toolbox);
+break;
 
-case SdrViewContext::Table:
+case SdrViewContext::Media:
+if (!bTextEdit)
 
mpToolBarManager->SetToolBarShell(ToolBarManager::ToolBarGroup::Function,
-  
ToolbarId::Draw_Table_Toolbox);
-bTextEdit = true;
-break;
+  
ToolbarId::Draw_Media_Toolbox);
+break;
 
-case SdrViewContext::Standard:
-default:
-if (!bTextEdit)
+case SdrViewContext::Table:
+
mpToolBarManager->SetToolBarShell(ToolBarManager::ToolBarGroup::Function,
+  ToolbarId::Draw_Table_Toolbox);
+bTextEdit = true;
+break;
+
+case SdrViewContext::Standard:
+default:
+if (!bTextEdit)
+{
+switch(rViewShell.GetShellType())
 {
-switch(rViewShell.GetShellType())
-{
-case ::sd::ViewShell::ST_IMPRESS:
-case ::sd::ViewShell::ST_DRAW:
-case ::sd::ViewShell::ST_NOTES:
-case ::sd::ViewShell::ST_HANDOUT:
-
mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Function,
- 
ToolBarManager::msDrawingObjectToolBar);
-
mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Permanent,
- 
ToolBarManager::msToolBar);
-break;
-default:
-break;
-}
-break;
+case ::sd::ViewShell::ST_IMPRESS:
+case ::sd::ViewShell::ST_DRAW:
+case ::sd::ViewShell::ST_NOTES:
+case ::sd::ViewShell::ST_HANDOUT:
+
mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Function,
+ 
ToolBarManager::msDrawingObjectToolBar);
+
mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Permanent,
+ 
ToolBarManager::msToolBar);
+break;
+default:
+break;
 }
-}
+break;
+}
 }
 
 if( bTextEdit )

core.git: sw/source

2024-05-22 Thread Justin Luth (via logerrit) 
 sw/source/filter/ww8/docxattributeoutput.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fe5b4257d852b937652d55f2272ed535835d85c5
Author: Justin Luth 
AuthorDate: Wed May 22 12:22:07 2024 -0400
Commit: Justin Luth 
CommitDate: Wed May 22 23:22:17 2024 +0200

NFC IsInline includes GetAnchorId() == RndStdIds::FLY_AS_CHAR

m_bIsInline is either forced true,
or is set by GetAnchorId() == RndStdIds::FLY_AS_CHAR.
Nothing sets it to false, but it can become true with
ForceTreatAsInline.

So, no need to check for FLY_AS_CHAR if we also allow IsInline.

Change-Id: I5f7a158962dcde1fd2d642ffd54e0995a69ad841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167966
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 20ce68a5b08c..682959b33f33 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6409,8 +6409,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl(const 
ww8::Frame& rFrame, const Po
 /// support that feature, instead it postponed and exported
 /// later when the original shape closed.
 
-if (rFrame.GetFrameFormat().GetAnchor().GetAnchorId() == 
RndStdIds::FLY_AS_CHAR
-|| rFrame.IsInline())
+if (rFrame.IsInline())
 {
 m_nEmbedFlyLevel++;
 WriteFlyFrame(rFrame);

RE: VS 2022 version 17.9.1 has a bug preventing building cli_ure

2024-05-22 Thread Vasily Melenchuk 
New version of Visual Studio 17.10.0 has exactly the same issue again. 
Do not hurry with update.

LINK : error LNK2034: metadata inconsistent with COFF symbol table: 
symbol '?   rtl_ustr_asciil_reverseEquals_WithLength@@$$J0YAEPEB_SPEBDJ@Z' 
(06000589) has inconsistent metadata with(0A000A14) in climaker_emit.o
climaker_emit.o : error LNK2020: unresolved token (0A000A14) "extern 
"C" unsigned char __cdecl  rtl_ustr_asciil_reverseEquals_WithLength(char16_t 
const *,char const *,long)" (?
rtl_ustr_asciil_reverseEquals_WithLength@@$$J0YAEPEB_SPEBDJ@Z)
D:\libreoffice\master\instdir\sdk\bin\climaker.exe : fatal error 
LNK1120: 1 unresolved externals



-Original Message-
From: LibreOffice  On Behalf Of 
Oliver Brinzing
Sent: Thursday, March 21, 2024 10:58 PM
To: libreoffice@lists.freedesktop.org
Subject: Re: VS 2022 version 17.9.1 has a bug preventing building cli_ure

Am 20.03.2024 um 06:01 schrieb Mike Kaganski:
> On 24.02.2024 21:50, Mike Kaganski wrote:
>> After upgrading my VS v.17.9.0 to v.17.9.1, building cli_ure started to fail 
>> like this:
>>
>>> LINK : error LNK2034: metadata inconsistent with COFF symbol table: 
>>> symbol 
>>> '?rtl_ustr_asciil_reverseEquals_WithLength@@$$J0YAEPEB_SPEBDJ@Z' 
>>> (06000579) has inconsistent metadata with (0A000A1A) in 
>>> climaker_emit.o climaker_emit.o : error LNK2020: unresolved token 
>>> (0A000A1A) "extern "C" unsigned char __cdecl 
>>> rtl_ustr_asciil_reverseEquals_WithLength(char16_t const *,char const 
>>> *,long)"
>>> (?rtl_ustr_asciil_reverseEquals_WithLength@@$$J0YAEPEB_SPEBDJ@Z)
>>> C:\lo\build\instdir\sdk\bin\climaker.exe : fatal error LNK1120: 1 
>>> unresolved externals
>>
>> I have filed a bug to Microsoft:
>>
>> https://deu01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdev
>> elopercommunity.visualstudio.com%2Ft%2FLINK-%3A-error-LNK2034%3A-meta
>> data-inconsis%2F10599604%3Fport%3D1025%26fsid%3Dfdff4046-995a-4c06-8c
>> 64-1c14b9752c8f&data=05%7C02%7Cvasily.melenchuk%40cib.de%7C18f799eaae
>> bb4c97b38108dc49e142af%7C00dd3e38f5434e1a88b93dbb13d75c49%7C0%7C0%7C6
>> 38466479173686144%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjo
>> iV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C4%7C%7C%7C&sdata=5yAjhj
>> 9ym%2FhxgKpBUeYmnNftJ2md%2F8D82udjjOOKr%2BY%3D&reserved=0
>
> This problem is fixed in VS 2022 version 17.9.4:
> https://deu01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flear
> n.microsoft.com%2Fen-us%2Fvisualstudio%2Freleases%2F2022%2Frelease-not
> es%2317.9.4&data=05%7C02%7Cvasily.melenchuk%40cib.de%7C18f799eaaebb4c9
> 7b38108dc49e142af%7C00dd3e38f5434e1a88b93dbb13d75c49%7C0%7C0%7C6384664
> 79173695033%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMz
> IiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C4%7C%7C%7C&sdata=%2FvnkJSIPmEMe
> S4bWkRU%2B3sSDSJ0BzdEZ2ERpL8Lh%2F6Y%3D&reserved=0
>

yes, it works again with VS 2022

btw: i had a build break after a "clean build":

cd /cygdrive/d/sources/libo-core
./g checkout master
./g fetch --tags
./g pull -r

/opt/lo/bin/make clean gb_COLOR=1 gb_TITLES=1

/cygdrive/d/sources/libo-core/autogen.sh \ 
--with-external-tar=/cygdrive/d/sources/lo-externalsrc \ 
--with-junit=/cygdrive/d/sources/junit-4.10.jar \
--with-ant-home=/cygdrive/d/sources/apache-ant-1.9.5 \
--with-jdk-home=/cygdrive/d/Programme/Java/jdk-17 \ --enable-pch \ 
--disable-ccache \ --enable-debug \ --disable-odk \ --disable-online-update \
--with-visual-studio=2022

/opt/lo/bin/make build gb_COLOR=1 gb_TITLES=1 2>&1 | tee build.log

[...]
[PAT] icu
[BIN] dragonbox
[MOD] frozen
[BIN] glm
Configuring OpenSSL version 3.0.13 for target VC-WIN64A Using os-specific seed 
configuration
/cygdrive/d/sources/libo-core/workdir/UnpackedTarball/openssl/crypto/sha/../providers:
 No such file or directory at Configure line 3419.
make[1]: *** 
[D:/sources/libo-core/external/openssl/ExternalProject_openssl.mk:67:
D:/sources/libo-core/workdir/ExternalProject/openssl/build] Error 1
make[1]: *** Waiting for unfinished jobs

but folder "providers" is located at:

/cygdrive/d/sources/libo-core/workdir/UnpackedTarball/openssl/providers

workaround: copy folder "providers" to:

/cygdrive/d/sources/libo-core/workdir/UnpackedTarball/openssl/crypto

core.git: sw/inc sw/source

2024-05-22 Thread Caolán McNamara (via logerrit) 
 sw/inc/PostItMgr.hxx |2 +
 sw/source/uibase/docvw/PostItMgr.cxx |   40 +--
 2 files changed, 26 insertions(+), 16 deletions(-)

New commits:
commit 80f7f3e8099e05632201d7b18de0112153ebc1ba
Author: Caolán McNamara 
AuthorDate: Wed May 22 11:13:12 2024 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 22 22:24:41 2024 +0200

split a piece of code out as a standalone GetOrCreateAnnotationWindow

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

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 2278ae05ea6f..1a6dac4a8f62 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -132,6 +132,8 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public 
SfxListener
 SwSidebarItem*  InsertItem( SfxBroadcaster* pItem, bool 
bCheckExistence, bool bFocus);
 voidRemoveItem( SfxBroadcaster* pBroadcast );
 
+VclPtr 
GetOrCreateAnnotationWindow(SwSidebarItem& rItem);
+
 public:
 SwPostItMgr(SwView* aDoc);
 virtual ~SwPostItMgr() override;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index 32d0f938e71c..95eaea2a5557 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -695,6 +695,28 @@ void SwPostItMgr::PreparePageContainer()
 }
 }
 
+VclPtr 
SwPostItMgr::GetOrCreateAnnotationWindow(SwSidebarItem& rItem)
+{
+VclPtr pPostIt = rItem.mpPostIt;
+if (!pPostIt)
+{
+pPostIt = rItem.GetSidebarWindow( mpView->GetEditWin(),
+  *this );
+pPostIt->InitControls();
+pPostIt->SetReadonly(mbReadOnly);
+rItem.mpPostIt = pPostIt;
+if (mpAnswer)
+{
+if (pPostIt->GetPostItField()->GetParentPostItId() != 0) //do we 
really have another note in front of this one
+{
+pPostIt->InitAnswer(*mpAnswer);
+}
+mpAnswer.reset();
+}
+}
+return rItem.mpPostIt;
+}
+
 void SwPostItMgr::LayoutPostIts()
 {
 const bool bLoKitActive = comphelper::LibreOfficeKit::isActive();
@@ -724,24 +746,9 @@ void SwPostItMgr::LayoutPostIts()
 
 for (auto const& pItem : pPage->mvSidebarItems)
 {
-VclPtr pPostIt = pItem->mpPostIt;
-
 if (pItem->mbShow)
 {
-if (!pPostIt)
-{
-pPostIt = pItem->GetSidebarWindow( 
mpView->GetEditWin(),
-  *this );
-pPostIt->InitControls();
-pPostIt->SetReadonly(mbReadOnly);
-pItem->mpPostIt = pPostIt;
-if (mpAnswer)
-{
-if 
(pPostIt->GetPostItField()->GetParentPostItId() != 0) //do we really have 
another note in front of this one
-pPostIt->InitAnswer(*mpAnswer);
-mpAnswer.reset();
-}
-}
+VclPtr pPostIt = 
GetOrCreateAnnotationWindow(*pItem);
 
 pPostIt->SetChangeTracking(
 pItem->mLayoutStatus,
@@ -808,6 +815,7 @@ void SwPostItMgr::LayoutPostIts()
 }
 else // we don't want to see it
 {
+VclPtr pPostIt = pItem->mpPostIt;
 if (pPostIt)
 pPostIt->HideNote();
 }

Minutes from the UX/design meeting 2023-May-22

2024-05-22 Thread Heiko Tietze 

Present:  Eyal, Sahil, John, Heiko
Comments: Aron, Jan

Tickets/Topics

 * When you select part of a column with merged cells, all columns that
   are part of the merged cell are selected
   + https://bugs.documentfoundation.org/show_bug.cgi?id=158288
   + NAB (Aron),
   + selection should denote/depict the merged cells (Eyal) vs.
 selection starts on top-left to bottom-right
   + we are Excel compatible, and actually even better (Heiko)
   + is a range-selection (not to confuse with multiple cells) meant to
 include all from x1 to y2; if so the behavior is correct
   + merged cells take actually the content from the top-left cell
   + copying of multi-selections is not possible
   + unclear use case, potentially impacting the workflow of many
 users (John)
   => comment with needinfo

 * Want MS-Word like auto-formatting of beginning of list item
   + https://bugs.documentfoundation.org/show_bug.cgi?id=158874
   + cool stuff (John)
   + could it be done via extension (Sahil)
   => do it

 * Form creating is too niche to merit a main menu item visible by default
   + https://bugs.documentfoundation.org/show_bug.cgi?id=161031
   + rarely used; conditional logic tricky to maintain and test (Jan)
   + was done to align with other modules, IIRC (Heiko)
   + changing the main menu is a PITA for users, showing conditionally like
 "View > [ ] Show Forms Menu" and also "[ ] Show Shapes Menu" is possible
  but would be quite uncommon; = NAB/WF (Heiko)
   + no strong opinion (John, Sahil)
   => resolve WF to safe users from the annoyance of changing menus

 * FORMCONTROLS: Add ability to Find and Replace field names
   + https://bugs.documentfoundation.org/show_bug.cgi?id=160938
   + intention is to (batch) rename fields, which is not needed (Heiko)
   + finding controls might make sense for a huge number of items, which
 is not so likely; and the Navigator lists the content nicely plus
 will have different sort methods (Heiko, John)
   + being an ODF editor requires a place to find everything which
 is defined (Eyal)
   + F&R with RegEx works well and might be handy for object names in
 some cases (Eyal)
   => both points are valid, keep ticket


OpenPGP_signature.asc
Description: OpenPGP digital signature

core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source include/sfx2 include/unotools officecfg/registry Repository.mk sfx2/sdi sfx2/source vcl/Module_vcl.mk vcl

2024-05-22 Thread Heiko Tietze (via logerrit) 
 Repository.mk  |1 
 cui/Library_cui.mk |1 
 cui/UIConfig_cui.mk|1 
 cui/inc/whatsnew.hrc   |   42 -
 cui/source/dialogs/whatsnew.cxx|  172 
 cui/source/factory/dlgfact.cxx |   14 
 cui/source/factory/dlgfact.hxx |2 
 cui/source/inc/whatsnew.hxx|   79 ---
 cui/uiconfig/ui/whatsnewdialog.ui  |  131 --
 dev/null   |binary
 include/sfx2/sfxdlg.hxx|2 
 include/sfx2/sfxsids.hrc   |3 
 include/sfx2/strings.hrc   |2 
 include/sfx2/viewfrm.hxx   |1 
 include/unotools/VersionConfig.hxx |5 
 officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs |6 
 officecfg/registry/schema/org/openoffice/Setup.xcs |2 
 sfx2/sdi/appslots.sdi  |4 
 sfx2/sdi/sfx.sdi   |   16 
 sfx2/source/appl/appserv.cxx   |9 
 sfx2/source/dialog/infobar.cxx |2 
 sfx2/source/view/viewfrm.cxx   |  212 
+-
 vcl/Module_vcl.mk  |1 
 vcl/Package_whatsnew.mk|   20 
 24 files changed, 124 insertions(+), 604 deletions(-)

New commits:
commit 1bd9747a126a3e82b6093c2b4af3b3a74774a3e9
Author: Heiko Tietze 
AuthorDate: Wed May 22 13:18:27 2024 +0200
Commit: Heiko Tietze 
CommitDate: Wed May 22 21:19:46 2024 +0200

tdf#161209 - Reverts WhatsNew/Welcome dialog

dd889b290304b73f96a9a8e6e0f144d3aa2ba7e1

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

diff --git a/Repository.mk b/Repository.mk
index b86eb1bc5646..4a505655d209 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -925,7 +925,6 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE)
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
tipoftheday_images \
-   whatsnew_images \
 ))
 endif
 
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 3ee744e32d0f..e01e33ecb4ec 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 cui/source/customize/SvxNotebookbarConfigPage \
 cui/source/customize/CustomNotebookbarGenerator \
 cui/source/dialogs/about \
-cui/source/dialogs/whatsnew \
 $(call gb_Helper_optional,EXTENSIONS, \
 cui/source/dialogs/AdditionsDialog) \
 cui/source/dialogs/colorpicker \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 79ff7696a93a..10acd83c8c39 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -18,7 +18,6 @@ endif
 ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE)
 $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/tipofthedaydialog \
-   cui/uiconfig/ui/whatsnewdialog \
 ))
 endif
 
diff --git a/cui/inc/whatsnew.hrc b/cui/inc/whatsnew.hrc
deleted file mode 100644
index e155a597bcf2..
--- a/cui/inc/whatsnew.hrc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#pragma once
-
-#define NC_(Context, String) TranslateId(Context, u8##String)
-
-#include 
-#include 
-#include 
-#include 
-
-/*
- * std:tuple consists of 
- * image:
-   * place new images at extra/source/whatsnew
-   * do not forget to add the files to vcl/Package_whatsnew.mk
-   * images are cut-off at 600x400px
-*/
-
-const std::tuple WELCOME_STRINGARRAY[] =
-{
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME is a powerful and free office 
suite, used by millions of people around the world."), "LibreOffice.gif"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME uses the reliable and trustworthy 
standard open document format."), "ODF.png"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME blends into every operation 
system and provides full customization."), "Configurability.png"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME is open source: Your project, 
your data, your freedom."), "Community.p

core.git: svx/source sw/qa

2024-05-22 Thread Mike Kaganski (via logerrit) 
 svx/source/svdraw/svdopath.cxx |   11 +++
 sw/qa/extras/ooxmlexport/data/cloud.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport21.cxx |8 
 3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 08da27fc377f443d1d6698f4a061fa462849062d
Author: Mike Kaganski 
AuthorDate: Wed May 22 20:22:08 2024 +0500
Commit: Mike Kaganski 
CommitDate: Wed May 22 20:53:05 2024 +0200

Handle empty range correctly

Otherwise, the translation gets MAX_DBL value, and scaling becomes 0.
After commit 690526f95e3ee4fd25bb2c987e093543e4bc435b (Generalize 
basegfx::fround
for templated return type, 2024-04-15) this made some documents (e.g., 
bugdoc
in tdf#85132) fail an assertion in debug builds, which allowed to find and 
fix
this problem.

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

diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 322b7444960f..935397d1ea61 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2850,11 +2850,14 @@ bool 
SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DP
 // itself, else this method will no longer return the full 
polygon information (curve will
 // be lost)
 const basegfx::B2DRange 
aPolyRangeNoCurve(basegfx::utils::getRange(rPolyPolygon));
-aScale = aPolyRangeNoCurve.getRange();
-aTranslate = aPolyRangeNoCurve.getMinimum();
+if (!aPolyRangeNoCurve.isEmpty())
+{
+aScale = aPolyRangeNoCurve.getRange();
+aTranslate = aPolyRangeNoCurve.getMinimum();
 
-// define matrix for move polygon to zero point
-aMoveToZeroMatrix.translate(-aTranslate.getX(), 
-aTranslate.getY());
+// define matrix for move polygon to zero point
+aMoveToZeroMatrix.translate(-aTranslate.getX(), 
-aTranslate.getY());
+}
 }
 }
 
diff --git a/sw/qa/extras/ooxmlexport/data/cloud.docx 
b/sw/qa/extras/ooxmlexport/data/cloud.docx
new file mode 100644
index ..74c4ac91031c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/cloud.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
index 6cfbe8d783fc..1c55be3df2cf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
@@ -553,6 +553,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf154369, "tdf154369.docx")
 "color"_ostr, "00527d55");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testEmptyObjectRange)
+{
+// Before the fix, this failed an assertion like this:
+// Assertion failed: isBetween(n, (SAL_MIN_INT64 + d / 2) / m, 
(SAL_MAX_INT64 - d / 2) / m),
+// file C:\lo+loadAndSave("cloud.docx");
+}
+
 } // end of anonymous namespace
 CPPUNIT_PLUGIN_IMPLEMENT();

core.git: helpcontent2

2024-05-22 Thread Olivier Hallot (via logerrit) 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d44b86964353cc2e65eba6c2e06529fd9b716cc1
Author: Olivier Hallot 
AuthorDate: Wed May 22 14:29:55 2024 -0300
Commit: Gerrit Code Review 
CommitDate: Wed May 22 19:29:55 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1686a72bcddf4f28d0510e02a1596baf5e6ebdc6
  - Reinstate screenshot for presentationdialog

+ Screenshot updated recently.
+ refactor

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

diff --git a/helpcontent2 b/helpcontent2
index 74121a4068a3..1686a72bcddf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 74121a4068a305b871e5aa5d0aada26012bced22
+Subproject commit 1686a72bcddf4f28d0510e02a1596baf5e6ebdc6

help.git: source/text

2024-05-22 Thread Olivier Hallot (via logerrit) 
 source/text/simpress/01/0608.xhp |   90 +--
 1 file changed, 45 insertions(+), 45 deletions(-)

New commits:
commit 1686a72bcddf4f28d0510e02a1596baf5e6ebdc6
Author: Olivier Hallot 
AuthorDate: Tue May 21 19:24:18 2024 -0300
Commit: Olivier Hallot 
CommitDate: Wed May 22 19:29:54 2024 +0200

Reinstate screenshot for presentationdialog

+ Screenshot updated recently.
+ refactor

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

diff --git a/source/text/simpress/01/0608.xhp 
b/source/text/simpress/01/0608.xhp
index ae760ec4eb..5ddce7e5c8 100644
--- a/source/text/simpress/01/0608.xhp
+++ b/source/text/simpress/01/0608.xhp
@@ -20,14 +20,14 @@
 
 
   
-Slide Show Settings
+Slide Show Settings
 /text/simpress/01/0608.xhp
   
 
 
 
 
-
+
   presentations; settings for
   slide shows; settings for
   presentations; window / full screen
@@ -42,98 +42,98 @@
 presentation; navigation bar settings
 
 
-
-
-
+
+
+
 
 Slide Show Settings
-Defines settings for your 
slide show, including how to display it, which slide to start from, the way you 
advance the slides, and whether you want to use the presenter console or 
control it remotely.
+Defines settings for your slide show, including 
how to display it, which slide to start from, the way you advance the slides, 
and whether you want to use the presenter console or control it 
remotely.
 
 
 
 
-
+
 Range
-Specifies 
which slides to include in the slide show.
-
+Specifies which slides to 
include in the slide show.
+
 
 All slides
-Includes all of the 
slides in your slide show.
-
-
+Includes all of the 
slides in your slide show.
+
+
 
 From:
-Enter the number of the 
start slide.
-
-
+Enter the number of the 
start slide.
+
+
 
 Custom Slide Show
-Runs a custom 
slide show in the order that you defined in Slide Show - Custom Slide 
Show.
+Runs a custom 
slide show in the order that you defined in Slide Show - Custom Slide 
Show.
 
 Presentation Mode
-Select the 
slide show type.
-
+Select the slide show 
type.
+
 
 Full screen
-A full screen slide is 
shown.
-
+A full screen slide is 
shown.
+
 
 In a window
-Slide show runs in the 
$[officename] program window.
-
+Slide show runs in the 
$[officename] program window.
+
 
 Loop and repeat after
-Restarts the slide show after 
the pause interval you specify. A pause slide is displayed between the final 
slide and the start slide. Press the Esc key to stop the 
show.
-
+Restarts the slide show after 
the pause interval you specify. A pause slide is displayed between the final 
slide and the start slide. Press the Esc key to stop the 
show.
+
 
 Duration of pause
-Enter the duration 
of the pause before the slide show is repeated. If you enter zero, the show 
restarts immediately without showing a pause slide.
-
+Enter the duration 
of the pause before the slide show is repeated. If you enter zero, the show 
restarts immediately without showing a pause slide.
+
 
 Show logo
-Displays the 
$[officename] logo on the pause slide. The logo cannot be 
exchanged.
+Displays the 
$[officename] logo on the pause slide. The logo cannot be 
exchanged.
 
 Presentation Options
-
+
 
 Disable automatic change of slide
-Slides never change 
automatically when this box is selected.
-
+Slides never change 
automatically when this box is selected.
+
 
 Change slides by clicking on background
-Advances to 
the next slide when you click on the background of a slide.
-
+Advances to 
the next slide when you click on the background of a slide.
+
 
 Mouse pointer visible
-Shows the mouse 
pointer during a slide show.
-
+Shows the mouse 
pointer during a slide show.
+
 
 Mouse pointer as pen
-Changes the mouse 
pointer to a pen which you can use to draw on slides during the 
presentation.
+Changes the mouse 
pointer to a pen which you can use to draw on slides during the 
presentation.
 Anything you write with the pen will appear in your 
slides after exiting the slideshow. The properties of the pen can be changed by 
choosing the Pen Width or Change pen Color command in 
the context menu of the running slide show.
-
+
 
 Enable animated images
-Displays all 
frames of animated GIF files during the slide show. If this option is 
not selected, only the first frame of an animated GIF file is 
displayed.see #i63884
-
+Displays all 
frames of animated GIF files during the slide show. If this option is 
not selected, only the first frame of an animated GIF file is 
displayed.see #i63884
+
 
 Keep presentation always on top
-The $[officename] 
window remains on top during the presentation. No other program will show its 
window in front of your presentation.
+The $[officename] 
window remains on top during the presentation. No other program will show its 
window in front of your presentation.
 
-
+
 
 Live-mode slideshow editi

core.git: editeng/source include/vcl sw/source vcl/CppunitTest_vcl_text.mk vcl/inc vcl/Library_vcl.mk vcl/qa vcl/source

2024-05-22 Thread Jonathan Clark (via logerrit) 
 editeng/source/editeng/impedit3.cxx|5 
 include/vcl/glyphitemcache.hxx |5 
 include/vcl/metaact.hxx|   15 
 include/vcl/outdev.hxx |   27 
 include/vcl/pdfwriter.hxx  |8 
 include/vcl/rendercontext/SalLayoutFlags.hxx   |3 
 include/vcl/vcllayout.hxx  |2 
 sw/source/core/text/guess.cxx  |   21 
 sw/source/core/text/itradj.cxx |   39 -
 sw/source/core/txtnode/fntcache.cxx|4 
 vcl/CppunitTest_vcl_text.mk|1 
 vcl/Library_vcl.mk |4 
 vcl/inc/ImplLayoutArgs.hxx |   13 
 vcl/inc/impglyphitem.hxx   |7 
 vcl/inc/justificationdata.hxx  |  125 +++
 vcl/inc/pdf/pdfwriter_impl.hxx |4 
 vcl/inc/sallayout.hxx  |   17 
 vcl/qa/cppunit/justificationdata.cxx   |  113 +++
 vcl/qa/cppunit/pdfexport/data/tdf124116-hebrew-track-untrack.odt   |binary
 vcl/qa/cppunit/pdfexport/data/tdf134226-shadda-in-hidden-span.fodt |  328 
++
 vcl/qa/cppunit/pdfexport/data/tdf71956-styled-diacritics.fodt  |  320 
+
 vcl/qa/cppunit/pdfexport/pdfexport2.cxx|  179 +
 vcl/qa/cppunit/svm/data/textarraycontext.svm   |binary
 vcl/qa/cppunit/svm/svmtest.cxx |   31 
 vcl/source/filter/svm/SvmReader.cxx|   28 
 vcl/source/filter/svm/SvmWriter.cxx|   11 
 vcl/source/gdi/CommonSalLayout.cxx |  212 
+-
 vcl/source/gdi/gdimtf.cxx  |6 
 vcl/source/gdi/impglyphitem.cxx|   28 
 vcl/source/gdi/metaact.cxx |   44 +
 vcl/source/gdi/mtfxmldump.cxx  |8 
 vcl/source/gdi/pdfwriter.cxx   |   16 
 vcl/source/gdi/pdfwriter_impl.cxx  |   27 
 vcl/source/gdi/pdfwriter_impl2.cxx |5 
 vcl/source/gdi/sallayout.cxx   |   46 -
 vcl/source/outdev/font.cxx |   45 -
 vcl/source/outdev/text.cxx |  164 +++--
 vcl/source/outdev/transparent.cxx  |   23 
 vcl/source/text/ImplLayoutArgs.cxx |   22 
 39 files changed, 1761 insertions(+), 195 deletions(-)

New commits:
commit ab0a4543cab77ae0c7c0a79feb8aebab71163dd7
Author: Jonathan Clark 
AuthorDate: Tue May 7 02:43:00 2024 -0600
Commit: Jonathan Clark 
CommitDate: Wed May 22 19:20:38 2024 +0200

tdf#124116 Correct Writer text shaping across formatting changes

Previously, Writer performed shaping for each span of text separately.
In certain situations, this caused incorrect glyph use, or incorrect
glyph positioning. This change updates Writer so it will also consider
neighboring text while performing shaping.

This change resolves the outstanding duplicates filed against tdf#61444.
As a side effect, this change also fixes tdf#134226.

In addition to the shaping fix, this change implements rendering for
individually-styled glyphs, which is required to fix tdf#71956. However,
this change does not implement diacritic selection, which is also
required for that issue.

Change-Id: Iab4774ffaab5ad6113778c54d02cb260a70c1010
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167699
Reviewed-by: Jonathan Clark 
Tested-by: Jenkins

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index ffd47d95f56a..b28532ae46d0 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2596,11 +2596,12 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* 
pNode, sal_Int32 nStart, sal_I
 }
 
 // Validate
-std::vector aDropped(aKashidaArray.size());
+std::vector aDropped;
 auto nOldLayout = GetRefDevice()->GetLayoutMode();
 GetRefDevice()->SetLayoutMode(nOldLayout | 
vcl::text::ComplexTextLayoutFlags::BiDiRtl);
 GetRefDevice()->ValidateKashidas(pNode->GetString(), nStart, nEnd - nStart,
-aKashidaArray.size(), aKashidaArray.data(), aDropped.data());
+ /*nPartIdx=*/nStart, /*nPartLen=*/nEnd - 
n

core.git: sw/inc sw/qa sw/source

2024-05-22 Thread Miklos Vajna (via logerrit) 
 sw/inc/pagedesc.hxx |2 
 sw/qa/core/layout/data/inline-endnote-position.docx |binary
 sw/qa/core/layout/ftnfrm.cxx|   20 
 sw/source/core/layout/ftnfrm.cxx|   49 +++-
 sw/source/filter/ww8/docxattributeoutput.cxx|   10 +++-
 5 files changed, 77 insertions(+), 4 deletions(-)

New commits:
commit d1ddd136a1b0e452492464d58715eaec144fd811
Author: Miklos Vajna 
AuthorDate: Wed May 22 13:56:40 2024 +0200
Commit: Miklos Vajna 
CommitDate: Wed May 22 17:50:10 2024 +0200

tdf#160984 sw continuous endnotes: fix the endnote container's top margin

Comparing the Word vs Writer output for the bugdoc, the vertical
position of the endnote text is not correct: the y pos should be larger
than it is, see the red reference at e.g.
.

Seems this is caused by the different height of the rectangle around the
endnote separator: the top margin is 124 twips in Writer, which is a
hardcoded default from the SwPageFootnoteInfo ctor, while Word has this
separator as a special character, inside a paragraph, which inherits the
height of the default paragraph style.

Fix the problem by extending sw::FootnoteSeparatorHeight() to also work
from RES_POOLCOLL_STANDARD in the Word compat case. Note that it's not
enough to take the font size (11pt in this case) from the paragraph
style, we want to work with the real font, which knows the spacing
between lines (15% in this case). SwFont::GetHeight() has this logic,
it's also what e.g. SwTextFrame::FormatEmpty() uses.

Note that footnotes have the same problem, but given that they grow from
the bottom of the page, the text position was correct, even if the
separator height is incorrect. Also, the separator line itself is not
changed in this commit, we just make sure that the height is OK, so text
below the line has the correct position.

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

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 3ec919ce3c83..a8241f15f6f0 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -399,7 +399,7 @@ public:
 namespace sw {
 class PageFootnoteHint final : public SfxHint {};
 
-SW_DLLPUBLIC SwTwips FootnoteSeparatorHeight(SwPageFootnoteInfo const&);
+SW_DLLPUBLIC SwTwips FootnoteSeparatorHeight(SwDoc& rDoc, 
SwPageFootnoteInfo const&);
 }
 
 typedef boost::multi_index_container<
diff --git a/sw/qa/core/layout/data/inline-endnote-position.docx 
b/sw/qa/core/layout/data/inline-endnote-position.docx
new file mode 100644
index ..3905208f9f0e
Binary files /dev/null and 
b/sw/qa/core/layout/data/inline-endnote-position.docx differ
diff --git a/sw/qa/core/layout/ftnfrm.cxx b/sw/qa/core/layout/ftnfrm.cxx
index 1cf31809e5a7..a7640e26ca9a 100644
--- a/sw/qa/core/layout/ftnfrm.cxx
+++ b/sw/qa/core/layout/ftnfrm.cxx
@@ -102,4 +102,24 @@ CPPUNIT_TEST_FIXTURE(Test, testInlineEndnoteAndSection)
 CPPUNIT_ASSERT_EQUAL(2, nToplevelSections);
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testInlineEndnotePosition)
+{
+// Given a document, ContinuousEndnotes is true:
+createSwDoc("inline-endnote-position.docx");
+
+// When laying out that document:
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+// Then make sure the endnote separator (line + spacing around it) is 
large enough, so the
+// endnote text below the separator has the correct position:
+sal_Int32 nEndnoteContTopMargin
+= parseDump("//column/ftncont/infos/prtBounds"_ostr, 
"top"_ostr).toInt32();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 269
+// - Actual  : 124
+// i.e. the top margin wasn't the default font size with its spacing, but 
the Writer default,
+// which shifted endnote text up, incorrectly.
+CPPUNIT_ASSERT_EQUAL(static_cast(269), nEndnoteContTopMargin);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index b7851a131e44..548d8228063e 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -42,9 +42,41 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #define ENDNOTE 0x8000
 
+namespace
+{
+/// Calculates the height of the line that hosts the separator line (the top 
margin of the
+/// container), based on the default paragraph style in rDoc.
+bool FootnoteSeparatorHeightFromParagraph(SwDoc& rDoc, SwTwips& rHeight)
+{
+const SwTextFormatColl* pDefaultParaFormat
+= 
rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD);
+if (!pDefaultPara

core.git: helpcontent2

2024-05-22 Thread Dione Maddern (via logerrit) 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ba662caf1c408dcf18a8624c707ce24d37d55de
Author: Dione Maddern 
AuthorDate: Wed May 22 17:24:39 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Wed May 22 17:24:39 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 74121a4068a305b871e5aa5d0aada26012bced22
  - tdf#148587 Update How to get section for Summary slide and Expand slide

In text/simpress/00/0404.xhp:
- Remove sections on Summary Slide and Expand slide because those 
options no longer appear in the "Insert" menu

In text/simpress/00/slide_menu.xhp
- Add updated howtoget information for Summary Slide and Expand Slide, 
including information for TabUI

In text/simpress/01/0309.xhp
- Add variable tags to h1 so that the page can easily be linked from 
other help pages

In text/simpress/01/0413.xhp
- Add variable tags to h1 so that the page can easily be linked from 
other help pages
- Update embed link in howtoget section to link to updated instructions 
in source/text/simpress/main_slide.xhp
- Add a related topics section

In text/simpress/01/0414.xhp:
- Add variable tags to h1 so that the page can easily be linked from 
other help pages
- Update embed link in howtoget section to link to updated instructions 
in source/text/simpress/main_slide.xhp
- Add a Related Topics section

In text/simpress/main_slide.xhp
- Add variable tags to h1 so that the page can easily be linked from 
other help pages

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

diff --git a/helpcontent2 b/helpcontent2
index 861553cf61b8..74121a4068a3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 861553cf61b80a1fd90546561862ca3e4703603a
+Subproject commit 74121a4068a305b871e5aa5d0aada26012bced22

help.git: source/text

2024-05-22 Thread Dione Maddern (via logerrit) 
 source/text/simpress/00/0404.xhp   |6 --
 source/text/simpress/00/slide_menu.xhp |   15 +++
 source/text/simpress/01/0309.xhp   |2 +-
 source/text/simpress/01/0413.xhp   |   11 +--
 source/text/simpress/01/0414.xhp   |   11 +--
 source/text/simpress/main_slide.xhp|2 +-
 6 files changed, 35 insertions(+), 12 deletions(-)

New commits:
commit 74121a4068a305b871e5aa5d0aada26012bced22
Author: Dione Maddern 
AuthorDate: Wed May 22 13:46:56 2024 +0200
Commit: Olivier Hallot 
CommitDate: Wed May 22 17:24:39 2024 +0200

tdf#148587 Update How to get section for Summary slide and Expand slide

In text/simpress/00/0404.xhp:
- Remove sections on Summary Slide and Expand slide because those options 
no longer appear in the "Insert" menu

In text/simpress/00/slide_menu.xhp
- Add updated howtoget information for Summary Slide and Expand Slide, 
including information for TabUI

In text/simpress/01/0309.xhp
- Add variable tags to h1 so that the page can easily be linked from other 
help pages

In text/simpress/01/0413.xhp
- Add variable tags to h1 so that the page can easily be linked from other 
help pages
- Update embed link in howtoget section to link to updated instructions in 
source/text/simpress/main_slide.xhp
- Add a related topics section

In text/simpress/01/0414.xhp:
- Add variable tags to h1 so that the page can easily be linked from other 
help pages
- Update embed link in howtoget section to link to updated instructions in 
source/text/simpress/main_slide.xhp
- Add a Related Topics section

In text/simpress/main_slide.xhp
- Add variable tags to h1 so that the page can easily be linked from other 
help pages

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

diff --git a/source/text/simpress/00/0404.xhp 
b/source/text/simpress/00/0404.xhp
index ff91e8638d..555134bf98 100644
--- a/source/text/simpress/00/0404.xhp
+++ b/source/text/simpress/00/0404.xhp
@@ -30,12 +30,6 @@
 Insert Menu
 Choose Insert - Duplicate Slide
 UFI: will be changed "SO later" to Page (for 
Draw)
-Choose Insert - Expand Slide
-
-Choose Insert - Summary Slide
-
-  Menu entries changed from Insert to Slide, so moved the paragraphs 
to slide_menu.xhp (sophia)
-Only for Draw (OH), so moved to sdraw/main_insert.xhp for now 
(sophia)
 
   
   Choose Insert - 
Snap Guide.
diff --git a/source/text/simpress/00/slide_menu.xhp 
b/source/text/simpress/00/slide_menu.xhp
index afd60c9ef1..8976c47fb0 100644
--- a/source/text/simpress/00/slide_menu.xhp
+++ b/source/text/simpress/00/slide_menu.xhp
@@ -42,5 +42,20 @@
   
 
   
+  
+  
+  
+  Choose 
Slide - Summary Slide
+  
+  Choose 
Layout, then in the Layout dropdown 
choose Summary Slide
+  
+  
+  
+  
+  Choose 
Slide - Expand Slide
+  
+  Choose 
Layout, then in the Layout dropdown 
choose Expand Slide
+  
+
 
 
diff --git a/source/text/simpress/01/0309.xhp 
b/source/text/simpress/01/0309.xhp
index ce79fea3f3..c0b443ece3 100644
--- a/source/text/simpress/01/0309.xhp
+++ b/source/text/simpress/01/0309.xhp
@@ -31,7 +31,7 @@
 
 
 
-Outline
+Outline
 Switches to outline view, where you can add, edit and 
reorganize slide titles and headings.
   
   
diff --git a/source/text/simpress/01/0413.xhp 
b/source/text/simpress/01/0413.xhp
index 89b814b480..c5d001eb56 100644
--- a/source/text/simpress/01/0413.xhp
+++ b/source/text/simpress/01/0413.xhp
@@ -36,13 +36,20 @@
 
 
 
-  Expand 
Slide
+  Expand Slide
   Creates a new slide from every top-level outline point 
(text one level below the title text in the outline hierarchy) in the selected 
slide. The outline text becomes the title of the new slide. Outline 
pointspoints? below the top level on the original slide are 
moved up one level on the new slide.
 
 
-  
+  
 
 You can only 
use the Expand Slide command if your slide layout contains a title 
object and an outline object.
 If you want to 
keep the original slide, choose Edit - Undo.
+
+
+
+
+
+
+
 
 
diff --git a/source/text/simpress/01/0414.xhp 
b/source/text/simpress/01/0414.xhp
index 58325a1350..5a81d14a64 100644
--- a/source/text/simpress/01/0414.xhp
+++ b/source/text/simpress/01/0414.xhp
@@ -33,11 +33,18 @@
   summary slide
   
   
-Summary 
Slide
+Summary Slide
 Creates a new slide that contains 
an unordered list from the titles of the slides that follow the selected slide. 
The summary slide is inserted behind the last slide.
   
   
-  
+  
 
+
+
+
+
+
+
+
  
 
diff --git a/source/text/simpress/main_slide.xhp 
b/source/text/simpress/main_slide.xhp
index 8eb2941b29..13ad2a2557 100644
--- a/source/text/simpress/main_slide.xhp
+++ b/source/text/simpress/main_slide.xhp
@@ -28,7 +28,7 @@

core.git: helpcontent2

2024-05-22 Thread Andrea Gelmini (via logerrit) 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea31765aed87a67698a67e0f8920df16abe8e97e
Author: Andrea Gelmini 
AuthorDate: Wed May 22 17:17:54 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Wed May 22 17:17:54 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 861553cf61b80a1fd90546561862ca3e4703603a
  - Remove exec bits on PNG files

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

diff --git a/helpcontent2 b/helpcontent2
index b3ffed2bfd79..861553cf61b8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b3ffed2bfd797c22fe28472898d2d9a72aa2ae41
+Subproject commit 861553cf61b80a1fd90546561862ca3e4703603a

help.git: source/media

2024-05-22 Thread Andrea Gelmini (via logerrit) 
 0 files changed

New commits:
commit 861553cf61b80a1fd90546561862ca3e4703603a
Author: Andrea Gelmini 
AuthorDate: Wed May 22 13:59:58 2024 +0200
Commit: Olivier Hallot 
CommitDate: Wed May 22 17:17:54 2024 +0200

Remove exec bits on PNG files

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

diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/af/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/af/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/am/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/am/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/ar/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/ar/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/as/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/as/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/ast/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/ast/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/be/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/be/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/bg/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/bg/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/bn-IN/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/bn-IN/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/bn/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/bn/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/bo/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/bo/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/br/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/br/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/brx/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/brx/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/bs/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/bs/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/ca-valencia/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/ca-valencia/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/ca/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/ca/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/ckb/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/ckb/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/cs/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/cs/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/cy/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationdialog/cy/PresentationDialog.png
old mode 100755
new mode 100644
diff --git 
a/source/media/screenshots/modules/simpress/ui/presentationdialog/da/PresentationDialog.png
 
b/source/media/screenshots/modules/simpress/ui/presentationd

ESC meeting agenda: 2024-05-23 16:00 CEST

2024-05-22 Thread Miklos Vajna 

Hi,

The prototype agenda is below. Extra items are appreciated either in
this document or as a reply to this mail:

https://pad.documentfoundation.org/p/esc

You can join using Jitsi here:

https://jitsi.documentfoundation.org/esc

Regards,

Miklos

---

* Present:
+

* Completed Action Items:

* Pending Action Items:
+ MAR update: include OS info in the user agent or file a bug to do it 
(Cloph)

* Release Engineering update (Cloph)
+ 24.2: 24.2.4 RC2 next week?
+ 24.8:
+ feature freeze in 2 weeks?
+ string / UI freeze 3 weeks after that

* Documentation (Olivier)
+ Bugzilla Documentation statistics
255(255) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 16(4)44(-2)112(5) 221(1)
 commented 37(25)   91(21)276(31)868(31)
  resolved  7(1)27(-1) 62(5) 124(1)
+ top 10 contributors:
  Olivier Hallot made 46 changes in 1 month, and 243 changes in 1 year
  Dione Maddern made 28 changes in 1 month, and 59 changes in 1 year
  Stéphane Guillou made 24 changes in 1 month, and 247 changes in 1 year
  Vernon, Stuart Foote made 23 changes in 1 month, and 107 changes in 1 
year
  Dieter made 13 changes in 1 month, and 18 changes in 1 year
  Heiko Tietze made 10 changes in 1 month, and 77 changes in 1 year
  Ilmari Lauhakangas made 10 changes in 1 month, and 69 changes in 1 
year
  Óvári made 10 changes in 1 month, and 13 changes in 1 year
  Kaganski, Mike made 7 changes in 1 month, and 74 changes in 1 year
  Cor Nouws made 6 changes in 1 month, and 9 changes in 1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
240(240) (topicUI) bugs open, 37(37) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months   12 months
 added  3(-4) 10(-3) 14(-4)  22(-3)
 commented 29(-31)   159(-47)   512(-48)   1710(-47)
   removed  0(0)   3(-1)  5(0)   11(0)
  resolved  5(-3) 28(-4) 79(-1) 290(-7)
+ top 10 contributors:
  Heiko Tietze made 94 changes in 1 month, and 956 changes in 1 year
  Vernon, Stuart Foote made 65 changes in 1 month, and 312 changes in 1 
year
  Eyal Rozenberg made 58 changes in 1 month, and 171 changes in 1 year
  Stéphane Guillou made 48 changes in 1 month, and 624 changes in 1 year
  Dieter made 16 changes in 1 month, and 124 changes in 1 year
  Weghorn, Michael made 8 changes in 1 month, and 23 changes in 1 year
  Olivier Hallot made 8 changes in 1 month, and 22 changes in 1 year
  Jakub Kościelak made 6 changes in 1 month, and 6 changes in 1 year
  Henschel, Regina made 6 changes in 1 month, and 33 changes in 1 year
  Roman Kuznetsov made 5 changes in 1 month, and 41 changes in 1 year

* Vertical tabpages state (Samuel)
  + review the state in 1 week

* Crash Testing (Caolan)
+ 23(-2) import failure, 18(-1) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now

* Crash Reporting (Xisco)
+ 24.2.0.2174(+1)
+ 24.2.0.318611(+663)
+ 24.2.1.177(+4)
+ 24.2.1.215171(+694)
+ 24.2.2.211690(+1291)
+ 24.2.3.22976(+1539)

* Mentoring (Hossein)
  committer...   1 week 1 month 3 months12 months
  open  56(-33)146(-14)147(-13) 147(-13)
   reviews 362(44)1322(72)3538(-56)   12486(28)
merged 254(-56)   1304(60)3385(-38)   12718(4)
 abandoned  10(-5)  53(-8) 175(1)   659(-2)
   own commits 177(-50)946(33)2400(20) 9273(-1)
review commits  72(34) 233(15) 820(-19)3005(11)
contributor...   1 week  1 month3 months 12 months
  open  36(-19)  95(-8) 96(-7)96(-7)
   reviews 730(-164)   3132(82)   7826(-104)   29550(-24)
merged  25(10)   90(4) 366(-11) 1589(6)
 abandoned   7(7)28(-5)280(1)704(5)
   own commits  35(21)  107(10)413(-16) 1137(23)
review commits   0(0) 0(0)   0(0)  0(0)
+ easyHack statistics:
   needsDevEval 9(9)   needsUXEval 1(1)   cleanup_comments 326(326)
   total 410(410)   assigned 27(27)   open 348(348)
+ top 10 contributors:
  Dione Maddern made 11 patches in 1 month, and 45 patches in 1 year
  Jakub Kościelak made 7 patches in 1 month, and 7 patches in 1 year
  Stéphane Guillou made 5 patches in 1 month, and 60 patches in 1 year
  Weblate made 4 patches in 1 month, and 25 patches in 1 year
made 4 patches in 1 month, and

core.git: sd/inc

2024-05-22 Thread Gabor Kelemen (via logerrit) 
 sd/inc/sdattr.hrc |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 46b497f5462848c51c8dd204a45128f606425637
Author: Gabor Kelemen 
AuthorDate: Tue May 21 08:56:47 2024 +0200
Commit: Gabor Kelemen 
CommitDate: Wed May 22 16:26:58 2024 +0200

Drop unused ATTR_OPTIONS_SNAP

after commit 563573068fe0835b1fa132d18b53f991be0e15a0

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

diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 20958e1b39d6..3bc08b04de81 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -102,8 +102,7 @@ class XColorItem;
 #define ATTR_OPTIONS_START  ATTR_SNAPLINE_END + 1
 #define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1
 #define ATTR_OPTIONS_MISC   
TypedWhichId(ATTR_OPTIONS_START + 2)
-#define ATTR_OPTIONS_SNAP   ATTR_OPTIONS_START + 3
-#define ATTR_OPTIONS_PRINT  
TypedWhichId(ATTR_OPTIONS_START + 4)
+#define ATTR_OPTIONS_PRINT  
TypedWhichId(ATTR_OPTIONS_START + 3)
 #define ATTR_OPTIONS_ENDATTR_OPTIONS_PRINT
 
 #define ATTR_OPTIONS_SCALE_STARTATTR_OPTIONS_END + 1

core.git: sw/source

2024-05-22 Thread Noel Grandin (via logerrit) 
 sw/source/ui/dbui/addresslistdialog.cxx  |   56 -
 sw/source/ui/dbui/createaddresslistdialog.cxx|   48 
 sw/source/ui/dbui/customizeaddresslistdialog.cxx |   20 +--
 sw/source/ui/dbui/customizeaddresslistdialog.hxx |8 -
 sw/source/ui/dbui/dbinsdlg.cxx   |   76 ++--
 sw/source/ui/dbui/dbtablepreviewdialog.cxx   |8 -
 sw/source/ui/dbui/mailmergewizard.cxx|   10 -
 sw/source/ui/dbui/mmaddressblockpage.cxx |  136 +++
 sw/source/ui/dbui/mmdocselectpage.cxx|   22 +--
 sw/source/ui/dbui/mmgreetingspage.cxx|   22 +--
 sw/source/ui/dbui/mmgreetingspage.hxx|   30 ++---
 sw/source/ui/dbui/mmlayoutpage.cxx   |   30 ++---
 sw/source/ui/dbui/mmoutputtypepage.cxx   |   32 ++---
 sw/source/ui/dbui/mmresultdialogs.cxx|  106 -
 sw/source/ui/dbui/selectdbtabledialog.cxx|   19 +--
 15 files changed, 312 insertions(+), 311 deletions(-)

New commits:
commit ebb1444a17d56acc93ffbb06b43506531dd6
Author: Noel Grandin 
AuthorDate: Wed May 22 09:36:10 2024 +0200
Commit: Noel Grandin 
CommitDate: Wed May 22 16:07:27 2024 +0200

loplugin:ostr in sw/../dbui

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

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx 
b/sw/source/ui/dbui/addresslistdialog.cxx
index 30df8ce37ce2..d4e6f40be4bc 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -87,13 +87,13 @@ static OUString lcl_getFlatURL( 
uno::Reference const & xSou
 if(xSourceProperties.is())
 {
 OUString sDBURL;
-xSourceProperties->getPropertyValue("URL") >>= sDBURL;
+xSourceProperties->getPropertyValue(u"URL"_ustr) >>= sDBURL;
 if (sDBURL.startsWith("sdbc:flat:"))
 {
 uno::Sequence aFilters;
-xSourceProperties->getPropertyValue("TableFilter") >>= aFilters;
+xSourceProperties->getPropertyValue(u"TableFilter"_ustr) >>= 
aFilters;
 uno::Sequence aInfo;
-xSourceProperties->getPropertyValue("Info") >>= aInfo;
+xSourceProperties->getPropertyValue(u"Info"_ustr) >>= aInfo;
 if(aFilters.getLength() == 1 && aInfo.hasElements() )
 {
 OUString sExtension;
@@ -118,19 +118,19 @@ static OUString lcl_getFlatURL( 
uno::Reference const & xSou
 }
 
 SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
-: SfxDialogController(pParent->GetWizard()->getDialog(), 
"modules/swriter/ui/selectaddressdialog.ui", "SelectAddressDialog")
+: SfxDialogController(pParent->GetWizard()->getDialog(), 
u"modules/swriter/ui/selectaddressdialog.ui"_ustr, u"SelectAddressDialog"_ustr)
 , m_bInSelectHdl(false)
 , m_pAddressPage(pParent)
-, m_xDescriptionFI(m_xBuilder->weld_label("desc"))
-, m_xConnecting(m_xBuilder->weld_label("connecting"))
-, m_xListLB(m_xBuilder->weld_tree_view("sources"))
-, m_xLoadListPB(m_xBuilder->weld_button("add"))
-, m_xRemovePB(m_xBuilder->weld_button("remove"))
-, m_xCreateListPB(m_xBuilder->weld_button("create"))
-, m_xFilterPB(m_xBuilder->weld_button("filter"))
-, m_xEditPB(m_xBuilder->weld_button("edit"))
-, m_xTablePB(m_xBuilder->weld_button("changetable"))
-, m_xOK(m_xBuilder->weld_button("ok"))
+, m_xDescriptionFI(m_xBuilder->weld_label(u"desc"_ustr))
+, m_xConnecting(m_xBuilder->weld_label(u"connecting"_ustr))
+, m_xListLB(m_xBuilder->weld_tree_view(u"sources"_ustr))
+, m_xLoadListPB(m_xBuilder->weld_button(u"add"_ustr))
+, m_xRemovePB(m_xBuilder->weld_button(u"remove"_ustr))
+, m_xCreateListPB(m_xBuilder->weld_button(u"create"_ustr))
+, m_xFilterPB(m_xBuilder->weld_button(u"filter"_ustr))
+, m_xEditPB(m_xBuilder->weld_button(u"edit"_ustr))
+, m_xTablePB(m_xBuilder->weld_button(u"changetable"_ustr))
+, m_xOK(m_xBuilder->weld_button(u"ok"_ustr))
 , m_xIter(m_xListLB->make_iterator())
 {
 m_sConnecting = m_xConnecting->get_label();
@@ -245,20 +245,20 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl, 
weld::Button&, void)
 {
 uno::Reference 
xConnectFactory(pUserData->xConnection, UNO_QUERY_THROW);
 uno::Reference xComposer(
-
xConnectFactory->createInstance("com.sun.star.sdb.SingleSelectQueryComposer"), 
UNO_QUERY_THROW);
+
xConnectFactory->createInstance(u"com.sun.star.sdb.SingleSelectQueryComposer"_ustr),
 UNO_QUERY_THROW);
 
 uno::Reference xRowSet(
-xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY);
+xMgr->createInstance(u"com.sun.star.sdb.RowSet"_ustr), 
UNO_QUERY);
 uno::Reference xRowProperties(xRowSet, UNO_QUERY);
-xRowProperties->setPropertyValue

core.git: download.lst

2024-05-22 Thread Xisco Fauli (via logerrit) 
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 027881928b48c4ea030f5e807cb6bfd45ee977da
Author: Xisco Fauli 
AuthorDate: Wed May 22 13:45:49 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 22 15:54:01 2024 +0200

openldap: upgrade to 2.6.8

Downloaded from 
https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.8.tgz

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

diff --git a/download.lst b/download.lst
index 8e523ba56413..79ef8e4ee4aa 100644
--- a/download.lst
+++ b/download.lst
@@ -503,8 +503,8 @@ ONLINEUPDATE_TARBALL := 
onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENLDAP_SHA256SUM := 
cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930
-OPENLDAP_TARBALL := openldap-2.6.7.tgz
+OPENLDAP_SHA256SUM := 
48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e
+OPENLDAP_TARBALL := openldap-2.6.8.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

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

2024-05-22 Thread Xisco Fauli (via logerrit) 
 sc/source/ui/app/inputwin.cxx  |   19 ++-
 sc/source/ui/condformat/condformatdlgentry.cxx |   68 ++---
 sc/source/ui/dialogs/searchresults.cxx |   20 ++-
 sc/source/ui/miscdlgs/mvtabdlg.cxx |   16 +--
 sc/source/ui/namedlg/namedefdlg.cxx|8 -
 sc/source/ui/namedlg/namedlg.cxx   |4 
 sc/source/ui/undo/undodat.cxx  |  129 -
 sc/source/ui/undo/undotab.cxx  |   26 -
 sc/source/ui/view/tabvwsh4.cxx |2 
 9 files changed, 183 insertions(+), 109 deletions(-)

New commits:
commit 768823934200096c4bd736526aa9765b1bceb0bb
Author: Xisco Fauli 
AuthorDate: Tue May 21 17:22:53 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 22 15:45:49 2024 +0200

sc: check GetActiveViewShell()

See the recently introduced

https://crashreport.libreoffice.org/stats/crash_details/3da2dcd1-ca3e-409a-a665-dcb09d2a3ba0

Change-Id: If6ddc71bc2946232d57d5fd8fd6029b45b19495f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167903
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167923
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 7f0cf742b05d..2b2dcb7ebd77 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -799,9 +799,11 @@ void ScInputWindow::MouseButtonDown( const MouseEvent& 
rMEvt )
 // I'd prefer to leave at least a single column header and a
 // row but I don't know how to get that value in pixels.
 // Use TOOLBOX_WINDOW_HEIGHT for the moment
-ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
-mnMaxY = GetOutputSizePixel().Height() + 
(pViewSh->GetGridHeight(SC_SPLIT_TOP)
-   + pViewSh->GetGridHeight(SC_SPLIT_BOTTOM)) - 
TOOLBOX_WINDOW_HEIGHT;
+if (ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell())
+{
+mnMaxY = GetOutputSizePixel().Height() + 
(pViewSh->GetGridHeight(SC_SPLIT_TOP)
+   + pViewSh->GetGridHeight(SC_SPLIT_BOTTOM)) - 
TOOLBOX_WINDOW_HEIGHT;
+}
 }
 }
 
@@ -2663,11 +2665,12 @@ void ScPosWnd::DoEnter()
 if (bOpenManageNamesDialog)
 {
 const sal_uInt16 nId  = ScNameDlgWrapper::GetChildWindowId();
-ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
-assert(pViewSh);
-SfxViewFrame& rViewFrm = pViewSh->GetViewFrame();
-SfxChildWindow* pWnd = rViewFrm.GetChildWindow( nId );
-SC_MOD()->SetRefDialog( nId, pWnd == nullptr );
+if (ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell())
+{
+SfxViewFrame& rViewFrm = pViewSh->GetViewFrame();
+SfxChildWindow* pWnd = rViewFrm.GetChildWindow( nId );
+SC_MOD()->SetRefDialog( nId, pWnd == nullptr );
+}
 }
 }
 
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index ade0cede7cef..171c9ecd135b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -440,43 +440,45 @@ void StyleSelect(weld::Window* pDialogParent, 
weld::ComboBox& rLbStyle, const Sc
 
 // unlock the dispatcher so SID_STYLE_NEW can be executed
 // (SetDispatcherLock would affect all Calc documents)
-ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-SfxDispatcher* pDisp = pViewShell->GetDispatcher();
-bool bLocked = pDisp->IsLocked();
-if (bLocked)
-pDisp->Lock(false);
-
-// Execute the "new style" slot, complete with undo and all necessary 
updates.
-// The return value (SfxUInt16Item) is ignored, look for new styles 
instead.
-pDisp->ExecuteList(SID_STYLE_NEW,
-SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
-{ &aFamilyItem, &aRefItem }, { &aDialogParent });
-
-if (bLocked)
-pDisp->Lock(true);
-
-// Find the new style and add it into the style list boxes
-SfxStyleSheetIterator aStyleIter( pDoc->GetStyleSheetPool(), 
SfxStyleFamily::Para );
-bool bFound = false;
-for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle && 
!bFound; pStyle = aStyleIter.Next() )
+if (ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell())
 {
-const OUString& aName = pStyle->GetName();
-if (rLbStyle.find_text(aName) == -1)// all lists contain the 
same entries
+SfxDispatcher* pDisp = pViewShell->GetDispatcher();
+bool bLocked = pDisp->IsLocked();
+if (bLocked)
+pDisp->Lock(false);
+
+// Execute the "new style" slot, complete with undo

core.git: sc/source

2024-05-22 Thread Xisco Fauli (via logerrit) 
 sc/source/ui/app/inputwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ee802917bd37665df3fe4116eb31b2a9f6be494
Author: Xisco Fauli 
AuthorDate: Wed May 22 12:40:25 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 22 15:40:50 2024 +0200

Partially revert 860d11230d6 "sc: check GetActiveViewShell()"

See 
https://gerrit.libreoffice.org/c/core/+/167923/comment/3b02cf2c_feea2a9f/

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

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index f39139b7b6e7..e447045e4b51 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1722,6 +1722,7 @@ bool ScTextWnd::Command( const CommandEvent& rCEvt )
 if (m_xEditView)
 {
 ScModule* pScMod = SC_MOD();
+ScTabViewShell* pStartViewSh = ScTabViewShell::GetActiveViewShell();
 
 // don't modify the font defaults here - the right defaults are
 // already set in StartEditEngine when the EditEngine is created
@@ -1739,7 +1740,6 @@ bool ScTextWnd::Command( const CommandEvent& rCEvt )
 {
 // Is dragged onto another View?
 ScTabViewShell* pEndViewSh = ScTabViewShell::GetActiveViewShell();
-ScTabViewShell* pStartViewSh = 
ScTabViewShell::GetActiveViewShell();
 if ( pEndViewSh != pStartViewSh && pStartViewSh != nullptr )
 {
 ScViewData& rViewData = pStartViewSh->GetViewData();

core.git: download.lst external/curl

2024-05-22 Thread Xisco Fauli (via logerrit) 
 download.lst  |4 ++--
 external/curl/curl-msvc-disable-protocols.patch.1 |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit aaf14d96cd9d2273e7828bfa3bd496fc9cb1d61e
Author: Xisco Fauli 
AuthorDate: Wed May 22 11:46:17 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 22 15:14:44 2024 +0200

curl: Upgrade to 8.8.0

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

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

diff --git a/download.lst b/download.lst
index 570ed2258157..8e523ba56413 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd
-CURL_TARBALL := curl-8.7.1.tar.xz
+CURL_SHA256SUM := 
0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400
+CURL_TARBALL := curl-8.8.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/curl/curl-msvc-disable-protocols.patch.1 
b/external/curl/curl-msvc-disable-protocols.patch.1
index 905a2d6a7ac3..1c74fa63381b 100644
--- a/external/curl/curl-msvc-disable-protocols.patch.1
+++ b/external/curl/curl-msvc-disable-protocols.patch.1
@@ -2,9 +2,9 @@ disable protocols nobody needs in MSVC build
 
 --- curl/lib/config-win32.h.orig   2017-08-09 16:43:29.46400 +0200
 +++ curl/lib/config-win32.h2017-08-09 16:47:38.54920 +0200
-@@ -654,4 +654,20 @@
- #  define ENABLE_IPV6 1
- #endif
+@@ -509,4 +509,20 @@
+ /* If you want to build curl with the built-in manual */
+ #define USE_MANUAL 1
  
 +#define CURL_DISABLE_DICT 1
 +#define CURL_DISABLE_FILE 1

Re: where are published maven artifacts, after 7.6.4 ?

2024-05-22 Thread sophi 

Hi,
Just for the list, I sent a link to the repository to Antoine who asked 
also on the fr lists.

Cheers
Sophie
Le 21/05/2024 à 14:15, antoine.pourc...@kelis.fr a écrit :

Hello,

Does anyone know why maven artifacts after 7.6.4 are no longer distributed
on  
https://mvnrepository.com/artifact/org.libreoffice/libreoffice?

Sincerely,

Antoine

scenario.software





--
Sophie Gautier so...@libreoffice.org
GSM: +33683901545
IRC: soph
Foundation coordinator
The Document Foundation

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

2024-05-22 Thread Miklos Vajna (via logerrit) 
 sw/qa/core/layout/data/fly-rel-width-rounding.odt |binary
 sw/qa/core/layout/fly.cxx |   25 ++
 sw/source/core/layout/fly.cxx |5 ++--
 xmloff/qa/unit/text.cxx   |4 +--
 4 files changed, 30 insertions(+), 4 deletions(-)

New commits:
commit 3046bd0e30406d37813ce3eaa65f71f5ed10ab13
Author: Miklos Vajna 
AuthorDate: Wed May 22 08:47:32 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 22 13:44:49 2024 +0200

Related: tdf#145972 sw images: fix rounding error in relative size 
calculation

Open the bugdoc, see that the image is roughly half of the page width,
right click, properties, UI shows that the width of the image is 5% of
the width of the entire page. This only happens if tools -> options ->
writer -> general sets the UI units to points, the default cm case is
fine.

This went wrong with commit 9e8712ed6f9fb5dbd971e352a5709bd45fadc74f (sw
image dialog: fix fallback width/height for images with relative sizes,
2022-03-17), because the layout size started to matter more after that
commit. This lead to the nWidth !=
m_xWidthED->get_value(FieldUnit::TWIP) check in SwFramePage::Init() to
be true, because 11906 * 0.48 is 5714.88, so you got 5714 in the layout,
but got 5715 with rounding in SwFramePage::Reset() (which tries to calc
the page width based on the 48% and the fly width). And once we had that
mismatch, we went down the wrong path.

Fix the problem by using rtl::math::round() in SwFlyFrame::CalcRel(), so
the relative width twips value is 5715 everywhere: once we have
consisteny, the UI value is correct, too.

Note that the original bugdoc needs more fixing, this just fixes the
bugdoc where KeepRatio is false.

Change-Id: I1e8782c95a0cf9d97375c36d41134735c01f3e46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167916
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167926

diff --git a/sw/qa/core/layout/data/fly-rel-width-rounding.odt 
b/sw/qa/core/layout/data/fly-rel-width-rounding.odt
new file mode 100644
index ..b70b9e51a917
Binary files /dev/null and b/sw/qa/core/layout/data/fly-rel-width-rounding.odt 
differ
diff --git a/sw/qa/core/layout/fly.cxx b/sw/qa/core/layout/fly.cxx
index 47cfb40fa6e7..81df20af3b35 100644
--- a/sw/qa/core/layout/fly.cxx
+++ b/sw/qa/core/layout/fly.cxx
@@ -86,6 +86,31 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyNegativeHeight)
 }
 }
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testFlyRelWithRounding)
+{
+// Given a document where page width is 21.001cm (11906 twips), and the 
image width is 48% of
+// the page width:
+createSwDoc("fly-rel-width-rounding.odt");
+
+// When laying out that document:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+
+// Then make sure that we calculate the width of the fly correctly:
+auto pPage = pLayout->GetLower()->DynCastPageFrame();
+CPPUNIT_ASSERT(pPage->GetSortedObjs());
+SwSortedObjs& rPageObjs = *pPage->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPageObjs.size());
+auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame();
+CPPUNIT_ASSERT(pFly);
+tools::Long nFlyWidth = pFly->getFrameArea().Width();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 5715
+// - Actual  : 5714
+// i.e. 5714.88 was truncated, not rounded.
+CPPUNIT_ASSERT_EQUAL(static_cast(5715), nFlyWidth);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index b454bd95917f..fd95ce192cf7 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -2845,9 +2846,9 @@ Size SwFlyFrame::CalcRel( const SwFormatFrameSize &rSz ) 
const
 }
 
 if ( rSz.GetWidthPercent() && rSz.GetWidthPercent() != 
SwFormatFrameSize::SYNCED )
-aRet.setWidth( nRelWidth * rSz.GetWidthPercent() / 100 );
+aRet.setWidth(rtl::math::round(double(nRelWidth) * 
rSz.GetWidthPercent() / 100));
 if ( rSz.GetHeightPercent() && rSz.GetHeightPercent() != 
SwFormatFrameSize::SYNCED )
-aRet.setHeight( nRelHeight * rSz.GetHeightPercent() / 100 );
+aRet.setHeight(rtl::math::round(double(nRelHeight) * 
rSz.GetHeightPercent() / 100));
 
 if ( rSz.GetHeight() && rSz.GetWidthPercent() == 
SwFormatFrameSize::SYNCED )
 {
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index e6433b2b70f9..2da04387d707 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -505,11 +505,11 @@ CPPUNIT_TEST_FIXTURE(XmloffSt

core.git: sc/source

2024-05-22 Thread Noel Grandin (via logerrit) 
 sc/source/ui/Accessibility/AccessibleCell.cxx|4 +--
 sc/source/ui/Accessibility/AccessibleCellBase.cxx|   12 -
 sc/source/ui/Accessibility/AccessibleContextBase.cxx |6 ++--
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx  |   14 +--
 sc/source/ui/Accessibility/AccessibleDocument.cxx|6 ++--
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |4 +--
 sc/source/ui/Accessibility/AccessibleEditObject.cxx  |2 -
 sc/source/ui/Accessibility/AccessiblePageHeader.cxx  |4 +--
 sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx  |4 +--
 sc/source/ui/Accessibility/AccessiblePreviewCell.cxx |4 +--
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx   |4 +--
 sc/source/ui/Accessibility/AccessiblePreviewTable.cxx|2 -
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |4 +--
 sc/source/ui/Accessibility/AccessibleTableBase.cxx   |2 -
 14 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit c2a2eb189c45b4eaf53bd2b5656185fa72512322
Author: Noel Grandin 
AuthorDate: Wed May 22 09:34:38 2024 +0200
Commit: Noel Grandin 
CommitDate: Wed May 22 12:42:07 2024 +0200

loplugin:ostr in sc/../Accessibility

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

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index b27fbb90671a..3d1fb315965c 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -300,13 +300,13 @@ uno::Reference SAL_CALL
 
 OUString SAL_CALL ScAccessibleCell::getImplementationName()
 {
-return "ScAccessibleCell";
+return u"ScAccessibleCell"_ustr;
 }
 
 uno::Sequence< OUString> SAL_CALL
 ScAccessibleCell::getSupportedServiceNames()
 {
-const css::uno::Sequence vals { 
"com.sun.star.sheet.AccessibleCell" };
+const css::uno::Sequence vals { 
u"com.sun.star.sheet.AccessibleCell"_ustr };
 return 
comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(),
 vals);
 }
 
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx 
b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index d8b84fabafc1..ebff91c101e2 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -269,7 +269,7 @@ uno::Any SAL_CALL
 
 OUString SAL_CALL ScAccessibleCellBase::getImplementationName()
 {
-return "ScAccessibleCellBase";
+return u"ScAccessibleCellBase"_ustr;
 }
 
 //=  XTypeProvider  ===
@@ -374,9 +374,9 @@ OUString ScAccessibleCellBase::getShadowAttrs() const
 }
 }
 //construct shadow attributes string
-OUString sShadowAttrs("Shadow:");
-OUString sInnerSplit(",");
-OUString sOuterSplit(";");
+OUString sShadowAttrs(u"Shadow:"_ustr);
+OUString sInnerSplit(u","_ustr);
+OUString sOuterSplit(u";"_ustr);
 sal_Int32 nLocationVal = 0;
 switch( aShadowFmt.Location )
 {
@@ -479,8 +479,8 @@ OUString ScAccessibleCellBase::getBorderAttrs()
 
 //construct border attributes string
 OUString sBorderAttrs;
-OUString sInnerSplit(",");
-OUString sOuterSplit(";");
+OUString sInnerSplit(u","_ustr);
+OUString sOuterSplit(u";"_ustr);
 //top border
 //if top of the cell has no border
 if ( aTopBorder.InnerLineWidth == 0 && aTopBorder.OuterLineWidth == 0 )
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx 
b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 59f2f399032e..34826eb80e9d 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -416,7 +416,7 @@ void SAL_CALL
 // XServiceInfo
 OUString SAL_CALL ScAccessibleContextBase::getImplementationName()
 {
-return "ScAccessibleContextBase";
+return u"ScAccessibleContextBase"_ustr;
 }
 
 sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& 
sServiceName)
@@ -427,8 +427,8 @@ sal_Bool SAL_CALL 
ScAccessibleContextBase::supportsService(const OUString& sServ
 uno::Sequence< OUString> SAL_CALL
ScAccessibleContextBase::getSupportedServiceNames()
 {
-return {"com.sun.star.accessibility.Accessible",
-"com.sun.star.accessibility.AccessibleContext"};
+return {u"com.sun.star.accessibility.Accessible"_ustr,
+u"com.sun.star.accessibility.AccessibleContext"_ustr};
 }
 
 //=  internal  
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx 
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index c6dc50dc011a..166e1482b057 100644
--- a/sc/source/ui/Accessibility/Acce

core.git: include/sfx2 sfx2/source

2024-05-22 Thread Xisco Fauli (via logerrit) 
 include/sfx2/bindings.hxx|2 +-
 sfx2/source/control/bindings.cxx |8 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 343ca5c8ae6f7216683c78b961816bf149f957a0
Author: Xisco Fauli 
AuthorDate: Wed May 22 10:01:14 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 22 12:22:47 2024 +0200

sfx2: bGlobalOnly is always false

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

diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 2b85b4dbd065..2fac9d1048ef 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -101,7 +101,7 @@ friend class SfxBindings_Impl;
 
 private:
 SAL_DLLPRIVATE SfxPoolItemHolder Execute_Impl( sal_uInt16 nSlot, const 
SfxPoolItem **pArgs, sal_uInt16 nModi,
-SfxCallMode nCall, const SfxPoolItem 
**pInternalArgs, bool bGlobalOnly=false);
+SfxCallMode nCall, const SfxPoolItem 
**pInternalArgs);
 SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* );
 SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // Update SlotServer
 SAL_DLLPRIVATE std::optional CreateSet_Impl(SfxStateCache& 
rCache, const SfxSlot* &pRealSlot,
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 63c8e56080d6..659d72254868 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -876,7 +876,7 @@ bool SfxBindings::Execute( sal_uInt16 nId, const 
SfxPoolItem** ppItems, SfxCallM
 }
 
 SfxPoolItemHolder SfxBindings::Execute_Impl( sal_uInt16 nId, const 
SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode,
-const SfxPoolItem **ppInternalArgs, bool bGlobalOnly )
+const SfxPoolItem **ppInternalArgs )
 {
 SfxStateCache *pCache = GetStateCache( nId );
 if ( !pCache )
@@ -885,7 +885,7 @@ SfxPoolItemHolder SfxBindings::Execute_Impl( sal_uInt16 
nId, const SfxPoolItem**
 while ( pBind )
 {
 if ( pBind->GetStateCache( nId ) )
-return pBind->Execute_Impl( nId, ppItems, nModi, nCallMode, 
ppInternalArgs, bGlobalOnly );
+return pBind->Execute_Impl( nId, ppItems, nModi, nCallMode, 
ppInternalArgs );
 pBind = pBind->pImpl->pSubBindings;
 }
 }
@@ -944,10 +944,6 @@ SfxPoolItemHolder SfxBindings::Execute_Impl( sal_uInt16 
nId, const SfxPoolItem**
 pSlot = pServer->GetSlot();
 }
 
-if ( bGlobalOnly )
-if ( dynamic_cast< const SfxModule *>( pShell ) == nullptr && 
dynamic_cast< const SfxApplication *>( pShell ) == nullptr && dynamic_cast< 
const SfxViewFrame *>( pShell ) == nullptr )
-return SfxPoolItemHolder();
-
 SfxItemPool &rPool = pShell->GetPool();
 SfxRequest aReq( nId, nCallMode, rPool );
 aReq.SetModifier( nModi );

core.git: sw/source

2024-05-22 Thread Michael Weghorn (via logerrit) 
 sw/source/core/doc/tblrwcl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 554c06b2f66ff7c26df0ac29f89894fff89eecd6
Author: Michael Weghorn 
AuthorDate: Wed May 22 08:16:00 2024 +0100
Commit: Michael Weghorn 
CommitDate: Wed May 22 11:05:03 2024 +0200

sw: Change OSL_ENSURE -> assert

This fixes my local Windows/MSVC build that previously
failed like this:


C:/tools/cygwin/home/user/development/git/libreoffice/sw/source/core/doc/tblrwcl.cxx(3187):
 error C2220: the following warning is treated as an error
C:  oolsmake[1]: *** 
[C:/tools/cygwin/home/user/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:338:
 
C:/tools/cygwin/home/user/development/git/libreoffice/workdir/CxxObject/sw/source/core/doc/tblrwcl.o]
 Error 2
make: *** [Makefile:294: build] Error 2

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

diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index b13dc38ebcef..38c5074f0e89 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3100,7 +3100,7 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox, 
TableChgWidthHeightType eTy
 for( auto n = nStt; n < nEnd; ++n )
 {
 SwLayoutFrame* pLineFrame = GetRowFrame( *(*pLines)[ n 
] );
-OSL_ENSURE( pLineFrame, "Where is the Frame from the 
SwTableLine??" );
+assert(pLineFrame && "Where is the Frame from the 
SwTableLine??");
 aParam.nMaxSpace += CalcRowRstHeight( pLineFrame );
 aParam.nMaxHeight += 
pLineFrame->getFrameArea().Height();
 }

core.git: sw/qa sw/source xmloff/qa

2024-05-22 Thread Miklos Vajna (via logerrit) 
 sw/qa/core/layout/data/fly-rel-width-rounding.odt |binary
 sw/qa/core/layout/fly.cxx |   25 ++
 sw/source/core/layout/fly.cxx |5 ++--
 xmloff/qa/unit/text.cxx   |4 +--
 4 files changed, 30 insertions(+), 4 deletions(-)

New commits:
commit 080afd6a345e5dffd924100b5a3ff9c028f5b094
Author: Miklos Vajna 
AuthorDate: Wed May 22 08:47:32 2024 +0200
Commit: Miklos Vajna 
CommitDate: Wed May 22 10:27:36 2024 +0200

Related: tdf#145972 sw images: fix rounding error in relative size 
calculation

Open the bugdoc, see that the image is roughly half of the page width,
right click, properties, UI shows that the width of the image is 5% of
the width of the entire page. This only happens if tools -> options ->
writer -> general sets the UI units to points, the default cm case is
fine.

This went wrong with commit 9e8712ed6f9fb5dbd971e352a5709bd45fadc74f (sw
image dialog: fix fallback width/height for images with relative sizes,
2022-03-17), because the layout size started to matter more after that
commit. This lead to the nWidth !=
m_xWidthED->get_value(FieldUnit::TWIP) check in SwFramePage::Init() to
be true, because 11906 * 0.48 is 5714.88, so you got 5714 in the layout,
but got 5715 with rounding in SwFramePage::Reset() (which tries to calc
the page width based on the 48% and the fly width). And once we had that
mismatch, we went down the wrong path.

Fix the problem by using rtl::math::round() in SwFlyFrame::CalcRel(), so
the relative width twips value is 5715 everywhere: once we have
consisteny, the UI value is correct, too.

Note that the original bugdoc needs more fixing, this just fixes the
bugdoc where KeepRatio is false.

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

diff --git a/sw/qa/core/layout/data/fly-rel-width-rounding.odt 
b/sw/qa/core/layout/data/fly-rel-width-rounding.odt
new file mode 100644
index ..b70b9e51a917
Binary files /dev/null and b/sw/qa/core/layout/data/fly-rel-width-rounding.odt 
differ
diff --git a/sw/qa/core/layout/fly.cxx b/sw/qa/core/layout/fly.cxx
index 47cfb40fa6e7..81df20af3b35 100644
--- a/sw/qa/core/layout/fly.cxx
+++ b/sw/qa/core/layout/fly.cxx
@@ -86,6 +86,31 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyNegativeHeight)
 }
 }
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testFlyRelWithRounding)
+{
+// Given a document where page width is 21.001cm (11906 twips), and the 
image width is 48% of
+// the page width:
+createSwDoc("fly-rel-width-rounding.odt");
+
+// When laying out that document:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+
+// Then make sure that we calculate the width of the fly correctly:
+auto pPage = pLayout->GetLower()->DynCastPageFrame();
+CPPUNIT_ASSERT(pPage->GetSortedObjs());
+SwSortedObjs& rPageObjs = *pPage->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPageObjs.size());
+auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame();
+CPPUNIT_ASSERT(pFly);
+tools::Long nFlyWidth = pFly->getFrameArea().Width();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 5715
+// - Actual  : 5714
+// i.e. 5714.88 was truncated, not rounded.
+CPPUNIT_ASSERT_EQUAL(static_cast(5715), nFlyWidth);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 549681ca7227..a3c9ac84e7c2 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -2845,9 +2846,9 @@ Size SwFlyFrame::CalcRel( const SwFormatFrameSize &rSz ) 
const
 }
 
 if ( rSz.GetWidthPercent() && rSz.GetWidthPercent() != 
SwFormatFrameSize::SYNCED )
-aRet.setWidth( nRelWidth * rSz.GetWidthPercent() / 100 );
+aRet.setWidth(rtl::math::round(double(nRelWidth) * 
rSz.GetWidthPercent() / 100));
 if ( rSz.GetHeightPercent() && rSz.GetHeightPercent() != 
SwFormatFrameSize::SYNCED )
-aRet.setHeight( nRelHeight * rSz.GetHeightPercent() / 100 );
+aRet.setHeight(rtl::math::round(double(nRelHeight) * 
rSz.GetHeightPercent() / 100));
 
 if ( rSz.GetHeight() && rSz.GetWidthPercent() == 
SwFormatFrameSize::SYNCED )
 {
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index 1679af04bc1f..f95e07e42578 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -508,11 +508,11 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testRelativeWidth)
 
 xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);

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

2024-05-22 Thread Michael Stahl (via logerrit) 
 sw/inc/doc.hxx  |   26 +-
 sw/qa/extras/uiwriter/data/stylewithlistandindents.fodt |  182 
 sw/qa/extras/uiwriter/uiwriter8.cxx |   81 +++
 sw/source/core/doc/DocumentContentOperationsManager.cxx |7 
 sw/source/core/doc/docnum.cxx   |   47 ++--
 sw/source/core/edit/autofmt.cxx |2 
 sw/source/core/edit/ednumber.cxx|   12 -
 sw/source/core/undo/unnum.cxx   |4 
 sw/source/core/unocore/unocrsrhelper.cxx|8 
 sw/source/filter/basflt/fltshell.cxx|2 
 10 files changed, 332 insertions(+), 39 deletions(-)

New commits:
commit 34049fd79aa085277260656b3ef50844c1de9b6f
Author: Michael Stahl 
AuthorDate: Thu May 16 18:09:18 2024 +0200
Commit: Miklos Vajna 
CommitDate: Wed May 22 09:53:23 2024 +0200

tdf#161137 sw: fix AutoText or Paste overriding paragraph indents

The problem is that when a paragraph style specifies a SwNumRule, then
this style's indents override the indents of the SwNumRule, but if the
same SwNumRule is also added to the SwTextNode's mpAttrSet, then the
style's indents no longer take effect.

This happens both when inserting an AutoText, and when Pasting, into a
list item, because DocumentContentOperationsManager::CopyImplImpl()
sets the pNumRuleToPropagate as direct formatting on every pasted node.

Add another flag to SwDoc::SetNumRule() to check if pNumRuleToPropagate
was already in effect due to the paragraph style.

Change-Id: Id98ad2a21eab4f8636fb36f9298a054cfe4f7784
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167766
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 7698f386413e514a4478a1af69a8a3be93dfecab)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167689
Reviewed-by: Caolán McNamara 
(cherry picked from commit 2e2ea78e585d469373c038aa12c5b99909a018c8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167917
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 99cb33c75826..84378f8521ea 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1052,23 +1052,28 @@ public:
 
 bool GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame 
const* = nullptr) const;
 
-/** Accept changes of outline styles for OutlineRule.
- @param bResetIndentAttrs Optional parameter - default value false:
-  If  equals true, the indent attributes "before text"
-  and "first line indent" are additionally reset at the provided PaM, if
-  the list style makes use of the new list level attributes.
- @param bCreateNewList indicates if a new list is created by applying the 
given list style.
+enum class SetNumRuleMode {
+Default = 0,
+/// indicates if a new list is created by applying the given list 
style.
+CreateNewList = 1,
+DontSetItem = 2,
+/** If enabled, the indent attributes "before text" and
+  "first line indent" are additionally reset at the provided PaM,
+  if the list style makes use of the new list level attributes. */
+ResetIndentAttrs = 4,
+DontSetIfAlreadyApplied = 8
+};
+
+/** Set or change numbering rule on text nodes, as direct formatting.
  @param sContinuedListId If bCreateNewList is false, may contain the
   list Id of a list which has to be continued by applying the given list 
style
 
  @return the set ListId if bSetItem is true */
 OUString SetNumRule( const SwPaM&,
  const SwNumRule&,
- bool bCreateNewList,
+ SetNumRuleMode mode,
  SwRootFrame const* pLayout = nullptr,
- const OUString& sContinuedListId = OUString(),
- bool bSetItem = true,
- const bool bResetIndentAttrs = false );
+ const OUString& sContinuedListId = OUString());
 void SetCounted(const SwPaM&, bool bCounted, SwRootFrame const* pLayout);
 
 void MakeUniqueNumRules(const SwPaM & rPaM);
@@ -1704,6 +1709,7 @@ private:
 
 namespace o3tl {
 template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 // This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
diff --git a/sw/qa/extras/uiwriter/data/stylewithlistandindents.fodt 
b/sw/qa/extras/uiwriter/data/stylewithlistandindents.fodt
new file mode 100644
index ..afb7ae06aac2
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/stylewithlistandindents.fodt
@@ -0,0 +1,182 @@
+
+http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:x