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
 {
 private Object  

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  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(  );
+#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,  );
+#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

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 )

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==regression%2C%20_type=allwords=0=LibreOffice=FIXED=csv=0'
+url = 
'https://bugs.documentfoundation.org/buglist.cgi?f1=component=component=component=component=component=1=1=1=1=1=equals=equals=equals=equals=equals=ci-infra=deletionRequest=FirefoxOS%20app=SI-GUI=WWW==regression%2C%20_type=allwords=0=LibreOffice=FIXED=csv=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_status=NEW_status=ASSIGNED_status=REOPENED_status=RESOLVED_status=VERIFIED_status=CLOSED_status=NEEDINFO_status=PLEASETEST==regression%2C%20_type=allwords=0_id=354018=LibreOffice_format=advanced=FIXED=csv=0'
+url = 
'https://bugs.documentfoundation.org/buglist.cgi?columnlist==regression%2C%20_type=allwords=0=LibreOffice=FIXED=csv=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):

core.git: Branch 'libreoffice-24-2-1' - officecfg/registry reportbuilder/registry

[Ilmari Lauhakangas (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 2720 
+-
 reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu |   34 
 2 files changed, 1377 insertions(+), 1377 deletions(-)

New commits:
commit 8d52be7d87c3be4a4792a0fab36835a8a2680e59
Author: Ilmari Lauhakangas 
AuthorDate: Wed Dec 13 21:24:28 2023 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Feb 23 18:23:37 2024 +0100

Fix typo: I10N -> L10N

Change-Id: I20a0eb54a85a9dea5c7d4cd91ff3632574b14802
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160714
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163481
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163808
Tested-by: Adolfo Jayme Barrientos 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index b6178a1d9f70..2265ec7c436a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -26,44 +26,44 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SelectAll
   .uno:Open
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   vnd.sun.star.findbar:FocusToFindbar
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Copy
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ZoomMinus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ZoomPlus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:InsertAnnotation
   
   
@@ -72,207 +72,207 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:InsertAnnotation
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:EditDoc
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SpellOnline
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:HyperlinkDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Delete
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SelectAll
   .uno:CommonAlignHorizontalCenter
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:MacroDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ViewDataSourceBrowser
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ToggleControlFocus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:HangulHanjaConversion
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   vnd.sun.star.findbar:FocusToFindbar
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Save
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:CommonAlignJustified
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
  

core.git: Branch 'libreoffice-24-2' - officecfg/registry reportbuilder/registry

[Ilmari Lauhakangas (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 2720 
+-
 reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu |   34 
 2 files changed, 1377 insertions(+), 1377 deletions(-)

New commits:
commit 684729cbd565129cdc6d3be09a864551fc6908c6
Author: Ilmari Lauhakangas 
AuthorDate: Wed Dec 13 21:24:28 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Fri Feb 16 13:36:48 2024 +0100

Fix typo: I10N -> L10N

Change-Id: I20a0eb54a85a9dea5c7d4cd91ff3632574b14802
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160714
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163481
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index b6178a1d9f70..2265ec7c436a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -26,44 +26,44 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SelectAll
   .uno:Open
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   vnd.sun.star.findbar:FocusToFindbar
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Copy
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ZoomMinus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ZoomPlus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:InsertAnnotation
   
   
@@ -72,207 +72,207 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:InsertAnnotation
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:EditDoc
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SpellOnline
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:HyperlinkDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Delete
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SelectAll
   .uno:CommonAlignHorizontalCenter
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:MacroDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ViewDataSourceBrowser
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ToggleControlFocus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:HangulHanjaConversion
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   vnd.sun.star.findbar:FocusToFindbar
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Save
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:CommonAlignJustified
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:CommonAlignLeft
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 

core.git: xmloff/qa

[Ilmari Lauhakangas (via logerrit)]

 xmloff/qa/unit/style.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9798f383f82897b0021665f50f3a9f8153febbe8
Author: Ilmari Lauhakangas 
AuthorDate: Tue Feb 13 14:41:13 2024 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Wed Feb 14 08:22:29 2024 +0100

tdf#141908 replace usage of sal_Int32 with colors in xmloff

Change-Id: Ia2661fa0f6864d6553e5cca7469e1d351bb06d17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163305
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx
index 178b0f216154..3bf1391d842a 100644
--- a/xmloff/qa/unit/style.cxx
+++ b/xmloff/qa/unit/style.cxx
@@ -371,8 +371,8 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMCGR_OldToNew)
 CPPUNIT_ASSERT_EQUAL(u"red2yellow"_ustr, sGradientName);
 awt::Gradient2 aGradient;
 xShapeProperties->getPropertyValue("FillGradient") >>= aGradient;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF), aGradient.StartColor);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00), aGradient.EndColor);
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, Color(ColorTransparency, 
aGradient.StartColor));
+CPPUNIT_ASSERT_EQUAL(COL_YELLOW, Color(ColorTransparency, 
aGradient.EndColor));
 
 // Test new properties
 auto aColorStopSeq = aGradient.ColorStops;
@@ -427,8 +427,8 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, 
testMCGR_OldToNew_opacity)
 // The old properties need to be still available, as they might be used in 
macros.
 awt::Gradient2 aGradient;
 xShapeProperties->getPropertyValue("FillTransparenceGradient") >>= 
aGradient;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0xE5E5E5), aGradient.StartColor);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aGradient.EndColor);
+CPPUNIT_ASSERT_EQUAL(Color(0xE5E5E5), Color(ColorTransparency, 
aGradient.StartColor));
+CPPUNIT_ASSERT_EQUAL(COL_BLACK, Color(ColorTransparency, 
aGradient.EndColor));
 CPPUNIT_ASSERT_EQUAL(sal_Int16(20), aGradient.Border);
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.XOffset);
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.YOffset);
@@ -493,8 +493,8 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMCGR_threeStops)
 CPPUNIT_ASSERT_EQUAL(u"threeStops"_ustr, sGradientName);
 awt::Gradient2 aGradient;
 xShapeProperties->getPropertyValue("FillGradient") >>= aGradient;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF), aGradient.StartColor);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00), aGradient.EndColor);
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, Color(ColorTransparency, 
aGradient.StartColor));
+CPPUNIT_ASSERT_EQUAL(COL_YELLOW, Color(ColorTransparency, 
aGradient.EndColor));
 CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_SQUARE, aGradient.Style);
 CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aGradient.XOffset);
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.YOffset);

core.git: icon-themes/karasa_jaga_svg

[Ilmari Lauhakangas (via logerrit)]

 icon-themes/karasa_jaga_svg/cmd/32/autopilotmenu.svg|2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dbnewreport.svg  |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dbnewreportautopilot.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dbreportdelete.svg   |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dbreportedit.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dbreportopen.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dbreportrename.svg   |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dbviewreports.svg|2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dsbinsertcolumns.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/dsbinsertcontent.svg |2 +-
 icon-themes/karasa_jaga_svg/cmd/32/executereport.svg|2 +-
 icon-themes/karasa_jaga_svg/cmd/32/reportnavigator.svg  |2 +-
 icon-themes/karasa_jaga_svg/cmd/lc_autopilotmenu.svg|2 +-
 icon-themes/karasa_jaga_svg/cmd/sc_autopilotmenu.svg|2 +-
 icon-themes/karasa_jaga_svg/dbaccess/res/reports_32.svg |2 +-
 icon-themes/karasa_jaga_svg/sd/res/doctext.svg  |2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 3be785e088cc0aa726509cf6b52b1d3b03817172
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jan 28 14:43:36 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 28 22:48:55 2024 +0100

tdf#158939 icon-themes/karasa_jaga_svg: simplify some db icons

Remove subtle image mask with very small details.
Saves 1,722,744 bytes.

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

diff --git a/icon-themes/karasa_jaga_svg/cmd/32/autopilotmenu.svg 
b/icon-themes/karasa_jaga_svg/cmd/32/autopilotmenu.svg
index ccdcb3cea90a..e955677b8130 100644
--- a/icon-themes/karasa_jaga_svg/cmd/32/autopilotmenu.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/32/autopilotmenu.svg
@@ -1 +1 @@
-e 
... etc. - the rest is truncated

core.git: icon-themes/colibre_dark_svg icon-themes/colibre_svg icon-themes/karasa_jaga_svg icon-themes/sukapura_dark_svg icon-themes/sukapura_svg

[Ilmari Lauhakangas (via logerrit)]

 icon-themes/colibre_dark_svg/vcl/res/pen.svg  |
2 
 icon-themes/colibre_svg/vcl/res/pen.svg   |
2 
 icon-themes/karasa_jaga_svg/sd/res/chart.svg  |
2 
 icon-themes/karasa_jaga_svg/svx/res/pr010.svg |
8 
 icon-themes/karasa_jaga_svg/svx/res/pr05.svg  |
8 
 icon-themes/karasa_jaga_svg/vcl/res/pen.svg   |
6 
 icon-themes/sukapura_dark_svg/chart2/res/donut3d_52x60.svg|
2 
 icon-themes/sukapura_dark_svg/chart2/res/donut3dexploded_52x60.svg|
2 
 icon-themes/sukapura_dark_svg/chart2/res/donut_52x60.svg  |
2 
 icon-themes/sukapura_dark_svg/chart2/res/donutexploded_52x60.svg  |
2 
 icon-themes/sukapura_dark_svg/chart2/res/pie3d_52x60.svg  |   
16 
 icon-themes/sukapura_dark_svg/chart2/res/pie3dexploded_52x60.svg  |   
16 
 icon-themes/sukapura_dark_svg/chart2/res/pie_52x60.svg|   
16 
 icon-themes/sukapura_dark_svg/chart2/res/pieexploded_52x60.svg|   
16 
 icon-themes/sukapura_dark_svg/chart2/res/valueaxisstepped3d_52x60.svg |   
25 
 icon-themes/sukapura_dark_svg/chart2/res/valueaxissteppedboth_52x60.svg   |   
25 
 icon-themes/sukapura_dark_svg/chart2/res/valueaxissteppedlines_52x60.svg  |   
25 
 icon-themes/sukapura_dark_svg/cmd/sc_bmpmask.svg  |
2 
 icon-themes/sukapura_dark_svg/sd/res/presenterscreen-BorderToolbarTop.svg |
2 
 icon-themes/sukapura_dark_svg/svx/res/a11y_check_issues_found.svg | 
3136 --
 icon-themes/sukapura_svg/chart2/res/donut3d_52x60.svg |
2 
 icon-themes/sukapura_svg/chart2/res/donut3dexploded_52x60.svg |
2 
 icon-themes/sukapura_svg/chart2/res/donut_52x60.svg   |
2 
 icon-themes/sukapura_svg/chart2/res/donutexploded_52x60.svg   |
2 
 icon-themes/sukapura_svg/chart2/res/pie3d_52x60.svg   |   
16 
 icon-themes/sukapura_svg/chart2/res/pie3dexploded_52x60.svg   |   
16 
 icon-themes/sukapura_svg/chart2/res/pie_52x60.svg |   
16 
 icon-themes/sukapura_svg/chart2/res/pieexploded_52x60.svg |   
16 
 icon-themes/sukapura_svg/chart2/res/valueaxisstepped3d_52x60.svg  |   
25 
 icon-themes/sukapura_svg/chart2/res/valueaxissteppedboth_52x60.svg|   
25 
 icon-themes/sukapura_svg/chart2/res/valueaxissteppedlines_52x60.svg   |   
25 
 icon-themes/sukapura_svg/cmd/sc_bmpmask.svg   |
2 
 icon-themes/sukapura_svg/sd/res/presenterscreen-BorderToolbarTop.svg  |
2 
 icon-themes/sukapura_svg/svx/res/a11y_check_issues_found.svg  | 
3136 --
 34 files changed, 34 insertions(+), 6568 deletions(-)

New commits:
commit ace5f5cbee7ea2c21ff9a3fe9b859b83a006edd6
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jan 26 18:41:27 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jan 27 20:46:31 2024 +0100

tdf#158939 icon-themes: remove leftover reference images from SVGs

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

diff --git a/icon-themes/colibre_dark_svg/vcl/res/pen.svg 
b/icon-themes/colibre_dark_svg/vcl/res/pen.svg
index b94a62aaac5f..7068f03aa614 100644
--- a/icon-themes/colibre_dark_svg/vcl/res/pen.svg
+++ b/icon-themes/colibre_dark_svg/vcl/res/pen.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
\ No newline at end of file
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
diff --git a/icon-themes/colibre_svg/vcl/res/pen.svg 
b/icon-themes/colibre_svg/vcl/res/pen.svg
index 332b3428f669..b4ee5cc555c9 100644
--- a/icon-themes/colibre_svg/vcl/res/pen.svg
+++ b/icon-themes/colibre_svg/vcl/res/pen.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
\ No newline at end of file
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
diff --git a/icon-themes/karasa_jaga_svg/sd/res/chart.svg 
b/icon-themes/karasa_jaga_svg/sd/res/chart.svg
index 574780dba8da..2bced015bcbf 100644
--- a/icon-themes/karasa_jaga_svg/sd/res/chart.svg
+++ b/icon-themes/karasa_jaga_svg/sd/res/chart.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>x2="14.287499" xlink:href="#b" y1="288.268737" 
 >y2="293.560387"/>x1="11.641666" x2="11.641666" xlink:href="#b" y1="282.977067" 
 >y2="288.268717"/>x1="8.995833" x2="8.995833" xlink:href="#b" y1="285.6229" 
 >y2="290.91455"/>x1="6.34" x2="6.34" xlink:href="#b" y1="289.591653" 
 >y2="294.354163"/>height="1.055826" width="1.042098" x="-.021049" 

core.git: extras/source

[Ilmari Lauhakangas (via logerrit)]

 extras/source/templates/presnt/Growing_Liberty/readme.txt |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 4fe9fab476c5e7d4e56696e237e1b4034989c156
Author: Ilmari Lauhakangas 
AuthorDate: Sun Jan 7 11:01:58 2024 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Sun Jan 7 12:38:40 2024 +0100

tdf#158863 Remove obsolete readme.txt file from Growing Liberty template

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

diff --git a/extras/source/templates/presnt/Growing_Liberty/readme.txt 
b/extras/source/templates/presnt/Growing_Liberty/readme.txt
deleted file mode 100644
index 82fb015c9693..
--- a/extras/source/templates/presnt/Growing_Liberty/readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Growing Liberty template by Budi Aryo @tokofoss
-Licensed under Creative Common Attribution ShareAlike 4.0 International 
(CC-BY-SA 4.0).
-
-
-
-Images included inside template:
-
-White Flower Background 2 by MALIZ ONG
-https://publicdomainpictures.net/en/view-image.php?image=38846=white-flower-background-2
-
-
-Icon set by Garik Barseghyan from Pixabay
-https://pixabay.com/users/insspirito-1851261/

core.git: Branch 'libreoffice-7-6' - helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 28e9ab0ed6fc0c5f4ddf590d50c26b2c467bab7a
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jan 5 14:06:53 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jan 5 13:06:53 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-6'
  to 219add06db0e2193170b462ef74956d559ffcbaa
  - tdf#158961 Remove a z-index: 100 rule to keep Safari happy

Modules navigation was not showing up in Safari because it had too
few elements to overflow. For some reason the z-index: 100 rule for
the containing div triggered this buggy behaviour.

Change-Id: I50776401b567d125d086e826ec7a23694bdf6774
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161651
Tested-by: Jenkins
Reviewed-by: Juan José González 
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 7f6876711ed991c8cf83edcc47980639b58c2c7a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161647
(cherry picked from commit c903a5157e0b9fe44a624965b642d1af57ec2b28)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161648

diff --git a/helpcontent2 b/helpcontent2
index 81ebb8bbf768..219add06db0e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 81ebb8bbf768326011406dc4a1e5bc7bbed6dc14
+Subproject commit 219add06db0e2193170b462ef74956d559ffcbaa

help.git: Branch 'libreoffice-7-6' - help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 219add06db0e2193170b462ef74956d559ffcbaa
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jan 4 23:05:27 2024 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jan 5 13:06:53 2024 +0100

tdf#158961 Remove a z-index: 100 rule to keep Safari happy

Modules navigation was not showing up in Safari because it had too
few elements to overflow. For some reason the z-index: 100 rule for
the containing div triggered this buggy behaviour.

Change-Id: I50776401b567d125d086e826ec7a23694bdf6774
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161651
Tested-by: Jenkins
Reviewed-by: Juan José González 
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 7f6876711ed991c8cf83edcc47980639b58c2c7a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161647
(cherry picked from commit c903a5157e0b9fe44a624965b642d1af57ec2b28)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161648

