Re: Slow and silent compilation

[Ilmari Lauhakangas]

On 22.9.2024 11.28, Regis Perdreau wrote:


HI,

With cygwin, Libreoffice takes ages, more than 6h to compile with no 
indication on screen.. Compil time is usually less 2 hours with my computer.

I have updated all.tools, visual studio, cygwin, libreoffice core.

I see :

[build DEP] LNK:Library/bootstraplo.dll.d
[build DEP] RC:smd/default
[build DEP] LNK:Library/smdlo.dll.d
[build DEP] RC:sm/default
[build DEP] LNK:Library/smlo.dll.d
[build DEP] RC:sot/default
[build DEP] LNK:Library/sotlo.dll.d
[build DEP] LNK:Executable/cpp.exe.d
[build DEP] LNK:Executable/g++-wrapper.exe.d
[build DEP] LNK:Executable/gcc-wrapper.exe.d
[build DEP] LNK:StaticLibrary/wrapper.lib.d
[build DEP] LNK:Executable/gbuildtojson.exe.d
[build DEP] LNK:Executable/concat-deps.exe.d
[build DEP] RC:smoketest/default
[build DEP] LNK:Library/smoketest.dll.d
[build DEP] RC:OGLTrans/default
[build DEP] LNK:Library/OGLTranslo.dll.d

And that's all.


What to do.?


You can also try the new way and skip Cygwin: 
https://wiki.documentfoundation.org/Development/BuildingOnWSLWindows


Ilmari

core.git: icon-themes/karasa_jaga_svg

[Ilmari Lauhakangas (via logerrit)]

 icon-themes/karasa_jaga_svg/cmd/32/addressbooksource.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/currencyfield.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/documentation.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/lc_addressbooksource.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/lc_changepicture.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/lc_currencyfield.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/lc_documentation.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/lc_sbaexecutesql.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/sc_addressbooksource.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/sc_bezierappend.svg  |2 +-
 icon-themes/karasa_jaga_svg/cmd/sc_bezierinsert.svg  |2 +-
 icon-themes/karasa_jaga_svg/cmd/sc_currencyfield.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/sc_documentation.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/sc_showlicense.svg   |2 +-
 icon-themes/karasa_jaga_svg/wizards/res/portrait_32.svg  |2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 750be5370638917361ec9cc2e7d016e4caf2416e
Author: Ilmari Lauhakangas 
AuthorDate: Tue Sep 17 10:44:54 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Wed Sep 18 09:14:31 2024 +0200

tdf#158939 Karasa Jaga: optimise icons by removing bitmaps

Change-Id: If6a285f03e3c97525c9de1267193347323964e37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173566
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/icon-themes/karasa_jaga_svg/cmd/32/addressbooksource.svg 
b/icon-themes/karasa_jaga_svg/cmd/32/addressbooksource.svg
index 9c7dd556fdf4..1f22bca24492 100644
--- a/icon-themes/karasa_jaga_svg/cmd/32/addressbooksource.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/32/addressbooksource.svg
@@ -1 +1 @@
-e 
... etc. - the rest is truncated

core.git: icon-themes/colibre

[Ilmari Lauhakangas (via logerrit)]

 icon-themes/colibre/chart2/res/typehistogram_16.png |binary
 1 file changed

New commits:
commit 6d64384d93b6ae256a529d524c15719b872fcab7
Author: Ilmari Lauhakangas 
AuthorDate: Tue Sep 17 15:42:47 2024 +0300
Commit: Tomaž Vajngerl 
CommitDate: Tue Sep 17 21:21:26 2024 +0200

Colibre: fix typehistogram_16.png icon

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

diff --git a/icon-themes/colibre/chart2/res/typehistogram_16.png 
b/icon-themes/colibre/chart2/res/typehistogram_16.png
index 0bab3c3f7e82..cc9eadb715cd 100644
Binary files a/icon-themes/colibre/chart2/res/typehistogram_16.png and 
b/icon-themes/colibre/chart2/res/typehistogram_16.png differ

core.git: Branch 'libreoffice-24-8' - 21 commits - basic/qa basic/source dictionaries extras/source icon-themes/colibre_dark_svg icon-themes/colibre_svg sc/inc sc/qa sc/source sc/uiconfig sd/qa sfx2/q

[Ilmari Lauhakangas (via logerrit)]

 basic/qa/basic_coverage/test_Property.GetSet.bas |1 
 basic/qa/basic_coverage/test_With.bas|   19 
 basic/source/comp/loops.cxx  |   15 
 basic/source/comp/parser.cxx |6 
 dictionaries |2 
 extras/source/autocorr/lang/en-AU/DocumentList.xml   |1 
 extras/source/autocorr/lang/en-GB/DocumentList.xml   |1 
 extras/source/autocorr/lang/en-US/DocumentList.xml   |1 
 extras/source/autocorr/lang/en-ZA/DocumentList.xml   |1 
 extras/source/autocorr/lang/ja/DocumentList.xml  |1 
 extras/source/autocorr/lang/ko/DocumentList.xml  |1 
 extras/source/autocorr/lang/zh-TW/DocumentList.xml   |1 
 icon-themes/colibre_dark_svg/res/locked.svg  |1 
 icon-themes/colibre_dark_svg/res/unlocked.svg|   44 
 icon-themes/colibre_svg/res/locked.svg   |1 
 icon-themes/colibre_svg/res/unlocked.svg |5 
 sc/inc/colorscale.hxx|6 
 sc/inc/fillinfo.hxx  |1 
 sc/qa/unit/subsequent_filters_test4.cxx  |   14 
 sc/qa/unit/ucalc_condformat.cxx  |9 
 sc/source/core/data/colorscale.cxx   |   66 
 sc/source/ui/condformat/condformatdlgentry.cxx   |   30 
 sc/source/ui/view/dbfunc.cxx |8 
 sc/source/ui/view/tabvwsha.cxx   |3 
 sc/uiconfig/scalc/ui/conditionaliconset.ui   |   11 
 sd/qa/unit/data/tdf162455.svg| 2115 +++
 sd/qa/unit/uiimpress.cxx |   37 
 sfx2/qa/cppunit/test_misc.cxx|   32 
 sfx2/source/doc/docfile.cxx  |5 
 svx/source/svdraw/svdfmtf.cxx|   88 
 svx/source/svdraw/svdfmtf.hxx|9 
 sw/inc/PostItMgr.hxx |2 
 sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx |   40 
 sw/qa/core/accessibilitycheck/data/DeleteHeader.odt  |binary
 sw/qa/extras/uiwriter/uiwriter6.cxx  |  126 
 sw/source/core/access/AccessibilityCheck.cxx |   71 
 sw/source/core/doc/docfmt.cxx|   33 
 sw/source/core/unocore/unosett.cxx   |2 
 sw/source/ui/config/optpage.cxx  |2 
 sw/source/uibase/app/docst.cxx   |   16 
 sw/source/uibase/uno/unotxdoc.cxx|8 
 vcl/source/components/dtranscomp.cxx |1 
 vcl/unx/gtk4/a11y.cxx|   12 
 43 files changed, 2589 insertions(+), 259 deletions(-)

New commits:
commit 3ed2932d1e6db06103cca2e13ca70c5465febee6
Author: Ilmari Lauhakangas 
AuthorDate: Tue Sep 17 08:51:01 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Sep 17 16:46:58 2024 +0200

tdf#162990 Colibre (and Dark) SVG: fix unlocked icon and add locked icon

Change-Id: Ic2121cdddc5bafb38b5082f4ba6e6774670a1543
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173509
Reviewed-by: Heiko Tietze 
Reviewed-by: Rafael Lima 
Tested-by: Jenkins
(cherry picked from commit b72068ba689af7f292eca707df5765fda8109fb5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173494
Reviewed-by: Ilmari Lauhakangas 

diff --git a/icon-themes/colibre_dark_svg/res/locked.svg 
b/icon-themes/colibre_dark_svg/res/locked.svg
new file mode 100644
index ..9bdb7c7e20cf
--- /dev/null
+++ b/icon-themes/colibre_dark_svg/res/locked.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_dark_svg/res/unlocked.svg 
b/icon-themes/colibre_dark_svg/res/unlocked.svg
index af033231c4fa..bd5bce15201d 100644
--- a/icon-themes/colibre_dark_svg/res/unlocked.svg
+++ b/icon-themes/colibre_dark_svg/res/unlocked.svg
@@ -1,43 +1 @@
-
-http://www.inkscape.org/namespaces/inkscape";
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
-   xmlns="http://www.w3.org/2000/svg";
-   xmlns:svg="http://www.w3.org/2000/svg";>
-  
-  
-  
-
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/res/locked.svg 
b/icon-themes/colibre_svg/res/locked.svg
new file mode 100644
index ..f809b339c918
--- /dev/null
+++ b/icon-themes/colibre_svg/res/locked.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/res/unlocked.svg 
b/icon-themes/colibre_svg/res/unlocked.svg
index fb22c1bf8e5c..8914e0138044 100644
--- a/icon-themes/colibre_svg/res/unlocked.svg
+++ b/icon-themes/colibre_svg/res/unlocked

Re: Contribution Enquiry

[Ilmari Lauhakangas]

On 15.9.2024 21.07, Komal deep wrote:

Respected Sir/Madam,

I hope you are doing well. My name is Komaldeep, and I am a third-year 
undergraduate student pursuing a degree in Computer Science at Keshav 
Mahavidyalaya, University Of Delhi. While I am relatively new to 
open-source contributions, I have a strong foundation in Python and Data 
analytics.


I am eager to contribute to your organization’s projects and would 
appreciate any guidance you can offer on how to get started. Please 
provide some direction on suitable beginner-level tasks, repositories to 
explore, or resources to help me understand the contribution process.


Thank you for your time, and I look forward to hearing from you.


I have invited you to an interview.

Ilmari

Re: How to get started with contribution

[Ilmari Lauhakangas]

On 13.9.2024 16.17, Suyog Acharya wrote:

Respected sir/madam,

I am Suyog Acharya, a computer science undergraduate, I have just 
entered my thrid year at NMIT Bangalore. I am new to open source 
contributions but I am well aware of Python and C++. I would love to 
contribute to your organization, For that could you please guide me on 
how to get started?

Hoping to hear from you soon.


I have invited you to an interview.

Ilmari

Re: Accessing fontconfig objs in gdb

[Ilmari Lauhakangas]

On 10.9.2024 14.01, Julien Nabet wrote:

Hello,

I'm trying to understand fontconfig use in LO for tdf#108243 (semicolon 
separated fonts substitution not working (bug in Linux FontConfig 
integration code)


On gdb, I got this:

(gdb) p pPattern
$1 = (FcPattern *) 0x5c030800
(gdb) p *pPattern
$2 = 

whereas I rebuilt fontconfig after having done:

1) adding --without-system-fontconfig in autogen.input

2) using this:

diff --git a/external/fontconfig/ExternalProject_fontconfig.mk 
b/external/fontconfig/ExternalProject_fontconfig.mk

index 0d899ef129bd..7ecd8353c154 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -31,6 +31,7 @@ $(call 
gb_ExternalProject_get_state_target,fontconfig,build) :

     $(if $(filter EMSCRIPTEN,$(OS)),-pthread)" \
     $(if $(filter ANDROID,$(OS)),LIBS="-lm") \
     $(if $(filter 
EMSCRIPTEN,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" 
LIBXML2_LIBS="$(LIBXML_LIBS)") \

+   $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=true) \
     $(gb_RUN_CONFIGURE) ./configure \
     --disable-silent-rules \
     --with-pic \

What should I do to teach gdb to display fontconfig objs?


Can you install the debug package for fontconfig in your Linux distro?

Ilmari

core.git: sw/uiconfig

[Ilmari Lauhakangas (via logerrit)]

 sw/uiconfig/swriter/ui/frmtypepage.ui |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 8a82a7cb706796c5fc5638b7364d438fb41c59a7
Author: Ilmari Lauhakangas 
AuthorDate: Fri Sep 6 14:01:17 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Sep 6 19:41:01 2024 +0200

Related: tdf#149085 fix IDs in context attributes

Change-Id: Ieb7d89e8a0304782bf32e2169230de1e3eabf446
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172943
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui 
b/sw/uiconfig/swriter/ui/frmtypepage.ui
index 76bcaf1cd9b8..ba3348579d9d 100644
--- a/sw/uiconfig/swriter/ui/frmtypepage.ui
+++ b/sw/uiconfig/swriter/ui/frmtypepage.ui
@@ -611,7 +611,7 @@
 18
 
   
-_Contents
+_Contents
 True
 True
 False
@@ -620,7 +620,7 @@
 True
 
   
-Prevents 
changes to the contents of the selected item.
+Prevents 
changes to the contents of the selected item.
   
 
   
@@ -631,7 +631,7 @@
 
 
   
-P_osition
+P_osition
 True
 True
 False
@@ -639,7 +639,7 @@
 True
 
   
-Locks the 
position of the selected item in the current document.
+Locks the 
position of the selected item in the current document.
   
 
   
@@ -650,7 +650,7 @@
 
 
   
-_Size
+_Size
 True
 True
 False
@@ -658,7 +658,7 @@
 True
 
   
-Locks the size 
of the selected item.
+Locks the 
size of the selected item.
   
 
   
@@ -673,7 +673,7 @@
   
 True
 False
-Protect
+Protect
 
   
 

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 52eceeb51b03afc4e3b003fad773a3f99fa74738
Author: Ilmari Lauhakangas 
AuthorDate: Fri Sep 6 18:46:09 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 6 17:46:09 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a88ae62e116a47c32a0fa679544eee79160616a9
  - Related tdf#140347: remove colons from headings

Change-Id: Ic0f7fa6dc262466a5fed8ddfac0a1b95ba2351af
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172973
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index edcc3ca5f71b..a88ae62e116a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit edcc3ca5f71bb680059d4713b095246f876837b4
+Subproject commit a88ae62e116a47c32a0fa679544eee79160616a9

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/swriter/01/06080100.xhp |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit a88ae62e116a47c32a0fa679544eee79160616a9
Author: Ilmari Lauhakangas 
AuthorDate: Fri Sep 6 18:44:50 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Sep 6 17:46:08 2024 +0200

Related tdf#140347: remove colons from headings

Change-Id: Ic0f7fa6dc262466a5fed8ddfac0a1b95ba2351af
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172973
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/swriter/01/06080100.xhp 
b/source/text/swriter/01/06080100.xhp
index f4b4de5c7a..1e9cbeb6a1 100644
--- a/source/text/swriter/01/06080100.xhp
+++ b/source/text/swriter/01/06080100.xhp
@@ -40,7 +40,7 @@
 AutoNumbering
 
 
-Numbering:
+Numbering
 Select the numbering scheme 
that you want to use.
 
 
@@ -111,7 +111,7 @@
 
 
 
-Counting:
+Counting
 Select the numbering option 
for the footnotes.
 
 
@@ -148,16 +148,16 @@
 
 
 
-Before:
+Before
 Enter the text that you want to 
display in front of the footnote number in the note text. For example, 
type "To " to display "To 1".
 
-After:
+After
 Enter the text that you want to 
display after the footnote number in the note text. For example, type 
")" to display "1)".
 Footnote numbers are left aligned 
by default in the footnote area. For right aligned footnote numbers first edit 
the paragraph style Footnote. Press Command+TF11
 to open Styles dialog and select Footnote from the 
list of paragraph styles. Open the local menu with right click and choose 
Modify. Go to the Indents & Spacing tab page and 
set indent to 0 before and after the paragraph, including the first line. On 
Tabs tab page create a tab of right type at 12pt and a tab of left 
type at 14pt. Then in Footnotes/Endnotes Settings dialog enter 
   into the Before and 
After edit boxes.
 
-Start at:
+Start at
 Enter the number for the first 
footnote in the document. This option is only available if you selected "Per 
Document" in the Counting box.
-Position:
+Position
 
 End of page
 Displays footnotes at the 
bottom of the page.
@@ -167,24 +167,24 @@
 Text style
 To ensure a 
uniform appearance for the footnotes in your document, assign a paragraph style 
to the footnote text, and assign character styles to the footnote anchor number 
and the number in the footnote area.
 
-Paragraph:
+Paragraph
 Select the paragraph style 
for the footnote text. Only special styles can be selected.
 
-Page:
+Page
 Select the page style that 
you want to use for footnotes.
 This option is only 
available if the End of Document check box is selected in the 
Position area.
 
-Anchor in text:
+Anchor in text
 Select the character 
style that you want to use for footnote anchors in the text area of your 
document.
 
-Anchor in footnote:
+Anchor in footnote
 Select the character style 
that you want to use for the footnote numbers in the footnote 
area.
 Continuation notice
 
-End of Footnote:
+End of Footnote
 Enter the text that you want to 
display when the footnotes are continued on the next page, for example, 
"Continued on Page ". $[officename] Writer automatically inserts the number of 
the following page. 
 
-Start of next page:
+Start of next page
 Enter the text that you want 
to display on the page where the footnotes are continued, for example, 
"Continued from Page ". $[officename] Writer automatically inserts the number 
of the previous page.
 
 

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 78a2addbfe500ff14bf09b0cc0a5183f830add99
Author: Ilmari Lauhakangas 
AuthorDate: Fri Sep 6 16:58:21 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 6 15:58:21 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to edcc3ca5f71bb680059d4713b095246f876837b4
  - tdf#149085 Protect section in Writer object properties moved to

Position and Size tab.

I removed the  tags as the .ui file already has extended tips 
defined.

Also update the label Automatic to AutoSize to match current UI.

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

diff --git a/helpcontent2 b/helpcontent2
index b4c5d498e409..edcc3ca5f71b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b4c5d498e409d98da283dcaa25a8e3d8591aac76
+Subproject commit edcc3ca5f71bb680059d4713b095246f876837b4

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/shared/guide/protection.xhp |4 ++--
 source/text/swriter/01/05060100.xhp |   17 +++--
 source/text/swriter/01/05060900.xhp |   12 
 3 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit edcc3ca5f71bb680059d4713b095246f876837b4
Author: Ilmari Lauhakangas 
AuthorDate: Fri Sep 6 13:52:05 2024 +0300
Commit: Olivier Hallot 
CommitDate: Fri Sep 6 15:58:20 2024 +0200

tdf#149085 Protect section in Writer object properties moved to

Position and Size tab.

I removed the  tags as the .ui file already has extended tips 
defined.

Also update the label Automatic to AutoSize to match current UI.

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

diff --git a/source/text/shared/guide/protection.xhp 
b/source/text/shared/guide/protection.xhp
index de60a51fd5..d163fcb509 100644
--- a/source/text/shared/guide/protection.xhp
+++ b/source/text/shared/guide/protection.xhp
@@ -90,7 +90,7 @@
Turning on protection
 
 
-   For example, for graphics inserted in Writer: Choose 
Format - Image - Properties - Options tab. Under 
Protect, mark Contents, Position and/or 
Size.
+   For example, for graphics inserted in Writer: Choose 
Format - Image - Properties - Position and Size tab. Under 
Protect, mark Contents, Position and/or 
Size.
 
  
  
@@ -98,7 +98,7 @@
Turning off protection
 
 
-   For example, for graphics inserted in Writer: Choose 
Format - Image - Properties - Options tab. Under 
Protect, unmark as appropriate.
+   For example, for graphics inserted in Writer: Choose 
Format - Image - Properties - Position and Size tab. Under 
Protect, unmark as appropriate.
 
  
   
diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index e5a0f42a5a..b77bbd1b32 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -67,9 +67,22 @@
   This option is not available for frames.
   
   
-  Automatic
+  AutoSize
   Automatically adjusts the width 
or height of a frame to match the contents of the frame. If you want, you can 
specify a minimum width or minimum height for the frame.
-  The Automatic option is only available 
when you select a frame.
+  The AutoSize option is only available 
when you select a frame.
+
+  Protect
+  Specifies protection options 
for the selected item.
+  
+  Contents
+  Prevents changes to the 
contents of the selected item.
+  You can still copy the 
contents of the selected item.
+  
+  Position
+  Locks the position of the 
selected item in the current document.
+  
+  Size
+  Locks the size of the 
selected item.
 
   
 Anchor
diff --git a/source/text/swriter/01/05060900.xhp 
b/source/text/swriter/01/05060900.xhp
index ddb0ddc9f9..8b0656b9f5 100644
--- a/source/text/swriter/01/05060900.xhp
+++ b/source/text/swriter/01/05060900.xhp
@@ -56,18 +56,6 @@
 
 Next link
 Displays the frame that comes after 
the selected frame in a linked sequence. To add or change the next link, select 
a name from the list. If you are a linking frames, the target frame must be 
empty.
-Protect
-Specifies protection options 
for the selected item.
-
-Contents
-Prevents changes to the 
contents of the selected item.
-You can still copy the contents 
of the selected item.
-
-Position
-Locks the position of the 
selected item in the current document.
-
-Size
-Locks the size of the selected 
item.
 Content alignment (frames only)
 Vertical alignment
 Specifies the vertical alignment 
of the frame's content. Mainly it means text content, but it also affects 
tables and other objects anchored to the text area (anchored as character, to 
character or to paragraph), for example frames, graphics or 
drawings.

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 3f3da299e54a78efd01f952f410cebe2bc67a77e
Author: Ilmari Lauhakangas 
AuthorDate: Fri Sep 6 16:07:13 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 6 15:07:13 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to b4c5d498e409d98da283dcaa25a8e3d8591aac76
  - tdf#140347 Labels changed in Settings of Footnotes and Endnotes dialog

Change-Id: I6c3f9c626c24bddf5cd72ce5c0a65732ad3073ad
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172968
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 35f143f5b52c..b4c5d498e409 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 35f143f5b52cf1b8203562e4016b75ba7e568c53
+Subproject commit b4c5d498e409d98da283dcaa25a8e3d8591aac76

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/swriter/01/06080100.xhp |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit b4c5d498e409d98da283dcaa25a8e3d8591aac76
Author: Ilmari Lauhakangas 
AuthorDate: Fri Sep 6 15:59:53 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Sep 6 15:07:13 2024 +0200

tdf#140347 Labels changed in Settings of Footnotes and Endnotes dialog

Change-Id: I6c3f9c626c24bddf5cd72ce5c0a65732ad3073ad
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172968
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/swriter/01/06080100.xhp 
b/source/text/swriter/01/06080100.xhp
index a2a43821f8..f4b4de5c7a 100644
--- a/source/text/swriter/01/06080100.xhp
+++ b/source/text/swriter/01/06080100.xhp
@@ -40,7 +40,7 @@
 AutoNumbering
 
 
-Numbering
+Numbering:
 Select the numbering scheme 
that you want to use.
 
 
@@ -111,7 +111,7 @@
 
 
 
-Counting
+Counting:
 Select the numbering option 
for the footnotes.
 
 
@@ -148,43 +148,43 @@
 
 
 
-Before
+Before:
 Enter the text that you want to 
display in front of the footnote number in the note text. For example, 
type "To " to display "To 1".
 
-After
+After:
 Enter the text that you want to 
display after the footnote number in the note text. For example, type 
")" to display "1)".
 Footnote numbers are left aligned 
by default in the footnote area. For right aligned footnote numbers first edit 
the paragraph style Footnote. Press Command+TF11
 to open Styles dialog and select Footnote from the 
list of paragraph styles. Open the local menu with right click and choose 
Modify. Go to the Indents & Spacing tab page and 
set indent to 0 before and after the paragraph, including the first line. On 
Tabs tab page create a tab of right type at 12pt and a tab of left 
type at 14pt. Then in Footnotes/Endnotes Settings dialog enter 
   into the Before and 
After edit boxes.
 
-Start at
+Start at:
 Enter the number for the first 
footnote in the document. This option is only available if you selected "Per 
Document" in the Counting box.
-Position
+Position:
 
 End of page
 Displays footnotes at the 
bottom of the page.
 
 End of document
 Displays footnotes at the end of 
the document as endnotes.
-Styles
+Text style
 To ensure a 
uniform appearance for the footnotes in your document, assign a paragraph style 
to the footnote text, and assign character styles to the footnote anchor number 
and the number in the footnote area.
 
-Paragraph
+Paragraph:
 Select the paragraph style 
for the footnote text. Only special styles can be selected.
 
-Page
+Page:
 Select the page style that 
you want to use for footnotes.
 This option is only 
available if the End of Document check box is selected in the 
Position area.
 
-Text area
+Anchor in text:
 Select the character 
style that you want to use for footnote anchors in the text area of your 
document.
 
-Footnote area
+Anchor in footnote:
 Select the character style 
that you want to use for the footnote numbers in the footnote 
area.
 Continuation notice
 
-End of Footnote
+End of Footnote:
 Enter the text that you want to 
display when the footnotes are continued on the next page, for example, 
"Continued on Page ". $[officename] Writer automatically inserts the number of 
the following page. 
 
-Start of next page
+Start of next page:
 Enter the text that you want 
to display on the page where the footnotes are continued, for example, 
"Continued from Page ". $[officename] Writer automatically inserts the number 
of the previous page.
 
 

Re: ESC meeting minutes: 2024-08-29

[Ilmari Lauhakangas]

On 31.8.2024 20.12, khagaroth wrote:
On Thu, Aug 29, 2024 at 4:53 PM Miklos Vajna > wrote:


* Cell indicator in 24.8 branch (Xisco)
    + Summary:
https://bugs.documentfoundation.org/show_bug.cgi?id=162646#c20

    + two topics: comment indicator and focus rectangle; no revert
please (Heiko)
    + the fear is that what's there in 24.8 is half-done (Xisco)
    + comments are mixed (Ilmari)
      + some people like what's in master
      + just today 2 commits were backported
      + one more patch to merge to 24-8, would be ideal even on 24-8-1
    + the issue is quite old, the focus rectangle of a cell was
painted inside the cell (Heiko)
      + then tried outside the cell to not cover content
      + design team suggestion was: push it to the release, see what
the wider community likes
      + meanwhile Rafael improved this, seems people are happy with
the current state
      + hope the problem is fixed
      + would like to avoid adding more options for this
      + would be good to wait, collect input and not just revert quickly
    + do you support backporting the relevant changes from master?
(Ilmari)
      + like it (Heiko)
    + fine with this, just good to not experiment on release
branches (Xisco)+


> Ignoring the subjectively ugly look (thankfully not as ugly and buggy as
> it was before the fixes). This change just replaced obscuring inner
> content with obscuring content of surrounding cells, so I would not call
> it much of an improvement, if any. It should behave the same way as MSO
> and just highlight the existing grid lines and not obscure anything.

The current state, now backported to 24.8.1, does match Excel's 
behaviour. The indicator in Excel goes slightly beyond the cell borders 
unlike you claim.


Ilmari

Re: Firebird not experimental

[Ilmari Lauhakangas]

On 28.8.2024 12.32, Alexander Thurgood wrote:

Hi all,


+1 to everything Mike wrote, with one further observation:

- the embedded HSQLDB is platform agnostic which means that one can 
share it across OSes, and to the extent that a JDK is available, is 
readable on all of the main platforms for which a LO release is 
available (and even some for which LO doesn't provide release packages, 
e.g. the BSDs).


My understanding was that the same is not guaranteed for embedded FB due 
to the endian-(n/m)ess of the architectures.


Does the use of the backup format take this into account? In other 
words, if I prepare an embedded FB ODB file on macOS Arm and send it to 
someone on Windows x86_64, will it be readable/exploitable/modifiable ?


Yes it does. Quoting from my reply to you in 2022 on board-discuss:

seems the problem existed before Aug 2016, but not anymore. See 
https://bugs.documentfoundation.org/show_bug.cgi?id=72987#c14 and 
comment 17 which refer to 
https://git.libreoffice.org/core/commit/0cc1ddf2d8d6bc7df74fdd8f8f97381df681177d


Quoting from Lionel's comment 17:

'The problem was fixed by saving (within the odb zip structure) firebird 
data in an endianess-independent format, called the "backup" format, in 
a file with extension ".fbk".'


Ilmari

Re: UI test logging not working

[Ilmari Lauhakangas]

On 27.8.2024 14.27, Xisco Fauli wrote:

On 24/8/24 9:57, Ilmari Lauhakangas wrote:
At step 5 I see a blank log file with my own build: 
https://wiki.documentfoundation.org/Development/UITests#Tools_for_writing_a_test


Another dev reported this to me and I confirmed it on 18 Aug.

linux-64-25.2 bibisect repo works fine, last commit from 19 Aug.

What might be the issue?

>
> Hi,
>
> Using my own build (64312cdae5d810dd02ef4c2a4d51b3d30cd6ac6e), it works
> fine on Linux.
>
> This is my autogen: --without-help --disable-odk --enable-debug
> --enable-assert-always-abort --enable-python=fully-internal
> --without-system-libxml --enable-werror

I wonder if it's because we (me and the first dev to notice) use Clang. 
I tried now with --enable-python=fully-internal but it didn't make a 
difference.


CC=clang
CXX=clang++
--disable-compiler-plugins
--enable-symbols
--enable-gtk4
--enable-kf5
--enable-kf6
--enable-pch=full
--with-jdk-home=/usr/lib/jvm/java-22-openjdk
--without-doxygen
--enable-odk
--without-myspell-dicts
--enable-ld=mold
--enable-gdb-index
--disable-ccache
--disable-online-update
--with-system-curl
--with-system-libxml=no
--enable-python=fully-internal

Ilmari

Re: Firebird not experimental

[Ilmari Lauhakangas]

On 27.8.2024 0.28, Thorsten Behrens wrote:

Hola Juan,

Juan C. Sanz wrote:

In considering the above, I propose to the ESC (or whomever it may concern):

  * Take Firebird out of experimental mode. Although it is not strictly
necessary for it to be the default database, I think it would be
preferable.

  * Decouple HSQLDB migration from the existence or not of Firebird.

  * Support and promote the use of Base as well as assist the
development of Base into a reliable and modern database (support
this long overdue bidding process).


The general idea is a good one IMO.

But please be aware that the ESC does not command any development
resources, but instead is a group of peers discussing the technical
status of the project (and sometimes manages to find volunteers to
work on critical bugs).

So asking the ESC to 'assist the development of Base into a reliable
and modern database' is likely not going to get us very far. What
could help, is drafting an ESC tender proposal in the wiki, with what
you have in mind (if it can be sufficiently narrowed-down to be costed
& tendered). Tendering from TDF though is still stalled indefinitely,
so that also might need some patience.

As often in FOSS land, your best bet to get stuff done - is starting
the work yourself! ;)


Firebird improvements were accepted for TDF's 2023 budget, but are not 
in the current budget. As Sophie posted to board-discuss recently, the 
procurement policy is currently finalised. New tenders can, pending 
board approval, likely be considered for next year's budget then.


Ilmari

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/swriter/main0208.xhp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 990dbc0f0480c8c9820e2079d0c9964467e6e8b0
Author: Ilmari Lauhakangas 
AuthorDate: Mon Aug 26 21:20:05 2024 +0300
Commit: Olivier Hallot 
CommitDate: Mon Aug 26 22:30:22 2024 +0200

tdf#153732 Add outline to status bar and reorder items

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

diff --git a/source/text/swriter/main0208.xhp b/source/text/swriter/main0208.xhp
index 9f3600dd3c..1af9ed39e2 100644
--- a/source/text/swriter/main0208.xhp
+++ b/source/text/swriter/main0208.xhp
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
@@ -58,7 +59,8 @@
 
 Digital Signature
 Click to start digital 
signature process.  You must have a digital certificate to complete the 
process. See also Digital 
Signatures.
-
+
+
 
 View Layout
 Three controls on the Writer 
Status Bar allow you to change the zoom and view layout of your text 
documents.

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 0247616169502d741a596519d36e005bc412ac72
Author: Ilmari Lauhakangas 
AuthorDate: Mon Aug 26 23:30:23 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Mon Aug 26 22:30:23 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 990dbc0f0480c8c9820e2079d0c9964467e6e8b0
  - tdf#153732 Add outline to status bar and reorder items

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

diff --git a/helpcontent2 b/helpcontent2
index f9c2c4f00d21..990dbc0f0480 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f9c2c4f00d219221d8e06a0961b0594835d94958
+Subproject commit 990dbc0f0480c8c9820e2079d0c9964467e6e8b0

UI test logging not working

[Ilmari Lauhakangas]

At step 5 I see a blank log file with my own build: 
https://wiki.documentfoundation.org/Development/UITests#Tools_for_writing_a_test


Another dev reported this to me and I confirmed it on 18 Aug.

linux-64-25.2 bibisect repo works fine, last commit from 19 Aug.

What might be the issue?

Ilmari

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit d613252fd9ecebc90d0ecf6afbfdab18eec4e808
Author: Ilmari Lauhakangas 
AuthorDate: Fri Aug 23 14:12:09 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Fri Aug 23 13:12:09 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to b27934a3330f48716085cacbc2054a605675f2a5
  - tdf#162559 Clarify conditional formatting example

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

diff --git a/helpcontent2 b/helpcontent2
index 192db7f5be7c..b27934a3330f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 192db7f5be7cc894d444f043747b1fd0865e4efc
+Subproject commit b27934a3330f48716085cacbc2054a605675f2a5

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit b27934a3330f48716085cacbc2054a605675f2a5
Author: Ilmari Lauhakangas 
AuthorDate: Fri Aug 23 12:21:44 2024 +0300
Commit: Olivier Hallot 
CommitDate: Fri Aug 23 13:12:08 2024 +0200

tdf#162559 Clarify conditional formatting example

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

diff --git a/source/text/scalc/guide/cellstyle_conditional.xhp 
b/source/text/scalc/guide/cellstyle_conditional.xhp
index 899893d10f..b82b5bb348 100644
--- a/source/text/scalc/guide/cellstyle_conditional.xhp
+++ b/source/text/scalc/guide/cellstyle_conditional.xhp
@@ -108,7 +108,7 @@
 Choose the Format - Conditional - Condition 
command to open the corresponding dialog.
  
  
-Define the condition as follows: If cell value is less than 
J14, format with cell style "Below", and if cell value is greater than or equal 
to J14, format with cell style "Above".
+Define the condition as follows: If cell value is less than 
$J$14, format with cell style "Below", and if cell value is greater than or 
equal to $J$14, format with cell style "Above".
  
   
   Step 5: Copy Cell Style

Re: GSOC More and Better Tests Weekly Update

[Ilmari Lauhakangas]

On 21.8.2024 7.46, Adam Seskunas wrote:
Last of all I've spent some time updating the Missing Unit Tests 
spreadsheet from the project proposal. Its a little messy, but I've 
marked which bug reports I've not been able to reproduce as well as bug 
reports that are for, one reason or another not possible to reproduce. 
This spreadsheet has been very useful and I will continue to update it 
for the remainder of the project.


You can also add comments to the fixed reports in Bugzilla while at the 
same time adding a certain string to the Whiteboard field. So if your 
comment will be 9, add to the Whiteboard:


unitTestNotes:9

Then a link to the comment will show up in the Notes column of the 
MissingUnitTests table.


Ilmari

core.git: offapi/com

[Ilmari Lauhakangas (via logerrit)]

 offapi/com/sun/star/drawing/GenericDrawPage.idl |2 +-
 offapi/com/sun/star/frame/XFrame2.idl   |2 ++
 offapi/com/sun/star/style/PageProperties.idl|6 ++
 offapi/com/sun/star/table/CellProperties.idl|4 +++-
 4 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 30faedfa35f6fbcd2c02f872903bc5d0ac36103a
Author: Ilmari Lauhakangas 
AuthorDate: Mon Aug 19 14:44:50 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Aug 19 16:02:42 2024 +0200

tdf#161347 Harmonise API docs for UserDefinedAttributes a bit

Change-Id: I85ce6e42d292b85ca0a54652dd733b14137afe9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172033
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl 
b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index 90fde7602fc3..ee46bd26cdbd 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -113,7 +113,7 @@ published service GenericDrawPage
 They will be saved to and restored from automatic styles inside xml 
files.
 
 @see com::sun::star::xml::AttributeContainer
-*/
+ */
 [optional, property] com::sun::star::container::XNameContainer 