diff --git a/help3xsl/default.css b/help3xsl/default.css
index f01f567484..54cf36daca 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -680,7 +680,6 @@ li.disabled a {
 .modules {
 border-bottom: 2px solid #f3f3f3;
 background-color: #26;
-z-index: 100;
 }
 #modules:after, #langs:after {
 font-size: 30px;

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

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit d370398fc082846e73ca9bfb680e2f42512a62c2
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jan 5 14:03:54 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jan 5 13:03:54 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-24-2'
  to c903a5157e0b9fe44a624965b642d1af57ec2b28
  - tdf#158961 Remove a z-index: 100 rule to keep Safari happy

Modules navigation was not showing up in Safari because it had too
few elements to overflow. For some reason the z-index: 100 rule for
the containing div triggered this buggy behaviour.

Change-Id: I50776401b567d125d086e826ec7a23694bdf6774
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161651
Tested-by: Jenkins
Reviewed-by: Juan José González 
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 7f6876711ed991c8cf83edcc47980639b58c2c7a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161647

diff --git a/helpcontent2 b/helpcontent2
index 3c77843503d8..c903a5157e0b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3c77843503d8aa93a874e5d9271c5dd52dc62efe
+Subproject commit c903a5157e0b9fe44a624965b642d1af57ec2b28

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

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c903a5157e0b9fe44a624965b642d1af57ec2b28
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jan 4 23:05:27 2024 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jan 5 13:03:54 2024 +0100

tdf#158961 Remove a z-index: 100 rule to keep Safari happy

Modules navigation was not showing up in Safari because it had too
few elements to overflow. For some reason the z-index: 100 rule for
the containing div triggered this buggy behaviour.

Change-Id: I50776401b567d125d086e826ec7a23694bdf6774
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161651
Tested-by: Jenkins
Reviewed-by: Juan José González 
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 7f6876711ed991c8cf83edcc47980639b58c2c7a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161647

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 5f3276fb5b..5bcd2c28f1 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -699,7 +699,6 @@ li.disabled a {
 .modules {
 border-bottom: 2px solid #f3f3f3;
 background-color: #26;
-z-index: 100;
 }
 #modules:after, #langs:after {
 font-size: 30px;

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 43ec43154c05aa19d7ec5b631634b9a843689c9e
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jan 5 14:00:32 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jan 5 13:00:32 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 27088ec11fbefefff49820050a411d5d21e32c6d
  - tdf#158961 Remove a z-index: 100 rule to keep Safari happy

Modules navigation was not showing up in Safari because it had too
few elements to overflow. For some reason the z-index: 100 rule for
the containing div triggered this buggy behaviour.

Change-Id: I50776401b567d125d086e826ec7a23694bdf6774
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161651
Tested-by: Jenkins
Reviewed-by: Juan José González 
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index c8244945b9d3..27088ec11fbe 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c8244945b9d36822a2a35edca7bb9111f39ef282
+Subproject commit 27088ec11fbefefff49820050a411d5d21e32c6d

help.git: help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 27088ec11fbefefff49820050a411d5d21e32c6d
Author: Ilmari Lauhakangas 
AuthorDate: Thu Jan 4 23:05:27 2024 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jan 5 13:00:32 2024 +0100

tdf#158961 Remove a z-index: 100 rule to keep Safari happy

Modules navigation was not showing up in Safari because it had too
few elements to overflow. For some reason the z-index: 100 rule for
the containing div triggered this buggy behaviour.

Change-Id: I50776401b567d125d086e826ec7a23694bdf6774
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161651
Tested-by: Jenkins
Reviewed-by: Juan José González 
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 5f3276fb5b..5bcd2c28f1 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -699,7 +699,6 @@ li.disabled a {
 .modules {
 border-bottom: 2px solid #f3f3f3;
 background-color: #26;
-z-index: 100;
 }
 #modules:after, #langs:after {
 font-size: 30px;

core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit b763e68a5641933d1ea2fd449b1faf0e4097b7a4
Author: Ilmari Lauhakangas 
AuthorDate: Wed Dec 20 11:15:19 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Dec 20 10:15:19 2023 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1ba5e041e6e4e259a69160b90afed882c8c0f664
  - tdf#158105 Change character "background" to "highlighting color"

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

diff --git a/helpcontent2 b/helpcontent2
index 8d2a9b80fbb8..1ba5e041e6e4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8d2a9b80fbb89596185c5b6863713eb696af7140
+Subproject commit 1ba5e041e6e4e259a69160b90afed882c8c0f664

help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 1ba5e041e6e4e259a69160b90afed882c8c0f664
Author: Ilmari Lauhakangas 
AuthorDate: Wed Dec 20 11:12:44 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Wed Dec 20 10:15:18 2023 +0100

tdf#158105 Change character "background" to "highlighting color"

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

diff --git a/source/text/shared/01/02100200.xhp 
b/source/text/shared/01/02100200.xhp
index 2d67988836..16347d4ef9 100644
--- a/source/text/shared/01/02100200.xhp
+++ b/source/text/shared/01/02100200.xhp
@@ -154,8 +154,8 @@
   Finds 
characters with the Individual Words attribute, which can be set 
when using Underlining, Strikethrough and 
Overlining.
 
 
-Character background
-  Finds 
characters that use the Background attribute.
+Character highlighting color
+  Finds 
characters that use the highlighting color attribute.
 
 
 Line Spacing

help.git: Branch 'libreoffice-24-2' - help3xsl/default.css help3xsl/help2.js help3xsl/online_transform.xsl help3xsl/paginathing.js help3xsl/xap_templ_query.xsl source/text

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css|  183 
 help3xsl/help2.js   |   15 --
 help3xsl/online_transform.xsl   |   86 +++
 help3xsl/paginathing.js |3 
 help3xsl/xap_templ_query.xsl|9 -
 source/text/shared/help/browserhelp.xhp |   22 +--
 6 files changed, 157 insertions(+), 161 deletions(-)

New commits:
commit 6d45710a35698fbab9b416b728d6cf0c78549542
Author: Ilmari Lauhakangas 
AuthorDate: Sat Dec 16 15:49:32 2023 +0200
Commit: Olivier Hallot 
CommitDate: Sun Dec 17 15:38:57 2023 +0100

Make Help navigation layout less busy

Bookmarks don't have to be visible all the time, so make them a
dropdown and move the search box to header.

Move Xapian search to the top of the content area.

Make Contents tree appear on the left side in 960px and wider screens.

Simplify/clean up some CSS and JS, for example for module colours.

Change-Id: Ic50a834b758d50098868866e4b8d3e8085755423
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160870
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 25f39b53fb292ec90368f2afd3678884a1a8bb27)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160860

diff --git a/help3xsl/default.css b/help3xsl/default.css
index b54f9fe725..5f3276fb5b 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -32,6 +32,7 @@ do not break anything related to layout by scaling.
   --font_mono: Menlo, "Cascadia Mono", "Cascadia Code", Consolas, "DejaVu Sans 
Mono", monospace;
   --font_body: Ubuntu, Cantarell, "Segoe UI Variable", "Segoe UI", "Noto 
Sans", "DejaVu Sans", "Lucida Grande", sans-serif, FreeSerif, NanumGothic, 
"Noto Sans Tibetan", Taprom;
   --background-color: #f7f8f7;
+  --module-color: #18A303;
 }
 
 body,
@@ -226,6 +227,7 @@ html[dir=ltr] th {
 margin-top: 0px;
 }
 .tableheadcell {
+background: var(--module-color);
 color: white;
 vertical-align:top;
 }
@@ -252,7 +254,8 @@ h4,
 h5,
 h6 {
 margin-bottom: 0.67rem;
-color: #148603;
+color: var(--module-color);
+border-bottom-color: var(--module-color);
 }
 p,
 ol,
@@ -263,7 +266,7 @@ td {
 h1 {
 font-size: 1.83rem;
 font-weight: 300;
-border-bottom: 2px solid #148603;
+border-bottom: 2px solid;
 margin-bottom: 1.67rem;
 }
 h1 a {
@@ -326,14 +329,15 @@ h6 {
 margin-top: 15px;
 margin-bottom: 15px;
 }
-
 #DisplayArea {
 background-color: #FCFCFC;
 overflow: auto;
 padding: 10px 10px 40px 10px;
 grid-area: main;
 }
-
+#omega-autofocus {
+width: 274px;
+}
 .mediabutton {
 background-color: cyan;
 }
@@ -360,6 +364,7 @@ h6 {
 
 .embedded {}
 #TopLeftHeader {
+background: var(--module-color);
 grid-area: header;
 position: sticky;
 top: 0px;
@@ -379,6 +384,7 @@ h6 {
 display: flex;
 justify-content: space-between;
 flex-direction: column;
+width: 100%;
 }
 .symbol, .logo, .logo:hover, .logo:visited {
 color: #fff;
@@ -495,9 +501,8 @@ footer p {
 label[for=accordion-1] {
 color: #26;
 display: block;
-padding: 10px 0 10px 20px;
+margin: 0 0 10px 10px;
 font-size: 22px;
-line-height: .6;
 }
 label[for=accordion-1]:after {
 font-size: 44px;
@@ -510,7 +515,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 color: #333;
 z-index: 6;
 display: block;
-margin: 0 20px 0 20px;
+margin: 0 20px 20px 20px;
 }
 .index-label {
 font-size: 22px;
@@ -518,7 +523,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 padding-left: 20px;
 margin: 20px 0 0 0;
 }
-#Index, .index {
+.index {
 margin-top: 10px;
 }
 .index {
@@ -532,7 +537,8 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 display: none;
 }
 #Bookmarks {
-padding: 0 20px;
+width: 300px;
+margin-left: 10px;
 }
 #Bookmarks p {
 font-size: 22px;
@@ -628,7 +634,6 @@ li.disabled a {
 box-shadow: inset 0 1px 1px rgba(0,0,0,0.1);
 box-sizing: border-box;
 line-height: 1.5em;
-margin-top: 10px;
 outline: none;
 padding: 0 .25em;
 transition: all 0.30s ease-in-out;
@@ -642,13 +647,25 @@ li.disabled a {
 #search-bar::placeholder {
 font-style: italic;
 }
+#SearchFrame .nav-container {
+display: none;
+position: absolute;
+background-color: var(--background-color);
+overflow-y: auto;
+-webkit-overflow-scrolling: touch;
+max-height: 80svh;
+width: 300px;
+}
+#SearchFrame:focus-within .nav-container {
+display: block;
+}
 .xapian-donation {
 border-top: 2px solid #148603;
 background-color: #FCFCFC;
 box-shadow: 0 2px 8px 0 rgba(0,0,0,.05);
 }
 #DonationFrame {
-background: #18A303;
+background: var(--module-color);
 position: sticky;
 top: 0px;
 }
@@ -672,10 +689,9 @@ li.disabled a {
 text-align: center;
 }
 #SearchFrame {
-background: #18A303;
 top: 

help.git: help3xsl/default.css help3xsl/help2.js help3xsl/online_transform.xsl help3xsl/paginathing.js help3xsl/xap_templ_query.xsl source/text

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css|  183 
 help3xsl/help2.js   |   15 --
 help3xsl/online_transform.xsl   |   86 +++
 help3xsl/paginathing.js |3 
 help3xsl/xap_templ_query.xsl|9 -
 source/text/shared/help/browserhelp.xhp |   22 +--
 6 files changed, 157 insertions(+), 161 deletions(-)

New commits:
commit 25f39b53fb292ec90368f2afd3678884a1a8bb27
Author: Ilmari Lauhakangas 
AuthorDate: Sat Dec 16 15:49:32 2023 +0200
Commit: Olivier Hallot 
CommitDate: Sat Dec 16 22:11:42 2023 +0100

Make Help navigation layout less busy

Bookmarks don't have to be visible all the time, so make them a
dropdown and move the search box to header.

Move Xapian search to the top of the content area.

Make Contents tree appear on the left side in 960px and wider screens.

Simplify/clean up some CSS and JS, for example for module colours.

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

diff --git a/help3xsl/default.css b/help3xsl/default.css
index b54f9fe725..5f3276fb5b 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -32,6 +32,7 @@ do not break anything related to layout by scaling.
   --font_mono: Menlo, "Cascadia Mono", "Cascadia Code", Consolas, "DejaVu Sans 
Mono", monospace;
   --font_body: Ubuntu, Cantarell, "Segoe UI Variable", "Segoe UI", "Noto 
Sans", "DejaVu Sans", "Lucida Grande", sans-serif, FreeSerif, NanumGothic, 
"Noto Sans Tibetan", Taprom;
   --background-color: #f7f8f7;
+  --module-color: #18A303;
 }
 
 body,
@@ -226,6 +227,7 @@ html[dir=ltr] th {
 margin-top: 0px;
 }
 .tableheadcell {
+background: var(--module-color);
 color: white;
 vertical-align:top;
 }
@@ -252,7 +254,8 @@ h4,
 h5,
 h6 {
 margin-bottom: 0.67rem;
-color: #148603;
+color: var(--module-color);
+border-bottom-color: var(--module-color);
 }
 p,
 ol,
@@ -263,7 +266,7 @@ td {
 h1 {
 font-size: 1.83rem;
 font-weight: 300;
-border-bottom: 2px solid #148603;
+border-bottom: 2px solid;
 margin-bottom: 1.67rem;
 }
 h1 a {
@@ -326,14 +329,15 @@ h6 {
 margin-top: 15px;
 margin-bottom: 15px;
 }
-
 #DisplayArea {
 background-color: #FCFCFC;
 overflow: auto;
 padding: 10px 10px 40px 10px;
 grid-area: main;
 }
-
+#omega-autofocus {
+width: 274px;
+}
 .mediabutton {
 background-color: cyan;
 }
@@ -360,6 +364,7 @@ h6 {
 
 .embedded {}
 #TopLeftHeader {
+background: var(--module-color);
 grid-area: header;
 position: sticky;
 top: 0px;
@@ -379,6 +384,7 @@ h6 {
 display: flex;
 justify-content: space-between;
 flex-direction: column;
+width: 100%;
 }
 .symbol, .logo, .logo:hover, .logo:visited {
 color: #fff;
@@ -495,9 +501,8 @@ footer p {
 label[for=accordion-1] {
 color: #26;
 display: block;
-padding: 10px 0 10px 20px;
+margin: 0 0 10px 10px;
 font-size: 22px;
-line-height: .6;
 }
 label[for=accordion-1]:after {
 font-size: 44px;
@@ -510,7 +515,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 color: #333;
 z-index: 6;
 display: block;
-margin: 0 20px 0 20px;
+margin: 0 20px 20px 20px;
 }
 .index-label {
 font-size: 22px;
@@ -518,7 +523,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 padding-left: 20px;
 margin: 20px 0 0 0;
 }
-#Index, .index {
+.index {
 margin-top: 10px;
 }
 .index {
@@ -532,7 +537,8 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 display: none;
 }
 #Bookmarks {
-padding: 0 20px;
+width: 300px;
+margin-left: 10px;
 }
 #Bookmarks p {
 font-size: 22px;
@@ -628,7 +634,6 @@ li.disabled a {
 box-shadow: inset 0 1px 1px rgba(0,0,0,0.1);
 box-sizing: border-box;
 line-height: 1.5em;
-margin-top: 10px;
 outline: none;
 padding: 0 .25em;
 transition: all 0.30s ease-in-out;
@@ -642,13 +647,25 @@ li.disabled a {
 #search-bar::placeholder {
 font-style: italic;
 }
+#SearchFrame .nav-container {
+display: none;
+position: absolute;
+background-color: var(--background-color);
+overflow-y: auto;
+-webkit-overflow-scrolling: touch;
+max-height: 80svh;
+width: 300px;
+}
+#SearchFrame:focus-within .nav-container {
+display: block;
+}
 .xapian-donation {
 border-top: 2px solid #148603;
 background-color: #FCFCFC;
 box-shadow: 0 2px 8px 0 rgba(0,0,0,.05);
 }
 #DonationFrame {
-background: #18A303;
+background: var(--module-color);
 position: sticky;
 top: 0px;
 }
@@ -672,10 +689,9 @@ li.disabled a {
 text-align: center;
 }
 #SearchFrame {
-background: #18A303;
 top: 0px;
 position: sticky;
-z-index: 100;
+z-index: 1;
 }
 .xapian-omega-search {
 margin: auto;
@@ -823,6 +839,57 @@ 

core.git: officecfg/registry reportbuilder/registry

[Ilmari Lauhakangas (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 2722 
+-
 reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu |   34 
 2 files changed, 1378 insertions(+), 1378 deletions(-)

New commits:
commit bcffed442b308a01e31fe8c832a12b47ec774290
Author: Ilmari Lauhakangas 
AuthorDate: Wed Dec 13 21:24:28 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Thu Dec 14 09:04:26 2023 +0100

Fix typo: I10N -> L10N

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

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 156dde567262..65fa7fcd25f3 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -26,44 +26,44 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SelectAll
   .uno:Open
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   vnd.sun.star.findbar:FocusToFindbar
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Copy
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ZoomMinus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ZoomPlus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:InsertAnnotation
   
   
@@ -72,207 +72,207 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:InsertAnnotation
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:EditDoc
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SpellOnline
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:HyperlinkDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Delete
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SelectAll
   .uno:CommonAlignHorizontalCenter
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:MacroDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ViewDataSourceBrowser
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:ToggleControlFocus
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:HangulHanjaConversion
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   vnd.sun.star.findbar:FocusToFindbar
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:SearchDialog
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:Save
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:CommonAlignJustified
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:CommonAlignLeft
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   .uno:AddDirect
 
   
   
 
-  I10N SHORTCUTS - NO 
TRANSLATE
+  L10N SHORTCUTS - NO 
TRANSLATE
   

[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Ilmari Lauhakangas (via logerrit)]

 include/sfx2/thumbnailview.hxx  |1 +
 sfx2/source/control/recentdocsview.cxx  |1 +
 sfx2/source/control/templatedefaultview.cxx |1 +
 sfx2/source/control/thumbnailview.cxx   |3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5584980493fd599054cc5bbdb9911ae2c70cd60f
Author: Ilmari Lauhakangas 
AuthorDate: Mon Nov 27 18:40:57 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Dec 4 20:16:06 2023 +0100

tdf#158404 Start Center: remove ability to do multiselections

in Recent Documents and Templates views using Shift+arrow keys as
no actions can be executed for multiple selected files.

Multiselection still works as normal in Manage Templates dialog.

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

diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 655aa3ba13e5..54e8440ad363 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -309,6 +309,7 @@ protected:
 bool mbShowTooltips : 1;
 bool mbDrawMnemonics : 1;
 bool mbSelectOnFocus : 1;
+bool mbAllowMultiSelection : 1;
 Color maFillColor;  ///< Background color of the thumbnail 
view widget.
 Color maTextColor;  ///< Text color.
 Color maHighlightColor; ///< Color of the highlight (background) 
of the hovered item.
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 6df534788a32..f6ea1278390a 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -68,6 +68,7 @@ 
RecentDocsView::RecentDocsView(std::unique_ptr xWindow, st
 , mpLoadRecentFile(nullptr)
 , m_nExecuteHdlId(nullptr)
 {
+mbAllowMultiSelection = false;
 AbsoluteScreenPixelRectangle aScreen = 
Application::GetScreenPosSizePixel(Application::GetDisplayBuiltInScreen());
 mnItemMaxSize = std::min(aScreen.GetWidth(),aScreen.GetHeight()) > 800 ? 
256 : 192;
 
diff --git a/sfx2/source/control/templatedefaultview.cxx 
b/sfx2/source/control/templatedefaultview.cxx
index 909545e423ce..eef46f1817fd 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -25,6 +25,7 @@ 
TemplateDefaultView::TemplateDefaultView(std::unique_ptr x
  std::unique_ptr xMenu)
 : TemplateLocalView(std::move(xWindow), std::move(xMenu))
 {
+mbAllowMultiSelection = false;
 AbsoluteScreenPixelRectangle aScreen = 
Application::GetScreenPosSizePixel(Application::GetDisplayBuiltInScreen());
 tools::Long nItemMaxSize = 
std::min(aScreen.GetWidth(),aScreen.GetHeight()) > 800 ? 256 : 192;
 ThumbnailView::setItemDimensions( nItemMaxSize, nItemMaxSize, 
gnTextHeight, gnItemPadding );
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index abb9f9799e34..1ae47016935e 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -246,6 +246,7 @@ void ThumbnailView::ImplInit()
 mbHasVisibleItems = false;
 mbShowTooltips = false;
 mbDrawMnemonics = false;
+mbAllowMultiSelection = true;
 maFilterFunc = ViewFilterAll();
 
 const StyleSettings& rSettings = 
Application::GetSettings().GetStyleSettings();
@@ -681,7 +682,7 @@ bool ThumbnailView::KeyInput( const KeyEvent& rKEvt )
 
 if ( pNext )
 {
-if (aKeyCode.IsShift() && bValidRange)
+if (aKeyCode.IsShift() && bValidRange && mbAllowMultiSelection)
 {
 std::pair aRange;
 size_t nSelPos = mpStartSelRange - mFilteredItemList.begin();

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 10b1babef046c686de279fefbb70aafcc2dd3d83
Author: Ilmari Lauhakangas 
AuthorDate: Fri Nov 24 16:45:38 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Nov 24 15:45:38 2023 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to b1830be3caa3fae67973f8370aaf1a5e820e3caa
  - tdf#157716 Rename "Language settings" to "Languages and Locales"

Change-Id: I73a7d291d997ac14074b88433b14fa755e888a68
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/159928
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index d85fa4e10f11..b1830be3caa3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d85fa4e10f1156978c2f21aeab4e7d6ad7f80ab0
+Subproject commit b1830be3caa3fae67973f8370aaf1a5e820e3caa

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/sbasic/shared/0003.xhp|2 +-
 source/text/sbasic/shared/03030102.xhp|2 +-
 source/text/sbasic/shared/03100300.xhp|2 +-
 source/text/sbasic/shared/03100900.xhp|6 +++---
 source/text/scalc/01/12030100.xhp |   10 +-
 source/text/scalc/01/12050200.xhp |4 ++--
 source/text/scalc/guide/currency_format.xhp   |2 +-
 source/text/schart/01/0402.xhp|2 +-
 source/text/shared/00/0005.xhp|2 +-
 source/text/shared/00/0007.xhp|2 +-
 source/text/shared/00/0406.xhp|   16 
 source/text/shared/01/05020100.xhp|2 +-
 source/text/shared/01/05020300.xhp|2 +-
 source/text/shared/01/05020301.xhp|2 +-
 source/text/shared/01/05020700.xhp|4 ++--
 source/text/shared/01/06010600.xhp|2 +-
 source/text/shared/01/0620.xhp|2 +-
 source/text/shared/01/ref_pdf_export_initial_view.xhp |2 +-
 source/text/shared/guide/ctl.xhp  |4 ++--
 source/text/shared/guide/language_select.xhp  |6 +++---
 source/text/shared/optionen/0100.xhp  |2 +-
 source/text/shared/optionen/01030500.xhp  |2 +-
 source/text/shared/optionen/0104.xhp  |4 ++--
 source/text/shared/optionen/01040300.xhp  |2 +-
 source/text/shared/optionen/01040400.xhp  |2 +-
 source/text/shared/optionen/0114.xhp  |8 
 source/text/shared/optionen/languagetools.xhp |2 +-
 source/text/shared/optionen/translatetools.xhp|2 +-
 source/text/swriter/01/05040800.xhp   |2 +-
 source/text/swriter/01/0603.xhp   |2 +-
 source/text/swriter/01/translate.xhp  |4 ++--
 source/text/swriter/guide/delete_from_dict.xhp|2 +-
 source/text/swriter/guide/finding.xhp |2 +-
 source/text/swriter/guide/hyphen_prevent.xhp  |2 +-
 source/text/swriter/librelogo/LibreLogo.xhp   |2 +-
 35 files changed, 58 insertions(+), 58 deletions(-)

New commits:
commit b1830be3caa3fae67973f8370aaf1a5e820e3caa
Author: Ilmari Lauhakangas 
AuthorDate: Fri Nov 24 15:45:05 2023 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Nov 24 15:45:37 2023 +0100

tdf#157716 Rename "Language settings" to "Languages and Locales"

Change-Id: I73a7d291d997ac14074b88433b14fa755e888a68
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/159928
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/sbasic/shared/0003.xhp 
b/source/text/sbasic/shared/0003.xhp
index 538ce5a35e..72b0f59d1b 100644
--- a/source/text/sbasic/shared/0003.xhp
+++ b/source/text/sbasic/shared/0003.xhp
@@ -27,7 +27,7 @@
 Information
 
 You can set 
the locale used for controlling the formatting numbers, dates and currencies in 
$[officename] Basic in %PRODUCTNAME - Preferences
-Tools - 
Options - Language Settings - 
Languages. In Basic format codes, the decimal point (.) is 
always used as placeholder for the decimal separator defined in 
your locale and will be replaced by the corresponding character.
+Tools - 
Options - Languages and Locales - 
General. In Basic format codes, the decimal point (.) is 
always used as placeholder for the decimal separator defined in 
your locale and will be replaced by the corresponding character.
 The same 
applies to the locale settings for date, time and currency formats. The Basic 
format code will be interpreted and displayed according to your locale 
setting.
 
 
diff --git a/source/text/sbasic/shared/03030102.xhp 
b/source/text/sbasic/shared/03030102.xhp
index 967ec67a14..e523630e5b 100644
--- a/source/text/sbasic/shared/03030102.xhp
+++ b/source/text/sbasic/shared/03030102.xhp
@@ -44,7 +44,7 @@
 
 
   date: A string 
that contains the date that will be converted to a Date 
object.
-  The string passed to 
DateValue must be expressed in one of the date formats 
defined by your locale setting (see %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings 
- Languages) or using the ISO date format "-mm-dd" (year, month 
and day separated by hyphens).
+  The string passed to 
DateValue must be expressed in one of the date formats 
defined by your locale setting (see %PRODUCTNAME - 
PreferencesTools - 
Options - Languages and 
Locales - General) or using the ISO date format "-mm-dd" (year, 
month and day separated by hyphens).
 
 
 Date.
diff --git a/source/text/sbasic/shared/03100300.xhp 
b/source/text/sbasic/shared/03100300.xhp
index 23a22419ce..d40df84cd3 100644
--- 

[Libreoffice-commits] core.git: officecfg/registry

[Ilmari Lauhakangas (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a18174e807e8704c385637b8a53c45b9608bfa42
Author: Ilmari Lauhakangas 
AuthorDate: Mon Oct 30 15:25:22 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Oct 30 20:24:02 2023 +0100

tdf#14 Use title case Toggle Point Edit Mode

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 4f56a16e59e8..5235cfea8946 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2507,7 +2507,7 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Toggle point edit mode
+  Toggle Point Edit Mode
 
 
   1

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 86f0d88025262b0cfb519545ae7956f6ecea16f9
Author: Ilmari Lauhakangas 
AuthorDate: Mon Oct 30 15:31:43 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 30 14:31:43 2023 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to acb9fd45cdf33a7ad567dad95dfea0ad33a6b915
  - tdf#14 Use title case Toggle Point Edit Mode

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

diff --git a/helpcontent2 b/helpcontent2
index b8d3fdc2402f..acb9fd45cdf3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b8d3fdc2402fbb7a2e0ebff6921e310d9a7b74af
+Subproject commit acb9fd45cdf33a7ad567dad95dfea0ad33a6b915

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/shared/00/00040502.xhp |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit acb9fd45cdf33a7ad567dad95dfea0ad33a6b915
Author: Ilmari Lauhakangas 
AuthorDate: Mon Oct 30 15:28:35 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Oct 30 14:31:42 2023 +0100

tdf#14 Use title case Toggle Point Edit Mode

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

diff --git a/source/text/shared/00/00040502.xhp 
b/source/text/shared/00/00040502.xhp
index b0abc5cb6f..ac3d7edaa1 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -294,21 +294,21 @@
 
 
 
-Choose Edit - 
Toggle point edit mode.
+Choose Edit - 
Toggle Point Edit Mode.
 
-Toggle point 
edit mode
+Toggle Point 
Edit Mode
 
-Choose 
Draw - Toggle point edit mode.
-On the 
Draw menu of the Draw tab, choose 
Toggle point edit mode.
+Choose 
Draw - Toggle Point Edit Mode.
+On the 
Draw menu of the Draw tab, choose 
Toggle Point Edit Mode.
 
 
 
 
 
-Icon Toggle point edit 
mode
+Icon Toggle Point Edit 
Mode
 
 
-Toggle 
point edit mode
+Toggle 
Point Edit Mode
 
 
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 138a441b108ea97f7873b633eb579b779f2cf748
Author: Ilmari Lauhakangas 
AuthorDate: Wed Oct 25 19:05:55 2023 +0300
Commit: Gerrit Code Review 
CommitDate: Wed Oct 25 18:05:55 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-6'
  to 4f4db70a67558885482ba33892910f8123f00c03
  - Improve accessibility of dropdown menus

Now the opened menus can be closed with Esc key, so we conform
to the dismissible success criterion in WCAG 2.1:

https://www.w3.org/WAI/WCAG21/Understanding/content-on-hover-or-focus.html

To simplify things, now the navigation lists are populated upon
page load in all cases.

Change-Id: I0a7daaea122d3e03de36c322ccb012c546b271e0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158429
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 69f85cbf17c5acb8fb9b38772139c34eea96a772)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158436
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index c10e043fdaf6..4f4db70a6755 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c10e043fdaf6ed01727d99dfa3bcccd49ba9c527
+Subproject commit 4f4db70a67558885482ba33892910f8123f00c03

[Libreoffice-commits] help.git: Branch 'libreoffice-7-6' - help3xsl/a11y-toggle.js help3xsl/default.css help3xsl/help2.js help3xsl/help.js help3xsl/online_transform.xsl help3xsl/xap_templ_query.xsl

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/a11y-toggle.js   |  146 ++
 help3xsl/default.css  |6 -
 help3xsl/help.js  |1 
 help3xsl/help2.js |   27 ---
 help3xsl/online_transform.xsl |8 +-
 help3xsl/xap_templ_query.xsl  |4 -
 6 files changed, 75 insertions(+), 117 deletions(-)

New commits:
commit 4f4db70a67558885482ba33892910f8123f00c03
Author: Ilmari Lauhakangas 
AuthorDate: Wed Oct 25 18:20:13 2023 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Oct 25 18:05:54 2023 +0200

Improve accessibility of dropdown menus

Now the opened menus can be closed with Esc key, so we conform
to the dismissible success criterion in WCAG 2.1:
https://www.w3.org/WAI/WCAG21/Understanding/content-on-hover-or-focus.html

To simplify things, now the navigation lists are populated upon
page load in all cases.

Change-Id: I0a7daaea122d3e03de36c322ccb012c546b271e0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158429
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 69f85cbf17c5acb8fb9b38772139c34eea96a772)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158436
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/a11y-toggle.js b/help3xsl/a11y-toggle.js
index 821a8e0272..62e1032b02 100644
--- a/help3xsl/a11y-toggle.js
+++ b/help3xsl/a11y-toggle.js
@@ -1,100 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-MIT License
-
-Copyright (c) 2016 Edenspiekermann
-
-*/
-
-(function () {
-  'use strict';
-
-  var internalId = 0;
-  var togglesMap = {};
-  var targetsMap = {};
-
-  function $ (selector, context) {
-return Array.prototype.slice.call(
-  (context || document).querySelectorAll(selector)
-);
-  }
-
-  function getClosestToggle (element) {
-if (element.closest) {
-  return element.closest('[data-a11y-toggle]');
-}
-
-while (element) {
-  if (element.nodeType === 1 && element.hasAttribute('data-a11y-toggle')) {
-return element;
-  }
-
-  element = element.parentNode;
-}
-
-return null;
-  }
-
-  function handleToggle (toggle) {
-var target = toggle && targetsMap[toggle.getAttribute('aria-controls')];
-
-if (!target) {
-  return false;
-}
-
-var toggles = togglesMap['#' + target.id];
-var isExpanded = target.getAttribute('aria-hidden') === 'false';
-
-target.setAttribute('aria-hidden', isExpanded);
-toggles.forEach(function (toggle) {
-  toggle.setAttribute('aria-expanded', !isExpanded);
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+function hideNavs() {
+let navs = document.querySelectorAll('[data-a11y-toggle] + nav');
+navs.forEach((nav) => {
+if (!nav.hasAttribute('hidden')) {
+nav.previousElementSibling.setAttribute('aria-expanded', 'false');
+nav.setAttribute('hidden', 'true');
+}
 });
-  }
-
-  var initA11yToggle = function (context) {
-togglesMap = $('[data-a11y-toggle]', context).reduce(function (acc, 
toggle) {
-  var selector = '#' + toggle.getAttribute('data-a11y-toggle');
-  acc[selector] = acc[selector] || [];
-  acc[selector].push(toggle);
-  return acc;
-}, togglesMap);
-
-var targets = Object.keys(togglesMap);
-targets.length && $(targets).forEach(function (target) {
-  var toggles = togglesMap['#' + target.id];
-  var isExpanded = target.hasAttribute('data-a11y-toggle-open');
-  var labelledby = [];
-
-  toggles.forEach(function (toggle) {
-toggle.id || toggle.setAttribute('id', 'a11y-toggle-' + internalId++);
-toggle.setAttribute('aria-controls', target.id);
-toggle.setAttribute('aria-expanded', isExpanded);
-labelledby.push(toggle.id);
-  });
-
-  target.setAttribute('aria-hidden', !isExpanded);
-  target.hasAttribute('aria-labelledby') || 
target.setAttribute('aria-labelledby', labelledby.join(' '));
-
-  targetsMap[target.id] = target;
-});
-  };
-
-  document.addEventListener('DOMContentLoaded', function () {
-initA11yToggle();
-  });
-
-  document.addEventListener('click', function (event) {
-var toggle = getClosestToggle(event.target);
-handleToggle(toggle);
-  });
-
-  document.addEventListener('keyup', function (event) {
-if (event.which === 13 || event.which === 32) {
-  var toggle = getClosestToggle(event.target);
-  if (toggle && toggle.getAttribute('role') === 'button') {
-handleToggle(toggle);
-  }
+}
+const navToggle = document.querySelectorAll('[data-a11y-toggle]');
+navToggle.forEach((toggle) => {
+  let navList = toggle.nextElementSibling;
+  let navLinks = 

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 725c543c3b1c91d6656e6ed58006d886f83456dc
Author: Ilmari Lauhakangas 
AuthorDate: Wed Oct 25 18:53:36 2023 +0300
Commit: Gerrit Code Review 
CommitDate: Wed Oct 25 17:53:36 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 69f85cbf17c5acb8fb9b38772139c34eea96a772
  - Improve accessibility of dropdown menus

Now the opened menus can be closed with Esc key, so we conform
to the dismissible success criterion in WCAG 2.1:

https://www.w3.org/WAI/WCAG21/Understanding/content-on-hover-or-focus.html

To simplify things, now the navigation lists are populated upon
page load in all cases.

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

diff --git a/helpcontent2 b/helpcontent2
index 3c0331071035..69f85cbf17c5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3c0331071035ec78359ec8a4e5919164a31ec879
+Subproject commit 69f85cbf17c5acb8fb9b38772139c34eea96a772

[Libreoffice-commits] help.git: help3xsl/a11y-toggle.js help3xsl/default.css help3xsl/help2.js help3xsl/help.js help3xsl/online_transform.xsl help3xsl/xap_templ_query.xsl

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/a11y-toggle.js   |  146 ++
 help3xsl/default.css  |6 -
 help3xsl/help.js  |1 
 help3xsl/help2.js |   27 ---
 help3xsl/online_transform.xsl |8 +-
 help3xsl/xap_templ_query.xsl  |4 -
 6 files changed, 75 insertions(+), 117 deletions(-)

New commits:
commit 69f85cbf17c5acb8fb9b38772139c34eea96a772
Author: Ilmari Lauhakangas 
AuthorDate: Wed Oct 25 18:20:13 2023 +0300
Commit: Olivier Hallot 
CommitDate: Wed Oct 25 17:53:36 2023 +0200

Improve accessibility of dropdown menus

Now the opened menus can be closed with Esc key, so we conform
to the dismissible success criterion in WCAG 2.1:
https://www.w3.org/WAI/WCAG21/Understanding/content-on-hover-or-focus.html

To simplify things, now the navigation lists are populated upon
page load in all cases.

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

diff --git a/help3xsl/a11y-toggle.js b/help3xsl/a11y-toggle.js
index 821a8e0272..62e1032b02 100644
--- a/help3xsl/a11y-toggle.js
+++ b/help3xsl/a11y-toggle.js
@@ -1,100 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-MIT License
-
-Copyright (c) 2016 Edenspiekermann
-
-*/
-
-(function () {
-  'use strict';
-
-  var internalId = 0;
-  var togglesMap = {};
-  var targetsMap = {};
-
-  function $ (selector, context) {
-return Array.prototype.slice.call(
-  (context || document).querySelectorAll(selector)
-);
-  }
-
-  function getClosestToggle (element) {
-if (element.closest) {
-  return element.closest('[data-a11y-toggle]');
-}
-
-while (element) {
-  if (element.nodeType === 1 && element.hasAttribute('data-a11y-toggle')) {
-return element;
-  }
-
-  element = element.parentNode;
-}
-
-return null;
-  }
-
-  function handleToggle (toggle) {
-var target = toggle && targetsMap[toggle.getAttribute('aria-controls')];
-
-if (!target) {
-  return false;
-}
-
-var toggles = togglesMap['#' + target.id];
-var isExpanded = target.getAttribute('aria-hidden') === 'false';
-
-target.setAttribute('aria-hidden', isExpanded);
-toggles.forEach(function (toggle) {
-  toggle.setAttribute('aria-expanded', !isExpanded);
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+function hideNavs() {
+let navs = document.querySelectorAll('[data-a11y-toggle] + nav');
+navs.forEach((nav) => {
+if (!nav.hasAttribute('hidden')) {
+nav.previousElementSibling.setAttribute('aria-expanded', 'false');
+nav.setAttribute('hidden', 'true');
+}
 });
-  }
-
-  var initA11yToggle = function (context) {
-togglesMap = $('[data-a11y-toggle]', context).reduce(function (acc, 
toggle) {
-  var selector = '#' + toggle.getAttribute('data-a11y-toggle');
-  acc[selector] = acc[selector] || [];
-  acc[selector].push(toggle);
-  return acc;
-}, togglesMap);
-
-var targets = Object.keys(togglesMap);
-targets.length && $(targets).forEach(function (target) {
-  var toggles = togglesMap['#' + target.id];
-  var isExpanded = target.hasAttribute('data-a11y-toggle-open');
-  var labelledby = [];
-
-  toggles.forEach(function (toggle) {
-toggle.id || toggle.setAttribute('id', 'a11y-toggle-' + internalId++);
-toggle.setAttribute('aria-controls', target.id);
-toggle.setAttribute('aria-expanded', isExpanded);
-labelledby.push(toggle.id);
-  });
-
-  target.setAttribute('aria-hidden', !isExpanded);
-  target.hasAttribute('aria-labelledby') || 
target.setAttribute('aria-labelledby', labelledby.join(' '));
-
-  targetsMap[target.id] = target;
-});
-  };
-
-  document.addEventListener('DOMContentLoaded', function () {
-initA11yToggle();
-  });
-
-  document.addEventListener('click', function (event) {
-var toggle = getClosestToggle(event.target);
-handleToggle(toggle);
-  });
-
-  document.addEventListener('keyup', function (event) {
-if (event.which === 13 || event.which === 32) {
-  var toggle = getClosestToggle(event.target);
-  if (toggle && toggle.getAttribute('role') === 'button') {
-handleToggle(toggle);
-  }
+}
+const navToggle = document.querySelectorAll('[data-a11y-toggle]');
+navToggle.forEach((toggle) => {
+  let navList = toggle.nextElementSibling;
+  let navLinks = navList.querySelectorAll('a');
+  toggle.addEventListener('click', (event) => {
+  if (navList.hasAttribute('hidden')) {
+  toggle.setAttribute('aria-expanded', 'true');
+  

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 66cf022ec61e1afe49acb4d5248e640fb075e649
Author: Ilmari Lauhakangas 
AuthorDate: Wed Oct 11 20:24:35 2023 +0300
Commit: Gerrit Code Review 
CommitDate: Wed Oct 11 19:24:35 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to e7ec227d83792bdaf88cb53be5a5a8849f7f576a
  - tdf#155044 Help: Description -> Alt Text and Text Alternative -> Text

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

diff --git a/helpcontent2 b/helpcontent2
index 379510d74d95..e7ec227d8379 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 379510d74d95dd4e7878e8e86401a3b60a6ef107
+Subproject commit e7ec227d83792bdaf88cb53be5a5a8849f7f576a

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/shared/00/00040502.xhp  |8 +--
 source/text/shared/01/05190100.xhp  |   16 +++---
 source/text/swriter/01/05060900.xhp |   96 ++--
 3 files changed, 59 insertions(+), 61 deletions(-)

New commits:
commit e7ec227d83792bdaf88cb53be5a5a8849f7f576a
Author: Ilmari Lauhakangas 
AuthorDate: Fri Oct 6 16:47:57 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Wed Oct 11 19:24:35 2023 +0200

tdf#155044 Help: Description -> Alt Text and Text Alternative -> Text

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

diff --git a/source/text/shared/00/00040502.xhp 
b/source/text/shared/00/00040502.xhp
index c31247393b..2d32400294 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -238,12 +238,10 @@
 
 
 
-Choose 
Format - Description.
-
-Choose 
Description.
+Choose 
Format - Alt Text.
 
-On the 
Image menu of the Image tab, choose 
Description.
-On the 
Object menu of the Object tab, choose 
Description.
+On the 
Image menu of the Image tab, choose 
Alt Text.
+On the 
Object menu of the Object tab, choose 
Alt Text.
 
 
 Click on textbox or 
shape to select, then...
diff --git a/source/text/shared/01/05190100.xhp 
b/source/text/shared/01/05190100.xhp
index 9108312f41..5a30aa4679 100644
--- a/source/text/shared/01/05190100.xhp
+++ b/source/text/shared/01/05190100.xhp
@@ -20,12 +20,12 @@
 
 
   
- Description
+ Alt Text
  /text/shared/01/05190100.xhp
   
 
 
-objects;text 
alternative and description
+objects;text and 
alt text
 descriptions for objects
 text alternative;objects
 
@@ -33,22 +33,22 @@
 
 
 
-Description
-Assigns a text 
alternative and a description to the selected object. These texts are available 
as alternative tags in your document for use by accessibility tools. They are 
also available as tags for images when you export the 
document.
+Alt Text
+Assigns a 
text and an alt text to the selected object. These 
texts are available as alternative tags in your document for use by 
accessibility tools. They are also available as tags for images when you export 
the document.
 
 
   
 
 
-Text Alternative
 
+Text
 Enter a short 
description of the essential details of the selected object for a person who 
cannot see the object. This text is available for use by assistive 
technologies.
 
 
 
-Description
-Enter a longer 
description of the object, especially if the object is too complex or contains 
too much detail to be described adequately with the short Text 
Alternative. Use Description to add 
additional information to the short description found in Text 
Alternative. This text is available for use by assistive 
technologies.
- For images, Text 
Alternative and Description are exported with 
an appropriate tag in HTML and PDF format (remember to enable the Universal
 Accessibility (PDF/UA) option in PDF export).
+Alt Text
+Enter a longer 
description of the object, especially if the object is too complex or contains 
too much detail to be described adequately with the short 
Text. Use Alt Text to add 
additional information to the short description found in 
Text. This text is available for use by assistive 
technologies.
+ For images, Text and 
Alt Text are exported with an appropriate tag in HTML and 
PDF format (remember to enable the Universal
 Accessibility (PDF/UA) option in PDF export).
 
 
 Decorative
diff --git a/source/text/swriter/01/05060900.xhp 
b/source/text/swriter/01/05060900.xhp
index 8d6cf91703..ddb0ddc9f9 100644
--- a/source/text/swriter/01/05060900.xhp
+++ b/source/text/swriter/01/05060900.xhp
@@ -20,7 +20,7 @@
 
 
 
-Options
+Options
 /text/swriter/01/05060900.xhp
 
 
@@ -29,63 +29,63 @@
 
 
 
-
-
-Options
-Specify properties for the 
selected image, frame or OLE object.
+
+
+Options
+Specify properties for the 
selected image, frame or OLE object.
 
 
   
 
-Accessibility
-
-Name
-Enter a name for the selected 
item.
-Assign an object, graphic or frame a 
meaningful name, so that you can quickly locate it afterwards in long 
documents.
-
-Text Alternative (images and OLE 
objects only)
+Accessibility
+
+Name
+Enter a name for the selected 
item.
+Assign an object, graphic or frame a meaningful name, 
so that you can quickly locate it afterwards in long documents.
+
 
+
 
-
-Decorative
-Marks the item as 
purely decorative, not part of the document content, and ignorable by assistive 
technologies.
+
+
+
 Sequences (frames only)
-
-Previous link
-Displays the frame that comes before 
the selected frame in a linked sequence. To add or change the previous link, 
select a name from the list. If you are linking frames, the selected frame and 
the target frame must be empty.
-
-Next link
-Displays the 

[Libreoffice-commits] core.git: cui/uiconfig

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 20f1da9c698023cdf76d35bb4a34b2fee094
Author: Ilmari Lauhakangas 
AuthorDate: Wed Oct 11 17:27:32 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Wed Oct 11 19:23:38 2023 +0200

tdf#155044 Missed one Description to Alt Text spot

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

diff --git a/cui/uiconfig/ui/objecttitledescdialog.ui 
b/cui/uiconfig/ui/objecttitledescdialog.ui
index bcb121dc7797..3085ac6124d2 100644
--- a/cui/uiconfig/ui/objecttitledescdialog.ui
+++ b/cui/uiconfig/ui/objecttitledescdialog.ui
@@ -124,8 +124,8 @@
   
 True
 False
-Give longer explanation 
of non-text content that is too complex to be described briefly in “Text 
Alternative”
-_Description:
+Give longer explanation 
of non-text content that is too complex to be described briefly in 
“Text”
+_Alt Text:
 True
 0
   

[Libreoffice-commits] core.git: sfx2/source

[Ilmari Lauhakangas (via logerrit)]

 sfx2/source/commandpopup/CommandPopup.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 72d6287c586a2481c62bf21d88bb363ce584b8dd
Author: Ilmari Lauhakangas 
AuthorDate: Sun Oct 8 22:34:15 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Oct 9 17:47:34 2023 +0200

tdf#142524 Search Commands: use ▸ to indicate sequence

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

diff --git a/sfx2/source/commandpopup/CommandPopup.cxx 
b/sfx2/source/commandpopup/CommandPopup.cxx
index 8d68bd62bd76..0d948a4e84e6 100644
--- a/sfx2/source/commandpopup/CommandPopup.cxx
+++ b/sfx2/source/commandpopup/CommandPopup.cxx
@@ -51,6 +51,7 @@ 
MenuContentHandler::MenuContentHandler(uno::Reference const& xFra
 void MenuContentHandler::gatherMenuContent(
 uno::Reference const& xIndexAccess, MenuContent& 
rMenuContent)
 {
+std::u16string_view aMenuLabelSeparator = AllSettings::GetLayoutRTL() ? u" 
◂ " : u" ▸ ";
 for (sal_Int32 n = 0; n < xIndexAccess->getCount(); n++)
 {
 MenuContent aNewContent;
@@ -85,7 +86,8 @@ void MenuContentHandler::gatherMenuContent(
 aNewContent.m_aMenuLabel = aLabel;
 
 if (!rMenuContent.m_aFullLabelWithPath.isEmpty())
-aNewContent.m_aFullLabelWithPath = 
rMenuContent.m_aFullLabelWithPath + " / ";
+aNewContent.m_aFullLabelWithPath
+= rMenuContent.m_aFullLabelWithPath + aMenuLabelSeparator;
 aNewContent.m_aFullLabelWithPath += aNewContent.m_aMenuLabel;
 aNewContent.m_aSearchableMenuLabel = 
toLower(aNewContent.m_aFullLabelWithPath);
 

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit aafde177d68b97ebd90587603eaad014ba89d337
Author: Ilmari Lauhakangas 
AuthorDate: Fri Oct 6 16:39:40 2023 +0300
Commit: Gerrit Code Review 
CommitDate: Fri Oct 6 15:39:40 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a79a6e02003a1dd220e2c03add548758f928795b
  - tdf#146609 Rename line width to thickness in Help

The ones that were easy to find. Probably missed something.

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

diff --git a/helpcontent2 b/helpcontent2
index e09f381a645a..a79a6e02003a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e09f381a645a2731e38bfff4a573ee25ccd488b7
+Subproject commit a79a6e02003a1dd220e2c03add548758f928795b

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/sbasic/guide/calc_borders.xhp |4 ++--
 source/text/scalc/01/sparklines.xhp   |2 +-
 source/text/scalc/main0203.xhp|4 ++--
 source/text/shared/00/0004.xhp|6 +++---
 source/text/shared/01/05200100.xhp|6 +++---
 source/text/shared/01/05200200.xhp|2 +-
 source/text/shared/guide/fontwork.xhp |2 +-
 source/text/shared/guide/line_intext.xhp  |6 +++---
 source/text/shared/guide/linestyle_define.xhp |8 
 source/text/shared/guide/linestyles.xhp   |8 
 source/text/simpress/main0202.xhp |6 +++---
 source/text/swriter/librelogo/LibreLogo.xhp   |4 ++--
 source/text/swriter/main0205.xhp  |4 ++--
 13 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit a79a6e02003a1dd220e2c03add548758f928795b
Author: Ilmari Lauhakangas 
AuthorDate: Fri Oct 6 16:37:10 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Oct 6 15:39:39 2023 +0200

tdf#146609 Rename line width to thickness in Help

The ones that were easy to find. Probably missed something.

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

diff --git a/source/text/sbasic/guide/calc_borders.xhp 
b/source/text/sbasic/guide/calc_borders.xhp
index 8295c0ad98..f0a9f06381 100644
--- a/source/text/sbasic/guide/calc_borders.xhp
+++ b/source/text/sbasic/guide/calc_borders.xhp
@@ -51,7 +51,7 @@
 newStyle is an integer value that corresponds to 
the border line style (see Line Styles 
below).
 
 
-newWidth is an integer value that defines the line 
width.
+newWidth is an integer value that defines the line 
thickness.
 
 
 newColor is an integer value corresponding to a 
color defined using the RGB 
function.
@@ -102,7 +102,7 @@
   
 Line Styles
   
-  Line styles are 
defined as integer constants. The table below lists the constants for the line 
styles available in Format - Cells - Borders:  
+  Line styles are 
defined as integer constants. The table below lists the constants for the line 
styles available in Format - Cells - Borders:
   


diff --git a/source/text/scalc/01/sparklines.xhp 
b/source/text/scalc/01/sparklines.xhp
index a50521ccca..3671605cc8 100644
--- a/source/text/scalc/01/sparklines.xhp
+++ b/source/text/scalc/01/sparklines.xhp
@@ -46,7 +46,7 @@
 Stacked: also known as win/loss. Displays equally 
sized bars indicating positive and negative values.
 
 
-Line 
width: enter the line width number manually or use the spin 
button.
+Line 
thickness: enter the line thickness number manually or use the spin 
button.
 Display empty 
cells as: choices are available in the drop-down list:
 
 
diff --git a/source/text/scalc/main0203.xhp b/source/text/scalc/main0203.xhp
index 5a769e5bd8..c040a41529 100644
--- a/source/text/scalc/main0203.xhp
+++ b/source/text/scalc/main0203.xhp
@@ -39,9 +39,9 @@
 Line 
Style
 
 
-Line 
Width
+Line 
Thickness
 
-
+
 Line 
Color
 
 
diff --git a/source/text/shared/00/0004.xhp 
b/source/text/shared/00/0004.xhp
index 3008ea016c..7822349b31 100644
--- a/source/text/shared/00/0004.xhp
+++ b/source/text/shared/00/0004.xhp
@@ -157,15 +157,15 @@
 
 
 
-
+
 
 
 
 
-Icon Line 
Width
+Icon Line 
Thickness
 
 
-Line Width
+Line Thickness
 
 
 
diff --git a/source/text/shared/01/05200100.xhp 
b/source/text/shared/01/05200100.xhp
index dd2309e70c..aeaa5600c6 100644
--- a/source/text/shared/01/05200100.xhp
+++ b/source/text/shared/01/05200100.xhp
@@ -49,10 +49,10 @@
 
 
 
-Widths
-Select the width for the line. You can append a 
measurement unit. A zero line width results in a hairline with a width of one 
pixel of the output medium.
+Thickness
+Select the thickness for the line. You can 
append a measurement unit. A zero line thickness results in a hairline with a 
thickness of one pixel of the output medium.
 
-
+
 
 Transparency
 Enter the transparency of the 
line, where 100% corresponds to completely transparent and 0% to completely 
opaque. 
diff --git a/source/text/shared/01/05200200.xhp 
b/source/text/shared/01/05200200.xhp
index 00784834ce..809ec2f846 100644
--- a/source/text/shared/01/05200200.xhp
+++ b/source/text/shared/01/05200200.xhp
@@ -56,7 +56,7 @@
 Spacing
 Enter the amount of space that 
you want to leave between dots or dashes.
 
-Fit to line width
+Fit to line thickness
 Automatically adjusts the entries 
relative to the length of the line.
 
 Add
diff --git a/source/text/shared/guide/fontwork.xhp 
b/source/text/shared/guide/fontwork.xhp
index 8646e33e0d..656285b5d4 100644
--- a/source/text/shared/guide/fontwork.xhp
+++ b/source/text/shared/guide/fontwork.xhp
@@ -113,7 +113,7 @@
 Click the Fontwork 
object. If the 

[Libreoffice-commits] core.git: emfio/qa include/test test/source

[Ilmari Lauhakangas (via logerrit)]

 emfio/qa/cppunit/wmf/wmfimporttest.cxx |   26 +-
 include/test/xmltesttools.hxx  |8 
 test/source/xmltesttools.cxx   |8 
 3 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit b693d19884a09b5f841b30f2e8b586778584ed16
Author: Ilmari Lauhakangas 
AuthorDate: Thu Sep 28 16:42:18 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Oct 6 12:48:17 2023 +0200

xmltesttools: add assertXPathDoubleValue that takes a double with delta

and use it to make WmfTest::testSetTextAlignWmf independent of DPI

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

diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx 
b/emfio/qa/cppunit/wmf/wmfimporttest.cxx
index 172d20d99fed..de9be9ba0a52 100644
--- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx
@@ -207,70 +207,70 @@ void WmfTest::testSetTextAlignWmf()
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[2]/text", 
"textalignment:default");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[3]", "align", "top");
-assertXPath(pDoc, "/metafile/push[2]/textarray[3]", "x", "12700");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[3]", "x", 12700, 
30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[3]", "y", "212");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[3]/text", 
"textalignment:0x00");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[4]", "align", "top");
-assertXPath(pDoc, "/metafile/push[2]/textarray[4]", "x", "12026");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[4]", "x", 12026, 
30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[4]", "y", "423");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[4]/text", 
"textalignment:0x02");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[5]", "align", "top");
 // Fails without the fix: Expected: 12026, Actual: 12350
-assertXPath(pDoc, "/metafile/push[2]/textarray[5]", "x", "12026");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[5]", "x", 12026, 
30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[5]", "y", "635");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[5]/text", 
"textalignment:0x04");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[6]", "align", "top");
-assertXPath(pDoc, "/metafile/push[2]/textarray[6]", "x", "12363");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[6]", "x", 12363, 
30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[6]", "y", "847");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[6]/text", 
"textalignment:0x06");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[7]", "align", "top");
-assertXPath(pDoc, "/metafile/push[2]/textarray[7]", "x", "12700");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[7]", "x", 12700, 
30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[7]", "y", "1058");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[7]/text", 
"textalignment:0x08");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[8]", "align", "top");
-assertXPath(pDoc, "/metafile/push[2]/textarray[8]", "x", "12026");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[8]", "x", 12026, 
30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[8]", "y", "1270");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[8]/text", 
"textalignment:0x0A");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[9]", "align", "bottom");
 // Fails without the fix: Expected: 12026, Actual: 12350
-assertXPath(pDoc, "/metafile/push[2]/textarray[9]", "x", "12026");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[9]", "x", 12026, 
30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[9]", "y", "1482");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[9]/text", 
"textalignment:0x0C");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[10]", "align", "bottom");
-assertXPath(pDoc, "/metafile/push[2]/textarray[10]", "x", "12363");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[10]", "x", 
12363, 30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[10]", "y", "1693");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[10]/text", 
"textalignment:0x0E");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[11]", "align", "bottom");
-assertXPath(pDoc, "/metafile/push[2]/textarray[11]", "x", "12700");
+assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[11]", "x", 
12700, 30);
 assertXPath(pDoc, "/metafile/push[2]/textarray[11]", "y", "1905");
 assertXPathContent(pDoc, "/metafile/push[2]/textarray[11]/text", 
"textalignment:0x10");
 
 assertXPath(pDoc, "/metafile/push[2]/textalign[12]", "align", 

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 024685f655c368fdcf4b9d29206526758eaf9015
Author: Ilmari Lauhakangas 
AuthorDate: Tue Sep 19 09:32:40 2023 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Sep 19 08:32:40 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 49cc168cf18562283b308f039cc8fc37b8866fed
  - tdf#155214 Rename Modify to Assign in keyboard shortcut customisation

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

diff --git a/helpcontent2 b/helpcontent2
index 5d1f356ef5b5..49cc168cf185 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5d1f356ef5b582aaf4abdf950dec1a948743dc38
+Subproject commit 49cc168cf18562283b308f039cc8fc37b8866fed

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/shared/01/06140200.xhp |4 ++--
 source/text/shared/guide/scripting.xhp |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 49cc168cf18562283b308f039cc8fc37b8866fed
Author: Ilmari Lauhakangas 
AuthorDate: Tue Sep 19 09:27:25 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Sep 19 08:32:40 2023 +0200

tdf#155214 Rename Modify to Assign in keyboard shortcut customisation

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

diff --git a/source/text/shared/01/06140200.xhp 
b/source/text/shared/01/06140200.xhp
index bc3c78f0dd..314d7fef0f 100644
--- a/source/text/shared/01/06140200.xhp
+++ b/source/text/shared/01/06140200.xhp
@@ -40,7 +40,7 @@
 
 
 You can assign 
or edit shortcut keys for the current application or for all $[officename] 
applications. To assign a key for all applications, choose the 
%PRODUCTNAME radio button in the top right corner.
-To assign or modify a 
shortcut key: select a command in the Function list, select the 
key combination to be assigned in the Shortcut Keys list, then 
click Modify.
+To assign or modify a 
shortcut key: select a command in the Function list, select the 
key combination to be assigned in the Shortcut Keys list, then 
click Assign.
 If the selected 
function already has a shortcut key, it is displayed in the Keys 
list. It is possible to assign the same function to more than one 
key.
 A shortcut key assigned 
to a particular application overrides the shortcut key setting made in 
%PRODUCTNAME for all applications.
 
@@ -74,7 +74,7 @@
 
 
 Displays shortcut keys for the current 
$[officename] application.
-Modify
+Assign
 Assigns the key combination selected in the 
Shortcut keys list to the command selected in the Function 
list.
 
 Delete
diff --git a/source/text/shared/guide/scripting.xhp 
b/source/text/shared/guide/scripting.xhp
index a64c78599b..90b0a09425 100644
--- a/source/text/shared/guide/scripting.xhp
+++ b/source/text/shared/guide/scripting.xhp
@@ -101,7 +101,7 @@
 Selecting the option button sets the scope of the new key 
combination to be applicable in all of %PRODUCTNAME or only in documents of the 
current module.
  
  
-Select a key combination from the Shortcut keys 
list box and click Modify.
+Select a key combination from the Shortcut keys 
list box and click Assign.
  
   
   To assign a script to an event

[Libreoffice-commits] core.git: bin/check-missing-unittests.py

[Ilmari Lauhakangas (via logerrit)]

 bin/check-missing-unittests.py |   62 -
 1 file changed, 37 insertions(+), 25 deletions(-)

New commits:
commit 5dae4ad45be14ea5ab29308f024b8ea1dc1a02e9
Author: Ilmari Lauhakangas 
AuthorDate: Thu Sep 7 16:48:40 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Sep 14 18:00:59 2023 +0200

check-missing-unittests: change to dump JSON

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

diff --git a/bin/check-missing-unittests.py b/bin/check-missing-unittests.py
index 5ea891396d6a..0ee36ef76aaf 100755
--- a/bin/check-missing-unittests.py
+++ b/bin/check-missing-unittests.py
@@ -21,6 +21,19 @@ def splitList(lst, n):
 for i in range(0, len(lst), n):
 yield lst[i:i + n]
 
+def whiteboardNotes(whiteboard):
+if not whiteboard:
+return ''
+if ' ' in whiteboard:
+whiteboardList = reversed(whiteboard.split(' '))
+for w in whiteboardList:
+if w.startswith("unitTestNotes"):
+return w.split(':')[1]
+elif whiteboard.startswith("unitTestNotes"):
+return whiteboard.split(':')[1]
+
+return ''
+
 def main(ignoredBugs):
 results = {
 'export': {
@@ -154,7 +167,10 @@ def main(ignoredBugs):
 if bugId not in hasTestSet:
 listOfBugIdsWithoutTest.append(bugId)
 
+
 bugzillaJson = []
+resultList = []
+fixList = []
 #Split the list into different chunks for the requests, otherwise it fails
 for chunk in splitList(listOfBugIdsWithoutTest, 50):
 urlGet = 'https://bugs.documentfoundation.org/rest/bug?id=' + 
','.join(chunk)
@@ -163,49 +179,45 @@ def main(ignoredBugs):
 rGet.close()
 bugzillaJson.extend(rawData['bugs'])
 
-print()
-print('{{TopMenu}}')
-print('{{Menu}}')
-print('{{Menu.Development}}')
-print()
-print('This report is generated by ' + os.path.basename(sys.argv[0]))
-print()
-print('Date: ' + str(datetime.datetime.now()))
-print()
-print('Commits: ' + str(len(commits)))
-print()
-print('Branch: ' + branch.decode().strip())
-print()
-print('Hash: ' + str(last_hash.decode().strip()))
-
 for k,v in results.items():
-print('\n== ' + k + ' ==')
 for k1, v1 in v.items():
-print('\n=== ' + k1 + ' ===')
 for bugId, info in v1.items():
 
 resolution = ''
 keywords = []
 priority = ''
+notes = ''
 for bug in bugzillaJson:
 if str(bug['id']) == str(bugId):
 resolution = bug['resolution']
 keywords = bug['keywords']
 priority = bug['priority']
+notes = whiteboardNotes(bug['whiteboard'])
 break
 
 # Only care about FIXED bugs
 # Ignore performance bugs and accessibility bugs
 if resolution and resolution == 'FIXED' and 'perf' not in 
keywords \
 and 'accessibility' not in keywords:
-print(
-"# {} - [{}] {} - 
[https://bugs.documentfoundation.org/show_bug.cgi?id={} tdf#{}]".format(
-info[0], priority.upper(), info[1], bugId, bugId))
-
-print('\n== ignored bugs ==')
-print(' '.join(ignoredBugs))
-print()
-print('[[Category:QA]][[Category:Development]]')
+fixList.append({
+"id": bugId,
+"date": info[0],
+"priority": priority.upper(),
+"summary": info[1],
+"maintopic":k,
+"subtopic":k1,
+"notes": notes
+})
+
+resultList.append([{
+"Generator": os.path.basename(sys.argv[0]),
+"Date": str(datetime.datetime.now()),
+"Commits": str(len(commits)),
+"Branch": branch.decode().strip(),
+"Hash": str(last_hash.decode().strip()),
+}])
+resultList.append(fixList)
+print(json.dumps(resultList))
 
 def usage():
 message = """usage: {program} [bugs to ignore (each one is one argument)]

[Libreoffice-commits] core.git: basic/qa include/sal

[Ilmari Lauhakangas (via logerrit)]

 basic/qa/cppunit/basic_coverage.cxx |7 ---
 basic/qa/cppunit/basictest.cxx  |8 
 basic/qa/cppunit/test_vba.cxx   |   11 ++-
 include/sal/log-areas.dox   |1 -
 4 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 115c8b42b8db7882f3e10e7ff1ef2f48d3ef973c
Author: Ilmari Lauhakangas 
AuthorDate: Sun Sep 3 13:33:13 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sun Sep 3 13:22:55 2023 +0200

Revert "tdf#130924 replace '*printf' with 'SAL_*' logging macros."

My mistake, did not notice
https://bugs.documentfoundation.org/show_bug.cgi?id=130924#c5

We shouldn't hide test output.

This reverts commit df0db4132428e95d276e923d8d5fb603dbb7f7bb.

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

diff --git a/basic/qa/cppunit/basic_coverage.cxx 
b/basic/qa/cppunit/basic_coverage.cxx
index ee36f2d1309f..0f0722917232 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -81,15 +81,16 @@ void Coverage::process_directory(const OUString& sDirName)
 testMacro.LoadSourceFromFile("TestModule", sFileURL);
 SbxVariableRef pReturn = testMacro.Run();
 CPPUNIT_ASSERT_MESSAGE("No return variable huh?", 
pReturn.is());
-SAL_INFO("basic.qa", "macro result for " << sFileURL);
-SAL_INFO("basic.qa", "macro returned:\n" << 
pReturn->GetOUString());
+fprintf(stderr, "macro result for %s\n", 
OUStringToOString(sFileURL,RTL_TEXTENCODING_UTF8).getStr());
+fprintf(stderr, "macro returned:\n%s\n",
+OUStringToOString(pReturn->GetOUString(), 
RTL_TEXTENCODING_UTF8).getStr());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", 
OUString("OK"),
  pReturn->GetOUString());
 }
 }
 }
 }
-SAL_INFO("basic.qa", "end process directory");
+fprintf(stderr,"end process directory\n");
 }
 
 void Coverage::Coverage_Iterator()
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index ebf39635620a..8cf9812d5212 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
 #include "basictest.hxx"
 #include 
 #include 
@@ -43,7 +42,7 @@ MacroSnippet::MacroSnippet()
 void MacroSnippet::LoadSourceFromFile(const OUString& sModuleName, const 
OUString& sMacroFileURL)
 {
 OUString sSource;
-SAL_INFO("basic.qa", "loadSource opening macro file" << sMacroFileURL);
+fprintf(stderr,"loadSource opening macro file %s\n", OUStringToOString( 
sMacroFileURL, RTL_TEXTENCODING_UTF8 ).getStr() );
 
 osl::File aFile(sMacroFileURL);
 if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
@@ -113,8 +112,9 @@ const ErrCode& MacroSnippet::getError() const { return 
maErrCode; }
 
 IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
 {
-SAL_INFO("basic.qa", '(' << StarBASIC::GetLine() << ':' << 
StarBASIC::GetCol1() << ")");
-SAL_INFO("basic.qa", "Basic error: " << StarBASIC::GetErrorText());
+fprintf(stderr,"(%d:%d)\n",
+StarBASIC::GetLine(), StarBASIC::GetCol1());
+fprintf(stderr,"Basic error: %s\n", OUStringToOString( 
StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
 mbError = true;
 maErrCode = StarBASIC::GetErrorCode();
 return false;
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index a95e2db6a7bd..8a15ba7234e8 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -6,7 +6,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#include 
 #include "basictest.hxx"
 #include 
 
@@ -169,8 +168,9 @@ void VBATest::testMiscVBAFunctions()
 myMacro.LoadSourceFromFile("TestModule", sMacroURL);
 SbxVariableRef pReturn = myMacro.Run();
 CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn.is());
-SAL_INFO("basic.qa", "macro result for" << macroSource[i]);
-SAL_INFO("basic.qa", "macro returned:\n" << pReturn->GetOUString());
+fprintf(stderr, "macro result for %s\n", macroSource[i]);
+fprintf(stderr, "macro returned:\n%s\n",
+OUStringToOString(pReturn->GetOUString(), 
RTL_TEXTENCODING_UTF8).getStr());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"),
  pReturn->GetOUString());
 }
@@ -248,8 +248,9 @@ void VBATest::testMiscOLEStuff()
 

[Libreoffice-commits] core.git: sw/uiconfig

[Ilmari Lauhakangas (via logerrit)]

 sw/uiconfig/swriter/ui/a11ycheckissuespanel.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53fed6a869d0fa983dd28a2f4c62b46d1e67a9f5
Author: Ilmari Lauhakangas 
AuthorDate: Tue Aug 29 12:18:20 2023 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Wed Aug 30 14:13:40 2023 +0200

a11ycheckissuespanel.ui: rename label from Fakes to Simulated captions

Change-Id: I8f46ac64dfb5cd72454abcc43dd2589da7091380
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156238
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sw/uiconfig/swriter/ui/a11ycheckissuespanel.ui 
b/sw/uiconfig/swriter/ui/a11ycheckissuespanel.ui
index 35cae66a0b04..cef9c692178f 100644
--- a/sw/uiconfig/swriter/ui/a11ycheckissuespanel.ui
+++ b/sw/uiconfig/swriter/ui/a11ycheckissuespanel.ui
@@ -213,7 +213,7 @@
   
 True
 False
-Fakes
+Simulated captions
   
 
   

[Libreoffice-commits] core.git: cui/uiconfig xmlsecurity/uiconfig

[Ilmari Lauhakangas (via logerrit)]

 cui/uiconfig/ui/signsignatureline.ui   |2 +-
 xmlsecurity/uiconfig/ui/selectcertificatedialog.ui |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 453af38f46ad4c2eb3125b8d2967c91b950b3c50
Author: Ilmari Lauhakangas 
AuthorDate: Tue May 2 11:23:19 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Tue May 2 14:54:34 2023 +0200

tdf#155049 Revert "tdf#115884 PDF signing should mention
it only works with x509 certificates"

This reverts commit a1146fd95022196636f8c41f7322a7257955cef4.

Reason for revert: needs special case for PDFs as this dialog
is also used when signing ODF files

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

diff --git a/cui/uiconfig/ui/signsignatureline.ui 
b/cui/uiconfig/ui/signsignatureline.ui
index ade411ed260a..12a68f2c855c 100644
--- a/cui/uiconfig/ui/signsignatureline.ui
+++ b/cui/uiconfig/ui/signsignatureline.ui
@@ -148,7 +148,7 @@
 
 
   
-Select X.509 
Certificate
+Select Certificate
 True
 True
 True
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui 
b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index 6683790559e6..3296173792f7 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -21,7 +21,7 @@
   
 False
 6
-Select X.509 
Certificate
+Select 
Certificate
 False
 True
 dialog

[Libreoffice-commits] core.git: dictionaries

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 1b52ec38dd338932255aa94411ad90f83ed02d9e
Author: Ilmari Lauhakangas 
AuthorDate: Tue Apr 4 08:35:21 2023 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Apr 4 07:35:21 2023 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to ff606081bb42acb96611ff232f5606dd76f411bf
  - tdf#154459 Improve grammar for hlp_ellipsis

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

diff --git a/dictionaries b/dictionaries
index bcf7f049315d..ff606081bb42 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit bcf7f049315dee2001cc2f7c7eabfbcb0b8ef21a
+Subproject commit ff606081bb42acb96611ff232f5606dd76f411bf

[Libreoffice-commits] dictionaries.git: en/dialog pt_BR/dialog

[Ilmari Lauhakangas (via logerrit)]

 en/dialog/en_en_US.properties   |2 +-
 pt_BR/dialog/pt_BR_en_US.properties |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff606081bb42acb96611ff232f5606dd76f411bf
Author: Ilmari Lauhakangas 
AuthorDate: Tue Apr 4 08:25:03 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Apr 4 07:35:20 2023 +0200

tdf#154459 Improve grammar for hlp_ellipsis

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

diff --git a/en/dialog/en_en_US.properties b/en/dialog/en_en_US.properties
index c25a6e0..0e43ded 100644
--- a/en/dialog/en_en_US.properties
+++ b/en/dialog/en_en_US.properties
@@ -26,7 +26,7 @@ hlp_minus=Change hyphen characters to real minus signs.
 minus=Minus sign
 hlp_apostrophe=Change typewriter apostrophe, single quotation marks and 
correct double primes.
 apostrophe=Apostrophe
-hlp_ellipsis=Change three dots with ellipsis.
+hlp_ellipsis=Replace three dots with ellipsis.
 ellipsis=Ellipsis
 others=Others
 hlp_metric=Measurement conversion from \u00b0F, mph, ft, in, lb, gal and miles.
diff --git a/pt_BR/dialog/pt_BR_en_US.properties 
b/pt_BR/dialog/pt_BR_en_US.properties
index 41cfa0e..e029eb6 100644
--- a/pt_BR/dialog/pt_BR_en_US.properties
+++ b/pt_BR/dialog/pt_BR_en_US.properties
@@ -26,7 +26,7 @@ hlp_minus=Change hyphen characters to real minus signs.
 minus=Minus sign
 hlp_apostrophe=Change typewriter apostrophe, single quotation marks and 
correct double primes.
 apostrophe=Apostrophes
-hlp_ellipsis=Change three dots with ellipsis.
+hlp_ellipsis=Replace three dots with ellipsis.
 ellipsis=Ellipsis
 others=Others
 hlp_metric=Identify redundant terms: "criar novo", "subir para cima", "beco 
sem sa\u00EDda", "regra geral".

[Libreoffice-commits] core.git: oox/source

[Ilmari Lauhakangas (via logerrit)]

 oox/source/export/ooxml-export-notes.txt |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f51ea7a8ec9150006c0fa8d9a9cfccadb61c014b
Author: Ilmari Lauhakangas 
AuthorDate: Mon Mar 27 14:09:58 2023 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Mar 27 11:34:16 2023 +

tdf#153362 oox: remove dead link from ooxml-export-notes.txt

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

diff --git a/oox/source/export/ooxml-export-notes.txt 
b/oox/source/export/ooxml-export-notes.txt
index 36c42fc53df4..1da7ffd2f12a 100644
--- a/oox/source/export/ooxml-export-notes.txt
+++ b/oox/source/export/ooxml-export-notes.txt
@@ -20,7 +20,6 @@ OOXML generally
 ---
 
 - http://www.ecma-international.org/publications/standards/Ecma-376.htm
-- http://www.asahi-net.or.jp/~eb2m-mrt/ooxml/dependencies.html
 
 Related modules
 ---

[Libreoffice-commits] core.git: bridges/source

[Ilmari Lauhakangas (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 2252313a90b6561f2746e05dae99551701550201
Author: Ilmari Lauhakangas 
AuthorDate: Mon Mar 20 14:26:58 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Mar 22 19:28:23 2023 +

bridges: drop unnecessary debug message

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

diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
index 11d60fdeab44..986be00c6fc5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
@@ -369,9 +369,6 @@ static typelib_TypeClass cpp_mediate(
 
 TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
 
-OString cstr( OUStringToOString( aMemberDescr.get()->pTypeName, 
RTL_TEXTENCODING_ASCII_US ) );
-SAL_WARN("bridges", "calling " << cstr.getStr() << ", nFunctionIndex=" << 
nFunctionIndex);
-
 typelib_TypeClass eRet;
 switch (aMemberDescr.get()->eTypeClass)
 {

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 468fbbc0f5676ec5a630041f835940f673888d83
Author: Ilmari Lauhakangas 
AuthorDate: Mon Mar 20 21:53:35 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Mar 20 19:53:35 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7222dc792d578f9640d5d8760041569b29e7f0c1
  - tdf#147469 remove mouse "Positioning" from View options help

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

diff --git a/helpcontent2 b/helpcontent2
index 5ba7b847709a..7222dc792d57 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5ba7b847709a22714cb276d0bc9d12b7ea204d50
+Subproject commit 7222dc792d578f9640d5d8760041569b29e7f0c1

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/shared/optionen/01010800.xhp |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 7222dc792d578f9640d5d8760041569b29e7f0c1
Author: Ilmari Lauhakangas 
AuthorDate: Mon Mar 20 21:50:23 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Mar 20 19:53:34 2023 +

tdf#147469 remove mouse "Positioning" from View options help

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

diff --git a/source/text/shared/optionen/01010800.xhp 
b/source/text/shared/optionen/01010800.xhp
index 339657ee90..bd0349c261 100644
--- a/source/text/shared/optionen/01010800.xhp
+++ b/source/text/shared/optionen/01010800.xhp
@@ -37,7 +37,6 @@
   previews; fonts lists
   font lists
   font name box
-  mouse; positioning
   mouse; middle button
   clipboard; selection clipboard
   selection clipboard
@@ -87,10 +86,6 @@
 
 Mouse
 
-Positioning
-Specifies if and how the mouse pointer will 
be positioned in newly opened dialogs.
-
-
 Middle button
 Defines the function of the middle mouse 
button.
 

[Libreoffice-commits] core.git: bridges/source

[Ilmari Lauhakangas (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e6c9ff68fafadc3d445720df2438d4e370cc816
Author: Ilmari Lauhakangas 
AuthorDate: Sat Mar 18 12:25:23 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Sat Mar 18 10:28:35 2023 +

bridges: add whitespace to SAL_INFO

Missed in 7a8ec6cddc9f37ba6ff1a98ad39702521c8fb36b

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

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 9fa6810d44da..9bce77bc8468 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -156,7 +156,7 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription 
const & pTypeDescr)
 // the symbol is prefixed with _ZTI
 char const * rttiName = symName.getStr() +4;
 
-SAL_INFO("bridges", "Generated rtti for" << rttiName);
+SAL_INFO("bridges", "Generated rtti for " << rttiName);
 
 std::unique_ptr newRtti;
 switch (pTypeDescr.eTypeClass) {

[Libreoffice-commits] core.git: sw/qa

[Ilmari Lauhakangas (via logerrit)]

 sw/qa/extras/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a1f86eb7cc5b3eaaec74501f472dfd0358b463c
Author: Ilmari Lauhakangas 
AuthorDate: Mon Mar 6 13:49:36 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Mar 6 11:52:25 2023 +

sw/qa/extras/README: update test suite name

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

diff --git a/sw/qa/extras/README b/sw/qa/extras/README
index 284979d8a90d..66bca01e63a0 100644
--- a/sw/qa/extras/README
+++ b/sw/qa/extras/README
@@ -144,7 +144,7 @@ If you want to run only a single test to allow quick 
development iteration,
 then use `CPPUNIT_TEST_NAME` to specify the name of the single test:
 
 
-CPPUNIT_TEST_NAME="testTdf91074" make -sr CppunitTest_sw_rtfimport
+CPPUNIT_TEST_NAME="testTdf91074" make -sr CppunitTest_sw_rtfexport6
 
 
 == UNO, in more details, various tips:

[Libreoffice-commits] core.git: solenv/clang-format

[Ilmari Lauhakangas (via logerrit)]

 solenv/clang-format/check-last-commit |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 0fcc2f933e588f5a9fa19f3decf91874d935ecfa
Author: Ilmari Lauhakangas 
AuthorDate: Fri Feb 10 08:12:16 2023 +
Commit: Ilmari Lauhakangas 
CommitDate: Fri Feb 10 08:12:26 2023 +

Revert "check-last-commit: more detailed advice on using clang-format"

This reverts commit f59d449ecfc078765dfaa2e150a21a7e4b330932.

Reason for revert: confusing

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

diff --git a/solenv/clang-format/check-last-commit 
b/solenv/clang-format/check-last-commit
index bd26258c5ad4..0de5ac4b0783 100755
--- a/solenv/clang-format/check-last-commit
+++ b/solenv/clang-format/check-last-commit
@@ -65,11 +65,7 @@ sub check_style()
 {
 print("\nERROR: The above differences were found between the code to 
commit \n");
 print("and the clang-format rules. Tips:\n");
-print("\n- On your local machine you may check how clang-format would 
modify the problematic file by saying\n");
-print("  diff --unified  <(/opt/lo/bin/clang-format 
)\n");
-print("- NOTE: you should only correct the lines that you changed. Do 
not add unrelated formatting to your patch.\n");
-print("- If the suggested corrections only apply to the lines you 
changed, you may run\n");
-print("  '/opt/lo/bin/clang-format -i ' to fix up 
style automatically.\n");
+print("\n- You may run '/opt/lo/bin/clang-format -i ' to fix up style automatically.\n");
 print("- See solenv/clang-format/README on where to get the required 
version of clang-format binaries.\n");
 print("- If you renamed an excluded file, update 
solenv/clang-format/excludelist accordingly to keep it excluded.\n");
 print("\nsolenv/clang-format/check-last-commit: KO\n");

[Libreoffice-commits] core.git: solenv/clang-format

[Ilmari Lauhakangas (via logerrit)]

 solenv/clang-format/check-last-commit |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f59d449ecfc078765dfaa2e150a21a7e4b330932
Author: Ilmari Lauhakangas 
AuthorDate: Thu Feb 9 12:45:37 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Thu Feb 9 15:44:41 2023 +

check-last-commit: more detailed advice on using clang-format

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

diff --git a/solenv/clang-format/check-last-commit 
b/solenv/clang-format/check-last-commit
index 0de5ac4b0783..bd26258c5ad4 100755
--- a/solenv/clang-format/check-last-commit
+++ b/solenv/clang-format/check-last-commit
@@ -65,7 +65,11 @@ sub check_style()
 {
 print("\nERROR: The above differences were found between the code to 
commit \n");
 print("and the clang-format rules. Tips:\n");
-print("\n- You may run '/opt/lo/bin/clang-format -i ' to fix up style automatically.\n");
+print("\n- On your local machine you may check how clang-format would 
modify the problematic file by saying\n");
+print("  diff --unified  <(/opt/lo/bin/clang-format 
)\n");
+print("- NOTE: you should only correct the lines that you changed. Do 
not add unrelated formatting to your patch.\n");
+print("- If the suggested corrections only apply to the lines you 
changed, you may run\n");
+print("  '/opt/lo/bin/clang-format -i ' to fix up 
style automatically.\n");
 print("- See solenv/clang-format/README on where to get the required 
version of clang-format binaries.\n");
 print("- If you renamed an excluded file, update 
solenv/clang-format/excludelist accordingly to keep it excluded.\n");
 print("\nsolenv/clang-format/check-last-commit: KO\n");

[Libreoffice-commits] core.git: opencl/source

[Ilmari Lauhakangas (via logerrit)]

 opencl/source/opencl_device.cxx |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit c544f9ea78eab46c4f5230273a5a8571b28ea84d
Author: Ilmari Lauhakangas 
AuthorDate: Thu Feb 2 16:19:11 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Fri Feb 3 07:13:52 2023 +

Use raw string literal in opencl to keep PMD static analyser happy

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

diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx
index ca9f4f43b5d1..e8712cb5a745 100644
--- a/opencl/source/opencl_device.cxx
+++ b/opencl/source/opencl_device.cxx
@@ -30,8 +30,6 @@
 #define INPUTSIZE  15360
 #define OUTPUTSIZE 15360
 
-#define STRINGIFY(...) #__VA_ARGS__"\n"
-
 namespace {
 
 void DS_CHECK_STATUS(cl_int status, char const * name) {
@@ -55,13 +53,13 @@ struct LibreOfficeDeviceEvaluationIO
 tools::ULong outputSize;
 };
 
-const char* source = STRINGIFY(
-\n#if defined(KHR_DP_EXTENSION)
-\n#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-\n#elif defined(AMD_DP_EXTENSION)
-\n#pragma OPENCL EXTENSION cl_amd_fp64 : enable
-\n#endif
-\n
+const char* source = R"delimit(
+#if defined(KHR_DP_EXTENSION)
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
+#elif defined(AMD_DP_EXTENSION)
+#pragma OPENCL EXTENSION cl_amd_fp64 : enable
+#endif
+
 int isNan(fp_t a) { return a != a; }
 fp_t fsum(fp_t a, fp_t b) { return a + b; }
 
@@ -108,7 +106,7 @@ const char* source = STRINGIFY(
 fp_t tmp1 = fMin(input1) * fSoP(input2, input3);
 result[gid0] = fsum(tmp0, tmp1);
 }
-);
+)delimit";
 
 size_t sourceSize[] = { strlen(source) };
 

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 8 commits - comphelper/source dbaccess/source external/python3 readlicense_oo/docs sc/qa sc/source svx/source vcl/inc vcl/win

[Ilmari Lauhakangas (via logerrit)]

Rebased ref, commits from common ancestor:
commit b13134f9142303db9516a3f28fd2234ad480c7d8
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jan 16 10:38:32 2023 +
Commit: Andras Timar 
CommitDate: Mon Jan 16 22:01:20 2023 +0100

readme.xrm: update for macOS

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

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index d01823d780d7..4d99b7c4611a 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -34,7 +34,7 @@



-   macOS 10.10 (Yosemite) or higher
+   macOS 10.14 (Mojave) or higher



commit 169892ad3c84b89389b999cfa5e090abe5550ef5
Author: Andreas Heinisch 
AuthorDate: Thu Jan 12 07:46:43 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 16 22:01:20 2023 +0100

tdf#147122 - Return cell object when a simple selection is merged

Change-Id: I4ddd3b3a804f8300a5ec15526f4c9c77aaf45fc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145378
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 
(cherry picked from commit b9411e587586750f36ba9009b5f1e29fe461d8b5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145452
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index f53389f40459..24379362bed5 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -71,6 +71,7 @@ public:
 void testTdf107572();
 void testShapeLayerId();
 void testFunctionAccessIndirect();
+void testTdf147122();
 
 CPPUNIT_TEST_SUITE(ScMacrosTest);
 CPPUNIT_TEST(testStarBasic);
@@ -105,6 +106,7 @@ public:
 CPPUNIT_TEST(testTdf107572);
 CPPUNIT_TEST(testShapeLayerId);
 CPPUNIT_TEST(testFunctionAccessIndirect);
+CPPUNIT_TEST(testTdf147122);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -898,6 +900,38 @@ void ScMacrosTest::testFunctionAccessIndirect()
 CPPUNIT_ASSERT_EQUAL(css::uno::Any(OUString("a1")), aResult);
 }
 
+void ScMacrosTest::testTdf147122()
+{
+mxComponent = loadFromDesktop("private:factory/scalc");
+
+css::uno::Reference xDocScr(mxComponent, 
UNO_QUERY_THROW);
+auto xLibs = xDocScr->getBasicLibraries();
+auto xLibrary = xLibs->createLibrary("TestLibrary");
+xLibrary->insertByName(
+"TestModule",
+uno::Any(
+OUString("Function TestMergedSelection\n"
+ // Insert test string into cell A1
+ "  oActiveSheet = 
ThisComponent.CurrentController.ActiveSheet\n"
+ "  oActiveCell = 
oActiveSheet.getCellRangeByName(\"A1\")\n"
+ "  oActiveCell.setString(\"This is a test\")\n"
+ // Merge A1:B2 cell range and return the content of the 
merged range
+ "  oRange = oActiveSheet.getCellRangeByName(\"A1:B2\")\n"
+ "  ThisComponent.getCurrentController.Select(oRange)\n"
+ "  oActiveCell = ThisComponent.CurrentSelection\n"
+ "  oActiveCell.Merge(True)\n"
+ "  TestMergedSelection = 
ThisComponent.getCurrentSelection().getString()\n"
+ "End Function\n")));
+
+Any aRet = 
executeMacro("vnd.sun.Star.script:TestLibrary.TestModule.TestMergedSelection?"
+"language=Basic=document");
+// Without the fix in place, this test would have failed with
+// - Expression: false
+// - Unexpected dialog: Error: BASIC runtime error.
+// Property or method not found: getString.
+CPPUNIT_ASSERT_EQUAL(Any(OUString("This is a test")), aRet);
+}
+
 ScMacrosTest::ScMacrosTest()
   : UnoApiXmlTest("/sc/qa/extras/testdocuments")
 {
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 5a7a8a391427..f8940594746c 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -872,7 +873,13 @@ uno::Any SAL_CALL ScTabViewObj::getSelection()
 ScMarkType eMarkType = rViewData.GetSimpleArea(aRange);
 if ( nTabs == 1 && (eMarkType == SC_MARK_SIMPLE) )
 {
-if (aRange.aStart == aRange.aEnd)
+// tdf#147122 - return cell object when a simple selection is 
merged
+ScDocument& rDoc = pDocSh->GetDocument();
+const ScPatternAttr* pMarkPattern = rDoc.GetPattern(aRange.aStart);
+if (aRange.aStart == aRange.aEnd
+|| (pMarkPattern
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 12 commits - comphelper/source configure.ac dbaccess/source external/lcms2 external/openssl external/pdfium external/python3 readli

[Ilmari Lauhakangas (via logerrit)]

 comphelper/source/misc/SelectionMultiplex.cxx   |3 
 configure.ac|2 
 dbaccess/source/ui/uno/copytablewizard.cxx  |2 
 external/lcms2/ExternalPackage_lcms2.mk |4 
 external/openssl/ExternalProject_openssl.mk |4 
 external/pdfium/UnpackedTarball_pdfium.mk   |1 
 external/pdfium/bsd-time.patch.1|   12 ++
 external/python3/internal-zlib.patch.0  |2 
 readlicense_oo/docs/readme.xrm  |2 
 sc/qa/extras/macros-test.cxx|   34 
 sc/qa/unit/data/functions/spreadsheet/fods/hlookup.fods |   41 --
 sc/qa/unit/data/functions/spreadsheet/fods/match.fods   |   46 ---
 sc/qa/unit/data/functions/spreadsheet/fods/vlookup.fods |   65 +++-
 sc/source/core/tool/interpr1.cxx|   23 -
 sc/source/ui/unoobj/viewuno.cxx |9 +-
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx |   14 +--
 vcl/inc/win/salframe.h  |1 
 vcl/inc/win/salinst.h   |1 
 vcl/win/gdi/salnativewidgets-luna.cxx   |4 
 19 files changed, 231 insertions(+), 39 deletions(-)

New commits:
commit 9c409e6fe568bd676a6fcc21ab2fe897afc3f45c
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jan 16 10:38:32 2023 +
Commit: Andras Timar 
CommitDate: Mon Jan 16 17:41:44 2023 +0100

readme.xrm: update for macOS

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

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index d01823d780d7..4d99b7c4611a 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -34,7 +34,7 @@



-   macOS 10.10 (Yosemite) or higher
+   macOS 10.14 (Mojave) or higher



commit 1fe14bb0bc2c36ad23969ed9d2b97db2ac8a1ce1
Author: Andreas Heinisch 
AuthorDate: Thu Jan 12 07:46:43 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 16 17:41:44 2023 +0100

tdf#147122 - Return cell object when a simple selection is merged

Change-Id: I4ddd3b3a804f8300a5ec15526f4c9c77aaf45fc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145378
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 
(cherry picked from commit b9411e587586750f36ba9009b5f1e29fe461d8b5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145452
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index f53389f40459..24379362bed5 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -71,6 +71,7 @@ public:
 void testTdf107572();
 void testShapeLayerId();
 void testFunctionAccessIndirect();
+void testTdf147122();
 
 CPPUNIT_TEST_SUITE(ScMacrosTest);
 CPPUNIT_TEST(testStarBasic);
@@ -105,6 +106,7 @@ public:
 CPPUNIT_TEST(testTdf107572);
 CPPUNIT_TEST(testShapeLayerId);
 CPPUNIT_TEST(testFunctionAccessIndirect);
+CPPUNIT_TEST(testTdf147122);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -898,6 +900,38 @@ void ScMacrosTest::testFunctionAccessIndirect()
 CPPUNIT_ASSERT_EQUAL(css::uno::Any(OUString("a1")), aResult);
 }
 
+void ScMacrosTest::testTdf147122()
+{
+mxComponent = loadFromDesktop("private:factory/scalc");
+
+css::uno::Reference xDocScr(mxComponent, 
UNO_QUERY_THROW);
+auto xLibs = xDocScr->getBasicLibraries();
+auto xLibrary = xLibs->createLibrary("TestLibrary");
+xLibrary->insertByName(
+"TestModule",
+uno::Any(
+OUString("Function TestMergedSelection\n"
+ // Insert test string into cell A1
+ "  oActiveSheet = 
ThisComponent.CurrentController.ActiveSheet\n"
+ "  oActiveCell = 
oActiveSheet.getCellRangeByName(\"A1\")\n"
+ "  oActiveCell.setString(\"This is a test\")\n"
+ // Merge A1:B2 cell range and return the content of the 
merged range
+ "  oRange = oActiveSheet.getCellRangeByName(\"A1:B2\")\n"
+ "  ThisComponent.getCurrentController.Select(oRange)\n"
+ "  oActiveCell = ThisComponent.CurrentSelection\n"
+ "  oActiveCell.Merge(True)\n"
+ "  TestMergedSelection = 
ThisComponent.getCurrentSelection().getString()\n"
+ "End Function\n")));
+
+Any aRet = 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-0' - readlicense_oo/docs

[Ilmari Lauhakangas (via logerrit)]

 readlicense_oo/docs/readme.xrm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 726d976e711d6c4324bfef714faa05cb5d4823a6
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jan 16 10:38:32 2023 +
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jan 16 15:25:31 2023 +

readme.xrm: update for macOS

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

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index d01823d780d7..4d99b7c4611a 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -34,7 +34,7 @@



-   macOS 10.10 (Yosemite) or higher
+   macOS 10.14 (Mojave) or higher

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - readlicense_oo/docs

[Ilmari Lauhakangas (via logerrit)]

 readlicense_oo/docs/readme.xrm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a53d20b5fea96d7dabba6aeb142a7688bd4ba9c
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jan 16 10:38:32 2023 +
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jan 16 15:24:44 2023 +

readme.xrm: update for macOS

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

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index d01823d780d7..4d99b7c4611a 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -34,7 +34,7 @@



-   macOS 10.10 (Yosemite) or higher
+   macOS 10.14 (Mojave) or higher

[Libreoffice-commits] core.git: readlicense_oo/docs

[Ilmari Lauhakangas (via logerrit)]

 readlicense_oo/docs/readme.xrm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 531cfd9ebd27edce524c3c80688d66153644f6fa
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jan 16 12:41:51 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jan 16 12:49:55 2023 +

readme.xrm: update for macOS

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

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 99c3a1fe1884..d49f4fea2e03 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -34,7 +34,7 @@



-   macOS 10.10 (Yosemite) or higher
+   macOS 10.15 (Catalina) or higher

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - readlicense_oo/docs

[Ilmari Lauhakangas (via logerrit)]

 readlicense_oo/docs/readme.xrm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8afbd1eee5e8b8331e1a4292dcdc7bd285be76d0
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jan 16 10:37:57 2023 +
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jan 16 12:01:31 2023 +

readme.xrm: update for macOS

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

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index d01823d780d7..afc70e34bda5 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -34,7 +34,7 @@



-   macOS 10.10 (Yosemite) or higher
+   macOS 10.13 (High Sierra) or higher

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - extras/CustomTarget_gallsystem.mk extras/source solenv/bin solenv/gbuild sysui/CustomTarget_share.mk sysui/desktop

[Ilmari Lauhakangas (via logerrit)]

 extras/CustomTarget_gallsystem.mk   |2 
 extras/source/gallery/share/gallery_names.ulf   |   20 +++---
 solenv/bin/desktop-translate.py |   31 -
 solenv/gbuild/Gallery.mk|2 
 sysui/CustomTarget_share.mk |   10 ---
 sysui/desktop/menus/base.desktop|4 -
 sysui/desktop/menus/calc.desktop|4 -
 sysui/desktop/menus/draw.desktop|4 -
 sysui/desktop/menus/impress.desktop |4 -
 sysui/desktop/menus/math.desktop|4 -
 sysui/desktop/menus/startcenter.desktop |2 
 sysui/desktop/menus/writer.desktop  |4 -
 sysui/desktop/share/launcher.ulf|   80 
 sysui/desktop/share/launcher_comment.ulf|   39 ---
 sysui/desktop/share/launcher_genericname.ulf|   23 --
 sysui/desktop/share/launcher_unityquicklist.ulf |   17 -
 16 files changed, 122 insertions(+), 128 deletions(-)

New commits:
commit c9137b453b53deb980e0c475548623483779a2ed
Author: Ilmari Lauhakangas 
AuthorDate: Wed Aug 17 22:02:01 2022 +0300
Commit: Christian Lohmaier 
CommitDate: Wed Dec 21 17:05:52 2022 +

tdf#140215 Simplify the handling of .ulf files

Now the headings in the ulf files for .desktop files are
in the form [filename_Key]

Gallery names are also adjusted to fit the new scheme, where there is
no longer a need to pass a --key argument to desktop-translate.py

Sync comments with .desktop files and the remaining .ulf and remove
obsolete Mandriva Linux meta data while at it.

Script to mass-replace relevant names in translations will be
provided to infra.

Change-Id: I87e8028aa5b66f5f5560efa62ddd9b1e5b61c49c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138455
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Christian Lohmaier 
(cherry picked from commit fe8eb2c01e6f4c30eb593eb526892829dbba1804)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144672
Tested-by: Christian Lohmaier 

diff --git a/extras/CustomTarget_gallsystem.mk 
b/extras/CustomTarget_gallsystem.mk
index 271c7332ac6c..434cbb6e17dd 100644
--- a/extras/CustomTarget_gallsystem.mk
+++ b/extras/CustomTarget_gallsystem.mk
@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_workdir,extras/gallsysstr)/%.str : 
\
 $(SRCDIR)/solenv/bin/desktop-translate.py
mkdir -p $(@D)/$* && cp 
$(SRCDIR)/extras/source/gallery/gallery_system/dummy.str $(@D)/$*/$*.str && \
$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/solenv/bin/desktop-translate.py \
---ext "str" --key "name" -d $(@D)/$*/ $(@D)/extras_gallsystem.ulf 
&& \
+--ext "str" -d $(@D)/$*/ $(@D)/extras_gallsystem.ulf && \
mv $(@D)/$*/$*.str $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/share/gallery_names.ulf 
b/extras/source/gallery/share/gallery_names.ulf
index 706b23817d04..cd22cf88f368 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -7,34 +7,34 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-[arrows]
+[arrows_name]
 en-US = "Arrows"
 
-[backgrounds]
+[backgrounds_name]
 en-US = "Backgrounds"
 
-[bullets]
+[bullets_name]
 en-US= "Bullets"
 
-[bpmn]
+[bpmn_name]
 en-US = "BPMN"
 
-[diagrams]
+[diagrams_name]
 en-US = "Diagrams"
 
-[flowchart]
+[flowchart_name]
 en-US = "Flow chart"
 
-[icons]
+[icons_name]
 en-US = "Icons"
 
-[network]
+[network_name]
 en-US = "Network"
 
-[shapes]
+[shapes_name]
 en-US = "Shapes"
 
-[sounds]
+[sounds_name]
 en-US = "Sounds"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/bin/desktop-translate.py b/solenv/bin/desktop-translate.py
index edc377dab15b..7075a51f9d97 100644
--- a/solenv/bin/desktop-translate.py
+++ b/solenv/bin/desktop-translate.py
@@ -54,7 +54,6 @@ def encode_desktop_string(s_value):
 parser = argparse.ArgumentParser()
 parser.add_argument("-p", dest="productname", default="LibreOffice")
 parser.add_argument("-d", dest="workdir", default=".")
-parser.add_argument("--key", dest="key")
 parser.add_argument("--prefix", dest="prefix", default="")
 parser.add_argument("--ext", dest="ext")
 parser.add_argument("--template-dir", dest="template_dir", default=None)
@@ -67,13 +66,6 @@ if o.template_dir is None:
 else:
 template_dir = o.template_dir
 
-# hack for unity section
-if o.key == "UnityQuickList":
-OUTKEY = "Name"
-else:
-OUTKEY = o.key
-
-
 templates = {}
 
 # open input file
@@ -85,14 +77,18 @@ template = None
 for line in source:
 if line.strip() == "":
 continue
+# the headings in the ulf files for .desktop files are in the form 
[filename_Key]
 if line[0] == "[":
-template = line.split("]", 1)[0][1:]
+heading = line.split("]", 1)[0][1:]
+template = 

[Libreoffice-commits] core.git: extras/CustomTarget_gallsystem.mk extras/source solenv/bin solenv/gbuild sysui/CustomTarget_share.mk sysui/desktop

[Ilmari Lauhakangas (via logerrit)]

 extras/CustomTarget_gallsystem.mk   |2 
 extras/source/gallery/share/gallery_names.ulf   |   20 +++---
 solenv/bin/desktop-translate.py |   31 -
 solenv/gbuild/Gallery.mk|2 
 sysui/CustomTarget_share.mk |   10 ---
 sysui/desktop/menus/base.desktop|4 -
 sysui/desktop/menus/calc.desktop|4 -
 sysui/desktop/menus/draw.desktop|4 -
 sysui/desktop/menus/impress.desktop |4 -
 sysui/desktop/menus/math.desktop|4 -
 sysui/desktop/menus/startcenter.desktop |2 
 sysui/desktop/menus/writer.desktop  |4 -
 sysui/desktop/share/launcher.ulf|   80 
 sysui/desktop/share/launcher_comment.ulf|   39 ---
 sysui/desktop/share/launcher_genericname.ulf|   23 --
 sysui/desktop/share/launcher_unityquicklist.ulf |   17 -
 16 files changed, 122 insertions(+), 128 deletions(-)

New commits:
commit fe8eb2c01e6f4c30eb593eb526892829dbba1804
Author: Ilmari Lauhakangas 
AuthorDate: Wed Aug 17 22:02:01 2022 +0300
Commit: Christian Lohmaier 
CommitDate: Wed Dec 21 16:45:08 2022 +

tdf#140215 Simplify the handling of .ulf files

Now the headings in the ulf files for .desktop files are
in the form [filename_Key]

Gallery names are also adjusted to fit the new scheme, where there is
no longer a need to pass a --key argument to desktop-translate.py

Sync comments with .desktop files and the remaining .ulf and remove
obsolete Mandriva Linux meta data while at it.

Script to mass-replace relevant names in translations will be
provided to infra.

Change-Id: I87e8028aa5b66f5f5560efa62ddd9b1e5b61c49c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138455
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Christian Lohmaier 

diff --git a/extras/CustomTarget_gallsystem.mk 
b/extras/CustomTarget_gallsystem.mk
index 271c7332ac6c..434cbb6e17dd 100644
--- a/extras/CustomTarget_gallsystem.mk
+++ b/extras/CustomTarget_gallsystem.mk
@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_workdir,extras/gallsysstr)/%.str : 
\
 $(SRCDIR)/solenv/bin/desktop-translate.py
mkdir -p $(@D)/$* && cp 
$(SRCDIR)/extras/source/gallery/gallery_system/dummy.str $(@D)/$*/$*.str && \
$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/solenv/bin/desktop-translate.py \
---ext "str" --key "name" -d $(@D)/$*/ $(@D)/extras_gallsystem.ulf 
&& \
+--ext "str" -d $(@D)/$*/ $(@D)/extras_gallsystem.ulf && \
mv $(@D)/$*/$*.str $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/share/gallery_names.ulf 
b/extras/source/gallery/share/gallery_names.ulf
index 706b23817d04..cd22cf88f368 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -7,34 +7,34 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-[arrows]
+[arrows_name]
 en-US = "Arrows"
 
-[backgrounds]
+[backgrounds_name]
 en-US = "Backgrounds"
 
-[bullets]
+[bullets_name]
 en-US= "Bullets"
 
-[bpmn]
+[bpmn_name]
 en-US = "BPMN"
 
-[diagrams]
+[diagrams_name]
 en-US = "Diagrams"
 
-[flowchart]
+[flowchart_name]
 en-US = "Flow chart"
 
-[icons]
+[icons_name]
 en-US = "Icons"
 
-[network]
+[network_name]
 en-US = "Network"
 
-[shapes]
+[shapes_name]
 en-US = "Shapes"
 
-[sounds]
+[sounds_name]
 en-US = "Sounds"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/bin/desktop-translate.py b/solenv/bin/desktop-translate.py
index edc377dab15b..7075a51f9d97 100644
--- a/solenv/bin/desktop-translate.py
+++ b/solenv/bin/desktop-translate.py
@@ -54,7 +54,6 @@ def encode_desktop_string(s_value):
 parser = argparse.ArgumentParser()
 parser.add_argument("-p", dest="productname", default="LibreOffice")
 parser.add_argument("-d", dest="workdir", default=".")
-parser.add_argument("--key", dest="key")
 parser.add_argument("--prefix", dest="prefix", default="")
 parser.add_argument("--ext", dest="ext")
 parser.add_argument("--template-dir", dest="template_dir", default=None)
@@ -67,13 +66,6 @@ if o.template_dir is None:
 else:
 template_dir = o.template_dir
 
-# hack for unity section
-if o.key == "UnityQuickList":
-OUTKEY = "Name"
-else:
-OUTKEY = o.key
-
-
 templates = {}
 
 # open input file
@@ -85,14 +77,18 @@ template = None
 for line in source:
 if line.strip() == "":
 continue
+# the headings in the ulf files for .desktop files are in the form 
[filename_Key]
 if line[0] == "[":
-template = line.split("]", 1)[0][1:]
+heading = line.split("]", 1)[0][1:]
+template = heading.split("_", 1)[0]
+key = heading.split("_", 1)[1]
 entry = {}
 # For every section in the specified ulf file there should exist
 # a 

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/sbasic/guide/sample_code.xhp|4 ++--
 source/text/sbasic/python/python_import.xhp |2 +-
 source/text/sbasic/shared/03101100.xhp  |2 +-
 source/text/sbasic/shared/03120411.xhp  |2 +-
 source/text/scalc/01/04060107.xhp   |4 ++--
 source/text/scalc/01/04060183.xhp   |2 +-
 source/text/scalc/01/04060185.xhp   |2 +-
 source/text/scalc/01/func_imcot.xhp |2 +-
 source/text/sdatabase/dabawiz02oracle.xhp   |2 +-
 source/text/sdatabase/dabawiz02text.xhp |2 +-
 source/text/shared/01/05020301.xhp  |2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 1445fa8fda93a2f0ffab873c926390adb4937397
Author: Ilmari Lauhakangas 
AuthorDate: Mon Dec 19 18:12:17 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Dec 19 16:22:00 2022 +

Fix duplicate IDs in non-localized content

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

diff --git a/source/text/sbasic/guide/sample_code.xhp 
b/source/text/sbasic/guide/sample_code.xhp
index 3b38f6946c..b6721f2dc8 100644
--- a/source/text/sbasic/guide/sample_code.xhp
+++ b/source/text/sbasic/guide/sample_code.xhp
@@ -40,7 +40,7 @@
 
Programming Examples for Controls in 
the Dialog Editor

-  
+
 The following 
examples are for a new dialog called "Dialog1". Use 
the tools on the Toolbox bar in the dialog editor to create the 
dialog and add the following controls: a Check Box called 
"CheckBox1", a Label Field called "Label1", a Button 
called "CommandButton1", and a List Box called 
"ListBox1".
 Be consistent 
with uppercase and lowercase letter when you attach a control to an object 
variable.
 Global 
Function for Loading Dialogs
@@ -76,7 +76,7 @@
 
 Sub Sample1
 With GlobalScope.Basiclibraries
-   If Not .IsLibraryLoaded("Tools") Then 
.LoadLibrary("Tools")
+   If Not .IsLibraryLoaded("Tools") Then 
.LoadLibrary("Tools")
 End With
 oDialog1 = Tools.LoadDialog("Standard", 
"Dialog1")
 REM get 
dialog model
diff --git a/source/text/sbasic/python/python_import.xhp 
b/source/text/sbasic/python/python_import.xhp
index da92932beb..ad53db487c 100644
--- a/source/text/sbasic/python/python_import.xhp
+++ b/source/text/sbasic/python/python_import.xhp
@@ -66,7 +66,7 @@
 Importing a Python document 
embedded module is illustrated below. Error handling is not detailed. Python 
run time path is updated when document has been opened and before closure. 
Refer to Event-Driven 
Macros to learn how to associate Python macros to document 
events.
 
 # -*- coding: 
utf-8 -*-
-from __future__ 
import unicode_literals
+from __future__ 
import unicode_literals
 
 import sys, 
uno
 
diff --git a/source/text/sbasic/shared/03101100.xhp 
b/source/text/sbasic/shared/03101100.xhp
index 82ddc1f24b..2500d928ad 100644
--- a/source/text/sbasic/shared/03101100.xhp
+++ b/source/text/sbasic/shared/03101100.xhp
@@ -59,7 +59,7 @@
 DefCur 
c,l-m
 DefDate 
t
 DefDbl 
f
-DefErr 
e
+DefErr 
e
 DefInt 
i-k,N
 DefLng 
x-z, D
 DefObj 
U, o-R
diff --git a/source/text/sbasic/shared/03120411.xhp 
b/source/text/sbasic/shared/03120411.xhp
index 40300eaed0..31327d0466 100644
--- a/source/text/sbasic/shared/03120411.xhp
+++ b/source/text/sbasic/shared/03120411.xhp
@@ -64,7 +64,7 @@
  iPos = 
InStrRev(sInput,"the",10,1) ' Returns 1, search is case-insensitive
  Print iPos 
  iPos = 
InStrRev(sInput,"the",10,0) ' Returns 0, search is case-sensitive
- Print iPos
+ Print iPos
 End Sub
 
 
diff --git a/source/text/scalc/01/04060107.xhp 
b/source/text/scalc/01/04060107.xhp
index 08eabd6926..079811675f 100644
--- a/source/text/scalc/01/04060107.xhp
+++ b/source/text/scalc/01/04060107.xhp
@@ -699,7 +699,7 @@
   
   
 
-  9
+  9
 
 
   4
@@ -1034,7 +1034,7 @@
 A
 
 
-B
+B
 
 
 C
diff --git a/source/text/scalc/01/04060183.xhp 
b/source/text/scalc/01/04060183.xhp
index c13d0a6fed..b0c96d5c13 100644
--- a/source/text/scalc/01/04060183.xhp
+++ b/source/text/scalc/01/04060183.xhp
@@ -316,7 +316,7 @@
 
 
 
-COM.MICROSOFT.LOGNORM.DIST
+COM.MICROSOFT.LOGNORM.DIST
 
 
 
diff --git a/source/text/scalc/01/04060185.xhp 
b/source/text/scalc/01/04060185.xhp
index 97ba4ce5a7..fa3662d734 100644
--- a/source/text/scalc/01/04060185.xhp
+++ b/source/text/scalc/01/04060185.xhp
@@ -436,7 +436,7 @@
 
 
 
-COM.MICROSOFT.T.INV
+COM.MICROSOFT.T.INV
 
 
 
diff --git a/source/text/scalc/01/func_imcot.xhp 
b/source/text/scalc/01/func_imcot.xhp
index 7155400177..20d572a62c 100644
--- a/source/text/scalc/01/func_imcot.xhp
+++ b/source/text/scalc/01/func_imcot.xhp
@@ -63,7 +63,7 @@

 

-   
+ 

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 3debc5161ef52afe822552caa6e288348f06928c
Author: Ilmari Lauhakangas 
AuthorDate: Mon Dec 19 18:22:01 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Dec 19 16:22:01 2022 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1445fa8fda93a2f0ffab873c926390adb4937397
  - Fix duplicate IDs in non-localized content

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

diff --git a/helpcontent2 b/helpcontent2
index 318ec1f0e624..1445fa8fda93 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 318ec1f0e6248eac2536256bf26e1a183fc59541
+Subproject commit 1445fa8fda93a2f0ffab873c926390adb4937397

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 8cc14b57d0a0583c48c22231ede9af9932fb9e0a
Author: Ilmari Lauhakangas 
AuthorDate: Mon Dec 19 12:05:14 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Dec 19 10:05:14 2022 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to e739da903b92597316aeac26ec190a8d7c7bec28
  - convertfilters.py: Don't add name attribute to links

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

diff --git a/helpcontent2 b/helpcontent2
index c8611c6e320b..e739da903b92 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c8611c6e320bf5db95a6d1fa54d3ff6e13f9eaa7
+Subproject commit e739da903b92597316aeac26ec190a8d7c7bec28

[Libreoffice-commits] help.git: helpers/convertfilters.py

[Ilmari Lauhakangas (via logerrit)]

 helpers/convertfilters.py |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e739da903b92597316aeac26ec190a8d7c7bec28
Author: Ilmari Lauhakangas 
AuthorDate: Mon Dec 19 12:03:15 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Dec 19 10:05:13 2022 +

convertfilters.py: Don't add name attribute to links

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

diff --git a/helpers/convertfilters.py b/helpers/convertfilters.py
index 8f4d4b5cc9..7fc3e39596 100755
--- a/helpers/convertfilters.py
+++ b/helpers/convertfilters.py
@@ -74,16 +74,16 @@ output = '''
 module file filters
 
 
-File 
Conversion Filter Names
+File Conversion Filter 
Names
 
 
 
-Tables with filter names for command 
line document conversion.
+Tables with filter names for command line document 
conversion.
 
 
 
 Usage
-Filter names are used 
when importing and exporting files in alien formats and converting files 
formats through the command line.
+Filter names are used 
when importing and exporting files in alien formats and converting files 
formats through the command 
line.
 soffice --convert-to 
OutputFileExtension[:OutputFilterName[:OutputFilterParams[,param]]] [--outdir 
output_dir]
 
 soffice 
--infilter=InputFilterName[:InputFilterParams[,param]]

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit feac23289bc28799b7cac9954aef1062098b3eca
Author: Ilmari Lauhakangas 
AuthorDate: Mon Dec 19 12:00:56 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Dec 19 10:00:56 2022 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to c8611c6e320bf5db95a6d1fa54d3ff6e13f9eaa7
  - Remove name attribute from links

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

diff --git a/helpcontent2 b/helpcontent2
index 534e501e3ad4..c8611c6e320b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 534e501e3ad4fef3ebee8788b45c063e96d50346
+Subproject commit c8611c6e320bf5db95a6d1fa54d3ff6e13f9eaa7

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/sbasic/shared/03/sf_calc.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c8611c6e320bf5db95a6d1fa54d3ff6e13f9eaa7
Author: Ilmari Lauhakangas 
AuthorDate: Mon Dec 19 11:58:25 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Dec 19 10:00:56 2022 +

Remove name attribute from links

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

diff --git a/source/text/sbasic/shared/03/sf_calc.xhp 
b/source/text/sbasic/shared/03/sf_calc.xhp
index 3fb471e40a..94c8fbdb07 100644
--- a/source/text/sbasic/shared/03/sf_calc.xhp
+++ b/source/text/sbasic/shared/03/sf_calc.xhp
@@ -794,7 +794,7 @@
   
 myDoc.ClearFormats("SheetX.*")
   
-  Refer to the ClearAll method documentation for examples on how 
to use the arguments filterformula and 
filterscope.
+  Refer to the ClearAll
 method documentation for examples on how to use the arguments 
filterformula and filterscope.
 
 
 
@@ -821,7 +821,7 @@
   
 myDoc.ClearValues("SheetX.A1:F10")
   
-  Refer to the ClearAllliteral> method documentation for 
examples on how to use the arguments filterformula and 
filterscope.
+  Refer to the ClearAllliteral>
 method documentation for examples on how to use the arguments 
filterformula and filterscope.
 
 
 
@@ -1806,7 +1806,7 @@
 myDoc.SetCellStyle("A1:J1", "Heading 1")
 myDoc.SetCellStyle("A2:J100", "Neutral")
   
-  Refer to the ClearAll method documentation for examples on how 
to use the arguments filterformula and 
filterscope.
+  Refer to the ClearAll
 method documentation for examples on how to use the arguments 
filterformula and filterscope.
 
 
 

[Libreoffice-commits] dev-tools.git: help3/xhpeditor

[Ilmari Lauhakangas (via logerrit)]

 help3/xhpeditor/snippets.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b1b1ad1e4b562ee56eeeb87619732beff46da8b9
Author: Ilmari Lauhakangas 
AuthorDate: Mon Dec 19 09:47:40 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Dec 19 07:49:08 2022 +

Remove name attribute from  snippets

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

diff --git a/help3/xhpeditor/snippets.js b/help3/xhpeditor/snippets.js
index e519a50d..207e493c 100644
--- a/help3/xhpeditor/snippets.js
+++ b/help3/xhpeditor/snippets.js
@@ -20,7 +20,7 @@ function startNewXHPDoc() {
 }
 function docHeading() {
 var a1 = '\n\n';
-var a2 = 'CHANGE ME\n';
+var a2 = 'CHANGE ME\n';
 var a3 = 'CHANGE 
ME\n\n\n';
 editor.replaceRange(a1 + a2 + a3 , editor.doc.getCursor());
 }
@@ -219,7 +219,7 @@ function tEmbedvar(){
 editor.replaceRange(a1, editor.doc.getCursor());
 }
  function tLink(){
- var a1 ='';
+ var a1 ='';
  var a2 = '';
  editor.replaceSelection(a1 + editor.doc.getSelection() + a2,'');
 }

[Libreoffice-commits] core.git: configure.ac README.md

[Ilmari Lauhakangas (via logerrit)]

 README.md|2 +-
 configure.ac |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c7b93e2687af1bf26b0843e3d815effd129752f6
Author: Ilmari Lauhakangas 
AuthorDate: Wed Dec 14 11:46:55 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Wed Dec 14 15:22:52 2022 +

Bump minimum macOS to 10.15

This gives us support for filesystem library
(after GCC is bumped to >7)

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

diff --git a/README.md b/README.md
index bd1528f321ee..1dda3212ea13 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: Windows 7
 * Build: Cygwin + Visual Studio 2019 version 16.10
 * macOS:
-* Runtime: 10.14
+* Runtime: 10.15
 * Build: 11.0 + Xcode 12.5
 * Linux:
 * Runtime: RHEL 7 or CentOS 7
diff --git a/configure.ac b/configure.ac
index c5a7ee205090..44c984df8440 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2882,7 +2882,7 @@ AC_ARG_WITH(macosx-version-min-required,
 AS_HELP_STRING([--with-macosx-version-min-required=],
 [set the minimum OS version needed to run the built LibreOffice])
 [
-  e. g.: --with-macosx-version-min-required=10.14
+  e. g.: --with-macosx-version-min-required=10.15
 ],
 ,)
 
@@ -3446,8 +3446,8 @@ if test $_os = Darwin; then
 # we don't target the lower versions anymore, so it doesn't matter that we 
don't generate the
 # correct version in case such an old SDK is specified, it will be 
rejected later anyway
 MACOSX_SDK_VERSION=$(echo $macosx_sdk | $AWK -F. '{ print 
$1*1+$2*100+$3 }')
-if test $MACOSX_SDK_VERSION -lt 101400; then
-AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported 
version is 10.14])
+if test $MACOSX_SDK_VERSION -lt 101500; then
+AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported 
version is 10.15])
 fi
 if test "$host_cpu" = arm64 -a $MACOSX_SDK_VERSION -lt 11; then
 AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported for Apple Silicon 
(need at least 11.0)])
@@ -3457,15 +3457,15 @@ if test $_os = Darwin; then
 AC_MSG_CHECKING([what minimum version of macOS to require])
 if test "$with_macosx_version_min_required" = "" ; then
 if test "$host_cpu" = x86_64; then
-with_macosx_version_min_required="10.14";
+with_macosx_version_min_required="10.15";
 else
 with_macosx_version_min_required="11.0";
 fi
 fi
 # see same notes about MACOSX_SDK_VERSION above
 MAC_OS_X_VERSION_MIN_REQUIRED=$(echo $with_macosx_version_min_required | 
$AWK -F. '{ print $1*1+$2*100+$3 }')
-if test $MAC_OS_X_VERSION_MIN_REQUIRED -lt 101400; then
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, minimum supported 
version is 10.14])
+if test $MAC_OS_X_VERSION_MIN_REQUIRED -lt 101500; then
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, minimum supported 
version is 10.15])
 fi
 AC_MSG_RESULT([$with_macosx_version_min_required])
 

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit e724de2e2e2a4ab98aef4c26945dd0ddf33e39da
Author: Ilmari Lauhakangas 
AuthorDate: Wed Dec 7 19:39:03 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Dec 7 17:39:03 2022 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7e42394ecbf921ee53160b495aa12c1cba158604
  - tdf#152323 drop name attribute from  elements

Replacement done with

find . -name \*.xhp -print0 |xargs -0 -P 0 perl -CS -pi -e \
's#(]*?) +name *="[^"]*" *( [^>]+|) *>#$1$2>#g'

(note some inconsistencies with space between name and = and also having
empty value, and some more complicated expression to also clear up
double space before/after the attribute)

translation files will be prepped with:

find */helpcontent2 -name \*.po -print0 |xargs -0 -P 0 perl -CS -pi -e \
$'s#(]*?) +name=(?:"[^"]*"|\'[^\']*\') *( [^>]+|) 
*(/?>)#$1$2$3#g unless /^#/'

(note that not all languages use the " as quote character for the
attributes, but that also single quotes appera in the po file. Hence
the use of the shell $'string' syntax to be able to quote ' as \'
It also requires to quote the backslash, so that it needs to be escaped
once for the shell, then another time for perl. Also don't work on
obsolete strings (those are prefixed with #~ in the po files)
Also note that  gets turned into  during
translation extraction (along with removal of the space between the
attribute name and the value), so the pattern needs to be slightly
different here)

Change-Id: I95e53a08e6b0095cd894109ea0de154cc4859d8f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143713
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/helpcontent2 b/helpcontent2
index 490d42493e8d..7e42394ecbf9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 490d42493e8dbec31ad58978df5084b080a36fcb
+Subproject commit 7e42394ecbf921ee53160b495aa12c1cba158604

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 90e1bf18aa33af9de8be8e489be8b5a3a8f8e940
Author: Ilmari Lauhakangas 
AuthorDate: Sat Nov 5 18:12:58 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Nov 5 17:12:58 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 717e1f64d70967254ec2379eb97c7f52c0c2ac3c
  - tdf#126917 help: correct menu path for XML Filter Settings

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

diff --git a/helpcontent2 b/helpcontent2
index 638ca29e5446..717e1f64d709 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 638ca29e5446bd2f330f8a66bcadfced725597ec
+Subproject commit 717e1f64d70967254ec2379eb97c7f52c0c2ac3c

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/shared/00/0406.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 717e1f64d70967254ec2379eb97c7f52c0c2ac3c
Author: Ilmari Lauhakangas 
AuthorDate: Sat Nov 5 18:07:13 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Sat Nov 5 17:12:55 2022 +0100

tdf#126917 help: correct menu path for XML Filter Settings

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

diff --git a/source/text/shared/00/0406.xhp 
b/source/text/shared/00/0406.xhp
index 2168512858..0520db7192 100644
--- a/source/text/shared/00/0406.xhp
+++ b/source/text/shared/00/0406.xhp
@@ -99,9 +99,9 @@
 Choose Tools - Macros - Organize Macros - 
Basic,click the Organizer 
button.
 Choose Tools - Extension 
Manager.
 Choose Tools - Extension Manager, click 
Check for Updates button.
-Choose Tools - Macros - XML Filter 
Settings.
-Tools - Macros - XML Filter Settings, 
then click New or Edit.
-Tools - Macros - XML Filter Settings, 
then click Test XSLTs.
+Choose Tools - XML Filter 
Settings.
+Tools - XML Filter Settings, then click 
New or Edit.
+Tools - XML Filter Settings, then click 
Test XSLTs.
 Choose Tools - Customize.
 Choose Tools - Customize - Menus 
tab.
 Choose Tools - Customize - Menus tab, click 
the hamburger Icon Hamburger 
menu dropdown menu and choose 
Add.

[Libreoffice-commits] core.git: solenv/bin

[Ilmari Lauhakangas (via logerrit)]

 solenv/bin/desktop-translate.py |  104 +---
 1 file changed, 55 insertions(+), 49 deletions(-)

New commits:
commit 4c3a23832ca8ee88d366e16adabea05a98ffeccb
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jul 15 11:58:41 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Jul 19 12:34:42 2022 +0200

Related: tdf#149990 solenv/bin/desktop-translate.py readability

Satisfies many pylint suggestions and includes a formatting pass with Black.

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

diff --git a/solenv/bin/desktop-translate.py b/solenv/bin/desktop-translate.py
index 639fa89af48f..edc377dab15b 100644
--- a/solenv/bin/desktop-translate.py
+++ b/solenv/bin/desktop-translate.py
@@ -16,15 +16,18 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-#
-# Translates multiple .desktop files at once with strings from .ulf
-# files; if you add new translatable .ulf files please add them to
-# l10ntools/source/localize.cxx
-#
+"""Translates multiple .desktop files at once with strings from .ulf
+files; if you add new translatable .ulf files please add them to
+l10ntools/source/localize.cxx in case the module is not already listed."""
 
-import os, sys, argparse, io
+import os
+import sys
+import argparse
+import io
 
-def encodeDesktopString(s):
+
+def encode_desktop_string(s_value):
+"""Function encoding strings to be used as values in .desktop files."""
 # 
 says "The escape sequences \s, \n, \t, \r, and \\ are 
supported for values of
 # type string and localestring, meaning ASCII space, newline, tab, 
carriage return, and
@@ -36,71 +39,72 @@ def encodeDesktopString(s):
 # supposed to relate, so just escape any U+000A LINE FEED as "\n" and any 
U+000D CARRIAGE RETURN
 # as "\r"; it is unclear exactly which occurrences of U+0020 SPACE and 
U+0009 CHARACTER
 # TABULATION would need to be escaped, so they are mostly left unescaped, 
for readability:
-s = s.replace('\\', '').replace('\n', '\\n').replace('\r', '\\r');
-if s.startswith(' '):
+s_value = s_value.replace("\\", "").replace("\n", "\\n").replace("\r", 
"\\r")
+if s_value.startswith(" "):
 # 
 says "Space before and after the equals sign should be 
ignored", so escape a
 # leading U+0020 SPACE as "\s" (while it is not clear whether "space" 
there means just
 # U+0020 SPACE or any kind of white space, in which case at least a 
leading U+0009 CHARACTER
 # TABULATION should similarly be escaped as "\t"; also, it is unclear 
whether such
 # characters should also be escaped at the end):
-s = '\\s' + s[1:]
-return s
+s_value = "\\s" + s_value[1:]
+return s_value
+
 
 parser = argparse.ArgumentParser()
-parser.add_argument('-p', dest='productname', default='LibreOffice')
-parser.add_argument('-d', dest='workdir', default='.')
-parser.add_argument('--key', dest='key')
-parser.add_argument('--prefix', dest='prefix', default='')
-parser.add_argument('--ext', dest='ext')
-parser.add_argument('--template-dir', dest='template_dir', default=None)
-parser.add_argument('ifile')
+parser.add_argument("-p", dest="productname", default="LibreOffice")
+parser.add_argument("-d", dest="workdir", default=".")
+parser.add_argument("--key", dest="key")
+parser.add_argument("--prefix", dest="prefix", default="")
+parser.add_argument("--ext", dest="ext")
+parser.add_argument("--template-dir", dest="template_dir", default=None)
+parser.add_argument("ifile")
 
 o = parser.parse_args()
 
 if o.template_dir is None:
-template_dir = '{}/{}'.format(o.workdir, o.prefix)
+template_dir = f"{o.workdir}/{o.prefix}"
 else:
 template_dir = o.template_dir
 
 # hack for unity section
 if o.key == "UnityQuickList":
-outkey = "Name"
+OUTKEY = "Name"
 else:
-outkey = o.key
+OUTKEY = o.key
 
 
 templates = {}
 
 # open input file
-source = io.open(o.ifile, encoding='utf-8')
+source = io.open(o.ifile, encoding="utf-8")
 
 template = None
 
 # read ulf file
 for line in source:
-if line.strip() == '':
+if line.strip() == "":
 continue
 if line[0] == "[":
-template = line.split(']', 1)[0][1:]
+template = line.split("]", 1)[0][1:]
 entry = {}
 # For every section in the specified ulf file there should exist
 # a template file in $workdir ..
-entry['outfile'] = "{}{}.{}".format(template_dir, template, o.ext)
-entry['translations'] = {}
+entry["outfile"] = f"{template_dir}{template}.{o.ext}"
+entry["translations"] = {}
 templates[template] = entry

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 4c5297b111fd1cd7236f9d43ccfd9cfe63e9dfbf
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 28 16:16:21 2022 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 28 15:16:21 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-4'
  to 0b51b8ac37eb73566a0ba026b706efb92b193ffb
  - Clarify AutoCorrect rules for separator lines

Change-Id: Ia3b4e2acce14b919e5fdebaf58c6040f901169ff
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136565
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 06913270253a3a6740fde42752dfec0389d2a1f2)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136540

diff --git a/helpcontent2 b/helpcontent2
index 03a7dfe5e620..0b51b8ac37eb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 03a7dfe5e6200bd6246fe71292897704b173c304
+Subproject commit 0b51b8ac37eb73566a0ba026b706efb92b193ffb

[Libreoffice-commits] help.git: Branch 'libreoffice-7-4' - source/text

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 0b51b8ac37eb73566a0ba026b706efb92b193ffb
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 28 13:41:44 2022 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 28 15:16:20 2022 +0200

Clarify AutoCorrect rules for separator lines

Change-Id: Ia3b4e2acce14b919e5fdebaf58c6040f901169ff
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136565
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 06913270253a3a6740fde42752dfec0389d2a1f2)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136540

diff --git a/source/text/swriter/01/05150100.xhp 
b/source/text/swriter/01/05150100.xhp
index ef162055c..ddee2b297 100644
--- a/source/text/swriter/01/05150100.xhp
+++ b/source/text/swriter/01/05150100.xhp
@@ -56,7 +56,7 @@
  
   
  AutoCorrect for Separator Lines
-  If you 
type three or more hyphens (---), underscores (___) or equal signs (===) on 
line and then press Enter, the paragraph is replaced by a horizontal line as 
wide as the page. The line is actually the lower border of 
the preceding paragraph. The following rules apply:
+  If you 
type three or more hyphens (---) or certain other characters in a row and then 
press Enter, the paragraph is replaced by a horizontal line as wide as the 
page. The line is actually the lower border of the preceding paragraph. The bottom 
padding of such a paragraph will be set to 0.75 mm. The following rules 
apply:
   
  
 Three hyphens (-) yield a single line (0.05 pt 
thick).

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 880d121c3ae9aade6264d8b469108109c26dcd61
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 28 16:15:03 2022 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 28 15:15:03 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-4'
  to 03a7dfe5e6200bd6246fe71292897704b173c304
  - Document all cases of AutoCorrect for separator lines

Looking at sw/source/core/edit/autofmt.cxx we can discover
all the six cases in SwAutoFormat::DoUnderline()

I don't understand what the "gap 0.75 mm" means, so I removed them.

Change-Id: Ia3e07d7c5e9bfd9581da37f99ce54374e1eb04ba
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136564
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 9c4821a20ffdaa879d326ad0537cc72d4f10f886)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136539
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 0b426bb3f291..03a7dfe5e620 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0b426bb3f2919aa34e8064de4b265a45cc6954cc
+Subproject commit 03a7dfe5e6200bd6246fe71292897704b173c304

[Libreoffice-commits] help.git: Branch 'libreoffice-7-4' - source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/swriter/01/05150100.xhp |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 03a7dfe5e6200bd6246fe71292897704b173c304
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 28 13:02:13 2022 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 28 15:15:00 2022 +0200

Document all cases of AutoCorrect for separator lines

Looking at sw/source/core/edit/autofmt.cxx we can discover
all the six cases in SwAutoFormat::DoUnderline()

I don't understand what the "gap 0.75 mm" means, so I removed them.

Change-Id: Ia3e07d7c5e9bfd9581da37f99ce54374e1eb04ba
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136564
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 9c4821a20ffdaa879d326ad0537cc72d4f10f886)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136539
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/swriter/01/05150100.xhp 
b/source/text/swriter/01/05150100.xhp
index 465cb1cbd..ef162055c 100644
--- a/source/text/swriter/01/05150100.xhp
+++ b/source/text/swriter/01/05150100.xhp
@@ -59,13 +59,22 @@
   If you 
type three or more hyphens (---), underscores (___) or equal signs (===) on 
line and then press Enter, the paragraph is replaced by a horizontal line as 
wide as the page. The line is actually the lower border of 
the preceding paragraph. The following rules apply:
   
  
-Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 
mm).
+Three hyphens (-) yield a single line (0.05 pt 
thick).
  
  
-Three underscore (_) yield a single line (1 pt thick, gap 0.75 
mm).
+Three underscores (_) yield a single line (0.75 pt 
thick).
  
  
-Three equal signs (=) yield a double line (1.10 pt thick, gap 
0.75 mm).
+Three equal signs (=) yield a thin double line (0.75 pt 
thick).
+ 
+ 
+Three asterisk signs (*) yield a thick/thin double line (2.25 
pt thick).
+ 
+ 
+Three tilde signs (~) yield a thin/thick double line (2.25 pt 
thick).
+ 
+ 
+Three hash signs (#) yield a medium double line (1.5 pt 
thick).
  
   
 

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 9dcbb941b21b35dec02a85544881b4e59e8dda2f
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 28 16:13:16 2022 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 28 15:13:16 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 06913270253a3a6740fde42752dfec0389d2a1f2
  - Clarify AutoCorrect rules for separator lines

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

diff --git a/helpcontent2 b/helpcontent2
index 8871d41ec6b3..06913270253a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8871d41ec6b31d722e3de27742605ff270cd33e1
+Subproject commit 06913270253a3a6740fde42752dfec0389d2a1f2

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 06913270253a3a6740fde42752dfec0389d2a1f2
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 28 13:41:44 2022 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 28 15:13:14 2022 +0200

Clarify AutoCorrect rules for separator lines

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

diff --git a/source/text/swriter/01/05150100.xhp 
b/source/text/swriter/01/05150100.xhp
index ef162055c..ddee2b297 100644
--- a/source/text/swriter/01/05150100.xhp
+++ b/source/text/swriter/01/05150100.xhp
@@ -56,7 +56,7 @@
  
   
  AutoCorrect for Separator Lines
-  If you 
type three or more hyphens (---), underscores (___) or equal signs (===) on 
line and then press Enter, the paragraph is replaced by a horizontal line as 
wide as the page. The line is actually the lower border of 
the preceding paragraph. The following rules apply:
+  If you 
type three or more hyphens (---) or certain other characters in a row and then 
press Enter, the paragraph is replaced by a horizontal line as wide as the 
page. The line is actually the lower border of the preceding paragraph. The bottom 
padding of such a paragraph will be set to 0.75 mm. The following rules 
apply:
   
  
 Three hyphens (-) yield a single line (0.05 pt 
thick).

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 47099350beb5d955d16776e43aa2276d4760eecb
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 28 13:22:58 2022 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 28 12:22:58 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9c4821a20ffdaa879d326ad0537cc72d4f10f886
  - Document all cases of AutoCorrect for separator lines

Looking at sw/source/core/edit/autofmt.cxx we can discover
all the six cases in SwAutoFormat::DoUnderline()

I don't understand what the "gap 0.75 mm" means, so I removed them.

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

diff --git a/helpcontent2 b/helpcontent2
index 4e1b00e5d940..9c4821a20ffd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4e1b00e5d940b647b550b3314985ebb775be2543
+Subproject commit 9c4821a20ffdaa879d326ad0537cc72d4f10f886

[Libreoffice-commits] help.git: source/text

[Ilmari Lauhakangas (via logerrit)]

 source/text/swriter/01/05150100.xhp |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 9c4821a20ffdaa879d326ad0537cc72d4f10f886
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 28 13:02:13 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Jun 28 12:22:56 2022 +0200

Document all cases of AutoCorrect for separator lines

Looking at sw/source/core/edit/autofmt.cxx we can discover
all the six cases in SwAutoFormat::DoUnderline()

I don't understand what the "gap 0.75 mm" means, so I removed them.

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

diff --git a/source/text/swriter/01/05150100.xhp 
b/source/text/swriter/01/05150100.xhp
index 465cb1cbd..ef162055c 100644
--- a/source/text/swriter/01/05150100.xhp
+++ b/source/text/swriter/01/05150100.xhp
@@ -59,13 +59,22 @@
   If you 
type three or more hyphens (---), underscores (___) or equal signs (===) on 
line and then press Enter, the paragraph is replaced by a horizontal line as 
wide as the page. The line is actually the lower border of 
the preceding paragraph. The following rules apply:
   
  
-Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 
mm).
+Three hyphens (-) yield a single line (0.05 pt 
thick).
  
  
-Three underscore (_) yield a single line (1 pt thick, gap 0.75 
mm).
+Three underscores (_) yield a single line (0.75 pt 
thick).
  
  
-Three equal signs (=) yield a double line (1.10 pt thick, gap 
0.75 mm).
+Three equal signs (=) yield a thin double line (0.75 pt 
thick).
+ 
+ 
+Three asterisk signs (*) yield a thick/thin double line (2.25 
pt thick).
+ 
+ 
+Three tilde signs (~) yield a thin/thick double line (2.25 pt 
thick).
+ 
+ 
+Three hash signs (#) yield a medium double line (1.5 pt 
thick).
  
   
 

[Libreoffice-commits] core.git: android/mobile-config.py

[Ilmari Lauhakangas (via logerrit)]

 android/mobile-config.py |   37 ++---
 1 file changed, 14 insertions(+), 23 deletions(-)

New commits:
commit df3942bba54e5588020082e0197b233d0f043282
Author: Ilmari Lauhakangas 
AuthorDate: Wed Jun 22 15:47:00 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Wed Jun 22 16:00:32 2022 +0200

Revert changes to android/mobile-config.py

made in 157298bb808a943616991927f9370a86c1f2ca48

Got Tinderbox failure with

Traceback (most recent call last):
  File 
"/opt/rh/rh-python36/root/usr/lib64/python3.6/xml/etree/ElementPath.py",
line 263, in iterfind
selector = _cache[cache_key]
KeyError: 
('%(component-schema)s[@%(name)s="Common"]/component/group[@%(name)s=

"Filter"]/group[@%(name)s="Microsoft"]/group[@{http://openoffice.org/2001/registry}
name="Import"]/prop', None)

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/tinderbox/buildslave/source/libo-master/android/mobile-config.py",
line 85, in 
props = root.findall(microsoftImport)
  File 
"/opt/rh/rh-python36/root/usr/lib64/python3.6/xml/etree/ElementPath.py",
line 304, in findall
return list(iterfind(elem, path, namespaces))
  File 
"/opt/rh/rh-python36/root/usr/lib64/python3.6/xml/etree/ElementPath.py",
line 277, in iterfind
selector.append(ops[token[0]](next, token))
KeyError: '('

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

diff --git a/android/mobile-config.py b/android/mobile-config.py
index 596f27f107a8..5998e5d1f9b7 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -14,13 +14,13 @@
 # already over-complicated by rampant conditionals.
 
 import sys
-import xml.etree.ElementTree as ElementTree
+import xml.etree.ElementTree as ET
 
 main_xcd_discard = [
-'org.openoffice.Office/TableWizard',  # huge
+'org.openoffice.Office/TableWizard', # huge
 
-'org.openoffice.Office.DataAccess/Drivers',  # no database
-'org.openoffice.Office/Addons',  # no addons
+'org.openoffice.Office.DataAccess/Drivers', # no database
+'org.openoffice.Office/Addons', # no addons
 
 # no conventional UI; reverse sorted by size
 'org.openoffice.Office.UI/GenericCommands',
@@ -46,15 +46,15 @@ main_xcd_discard = [
 'org.openoffice.Office.UI/GlobalSettings',
 'org.openoffice.Office.UI/BibliographyWindowState',
 'org.openoffice.Office.UI/Category',
-]
+]
 
 if __name__ == '__main__':
-tree = ElementTree.parse(sys.argv[1])
+tree = ET.parse(sys.argv[1])
 root = tree.getroot()
 
 total = 0
 for child in root:
-total += len(ElementTree.tostring(child))
+total += len(ET.tostring(child))
 
 saved = 0
 to_remove = []
@@ -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(ElementTree.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))
@@ -72,7 +72,7 @@ if __name__ == '__main__':
 for child in to_remove:
 root.remove(child)
 
-print("saved %d of %d bytes: %2.f%%" % (saved, total, saved * 100.0 / 
total))
+print("saved %d of %d bytes: %2.f%%" % (saved, total, saved*100.0/total))
 
 # Don't do pointless Word -> Writer and similar conversions when we have 
no UI.
 nsDict = {
@@ -80,37 +80,28 @@ if __name__ == '__main__':
 "component-data": 
"{http://openoffice.org/2001/registry}component-data;,
 "name": "{http://openoffice.org/2001/registry}name;,
 }
-microsoftImport = 
'%(component-schema)s[@%(name)s="Common"]/component/group[@%(name)s="Filter"]/group[@%('
 +\
-  'name)s="Microsoft"]/group[@%(name)s="Import"]/prop' % 
nsDict
+microsoftImport = 
'%(component-schema)s[@%(name)s="Common"]/component/group[@%(name)s="Filter"]/group[@%(name)s="Microsoft"]/group[@%(name)s="Import"]/prop'
 % nsDict
 props = root.findall(microsoftImport)
 for prop in props:
 prop.findall("value")[0].text = "false"
 
 # Disable View -> Text Boundaries
-for prop in root.findall(
-
'%(component-schema)s[@%(name)s="UI"]/templates/group[@%(name)s="ColorScheme"]/group[@%('
 +
-'name)s="DocBoundaries"]/prop' % nsDict):
+for prop in 
root.findall('%(component-schema)s[@%(name)s="UI"]/templates/group[@%(name)s="ColorScheme"]/group[@%(name)s="DocBoundaries"]/prop'
 % nsDict):
 for value in prop.findall("value"):
 value.text = "false"
 
 # Disable Table -> Table 

[Libreoffice-commits] core.git: configure.ac README.md

[Ilmari Lauhakangas (via logerrit)]

 README.md|2 +-
 configure.ac |9 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 0c96561a567fd7dbb394a1a44479a42aa149bcc7
Author: Ilmari Lauhakangas 
AuthorDate: Tue Jun 14 11:22:13 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Wed Jun 15 08:20:59 2022 +0200

Bump minimum macOS to 10.14

This gives us full support for variant, optional, any and visit libraries

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

diff --git a/README.md b/README.md
index d2effbb58576..bd1528f321ee 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: Windows 7
 * Build: Cygwin + Visual Studio 2019 version 16.10
 * macOS:
-* Runtime: 10.13
+* Runtime: 10.14
 * Build: 11.0 + Xcode 12.5
 * Linux:
 * Runtime: RHEL 7 or CentOS 7
diff --git a/configure.ac b/configure.ac
index cafa0945982d..f2dded1c65c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2845,7 +2845,7 @@ AC_ARG_WITH(macosx-version-min-required,
 AS_HELP_STRING([--with-macosx-version-min-required=],
 [set the minimum OS version needed to run the built LibreOffice])
 [
-  e. g.: --with-macosx-version-min-required=10.13
+  e. g.: --with-macosx-version-min-required=10.14
 ],
 ,)
 
@@ -3446,7 +3446,7 @@ if test $_os = Darwin; then
 
 if test "$with_macosx_version_min_required" = "" ; then
 if test "$host_cpu" = x86_64; then
-with_macosx_version_min_required="10.13";
+with_macosx_version_min_required="10.14";
 else
 with_macosx_version_min_required="11.0";
 fi
@@ -3470,9 +3470,6 @@ if test $_os = Darwin; then
 fi
 
 case "$with_macosx_version_min_required" in
-10.13)
-MAC_OS_X_VERSION_MIN_REQUIRED="101300"
-;;
 10.14)
 MAC_OS_X_VERSION_MIN_REQUIRED="101400"
 ;;
@@ -3501,7 +3498,7 @@ if test $_os = Darwin; then
 MAC_OS_X_VERSION_MIN_REQUIRED="120300"
 ;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.13--12.3])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.14--12.3])
 ;;
 esac
 

[Libreoffice-commits] core.git: comphelper/source

[Ilmari Lauhakangas (via logerrit)]

 comphelper/source/misc/numberedcollection.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7784f289d29c49e14229c9ec86ce994b68d0ecb7
Author: Ilmari Lauhakangas 
AuthorDate: Wed Jun 8 13:08:50 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Wed Jun 8 12:12:43 2022 +0200

Fix typo

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

diff --git a/comphelper/source/misc/numberedcollection.cxx 
b/comphelper/source/misc/numberedcollection.cxx
index 146f002eab3f..80d33776c420 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -100,7 +100,7 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 
nNumber)
 std::scoped_lock aLock(m_aMutex);
 
 if (nNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER)
-throw css::lang::IllegalArgumentException ("Special valkud 
INVALID_NUMBER not allowed as input parameter.", m_xOwner.get(), 1);
+throw css::lang::IllegalArgumentException ("Special value 
INVALID_NUMBER not allowed as input parameter.", m_xOwner.get(), 1);
 
 TDeadItemList   lDeadItems;
 TNumberedItemHash::iterator pComponent;

[Libreoffice-commits] core.git: sysui/desktop

[Ilmari Lauhakangas (via logerrit)]

 sysui/desktop/menus/base.desktop|2 +-
 sysui/desktop/menus/calc.desktop|2 +-
 sysui/desktop/menus/draw.desktop|2 +-
 sysui/desktop/menus/impress.desktop |2 +-
 sysui/desktop/menus/math.desktop|2 +-
 sysui/desktop/menus/startcenter.desktop |4 ++--
 sysui/desktop/menus/writer.desktop  |2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6ed597a7dd1da40248236e7a71843c2d76d6173e
Author: Ilmari Lauhakangas 
AuthorDate: Sat May 21 16:32:26 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon May 23 12:57:52 2022 +0200

tdf#140215 Improve the Comment strings in .desktop files

Change-Id: I94bde89ee8cb122ed04f510e25e558240e3029b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134708
Reviewed-by: Heiko Tietze 
Tested-by: Ilmari Lauhakangas 

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 36a36ecb6fe5..b2a06b5c4730 100644
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -25,7 +25,7 @@ Exec=${UNIXBASISROOTNAME} --base %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
 Name=%PRODUCTNAME Base
 GenericName=Database Development
-Comment=Manage databases, create queries and reports to track and manage your 
information by using Base.
+Comment=Manage databases, create queries and reports to track and manage your 
information
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Data;SQL;
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 643687946d1a..0575f49e3e09 100644
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -25,7 +25,7 @@ Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;applica
 
tion/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/x-starcalc;
 Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
-Comment=Perform calculations, analyze information and manage lists in 
spreadsheets by using Calc.
+Comment=Perform calculations, analyze information and manage lists in 
spreadsheets
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft 
Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx;
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index ff9fa53084ed..e5fe6864fda4 100644
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -25,7 +25,7 @@ Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;application/pdf;application/x-stardraw;image/x-emf;image/x-wmf;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
-Comment=Create and edit drawings, flow charts and logos by using Draw.
+Comment=Create and edit drawings, flow charts and logos
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft 
Publisher;Microsoft Visio;Corel Draw;cdr;odg;svg;pdf;vsd;
diff --git a/sysui/desktop/menus/impress.desktop 
b/sysui/desktop/menus/impress.desktop
index 0af5e121d371..d2d607d871e0 100644
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -25,7 +25,7 @@ Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
 

[Libreoffice-commits] core.git: .gitignore

[Ilmari Lauhakangas (via logerrit)]

 .gitignore |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 168a1bda076058b11010760af966486b723ce376
Author: Ilmari Lauhakangas 
AuthorDate: Fri May 13 10:30:06 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri May 13 15:15:12 2022 +0200

Add mold linker temp files to .gitignore

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

diff --git a/.gitignore b/.gitignore
index 9c85f02f90c3..3e5bfc0d3f5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,6 +94,7 @@ eclipsesettingfile.xml
 .yavide_session
 .vscode
 *.code-workspace
+.mold-*
 
 # things below this point are targeted for elimination
 

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit 3c6a0a8703f922757dae2fa77d3dd7a7bdf317fe
Author: Ilmari Lauhakangas 
AuthorDate: Thu May 12 15:44:47 2022 +0300
Commit: Gerrit Code Review 
CommitDate: Thu May 12 14:44:47 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to e3164d8b3f10d2d3f856182044ff541adfcb1439
  - Add dir attribute to html element based on language directionality

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

diff --git a/helpcontent2 b/helpcontent2
index 1a71181cd6bd..e3164d8b3f10 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1a71181cd6bd1b204e5b466c97b6e0e6c4434cca
+Subproject commit e3164d8b3f10d2d3f856182044ff541adfcb1439

[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/help.js  |2 
 help3xsl/online_transform.xsl |  103 +++---
 2 files changed, 59 insertions(+), 46 deletions(-)

New commits:
commit e3164d8b3f10d2d3f856182044ff541adfcb1439
Author: Ilmari Lauhakangas 
AuthorDate: Thu Apr 21 19:19:51 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu May 12 14:44:46 2022 +0200

Add dir attribute to html element based on language directionality

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

diff --git a/help3xsl/help.js b/help3xsl/help.js
index dcf0dd365..65493ab0c 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -77,7 +77,7 @@ function fullLinkify(indexEl, bookmarks, modules, 
currentModule) {
 });
 }
 bookmarks.forEach(function(obj) {
-fullLinkified += '' + obj['text'] + '';
+fullLinkified += '' + obj['text'] + '';
 });
 return fullLinkified;
 }
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 70c7ab0af..a9c47ae1e 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -132,7 +132,17 @@
 
 
 
-
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -165,7 +175,7 @@
 
 
 
-
+
 
 
 
@@ -186,12 +196,12 @@
 
 
 
-
+
 
 
 
 
- 

+ 

 
 
 
@@ -203,8 +213,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -231,7 +241,7 @@
 
 
 
-
+
 
 
 
@@ -241,13 +251,13 @@
 
 
 
-https://www.libreoffice.org/donate/?pk_campaign=help; target 
="_blank">
+https://www.libreoffice.org/donate/?pk_campaign=help; target 
="_blank">
 
 
 
 
 
-http://schema.org/Organization;>
+http://schema.org/Organization; 
dir="auto">
 
 
 
@@ -256,11 +266,11 @@
 
 
 Help content debug info:
-This page is: https://opengrok.libreoffice.org/xref/help/source{$filename}; 
target="_blank">
-Title is: 
-
-
-
+This page is: https://opengrok.libreoffice.org/xref/help/source{$filename}; 
target="_blank">
+Title is: 
+
+
+
 
 
 
@@ -484,7 +494,7 @@
 
 
 
-
+
 
 
 
@@ -527,7 +537,7 @@
 
 
 
-
+
 
 
 
@@ -550,7 +560,7 @@
 
 
 
-
+
 
 
 
@@ -660,7 +670,7 @@
 
 
 
-Unsupported switch condition.
+Unsupported switch condition.
 
 
 
@@ -679,7 +689,7 @@
 
 
 
-Unsupported switch condition.
+Unsupported switch condition.
 
 
 
@@ -700,7 +710,7 @@
 
 
 
-Unsupported switch condition.
+Unsupported switch condition.
 
 
 
@@ -719,7 +729,7 @@
 
 
 
-Unsupported switch condition.
+Unsupported switch condition.
 
 
 
@@ -732,10 +742,10 @@
 
 
 
-
+
 
 
-
+
 
 
 
@@ -744,10 +754,10 @@
 
 
 
-
+
 
 
-
+
 
 
 
@@ -788,12 +798,14 @@
 
 
 
+auto
 
 
 
 
 
 
+auto
 
 
 
@@ -824,8 +836,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -838,8 +850,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -916,12 +928,12 @@
 
 

-http://schema.org/HowToStep;>
+http://schema.org/HowToStep; dir="auto">
 
 
 
 
-http://schema.org/ItemListUnordered;>
+http://schema.org/ItemListUnordered; dir="auto">
 
 
 
@@ -932,7 +944,7 @@
 
 
 
-http://schema.org/HowToSection;>
+http://schema.org/HowToSection; 

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit cd8848acc93346e5613bc8c1fdc1d6c74c099f1f
Author: Ilmari Lauhakangas 
AuthorDate: Tue Apr 19 15:51:36 2022 +0300
Commit: Gerrit Code Review 
CommitDate: Tue Apr 19 14:51:36 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5bab8a2d2530d7487064a2560c440269018a56b9
  - tdf#148621 Make ScriptForge service tables mobile-friendly

- Introduce  element
- While considering text-align, I noticed we do not take RTL languages
into account. A CSS rule 'html[dir=ltr] th' was added, which does
nothing at the moment. We should look into directionality.

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

diff --git a/helpcontent2 b/helpcontent2
index 26cd9a5e8be2..5bab8a2d2530 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 26cd9a5e8be28097e59188bcdf6bcaa9c75be4e4
+Subproject commit 5bab8a2d2530d7487064a2560c440269018a56b9

[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl helpers/xmlhelp.dtd source/text

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |   27 ++
 help3xsl/online_transform.xsl|7 -
 helpers/xmlhelp.dtd  |7 -
 source/text/sbasic/shared/03/lib_ScriptForge.xhp |   28 +--
 4 files changed, 50 insertions(+), 19 deletions(-)

New commits:
commit 5bab8a2d2530d7487064a2560c440269018a56b9
Author: Ilmari Lauhakangas 
AuthorDate: Mon Apr 18 12:41:48 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Apr 19 14:51:33 2022 +0200

tdf#148621 Make ScriptForge service tables mobile-friendly

- Introduce  element
- While considering text-align, I noticed we do not take RTL languages
into account. A CSS rule 'html[dir=ltr] th' was added, which does
nothing at the moment. We should look into directionality.

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

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 2c5e59ac0..bc053cc70 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -212,6 +212,9 @@ table, th, td {
 border-right: 0;
 padding: 0.3em;
 }
+html[dir=ltr] th {
+text-align: left;
+}
 .tablehead,
 .tableheadintable {
 font-weight: bold;
@@ -226,6 +229,17 @@ table, th, td {
 font-size: 0.98rem;
 }
 
+/* ScriptForge service tables */
+.sf_table {
+min-width: 100%;
+}
+.sf_table thead {
+display: none;
+}
+.sf_table tr, .sf_table td {
+display: block;
+}
+
 h1,
 h2,
 h3,
@@ -840,6 +854,19 @@ li.disabled a {
 max-width: 200px;
 width: 100%
 }
+/* ScriptForge service tables */
+.sf_table {
+min-width: auto;
+}
+.sf_table thead {
+display: table-header-group;
+}
+.sf_table tr {
+display: table-row;
+}
+.sf_table td {
+display: table-cell;
+}
 }
 @media screen and (min-width: 1440px) {
 #Contents {
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 465415ea2..70c7ab0af 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -732,7 +732,7 @@
 
 
 
-
+
 
 
 
@@ -744,7 +744,7 @@
 
 
 
-
+
 
 
 
@@ -758,6 +758,9 @@
 
 
 
+
+
+
 
 
 
diff --git a/helpers/xmlhelp.dtd b/helpers/xmlhelp.dtd
index 6a4ef9778..fcb1076b5 100644
--- a/helpers/xmlhelp.dtd
+++ b/helpers/xmlhelp.dtd
@@ -228,7 +228,7 @@ Version Nov 2018
   select (sys | appl | distrib | target | ver | lang) #REQUIRED
 >
 
-
+
 
 
+
+
+
 
 
 
   Services provided by the ScriptForge 
library
-  
-
-   
- Category
-   
-   
- Services
-   
-   
- 
-   
-   
- 
-   
-
+  
+
+  
+
+  Category
+
+
+  Services
+
+  
+
 

  %PRODUCTNAME Basic
@@ -241,4 +237,4 @@
   All ScriptForge 
Basic routines or identifiers that are prefixed with an underscore character 
"_" are reserved for internal use. They are not meant be used in Basic macros 
or Python scripts.
 
 
-
\ No newline at end of file
+