UserDefinedAttributes;
 
 
diff --git a/offapi/com/sun/star/frame/XFrame2.idl 
b/offapi/com/sun/star/frame/XFrame2.idl
index d1a143623d02..8ab0e8f3267a 100644
--- a/offapi/com/sun/star/frame/XFrame2.idl
+++ b/offapi/com/sun/star/frame/XFrame2.idl
@@ -26,6 +26,8 @@ module com {  module sun {  module star {  module frame {
 published interface XFrame2
 {
 /** contains user defined attributes.
+
+@see com::sun::star::xml::AttributeContainer
  */
 [attribute, readonly] com::sun::star::container::XNameContainer 
UserDefinedAttributes;
 
diff --git a/offapi/com/sun/star/style/PageProperties.idl 
b/offapi/com/sun/star/style/PageProperties.idl
index ea66bdc4e20f..80586ac79725 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -146,11 +146,9 @@ published service PageProperties
  */
 [optional , property] com::sun::star::text::XTextColumns TextColumns;
 
-/** contains user defined  attributes.
+/** contains user defined attributes.
 
-This com::sun::star::container::XNameContainer
-supports the service
-com::sun::star::xml::AttributeContainer.
+@see com::sun::star::xml::AttributeContainer
  */
 [property] com::sun::star::container::XNameContainer UserDefinedAttributes;
 
diff --git a/offapi/com/sun/star/table/CellProperties.idl 
b/offapi/com/sun/star/table/CellProperties.idl
index 0c1c33e9fa7f..ed00fcf496cf 100644
--- a/offapi/com/sun/star/table/CellProperties.idl
+++ b/offapi/com/sun/star/table/CellProperties.idl
@@ -166,7 +166,9 @@ published service CellProperties
 
 This property is used i.e. by the XML filters to load and
 restore unknown attributes.
-*/
+
+@see com::sun::star::xml::AttributeContainer
+ */
 [optional, property] com::sun::star::container::XNameContainer
 UserDefinedAttributes;
 

Re: RTF import bug & info

[Ilmari Lauhakangas]

On 17.8.2024 18.34, Al Schapira wrote:

On Sat, 2024-08-17 at 09:29 -0400, Justin Luth wrote:

I don't think you read the information on
https://wiki.documentfoundation.org/QA/Bibisect very closely. Go back
to that and understand it.

especially Watch Effective Bisection and Bibisection (Matthew
Francis's talk at LibOCon 2015 on YouTube) for both an introduction,
and practical details.
  
Justin
  

This is not a helpful message. Its like RTFM.

I am not a developer or bug fixer of LO nor do I want to be. I simply
want to provide as much information as I can to the appropriate parties
so that this bug can be fixed asap.

With the help of Mike and David, I learned just enough about  bibisect
to narrow the introduction of the bug down.  I hope that helps gets it
fixed.  That is all.


Raal bibisected it after you provided the version pointers.

Beyond our Fine Manuals, we provide mentoring to help new contributors 
get started. If you are interested in learning more about how quality 
assurance is done for LibreOffice, you can email me and we can start the 
mentoring sessions. QA is a nice way to help without needing to get into 
development.


Ilmari

PowerShell examples added to automated bibisecting wiki article

[Ilmari Lauhakangas]

Check it out, ya'll: 
https://wiki.documentfoundation.org/QA/Bibisect/Automation#Automating_bisecting_with_scripts


I thought it would be nice to use 'git bisect run' also with native 
Windows git, so I created PowerShell versions of the Bash scripts.


Last month I had added a couple of additional Bash examples, done some 
cleanups and expanded the explanations.


Ilmari

core.git: solenv/bin

[Ilmari Lauhakangas (via logerrit)]

 solenv/bin/uiex |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f8c9e602a11e4fb3951a714ce026848aa9419085
Author: Ilmari Lauhakangas 
AuthorDate: Sat Aug 10 11:19:35 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Wed Aug 14 07:51:07 2024 +0200

solenv/bin/uiex: more helpful error message for context issues

Change-Id: I82b092a18b2fa2bacef7a27ad4e79350b42bc1d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171711
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/solenv/bin/uiex b/solenv/bin/uiex
index b9344c429543..d76a2d451207 100755
--- a/solenv/bin/uiex
+++ b/solenv/bin/uiex
@@ -31,7 +31,11 @@ with open(ofile, "a") as output:
 # l10ntools/source/localize.cxx will insert one entry for each 
stock per .po
 if entry.msgctxt == "stock":
 continue
-keyid = entry.msgctxt + '|' + entry.msgid
+try:
+keyid = entry.msgctxt + '|' + entry.msgid
+except Exception:
+print(f"There is a problem with the translatable string 
labeled \"{entry.msgid}\". Likely no context attribute has been specified.")
+sys.exit(2)
 print('#. ' + polib.genKeyId(keyid), file=output)
 for i, occurrence in enumerate(entry.occurrences):
 entry.occurrences[i] = os.path.relpath(occurrence[0], 
os.environ['SRCDIR']), occurrence[1]

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 2e77a93b10399b31882dbba5e5b1f2211f6b5e42
Author: Ilmari Lauhakangas 
AuthorDate: Mon Aug 12 19:48:40 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Mon Aug 12 18:48:40 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1a9977f6be56c826404b695ce22f61dd4fc8e0e1
  - tdf#155459 Fix grammar

Change-Id: I15f1dfeab5e11bd27feb0d9d9d392c4eba33ecd6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171800
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 9f8545f321c3..1a9977f6be56 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9f8545f321c3569849c0bde94c225e1af922ed7f
+Subproject commit 1a9977f6be56c826404b695ce22f61dd4fc8e0e1

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/shared/optionen/01010600.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a9977f6be56c826404b695ce22f61dd4fc8e0e1
Author: Ilmari Lauhakangas 
AuthorDate: Mon Aug 12 19:46:46 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Aug 12 18:48:39 2024 +0200

tdf#155459 Fix grammar

Change-Id: I15f1dfeab5e11bd27feb0d9d9d392c4eba33ecd6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171800
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 

diff --git a/source/text/shared/optionen/01010600.xhp 
b/source/text/shared/optionen/01010600.xhp
index c4bd4b00df..6bb6144d80 100644
--- a/source/text/shared/optionen/01010600.xhp
+++ b/source/text/shared/optionen/01010600.xhp
@@ -63,7 +63,7 @@
 
 Help Improve %PRODUCTNAME
 Prompt for sending crash reports to The Document 
Foundation
-Ask you whether to send a crash report 
to help developers improve the software’s reliability. Whenever 
%PRODUCTNAME crashes, you can opt to send a report containing 
anonymous debugging information, to help track down and eventually fix 
the root cause.
+Asks you whether to send a crash report 
to help developers improve the software’s reliability. Whenever 
%PRODUCTNAME crashes, you can opt to send a report containing 
anonymous debugging information, to help track down and eventually fix 
the root cause.
 
 
 %PRODUCTNAME Quickstarter

core.git: scripting/source

[Ilmari Lauhakangas (via logerrit)]

 scripting/source/pyprov/pythonscript.py |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 817164a9de1bf497954446afe5ca5448f4a1c090
Author: Ilmari Lauhakangas 
AuthorDate: Wed Jul 31 20:06:38 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Aug 1 08:14:35 2024 +0200

scripting: fix issues found by Ruff linter

Change-Id: I104f1b1e1d907fbd01feeb37e3fc69ee3e2fc121
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171332
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 3b21e3283b0b..77d554920a7e 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -77,7 +77,7 @@ def getLogTarget():
 if len( userInstallation ) > 0:
 systemPath = uno.fileUrlToSystemPath( userInstallation + 
"/Scripts/python/log.txt" )
 ret = open( systemPath , "a" )
-except:
+except Exception:
 print("Exception during creation of pythonscript logfile: "+ 
lastException2String() + "
, delegating log to stdout
")
 return ret
 
@@ -110,7 +110,7 @@ class Logger(LogLevel):
 msg +
 "
" )
 self.target.flush()
-except:
+except Exception:
 print("Error during writing to stdout: " 
+lastException2String() + "
")
 
 log = Logger( getLogTarget() )
@@ -424,7 +424,7 @@ class ProviderContext:
 
 try:
 code = ast.parse( src )
-except:
+except Exception:
 log.isDebugLevel() and log.debug( "pythonscript: getFuncsByUrl: 
exception while parsing: " + lastException2String())
 raise
 
@@ -532,7 +532,7 @@ class ScriptBrowseNode( unohelper.Base, XBrowseNode , 
XPropertySet, XInvocation,
 ret = not self.provCtx.sfa.isReadOnly( self.uri )
 
 log.debug( "ScriptBrowseNode.getPropertyValue called for " + name 
+ ", returning " + str(ret) )
-except:
+except Exception:
 log.error( "ScriptBrowseNode.getPropertyValue error " + 
lastException2String())
 raise
 
@@ -600,7 +600,7 @@ class ScriptBrowseNode( unohelper.Base, XBrowseNode , 
XPropertySet, XInvocation,
 #log.debug("Save is not implemented yet")
 #text = self.editor.getControl("EditorTextField").getText()
 #log.debug("Would save: " + text)
-except:
+except Exception:
 # TODO: add an error box here!
 log.error( lastException2String() )
 
@@ -641,7 +641,7 @@ class FileBrowseNode( unohelper.Base, XBrowseNode ):
 self.provCtx, self.uri, self.name, i ))
 ret = tuple( scriptNodeList )
 log.debug( "returning " +str(len(ret)) + " ScriptChildNodes on " + 
self.uri )
-except:
+except Exception:
 text = lastException2String()
 log.error( "Error while evaluating " + self.uri + ":" + text )
 raise
@@ -650,7 +650,7 @@ class FileBrowseNode( unohelper.Base, XBrowseNode ):
 def hasChildNodes(self):
 try:
 return len(self.getChildNodes()) > 0
-except:
+except Exception:
 return False
 
 def getType( self):
@@ -1059,7 +1059,7 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode, 
XScriptProvider, XNameC
 
 log.debug( "got func " + str( func ) )
 return PythonScript( func, mod, funcArgs )
-except:
+except Exception:
 text = lastException2String()
 log.error( text )
 raise ScriptFrameworkErrorException( text, self, scriptUri, 
LANGUAGENAME, 0 )
@@ -1091,7 +1091,7 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode, 
XScriptProvider, XNameC
 ret = self.provCtx.isUrlInPackage( uri )
 log.debug( "hasByName " + uri + " " +str( ret ) )
 return ret
-except:
+except Exception:
 text = lastException2String()
 log.debug( "Error in hasByName:" +  text )
 return False

core.git: testtools/source wizards/com wizards/source xmlsecurity/qa

[Ilmari Lauhakangas (via logerrit)]

 testtools/source/bridgetest/pyuno/impl.py   |4 -
 testtools/source/bridgetest/pyuno/importer.py   |6 +-
 wizards/com/sun/star/wizards/common/Desktop.py  |2 
 wizards/com/sun/star/wizards/ui/event/CommonListener.py |2 
 wizards/source/access2base/access2base.py   |   43 ++--
 wizards/source/scriptforge/python/ScriptForgeHelper.py  |3 -
 xmlsecurity/qa/uitest/gpg/encrypt.py|4 -
 7 files changed, 38 insertions(+), 26 deletions(-)

New commits:
commit 129e69f005d4752bb5ec10a8c12d842037394822
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jul 29 14:59:25 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jul 29 16:56:57 2024 +0200

testtools, wizards, xmlsecurity: fix issues found by Ruff linter

Change-Id: I03edbaa7c9a643ca7503fa0e93c2bf0de3ac4e51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171211
Tested-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/testtools/source/bridgetest/pyuno/impl.py 
b/testtools/source/bridgetest/pyuno/impl.py
index c95622022548..e6062c9e5360 100644
--- a/testtools/source/bridgetest/pyuno/impl.py
+++ b/testtools/source/bridgetest/pyuno/impl.py
@@ -169,8 +169,8 @@ class TestHelperCase( unittest.TestCase ):
 try:
   uno.setCurrentContext(
 unohelper.CurrentContext( oldContext,{"My42":42}) )
-  self.assertTrue( 42 == 
uno.getCurrentContext().getValueByName( "My42" ) )
-  self.assertTrue( None == 
uno.getCurrentContext().getValueByName( "My43" ) )
+  self.assertTrue( uno.getCurrentContext().getValueByName( 
"My42" ) == 42 )
+  self.assertTrue( uno.getCurrentContext().getValueByName( 
"My43" ) is None )
 finally:
   uno.setCurrentContext( oldContext )
   
diff --git a/testtools/source/bridgetest/pyuno/importer.py 
b/testtools/source/bridgetest/pyuno/importer.py
index c3fc20eed039..3ed02d76d9d0 100644
--- a/testtools/source/bridgetest/pyuno/importer.py
+++ b/testtools/source/bridgetest/pyuno/importer.py
@@ -32,7 +32,7 @@ class ImporterTestCase(unittest.TestCase):
"com.sun.star.test.bridge.CppTestObject",self.ctx)
 
   def testStandard( self ):
-  self.assertTrue( IllegalArgumentException != None, "none-test" )
+  self.assertTrue( IllegalArgumentException is not None, "none-test" )
   self.assertRaises( IllegalArgumentException, 
self.tobj.raiseException, 1,"foo",self.tobj)
  
   self.assertTrue( TWO == uno.Enum( 
"test.testtools.bridgetest.TestEnum","TWO"), "enum" )
@@ -49,10 +49,10 @@ class ImporterTestCase(unittest.TestCase):
   def testDynamicComponentRegistration( self ):
   ctx = uno.getComponentContext()
   self.assertTrue(
-  not ("com.sun.star.connection.Acceptor" in 
ctx.ServiceManager.getAvailableServiceNames()),
+  "com.sun.star.connection.Acceptor" not in 
ctx.ServiceManager.getAvailableServiceNames(),
   "precondition for dynamic component registration test is not 
fulfilled" )
   self.assertTrue(
-  not ("com.sun.star.connection.Connector" in 
ctx.ServiceManager.getAvailableServiceNames()),
+  "com.sun.star.connection.Connector" not in 
ctx.ServiceManager.getAvailableServiceNames(),
   "precondition for dynamic component registration test is not 
fulfilled" )
   unohelper.addComponentsToContext(
   ctx , ctx, ("acceptor.uno","connector.uno"), 
"com.sun.star.loader.SharedLibrary" )
diff --git a/wizards/com/sun/star/wizards/common/Desktop.py 
b/wizards/com/sun/star/wizards/common/Desktop.py
index 9469f9f5f403..e1af6eaa3b53 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.py
+++ b/wizards/com/sun/star/wizards/common/Desktop.py
@@ -68,7 +68,7 @@ class Desktop(object):
 while bElementexists:
 try:
 bElementexists = xElementContainer.hasByName(sElementName)
-except:
+except Exception:
 bElementexists = xElementContainer.hasByHierarchicalName(
 sElementName)
 if bElementexists:
diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.py 
b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
index c131195711ad..dad035ddf2c6 100644
--- a/wizards/com/sun/star/wizards/ui/event/CommonListener.py
+++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
@@ -39,7 +39,7 @@ class ItemListenerProcAdapter( unohelper.Base, XItemListener 
):
 if callable( self.oProcToCall ):
 try:
 self.oProcToCa

core.git: testtools/source uitest/test_main.py uitest/ui_logger_dsl uitest/uitest unotest/source

[Ilmari Lauhakangas (via logerrit)]

 testtools/source/bridgetest/pyuno/core.py|   30 +--
 testtools/source/bridgetest/pyuno/samplecomponent.py |   30 +--
 uitest/test_main.py  |2 -
 uitest/ui_logger_dsl/dsl_core.py |4 +-
 uitest/uitest/uihelper/testDialog.py |8 ++---
 unotest/source/python/org/libreoffice/unotest.py |2 -
 6 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit d7628892b04d1a1ed47d6d6c355940f9915dcd99
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jul 28 20:07:43 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jul 29 10:34:57 2024 +0200

testtools, uitest, unotest: fix issues found by Ruff linter

Change-Id: I4a848b0f1f114d1262b5242786e088eb50a33cef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171145
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/testtools/source/bridgetest/pyuno/core.py 
b/testtools/source/bridgetest/pyuno/core.py
index 5c0edef8..c0c798daa5f4 100644
--- a/testtools/source/bridgetest/pyuno/core.py
+++ b/testtools/source/bridgetest/pyuno/core.py
@@ -46,21 +46,21 @@ def equalsEps( a,b,eps ):
 
 def assign( rData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong, 
nHyper,\
   nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny  ):
-rData.Bool = bBool;
-rData.Char = cChar;
-rData.Byte = nByte;
-rData.Short = nShort;
-rData.UShort = nUShort;
-rData.Long = nLong;
-rData.ULong = nULong;
-rData.Hyper = nHyper;
-rData.UHyper = nUHyper;
-rData.Float = fFloat;
-rData.Double = fDouble;
-rData.Enum = eEnum;
-rData.String = rStr;
-rData.Interface = xTest;
-rData.Any = rAny;
+rData.Bool = bBool
+rData.Char = cChar
+rData.Byte = nByte
+rData.Short = nShort
+rData.UShort = nUShort
+rData.Long = nLong
+rData.ULong = nULong
+rData.Hyper = nHyper
+rData.UHyper = nUHyper
+rData.Float = fFloat
+rData.Double = fDouble
+rData.Enum = eEnum
+rData.String = rStr
+rData.Interface = xTest
+rData.Any = rAny
 
 
 class PythonTransporter:
diff --git a/testtools/source/bridgetest/pyuno/samplecomponent.py 
b/testtools/source/bridgetest/pyuno/samplecomponent.py
index 4778a76022e0..1af48bb67876 100644
--- a/testtools/source/bridgetest/pyuno/samplecomponent.py
+++ b/testtools/source/bridgetest/pyuno/samplecomponent.py
@@ -32,21 +32,21 @@ g_attribs = "RuntimeException", "Bool", "Char", "Byte", 
"Short", "UShort", \
 
 def assign( rData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong, 
nHyper,\
   nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny  ):
-rData.Bool = bBool;
-rData.Char = cChar;
-rData.Byte = nByte;
-rData.Short = nShort;
-rData.UShort = nUShort;
-rData.Long = nLong;
-rData.ULong = nULong;
-rData.Hyper = nHyper;
-rData.UHyper = nUHyper;
-rData.Float = fFloat;
-rData.Double = fDouble;
-rData.Enum = eEnum;
-rData.String = rStr;
-rData.Interface = xTest;
-rData.Any = rAny;
+rData.Bool = bBool
+rData.Char = cChar
+rData.Byte = nByte
+rData.Short = nShort
+rData.UShort = nUShort
+rData.Long = nLong
+rData.ULong = nULong
+rData.Hyper = nHyper
+rData.UHyper = nUHyper
+rData.Float = fFloat
+rData.Double = fDouble
+rData.Enum = eEnum
+rData.String = rStr
+rData.Interface = xTest
+rData.Any = rAny
 
 class MyRecursiveCall( XRecursiveCall, unohelper.Base ):
   def callRecursivly( xCall, nToCall ):
diff --git a/uitest/test_main.py b/uitest/test_main.py
index 1957f54dc373..9106d1b8e86a 100644
--- a/uitest/test_main.py
+++ b/uitest/test_main.py
@@ -116,7 +116,7 @@ if __name__ == '__main__':
 if "-h" in opts or "--help" in opts:
 usage()
 sys.exit()
-elif not "--soffice" in opts:
+elif "--soffice" not in opts:
 usage()
 sys.exit(1)
 elif "--dir" in opts:
diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index 79bd748b54e2..ef0a36273219 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -46,7 +46,7 @@ class ul_Compiler:
 parent_hierarchy_count = 0
 last_parent = []
 flag_for_QuerySaveDialog = False
-math_element_selector_initializer= False;
+math_element_selector_initializer= False
 
 def __init__(self, input_address, output_address):
 self.ui_dsl_mm = metamodel_from_file("ui_logger_dsl_grammar.tx")
@@ -961,7 +961,7 @@ class ul_Compiler:
 
 def handle_math_element_selector(self, math_element_selector):
 
-if( self.math_element_selector_initializer == False ):
+if not self.math_element_selector_initializer:
 # This

core.git: dictionaries

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 221e3fb4afe662a040479494b6789325bc9155db
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jul 28 19:53:39 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Sun Jul 28 18:53:39 2024 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to eff9495b70722d8e590e97b1710cfc7c00f6ce72
  - Lightproof: undo some import order changes advised by Ruff linter

Change-Id: Iec2b9a1ed9bf2f9a41dc098fcf6ee8026917e3a3
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/171140
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/dictionaries b/dictionaries
index 54a753654845..eff9495b7072 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 54a753654845ecd253d7af7693bbcfbc9d952716
+Subproject commit eff9495b70722d8e590e97b1710cfc7c00f6ce72

dictionaries.git: en/pythonpath hu_HU/pythonpath pt_BR/Lightproof.py pt_BR/pythonpath ru_RU/pythonpath

[Ilmari Lauhakangas (via logerrit)]

 en/pythonpath/lightproof_impl_en.py   |3 ++-
 hu_HU/pythonpath/lightproof_impl_hu_HU.py |3 ++-
 pt_BR/Lightproof.py   |7 ---
 pt_BR/pythonpath/lightproof_impl_pt_BR.py |3 ++-
 ru_RU/pythonpath/lightproof_impl_ru_RU.py |3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit eff9495b70722d8e590e97b1710cfc7c00f6ce72
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jul 28 16:14:23 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sun Jul 28 18:53:39 2024 +0200

Lightproof: undo some import order changes advised by Ruff linter

Change-Id: Iec2b9a1ed9bf2f9a41dc098fcf6ee8026917e3a3
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/171140
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/en/pythonpath/lightproof_impl_en.py 
b/en/pythonpath/lightproof_impl_en.py
index bd8b1c1..9700fbe 100644
--- a/en/pythonpath/lightproof_impl_en.py
+++ b/en/pythonpath/lightproof_impl_en.py
@@ -4,7 +4,6 @@ import re
 import sys
 import os
 import traceback
-import lightproof_handler_en
 from com.sun.star.text.TextMarkupType import PROOFREADING
 from com.sun.star.beans import PropertyValue
 
@@ -15,6 +14,8 @@ version = "0.4.3"
 author = "László Németh"
 name = "Lightproof grammar checker (English)"
 
+import lightproof_handler_en
+
 # loaded rules (check for Update mechanism of the editor)
 try:
 langrule
diff --git a/hu_HU/pythonpath/lightproof_impl_hu_HU.py 
b/hu_HU/pythonpath/lightproof_impl_hu_HU.py
index 27dfabc..ff5048d 100644
--- a/hu_HU/pythonpath/lightproof_impl_hu_HU.py
+++ b/hu_HU/pythonpath/lightproof_impl_hu_HU.py
@@ -5,7 +5,6 @@ import re
 import sys
 import os
 import traceback
-import lightproof_handler_hu_HU
 from com.sun.star.text.TextMarkupType import PROOFREADING
 from com.sun.star.beans import PropertyValue
 
@@ -16,6 +15,8 @@ version = "1.6.4"
 author = "László Németh"
 name = "Lightproof grammar checker (magyar)"
 
+import lightproof_handler_hu_HU
+
 # loaded rules (check for Update mechanism of the editor)
 try:
 langrule
diff --git a/pt_BR/Lightproof.py b/pt_BR/Lightproof.py
index adb939c..012c5e7 100644
--- a/pt_BR/Lightproof.py
+++ b/pt_BR/Lightproof.py
@@ -6,6 +6,10 @@ import uno
 import unohelper
 import os
 import traceback
+
+locales = {'pt-BR': ['pt', 'BR', '']}
+pkg = "pt_BR"
+
 import lightproof_handler_pt_BR
 from com.sun.star.linguistic2 import XProofreader, XSupportedLocales
 from com.sun.star.linguistic2 import ProofreadingResult, 
SingleProofreadingError
@@ -17,9 +21,6 @@ try:
 except Exception:
 pass
 
-locales = {'pt-BR': ['pt', 'BR', '']}
-pkg = "pt_BR"
-
 class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, 
XServiceDisplayName, XSupportedLocales):
 
 def __init__( self, ctx, *args ):
diff --git a/pt_BR/pythonpath/lightproof_impl_pt_BR.py 
b/pt_BR/pythonpath/lightproof_impl_pt_BR.py
index bcf8bbc..7c5bf2a 100644
--- a/pt_BR/pythonpath/lightproof_impl_pt_BR.py
+++ b/pt_BR/pythonpath/lightproof_impl_pt_BR.py
@@ -5,7 +5,6 @@ import re
 import sys
 import os
 import traceback
-import lightproof_handler_pt_BR
 from com.sun.star.text.TextMarkupType import PROOFREADING
 from com.sun.star.beans import PropertyValue
 
@@ -16,6 +15,8 @@ version = "0.4.3"
 author = "Raimundo Santos Moura"
 name = "Lightproof grammar checker (Portuguese Brazilian)"
 
+import lightproof_handler_pt_BR
+
 # loaded rules (check for Update mechanism of the editor)
 try:
 langrule
diff --git a/ru_RU/pythonpath/lightproof_impl_ru_RU.py 
b/ru_RU/pythonpath/lightproof_impl_ru_RU.py
index 5a67e72..ec096a9 100644
--- a/ru_RU/pythonpath/lightproof_impl_ru_RU.py
+++ b/ru_RU/pythonpath/lightproof_impl_ru_RU.py
@@ -4,7 +4,6 @@ import re
 import sys
 import os
 import traceback
-import lightproof_handler_ru_RU
 from com.sun.star.text.TextMarkupType import PROOFREADING
 from com.sun.star.beans import PropertyValue
 
@@ -15,6 +14,8 @@ version = "0.3.4"
 author = "Yakov Reztsov "
 name = "Lightproof grammar checker (Russian)"
 
+import lightproof_handler_ru_RU
+
 # loaded rules (check for Update mechanism of the editor)
 try:
 langrule

core.git: sfx2/qa solenv/bin solenv/gbuild solenv/gdb solenv/lldb sw/qa

[Ilmari Lauhakangas (via logerrit)]

 sfx2/qa/python/check_sidebar.py |2 -
 solenv/bin/finish-gbuild-trace.py   |2 -
 solenv/bin/generate-tokens.py   |   15 
+
 solenv/bin/image-sort.py|4 +-
 solenv/bin/pack_images.py   |4 +-
 solenv/bin/polib.py |2 -
 solenv/gbuild/gen-autoinstall.py|8 ++---
 solenv/gdb/boost/ptr_container.py   |2 -
 solenv/gdb/boost/util/printing.py   |2 -
 solenv/gdb/libreoffice/cppu.py  |2 -
 solenv/gdb/libreoffice/sw.py|   10 +++---
 solenv/gdb/libreoffice/util/printing.py |2 -
 solenv/lldb/libreoffice/LO.py   |   16 
++
 sw/qa/python/set_expression.py  |3 -
 sw/qa/python/text_portion_enumeration_test.py   |   12 +++
 sw/qa/uitest/writer_tests2/formatCharacter.py   |1 
 sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py |8 ++---
 sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py |4 +-
 sw/qa/uitest/writer_tests8/tdf159102.py |2 -
 19 files changed, 52 insertions(+), 49 deletions(-)

New commits:
commit dffa7b7d0b6553a5b37081cd164d3ffc0b215040
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jul 28 12:11:20 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sun Jul 28 15:23:39 2024 +0200

sfx2, solenv, sw: fix issues found by Ruff linter

Change-Id: Iab375e8c8aa4c4915f3c70a9ef6aede268e4619f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171138
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/sfx2/qa/python/check_sidebar.py b/sfx2/qa/python/check_sidebar.py
index 7f188baa4ba7..3ea8542d2e03 100644
--- a/sfx2/qa/python/check_sidebar.py
+++ b/sfx2/qa/python/check_sidebar.py
@@ -44,7 +44,7 @@ class CheckSidebar(unittest.TestCase):
 
 xDecks = xSidebar.getDecks()
 
-first_deck_name = "PropertyDeck";
+first_deck_name = "PropertyDeck"
 
 deck_element_names = xDecks.getElementNames()
 assert ( first_deck_name in deck_element_names )
diff --git a/solenv/bin/finish-gbuild-trace.py 
b/solenv/bin/finish-gbuild-trace.py
index fcd31fc23fa9..5acd0b01de8b 100755
--- a/solenv/bin/finish-gbuild-trace.py
+++ b/solenv/bin/finish-gbuild-trace.py
@@ -84,7 +84,7 @@ with open(filename + ".tmp", "w") as outfile:
 slot_start_time[tid-1] = int(match.group(3))
 elif match.group(2) == 'E':
 tid = free_slot(match.group(1), match.group(4)) # "name", "args"
-if not match.group(1) in totals_time:
+if match.group(1) not in totals_time:
 totals_time[match.group(1)] = 0
 totals_count[match.group(1)] = 0
 totals_time[match.group(1)] += int(match.group(3)) - 
slot_start_time[tid-1]
diff --git a/solenv/bin/generate-tokens.py b/solenv/bin/generate-tokens.py
index 2dc3c3fd4cfc..40b6b12aae9b 100644
--- a/solenv/bin/generate-tokens.py
+++ b/solenv/bin/generate-tokens.py
@@ -15,7 +15,8 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-import sys, re
+import sys
+import re
 
 infile_name = sys.argv[1]
 idfile_out_name = sys.argv[2]
@@ -37,7 +38,7 @@ struct xmltoken {
 %%
 """)
 
-token_count = 0;
+token_count = 0
 tokens = {}
 
 with open(infile_name) as infile:
@@ -45,16 +46,16 @@ with open(infile_name) as infile:
 line = line.strip()
 # check for valid characters
 if not re.match(r'[a-zA-Z0-9-_]+$', line):
-sys.exit("Error: invalid character in token '{}'".format(line));
-cur_id = "XML_" + line;
+sys.exit("Error: invalid character in token '{}'".format(line))
+cur_id = "XML_" + line
 # we have two ids with similar names("cut-offs" and "cut_offs")
 if cur_id == "XML_cut_offs":
-cur_id = "cut_offs2";
+cur_id = "cut_offs2"
 cur_id = cur_id.replace('-', '_')
 tokens[line] = cur_id
 idfile.write("const sal_Int32 {} = {};
".format(cur_id, token_count))
-namefile.write("\"{}\",
".format(line));
-gperffile.write("{},{}
".format(line, cur_id));
+namefile.write("\"{}\",
".format(line))
+gperffile.write("{},{}
".format(line, cur_id))
 token_count += 1
 
 idfile.write(&q

core.git: sd/qa

[Ilmari Lauhakangas (via logerrit)]

 sd/qa/uitest/impress_tests/autocorrectOptions.py |1 -
 sd/qa/uitest/impress_tests/customSlideShow.py|   14 ++
 sd/qa/uitest/impress_tests/slideShowSettings.py  |4 +---
 sd/qa/uitest/impress_tests/tdf152295.py  |2 +-
 sd/qa/uitest/impress_tests/tdf155863.py  |2 +-
 sd/qa/uitest/impress_tests/tdf159927_dateTime.py |2 +-
 sd/qa/uitest/impress_tests2/tdf128787.py |2 +-
 7 files changed, 7 insertions(+), 20 deletions(-)

New commits:
commit c371b9a708fb1dd1fc0b6d9359bc41685eb26d61
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jul 28 09:01:08 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sun Jul 28 10:41:40 2024 +0200

sd: fix issues found by Ruff linter

Change-Id: I96dae5eca3bb493500ca1145e141371a5572e29e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171134
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 

diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py 
b/sd/qa/uitest/impress_tests/autocorrectOptions.py
index 2f4b7645e30c..25c6215b690e 100644
--- a/sd/qa/uitest/impress_tests/autocorrectOptions.py
+++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py
@@ -29,7 +29,6 @@ class autocorrectOptions(UITestCase):
 xnew = xDialog.getChild("new")
 xdelete = xDialog.getChild("delete")
 xtabview = xDialog.getChild("tabview")
-xreset = xDialog.getChild("reset")
 nrRows = get_state_as_dict(xtabview)["VisibleCount"]
 
 self.assertTrue(int(nrRows) > 0)
diff --git a/sd/qa/uitest/impress_tests/customSlideShow.py 
b/sd/qa/uitest/impress_tests/customSlideShow.py
index f070a1ca1cda..f8a75e08527f 100644
--- a/sd/qa/uitest/impress_tests/customSlideShow.py
+++ b/sd/qa/uitest/impress_tests/customSlideShow.py
@@ -9,14 +9,11 @@
 
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
-import importlib
-from uitest.uihelper.common import select_pos
-from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.uihelper.common import get_state_as_dict
 
 class customSlideShow(UITestCase):
 def test_customSlideShow(self):
 with self.ui_test.create_doc_in_start_center("impress"):
-MainWindow = self.xUITest.getTopFocusWindow()
 TemplateDialog = self.xUITest.getTopFocusWindow()
 cancel = TemplateDialog.getChild("close")
 self.ui_test.close_dialog_through_button(cancel)
@@ -45,29 +42,22 @@ class customSlideShow(UITestCase):
 self.assertEqual(get_state_as_dict(customname)["Text"], 
"aa")
 custompages = DefineCustomSlideShow.getChild("custompages")
 pages = DefineCustomSlideShow.getChild("pages")
-remove = DefineCustomSlideShow.getChild("remove")
 
self.assertEqual(get_state_as_dict(custompages)["Children"], "1")
 self.assertEqual(get_state_as_dict(pages)["Children"], "1")
 xEntry = custompages.getChild("0")
 xEntry.executeAction("SELECT", tuple())
-#remove.executeAction("CLICK",tuple())  #tdf126951
 
self.assertEqual(get_state_as_dict(custompages)["Children"], "1")
 self.assertEqual(get_state_as_dict(pages)["Children"], "1")
 
-delete = CustomSlideShows.getChild("delete")
 customshowlist = CustomSlideShows.getChild("customshowlist")
 
self.assertEqual(get_state_as_dict(customshowlist)["Children"], "1")
 
-#delete.executeAction("CLICK",tuple())
-#self.assertEqual(get_state_as_dict(customshowlist)["Children"], "0")
-
 def test_tdf143125(self):
 with self.ui_test.create_doc_in_start_center("impress"):
-MainWindow = self.xUITest.getTopFocusWindow()
 TemplateDialog = self.xUITest.getTopFocusWindow()
 cancel = TemplateDialog.getChild("close")
 self.ui_test.close_dialog_through_button(cancel)
-with 
self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog") as 
CustomSlideShows:
+with 
self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog"):
 # Without the fix in place, this test would have crashed here
 pass
 
diff --git a/sd/qa/uitest/impress_tests/slideShowSettings.py 
b/sd/qa/uitest/impress_tests/slideShowSettings.py
index 16fbdc8405c9..0750d462bbba 100644
--- a/sd/qa/uitest/impress_tests/slideShowSettings.py
+++ b/sd/qa/uit

Re: Trouble with git reset in my pushtree

[Ilmari Lauhakangas]

On 28.7.2024 11.25, Laurent Balland wrote:

Hi,

I've got a push tree since several years, and it changed its behavior a 
few weeks ago:


git reset --hard origin/master

now preserve my changes. Which option should I use to discard all my 
changes?


In the .git/config file of LibreOffice source code, what is the value of 
url in the [remote "origin"] block?


Ilmari

core.git: sc/qa sc/workben

[Ilmari Lauhakangas (via logerrit)]

 sc/qa/uitest/autofilter2/tdf158440.py  |3 +--
 sc/qa/uitest/autofilter2/tdf161457.py  |2 +-
 sc/qa/uitest/calc_tests9/tdf115474.py  |3 ---
 sc/qa/uitest/calc_tests9/tdf159707.py  |3 ---
 sc/qa/uitest/chart/chartDataLabels.py  |4 ++--
 sc/qa/uitest/pasteSpecial/tdf158110.py |2 +-
 sc/workben/celltrans/parse.py  |4 ++--
 7 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit 5373679b695e5bd4f68fe4554234dd9facc3e54f
Author: Ilmari Lauhakangas 
AuthorDate: Sat Jul 27 21:10:58 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat Jul 27 21:38:55 2024 +0200

sc: fix issues found by Ruff linter

Change-Id: I6710db13549c42e9ae7231e0434a26b6357083e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171102
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/sc/qa/uitest/autofilter2/tdf158440.py 
b/sc/qa/uitest/autofilter2/tdf158440.py
index df0b17c6706e..28b88cc1199e 100644
--- a/sc/qa/uitest/autofilter2/tdf158440.py
+++ b/sc/qa/uitest/autofilter2/tdf158440.py
@@ -9,13 +9,12 @@
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from libreoffice.calc.document import get_cell_by_position
 
 class tdf158440(UITestCase):
 
 def test_tdf158440(self):
 
-with self.ui_test.load_file(get_url_for_data_file("tdf158440.ods")) as 
calc_doc:
+with self.ui_test.load_file(get_url_for_data_file("tdf158440.ods")):
 
 xCalcDoc = self.xUITest.getTopFocusWindow()
 gridwin = xCalcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/autofilter2/tdf161457.py 
b/sc/qa/uitest/autofilter2/tdf161457.py
index 400f4df9b584..bbe63f770a45 100644
--- a/sc/qa/uitest/autofilter2/tdf161457.py
+++ b/sc/qa/uitest/autofilter2/tdf161457.py
@@ -14,7 +14,7 @@ class tdf161457(UITestCase):
 
 def test_tdf161457(self):
 
-with self.ui_test.load_file(get_url_for_data_file("tdf161457.ods")) as 
calc_doc:
+with self.ui_test.load_file(get_url_for_data_file("tdf161457.ods")):
 
 xCalcDoc = self.xUITest.getTopFocusWindow()
 xGridWin = xCalcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/calc_tests9/tdf115474.py 
b/sc/qa/uitest/calc_tests9/tdf115474.py
index 92ca5cc7b7e6..f1de3b7d9d67 100644
--- a/sc/qa/uitest/calc_tests9/tdf115474.py
+++ b/sc/qa/uitest/calc_tests9/tdf115474.py
@@ -7,10 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict
-from uitest.uihelper.common import select_by_text, select_pos
 from libreoffice.calc.document import get_cell_by_position
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 class tdf115474(UITestCase):
diff --git a/sc/qa/uitest/calc_tests9/tdf159707.py 
b/sc/qa/uitest/calc_tests9/tdf159707.py
index 1e7b240f4b56..4d6721ed9e91 100644
--- a/sc/qa/uitest/calc_tests9/tdf159707.py
+++ b/sc/qa/uitest/calc_tests9/tdf159707.py
@@ -9,9 +9,6 @@
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_url_for_data_file
 
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from com.sun.star.beans import PropertyValue
-
 class tdf159707(UITestCase):
 
 def test_tdf159707(self):
diff --git a/sc/qa/uitest/chart/chartDataLabels.py 
b/sc/qa/uitest/chart/chartDataLabels.py
index da94cde5fa87..cbdfb30e82d5 100644
--- a/sc/qa/uitest/chart/chartDataLabels.py
+++ b/sc/qa/uitest/chart/chartDataLabels.py
@@ -225,8 +225,8 @@ class chartDataLabels(UITestCase):
 sourceformat = dialog.getChild("sourceformat")
 
 # Select currency
-sourceformat.executeAction("CLICK", tuple());
-categoryformat.getChild("4").executeAction("SELECT", tuple());
+sourceformat.executeAction("CLICK", tuple())
+categoryformat.getChild("4").executeAction("SELECT", tuple())
 
 
self.assertEqual(get_state_as_dict(categoryformat)["SelectEntryText"], 
"Currency")
 
diff --git a/sc/qa/uitest/pasteSpecial/tdf158110.py 
b/sc/qa/uitest/pasteSpecial/tdf158110.py
index 9d775226c030..a2a83c0f3523 100644
--- a/sc/qa/uitest/pasteSpecial/tdf158110.py
+++ b/sc/qa/uitest/pasteSpecial/tdf158110.py
@@ -47,7 +47,7 @@ class tdf158110(UITestCase):
 self.assertEqual("Comment 1", get_cell_by_position(document, 0, 1, 
0).Annotation.String)
 
 def test_tdf158110_paste_special_overwrite_comments(self):
-with self.ui_test.create_doc_in_start_center("calc") as document:
+with self.ui_test.create_doc_in_start_center("calc"):
 xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_

core.git: odk/examples oox/source pyuno/demo pyuno/qa pyuno/source

[Ilmari Lauhakangas (via logerrit)]

 odk/examples/DevelopersGuide/Charts/python/ChartInCalc.py |5 --
 oox/source/token/namespaces.py|5 +-
 oox/source/token/properties.py|5 +-
 pyuno/demo/biblioaccess.py|4 +-
 pyuno/demo/ooextract.py   |3 +
 pyuno/qa/pytests/testcollections_XIndexAccess.py  |   28 +++---
 pyuno/source/loader/pythonloader.py   |   14 +++
 pyuno/source/officehelper.py  |   13 +-
 8 files changed, 41 insertions(+), 36 deletions(-)

New commits:
commit 2c3bf9471d779ea40112a3ae70eec40eaf57cf6f
Author: Ilmari Lauhakangas 
AuthorDate: Sat Jul 27 18:01:30 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat Jul 27 18:52:48 2024 +0200

odk, oox, pyuno: fix issues found by Ruff linter

Change-Id: I79d56453877a10502768b522ca93da3990891c0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171098
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/odk/examples/DevelopersGuide/Charts/python/ChartInCalc.py 
b/odk/examples/DevelopersGuide/Charts/python/ChartInCalc.py
index 787cc2274020..141e939e1cf2 100644
--- a/odk/examples/DevelopersGuide/Charts/python/ChartInCalc.py
+++ b/odk/examples/DevelopersGuide/Charts/python/ChartInCalc.py
@@ -71,11 +71,6 @@ class ChartInCalc(object):
 def test_data_point_properties(self):
 #  set properties for a single data point
 try:
-# determine the maximum value of the first series
-data_array = self._chart_document.getData()
-data = data_array.getData()
-max_value = max([data[i][1] for i in range(len(data))])
-
 # first parameter is the index of the point, the second one is the 
series
 point_prop = self._diagram.getDataPointProperties(0, 1)
 
diff --git a/oox/source/token/namespaces.py b/oox/source/token/namespaces.py
index 1244e88e857f..41df70a88274 100644
--- a/oox/source/token/namespaces.py
+++ b/oox/source/token/namespaces.py
@@ -15,7 +15,8 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-import sys, re
+import sys
+import re
 
 infile_name = sys.argv[1]
 id_out_name = sys.argv[2]
@@ -69,7 +70,7 @@ shift = 16
 
 idfile.write("const size_t NMSP_SHIFT = {};
".format(shift))
 
-i = 1;
+i = 1
 for token in sorted(namespaces.keys()):
 idfile.write("const sal_Int32 NMSP_{} = {} << NMSP_SHIFT;
".format(token, i))
 cur_id = i << shift
diff --git a/oox/source/token/properties.py b/oox/source/token/properties.py
index 8f8bc437b358..93c82dcb 100644
--- a/oox/source/token/properties.py
+++ b/oox/source/token/properties.py
@@ -15,7 +15,8 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-import sys, re
+import sys
+import re
 
 infile_name = sys.argv[1]
 id_out_name = sys.argv[2]
@@ -37,7 +38,7 @@ with open(infile_name) as infile:
 idfile = open(id_out_name, 'w')
 namefile = open(name_out_name, 'w')
 
-i = 0;
+i = 0
 for token in sorted(props.keys()):
 idfile.write("const sal_Int32 {}  = {};
".format(props[token], i))
 namefile.write("/* {} */ \"{}\",
".format(i, token))
diff --git a/pyuno/demo/biblioaccess.py b/pyuno/demo/biblioaccess.py
index 0e5d0b4c8071..5ad5a2625f01 100644
--- a/pyuno/demo/biblioaccess.py
+++ b/pyuno/demo/biblioaccess.py
@@ -37,7 +37,7 @@ def main():
 rowset.CommandType = COMMAND
 rowset.Command = "SELECT IDENTIFIER, AUTHOR FROM biblio"
 
-rowset.execute();
+rowset.execute()
 
 print("Identifier  Author")
 
@@ -46,7 +46,7 @@ def main():
 while rowset.next():
 print(rowset.getString(id) + " " + repr(rowset.getString(author)))
 
-rowset.dispose();
+rowset.dispose()
 
 main()
 
diff --git a/pyuno/demo/ooextract.py b/pyuno/demo/ooextract.py
index 0aec00f43a47..e93b169a8273 100644
--- a/pyuno/demo/ooextract.py
+++ b/pyuno/demo/ooextract.py
@@ -17,7 +17,8 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-import getopt,sys
+import getopt
+import sys
 import uno
 
 from unohelper import Base,systemPathToFileUrl
diff --git a/pyuno/qa/pytests/testcollections_XIndexAccess.py 
b/pyuno/qa/pytests/testcollections_XIndexAccess.py
index 07c14c1b0942..6dd85e39af74 100644
--- a/pyuno/qa/pytests/testcollections_XIndexAccess.py
+++ b/pyuno/qa/pytests/testcollections_XIndexAccess.py
@@ -75,7 +75,7 @@ class TestXIndexAccess(CollectionsTestBase):
 # Then
 self.assertEqual(0, count)
 
-doc.close(True);
+doc.close(True)
 
 # Tests syntax:
 #num = len(obj)  # Number of elements
@@ -94,7 +94,7 @@ class TestXIndexAccess(CollectionsTestBase):
 # Then
 self.assertEqual(1, count)
 
-doc.close(True);
+doc.clos

core.git: comphelper/qa msicreator/create_installer.py msicreator/createmsi.py odk/examples odk/source

[Ilmari Lauhakangas (via logerrit)]

 comphelper/qa/python/test_sequence_output_stream.py
   |2 
 msicreator/create_installer.py 
   |3 
 msicreator/createmsi.py
   |6 
 
odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/python/HelloTextTableShape.py
 |2 
 odk/examples/python/DocumentHandling/DocumentConverter.py  
   |2 
 odk/examples/python/Miscellaneous/InputEvents.py   
   |  109 +-
 odk/examples/python/Text/BookmarkInsertion.py  
   |   12 -
 odk/examples/python/Text/GraphicsInserter.py   
   |8 
 odk/examples/python/Text/HardFormatting.py 
   |4 
 odk/examples/python/Text/SWriter.py
   |6 
 odk/examples/python/Text/StyleCreation.py  
   |4 
 odk/examples/python/Text/StyleInitialization.py
   |9 
 odk/examples/python/Text/TextDocumentStructure.py  
   |4 
 odk/examples/python/Text/TextReplace.py
   |8 
 odk/examples/python/Text/WriterSelector.py 
   |4 
 odk/source/helper/addon_console.py 
   |1 
 16 files changed, 94 insertions(+), 90 deletions(-)

New commits:
commit 558b20d1acc553f4ffc4361e74e1b955b98a661d
Author: Ilmari Lauhakangas 
AuthorDate: Sat Jul 27 14:54:40 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat Jul 27 15:42:26 2024 +0200

comphelper, msicreator, odk: fix issues found by Ruff linter

Change-Id: I5ef65baeb0100b9d70b5c59c1d5f6f43ab951a22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171092
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 

diff --git a/comphelper/qa/python/test_sequence_output_stream.py 
b/comphelper/qa/python/test_sequence_output_stream.py
index 6f1294960e29..3496c46303af 100644
--- a/comphelper/qa/python/test_sequence_output_stream.py
+++ b/comphelper/qa/python/test_sequence_output_stream.py
@@ -30,7 +30,7 @@ class TestSequenceOutputStream(unittest.TestCase):
 self.data = uno.ByteSequence(b"some data")
 try:
 self.service_manager = self._uno.getContext().getServiceManager()
-except:
+except Exception:
 raise RuntimeError("Cannot create service factory!")
 if self.service_manager is None:
 raise RuntimeError("Cannot create service factory!")
diff --git a/msicreator/create_installer.py b/msicreator/create_installer.py
index 01394a48c4a3..5e40bb9547ca 100644
--- a/msicreator/create_installer.py
+++ b/msicreator/create_installer.py
@@ -1,4 +1,5 @@
-import os, sys
+import os
+import sys
 from shutil import copytree, copy2, move, rmtree
 import json
 import createmsi
diff --git a/msicreator/createmsi.py b/msicreator/createmsi.py
index d728e64520d2..0f720b74d380 100644
--- a/msicreator/createmsi.py
+++ b/msicreator/createmsi.py
@@ -14,7 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys, os, subprocess, shutil, uuid, json, re
+import sys
+import os
+import subprocess
+import uuid
+import json
 from glob import glob
 import platform
 import xml.etree.ElementTree as ET
diff --git 
a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/python/HelloTextTableShape.py
 
b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/python/HelloTextTableShape.py
index 2e2ab2ee65b3..437ca5491d92 100644
--- 
a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/python/HelloTextTableShape.py
+++ 
b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/python/HelloTextTableShape.py
@@ -37,7 +37,7 @@ class HelloTextTableShape:
 self.remote_context = officehelper.bootstrap()
 print("Connected to a running office ...")
 return self.remote_context.ServiceManager
-except Exception as e:
+except Exception:
 traceback.print_exc()
 sys.exit(1)
 
diff --git a/odk/examples/python/DocumentHandling/DocumentConverter.py 
b/odk/examples/python/DocumentHandling/DocumentConverter.py
index c2683b8c7cb7..4613a8b797e2 100644
--- a/odk/examples/python/DocumentHandling/DocumentConverter.py
+++ b/odk/examples/python/DocumentHandling/DocumentConverter.py
@@ -50,7 +50,7 @@ def convert(src_file, dest_file, to_type):
 PropertyValue(Name="FilterName", Value=to_type),
 )
 try:
-doc.storeAsURL(dest_url, opts);
+ 

core.git: dictionaries

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit abb0ec365b82982154fda661538c5b31b37c104a
Author: Ilmari Lauhakangas 
AuthorDate: Sat Jul 27 13:52:15 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Sat Jul 27 12:52:15 2024 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to 54a753654845ecd253d7af7693bbcfbc9d952716
  - Fix issues found by Ruff linter

Change-Id: I0517a69b52e9f5b3da2648e82e63bc35a48e3e99
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/171091
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/dictionaries b/dictionaries
index 95ad46565d8b..54a753654845 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 95ad46565d8b72a66bff7201b14040f031e8c615
+Subproject commit 54a753654845ecd253d7af7693bbcfbc9d952716

dictionaries.git: en/Lightproof.py en/pythonpath hu_HU/Lightproof.py hu_HU/pythonpath pt_BR/Lightproof.py pt_BR/pythonpath ru_RU/Lightproof.py ru_RU/pythonpath

[Ilmari Lauhakangas (via logerrit)]

 en/Lightproof.py |9 +--
 en/pythonpath/lightproof_handler_en.py   |6 ++---
 en/pythonpath/lightproof_impl_en.py  |   17 --
 hu_HU/Lightproof.py  |9 +--
 hu_HU/pythonpath/lightproof_handler_hu_HU.py |6 ++---
 hu_HU/pythonpath/lightproof_impl_hu_HU.py|   17 --
 pt_BR/Lightproof.py  |   17 --
 pt_BR/pythonpath/lightproof_handler_pt_BR.py |   10 
 pt_BR/pythonpath/lightproof_impl_pt_BR.py|   32 +++
 ru_RU/Lightproof.py  |9 +--
 ru_RU/pythonpath/lightproof_handler_ru_RU.py |6 ++---
 ru_RU/pythonpath/lightproof_impl_ru_RU.py|   17 --
 12 files changed, 86 insertions(+), 69 deletions(-)

New commits:
commit 54a753654845ecd253d7af7693bbcfbc9d952716
Author: Ilmari Lauhakangas 
AuthorDate: Sat Jul 27 13:42:00 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat Jul 27 12:52:15 2024 +0200

Fix issues found by Ruff linter

Change-Id: I0517a69b52e9f5b3da2648e82e63bc35a48e3e99
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/171091
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/en/Lightproof.py b/en/Lightproof.py
index 3003810..62e5fa7 100644
--- a/en/Lightproof.py
+++ b/en/Lightproof.py
@@ -2,7 +2,10 @@
 # Lightproof grammar checker for LibreOffice and OpenOffice.org
 # 2009-2012 (c) László Németh (nemeth at numbertext org), license: MPL 1.1 / 
GPLv3+ / LGPLv3+
 
-import uno, unohelper, os, sys, traceback
+import uno
+import unohelper
+import os
+import traceback
 from lightproof_impl_en import locales
 from lightproof_impl_en import pkg
 import lightproof_impl_en
@@ -15,7 +18,7 @@ from com.sun.star.lang import Locale
 # reload in obj.reload in Python 3
 try:
 from obj import reload
-except:
+except Exception:
 pass
 
 class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, 
XServiceDisplayName, XSupportedLocales):
@@ -117,7 +120,7 @@ class Lightproof( unohelper.Base, XProofreader, 
XServiceInfo, XServiceName, XSer
 return aRes
 aRes.aText = ""
 return aRes
-except:
+except Exception:
 if 'PYUNO_LOGLEVEL' in os.environ:
 print(traceback.format_exc())
 
diff --git a/en/pythonpath/lightproof_handler_en.py 
b/en/pythonpath/lightproof_handler_en.py
index 8d2150f..ef2bf34 100644
--- a/en/pythonpath/lightproof_handler_en.py
+++ b/en/pythonpath/lightproof_handler_en.py
@@ -14,16 +14,16 @@ def load(context):
 l = LightproofOptionsEventHandler(context)
 for i in lightproof_opts_en.lopts:
 l.load(i)
-except:
+except Exception:
 pass
 
 def get_option(page, option):
 try:
 return options[page + "," + option]
-except:
+except Exception:
 try:
 return options[page[:2] + "," + option]
-except:
+except Exception:
 return 0
 
 def set_option(page, option, value):
diff --git a/en/pythonpath/lightproof_impl_en.py 
b/en/pythonpath/lightproof_impl_en.py
index e9c7588..bd8b1c1 100644
--- a/en/pythonpath/lightproof_impl_en.py
+++ b/en/pythonpath/lightproof_impl_en.py
@@ -1,5 +1,10 @@
 # -*- encoding: UTF-8 -*-
-import uno, re, sys, os, traceback
+import uno
+import re
+import sys
+import os
+import traceback
+import lightproof_handler_en
 from com.sun.star.text.TextMarkupType import PROOFREADING
 from com.sun.star.beans import PropertyValue
 
@@ -10,8 +15,6 @@ version = "0.4.3"
 author = "László Németh"
 name = "Lightproof grammar checker (English)"
 
-import lightproof_handler_en
-
 # loaded rules (check for Update mechanism of the editor)
 try:
 langrule
@@ -86,7 +89,7 @@ def stem(rLoc, word):
 global stems
 if not word:
 return []
-if not word in stems:
+if word not in stems:
 x = spellchecker.spell(u"" + word + 
"", rLoc, ())
 if not x:
 return []
@@ -150,7 +153,7 @@ def proofread( nDocId, TEXT, LOCALE, nStartOfSentencePos, 
nSuggestedSentenceEndP
 s = TEXT[nStartOfSentencePos:nSuggestedSentenceEndPos]
 for i in get_rule(LOCALE).dic:
 # 0: regex,  1: replacement,  2: message,  3: condition,  4: ngroup,  
(5: oldline),  6: case sensitive ?
-if i[0] and not str(i[0]) in ignore:
+if i[0] and str(i[0]) not in ignore:
 for m in i[0].finditer(s):
 try:
 if not i[3] or eval(i[3]):
@@ -213,7 +216,7 @@ def compile_rules(dic):
 else:
 i += [False]
 i[0] = re.compile(i[0])
-except:
+except Exception:
 if 'PYUNO_LOGLEVEL' in os.environ:
 print("Lightproof: bad regul

core.git: cui/qa dbaccess/qa desktop/test external/nss filter/source librelogo/source

[Ilmari Lauhakangas (via logerrit)]

 cui/qa/uitest/dialogs/chardlg.py  |2 
 dbaccess/qa/python/fdo84315.py|4 
 desktop/test/deployment/active/active_python.py   |6 
 desktop/test/deployment/passive/passive_python.py |4 
 external/nss/nsinstall.py |2 
 filter/source/svg/gentoken.py |4 
 filter/source/svg/js2hxx.py   |3 
 librelogo/source/LibreLogo/LibreLogo.py   |  187 ++
 8 files changed, 105 insertions(+), 107 deletions(-)

New commits:
commit 656c48d4a2b444ccceed18c0dc09664c8cf46213
Author: Ilmari Lauhakangas 
AuthorDate: Sat Jul 27 12:27:55 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat Jul 27 12:51:55 2024 +0200

cui, dbaccess, desktop, external, filter, librelogo: fix issues found by

Ruff linter

Change-Id: I34df4c10520406a2b9d2d8f3487f877698a324f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171090
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py
index 686cb6472ac8..ee754b3c0f3a 100644
--- a/cui/qa/uitest/dialogs/chardlg.py
+++ b/cui/qa/uitest/dialogs/chardlg.py
@@ -149,8 +149,6 @@ class Test(UITestCase):
 def testSvxCharEffectsPageWriterAutomatic(self):
 # Start Writer.
 with self.ui_test.create_doc_in_start_center("writer"):
-doc = self.xUITest.getTopFocusWindow()
-
 # Use Format -> Character.
 with 
self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
 xTabs = xDialog.getChild("tabcontrol")
diff --git a/dbaccess/qa/python/fdo84315.py b/dbaccess/qa/python/fdo84315.py
index 680ba7495c3b..75954c0cd0b2 100644
--- a/dbaccess/qa/python/fdo84315.py
+++ b/dbaccess/qa/python/fdo84315.py
@@ -56,12 +56,12 @@ class Fdo84315(unittest.TestCase):
 
 xResultset = xStatement.executeQuery('SELECT "count" FROM 
"test_table"')
 expected_values = deque([42, 4711])
-xMeta = self.__test_Query('count', NUMERIC, xResultset)
+self.__test_Query('count', NUMERIC, xResultset)
 self.__test_ResultSetInteger(xResultset, expected_values)
 
 xResultset = xStatement.executeQuery('SELECT "name" FROM "test_table"')
 expected_values = deque(['foo', 'bar'])
-xMeta = self.__test_Query('name', VAR_CHAR, xResultset)
+self.__test_Query('name', VAR_CHAR, xResultset)
 self.__test_ResultSetString(xResultset, expected_values)
 
 xResultset = xStatement.executeQuery('SELECT "id" FROM "test_table"')
diff --git a/desktop/test/deployment/active/active_python.py 
b/desktop/test/deployment/active/active_python.py
index 1d6a32749a80..c06db4bc9354 100644
--- a/desktop/test/deployment/active/active_python.py
+++ b/desktop/test/deployment/active/active_python.py
@@ -76,8 +76,8 @@ class Dispatch(unohelper.Base, XServiceInfo, XDispatch):
 "com.sun.star.frame.Desktop", self.context). \
 getCurrentFrame().getComponentWindow(), \
 INFOBOX, BUTTONS_OK, "active", "python")
-box.execute();
-box.dispose();
+box.execute()
+box.dispose()
 
 def addStatusListener(self, Control, URL):
 pass
@@ -100,7 +100,7 @@ def writeRegistryInfo(smgr, regKey):
 for i in (Provider, Dispatch):
 key = regKey.createKey("/" + i.implementationName + "/UNO")
 for j in i.serviceNames:
-key.createKey("/SERVICES/" + j);
+key.createKey("/SERVICES/" + j)
 regKey.createKey( \
 "/" + Dispatch.implementationName + "/UNO/SINGLETONS/" \
 "com.sun.star.test.deployment.active_python_singleton"). \
diff --git a/desktop/test/deployment/passive/passive_python.py 
b/desktop/test/deployment/passive/passive_python.py
index 58fe5d2266b6..ba1eda8f767f 100644
--- a/desktop/test/deployment/passive/passive_python.py
+++ b/desktop/test/deployment/passive/passive_python.py
@@ -75,8 +75,8 @@ class Dispatch(unohelper.Base, XServiceInfo, XDispatch):
 "com.sun.star.frame.Desktop", self.context). \
 getCurrentFrame().getComponentWindow(), \
 INFOBOX, BUTTONS_OK, "passive", "python")
-box.execute();
-box.dispose();
+box.execute()
+box.dispose()
 
 def addStatusListener(self, Control, URL):
 pass
diff --git a/external/nss/nsinstall.py b/external/nss/nsinstall.py
index d90a85e6c540..26114ef5db17 100644
--- a/external/nss/nsinstall.py
+++ b/externa

core.git: android/mobile-config.py compilerplugins/clang

[Ilmari Lauhakangas (via logerrit)]

 android/mobile-config.py|2 
 compilerplugins/clang/constantparam.py  |   63 +
 compilerplugins/clang/finalclasses.py   |   48 ---
 compilerplugins/clang/finalmethods.py   |   42 +++--
 compilerplugins/clang/methodcycles.py   |3 -
 compilerplugins/clang/pahole-all-classes.py |   15 --
 compilerplugins/clang/unnecessaryvirtual.py |   69 ++--
 compilerplugins/clang/unusedmethods.py  |   60 
 compilerplugins/clang/virtualdead.py|   60 
 compilerplugins/clang/virtualdown.py|3 -
 10 files changed, 243 insertions(+), 122 deletions(-)

New commits:
commit c5823a2e276a26194aec82297bade6648626b690
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 25 20:56:05 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jul 26 18:45:56 2024 +0200

android, compilerplugins: fix issues found by Ruff linter

Change-Id: Idab013bf2ff1f274a07911ec8b545cd26142139c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171050
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/android/mobile-config.py b/android/mobile-config.py
index 5998e5d1f9b7..89bb7e773666 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -62,7 +62,7 @@ if __name__ == '__main__':
 for child in root:
 section = child.attrib['{http://openoffice.org/2001/registry}name']
 package = child.attrib['{http://openoffice.org/2001/registry}package']
-size = len(ET.tostring(child));
+size = len(ET.tostring(child))
 key = '%s/%s' % (package, section)
 if key in main_xcd_discard:
 print('removed %s - saving %d' % (key, size))
diff --git a/compilerplugins/clang/constantparam.py 
b/compilerplugins/clang/constantparam.py
index d2d33087a4c9..24c4d257e1e0 100755
--- a/compilerplugins/clang/constantparam.py
+++ b/compilerplugins/clang/constantparam.py
@@ -21,7 +21,8 @@ with io.open("workdir/loplugin.constantparam.log", "r") as 
txt:
 nameAndParams = normalizeTypeParams(tokens[1])
 sourceLocation = tokens[2]
 # the cxx should actually ignore these
-if sourceLocation.startswith("workdir/"): continue
+if sourceLocation.startswith("workdir/"):
+continue
 paramName = tokens[3]
 paramType = normalizeTypeParams(tokens[4])
 callValue = tokens[5]
@@ -61,19 +62,27 @@ for callInfo, callValues in iter(callDict.items()):
 if ("," not in nameAndParams) and (("::set" in nameAndParams) or ("::Set" 
in nameAndParams)):
 continue
 # ignore code that follows a common pattern
-if sourceLoc.startswith("sw/inc/swatrset.hxx"): continue
-if sourceLoc.startswith("sw/inc/format.hxx"): continue
+if sourceLoc.startswith("sw/inc/swatrset.hxx"):
+continue
+if sourceLoc.startswith("sw/inc/format.hxx"):
+continue
 # template generated code
-if sourceLoc.startswith("include/sax/fshelper.hxx"): continue
+if sourceLoc.startswith("include/sax/fshelper.hxx"):
+continue
 # debug code
-if sourceLoc.startswith("include/oox/dump"): continue
+if sourceLoc.startswith("include/oox/dump"):
+continue
 # part of our binary API
-if sourceLoc.startswith("include/LibreOfficeKit"): continue
+if sourceLoc.startswith("include/LibreOfficeKit"):
+continue
 
 # ignore methods generated by SFX macros
-if "RegisterInterface(class SfxModule *)" in nameAndParams: continue
-if "RegisterChildWindow(_Bool,class SfxModule *,enum SfxChildWindowFlags)" 
in nameAndParams: continue
-if "RegisterControl(unsigned short,class SfxModule *)" in nameAndParams: 
continue
+if "RegisterInterface(class SfxModule *)" in nameAndParams:
+continue
+if "RegisterChildWindow(_Bool,class SfxModule *,enum SfxChildWindowFlags)" 
in nameAndParams:
+continue
+if "RegisterControl(unsigned short,class SfxModule *)" in nameAndParams:
+continue
 
 if RepresentsInt(callValue):
 if callValue == "0" or callValue == "1":
@@ -82,13 +91,20 @@ for callInfo, callValues in iter(callDict.items()):
 tmp2list.append((sourceLoc, functionSig, callInfo[3] + " " + 
callInfo[2], callValue))
 # look for places where the callsite is always a constructor invocation
 elif constructor_regex.match(callValue) or callValue == "\"\"":
-if callValue.startswith("Get"): continue
-if callValue.startswith("get"

core.git: bin/check-autocorr.py bin/check-missing-export-asserts.py bin/convwatch.py bin/find-can-be-private-symbols.py bin/find-headers-to-move-inside-modules.py bin/find-unused-defines.py bin/find-u

[Ilmari Lauhakangas (via logerrit)]

 bin/check-autocorr.py  |2 
 bin/check-missing-export-asserts.py|2 
 bin/convwatch.py   |   10 -
 bin/find-can-be-private-symbols.py |  264 +++--
 bin/find-headers-to-move-inside-modules.py |   27 +-
 bin/find-unused-defines.py |   95 ++
 bin/find-unused-sid-commands.py|   15 +
 bin/find-unused-typedefs.py|6 
 bin/get-forum-attachments.py   |2 
 bin/symbolstore.py |6 
 bin/test-hid-vs-ui.py  |9 
 11 files changed, 288 insertions(+), 150 deletions(-)

New commits:
commit 9471fce06e996e4433a8000ead704fda91588d1d
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 25 18:20:11 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Jul 25 19:57:10 2024 +0200

bin: fix issues found by Ruff linter

Change-Id: I44e546defb278bb5217ed028dcaebc9fb2d23f0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171020
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/bin/check-autocorr.py b/bin/check-autocorr.py
index f865d3e891ce..052fd97274d0 100755
--- a/bin/check-autocorr.py
+++ b/bin/check-autocorr.py
@@ -33,6 +33,6 @@ for element in elements_x:
 print('In ' + complete_file + ' same value: ' + value_a)
 bAllFilesOk = False
 
-if bAllFilesOk == True:
+if bAllFilesOk:
   exit(0)
 exit(1)
diff --git a/bin/check-missing-export-asserts.py 
b/bin/check-missing-export-asserts.py
index 9f0fb52da516..f9974ef9ebff 100755
--- a/bin/check-missing-export-asserts.py
+++ b/bin/check-missing-export-asserts.py
@@ -82,7 +82,7 @@ def execute_make_and_parse_output(fileName, makeName):
 if line.startswith('DECLARE'):
 try:
 testName = re.findall('"([^"]*)"', line)[0]
-except:
+except Exception:
 #check in the next line when line is broken into 2 lines
 testName = re.findall('"([^"]*)"', lines[i + 1])[0]
 
diff --git a/bin/convwatch.py b/bin/convwatch.py
index 25920b7343c8..41e95cc5ef2c 100644
--- a/bin/convwatch.py
+++ b/bin/convwatch.py
@@ -231,7 +231,7 @@ def retryInvoke(connection, test):
 connection.postTest()
 except KeyboardInterrupt:
 raise # Ctrl+C should work
-except:
+except Exception:
 log("retryInvoke: caught exception")
 raise Exception("FAILED retryInvoke")
 
@@ -244,7 +244,7 @@ def runConnectionTests(connection, invoker, tests):
 invoker(connection, test)
 except KeyboardInterrupt:
 raise # Ctrl+C should work
-except:
+except Exception:
 failed.append(test.file)
 estr = traceback.format_exc()
 log("... FAILED with exception:
" + estr)
@@ -292,7 +292,7 @@ def loadFromURL(xContext, url):
 time.sleep(1)
 log("timeout: no OnLayoutFinished received")
 return xDoc
-except:
+except Exception:
 if xDoc:
 log("CLOSING")
 xDoc.close(True)
@@ -431,13 +431,13 @@ def usage():
 def checkTools():
 try:
 subprocess.check_output(["gs", "--version"])
-except:
+except Exception:
 print("Cannot execute 'gs'. Please install ghostscript.")
 sys.exit(1)
 try:
 subprocess.check_output(["composite", "-version"])
 subprocess.check_output(["identify", "-version"])
-except:
+except Exception:
 print("Cannot execute 'composite' or 'identify'.")
 print("Please install ImageMagick.")
 sys.exit(1)
diff --git a/bin/find-can-be-private-symbols.py 
b/bin/find-can-be-private-symbols.py
index e5d7175d4be7..e3c08b9b40c7 100755
--- a/bin/find-can-be-private-symbols.py
+++ b/bin/find-can-be-private-symbols.py
@@ -55,7 +55,8 @@ with subprocess_find.stdout as txt:
 #   DF *UND*   
_ZN16FilterConfigItem10WriteInt32ERKN3rtl8OUStringEi
 for line2_bytes in txt2:
 line2 = line2_bytes.strip().decode("utf-8")
-if "*UND*" not in line2: continue
+if "*UND*" not in line2:
+continue
 tokens = line2.split(" ")
 sym = tokens[len(tokens)-1].strip()
 imported_symbols1.add(sym)
@@ -85,18 +86,24 @@ progress = 0
 progress_max_len = len(imported_symbols1) + len(exported_symbols1)
 for sym in imported_symbols1:
 progress += 1
-if (progress % 128 == 0): print( str(int(progress * 100 / 
progres

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit be1b9f955be3bf1f207967b4590e4b66450b275c
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 25 16:50:32 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Thu Jul 25 15:50:32 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to ff6b674fc9034f2f70f78159c0bb16924d8ff2c1
  - helpers: fix issues found by Ruff linter

Change-Id: I0fd932259a79bef030d6450a2770cb28c4c840b7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171015
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index e35fb29cb092..ff6b674fc903 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e35fb29cb092771840ff876bbb4350e7570e1627
+Subproject commit ff6b674fc9034f2f70f78159c0bb16924d8ff2c1

help.git: helpers/convertfilters.py helpers/make_icon_link.txt.py

[Ilmari Lauhakangas (via logerrit)]

 helpers/convertfilters.py |9 +++--
 helpers/make_icon_link.txt.py |   24 
 2 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit ff6b674fc9034f2f70f78159c0bb16924d8ff2c1
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 25 16:48:49 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Jul 25 15:50:32 2024 +0200

helpers: fix issues found by Ruff linter

Change-Id: I0fd932259a79bef030d6450a2770cb28c4c840b7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171015
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/helpers/convertfilters.py b/helpers/convertfilters.py
index 863cbb23e2..c2557205cc 100755
--- a/helpers/convertfilters.py
+++ b/helpers/convertfilters.py
@@ -16,9 +16,6 @@
 
 import os
 import sys
-import random
-import time
-from math import floor
 from lxml import etree
 
 output_file_path = os.path.join(os.path.dirname(sys.argv[0]), 
"convertfilters.xhp")
@@ -169,11 +166,11 @@ for module in modules:
 
\
 
'
 
-output += f'\
+output += '\
 
\
 
'
 
-output += f'\
+output += '\
 
\
 '
 
@@ -181,4 +178,4 @@ with open(output_file_path, "w") as f:
 f.write(output)
 
 print(f'
Done. File saved at: {output_file_path}.')
-print(f'Please move this file into helpcontent2/source/text/shared/guide.')
+print('Please move this file into helpcontent2/source/text/shared/guide.')
diff --git a/helpers/make_icon_link.txt.py b/helpers/make_icon_link.txt.py
index 573af4050c..d8f37f3765 100644
--- a/helpers/make_icon_link.txt.py
+++ b/helpers/make_icon_link.txt.py
@@ -26,23 +26,23 @@ except IOError:
print("There was an error writing", file_xsl)
sys.exit()
 
-file_xsl.write('
');
-file_xsl.write('http://www.w3.org/1999/XSL/Transform";>
');
-file_xsl.write('
');
-file_xsl.write('
');
+file_xsl.write('
')
+file_xsl.write('http://www.w3.org/1999/XSL/Transform";>
')
+file_xsl.write('
')
+file_xsl.write('
')
 file_xsl.write('
')
 
 for line in file_icon:
 if line[0] != "#" :
 if line.find('png',0, len(line)) != -1 :
-a = "\'" + line.split()[0] + "\'";
-b = line.split()[1].replace(".png",".svg");
-file_xsl.write(''+ b + 
'
');
-
-file_xsl.write('
');
-file_xsl.write('
');
-file_xsl.write('
');
-file_xsl.write('
');
+a = "\'" + line.split()[0] + "\'"
+b = line.split()[1].replace(".png",".svg")
+file_xsl.write(''+ b + 
'
')
+
+file_xsl.write('
')
+file_xsl.write('
')
+file_xsl.write('
')
+file_xsl.write('
')
 
 file_xsl.close()
 file_icon.close()

core.git: bin/check-implementer-notes.py bin/find-mergedlib-can-be-private.py bin/flat-odf-cleanup.py bin/lint-ui.py bin/refcount_leak.py

[Ilmari Lauhakangas (via logerrit)]

 bin/check-implementer-notes.py   |6 
 bin/find-mergedlib-can-be-private.py |  265 +++
 bin/flat-odf-cleanup.py  |   10 -
 bin/lint-ui.py   |8 -
 bin/refcount_leak.py |2 
 5 files changed, 191 insertions(+), 100 deletions(-)

New commits:
commit 5fc6ef5990fa66982a3803916f32f7aa8d7f9692
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 25 14:25:42 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Jul 25 15:16:44 2024 +0200

bin: fix issues found by Ruff linter

Change-Id: Ic81d21a90059f5db87543c8ce2abb8007f278f14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171008
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/bin/check-implementer-notes.py b/bin/check-implementer-notes.py
index e637563d2f86..24e4049ddeba 100755
--- a/bin/check-implementer-notes.py
+++ b/bin/check-implementer-notes.py
@@ -1,6 +1,10 @@
 #!/usr/bin/env python
 
-import json, re, subprocess, sys, urllib3
+import json
+import re
+import subprocess
+import sys
+import urllib3
 
 http = urllib3.PoolManager()
 
diff --git a/bin/find-mergedlib-can-be-private.py 
b/bin/find-mergedlib-can-be-private.py
index bab145839571..243e19374d8a 100755
--- a/bin/find-mergedlib-can-be-private.py
+++ b/bin/find-mergedlib-can-be-private.py
@@ -7,7 +7,6 @@
 
 import subprocess
 import re
-import multiprocessing
 
 exported_symbols1 = set()
 imported_symbols1 = set()
@@ -46,7 +45,8 @@ with subprocess_find.stdout as txt:
 #   DF *UND*   
_ZN16FilterConfigItem10WriteInt32ERKN3rtl8OUStringEi
 for line2_bytes in txt2:
 line2 = line2_bytes.strip().decode("utf-8")
-if "*UND*" not in line2: continue
+if "*UND*" not in line2:
+continue
 tokens = line2.split(" ")
 sym = tokens[len(tokens)-1].strip()
 imported_symbols1.add(sym)
@@ -76,18 +76,24 @@ progress = 0
 progress_max_len = len(imported_symbols1) + len(exported_symbols1)
 for sym in imported_symbols1:
 progress += 1
-if (progress % 128 == 0): print( str(int(progress * 100 / 
progress_max_len)) + "%")
+if (progress % 128 == 0):
+print( str(int(progress * 100 / progress_max_len)) + "%")
 filtered_sym = subprocess.check_output(["c++filt", 
sym]).strip().decode("utf-8")
-if filtered_sym.startswith("non-virtual thunk to "): filtered_sym = 
filtered_sym[21:]
-elif filtered_sym.startswith("virtual thunk to "): filtered_sym = 
filtered_sym[17:]
+if filtered_sym.startswith("non-virtual thunk to "):
+filtered_sym = filtered_sym[21:]
+elif filtered_sym.startswith("virtual thunk to "):
+filtered_sym = filtered_sym[17:]
 imported_symbols2.add(filtered_sym)
 progress = 0
 for sym in exported_symbols1:
 progress += 1
-if (progress % 128 == 0): print( str(int(progress * 100 / 
progress_max_len)) + "%")
+if (progress % 128 == 0):
+print( str(int(progress * 100 / progress_max_len)) + "%")
 filtered_sym = subprocess.check_output(["c++filt", 
sym]).strip().decode("utf-8")
-if filtered_sym.startswith("non-virtual thunk to "): filtered_sym = 
filtered_sym[21:]
-elif filtered_sym.startswith("virtual thunk to "): filtered_sym = 
filtered_sym[17:]
+if filtered_sym.startswith("non-virtual thunk to "):
+filtered_sym = filtered_sym[21:]
+elif filtered_sym.startswith("virtual thunk to "):
+filtered_sym = filtered_sym[17:]
 exported_symbols2.add(filtered_sym)
 
 
@@ -100,7 +106,8 @@ print("unused_exports = " + str(len(unused_exports)))
 can_be_hidden_count = dict()
 for sym in exported_symbols2:
 i = sym.rfind("::")
-if i == -1: continue
+if i == -1:
+continue
 clz = sym[:i]
 if clz in can_be_hidden_count:
 can_be_hidden_count[clz] = can_be_hidden_count[clz] + 1
@@ -108,7 +115,8 @@ for sym in exported_symbols2:
 can_be_hidden_count[clz] = 1
 for sym in imported_symbols2:
 i = sym.rfind("::")
-if i == -1: continue
+if i == -1:
+continue
 clz = sym[:i]
 if clz in can_be_hidden_count:
 can_be_hidden_count[clz] = can_be_hidden_count[clz] - 1
@@ -123,7 +131,8 @@ for clz in can_be_hidden_count:
 can_be_hidden_list.sort(reverse=True)
 with open("bin/find-mergedlib-can-be-private-symbols.classes.results", "wt") 
as f:
 for i in can_be_hidden_list:
-if i[0] < 10: break
+if i[0] < 10:
+break
 f.write(str(i[0]) + " " + i[1] + "
")
 
 
@@ -131,85 +140,163 @@ with 
open("bin/find-m

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 6817badaf268f49106406157cf5005871314dc32
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 25 12:02:54 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Thu Jul 25 11:02:54 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to e35fb29cb092771840ff876bbb4350e7570e1627
  - Related tdf#69192 better placeholder string for command line example

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

diff --git a/helpcontent2 b/helpcontent2
index 421ecbe5b8f3..e35fb29cb092 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 421ecbe5b8f35dc9a50ac6a329662231914132d4
+Subproject commit e35fb29cb092771840ff876bbb4350e7570e1627

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/shared/guide/start_parameters.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e35fb29cb092771840ff876bbb4350e7570e1627
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 25 10:31:09 2024 +0300
Commit: Olivier Hallot 
CommitDate: Thu Jul 25 11:02:54 2024 +0200

Related tdf#69192 better placeholder string for command line example

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

diff --git a/source/text/shared/guide/start_parameters.xhp 
b/source/text/shared/guide/start_parameters.xhp
index 9b0df08afa..d34577e0e5 100644
--- a/source/text/shared/guide/start_parameters.xhp
+++ b/source/text/shared/guide/start_parameters.xhp
@@ -533,10 +533,10 @@
 
 
 
---show[=slide_number]
+--show[=N]
 
 
-Opens and starts the slideshow of the following presentation 
documents immediately. Files are closed after the showing. If a 
slide_number is provided, they start at that 
slide.
+Opens and starts the slideshow of the following presentation 
documents immediately. Files are closed after the showing. N 
in the example refers to the slide number and, when it is provided, they start 
at that slide.
 
 
 

dev-tools.git: lionss/application lionss/config.py lionss/_lionss lionss/lionss.py lionss/openshift.htaccess lionss/README.md lionss/static lionss/tpl

[Ilmari Lauhakangas (via logerrit)]

 dev/null  |binary
 lionss/README.md  |   53 --
 lionss/_lionss/gitter.py  |   85 ---
 lionss/application|   21 
 lionss/config.py  |   20 
 lionss/lionss.py  |  110 --
 lionss/openshift.htaccess |2 
 lionss/static/README  |   12 -
 lionss/static/lionss.css  |   42 -
 lionss/tpl/error.html |9 ---
 lionss/tpl/footer.html|8 ---
 lionss/tpl/header.html|   21 
 lionss/tpl/index.html |   19 ---
 lionss/tpl/result.html|   30 
 14 files changed, 432 deletions(-)

New commits:
commit 27c06da300fec7988cd7439d6f81aa2490b1d494
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 25 09:22:47 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Jul 25 08:26:50 2024 +0200

Drop lionss

It was an experiment aiming to create a web interface for UI string
searching. Nowadays the situation is better as we can just search through
Glade files or .pot files or in Weblate.

Change-Id: Idb08f06f036f06a08a4fd52d64231d351e582003
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/170994
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/lionss/README.md b/lionss/README.md
deleted file mode 100644
index 1dd03eb6..
--- a/lionss/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Lionss
-==
-
-Introduction
---
-The python webapp provides a web GUI to search for UI strings in LO code base, 
show all occurrences, and let you decide which one you want to search the 
references for in OpenGrok.
-
-OpenGrok has some issues which forced us to do this app. Else it would be able 
to cope with it.
-
-
-Notes on implementation

-### Choices
-
-We used Python 2.7, with `web.py` and `pylev` specific packages.
-
-We rely on a standard git repository. Due to architecture of .ui files and 
their references, we cannot use a bare repo now *(at least I don't know how. 
Well, it is handled by the code, but not supported anymore, actually)*.
-We rely on git being in the path.
-
-Strategy is we query for terms including all letters and same number of 
occurrences. Then we refine with levenshtein algorithm. So jokers are not 
allowed in search field. Once we found referenced text in .ui, we search for 
the same in the sources to provides all its uses, and link them to OpenGrok.
-
-### WebApp
-
-We kept the module layout although it is very small, because it is also a 
training for my Python skills
-
- Config
-
-The configuration file holds:
-
-* the git repo path
-* the OpenGrok LO base url for queries
-* the analysis config: file extensions, patterns for deciphering. It is held 
in a dict as we may want more items later (we had with [hs]rc + ui).
-
-### Script
-
-Not done since moving to .ui makes current work invalid. I will wait for 
validation of webapp before going into script.
-
-*Draft* : The python script does roughly the same workflow, but shows you file 
paths and lines so you can go through them in your shell.
-
-### Deployment
-
-+ Bundled webserver of  `web.py` : smooth
-+ Managed to configure Apache + mod_wsgi : some tricks, but that's Apache
-+ Tried heroku, but lack of filesystem (was simple, though)
-+ Tried OpenShift: has a small quota filesystem (1GB) for the free plan, but 
is a pain to configure
-  + A first level is almost useless, because wsgi expects either a ./wsgi.py 
or a /wsgi with some content.
-  + static files are expected in a specific place, so if you want to keep the 
framework struct, you need a `.htaccess` to redirect that.
-  + doesn't accept a module folder whose name is the same as base script.
-  + To keep in the 1GB allowed:
-+ `git clone -n --single-branch https://git.libreoffice.org/core lo_core  
(~900MB out of 1GB)`
-+ `git config core.sparsecheckout true`
-+ `echo *.ui > .git/info/sparse-checkout`
-+ `git grep -l "" HEAD -- *.ui  | awk -F:  '{print $2}' | xargs git 
checkout HEAD --`
diff --git a/lionss/_lionss/__init__.py b/lionss/_lionss/__init__.py
deleted file mode 100644
index e69de29b..
diff --git a/lionss/_lionss/gitter.py b/lionss/_lionss/gitter.py
deleted file mode 100644
index 290bde7f..
--- a/lionss/_lionss/gitter.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-#
-# 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 https://mozilla.org/MPL/2.0/.
-#
-
-import subprocess
-import os
-import pylev # levenstein module
-
-class worker:
-def __init__(self, needle, case, repo_path):
-self.goal = needle
-self.case = case
-self.proposals = dict()
-
-if

dev-tools.git: update-stats-geoip/analyser.py update-stats-geoip/compiler.py

[Ilmari Lauhakangas (via logerrit)]

 update-stats-geoip/analyser.py |2 +-
 update-stats-geoip/compiler.py |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 191e40cf01c9117c59976dbc5c621b4e6e849037
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 18 19:37:30 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Jul 18 18:38:11 2024 +0200

update-stats-geoip: fix issues found by Ruff linter

Change-Id: I0aed09d6044c85f90d70703599e025b082ced309
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/170701
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/update-stats-geoip/analyser.py b/update-stats-geoip/analyser.py
index 14ca2453..2ebfe9ef 100755
--- a/update-stats-geoip/analyser.py
+++ b/update-stats-geoip/analyser.py
@@ -40,7 +40,7 @@ while (datetime.date(year, month, 1) + 
datetime.timedelta(days=20)) < datetime.d
 for version in VERSIONLIST:
 sFile = "storage-" + sPrefix + "/" + version + "/" + str(year) + "/" + 
str(month).zfill(2) + "/countryhits.dat"
 if not os.path.exists(sFile):
-continue;
+continue
 with open(sFile, 'r') as aFile:
 aData[version] = pickle.load(aFile)
 
diff --git a/update-stats-geoip/compiler.py b/update-stats-geoip/compiler.py
index b74f2448..93610d6d 100755
--- a/update-stats-geoip/compiler.py
+++ b/update-stats-geoip/compiler.py
@@ -17,7 +17,6 @@ import datetime
 import GeoIP
 import cPickle as pickle
 import re
-import sys
 import time
 import os.path
 

dev-tools.git: uitest/mass-testing

[Ilmari Lauhakangas (via logerrit)]

 uitest/mass-testing/calc.py|1 -
 uitest/mass-testing/impress.py |7 ++-
 uitest/mass-testing/run.py |2 +-
 uitest/mass-testing/writer.py  |5 ++---
 4 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 84d578554adbb85166ac9b1413656ce756236704
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 18 19:33:44 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Jul 18 18:34:51 2024 +0200

uitest: fix issues found by Ruff linter

Change-Id: I6a0c9ea90ec6423ed27f525e14ffd8d4b6b8495c
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/170700
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/uitest/mass-testing/calc.py b/uitest/mass-testing/calc.py
index 8b9f3bbc..597b9774 100755
--- a/uitest/mass-testing/calc.py
+++ b/uitest/mass-testing/calc.py
@@ -5,7 +5,6 @@
 #
 
 import os
-import signal
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict
 from libreoffice.uno.propertyvalue import mkPropertyValues
diff --git a/uitest/mass-testing/impress.py b/uitest/mass-testing/impress.py
index a885d0a7..dbe12ada 100755
--- a/uitest/mass-testing/impress.py
+++ b/uitest/mass-testing/impress.py
@@ -40,7 +40,7 @@ class massTesting(UITestCase):
 yield xEdit
 
 def test_copy_all_paste_undo(self):
-with self.load_file() as xEdit:
+with self.load_file():
 self.xUITest.executeCommand(".uno:SelectAll")
 
 self.xUITest.executeCommand(".uno:Copy")
@@ -66,13 +66,10 @@ class massTesting(UITestCase):
 self.xUITest.executeCommand(".uno:Undo")
 
 def test_duplicate_all_slides_and_undo(self):
-with self.load_file() as xEdit:
+with self.load_file():
 # Go to the slide sorter view
 self.xUITest.executeCommand(".uno:DiaMode")
 
-xDoc = self.xUITest.getTopFocusWindow()
-xEdit = xDoc.getChild("slidesorter")
-
 self.xUITest.executeCommand(".uno:SelectAll")
 
 self.xUITest.executeCommand(".uno:DuplicatePage")
diff --git a/uitest/mass-testing/run.py b/uitest/mass-testing/run.py
index d1bec88b..f829b0d6 100755
--- a/uitest/mass-testing/run.py
+++ b/uitest/mass-testing/run.py
@@ -9,7 +9,7 @@ import os
 import argparse
 import glob
 import shutil
-from subprocess import Popen, PIPE, TimeoutExpired
+from subprocess import Popen, PIPE
 import sys
 import signal
 import logging
diff --git a/uitest/mass-testing/writer.py b/uitest/mass-testing/writer.py
index 83ead784..a88933c7 100755
--- a/uitest/mass-testing/writer.py
+++ b/uitest/mass-testing/writer.py
@@ -5,7 +5,6 @@
 #
 
 import os
-import signal
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from contextlib import contextmanager
@@ -54,7 +53,7 @@ class massTesting(UITestCase):
 self.xUITest.executeCommand(".uno:Undo")
 
 def test_insert_pageBreaks_and_undo(self):
-with self.load_file() as xEdit:
+with self.load_file():
 for i in range(5):
 self.xUITest.executeCommand(".uno:InsertPagebreak")
 
@@ -62,7 +61,7 @@ class massTesting(UITestCase):
 self.xUITest.executeCommand(".uno:Undo")
 
 def test_copy_all_paste_undo(self):
-with self.load_file() as xEdit:
+with self.load_file():
 self.xUITest.executeCommand(".uno:SelectAll")
 self.xUITest.executeCommand(".uno:SelectAll")
 self.xUITest.executeCommand(".uno:SelectAll")

dev-tools.git: scripts/easyhackers.py scripts/rtf-anonymiser.py scripts/tpconv.py test-bugzilla-files/analyze_logs.py test-bugzilla-files/test-bugzilla-files.py

[Ilmari Lauhakangas (via logerrit)]

 scripts/easyhackers.py |1 -
 scripts/rtf-anonymiser.py  |3 ++-
 scripts/tpconv.py  |2 +-
 test-bugzilla-files/analyze_logs.py|6 +++---
 test-bugzilla-files/test-bugzilla-files.py |   25 ++---
 5 files changed, 16 insertions(+), 21 deletions(-)

New commits:
commit 21fc2f5b63d8882f8bec43e91b67e273b75abc12
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 18 18:14:19 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Jul 18 17:15:50 2024 +0200

scripts, test-bugzilla-files: fix issues found by Ruff linter

Change-Id: Ic473fa0ccb8edaff3a303354d9676c6f57be655f
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/170697
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/scripts/easyhackers.py b/scripts/easyhackers.py
index b957d33c..17b365b8 100755
--- a/scripts/easyhackers.py
+++ b/scripts/easyhackers.py
@@ -8,7 +8,6 @@
 #
 
 import sys
-import re
 import sh
 from urllib.request import urlopen, URLError
 from io import BytesIO
diff --git a/scripts/rtf-anonymiser.py b/scripts/rtf-anonymiser.py
index d7238ff1..df2b718a 100755
--- a/scripts/rtf-anonymiser.py
+++ b/scripts/rtf-anonymiser.py
@@ -6,7 +6,8 @@
 #
 
 
-import sys, getopt
+import sys
+import getopt
 
 def usage(code):
 print("Usage: %s [-i|--inline] input.rtf" % sys.argv[0])
diff --git a/scripts/tpconv.py b/scripts/tpconv.py
index 141db10c..725e9975 100755
--- a/scripts/tpconv.py
+++ b/scripts/tpconv.py
@@ -31,7 +31,7 @@ conv = {
 
 # We know that VirtualDevices use a DPI of 96.
 # Could use 'gtk.gdk.screen_get_default().get_resolution()' from pygtk.
-conv['pixel'] = conv['inch'] / int(os.environ.get("DPI", "96"));
+conv['pixel'] = conv['inch'] / int(os.environ.get("DPI", "96"))
 
 def convert(amount, fro, to):
 # convert to EMU
diff --git a/test-bugzilla-files/analyze_logs.py 
b/test-bugzilla-files/analyze_logs.py
index f027dc1f..740092c6 100644
--- a/test-bugzilla-files/analyze_logs.py
+++ b/test-bugzilla-files/analyze_logs.py
@@ -42,7 +42,7 @@ def analyze_odfundifflog(odfundifflog_file, differences):
 regex = re.compile("/srv/crashtestdata/.+/(\w*)/")
 for line in open(odfundifflog_file):
 r = regex.search(line)
-if r == None:
+if r is None:
 continue
 format = r.groups()[0]
 if format not in differences:
@@ -88,12 +88,12 @@ def import_csv(filename):
 def export_csv(filename, data, reader, header=True):
 fieldnames = set(data.keys())
 
-if not reader is None:
+if reader is not None:
 fieldnames.update(reader.fieldnames)
 writer = csv.DictWriter(open(filename, "w"), sorted(fieldnames), restval=0)
 if header:
 writer.writeheader()
-if not reader is None:
+if reader is not None:
 for row in reader:
 writer.writerow(row)
 writer.writerow(data)
diff --git a/test-bugzilla-files/test-bugzilla-files.py 
b/test-bugzilla-files/test-bugzilla-files.py
index 22216137..fdfcaad7 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -27,15 +27,12 @@
 
 import getopt
 import os
-import glob
 import subprocess
 import sys
 import time
 import uuid
-import datetime
 import re
 
-import signal
 import threading
 try:
 from urllib.parse import quote
@@ -161,7 +158,7 @@ class OfficeConnection:
 #return ret
 def kill(self):
 self.suicided = True
-command = "rm /tmp/OSL_PIPE_" + str(os.getuid()) + "_" + self.pipename;
+command = "rm /tmp/OSL_PIPE_" + str(os.getuid()) + "_" + self.pipename
 print(command)
 os.system(command)
 command = "kill " + str(self.pro.pid)
@@ -221,7 +218,7 @@ def retryInvoke(connection, test):
 connection.postTest()
 except KeyboardInterrupt:
 raise # Ctrl+C should work
-except:
+except Exception:
 print("retryInvoke: caught exception")
 raise Exception("FAILED retryInvoke")
 
@@ -247,7 +244,6 @@ class EventListener(XDocumentEventListener,unohelper.Base):
 def mkPropertyValue(name, value):
 return uno.createUnoStruct("com.sun.star.beans.PropertyValue",
 name, 0, value, 0)
-de
 
 def getComponent(xDoc):
 if not xDoc:
@@ -318,7 +314,7 @@ def loadFromURL(xContext, url, t):
 raise # means crashed, handle it later
 except pyuno.getClass("com.sun.star.lang.IllegalArgumentException"):
 pass # means could not open the file, ignore it
-except:
+except Exception:
 if xDoc:
 print("CLOSING")
 xDoc.close(True)
@@ -397,7 +393,7 @@ def exportDoc(xDoc, filterName, valid

dev-tools.git: perf/compare-logs.py qa/bugzillaDataAnalyzer.py qa/createBlogReport.py qa/createWeeklyReport.py qa/createWikiStats.py qa/document_analyser.py

[Ilmari Lauhakangas (via logerrit)]

 perf/compare-logs.py   |3 ++-
 qa/bugzillaDataAnalyzer.py |3 +--
 qa/createBlogReport.py |8 +---
 qa/createWeeklyReport.py   |2 --
 qa/createWikiStats.py  |2 --
 qa/document_analyser.py|3 ---
 6 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit 51c4f0a5215da7bb5df60a380f7f588967813b3b
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jul 18 17:58:16 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Jul 18 17:00:10 2024 +0200

perf, qa: fix issues found by Ruff linter

Change-Id: I5acb07130a96d125396992361a5318d1309111b3
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/170696
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/perf/compare-logs.py b/perf/compare-logs.py
index 90a60daa..b1375ae6 100755
--- a/perf/compare-logs.py
+++ b/perf/compare-logs.py
@@ -25,7 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-import sys, os
+import sys
+import os
 import argparse
 
 def readFile(url):
diff --git a/qa/bugzillaDataAnalyzer.py b/qa/bugzillaDataAnalyzer.py
index 1ff4be85..439fd359 100755
--- a/qa/bugzillaDataAnalyzer.py
+++ b/qa/bugzillaDataAnalyzer.py
@@ -336,7 +336,7 @@ def util_print_QA_line_data(statList, dValue, kind, action, 
total_count):
 usersString += statList['people'][i2]['name'] + ' ( ' + 
str(i1) + ' ) 
'
 else:
 break
-except:
+except Exception:
 if i2 == 'UNKNOWN':
 continue
 usersString += i2 + ' ( ' + str(i1) + ' ) 
'
@@ -383,7 +383,6 @@ def util_print_QA_line_data(statList, dValue, kind, action, 
total_count):
 
 if 'difftime' in dValue and dValue['difftime']:
 sortList = sorted(dValue['difftime'])
-rangeList = sortList[-1] - sortList[0]
 subLists = {}
 for i in sortList:
 timePeriod = ''
diff --git a/qa/createBlogReport.py b/qa/createBlogReport.py
index c8276938..111e36ee 100755
--- a/qa/createBlogReport.py
+++ b/qa/createBlogReport.py
@@ -11,7 +11,6 @@ import common
 import math
 from datetime import datetime, timedelta
 
-import matplotlib
 import matplotlib.pyplot as plt
 
 lKeywords = ['havebacktrace', 'regression', 'bisected']
@@ -104,11 +103,6 @@ def analyze_bugzilla_data(statList, bugzillaData, cfg):
 unconfirmedCountPerDay[actionDay] = 0
 unconfirmedCountPerDay[actionDay] += 1
 
-rowStatus = row['status']
-rowResolution = row['resolution']
-
-rowKeywords = row['keywords']
-
 creatorMail = row['creator']
 
 #get information about created bugs in the period of time
@@ -514,7 +508,7 @@ def createPlot(valueDict, plotType, plotTitle, plotLabel, 
plotColor):
 plt.xticks(range(len(x)), x, rotation=90)
 plt.title(plotTitle)
 plt.xlabel("Date")
-plt.legend();
+plt.legend()
 ax = plt.gca()
 ax.grid(axis="y", linestyle='--')
 #Remove labels depending on number of elements
diff --git a/qa/createWeeklyReport.py b/qa/createWeeklyReport.py
index b446f08d..0c36246d 100755
--- a/qa/createWeeklyReport.py
+++ b/qa/createWeeklyReport.py
@@ -67,8 +67,6 @@ def analyze_bugzilla_weeklyReport(statList, bugzillaData, 
cfg):
 
 rowKeywords = row['keywords']
 
-crashSignature = row['cf_crashreport']
-
 for action in row['history']:
 actionMail = action['who']
 actionDate = datetime.datetime.strptime(action['when'], 
"%Y-%m-%dT%H:%M:%SZ")
diff --git a/qa/createWikiStats.py b/qa/createWikiStats.py
index c7550e35..b95c5098 100755
--- a/qa/createWikiStats.py
+++ b/qa/createWikiStats.py
@@ -181,7 +181,6 @@ def analyze_bugzilla_wiki_stats(statList, bugzillaData, 
cfg):
 
 if change['field_name'] == 'status':
 addedStatus = change['added']
-removedStatus = change['removed']
 
 if  addedStatus == 'RESOLVED' or addedStatus == 
'VERIFIED':
 if(rowResolution):
@@ -217,7 +216,6 @@ def analyze_bugzilla_wiki_stats(statList, bugzillaData, 
cfg):
 util_increase_user_actions(statList, key, 
actionMail, bugTargets, 'keyword_removed', actionDate)
 
 elif change['field_name'] == 'op_sys':
-newSystem = change['added']
 util_increase_user_actions(statList, rowId, 
actionMail, bugTargets, 'system_changed', a

core.git: odk/examples

[Ilmari Lauhakangas (via logerrit)]

 odk/examples/python/Spreadsheet/EuroAdaption.py |   12 
 odk/examples/python/Spreadsheet/SCalc.py|6 --
 2 files changed, 18 deletions(-)

New commits:
commit 4058ca814a794cc80a4ebb2089df95798b2de85e
Author: Ilmari Lauhakangas 
AuthorDate: Wed Jul 17 18:24:25 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Wed Jul 17 19:39:56 2024 +0200

tdf#158803 related: remove unnecessary comments

Change-Id: I25093100db0473bb907036b4f80e1bbc440cfb8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170639
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/odk/examples/python/Spreadsheet/EuroAdaption.py 
b/odk/examples/python/Spreadsheet/EuroAdaption.py
index 920af8650581..594fdc9d7113 100644
--- a/odk/examples/python/Spreadsheet/EuroAdaption.py
+++ b/odk/examples/python/Spreadsheet/EuroAdaption.py
@@ -25,8 +25,6 @@ def get_desktop():
 print("Can't create a desktop. No connection, no remote office 
servicemanager available!")
 else:
 desktop = 
srv_mgr.createInstanceWithContext("com.sun.star.frame.Desktop", remote_context)
-# removing bare except: and handling it similar to the try/except already
-# committed in './SCalc.py'
 except Exception as e:
 print(f"Failed to get desktop: {e}")
 traceback.print_exc()
@@ -50,8 +48,6 @@ def get_number_format_key(number_formats, format: str, 
language) -> int:
 # If not exist, create a new one
 if (key := number_formats.addNew(format, language)) == -1:
 key == 0
-# removing bare except: and handling it similar to the try/except already
-# committed in './SCalc.py'
 except Exception as e:
 print(f"Failed to get key: {e}")
 traceback.print_exc()
@@ -79,8 +75,6 @@ def create_example_data(sheet, number_formats):
 cell.NumberFormat = number_format_key
 cell_range = sheet[counter + 1:counter + 2, 2:3]
 cell_range.NumberFormat = number_format_key
-# removing bare except: and handling it similar to the try/except already
-# committed in './SCalc.py'
 except Exception as e:
 print(f"Failed to create example data: {e}")
 traceback.print_exc()
@@ -128,8 +122,6 @@ def convert(sheet, number_formats, old_symbol: str, 
new_symbol: str, factor: flo
 if sheet_cell_ranges.getCount() > 0:
 for cell in sheet_cell_ranges.getCells():
 cell.Value = cell.Value / factor
-# removing bare except: and handling it similar to the try/except already
-# committed in './SCalc.py'
 except Exception as e:
 print(f"Failed to convert currency: {e}")
 traceback.print_exc()
@@ -143,8 +135,6 @@ def main():
 try:
 doc = desktop.loadComponentFromURL("private:factory/scalc", "_blank", 
0, tuple())
 print("Create a new Spreadsheet")
-# removing bare except: and handling it similar to the try/except already
-# committed in './SCalc.py'
 except Exception as e:
 print(f"Failed to load component from URL: {e}")
 traceback.print_exc()
@@ -156,8 +146,6 @@ def main():
 
 try:
 sheet = doc.Sheets[0]
-# removing bare except: and handling it similar to the try/except already
-# committed in './SCalc.py'
 except Exception as e:
 print(f"Failed to get sheet: {e}")
 traceback.print_exc()
diff --git a/odk/examples/python/Spreadsheet/SCalc.py 
b/odk/examples/python/Spreadsheet/SCalc.py
index 91e256a64fcc..b77482c7401b 100644
--- a/odk/examples/python/Spreadsheet/SCalc.py
+++ b/odk/examples/python/Spreadsheet/SCalc.py
@@ -36,8 +36,6 @@ def main():
 desktop = srv_mgr.createInstanceWithContext(
 "com.sun.star.frame.Desktop", remote_context
 )
-# removing bare except: and handling it similar to the try/except already
-# committed in other parts of this script
 except Exception as e:
 print(f"Couldn't get Sheet: {e}")
 traceback.print_exc()
@@ -52,8 +50,6 @@ def main():
 doc_url = "private:factory/scalc"
 try:
 doc = desktop.loadComponentFromURL(doc_url, "_blank", 0, tuple())
-# removing bare except: and handling it similar to the try/except already
-# committed in other parts of this script
 except Exception as e:
 print(f"Couldn't get Sheet: {e}")
 traceback.print_exc()
@@ -76,8 +72,6 @@ def main():
 cell_styles["My Style2"] = cell_style
 cell_style.IsCellBackgroundTransparent = False
 cell_style.CellBackColor = 13421823
-# removing bare except: and handling it similar to the try/except already
-# committed in other parts of this script
 except Exception as e:
 print(f"Couldn't get Sheet: {e}")
 traceback.print_exc()

Re: Translation of Release Notes 24.8

[Ilmari Lauhakangas]

On 16.7.2024 16.07, Laurent Balland wrote:

Hello,

I am translating in French the Release Notes 24.8 [1]. I have some 
interrogations about :


  * ODF Wholesome Encryption [2]: it is the same text as for Release
Notes 24.2 [3]. Is it done on purpose or a copy-paste error?


Looks like added with the message "add encryption again, because it's 
now the default" in 
https://wiki.documentfoundation.org/index.php?title=ReleaseNotes%2F24.8&type=revision&diff=753029&oldid=752788


So seems to be on purpose.

Ilmari

dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-automate.py esc-reporting/esc-collect.py esc-reporting/esc-report.py esc-reporting/esc-tocsv.py esc-reporting/license-analyze.py

[Ilmari Lauhakangas (via logerrit)]

 esc-reporting/esc-analyze.py |   36 +-
 esc-reporting/esc-automate.py|1 
 esc-reporting/esc-collect.py |   45 
 esc-reporting/esc-report.py  |   62 ++-
 esc-reporting/esc-tocsv.py   |   11 +-
 esc-reporting/license-analyze.py |   14 ++--
 6 files changed, 53 insertions(+), 116 deletions(-)

New commits:
commit 2b6eaae44ac519ffd5f0236ca5089ff4149e8e69
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jul 12 13:33:15 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Jul 16 12:30:51 2024 +0200

esc-reporting: fix issues found by Ruff linter

remove unused method DUMP_report()

Change-Id: I42b5e6716b6815fb3465e33d59c074e170116f1f
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/170404
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 8289fceb..d2ac1c8e 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -46,13 +46,9 @@
 
 import common
 import sys
-import csv
-import io
 import os
-import operator
 import datetime
 import json
-import xmltodict
 import re
 import gzip
 from shutil import copyfile
@@ -138,7 +134,7 @@ def util_build_period_stat(xDate, email, base, 
peopleTarget=None, dataTarget=Non
 
 def util_load_data_file(fileName):
 rawList = util_load_file(fileName)
-if rawList == None:
+if rawList is None:
   exit(-1)
 return rawList
 
@@ -263,7 +259,7 @@ def util_check_mail(name, xmail):
 
 if mail in statList['aliases']:
   mail = statList['aliases'][mail]
-if not mail in statList['people']:
+if mail not in statList['people']:
   statList['people'][mail] = util_create_person_gerrit(name, mail)
   if mail == '*dummy*':
 statList['people'][mail]['licenseOK'] = True
@@ -277,10 +273,10 @@ def util_check_mail(name, xmail):
 def util_build_diff(newList, oldList):
 result = {}
 for i in newList:
-  if not i in oldList:
+  if i not in oldList:
 oldList[i] = newList[i]
   if type(newList[i]) is dict:
-if not type(oldList[i]) is dict:
+if type(oldList[i]) is not dict:
   result[i] = 0
 else:
   result[i] = util_build_diff(newList[i], oldList[i])
@@ -383,7 +379,7 @@ def analyze_mentoring():
 statNewDate = cfg['1yearDate']
 statOldDate = cfg['nowDate']
 for key, row in bugzillaData['bugs'].items():
-  if row['status'] == 'RESOLVED' or row['status'] == 'VERIFIED' or not 
'easyHack' in row['keywords']:
+  if row['status'] == 'RESOLVED' or row['status'] == 'VERIFIED' or 
'easyHack' not in row['keywords']:
 continue
 
   xDate = datetime.datetime.strptime(row['last_change_time'], 
"%Y-%m-%dT%H:%M:%SZ")
@@ -427,7 +423,7 @@ def analyze_ui():
   if xDate > cfg['cutDate']:
 continue
 
-  if not 'topicUI' in row['keywords'] and not 'needsUXEval' in 
row['keywords']:
+  if 'topicUI' not in row['keywords'] and 'needsUXEval' not in 
row['keywords']:
 continue
 
   for change in row['comments']:
@@ -594,7 +590,7 @@ def analyze_esc():
 fixer = statList['aliases'][fixer]
   if fixer in statList['people']:
 fixer = statList['people'][fixer]['name']
-  if not fixer in bug_fixers:
+  if fixer not in bug_fixers:
 bug_fixers[fixer] = 0
   bug_fixers[str(fixer)] += 1
 
@@ -603,7 +599,7 @@ def analyze_esc():
 confirmer = statList['aliases'][confirmer]
   if confirmer in statList['people']:
 confirmer = statList['people'][confirmer]['name']
-  if not confirmer in bug_confirmers:
+  if confirmer not in bug_confirmers:
 bug_confirmers[confirmer] = 0
   bug_confirmers[str(confirmer)] += 1
 
@@ -665,7 +661,6 @@ def analyze_reports():
 
 print("reports: analyze", flush=True)
 mailedDate = cfg['3monthDate'] - datetime.timedelta(days=90)
-zeroDate = datetime.datetime(year=2001, month=1, day=1)
 statList['reportList'] = {'award_1st_email': [],
   'pending_license': [],
   'missing_license': [],
@@ -698,7 +693,7 @@ def analyze_reports():
 automateList['mail']['we_miss_you_email'][entry['email']] = 
entry['name']
 automateData['reminde

core.git: testtools/source

[Ilmari Lauhakangas (via logerrit)]

 testtools/source/bridgetest/pyuno/core.py |  238 +-
 testtools/source/bridgetest/pyuno/impl.py |   24 +-
 testtools/source/bridgetest/pyuno/importer.py |   18 -
 3 files changed, 140 insertions(+), 140 deletions(-)

New commits:
commit 64021a103945f8c77787b7281192643002712b1e
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jul 12 11:11:03 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jul 12 15:18:35 2024 +0200

PyUNO bridgetest: adapt to alias removals in unittest module and

fix syntax errors

Change-Id: I7e853ba25fd0b541ea7d2770335810b2d9dcb207
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170399
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/testtools/source/bridgetest/pyuno/core.py 
b/testtools/source/bridgetest/pyuno/core.py
index c56e9f144df8..5c0edef8 100644
--- a/testtools/source/bridgetest/pyuno/core.py
+++ b/testtools/source/bridgetest/pyuno/core.py
@@ -107,24 +107,24 @@ class TestCase( unittest.TestCase):
  self.tobj.Sequence = (self.testElement,self.testElement2)
 
   def testBaseTypes(self):
-  self.failUnless( 42 == self.tobj.Long , "Long attribute" )
-  self.failUnless( 41 == self.tobj.ULong , "ULong attribute" )
-  self.failUnless( 43 == self.tobj.Byte , "Byte attribute" )
-  self.failUnless( 44 == self.tobj.UShort , "UShort attribute" )
-  self.failUnless( -42 == self.tobj.Short , "Short attribute" )
-  self.failUnless( 46 == self.tobj.Hyper , "Hyper attribute" )
-  self.failUnless( 47 == self.tobj.UHyper , "UHyper attribute" )
-  self.failUnless( self.tobj.Bool , "Bool attribute2" )
-  self.failUnless( "yabadabadoo" == self.tobj.String , "String 
attribute" )
-  self.failUnless( self.tobj.Sequence[0] == self.testElement , 
"Sequence test")
-  self.failUnless( self.tobj.Sequence[1] == self.testElement2 , 
"Sequence2 test")
-  self.failUnless( equalsEps( 4.3,self.tobj.Float,0.0001) , "float 
test" )
-  self.failUnless( 4.2 == self.tobj.Double , "double test" )
-  self.failUnless( self.ctx == self.tobj.Interface , 
+  self.assertTrue( 42 == self.tobj.Long , "Long attribute" )
+  self.assertTrue( 41 == self.tobj.ULong , "ULong attribute" )
+  self.assertTrue( 43 == self.tobj.Byte , "Byte attribute" )
+  self.assertTrue( 44 == self.tobj.UShort , "UShort attribute" )
+  self.assertTrue( -42 == self.tobj.Short , "Short attribute" )
+  self.assertTrue( 46 == self.tobj.Hyper , "Hyper attribute" )
+  self.assertTrue( 47 == self.tobj.UHyper , "UHyper attribute" )
+  self.assertTrue( self.tobj.Bool , "Bool attribute2" )
+  self.assertTrue( "yabadabadoo" == self.tobj.String , "String 
attribute" )
+  self.assertTrue( self.tobj.Sequence[0] == self.testElement , 
"Sequence test")
+  self.assertTrue( self.tobj.Sequence[1] == self.testElement2 , 
"Sequence2 test")
+  self.assertTrue( equalsEps( 4.3,self.tobj.Float,0.0001) , "float 
test" )
+  self.assertTrue( 4.2 == self.tobj.Double , "double test" )
+  self.assertTrue( self.ctx == self.tobj.Interface ,
   "object identity test with C++ object" )
-  self.failUnless( not self.ctx == self.tobj , "object not identical 
test " )
-  self.failUnless( 42 == self.tobj.transportAny( 42 ), "transportAny 
long" )
-  self.failUnless( "woo, this is python" == self.tobj.transportAny( 
"woo, this is python" ), \
+  self.assertTrue( not self.ctx == self.tobj , "object not identical 
test " )
+  self.assertTrue( 42 == self.tobj.transportAny( 42 ), "transportAny 
long" )
+  self.assertTrue( "woo, this is python" == self.tobj.transportAny( 
"woo, this is python" ), \
   "string roundtrip via any test"  )

   def testEnum( self ):
@@ -132,45 +132,45 @@ class TestCase( unittest.TestCase):
   e2 = uno.Enum( "com.sun.star.uno.TypeClass" , "LONG" )
   e3 = uno.Enum( "com.sun.star.uno.TypeClass" , "UNSIGNED_LONG" )
   e4 = uno.Enum( "test.testtools.bridgetest.TestEnum" , "TWO" )
-  self.failUnless( e1 == e2 , "equal enum test" )
-  self.failUnless( not (e1 == e3) , "different enums test" )
-  self.failUnless( self.tobj.transportAny( e3 ) == e3, "enum roundtrip 
test" 

dev-tools.git: build-analysis/parse-scp2.py

[Ilmari Lauhakangas (via logerrit)]

 build-analysis/parse-scp2.py |   26 +++---
 1 file changed, 15 insertions(+), 11 deletions(-)

New commits:
commit dbc32eae23589e552ecf2ff5bf2dad7a51402e6f
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jul 12 12:48:15 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jul 12 11:49:41 2024 +0200

build-analysis: fix issues found by Ruff linter

Change-Id: I7e789704ff294e533c388653f86d03e6a8646e78
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/170401
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/build-analysis/parse-scp2.py b/build-analysis/parse-scp2.py
index 98b1b9c4..a0071812 100755
--- a/build-analysis/parse-scp2.py
+++ b/build-analysis/parse-scp2.py
@@ -26,7 +26,11 @@
 #
 
 
-import sys, os, os.path, optparse, subprocess
+import sys
+import os
+import os.path
+import optparse
+import subprocess
 
 arg_desc = ""
 
@@ -287,7 +291,7 @@ class Scp2Parser(object):
 nodetree[name] = LinkedNode(name)
 
 nodetree[parentID].children.append(nodetree[name])
-if nodetree[name].parent != None:
+if nodetree[name].parent is not None:
 raise ParseError("parent node instance already exists for 
'%s'"%name, 1)
 nodetree[name].parent = nodetree[parentID]
 
@@ -314,7 +318,7 @@ class Scp2Parser(object):
 nodetree[parentID] = LinkedNode(parentID)
 
 nodetree[parentID].children.append(nodetree[name])
-if nodetree[name].parent != None:
+if nodetree[name].parent is not None:
 raise ParseError("parent node instance already exists for 
'%s'"%name, 1)
 nodetree[name].parent = nodetree[parentID]
 
@@ -400,7 +404,7 @@ class XMLFunc:
 """CamelCase to camel-case"""
 s = ''
 n = len(name)
-for i in xrange(0, n):
+for i in range(0, n):
 c = name[i]
 if 'A' <= c and c <= 'Z':
 if i > 0:
@@ -581,7 +585,7 @@ class Scp2Processor(object):
 
 parent_dir_name = nodedata['Dir']
 
-while parent_dir_name != None:
+while parent_dir_name is not None:
 
 if parent_dir_name == 'PREDEFINED_PROGDIR':
 # special directory name
@@ -613,7 +617,7 @@ class Scp2Processor(object):
 
 indent = ''*level
 
-if node == None:
+if node is None:
 return
 
 if not self.nodedata.has_key(node.name):
@@ -709,7 +713,7 @@ class OOLstParser(object):
 keys.sort()
 for key in keys:
 s += "%s"%key
-if attrs[key] != None:
+if attrs[key] is not None:
 s += " = %s"%attrs[key]
 else:
 s += " ="
@@ -733,7 +737,7 @@ class OOLstParser(object):
 self.ns = [] # namespace stack
 n = len(lines)
 self.last = None
-for i in xrange(0, n):
+for i in range(0, n):
 words = lines[i].split()
 if len(words) == 0:
 # empty line
@@ -743,7 +747,7 @@ class OOLstParser(object):
 # new scope begins
 if len(words) != 1:
 raise _Error("{ is followed by a token.", 1)
-if self.last == None:
+if self.last is None:
 raise _Error("fail to find a namespace token in the 
previous line.", 1)
 if len(self.last) != 1:
 raise _Error("line contains multiple tokens when only one 
token is expected.", 1)
@@ -765,7 +769,7 @@ class OOLstParser(object):
 self.last = words
 
 def __check_last_line (self):
-if self.last == None or len(self.last) == 0:
+if self.last is None or len(self.last) == 0:
 return
 
 if self.last[0] in '{}':
@@ -808,7 +812,7 @@ if __name__ == '__main__':
 
 options, args = parser.parse_args()
 
-if not options.mode in ['tree', 'flat']:
+if options.mode not in ['tree', 'flat']:
 error("unknown output mode '%s'"%options.mode)
 sys.exit(1)
 

dev-tools.git: lionss/lionss.py update-stats-geoip/compiler.py

[Ilmari Lauhakangas (via logerrit)]

 lionss/lionss.py   |4 ++--
 update-stats-geoip/compiler.py |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c7339632d8fba48f1e89a99c3ab7abb0208f0c2d
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jul 12 12:29:07 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jul 12 11:30:00 2024 +0200

Fix syntax errors in lionss and update-stats-geoip

Change-Id: Ieaaf2f8e6fe9cae376c2d78781234fa5c4917654
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/170400
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/lionss/lionss.py b/lionss/lionss.py
index ff82476f..12730b70 100644
--- a/lionss/lionss.py
+++ b/lionss/lionss.py
@@ -99,8 +99,8 @@ class pick:
 raise web.seeother(grok_url)
 
 if __name__ == "__main__":
-   web.config.debug = True
-   app = web.application(urls, globals())
+web.config.debug = True
+app = web.application(urls, globals())
 app.run()
 else:
 web.config.debug = False
diff --git a/update-stats-geoip/compiler.py b/update-stats-geoip/compiler.py
index 7192b3e9..b74f2448 100755
--- a/update-stats-geoip/compiler.py
+++ b/update-stats-geoip/compiler.py
@@ -64,7 +64,7 @@ config.read('storage-' + sPrefix + '/compiler.cfg')
 if config.has_option('Main', 'last_year'):
 currentFileDate = datetime.date(int(config.get('Main', 'last_year')), 
int(config.get('Main', 'last_month')), int(config.get('Main', 'last_day')))
 else:
-currentFileDate = datetime.date(2012,04,27)
+currentFileDate = datetime.date(2012,4,27)
 
 def getCurrentFileName():
 return "data/" + "update.libreoffice.org-access_log-" + 
currentFileDate.strftime("%Y%m%d") + ".bz2"

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit df9055254c0db96f3233a952fca9b167907c186c
Author: Ilmari Lauhakangas 
AuthorDate: Wed Jul 10 17:51:15 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Wed Jul 10 16:51:15 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 33ffaf1eaac11bb5770eadce49fac96a4ae4ba86
  - tdf#160197 remove mention of removed GetLocale BASIC function

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

diff --git a/helpcontent2 b/helpcontent2
index c2abcb72746a..33ffaf1eaac1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c2abcb72746a4354ff3e13aa8343c3f123ebc763
+Subproject commit 33ffaf1eaac11bb5770eadce49fac96a4ae4ba86

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/sbasic/shared/03/lib_tools.xhp |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 33ffaf1eaac11bb5770eadce49fac96a4ae4ba86
Author: Ilmari Lauhakangas 
AuthorDate: Wed Jul 10 16:10:24 2024 +0300
Commit: Olivier Hallot 
CommitDate: Wed Jul 10 16:51:14 2024 +0200

tdf#160197 remove mention of removed GetLocale BASIC function

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

diff --git a/source/text/sbasic/shared/03/lib_tools.xhp 
b/source/text/sbasic/shared/03/lib_tools.xhp
index 0c1c3916fe..23817da191 100644
--- a/source/text/sbasic/shared/03/lib_tools.xhp
+++ b/source/text/sbasic/shared/03/lib_tools.xhp
@@ -372,12 +372,6 @@
 
 Function IsFatOffice() As Boolean
 
-GetLocale
-
-Function GetLocale(
-sLanguage as String, 
-sCountry as String)
-
 ToggleDesignMode
 
 Sub ToggleDesignMode(oDocument as Object)

Re: CairoSDPR status

[Ilmari Lauhakangas]

On 9.7.2024 23.31, Michael Meeks wrote:
PatternFill: It sometimes feels slow, but it's NOT the rendering, but 
the HitTest using Primitives when moving the mouse hovering: Needs to 
directly support FillGraphicPrimitive2D instead of using the decompose.


It reminds me of this recent comment 
https://bugs.documentfoundation.org/show_bug.cgi?id=158397#c17


"The real problem is in the drawinglayer module. From the following 
debug patch, it is clear to me that 
drawinglayer::processor2d::HitTestProcessor2D::process() actually 
redraws the entire image object on every single mouse event (click or 
move) which, seems very strange when the code in the following debug 
patch is just trying to do a hit test."


Ilmari

Re: Commit 5bf587 breaks build on Debian 12

[Ilmari Lauhakangas]

On 6.7.2024 16.42, Etna - wrote:
Hi, commit 5bf587, which bumps the GTK4 requirements to GTK 4.10, breaks 
building on Debian 12 because Debian 12 only ships with GTK 4.8.


The relevant change is at https://gerrit.libreoffice.org/c/core/+/169324 



Will it be possible to please rollback this particular commit? Debian 12 
still has a very long life left.


Can you confirm that this only happens with the build option

--enable-gtk4

At the moment, the GTK4 UI backend is still experimental.

Ilmari

Re: GSoC: Libreoffice Theme WIN (failed on ->./autogen.sh failed, visual-studio not found)

[Ilmari Lauhakangas]

Did you remember to add to your autogen.input

--with-visual-studio=2022

Ilmari

On 29.6.2024 22.19, Sahil Gautam wrote:

Hi,
So I was setting up Libreoffice Dev on windows (Yes, windows), I was following 
the
LODE guide from the wiki. I faced this error while running ./autogen.sh

checking whether build should auto use hardening compiler flags... no   
  checking whether to build a Community flavor... yes   
checking whether to sign windows build... 
no  checking for gawk... gawk   
  checking for 
gawk... /usr/bin/gawk   
 checking for bash... /bin/sh   
   checking for pigz... no  
 checking for gzip... /usr/bin/gzip 
   checking for GNU or BSD tar... tar   
 checking for tar's 
option to strip components... --strip-components   
checking how to build and package galleries... internal src images for desktop  
  checking build with or without template files... enable all 
templates checking for ccache... not found  
checking for sccache... 
(cached) not foundchecking 
whether to build with .NET support... yes   
 checking for dotnet... no  
   checking whether to build with Java support... yes   
 checking whether to treat the installation as 
read-only... no checking Visual C++... checking 
VC++ Build Tools and similar... configure: error: no Visual Studio installation 
found   
Error running configure at ./autogen.sh line 321.

I will try one more time, and If I get some success, then I will  write a 
followup.
Also I Installed visual studio 2022 community (this is what I found on the 
first few links.
on a google search)

On 28-06-2024 10:37, Sahil Gautam wrote:
Hi, I missed the email for the last week, sorry for that. So the patch 
for gtk was pushed, and the one for QT will be out by tommorrow(+1 
day). I spent quite some time with QStyle trying to get it to paint 
the UI elements, which complicated stuff, and took a lot of time, 
where it was just palette manipulation (mostly). Also I found that we 
handle the menubar separately, and it's not drawn via 
drawNativeControl(...). What is left for QT: - color customization for 
menus (menubar/window/button/etc done) - adding a listener for instant 
redraw - And some improvements on the GTK patch (on color coverage). 
Then I will start with windows vcl plugin. Can't say, but I would be 
very happy if I get done with windows vcl plugin before the mid term 
evaluation. In this time I tried setting up macos VM as well, and 
using quickget (as suggested by Ilmari), it was quite simple. (Though 
it took years to install neovim via brew, and I had to C^c it every 
time) Regards Sahil Gautam

On 6/11/24 11:44 PM, Sahil Gautam wrote:

Hi, so the issue has been 
resolved,https://gerrit.libreoffice.org/c/core/+/168016/comment/b977e358_def16582/
[Rafael's comment on missing registry entry for LoadDefaultSystemColors]. Now 
it loads the default colors
into the registry once (as expected).
On 6/11/24 4:04 AM, Sahil Gautam wrote:

Hi
went through the design of data flow this week. I found myself running away 
from the VCL
and it's colors, or rather from the question of "how to get 2 way exchange of colors 
working".

https://gerrit.libreoffice.org/c/core/+/168016  Here's the patch [WIP]

There is quite some information to keep in the head, I would try to briefly 
describe it.

- So we get colors out of the widget toolkits using the updateSettings() 
functions.
- We have ColorConfig() which gives access to the ExpertConfiguration colors 
(or colors in the registry).
- We cannot access ColorConfig inside updateSettings() functions in the VCL 
(because vcl can't depend on svt).

My plan was to (and still is) to load the registry colors in the StyleSettings 
object when ColorConfig is
created (in the constructor), and mark a flag in the StyleSettings that the 
Theme is Loaded.
Note that I want to keep the ThemeColors object and the bLoaded flag as static 
in the StyleSettings.
The reasons are:

a) this feels right, as the ThemeColors are object independent and depend only 
on the ExpertConfiguration.
b) this way, I evade the various SetStyleSettings() calls. Otherwise, at the 
end, there would 

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

[Ilmari Lauhakangas (via logerrit)]

 sc/source/ui/formdlg/dwfunctr.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 3bf923428f75506e16a99805c00c1cc8eff28f40
Author: Ilmari Lauhakangas 
AuthorDate: Sat Jun 22 22:04:39 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Jun 25 08:10:04 2024 +0200

tdf#161743 Calc Sidebar Functions deck: move focus to document upon

Esc while in empty search field

Change-Id: I7bb6aaeb69712b293c74bfcf34ab65c4869c860c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169352
Tested-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 1f26aa7f42795aed775646cbb616f5ee4e60326c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169442
Reviewed-by: Jim Raykowski 

diff --git a/sc/source/ui/formdlg/dwfunctr.cxx 
b/sc/source/ui/formdlg/dwfunctr.cxx
index 355a820f4f87..96df2105bfbe 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -443,6 +443,20 @@ IMPL_LINK(ScFunctionWin, KeyInputHdl, const KeyEvent&, 
rEvent, bool)
 break;
 case KEY_ESCAPE:
 {
+// Escape in an empty search field should move focus to the 
document,
+// adhering to Sidebar guidelines
+if (m_xSearchString->get_text().isEmpty())
+{
+if (SfxViewShell* pCurSh = SfxViewShell::Current())
+{
+vcl::Window* pShellWnd = pCurSh->GetWindow();
+
+if (pShellWnd)
+pShellWnd->GrabFocusToDocument();
+}
+bHandled = true;
+break;
+}
 m_xSearchString->set_text(u""_ustr);
 UpdateFunctionList(u""_ustr);
 bHandled = true;

core.git: sc/source

[Ilmari Lauhakangas (via logerrit)]

 sc/source/ui/formdlg/dwfunctr.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 1f26aa7f42795aed775646cbb616f5ee4e60326c
Author: Ilmari Lauhakangas 
AuthorDate: Sat Jun 22 22:04:39 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jun 24 17:57:06 2024 +0200

tdf#161743 Calc Sidebar Functions deck: move focus to document upon

Esc while in empty search field

Change-Id: I7bb6aaeb69712b293c74bfcf34ab65c4869c860c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169352
Tested-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/sc/source/ui/formdlg/dwfunctr.cxx 
b/sc/source/ui/formdlg/dwfunctr.cxx
index 690db4c8aac1..504703f3b478 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -443,6 +443,20 @@ IMPL_LINK(ScFunctionWin, KeyInputHdl, const KeyEvent&, 
rEvent, bool)
 break;
 case KEY_ESCAPE:
 {
+// Escape in an empty search field should move focus to the 
document,
+// adhering to Sidebar guidelines
+if (m_xSearchString->get_text().isEmpty())
+{
+if (SfxViewShell* pCurSh = SfxViewShell::Current())
+{
+vcl::Window* pShellWnd = pCurSh->GetWindow();
+
+if (pShellWnd)
+pShellWnd->GrabFocusToDocument();
+}
+bHandled = true;
+break;
+}
 m_xSearchString->set_text(u""_ustr);
 UpdateFunctionList(u""_ustr);
 bHandled = true;

core.git: README.md

[Ilmari Lauhakangas (via logerrit)]

 README.md |4 
 1 file changed, 4 insertions(+)

New commits:
commit a38180b5393e07d55d21bc2d43a8febe574fe240
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jun 13 18:38:02 2024 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jun 13 21:28:53 2024 +0200

README.md: add Python baseline

Change-Id: Iffb83588cead716b009578d0f571f3d9cd2e83d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168818
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins

diff --git a/README.md b/README.md
index b3e4e4a515cd..10627f317145 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,10 @@ exact modules that depend on Java are listed.
 
 The baseline for Java is Java Development Kit (JDK) Version 17 or later.
 
+The baseline for Python is version 3.11. It follows the version available
+in SUSE Linux Enterprise Desktop and the Maintenance Support version of
+Red Hat Enterprise Linux.
+
 If you want to use Clang with the LibreOffice compiler plugins, the minimal
 version of Clang is 12.0.1. Since Xcode doesn't provide the compiler plugin
 headers, you have to compile your own Clang to use them on macOS.

core.git: Branch 'libreoffice-24-2' - helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 23cacb1595347b72eb9d3c15834f2a036e216286
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 4 21:04:04 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 4 20:04:04 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-24-2'
  to 1141bf7d15c24f3e053785dbbc60d8acf22cdc6f
  - tdf#161413 Don't allow note icon SVGs to shrink

Change-Id: I0d760f0e784f3ef2beb0fa9f80fdb52f7222b298
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168411
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins
(cherry picked from commit 1eb2e622fbd81928bc7e8b48f75332c787c01225)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168328
Tested-by: Ilmari Lauhakangas 
    Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index d5b7f6808b44..1141bf7d15c2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d5b7f6808b445825fc80c1f1ec9c1c970a64bf76
+Subproject commit 1141bf7d15c24f3e053785dbbc60d8acf22cdc6f

help.git: Branch 'libreoffice-24-2' - help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1141bf7d15c24f3e053785dbbc60d8acf22cdc6f
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 4 20:22:12 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Jun 4 20:04:03 2024 +0200

tdf#161413 Don't allow note icon SVGs to shrink

Change-Id: I0d760f0e784f3ef2beb0fa9f80fdb52f7222b298
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168411
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins
(cherry picked from commit 1eb2e622fbd81928bc7e8b48f75332c787c01225)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168328
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 969ba50a73..dda3942ac4 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -189,6 +189,9 @@ img[src$=".svg"] {
 .noteicon, .notetext {
 padding:0.3em;
 }
+.noteicon {
+flex-shrink: 0;
+}
 /* Override some Prism.js styles */
 code[class*="language-"], pre[class*="language-"] {
 white-space: pre-wrap;

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit d6607a9d9a3076c1d7c9a3e284631c5f57c24137
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 4 20:55:47 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 4 19:55:47 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1eb2e622fbd81928bc7e8b48f75332c787c01225
  - tdf#161413 Don't allow note icon SVGs to shrink

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

diff --git a/helpcontent2 b/helpcontent2
index b256e08a3162..1eb2e622fbd8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b256e08a31624c1c55894b4f11065c75423af30e
+Subproject commit 1eb2e622fbd81928bc7e8b48f75332c787c01225

help.git: help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1eb2e622fbd81928bc7e8b48f75332c787c01225
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 4 20:22:12 2024 +0300
Commit: Olivier Hallot 
CommitDate: Tue Jun 4 19:55:46 2024 +0200

tdf#161413 Don't allow note icon SVGs to shrink

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

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 969ba50a73..dda3942ac4 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -189,6 +189,9 @@ img[src$=".svg"] {
 .noteicon, .notetext {
 padding:0.3em;
 }
+.noteicon {
+flex-shrink: 0;
+}
 /* Override some Prism.js styles */
 code[class*="language-"], pre[class*="language-"] {
 white-space: pre-wrap;

core.git: Branch 'libreoffice-24-2' - helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit ecc496e8c6cab8bb2f517c7328c18672be800aef
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 4 20:55:20 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 4 19:55:20 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-24-2'
  to d5b7f6808b445825fc80c1f1ec9c1c970a64bf76
  - tdf#161413 Prevent SVGs without width from overflowing the container

Change-Id: Idaf3a4f4d0d286520565623b29bbc186fbfd79d8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168400
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit b256e08a31624c1c55894b4f11065c75423af30e)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168327
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 9870350ad93b..d5b7f6808b44 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9870350ad93b6d2cdbbf037e120a5d9a50ccd919
+Subproject commit d5b7f6808b445825fc80c1f1ec9c1c970a64bf76

help.git: Branch 'libreoffice-24-2' - help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |4 
 1 file changed, 4 insertions(+)

New commits:
commit d5b7f6808b445825fc80c1f1ec9c1c970a64bf76
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 4 12:35:25 2024 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 4 19:55:20 2024 +0200

tdf#161413 Prevent SVGs without width from overflowing the container

Change-Id: Idaf3a4f4d0d286520565623b29bbc186fbfd79d8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168400
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit b256e08a31624c1c55894b4f11065c75423af30e)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168327
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 2a1fb17cb8..969ba50a73 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -126,6 +126,10 @@ pre,
 font-family: var(--font_mono);
 word-wrap: anywhere;
 }
+/* prevent SVGs without width from overflowing the container */
+img[src$=".svg"] {
+max-width: 100%;
+}
 .literal {
 white-space: normal;
 }

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 1d4aa9ab30d97060b7069f844264bf1c9c74837f
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 4 12:37:52 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 4 11:37:52 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to b256e08a31624c1c55894b4f11065c75423af30e
  - tdf#161413 Prevent SVGs without width from overflowing the container

Change-Id: Idaf3a4f4d0d286520565623b29bbc186fbfd79d8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168400
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 0bcda2014376..b256e08a3162 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0bcda201437649d9a6cfc0c7b7875e19c511ea22
+Subproject commit b256e08a31624c1c55894b4f11065c75423af30e

help.git: help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |4 
 1 file changed, 4 insertions(+)

New commits:
commit b256e08a31624c1c55894b4f11065c75423af30e
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 4 12:35:25 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Jun 4 11:37:52 2024 +0200

tdf#161413 Prevent SVGs without width from overflowing the container

Change-Id: Idaf3a4f4d0d286520565623b29bbc186fbfd79d8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168400
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 2a1fb17cb8..969ba50a73 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -126,6 +126,10 @@ pre,
 font-family: var(--font_mono);
 word-wrap: anywhere;
 }
+/* prevent SVGs without width from overflowing the container */
+img[src$=".svg"] {
+max-width: 100%;
+}
 .literal {
 white-space: normal;
 }

core.git: sw/source

[Ilmari Lauhakangas (via logerrit)]

 sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e5e3188165e2e3dd81f5e7ec554fe66f20f7b8fc
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jun 2 18:49:58 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jun 3 08:32:38 2024 +0200

Fix typo

Change-Id: I2901abfb392caba672259c056af7dd53388050ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168350
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx 
b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
index 7bbbf130678c..8a41db78f0ac 100644
--- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
+++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
@@ -164,8 +164,8 @@ void A11yCheckIssuesPanel::ImplDestroy()
 mpBindings->Invalidate(SID_ACCESSIBILITY_CHECK_ONLINE);
 }
 
-for (auto& xExapnder : m_xExpanders)
-xExapnder.reset();
+for (auto& xExpander : m_xExpanders)
+xExpander.reset();
 
 for (auto& xBox : m_xBoxes)
 xBox.reset();

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 71e2d887dcf0947328bac137ad1f3a3e58121310
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jun 2 12:51:44 2024 +0300
Commit: Gerrit Code Review 
CommitDate: Sun Jun 2 11:51:44 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 540ea4b3f6f10a77fc06665de7c550c1eb9df00e
  - Improve example in Advanced Filters

Change-Id: I1773fdfee5cc067551cbf7a7bad06cd705eecedf
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168340
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 692e37447c9a..540ea4b3f6f1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 692e37447c9af746a7c34bfe46a1b78e0b15322d
+Subproject commit 540ea4b3f6f10a77fc06665de7c550c1eb9df00e

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 540ea4b3f6f10a77fc06665de7c550c1eb9df00e
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jun 2 12:44:53 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sun Jun 2 11:51:44 2024 +0200

Improve example in Advanced Filters

Change-Id: I1773fdfee5cc067551cbf7a7bad06cd705eecedf
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168340
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/source/text/scalc/guide/specialfilter.xhp 
b/source/text/scalc/guide/specialfilter.xhp
index bd7229d00b..2361fe194c 100644
--- a/source/text/scalc/guide/specialfilter.xhp
+++ b/source/text/scalc/guide/specialfilter.xhp
@@ -203,14 +203,14 @@
 
 
 
- <16
+ >16
 
 
 
 

   
-  Specify that only rows which 
either have the value January in the Month 
cells OR a value of under 16 in the Standardstandard 
not default, look at U59!!! cells will be displayed.
+  Specify that only rows which 
either have the value January in the Month 
cells OR a value of over 16 in the Standardstandard 
not default, look at U59!!! cells will be displayed.
   Choose Data - More 
Filters - Advanced Filter, and then select the range A20:E22. After 
you click OK, only the filtered rows will be displayed. The other rows will be 
hidden from view.
 
 

core.git: odk/examples

[Ilmari Lauhakangas (via logerrit)]

 odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx  |  
 14 +++-
 odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx  |  
  2 -
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx|  
  2 -
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx|  
  2 -
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx |  
  4 +-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx |  
  4 +-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx |  
  4 +-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx |  
  4 +-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx |  
  2 -
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx |  
 10 +++---
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx |  
 10 +++---
 odk/examples/cpp/counter/counter.cxx|  
  4 +-
 odk/examples/cpp/custompanel/ctp_factory.cxx|  
 14 
 odk/examples/cpp/custompanel/ctp_factory.hxx|  
 14 
 odk/examples/cpp/custompanel/ctp_panel.cxx  |  
 16 +-
 odk/examples/cpp/custompanel/ctp_panel.hxx  |  
 16 +-
 16 files changed, 59 insertions(+), 63 deletions(-)

New commits:
commit aa4188b8a60a46154657013640c0f160b057fa79
Author: Ilmari Lauhakangas 
AuthorDate: Tue May 7 18:14:53 2024 +0300
Commit: Hossein 
CommitDate: Sun May 26 14:31:10 2024 +0200

Remove remaining dynamic exception specifications in odk/examples

as begun in

commit ddcc98fa50dd9d86a60dada4daa00f4d95ffe005
Author: Stephan Bergmann 
Date:   Wed Jul 22 13:41:12 2020 +0200

Remove obsolete dynamic exception specifications from SDK example C++ 
code

Change-Id: I70a799655f7633e255d80e829f12a88a27a3c2f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167289
Tested-by: Jenkins
Reviewed-by: Hossein 

diff --git 
a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx 
b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index 11320c252c34..be2055e9ce99 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -74,7 +74,7 @@ class MyService1Impl
 // other UNO API's in your implementation
 Reference< XComponentContext > m_xContext;
 public:
-inline MyService1Impl(Reference< XComponentContext > const & xContext) 
throw ()
+inline MyService1Impl(Reference< XComponentContext > const & xContext) 
SAL_NOEXCEPT
 : m_refcount( 0 ),
   m_xContext(xContext)
 {}
@@ -83,10 +83,8 @@ public:
 
 // XInterface
 virtual Any SAL_CALL queryInterface( Type const & type );
-virtual void SAL_CALL acquire()
-throw ();
-virtual void SAL_CALL release()
-throw ();
+virtual void SAL_CALL acquire() SAL_NOEXCEPT;
+virtual void SAL_CALL release() SAL_NOEXCEPT;
 // XTypeProvider
 virtual Sequence< Type > SAL_CALL getTypes();
 virtual Sequence< sal_Int8 > SAL_CALL getImplementationId();
@@ -135,15 +133,13 @@ Any MyService1Impl::queryInterface( Type const & type )
 return Any();
 }
 
-void MyService1Impl::acquire()
-throw ()
+void MyService1Impl::acquire() SAL_NOEXCEPT
 {
 // thread-safe incrementation of reference count
 ::osl_atomic_increment( &m_refcount );
 }
 
-void MyService1Impl::release()
-throw ()
+void MyService1Impl::release() SAL_NOEXCEPT
 {
 // thread-safe decrementation of reference count
 if (0 == ::osl_atomic_decrement( &m_refcount ))
diff --git 
a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx 
b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
index eecaec5a3db1..7c1648a2ad8d 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
@@ -78,7 +78,7 @@ class MyService2Impl : public ::cppu::WeakImplHelper3<
 // other UNO API's in your implementation
 Reference< XComponentContext > m_xContext;
 public:
-inline MyService2Impl(Reference< XComponentContext > const & xContext) 
throw ()
+inline MyService2Impl(Reference< XComponentContext > const & xContext) 
SAL_NOEXCEPT
 : m_xContext(xContext)
 {}
 
diff --git 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index a52cb0c86a41..d76bb84122a5 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkelet

Re: Make failed due to multiple definitions in zxing

[Ilmari Lauhakangas]

On 25.5.2024 23.38, Caolán McNamara wrote:

On Sat, 2024-05-25 at 16:12 +0200, Laurent Balland wrote:

After "./g pull -r" and "make distclean && ./autogen.sh && make", I
get the following errors (see attached file).


Did you always build with
--enable-pch=full
before without error? I happen to not typically use it on Linux so I
wonder if that's the difference.


Related comment in an issue last year: 
https://github.com/zxing-cpp/zxing-cpp/issues/685#issuecomment-1868610667


'Only now did I realize that LibreOffice does not use the cmake build 
files provided by zxing-cpp but rolls it's own (ughh) and that was the 
"attack vector" for the precompiled headers change.'


It's weird that there would still be problems as upgrading to ZXing 
2.2.1 should have fixed the issue.


Ilmari

core.git: odk/examples

[Ilmari Lauhakangas (via logerrit)]

 odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java 
   |4 ++--
 odk/examples/DevelopersGuide/Forms/ControlValidator.java   
   |2 +-
 odk/examples/DevelopersGuide/Forms/RowSet.java 
   |2 +-
 odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java   
   |4 ++--
 odk/examples/DevelopersGuide/Forms/WaitForInput.java   
   |2 +-
 
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
 |2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8a73c5725f0ef0494e0a933cbfc22a8f04328ddd
Author: Ilmari Lauhakangas 
AuthorDate: Sun May 12 20:34:09 2024 +0300
Commit: Noel Grandin 
CommitDate: Mon May 13 14:44:47 2024 +0200

odk: classes in java.lang package do not need to be fully qualified

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

diff --git 
a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java 
b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
index 9b55929d870a..c47244b9abbb 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
+++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
@@ -198,7 +198,7 @@ public class AsyncJob extendsWeakBase implements 
XServiceInfo, XAsyncJob
 ++c;
 aDeactivation   = new com.sun.star.beans.NamedValue();
 aDeactivation.Name  = "Deactivate";
-aDeactivation.Value = java.lang.Boolean.TRUE;
+aDeactivation.Value = Boolean.TRUE;
 }
 
 // Sending of result events is useful inside DISPATCH environment only
@@ -284,7 +284,7 @@ public class AsyncJob extendsWeakBase implements 
XServiceInfo, XAsyncJob
 xInfoBox.setMessageText(sMessage);
 xInfoBox.execute();
 }
-catch(java.lang.Throwable exIgnore)
+catch(Throwable exIgnore)
 {
 // ignore any problem, which can occur here.
 // It's not really a bug for this example job, if
diff --git a/odk/examples/DevelopersGuide/Forms/ControlValidator.java 
b/odk/examples/DevelopersGuide/Forms/ControlValidator.java
index c29dec5585ee..c7afdf369aa7 100644
--- a/odk/examples/DevelopersGuide/Forms/ControlValidator.java
+++ b/odk/examples/DevelopersGuide/Forms/ControlValidator.java
@@ -42,7 +42,7 @@ public abstract class ControlValidator implements 
com.sun.star.form.validation.X
 return ( 
com.sun.star.uno.AnyConverter.getType(Value).getTypeClass()
  == com.sun.star.uno.TypeClass.VOID );
 }
-catch( java.lang.ClassCastException e )
+catch( ClassCastException e )
 {
 }
 return false;
diff --git a/odk/examples/DevelopersGuide/Forms/RowSet.java 
b/odk/examples/DevelopersGuide/Forms/RowSet.java
index 93e62cacf088..37eacaefff0c 100644
--- a/odk/examples/DevelopersGuide/Forms/RowSet.java
+++ b/odk/examples/DevelopersGuide/Forms/RowSet.java
@@ -58,7 +58,7 @@ public class RowSet implements XRowSet, XRow
 catch ( Exception e )
 {
 e.printStackTrace(System.err);
-throw new java.lang.InstantiationError();
+throw new InstantiationError();
 }
 }
 
diff --git a/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java 
b/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java
index 23a9e4226231..c1464c4b1ae3 100644
--- a/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java
+++ b/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java
@@ -37,7 +37,7 @@ import com.sun.star.text.XTextRange;
 content to other interested parties.
 */
 public class TableCellTextBinding
-extends java.lang.Thread
+extends Thread
 implements  com.sun.star.form.binding.XValueBinding,
 com.sun.star.util.XModifyBroadcaster
 {
@@ -95,7 +95,7 @@ public class TableCellTextBinding
 {
 text = (String)obj;
 }
-catch( java.lang.ClassCastException e )
+catch( ClassCastException e )
 {
 throw new com.sun.star.form.binding.IncompatibleTypesException();
 }
diff --git a/odk/examples/DevelopersGuide/Forms/WaitForInput.java 
b/odk/examples/DevelopersGuide/Forms/WaitForInput.java
index e5891ada4afd..b05544f1fb4f 100644
--- a/odk/examples/DevelopersGuide/Forms/WaitForInput.java
+++ b/odk/examples/DevelopersGuide/Forms/WaitForInput.java
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-class WaitForInput extends java.lang.Thread
+class WaitForInput extends Thread
 {

Re: Windows build broken.

[Ilmari Lauhakangas]

On 13.5.2024 11.09, Regis Perdreau wrote:


Hi,

I follow carefully again windows build instruction wiki, but the windows 
build does not work again. Could you we expect that it will work for 
everybody not only on developper's computer ? (i know it's sometimes 
difficult, but if we could have some news, it's better)


Please share the text output showing how the build fails.

Ilmari

core.git: external/hunspell external/hyphen external/mythes

[Ilmari Lauhakangas (via logerrit)]

 external/hunspell/README |2 +-
 external/hyphen/README   |2 +-
 external/mythes/README   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 75ff14d9cba2fca20d8ff958bdd9f6a931f88333
Author: Ilmari Lauhakangas 
AuthorDate: Sat May 11 14:26:23 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat May 11 13:28:17 2024 +0200

Update Hunspell URL in readmes

Change-Id: Ic1a993029060a1260dffa126a930e29d4135fe61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167506
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/external/hunspell/README b/external/hunspell/README
index 1221735cad65..4ec341fc1414 100644
--- a/external/hunspell/README
+++ b/external/hunspell/README
@@ -1,4 +1,4 @@
 Library for spell checking.
 
 From:
-[http://hunspell.sourceforge.net/].
+[https://hunspell.github.io/].
diff --git a/external/hyphen/README b/external/hyphen/README
index 327b5b6e8954..ec03fb1319ce 100644
--- a/external/hyphen/README
+++ b/external/hyphen/README
@@ -1 +1 @@
-Hyphenator library from [http://hunspell.sourceforge.net]
+Hyphenator library from [https://hunspell.github.io/]
diff --git a/external/mythes/README b/external/mythes/README
index 8a1792ee05b3..1195dee836f7 100644
--- a/external/mythes/README
+++ b/external/mythes/README
@@ -1 +1 @@
-Library for handling thesaurus files from [http://hunspell.sourceforge.net].
+Library for handling thesaurus files from [https://hunspell.github.io/].

core.git: odk/README.md

[Ilmari Lauhakangas (via logerrit)]

 odk/README.md |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 69980bb2f951f780e63718215ca522a69676febf
Author: Ilmari Lauhakangas 
AuthorDate: Wed May 8 11:46:40 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri May 10 07:18:25 2024 +0200

odk/README.md: easy way to build examples on Linux and macOS

Change-Id: Ib511e81830a3e4b83f391d3f2d771dc657ee12b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167333
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/odk/README.md b/odk/README.md
index ee54679bb13c..c6499cf6801d 100644
--- a/odk/README.md
+++ b/odk/README.md
@@ -8,7 +8,9 @@ Part of the SDK; to build you need to add `--enable-odk`.
 
 ## Testing the Examples:
 
-* Go to `instdir/sdk` (Don't try directly in `odk/`)
+* The easiest way on Linux and macOS is to run `make odk.subsequentcheck`
+
+* The way that also works on Windows is to go to `instdir/sdk` (don't try 
directly in `odk/`)
 
 * See <https://api.libreoffice.org/docs/install.html> how to set up the SDK.
 

core.git: odk/examples

[Ilmari Lauhakangas (via logerrit)]

 odk/examples/DevelopersGuide/Database/sdbcx.java |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 3d1a96d85d1a0e54e37cc8cd83c6216709360729
Author: Ilmari Lauhakangas 
AuthorDate: Thu May 9 21:02:06 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri May 10 07:17:35 2024 +0200

odk/examples: grammar and comment fixes

Change-Id: I86174573d9f59135865496a4f3ee5efb86141ffb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167410
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/odk/examples/DevelopersGuide/Database/sdbcx.java 
b/odk/examples/DevelopersGuide/Database/sdbcx.java
index 8d7bcab93a78..e4e53a3db7e9 100644
--- a/odk/examples/DevelopersGuide/Database/sdbcx.java
+++ b/odk/examples/DevelopersGuide/Database/sdbcx.java
@@ -180,7 +180,7 @@ public class sdbcx
 public static void printColumns(XColumnsSupplier xColumnsSup)
 {
 System.out.println("Example printColumns");
-// the table must be at least support a XColumnsSupplier interface
+// the table must at least support a XColumnsSupplier interface
 System.out.println("--- Columns ---");
 XNameAccess xColumns = xColumnsSup.getColumns();
 String [] aColumnNames = xColumns.getElementNames();
@@ -189,7 +189,7 @@ public class sdbcx
 }
 
 // 16. example
-// print all keys inclusive the columns of a key
+// print all keys including the columns of a key
 
 public static void printKeys(XColumnsSupplier xColumnsSup) throws 
com.sun.star.uno.Exception
 {
@@ -211,7 +211,7 @@ public class sdbcx
 }
 
 // 17. example
-// print all keys inclusive the columns of a key
+// print all indexes including the columns of an index
 
 public static void printIndexes(XColumnsSupplier xColumnsSup) throws 
com.sun.star.uno.Exception
 {
@@ -346,29 +346,29 @@ public class sdbcx
 xCol.setPropertyValue("Type",Integer.valueOf(DataType.INTEGER));
 
xCol.setPropertyValue("IsNullable",Integer.valueOf(ColumnValue.NO_NULLS));
 xAppend.appendByDescriptor(xCol);
-// 2nd only set the properties which differs
+// 2nd only set the properties which differ
 xCol.setPropertyValue("Name","FIRSTNAME");
 xCol.setPropertyValue("Type",Integer.valueOf(DataType.VARCHAR));
 
xCol.setPropertyValue("IsNullable",Integer.valueOf(ColumnValue.NULLABLE));
 xCol.setPropertyValue("Precision",Integer.valueOf(50));
 xAppend.appendByDescriptor(xCol);
-// 3nd only set the properties which differs
+// 3rd only set the properties which differ
 xCol.setPropertyValue("Name","LASTNAME");
 xCol.setPropertyValue("Precision",Integer.valueOf(100));
 xAppend.appendByDescriptor(xCol);
-// 4nd only set the properties which differs
+// 4th only set the properties which differ
 xCol.setPropertyValue("Name","STREET");
 xCol.setPropertyValue("Precision",Integer.valueOf(50));
 xAppend.appendByDescriptor(xCol);
-// 5nd only set the properties which differs
+// 5th only set the properties which differ
 xCol.setPropertyValue("Name","STATE");
 xAppend.appendByDescriptor(xCol);
-// 6nd only set the properties which differs
+// 6th only set the properties which differ
 xCol.setPropertyValue("Name","ZIP");
 xCol.setPropertyValue("Type",Integer.valueOf(DataType.INTEGER));
 xCol.setPropertyValue("Precision",Integer.valueOf(10)); // default 
value integer
 xAppend.appendByDescriptor(xCol);
-// 7nd only set the properties which differs
+// 7th only set the properties which differ
 xCol.setPropertyValue("Name","BIRTHDATE");
 xCol.setPropertyValue("Type",Integer.valueOf(DataType.DATE));
 xCol.setPropertyValue("Precision",Integer.valueOf(10)); // default 
value integer

core.git: pyuno/source

[Ilmari Lauhakangas (via logerrit)]

 pyuno/source/loader/pyuno_loader.cxx |   22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit da0e9240bf6505ac3a67ff985705950566c66144
Author: Ilmari Lauhakangas 
AuthorDate: Thu Dec 21 12:01:50 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Thu May 9 09:32:47 2024 +0200

tdf#158447 Use PyConfig for setting Python home directory with Python >= 3.8

Change-Id: Ic5b7c60613b22f5215cb1a2a13fecf3e0946ca49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161089
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Tested-by: Ilmari Lauhakangas 

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index 008d58634947..1e00773761e7 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -114,7 +114,11 @@ static PyRef getObjectFromLoaderModule( const char * func )
 return object;
 }
 
+#if PY_VERSION_HEX >= 0x0308
+static void setPythonHome ( const OUString & pythonHome, PyConfig * config )
+#else
 static void setPythonHome ( const OUString & pythonHome )
+#endif
 {
 OUString systemPythonHome;
 osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) 
);
@@ -138,9 +142,11 @@ static void setPythonHome ( const OUString & pythonHome )
 PyErr_SetString(PyExc_SystemError, "python home path is too long");
 return;
 }
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-Py_SetPythonHome(wide); // deprecated since python 3.11
-SAL_WNODEPRECATED_DECLARATIONS_POP
+#if PY_VERSION_HEX >= 0x0308
+config->home = wide;
+#else
+Py_SetPythonHome(wide);
+#endif
 }
 
 static void prependPythonPath( std::u16string_view pythonPathBootstrap )
@@ -192,11 +198,17 @@ void pythonInit() {
 if ( Py_IsInitialized()) // may be inited by getComponentContext() already
 return;
 
+#if PY_VERSION_HEX >= 0x0308
+PyConfig config;
+#endif
 OUString pythonPath;
 OUString pythonHome;
 OUString path( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("pythonloader.uno" ));
 rtl::Bootstrap::expandMacros(path); //TODO: detect failure
 rtl::Bootstrap bootstrap(path);
+#if PY_VERSION_HEX >= 0x0308
+PyConfig_InitPythonConfig( &config );
+#endif
 
 // look for pythonhome
 bootstrap.getFrom( "PYUNO_LOADER_PYTHONHOME", pythonHome );
@@ -205,7 +217,11 @@ void pythonInit() {
 // pythonhome+pythonpath must be set before Py_Initialize(), otherwise 
there appear warning on the console
 // sadly, there is no api for setting the pythonpath, we have to use the 
environment variable
 if( !pythonHome.isEmpty() )
+#if PY_VERSION_HEX >= 0x0308
+setPythonHome( pythonHome, &config );
+#else
 setPythonHome( pythonHome );
+#endif
 
 if( !pythonPath.isEmpty() )
 prependPythonPath( pythonPath );

core.git: odk/examples

[Ilmari Lauhakangas (via logerrit)]

 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
 |   10 +-
 odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx 
   |8 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 971eb758132994b5dfacf0af456fbb96f1863534
Author: Ilmari Lauhakangas 
AuthorDate: Mon May 6 18:49:34 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue May 7 07:42:35 2024 +0200

odk/examples: grammar fixes

Also remove outdated comment related to RTL_CONSTASCII_STRINGPARAM
(only the first line was removed in the past)

Change-Id: Iebef1bf83ab049a96c846e714cb700df4dacd878
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167233
Tested-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
index 426caaf361b8..943bf623d109 100644
--- 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
+++ 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
@@ -108,7 +108,7 @@ void SAL_CALL Addon::initialize( const Sequence< Any >& 
aArguments )
 
 /**
   * Called by the Office framework.
-  * We are ask to query the given URL and return a dispatch object if the URL
+  * We are asked to query the given URL and return a dispatch object if the URL
   * contains an Add-On command.
   */
 Reference< XDispatch > SAL_CALL Addon::queryDispatch( const URL& aURL, const 
::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags )
@@ -129,7 +129,7 @@ Reference< XDispatch > SAL_CALL Addon::queryDispatch( const 
URL& aURL, const ::r
 
 /**
   * Called by the Office framework.
-  * We are ask to execute the given Add-On command URL.
+  * We are asked to execute the given Add-On command URL.
   */
 void SAL_CALL Addon::dispatch( const URL& aURL, const Sequence < PropertyValue 
>& lArgs )
 {
@@ -159,7 +159,7 @@ void SAL_CALL Addon::dispatch( const URL& aURL, const 
Sequence < PropertyValue >
 
 /**
   * Called by the Office framework.
-  * We are ask to query the given sequence of URLs and return dispatch objects 
if the URLs
+  * We are asked to query the given sequence of URLs and return dispatch 
objects if the URLs
   * contain Add-On commands.
   */
 Sequence < Reference< XDispatch > > SAL_CALL Addon::queryDispatches( const 
Sequence < DispatchDescriptor >& seqDescripts )
@@ -175,7 +175,7 @@ Sequence < Reference< XDispatch > > SAL_CALL 
Addon::queryDispatches( const Seque
 
 /**
   * Called by the Office framework.
-  * We are ask to query the given sequence of URLs and return dispatch objects 
if the URLs
+  * We are asked to query the given sequence of URLs and return dispatch 
objects if the URLs
   * contain Add-On commands.
   */
 void SAL_CALL Addon::addStatusListener( const Reference< XStatusListener >& 
xControl, const URL& aURL )
@@ -184,7 +184,7 @@ void SAL_CALL Addon::addStatusListener( const Reference< 
XStatusListener >& xCon
 
 /**
   * Called by the Office framework.
-  * We are ask to query the given sequence of URLs and return dispatch objects 
if the URLs
+  * We are asked to query the given sequence of URLs and return dispatch 
objects if the URLs
   * contain Add-On commands.
   */
 void SAL_CALL Addon::removeStatusListener( const Reference< XStatusListener >& 
xControl, const URL& aURL )
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx 
b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
index f8bb34f97cd4..7de5d36a2025 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
@@ -59,10 +59,6 @@ SAL_IMPLEMENT_MAIN()
 
 // numbers can be simply appended
 buf.append(M_PI);
-
-// lets the compiler count the stringlength, so this is more efficient than
-// the above appendAscii call, where length of the string must be 
calculated at
-// runtime
 buf.append(" ) multiplied with ");
 buf.append(n);
 buf.append(" gives ");
@@ -70,10 +66,10 @@ SAL_IMPLEMENT_MAIN()
 buf.append(".");
 
 // now transfer the buffer into the string.
-// afterwards buffer is empty and may be reused again !
+// afterwards buffer is empty and may be reused again!
 OUString string = buf.makeStringAndClear();
 
-// I could of course also used the OStringBuffer directly
+// You could of course use the OStringBuffer directly to get an OString
 OString oString = rtl::OUStringToOString(string, 
RTL_TEXTENCODING_ASCII_US);
 
 // just to print something

Gerrit upgrade goodies (3.6 -> 3.8)

[Ilmari Lauhakangas]

Recently TDF's infra team upgraded Gerrit from 3.6 to 3.8, which 
involved quite a bit of wrangling with a new build system. I encourage 
everyone to study the release notes and spot improvements which might 
otherwise fly under the radar:

https://www.gerritcodereview.com/3.7.html
https://www.gerritcodereview.com/3.8.html

If you like to use a dark theme, Gerrit now by default picks it up from 
system preferences and you can control it further via Settings - 
Preferences - Theme.


Some might find the new bulk actions feature useful:
https://www.gerritcodereview.com/3.7.html#bulk-actions-on-search-results-and-dashboard

Not mentioned in the notes, we now see an "(executable)" label in the 
file list of a change for files with that bit set, which helps in 
noticing an unwanted mode change.


Ilmari

core.git: officecfg/registry vcl/source

[Ilmari Lauhakangas (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 +
 vcl/source/app/svapp.cxx   |   34 
++
 2 files changed, 13 insertions(+), 27 deletions(-)

New commits:
commit e1c59fd539222973410dc6adcb8eac4abeeb9e6a
Author: Ilmari Lauhakangas 
AuthorDate: Tue Apr 23 14:02:00 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Apr 25 11:01:17 2024 +0200

Improve documentation on reserved shortcuts

Ctrl+F1 can be dropped from the reserved ones. It used to point to Context
help, but at some point the shortcuts were switched around.

Ctrl+Shift+F6 used to have references "activate splitter" and
SV_SHORTCUT_SPLITTER, but it is not clear what this means. Related to
vcl/source/window/split.cxx perhaps? One guess is that this is related to
StarOffice's Window - Tile feature:

https://www.oreilly.com/library/view/starofficetm-52-calc/013029389X/013029389X_ch02lev1sec8.html

The Ctrl+Shift+F6 shortcut doesn't seem to do anything, so let's drop it
from the reserved ones.

Remove Unix-specific shortcuts Ctrl+Shift+1 through 0, Ctrl+Shift+Plus 
added in
2003 without explanation in commit 2f382d6c2579a25c68dbd121af7f1f5dc7ec9852

Ctrl+Shift+E is no longer used by IBus:
https://github.com/ibus/ibus/commit/b952d30a1b7c741052c168fe1081ecb4d4b1c034
https://github.com/ibus/ibus/commit/1520c39d0d6036da725fcecd932883be3f3d3575

Change-Id: I19766c85871a56c4ba3cebc56e29c99e1f9a8f4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166530
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 56eb20da6bd3..73419dee1102 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -16,9 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
 
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:install="http://openoffice.org/2004/installation"; oor:name="Accelerators" 
oor:package="org.openoffice.Office">
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 72f6afcb3b01..21de9dfc0f16 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -98,31 +98,15 @@ void InitSettings(ImplSVData* pSVData);
 // keycodes handled internally by VCL
 vcl::KeyCode const ReservedKeys[]
 {
-vcl::KeyCode(KEY_F1,0)  ,
-vcl::KeyCode(KEY_F1,KEY_SHIFT)  ,
-vcl::KeyCode(KEY_F1,KEY_MOD1)   ,
-vcl::KeyCode(KEY_F2,KEY_SHIFT)  ,
-vcl::KeyCode(KEY_F4,KEY_MOD1)   ,
-vcl::KeyCode(KEY_F4,KEY_MOD2)   ,
-vcl::KeyCode(KEY_F6,0)  ,
-vcl::KeyCode(KEY_F6,KEY_MOD1)   ,
-vcl::KeyCode(KEY_F6,KEY_SHIFT)  ,
-vcl::KeyCode(KEY_F6,KEY_MOD1|KEY_SHIFT) ,
-vcl::KeyCode(KEY_F10,0)
-#ifdef UNX
-,
-vcl::KeyCode(KEY_1,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_2,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_3,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_4,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_5,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_6,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_7,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_8,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_9,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_0,KEY_SHIFT|KEY_MOD1),
-vcl::KeyCode(KEY_ADD,KEY_SHIFT|KEY_MOD1)
-#endif
+vcl::KeyCode(KEY_F1,0)  , // Help
+vcl::KeyCode(KEY_F1,KEY_SHIFT)  , // Context help
+vcl::KeyCode(KEY_F2,KEY_SHIFT)  , // Activate extended 
tooltips
+vcl::KeyCode(KEY_F4,KEY_MOD1)   , // Close document
+vcl::KeyCode(KEY_F4,KEY_MOD2)   , // Close document
+vcl::KeyCode(KEY_F6,0)  , // Set focus to next 
visible subwindow
+vcl::KeyCode(KEY_F6,KEY_MOD1)   , // Set focus to the 
document canvas/data source
+vcl::KeyCode(KEY_F6,KEY_SHIFT)  , // Set focus to 
previous subwindow
+vcl::KeyCode(KEY_F10,0)   // Activate the 
first menu
 };
 
 extern "C" {

core.git: vcl/source

[Ilmari Lauhakangas (via logerrit)]

 vcl/source/window/split.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7d13e62c3d468bd249db62cfdde14f28f74b3f59
Author: Ilmari Lauhakangas 
AuthorDate: Tue Apr 23 19:39:12 2024 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Apr 23 20:30:46 2024 +0200

tdf#39468 Translate German comments in vcl

Change-Id: I783d924bffddb637eac1a3d89f4ee956955e0044
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166558
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins

diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index df631b270bbf..d25e2b677e36 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -460,10 +460,10 @@ void Splitter::StartDrag()
 
 StartSplit();
 
-// Tracking starten
+// Start tracking
 StartTracking();
 
-// Start-Position ermitteln
+// Determine start position
 maDragPos = mpRefWin->GetPointerPosPixel();
 ImplSplitMousePos( maDragPos );
 if ( mbHorzSplit )

Re: Fix 165948

[Ilmari Lauhakangas]

On 15.4.2024 10.41, Pierre Vacher wrote:

Hi all,

I need your help.I would like cherry pick tdf#156471 
 to 7.6.7


So I created Fix#165948 
, however there are only 
a few days left to validate it.


Thank you if you can validate it.


Julien already gave an explanation in his comment 47 in January. I see 
Mike and Lionel also commented on it in the cherry pick patch. No 
features / enhancements should be pushed to minor releases.


Ilmari

dev-tools.git: scripts/regression-hotspots.py

[Ilmari Lauhakangas (via logerrit)]

 scripts/regression-hotspots.py |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e4c3bf95610bf2995326c0a7a3a2f2a2e9b75c1e
Author: Ilmari Lauhakangas 
AuthorDate: Fri Apr 12 18:19:53 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Apr 12 17:20:35 2024 +0200

regression-hotspots: don't print counts below 10

Change-Id: Ic6b52077bd6a343461aba35640498de1422a18ed
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/166036
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py
index 150cb9bd..5cca55f8 100755
--- a/scripts/regression-hotspots.py
+++ b/scripts/regression-hotspots.py
@@ -52,7 +52,9 @@ def print_counts(counts):
 # wiki page uses a widget to clamp the output while offering a button to 
expand
 print('')
 for count in printorder:
-print('%5d %s' % (count[0], count[1]))
+# we are mainly interested in the hottest spots, so skip counts below 
10
+if count[0] >= 10:
+print('%5d %s' % (count[0], count[1]))
 print('')
 
 if __name__ == '__main__':

dev-tools.git: scripts/regression-hotspots.py

[Ilmari Lauhakangas (via logerrit)]

 scripts/regression-hotspots.py |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9a568801c8d78b4d3faced5afc89fbb2bfd1a21a
Author: Ilmari Lauhakangas 
AuthorDate: Fri Apr 12 13:03:19 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Apr 12 12:04:23 2024 +0200

regression-hotspots: allow tdf1234 style IDs, exclude some components

Change-Id: Id7ab2bd48a3fa1047798d28e102c1d8059eadd17
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/166030
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py
index 27a684fe..150cb9bd 100755
--- a/scripts/regression-hotspots.py
+++ b/scripts/regression-hotspots.py
@@ -19,7 +19,7 @@ from urllib.request import urlopen, URLError
 from io import BytesIO
 
 def get_fixed_regression_bugs():
-url = 
'https://bugs.documentfoundation.org/buglist.cgi?columnlist=&keywords=regression%2C%20&keywords_type=allwords&limit=0&product=LibreOffice&resolution=FIXED&ctype=csv&human=0'
+url = 
'https://bugs.documentfoundation.org/buglist.cgi?f1=component&f2=component&f3=component&f4=component&f5=component&n1=1&n2=1&n3=1&n4=1&n5=1&o1=equals&o2=equals&o3=equals&o4=equals&o5=equals&v1=ci-infra&v2=deletionRequest&v3=FirefoxOS%20app&v4=SI-GUI&v5=WWW&columnlist=&keywords=regression%2C%20&keywords_type=allwords&limit=0&product=LibreOffice&resolution=FIXED&ctype=csv&human=0'
 
 ctx = ssl.create_default_context()
 ctx.check_hostname = False
@@ -63,14 +63,15 @@ if __name__ == '__main__':
 
 # build a dictionary of hashes and bug IDs from all commits targeting a 
report in FDO/TDF Bugzilla
 # (first commit with fdo# aka freedesktop.org is from 1 Oct 2010)
+# sometimes people accidentally leave out the #, so take that into account 
in the regexes
 gitbugs = {}
-buglog = git.Git('.').execute(['git', 'log', '--grep=(fdo|tdf)#', '-E', 
'--oneline', '--since=1.10.2010'])
+buglog = git.Git('.').execute(['git', 'log', '--grep=(fdo|tdf)#*', '-E', 
'--oneline', '--since=1.10.2010'])
 if buglog:
 for line in buglog.split('
'):
 githash = line.partition(' ')[0]
 # the regex search will ignore any commits hit by the grep where 
fdo|tdf# occurred below
 # the first line - this is desirable as the referred bug ID should 
appear in the subject line
-bugid = re.search(r"(?:fdo|tdf)#([0-9]+)", line)
+bugid = re.search(r"(?:fdo|tdf)#*([0-9]+)", line)
 if bugid:
 gitbugs[githash] = int(bugid.group(1))
 

dev-tools.git: scripts/regression-hotspots.py

[Ilmari Lauhakangas (via logerrit)]

 scripts/regression-hotspots.py |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 1e0969a8c1ac9c0cb0a1b30f3de73a11583f20d9
Author: Ilmari Lauhakangas 
AuthorDate: Fri Apr 12 10:11:14 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Apr 12 09:13:30 2024 +0200

regression-hotspots: improve output, exclusions, comments and names

Change-Id: If548e67b7f39b24ccfc78c5d76d18f8fdc90fd80
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/166021
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py
index 8a4fb76d..27a684fe 100755
--- a/scripts/regression-hotspots.py
+++ b/scripts/regression-hotspots.py
@@ -8,7 +8,7 @@
 #
 # Uses https://github.com/gitpython-developers/GitPython
 # Results published in 
https://wiki.documentfoundation.org/Development/RegressionHotspots
-# Run in LibreOffice core directory. Shouldn't take more than a minute.
+# Run in LibreOffice core directory directing output to a text file. Shouldn't 
take more than a minute.
 
 import sys
 import re
@@ -49,16 +49,20 @@ def get_dir_counts(file_counts, level):
 
 def print_counts(counts):
 printorder = reversed(sorted((count, name) for (name, count) in 
counts.items()))
+# wiki page uses a widget to clamp the output while offering a button to 
expand
+print('')
 for count in printorder:
 print('%5d %s' % (count[0], count[1]))
+print('')
 
 if __name__ == '__main__':
 file_counts = {}
-excluderegex = 
re.compile(r'qa/|icon-themes/|extras/source/gallery/|extras/source/palettes/|extras/source/templates/|extras/source/truetype/|helpcontent2|dictionaries|translations|download\.lst|\.png|\.patch')
+excluderegex = 
re.compile(r'qa/|qadevOOo/|icon-themes/|extras/source/gallery/|extras/source/palettes/|extras/source/templates/|extras/source/truetype/|\.git-hooks|helpcontent2|dictionaries|translations|download\.lst|\.png|\.patch')
 fixed_regression_ids = get_fixed_regression_bugs()
 sys.stderr.write('found %d fixed regressions: %s
' % (len(fixed_regression_ids), fixed_regression_ids))
 
 # build a dictionary of hashes and bug IDs from all commits targeting a 
report in FDO/TDF Bugzilla
+# (first commit with fdo# aka freedesktop.org is from 1 Oct 2010)
 gitbugs = {}
 buglog = git.Git('.').execute(['git', 'log', '--grep=(fdo|tdf)#', '-E', 
'--oneline', '--since=1.10.2010'])
 if buglog:
@@ -70,10 +74,10 @@ if __name__ == '__main__':
 if bugid:
 gitbugs[githash] = int(bugid.group(1))
 
-# filter by the bug IDs we got from the Bugzilla query
-regression_hashes = [key for key, value in gitbugs.items() if value in 
fixed_regression_ids]
+# create a list of bug fix hashes by filtering with the bug IDs we got 
from the Bugzilla query
+fix_hashes = [key for key, value in gitbugs.items() if value in 
fixed_regression_ids]
 
-for githash in regression_hashes:
+for githash in fix_hashes:
 lognames = git.Git('.').execute(['git', 'show', githash, 
'--pretty=tformat:', '--name-only'])
 if lognames:
 for filename in lognames.split('
'):

dev-tools.git: scripts/regression-hotspots.py

[Ilmari Lauhakangas (via logerrit)]

 scripts/regression-hotspots.py |   23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

New commits:
commit a0176ee710a845567fff9c61608bd2393160c895
Author: Ilmari Lauhakangas 
AuthorDate: Thu Apr 11 22:50:48 2024 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Apr 11 21:59:57 2024 +0200

regression-hotspots: optimise by running git log only once instead of

eight thousand times. Takes running time from 10 hours to 30 seconds for me.
Also more accurate results as previously the bug tracker ID in the commit
message was accepted even when only appearing after the first line.

Change-Id: I75f77eb0e3f5c884f35d639608752225f5085c4c
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/166014
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py
index 6ea80ba6..8a4fb76d 100755
--- a/scripts/regression-hotspots.py
+++ b/scripts/regression-hotspots.py
@@ -8,6 +8,7 @@
 #
 # Uses https://github.com/gitpython-developers/GitPython
 # Results published in 
https://wiki.documentfoundation.org/Development/RegressionHotspots
+# Run in LibreOffice core directory. Shouldn't take more than a minute.
 
 import sys
 import re
@@ -18,7 +19,7 @@ from urllib.request import urlopen, URLError
 from io import BytesIO
 
 def get_fixed_regression_bugs():
-url = 
'https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_status=NEEDINFO&bug_status=PLEASETEST&columnlist=&keywords=regression%2C%20&keywords_type=allwords&limit=0&list_id=354018&product=LibreOffice&query_format=advanced&resolution=FIXED&ctype=csv&human=0'
+url = 
'https://bugs.documentfoundation.org/buglist.cgi?columnlist=&keywords=regression%2C%20&keywords_type=allwords&limit=0&product=LibreOffice&resolution=FIXED&ctype=csv&human=0'
 
 ctx = ssl.create_default_context()
 ctx.check_hostname = False
@@ -57,9 +58,23 @@ if __name__ == '__main__':
 fixed_regression_ids = get_fixed_regression_bugs()
 sys.stderr.write('found %d fixed regressions: %s
' % (len(fixed_regression_ids), fixed_regression_ids))
 
-for bug_id in fixed_regression_ids:
-sys.stderr.write('working on bug %d
' % bug_id)
-lognames = git.Git('.').execute(['git', 'log', 
'--grep=[fdo|tdf]#'+str(bug_id), '--pretty=tformat:', '--name-only'])
+# build a dictionary of hashes and bug IDs from all commits targeting a 
report in FDO/TDF Bugzilla
+gitbugs = {}
+buglog = git.Git('.').execute(['git', 'log', '--grep=(fdo|tdf)#', '-E', 
'--oneline', '--since=1.10.2010'])
+if buglog:
+for line in buglog.split('
'):
+githash = line.partition(' ')[0]
+# the regex search will ignore any commits hit by the grep where 
fdo|tdf# occurred below
+# the first line - this is desirable as the referred bug ID should 
appear in the subject line
+bugid = re.search(r"(?:fdo|tdf)#([0-9]+)", line)
+if bugid:
+gitbugs[githash] = int(bugid.group(1))
+
+# filter by the bug IDs we got from the Bugzilla query
+regression_hashes = [key for key, value in gitbugs.items() if value in 
fixed_regression_ids]
+
+for githash in regression_hashes:
+lognames = git.Git('.').execute(['git', 'show', githash, 
'--pretty=tformat:', '--name-only'])
 if lognames:
 for filename in lognames.split('
'):
 if not excluderegex.search(filename):

Re: Ynt: Unsubscribe from the Mailing List

[Ilmari Lauhakangas]

On 30.3.2024 19.56, alper akyol wrote:
I'm sorry to bother everyone. I'm still getting emails. How can I 
unsubscribe from the mailing list?


Read the instructions on 
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Ilmari

Cygwin build fails with /usr/bin/sh: line 1: /usr/bin/mkdir: Bad address

[Ilmari Lauhakangas]

A new developer is facing this issue:

$ make check 2>&1 | tee build.log
C:/cygwin64/home/user/lode/opt/bin/make -j 12  -rs -f 
C:/cygwin64/home/user/lode/dev/core/Makefile.gbuild  unitcheck slowcheck 
subsequentcheck  check

/usr/bin/sh: line 1: /usr/bin/mkdir: Bad address
[build XCD] main
make[1]: *** 
[C:/cygwin64/home/user/lode/dev/core/canvas/Library_vclcanvas.mk:27: 
C:/cygwin64/home/user/lode/dev/core/workdir/PrecompiledHeader/debug/precompiled_vclcanvas.hxx.pch.flags] 
Error -1073741819
make[1]: *** Deleting file 
'C:/cygwin64/home/user/lode/dev/core/workdir/PrecompiledHeader/debug/precompiled_vclcanvas.hxx.pch.flags'

make[1]: *** Waiting for unfinished jobs
make: *** [Makefile:290: build] Error 2

Does it sound familiar to anyone? I couldn't find anything useful 
related to it.


Ilmari