core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Focus/content.xml |   83 --
 extras/source/templates/presnt/Focus/meta.xml|5 
 extras/source/templates/presnt/Focus/styles.xml  |  767 ++-
 3 files changed, 230 insertions(+), 625 deletions(-)

New commits:
commit 13d27a60ec301874a5d0d171dcdf86f20e5f7473
Author: Laurent Balland 
AuthorDate: Sat Jul 27 19:13:50 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 14:24:19 2024 +0200

Update Focus Impress template

- replace Liberation Sans by DejaVu Sans
- simplify definition of font names
- remove writing mode tags
- modify bundled styles to use same color as the template for Filled Color 
and Outline Color
- move Handout elements to better places
- move Notes elements to better places. set font color to black
- remove used styles
- set Title font size to 32pt to all slides, and enlarge font size for 
outlines
- change draw:fit-to-size="shrink-to-fit" to draw:fit-to-size="false" to be 
ODF valid according to
  https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
- add initial author to meta.xml (according to
  
https://github.com/dohliam/libreoffice-impress-templates/blob/master/lo51-templates/README.md
- remove text:span empty tags

Change-Id: Ie7e62927b2de56b5603694d58af7cd15d7d844a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171101
Reviewed-by: Laurent Balland 
Tested-by: Jenkins

diff --git a/extras/source/templates/presnt/Focus/content.xml 
b/extras/source/templates/presnt/Focus/content.xml
index 1d88905e6b15..f2bb7e22f736 100644
--- a/extras/source/templates/presnt/Focus/content.xml
+++ b/extras/source/templates/presnt/Focus/content.xml
@@ -1,11 +1,5 @@
 
 http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1
 .0" xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:d
 atastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; office:version="1.2">
-  
-  
-
-
-
-  
   
 
   
@@ -19,110 +13,65 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-  
-
-
-
-
-  
-
   
   
 
   
 
-
+
   
 
-
+
   
 
 
-  
-  
+  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
 
-  
-  
+  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
 
-  
-  
+  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
 
-  
-  
+  
+

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Lights/content.xml |   68 --
 extras/source/templates/presnt/Lights/meta.xml|5 
 extras/source/templates/presnt/Lights/styles.xml  |  602 +-
 3 files changed, 159 insertions(+), 516 deletions(-)

New commits:
commit 1da2778bc4df3209689dc32dfa0c91848d384556
Author: Laurent Balland 
AuthorDate: Tue Jul 30 22:53:59 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 16:54:04 2024 +0200

Update Lights Impress template

  - styles.xml: set draw:fit-to-size at "false" instead of "shrink-to-fit" 
(suggested by Regina)
  https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
  - remove writing mode tags
  - simplify definition of font names
  - remove duplicate Date and Page placeholders on masters Lights2 and 
Lights1
  - set font colot to black for Footer/Header/Date/Page in Notes
  - change slide 3 to Title+Content
  - restore white+ transparency background to content of master Lights2
  - remove unused styles
  - add licence and initial creator in meta.xml according to

https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo5-design-candidates
  - remove text:span empty tags

Change-Id: I50aa21fd0f77d808bb0d4d3d554dc68e09f528ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171252
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Lights/content.xml 
b/extras/source/templates/presnt/Lights/content.xml
index 49b3183e8b4e..f40fb5561fc6 100644
--- a/extras/source/templates/presnt/Lights/content.xml
+++ b/extras/source/templates/presnt/Lights/content.xml
@@ -1,9 +1,5 @@
 
 http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:presentat
 ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
-  
-  
-
-  
   
 
   
@@ -11,92 +7,56 @@
 
   
 
+
+  
+
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-
-
-  
-  
-
-
-  
-
-
-  
-
   
   
 
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
   
-  
+  
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
   
-  
+  
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/Lights/meta.xml 
b/extras/source/templates/presnt/Lights/meta.xml
index 8d595724284d..a8877c9a0dfa 100644
---

core.git: 2 commits - sal/osl vcl/source

[Caolán McNamara (via logerrit)]

 sal/osl/unx/pipe.cxx  |4 +---
 vcl/source/treelist/imap2.cxx |   13 +
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 7c49f6c89e7501f4b5ca28a45a91c6cdac5eb01b
Author: Caolán McNamara 
AuthorDate: Fri Aug 30 09:45:36 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:08:20 2024 +0200

cid#1608005 Overflowed constant

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

diff --git a/vcl/source/treelist/imap2.cxx b/vcl/source/treelist/imap2.cxx
index 559658581ca5..f905ca52f533 100644
--- a/vcl/source/treelist/imap2.cxx
+++ b/vcl/source/treelist/imap2.cxx
@@ -282,11 +282,16 @@ void ImageMap::ImpReadCERNLine( std::string_view rLine  )
 }
 else if ( ( aToken == "polygon" ) || ( aToken == "poly" ) )
 {
-const sal_uInt16 nCount = comphelper::string::getTokenCount(aStr, '(') 
- 1;
-tools::Polygon aPoly( nCount );
+const sal_Int32 nTokenCount = comphelper::string::getTokenCount(aStr, 
'(');
+tools::Polygon aPoly;
+if (nTokenCount > 0)
+{
+const sal_uInt16 nCount = nTokenCount - 1;
+aPoly.SetSize(nCount);
 
-for ( sal_uInt16 i = 0; i < nCount; i++ )
-aPoly[ i ] = ImpReadCERNCoords( &pStr );
+for (sal_uInt16 i = 0; i < nCount; ++i)
+aPoly[ i ] = ImpReadCERNCoords( &pStr );
+}
 
 const OUString aURL = ImpReadCERNURL( &pStr );
 
commit 68730a0e14d2ea37d5aa78bb19d16d5a5ee9d9ae
Author: Caolán McNamara 
AuthorDate: Fri Aug 30 09:17:14 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:08:09 2024 +0200

assign immediately

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

diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index 618ca23ed108..a4778bde66f6 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -506,9 +506,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void 
*pBuffer , sal_Int32 n )
 SAL_WARN_IF(!pPipe, "sal.osl.pipe", "osl_readPipe: invalid pipe"); // 
osl_receivePipe detects invalid pipe
 while (BytesToRead > 0)
 {
-sal_Int32 RetVal;
-RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead);
-
+sal_Int32 RetVal = osl_receivePipe(pPipe, pBuffer, BytesToRead);
 /* error occurred? */
 if (RetVal <= 0)
 break;

core.git: xmlsecurity/source

[Caolán McNamara (via logerrit)]

 xmlsecurity/source/helper/xmlsignaturehelper.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit beb7dc01ebf8558232ae41976e88b1ee7ed7be0f
Author: Caolán McNamara 
AuthorDate: Sat Aug 31 16:24:57 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:55:04 2024 +0200

cid#1607713 silence Overflowed constant

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

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx 
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 731405e8ad0b..71c6ebdbce56 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -632,10 +632,10 @@ static auto CheckX509Data(
 chain.emplace_back(*start);
 
 // second, check that there is a chain, no tree or cycle...
-for (size_t i = 0; i < certs.size(); ++i)
+for (size_t i = 0, certs_size = certs.size(); i < certs_size; ++i)
 {
 assert(chain.size() == i + 1);
-for (size_t j = 0; j < certs.size(); ++j)
+for (size_t j = 0; j < certs_size; ++j)
 {
 if (chain[i] != j)
 {
@@ -651,7 +651,7 @@ static auto CheckX509Data(
 }
 }
 }
-if (i == certs.size() - 1)
+if (i == certs_size - 1)
 {   // last one: must be a leaf
 if (chain.size() != i + 1)
 {

core.git: helpcontent2

[Pierre F (via logerrit)]

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

New commits:
commit 4745d42051915cbf36007f8e0ddb8768eb12579a
Author: Pierre F 
AuthorDate: Sat Aug 31 18:39:55 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Aug 31 18:39:55 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to dc7a2b091a7652d4907391f8e39262b65ae6c780
  - clarify Instr(). tdf#129436, tdf#139840

Change-Id: I14f70db80e2a09f9c1e614d0e079830016cbea0f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171778
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/helpcontent2 b/helpcontent2
index eee5d2a36a44..dc7a2b091a76 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit eee5d2a36a440d54d5e793ea747239f9f782b9cf
+Subproject commit dc7a2b091a7652d4907391f8e39262b65ae6c780

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

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

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

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


** CID 1618766:  Error handling issues  (CHECKED_RETURN)
/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx: 199 in 
ScXMLChangeTrackingImportHelper::GetIDFromString(std::basic_string_view>)()



*** CID 1618766:  Error handling issues  (CHECKED_RETURN)
/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx: 199 in 
ScXMLChangeTrackingImportHelper::GetIDFromString(std::basic_string_view>)()
193 sal_uInt32 nResult(0);
194 if (!sID.empty())
195 {
196 if (sID.substr(0, SC_CHANGE_ID_PREFIX.getLength()) == 
SC_CHANGE_ID_PREFIX)
197 {
198 sal_Int32 nValue;
>>> CID 1618766:  Error handling issues  (CHECKED_RETURN)
>>> Calling "convertNumber" without checking return value (as is done 
>>> elsewhere 21 out of 22 times).
199 ::sax::Converter::convertNumber(nValue, 
sID.substr(SC_CHANGE_ID_PREFIX.getLength()),
200 0, SAL_MAX_INT32);
201 OSL_ENSURE(nValue > 0, "wrong change action ID");
202 nResult = nValue;
203 }
204 else

** CID 1618765:(PASS_BY_VALUE)
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)256, 
frozen::elsa>>>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa>>)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)32, 
frozen::elsa>>>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa>>)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)64, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)64, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)32, frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)256, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)64, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)32, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)32, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)64, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)32, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)64, 
frozen::elsa>>>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa>>)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)64, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa)()
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)32, 
frozen::elsa>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 
frozen::elsa)()



*** CID 1618765:(PASS_BY_VALUE)
/workdir/UnpackedTarball/frozen/include/frozen/bits/pmh.h: 158 in 
frozen::bits::pmh_tables<(unsigned long)256, 
frozen::elsa>>>::pmh_tables(unsigned long, 
frozen::bits::carray, 
frozen::bits::carray, 

core.git: 2 commits - vcl/workben

[Caolán McNamara (via logerrit)]

 vcl/workben/schtmlfuzzer.options |2 +-
 vcl/workben/scrtffuzzer.options  |3 ++-
 vcl/workben/ww2fuzzer.options|2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c8468882296f38288b86ccf369e5df2272b6e1e4
Author: Caolán McNamara 
AuthorDate: Sat Aug 31 16:47:55 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:12:19 2024 +0200

bump these allowed fuzzer input sizes

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

diff --git a/vcl/workben/schtmlfuzzer.options b/vcl/workben/schtmlfuzzer.options
index e29edfebfb89..42c23c6321e0 100644
--- a/vcl/workben/schtmlfuzzer.options
+++ b/vcl/workben/schtmlfuzzer.options
@@ -1,3 +1,3 @@
 [libfuzzer]
-max_len = 4096
+max_len = 8192
 dict = html.dict
diff --git a/vcl/workben/scrtffuzzer.options b/vcl/workben/scrtffuzzer.options
index 3aef05154c81..3f9b31d60f98 100644
--- a/vcl/workben/scrtffuzzer.options
+++ b/vcl/workben/scrtffuzzer.options
@@ -1,3 +1,3 @@
 [libfuzzer]
-max_len = 4096
+max_len = 8192
 dict = rtf.dict
diff --git a/vcl/workben/ww2fuzzer.options b/vcl/workben/ww2fuzzer.options
index 9fda93fcb340..8ea8588375d7 100644
--- a/vcl/workben/ww2fuzzer.options
+++ b/vcl/workben/ww2fuzzer.options
@@ -1,2 +1,2 @@
 [libfuzzer]
-max_len = 4096
+max_len = 8192
commit f635441715501aed14f480f72caf1e870b2689ca
Author: Caolán McNamara 
AuthorDate: Sat Aug 31 16:46:18 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:12:09 2024 +0200

use the rtf dict for the calc rtl fuzzer

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

diff --git a/vcl/workben/scrtffuzzer.options b/vcl/workben/scrtffuzzer.options
index 9fda93fcb340..3aef05154c81 100644
--- a/vcl/workben/scrtffuzzer.options
+++ b/vcl/workben/scrtffuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
 max_len = 4096
+dict = rtf.dict

core.git: vcl/inc vcl/qt5

[Michael Weghorn (via logerrit)]

 vcl/inc/salvtables.hxx |2 +-
 vcl/qt5/QtInstance.cxx |   12 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 1e2836665a1839f61cd8bfa46c54687f010e7e9d
Author: Michael Weghorn 
AuthorDate: Fri Aug 30 18:17:53 2024 +0200
Commit: Michael Weghorn 
CommitDate: Sat Aug 31 18:28:36 2024 +0200

tdf#162696 tdf#130857 qt weld: Get parent via SalInstanceWidget

Since only welding for simple message dialogs has been
implemented for the Qt based VCL plugins so far, the
`weld::Widget*` parent passed to `QtInstance::CreateMessageDialog`
is usually not a `QtInstanceWidget`.

The initial implementation to get a parent from

commit 9e40fc8c9458b937200ea56c96b89113c74b67f5
Author: Michael Weghorn 
Date:   Wed Feb 14 10:54:59 2024 +0100

tdf#130857 qt weld: Set msg dialog parent

implemented a fallback to use of the currently active
window if no native Qt parent is set.

That is however not sufficient to reliably set the
correct parent for the QMessageBox for the tdf#162696
scenario, where the "Extension" dialog that is the
parent and the message box and the message box itself
are created shortly after each other, and the extension
dialog does not reliably have focus yet when the message
box is created, so the start center window would sometimes
be set as the parent of the message dialog instead.

Adjust the logic to make use of the implementation detail
that non-Qt parents are `SalInstanceWidget`s.
Retrieve a `QWidget` to use as the parent via
the `SalFrame`/`QtFrame` in that case.

This makes setting the correct parent work for both,
the case described in the commit message of the
above-mentioned commit and for the tdf#162696
case, fixing the issue mentioned in tdf#162696#c13:

> One small thing I noticed is that after clicking OK on the warning
> dialog, the Extensions dialog has to be manually brought into focus. So
> it's not layered below the warning dialog during the first installation
> action in a session.

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

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 200e0ef36bf5..ba7653a0fc40 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -183,7 +183,7 @@ public:
 
 class SalFlashAttention;
 
-class SalInstanceWidget : public virtual weld::Widget
+class VCL_DLLPUBLIC SalInstanceWidget : public virtual weld::Widget
 {
 protected:
 VclPtr m_xWidget;
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 4587ef6c7933..f650699bacdd 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -39,6 +39,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -827,8 +828,15 @@ weld::MessageDialog* 
QtInstance::CreateMessageDialog(weld::Widget* pParent,
 }
 else
 {
-// the parent is not welded/not a native Qt widget; fall back 
to currently active window
-pQtParent = QApplication::activeWindow();
+// the parent is not welded/not a native Qt widget; get 
QWidget via frame
+if (SalInstanceWidget* pSalWidget = 
dynamic_cast(pParent))
+{
+if (vcl::Window* pWindow = pSalWidget->getWidget())
+{
+if (QtFrame* pFrame = 
static_cast(pWindow->ImplGetFrame()))
+pQtParent = pFrame->GetQWidget();
+}
+}
 }
 }
 

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Beehive/content.xml |   42 -
 extras/source/templates/presnt/Beehive/meta.xml|5 
 extras/source/templates/presnt/Beehive/styles.xml  |  170 +++--
 3 files changed, 66 insertions(+), 151 deletions(-)

New commits:
commit 9dfb1b77e7f4191327048f24318ddeff7aae8108
Author: Laurent Balland 
AuthorDate: Sun Jul 28 10:28:10 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 09:03:07 2024 +0200

Beehive Impress template: correct fit-to-size

- draw:fit-to-size should be set to false according to
  https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
- add licence and initial creator in meta.xml according to

https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo5-design-candidates
- simplify font definition
- remove unused styles

Change-Id: I651619a992958f478942f008b6fa0fcb9716c41e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171136
Reviewed-by: Laurent Balland 
Tested-by: Jenkins

diff --git a/extras/source/templates/presnt/Beehive/content.xml 
b/extras/source/templates/presnt/Beehive/content.xml
index bbd71ccf5483..697669207929 100644
--- a/extras/source/templates/presnt/Beehive/content.xml
+++ b/extras/source/templates/presnt/Beehive/content.xml
@@ -1,9 +1,6 @@
 
 http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1
 .0" xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:d
 atastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; office:version="1.2">
   
-  
-
-  
   
 
   
@@ -14,62 +11,35 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-
-
-  
-  
-
-
-  
-
   
   
 
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/Beehive/meta.xml 
b/extras/source/templates/presnt/Beehive/meta.xml
index afbace5f0dd8..4c9c396593bb 100644
--- a/extras/source/templates/presnt/Beehive/meta.xml
+++ b/extras/source/templates/presnt/Beehive/meta.xml
@@ -2,8 +2,9 @@
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
   
 2020-03-18T20:19:44.227941126
-P0D
-1
+kka_libo_des...@ashisuto.co.jp
+This work is licensed under a Creative Com

core.git: 2 commits - basic/qa basic/source

[Mike Kaganski (via logerrit)]

 basic/qa/basic_coverage/da-DK/test_ccur_da_DK_locale.bas |6 -
 basic/qa/basic_coverage/test_ccur_method.bas |3 
 basic/qa/basic_coverage/zh-CN/test_ccur_zh_CN_locale.bas |2 
 basic/source/sbx/sbxcurr.cxx |   81 +--
 4 files changed, 38 insertions(+), 54 deletions(-)

New commits:
commit 7bbf1f2a7d4cb3230bf69723b6864cff1a52d531
Author: Mike Kaganski 
AuthorDate: Sat Aug 31 20:12:07 2024 +0500
Commit: Mike Kaganski 
CommitDate: Sun Sep 1 04:06:52 2024 +0200

Refactor ImpCurrencyToString for simplicity

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

diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 37de86a800f3..be4fed2b7bdd 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -32,63 +32,39 @@
 
 static OUString ImpCurrencyToString( sal_Int64 rVal )
 {
-bool isNeg = ( rVal < 0 );
-sal_Int64 absVal = isNeg ? -rVal : rVal;
-
 sal_Unicode cDecimalSep, cThousandSepDummy, cDecimalSepAltDummy;
 ImpGetIntntlSep(cDecimalSep, cThousandSepDummy, cDecimalSepAltDummy);
 
-OUString aAbsStr = OUString::number( absVal );
-
-sal_Int32 initialLen = aAbsStr.getLength();
-
-bool bLessThanOne = false;
-if ( initialLen  <= 4 )  // if less the 1
-bLessThanOne = true;
-
-sal_Int32 nCapacity = 6; // minimum e.g. 0.
-
-if ( !bLessThanOne )
+OUStringBuffer aBuf(22);
+if (rVal < 0)
 {
-nCapacity = initialLen + 1;
+aBuf.append('-');
+rVal = -rVal;
 }
+OUString aAbsStr = OUString::number(rVal);
+sal_Int32 hasFractDigits = std::min(aAbsStr.getLength(), sal_Int32(4));
+sal_Int32 hasWholeDigits = aAbsStr.getLength() - hasFractDigits;
 
-if ( isNeg )
-++nCapacity;
-
-OUStringBuffer aBuf( nCapacity );
-aBuf.setLength( nCapacity );
-
-
-sal_Int32 nDigitCount = 0;
-sal_Int32 nInsertIndex = nCapacity - 1;
-sal_Int32 nEndIndex = isNeg ? 1 : 0;
-
-for ( sal_Int32 charCpyIndex = aAbsStr.getLength() - 1; nInsertIndex >= 
nEndIndex;  ++nDigitCount )
-{
-if ( nDigitCount == 4 )
-aBuf[nInsertIndex--] = cDecimalSep;
-if ( nDigitCount < initialLen )
-aBuf[nInsertIndex--] = aAbsStr[ charCpyIndex-- ];
-else
-// Handle leading 0's to right of decimal separator
-// Note: in VBA the stringification is a little more complex
-// but more natural as only the necessary digits
-// to the right of the decimal places are displayed
-// It would be great to conditionally be able to display like that too
-
-// Val   OOo (Cur)  VBA (Cur)
-// ---   -  -
-// 0 0. 0
-// 0.1   0.1000 0.1
-
-aBuf[nInsertIndex--] = '0';
-}
-if ( isNeg )
-aBuf[nInsertIndex] = '-';
-
-aAbsStr = aBuf.makeStringAndClear();
-return aAbsStr;
+if (hasWholeDigits > 0)
+aBuf.append(aAbsStr.subView(0, hasWholeDigits));
+else
+aBuf.append('0');
+aBuf.append(cDecimalSep);
+// Handle leading 0's to right of decimal separator
+// Note: in VBA the stringification is a little more complex
+// but more natural as only the necessary digits
+// to the right of the decimal places are displayed
+// It would be great to conditionally be able to display like that too
+
+// Val   OOo (Cur)  VBA (Cur)
+// ---   -  -
+// 0 0. 0
+// 0.1   0.1000 0.1
+for (sal_Int32 i = 4; i > hasFractDigits; --i)
+aBuf.append('0');
+aBuf.append(aAbsStr.subView(aAbsStr.getLength() - hasFractDigits, 
hasFractDigits));
+
+return aBuf.makeStringAndClear();
 }
 
 static sal_Int64 ImpStringToCurrency(const rtl::OUString& rStr)
commit a795fddafad69e8a7ce600352c7236b35539cebb
Author: Mike Kaganski 
AuthorDate: Sat Aug 31 20:08:28 2024 +0500
Commit: Mike Kaganski 
CommitDate: Sun Sep 1 04:06:40 2024 +0200

tdf#162724: use localized decimal separator in ImpCurrencyToString

Same as in ImpCvtNum

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

diff --git a/basic/qa/basic_coverage/da-DK/test_ccur_da_DK_locale.bas 
b/basic/qa/basic_coverage/da-DK/test_ccur_da_DK_locale.bas
index 52b8d3b6f1aa..ff4704fcc3db 100644
--- a/basic/qa/basic_coverage/da-DK/test_ccur_da_DK_locale.bas
+++ b/basic/qa/basic_coverage/da-DK/test_ccur_da_DK_locale.bas
@@ -18,8 +18,10 @@ Sub verify_testCCurDaDKLocale
 On Error GoTo errorHandler
 
 ' tdf#141050 - characteristic test for CCur() with the da_DK locale
-TestUtil.AssertEqual(CCur("75,50"), 75.5, "CCur(75,50)")
-TestUtil.AssertEqual(CCur("75,50 kr."),

core.git: scripting/java

[Caolán McNamara (via logerrit)]

 scripting/java/com/sun/star/script/framework/provider/ScriptEditorBase.java |  
  4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6d6b5a0a7dc6594497628010dca7797953b48a0a
Author: Caolán McNamara 
AuthorDate: Fri Aug 30 09:09:02 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 21:52:45 2024 +0200

cid#1607209 PA: Public Attribute

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

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptEditorBase.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptEditorBase.java
index 1a8bf33a5395..63593643cdb5 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/ScriptEditorBase.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/ScriptEditorBase.java
@@ -31,7 +31,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JDialog;
 
 public abstract class ScriptEditorBase implements ScriptEditor {
-public XScriptContext context;
+protected XScriptContext context;
 
 public void setContext(XScriptContext context) {
 this.context = context;
@@ -70,4 +70,4 @@ public abstract class ScriptEditorBase implements 
ScriptEditor {
 JDialog dialog = optionPane.createDialog(null, "Error");
 dialog.setVisible(true);
 }
-}
\ No newline at end of file
+}

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Blue_Curve/content.xml |   40 ---
 extras/source/templates/presnt/Blue_Curve/meta.xml|5 
 extras/source/templates/presnt/Blue_Curve/styles.xml  |  234 +++---
 3 files changed, 57 insertions(+), 222 deletions(-)

New commits:
commit 688ddd1eaaa7064a0c3fc6018ca2c37a6e323f46
Author: Laurent Balland 
AuthorDate: Sat Jul 6 16:08:49 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 11:31:15 2024 +0200

Update Blue Curve template

- remove useless styles
- remove German style Without Fill Without Line
- remove lr-tb tag
- change color of header/Date/Footer/Page # to black to make them
  visible on Notes and Handout
- draw: fit-to-size should be set to false according to
  https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
- add licence and initial creator in meta.xml according to

https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo5-design-candidates
- simplify font definition

Change-Id: I2653c62b3050100782c0fd76c553f7d414086152
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170096
Reviewed-by: Laurent Balland 
Tested-by: Jenkins

diff --git a/extras/source/templates/presnt/Blue_Curve/content.xml 
b/extras/source/templates/presnt/Blue_Curve/content.xml
index 3e2190dea407..366e9849557e 100644
--- a/extras/source/templates/presnt/Blue_Curve/content.xml
+++ b/extras/source/templates/presnt/Blue_Curve/content.xml
@@ -1,9 +1,6 @@
 
 http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:presentat
 ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
   
-  
-
-  
   
 
   
@@ -17,59 +14,32 @@
 
   
 
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-
-
-  
-  
-
   
   
 
   
 
-
+
   
 
 
   
-  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/Blue_Curve/meta.xml 
b/extras/source/templates/presnt/Blue_Curve/meta.xml
index 164bdfb40ac2..bf1b16863fed 100644
--- a/extras/source/templates/presnt/Blue_Curve/meta.xml
+++ b/extras/source/templates/presnt/Blue_Curve/meta.xml
@@ -2,8 +2,9 @@
 http://www.w3.org/2003/g/data-view#"; 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://ope

help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/shared/00/0001.xhp |1 
 source/text/shared/autopi/0109.xhp |   14 +--
 source/text/shared/autopi/01090100.xhp |  119 -
 3 files changed, 66 insertions(+), 68 deletions(-)

New commits:
commit d41c733d4d966f47cc0212a526d78722eee81ca8
Author: Olivier Hallot 
AuthorDate: Sat Aug 31 09:50:16 2024 -0300
Commit: Olivier Hallot 
CommitDate: Sat Aug 31 19:05:09 2024 +0200

tdf#162607 Remove dup's in hid2file.js WIZARDS

+ Deleted dups for
 WIZARDS_HID_QUERYWIZARD_CMDMOVEUP
 WIZARDS_HID_DLGFORM_CMDNEXT
 WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN

+ refactor

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

diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index d370d15da8..8dedcf27d8 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -193,7 +193,6 @@
 
 
 
-
 
 
 
diff --git a/source/text/shared/autopi/0109.xhp 
b/source/text/shared/autopi/0109.xhp
index d60c9f9e7c..126297e67b 100644
--- a/source/text/shared/autopi/0109.xhp
+++ b/source/text/shared/autopi/0109.xhp
@@ -22,22 +22,22 @@

 
 
-Form Wizard
+Form Wizard
 /text/shared/autopi/0109.xhp
 
 
 
-
-forms;wizards
+
+forms;wizards
 wizards;forms
 
 Form Wizard
-Activates the Wizard for creating 
forms.
+Activates the Wizard for creating forms.
 
 
 
 
-Select the 
form properties using the following steps:
+Select the form properties 
using the following steps:
 
 
 
@@ -48,8 +48,8 @@
 
 
 
-
-Click to create the form without answering further 
pages.
+
+Click to create 
the form without answering further pages.
 
 
 
diff --git a/source/text/shared/autopi/01090100.xhp 
b/source/text/shared/autopi/01090100.xhp
index 13c399646c..5baba1260f 100644
--- a/source/text/shared/autopi/01090100.xhp
+++ b/source/text/shared/autopi/01090100.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
-Form Wizard - Field Selection
+Form Wizard - Field Selection
 /text/shared/autopi/01090100.xhp
 
 
 
 
 Form Wizard 
- Field Selection
-On this page 
of the Form Wizard, you can 
specify the table or query that you need to create the form as well as the 
fields that you want to include in the form.
+On this page of the Form Wizard, you can specify the 
table or query that you need to create the form as well as the fields that you 
want to include in the form.
 
 
 
 
 
-
+
 Tables or queries
-Specifies the table or query that you want to create the form 
for.
+Specifies the 
table or query that you want to create the form for.
 
 
-
-
-
-
-
+
+
+
+
+
 Available fields
-Lists the names of the data base fields in the selected table or 
query. Click to select a field or hold down the Shift or the 
CommandCtrl
 key while you click to select more than one field.
+Lists the names 
of the data base fields in the selected table or query. Click to select 
a field or hold down the Shift or the CommandCtrl
 key while you click to select more than one field.
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 >
-Click to move the selected field(s) to the box that the arrow is 
pointing to.i73704
+Click to move 
the selected field(s) to the box that the arrow is pointing 
to.i73704
 
 
 
-
-
-
-
+
+
+
+
 >>
-Click to move all fields to the box that the arrow is pointing 
to.
+Click to move 
all fields to the box that the arrow is pointing to.
 
 
 
-
-
-
-
-
+
+
+
+
+
 <
-Click to move the selected field(s) to the box that the arrow is 
pointing to.
+Click to move 
the selected field(s) to the box that the arrow is pointing 
to.
 
 
 
-
-
-
-
-
+
+
+
+
+
 <<
-Click to move all fields to the box that the arrow is pointing 
to.
+Click to move 
all fields to the box that the arrow is pointing to.
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
 ^
-Click to move the selected field up one entry in the 
list.
-
-
-
-
-
-
-
-
-
+Click to move the 
selected field up one entry in the list.
+
+
+
+
+
+
+
+
+
 v
-Click to move the selected field down one entry in the 
list.
+Click to move the 
selected field down one entry in the list.
 
 
-
+
 Fields in the form
-Displays the fields that are in the new form.
-Form Wizard - Set up a 
subform
+Displays the 
fields that are in the new form.
+Form Wizard - Set up a 
subform
 
 

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/DNA/content.xml |9 
 extras/source/templates/presnt/DNA/meta.xml|5 
 extras/source/templates/presnt/DNA/styles.xml  |  699 -
 3 files changed, 245 insertions(+), 468 deletions(-)

New commits:
commit a31c52d93fcfffe5bda3d8937e6a934cf76eed54
Author: Laurent Balland 
AuthorDate: Sat Jul 6 18:50:32 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 13:32:01 2024 +0200

Update DNA Impress template

- remove useless styles
- correct ODF validator errors: draw:fit-to-size to false
see https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
- remove lr-tb tag
- uniformization of fonts (only Serif)
- change German name of styles to English
- create a group for DNA drawing
- add licence and initial creator in meta.xml according to
https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo-cft

Change-Id: I06c3aeb3708f011d29796098800ca6c863ac1ef7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170706
Reviewed-by: Laurent Balland 
Tested-by: Jenkins

diff --git a/extras/source/templates/presnt/DNA/content.xml 
b/extras/source/templates/presnt/DNA/content.xml
index 0644ebd1eddc..d601705ca6b8 100644
--- a/extras/source/templates/presnt/DNA/content.xml
+++ b/extras/source/templates/presnt/DNA/content.xml
@@ -1,12 +1,6 @@
 
 http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:presentat
 ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
   
-  
-
-
-
-
-  
   
 
   
@@ -19,15 +13,12 @@
 
 
   
-  
 
 
   
-  
 
 
   
-  
 
 
   
diff --git a/extras/source/templates/presnt/DNA/meta.xml 
b/extras/source/templates/presnt/DNA/meta.xml
index 51e8c62e258b..a985a865f9cb 100644
--- a/extras/source/templates/presnt/DNA/meta.xml
+++ b/extras/source/templates/presnt/DNA/meta.xml
@@ -2,8 +2,9 @@
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
   
 2016-10-08T08:58:55.7
-P0D
-1
+Alexander Wilms
+This work is licensed under a Creative Commons 0 License.
+It makes use of the works of Alexander Wilms.
 LibreOffice/5.2.2.2$Windows_X86_64 
LibreOffice_project/8f96e87c890bf8fa77463cd4b640a2312823f3ad
 DNA
 
diff --git a/extras/source/templates/presnt/DNA/styles.xml 
b/extras/source/templates/presnt/DNA/styles.xml
index 42422332ddee..5bbadf6f2e07 100644
--- a/extras/sourc

core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/bastyp/swcache.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 900f47904517878530b88776a09a3268f4cc1a84
Author: Caolán McNamara 
AuthorDate: Sat Aug 31 16:32:41 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:55:38 2024 +0200

cid#1608098 Overflowed constant

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

diff --git a/sw/source/core/bastyp/swcache.cxx 
b/sw/source/core/bastyp/swcache.cxx
index 531ce2de4449..484850294193 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -301,17 +301,18 @@ void SwCache::DeleteObj( SwCacheObj *pObj )
 // Shrink if possible.To do so we need enough free positions.
 // Unpleasant side effect: positions will be moved and the owner of
 // these might not find them afterwards
-for ( size_t i = 0; i < m_aCacheObjects.size(); ++i )
+size_t i = 0;
+while (i < m_aCacheObjects.size())
 {
 SwCacheObj *pTmpObj = m_aCacheObjects[i].get();
 if ( !pTmpObj )
 {
 m_aCacheObjects.erase( m_aCacheObjects.begin() + i );
---i;
 }
 else
 {
 pTmpObj->SetCachePos( i );
+++i;
 }
 }
 m_aFreePositions.clear();

core.git: svl/source

[Caolán McNamara (via logerrit)]

 svl/source/numbers/zforscan.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 25209dbefbb21fcaa9bc00e7ad8ad064cea92e39
Author: Caolán McNamara 
AuthorDate: Thu Aug 22 13:51:03 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 21:41:08 2024 +0200

cid#1607947 silence Overflowed array index write

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

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 08f6a8591ef5..272fb10ba4e8 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1660,10 +1660,13 @@ bool ImpSvNumberformatScan::InsertSymbol( sal_uInt16 & 
nPos, svt::NfSymbolType e
 return false;
 }
 ++nStringsCnt;
-for (size_t i = nStringsCnt; i > nPos; --i)
+sal_uInt16 i = nStringsCnt;
+while (i > nPos)
 {
-nTypeArray[i] = nTypeArray[i-1];
-sStrArray[i] = sStrArray[i-1];
+sal_uInt16 nexti = o3tl::sanitizing_dec(i);
+nTypeArray[i] = nTypeArray[nexti];
+sStrArray[i] = sStrArray[nexti];
+i = nexti;
 }
 }
 ++nResultStringsCnt;

Re: ESC meeting minutes: 2024-08-29

[khagaroth]

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

On Thu, Aug 29, 2024 at 4:53 PM Miklos Vajna  wrote:

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

core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d40b5f9cfcc971620bcd0400433fd032c46ff8ca
Author: Caolán McNamara 
AuthorDate: Sat Aug 31 16:11:38 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:08:27 2024 +0200

cid#1606767 Overflowed constant

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

diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx 
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 076ceda030f9..1670570e8a05 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -196,7 +196,8 @@ sal_uInt32 
ScXMLChangeTrackingImportHelper::GetIDFromString(std::string_view sID
 if (sID.substr(0, SC_CHANGE_ID_PREFIX.getLength()) == 
SC_CHANGE_ID_PREFIX)
 {
 sal_Int32 nValue;
-::sax::Converter::convertNumber(nValue, 
sID.substr(SC_CHANGE_ID_PREFIX.getLength()));
+::sax::Converter::convertNumber(nValue, 
sID.substr(SC_CHANGE_ID_PREFIX.getLength()),
+0, SAL_MAX_INT32);
 OSL_ENSURE(nValue > 0, "wrong change action ID");
 nResult = nValue;
 }

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Piano/content.xml |   40 ---
 extras/source/templates/presnt/Piano/meta.xml|5 
 extras/source/templates/presnt/Piano/styles.xml  |  295 +--
 3 files changed, 78 insertions(+), 262 deletions(-)

New commits:
commit f7f87ca21e20badfde3b7328e71f259d69c01391
Author: Laurent Balland 
AuthorDate: Sat Aug 10 16:59:21 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 18:49:58 2024 +0200

Update Piano Impress template

  - remove unused styles
  - simplify definition of font names
  - add licence and initial creator in meta.xml according to

https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo5-design-candidates
  - remove writing mode tags
  - styles.xml: set draw:fit-to-size at "false" instead of "shrink-to-fit" 
(suggested by Regina)
  https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18

Change-Id: Ibf57a515dce0952c2d08fe1abfaef1bff462f433
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171751
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Piano/content.xml 
b/extras/source/templates/presnt/Piano/content.xml
index 4d44fad08ffd..a2e379644148 100644
--- a/extras/source/templates/presnt/Piano/content.xml
+++ b/extras/source/templates/presnt/Piano/content.xml
@@ -1,9 +1,6 @@
 
 http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:presentat
 ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
   
-  
-
-  
   
 
   
@@ -14,62 +11,37 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-  
-
-
-  
-
   
   
 
   
 
-
+
   
 
-
+
   
 
 
   
   
-  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
 
   
   
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/Piano/meta.xml 
b/extras/source/templates/presnt/Piano/meta.xml
index 120c706b0d98..a19c2345e955 100644
--- a/extras/source/templates/presnt/Piano/meta.xml
+++ b/extras/source/templates/presnt/Piano/meta.xml
@@ -2,8 +2,9 @@
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; offi

Re: ESC meeting minutes: 2024-08-29

[Ilmari Lauhakangas]

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


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

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


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

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


Ilmari

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

[Laurent Balland (via logerrit)]

 dev/null |binary
 extras/source/templates/presnt/Blueprint_Plans/META-INF/manifest.xml |1 
 extras/source/templates/presnt/Blueprint_Plans/content.xml   |  135 ---
 extras/source/templates/presnt/Blueprint_Plans/meta.xml  |5 
 extras/source/templates/presnt/Blueprint_Plans/styles.xml|  415 
++
 extras/template_files.mk |1 
 6 files changed, 125 insertions(+), 432 deletions(-)

New commits:
commit d145692f4e4e66f622f90e6a61261a28468d496a
Author: Laurent Balland 
AuthorDate: Sat Jul 6 18:34:22 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 13:39:14 2024 +0200

Update Blueprint Plans template

- remove uselless styles
- move contributor to meta.xml
- remove lr-tb tags
- correct ODF validator errors: draw: fit-to-size should be set to false 
according to
  https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
- simplify inheritance of fonts
- force footer/header/date/page font color to black for Handout view, to
  get them visible
- add licence and initial creator in meta.xml according to last slide
- remove last slide as it is a duplicate of 1st slide

Change-Id: If27084f26306c34ba73389c5594d3e662cb551f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170704
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git 
a/extras/source/templates/presnt/Blueprint_Plans/META-INF/manifest.xml 
b/extras/source/templates/presnt/Blueprint_Plans/META-INF/manifest.xml
index 99f5d8f0359e..693270d2691d 100644
--- a/extras/source/templates/presnt/Blueprint_Plans/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Blueprint_Plans/META-INF/manifest.xml
@@ -4,7 +4,6 @@
   
   
   
-  
   
   
   
diff --git 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
deleted file mode 100644
index a7264148dc75..
Binary files 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 and /dev/null differ
diff --git a/extras/source/templates/presnt/Blueprint_Plans/content.xml 
b/extras/source/templates/presnt/Blueprint_Plans/content.xml
index 12e0d1fe5b9b..a31b36a4ffd2 100644
--- a/extras/source/templates/presnt/Blueprint_Plans/content.xml
+++ b/extras/source/templates/presnt/Blueprint_Plans/content.xml
@@ -1,9 +1,5 @@
 
 http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1
 .0" xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:d
 atastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; office:version="1.2">
-  
-  
-
-  
   
 
   
@@ -14,152 +10,33 @@
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-
-

core.git: sw/qa

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

 sw/qa/extras/layout/data/tdf162109.fodt |  202 ++
 sw/qa/extras/layout/data/tdf162220.fodt |  209 
 sw/qa/extras/layout/layout3.cxx |   34 +
 3 files changed, 445 insertions(+)

New commits:
commit 1a87cd290282ea723c5d1a0d80c958b705b9d7ec
Author: László Németh 
AuthorDate: Sat Aug 31 02:18:02 2024 +0200
Commit: László Németh 
CommitDate: Sat Aug 31 16:20:05 2024 +0200

tdf#162109 tdf#162220 sw smart justify: add unit tests

Follow-up to commit 6b857398a59d16308d6185d01e003e401439f060
"tdf#162109 sw smart justify: fix overhanging last line"
and commit 22eac3145ca62d15b47d95f4df60ce38d4f5aa46
"tdf#162220 sw smart justify: fix shrinking for single portion lines".

Change-Id: I046bc3c5f45659442b288952ed1cd5b5cb6c16e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172689
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/layout/data/tdf162109.fodt 
b/sw/qa/extras/layout/data/tdf162109.fodt
new file mode 100644
index ..fd350b1364aa
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf162109.fodt
@@ -0,0 +1,202 @@
+
+
+http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ 
2024-08-21T13:37:42.534597431PT29S1LibreOfficeDev/25.2.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/c2a186c8c116a059796ca179e252b4feb9829950
+ 
+  
+   0
+   0
+   24045
+   14256
+   true
+   false
+   
+
+ view2
+ 3321
+ 2300
+ 0
+ 0
+ 24044
+ 14254
+ 0
+ 1
+ false
+ 160
+ false
+ false
+ false
+ false
+ false
+ false
+
+   
+  
+  
+   false
+   true
+   true
+   
+   false
+   0
+   false
+   true
+   false
+   true
+   false
+   true
+   0
+   true
+   false
+   false
+   false
+   true
+   false
+   true
+   false
+   false
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   false
+   false
+   false
+   false
+   true
+   false
+   false
+   false
+   false
+   false
+   false
+   high-resolution
+   true
+   1476935
+   false
+   false
+   false
+   
+   
+   true
+   
+   false
+   false
+   false
+   true
+   true
+   true
+   false
+   0
+   true
+   false
+   true
+   false
+   true
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   false
+   true
+   true
+   true
+   
+   false
+   false
+   true
+   0
+   false
+   true
+   
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1
+   true
+   true
+   true
+   false
+   false
+   true
+   false
+   false
+   true
+   false
+   true
+   false
+   false
+   
+   true
+   1476935
+   true
+   false
+   false
+   true
+  
+ 
+ 
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+
+   
+

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Progress/content.xml |  132 
 extras/source/templates/presnt/Progress/meta.xml|5 
 extras/source/templates/presnt/Progress/styles.xml  |  576 
 3 files changed, 161 insertions(+), 552 deletions(-)

New commits:
commit 18746c7efe0b6eb78ec19a99b65c40a8291eb8d7
Author: Laurent Balland 
AuthorDate: Tue Aug 13 11:05:28 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 20:26:42 2024 +0200

Update Progress Impress template

  - simplify definition of font names (replace Liberation Narrow with 
Liberation)
  - remove writing mode tags
  - add licence and initial creator in meta.xml according to
https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo-cft
  - styles.xml: set draw:fit-to-size at "false" instead of "shrink-to-fit" 
(suggested by Regina)
https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
  - remove unused styles
  - remove useless shapes
  - correct misalignment in Handout and Notes view of Header/Footer
  - Slide 1: center Title/subtitle
  - rotate outline in last slide
  - remove text:span empty tags

Change-Id: Ibbc4b469edd78af6b8ce0766137d4e2218b8b35b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171812
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Progress/content.xml 
b/extras/source/templates/presnt/Progress/content.xml
index e97462c01af8..4af922334bf5 100644
--- a/extras/source/templates/presnt/Progress/content.xml
+++ b/extras/source/templates/presnt/Progress/content.xml
@@ -1,12 +1,5 @@
 
 http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:presentat
 ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
-  
-  
-
-
-
-
-  
   
 
   
@@ -20,114 +13,19 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-
-
-  
-
-
-  
-  
-  
-
-
-  
-
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-
   
   
 
   
 
-
+
   
 
-
+
   
-
-  
-
-
-
-  
-
+
+  
+
   
 
 
@@ -138,17 +36,17 @@
 
 
   
-  
+  
 

help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/sbasic/shared/main0601.xhp |   14 ++
 source/text/scalc/main.xhp |2 +-
 source/text/sdraw/main.xhp |2 +-
 source/text/simpress/main.xhp  |1 -
 source/text/swriter/main.xhp   |1 -
 5 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit eee5d2a36a440d54d5e793ea747239f9f782b9cf
Author: Olivier Hallot 
AuthorDate: Fri Aug 30 10:13:33 2024 -0300
Commit: Olivier Hallot 
CommitDate: Sat Aug 31 14:31:13 2024 +0200

tdf#162607 Remove dup's in hid2file.js, bad hid

+ Deleted HID_GLOBAL_FALLBACK, removed long time ago, pre-LibreOffice
+ refactor simpress/main0210.xhp

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

diff --git a/source/text/sbasic/shared/main0601.xhp 
b/source/text/sbasic/shared/main0601.xhp
index 72e3c47c1b..7f6cdb26c9 100644
--- a/source/text/sbasic/shared/main0601.xhp
+++ b/source/text/sbasic/shared/main0601.xhp
@@ -20,20 +20,18 @@
 
 
   
-$[officename] Basic Help
+$[officename] Basic Help
 /text/sbasic/shared/main0601.xhp
   
 
 
 
 
-
-
 %PRODUCTNAME Basic 
Help
 
 
-%PRODUCTNAME 
provides an Application Programming Interface (API) that allows controlling the 
$[officename] components with different programming languages by using the 
$[officename] Software Development Kit (SDK). For more information about the 
$[officename] API and the Software Development Kit, visit https://api.libreoffice.org/";>https://api.libreoffice.org
-This help 
section explains the most common functions of %PRODUCTNAME Basic. For more 
in-depth information please refer to the https://wiki.documentfoundation.org/Documentation/BASIC_Guide";>OpenOffice.org
 BASIC Programming Guide on the Wiki.
+%PRODUCTNAME provides an 
Application Programming Interface (API) that allows controlling the 
$[officename] components with different programming languages by using the 
$[officename] Software Development Kit (SDK). For more information about the 
$[officename] API and the Software Development Kit, visit https://api.libreoffice.org/";>https://api.libreoffice.org
+This help section explains the 
most common functions of %PRODUCTNAME Basic. For more in-depth information 
please refer to the https://wiki.documentfoundation.org/Documentation/BASIC_Guide";>OpenOffice.org
 BASIC Programming Guide on the Wiki.
 
 
 Working with %PRODUCTNAME Basic
@@ -58,9 +56,9 @@
 
 
 
-  
-%PRODUCTNAME internal Basic 
macro libraries
-%PRODUCTNAME installs a set of Basic macro libraries that can 
be accessed from your Basic macros.
+
+%PRODUCTNAME internal Basic macro libraries
+%PRODUCTNAME installs a 
set of Basic macro libraries that can be accessed from your Basic 
macros.
 
 
 
diff --git a/source/text/scalc/main.xhp b/source/text/scalc/main.xhp
index 408bca30a4..38e70dea2d 100644
--- a/source/text/scalc/main.xhp
+++ b/source/text/scalc/main.xhp
@@ -25,7 +25,7 @@
 
 
 
-Welcome to the $[officename] Calc 
Help
+Welcome to the $[officename] Calc Help
 
 How to Work With $[officename] Calc
 
diff --git a/source/text/sdraw/main.xhp b/source/text/sdraw/main.xhp
index e9f94a5aac..4ffcae44cc 100644
--- a/source/text/sdraw/main.xhp
+++ b/source/text/sdraw/main.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 Welcome to the $[officename] Draw Help
   
   How to Work With $[officename] Draw
diff --git a/source/text/simpress/main.xhp 
b/source/text/simpress/main.xhp
index 81bf0d8475..b09b7875f2 100644
--- a/source/text/simpress/main.xhp
+++ b/source/text/simpress/main.xhp
@@ -30,7 +30,6 @@
 
 
 
-
 Welcome to the $[officename] Impress Help
   
 How to Work With $[officename] Impress
diff --git a/source/text/swriter/main.xhp b/source/text/swriter/main.xhp
index 693a5d284b..2497938024 100644
--- a/source/text/swriter/main.xhp
+++ b/source/text/swriter/main.xhp
@@ -28,7 +28,6 @@
 
 
 
-
 %PRODUCTNAME Writer Help
 
 Working With %PRODUCTNAME Writer

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/DNA/content.xml  |   19 
 extras/source/templates/presnt/DNA/styles.xml   |  291 ++--
 3 files changed, 149 insertions(+), 161 deletions(-)

New commits:
commit baf7cb96d46c3304c5be6a6a2565534b02824bc7
Author: Laurent Balland 
AuthorDate: Tue Jul 23 12:06:53 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 17:38:42 2024 +0200

tdf#162229 DNA Impress template: smarter DNA chain

- resort elements in more logical order
- modify position to more regular place
- modify darkness according to distance
- update thumbnail.png
- remove text:span empty tags

Change-Id: Ib260c15aaf420837f24cde93b667f1cb9dbb6a90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171021
Reviewed-by: Laurent Balland 
Tested-by: Jenkins

diff --git a/extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png
index 507d9b0a929c..d1c5e6bce237 100644
Binary files a/extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png and 
b/extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/DNA/content.xml 
b/extras/source/templates/presnt/DNA/content.xml
index d601705ca6b8..211079aeda80 100644
--- a/extras/source/templates/presnt/DNA/content.xml
+++ b/extras/source/templates/presnt/DNA/content.xml
@@ -1,6 +1,5 @@
 
 http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:presentat
 ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
-  
   
 
   
@@ -11,32 +10,20 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
   
   
 
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/DNA/styles.xml 
b/extras/source/templates/presnt/DNA/styles.xml
index 5bbadf6f2e07..004c964b8af2 100644
--- a/extras/source/templates/presnt/DNA/styles.xml
+++ b/extras/source/templates/presnt/DNA/styles.xml
@@ -65,7 +65,7 @@
 
   
   
-  
+  
 
 
   
@@ -75,7 +75,6 @@
 
 
   
-  
 
 
   
@@ -109,7 +108,7 @@
 
 
   
-  
+  
 
 
   
@@ -380,11 +379,35 @@
 
   
 
-
-  
+
+  
 
-
-  
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
 
 
   
@@ -422,36 +445,28 @@
   
 
   
-
-  
-
+
   
 
   
   
 
   
-
-  
-
+  

core.git: vcl/qt5

[Michael Weghorn (via logerrit)]

 vcl/qt5/QtFrame.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 5ef991ffc226424a673662b6e478db124825022a
Author: Michael Weghorn 
AuthorDate: Fri Aug 30 17:20:41 2024 +0200
Commit: Michael Weghorn 
CommitDate: Sat Aug 31 18:27:50 2024 +0200

tdf#162696 qt: Always run QtFrame::SetPosSize in main thread

This fixes the following assert seen with the qt6 VCL plugin
when run with a current Qt 6 dev debug build for the tdf#162696
scenario when when native Qt widgets (currently only message dialogs
are implmeneted) are explicitly disabled using
`SAL_VCL_QT_NO_WELDED_WIDGETS=1`.

ASSERT failure in QWidget: "Widgets must be created in the GUI 
thread.", file 
/home/michi/development/git/qt5/qtbase/src/widgets/kernel/qwidget.cpp, line 958
terminate called after throwing an instance of 
'com::sun::star::uno::RuntimeException'

Fatal exception: Signal 6
Stack:
#0 sal::backtrace_get(unsigned int) at 
/home/michi/development/git/libreoffice/sal/osl/unx/backtraceapi.cxx:42
#1 (anonymous namespace)::printStack(int) at 
/home/michi/development/git/libreoffice/sal/osl/unx/signal.cxx:289
#2 (anonymous namespace)::callSystemHandler(int, siginfo_t*, void*) at 
/home/michi/development/git/libreoffice/sal/osl/unx/signal.cxx:330
#3 (anonymous namespace)::signalHandlerFunction(int, siginfo_t*, void*) 
at /home/michi/development/git/libreoffice/sal/osl/unx/signal.cxx:427
#4 /lib/x86_64-linux-gnu/libc.so.6(+0x3f590) [0x7f73cbe55590]
#5 __pthread_kill_implementation at ./nptl/pthread_kill.c:44 
(discriminator 1)
#6 raise at ./signal/../sysdeps/posix/raise.c:27
#7 abort at ./stdlib/abort.c:81
#8 /lib/x86_64-linux-gnu/libstdc++.so.6(+0xa1a3d) [0x7f73cbaa1a3d]
#9 /lib/x86_64-linux-gnu/libstdc++.so.6(+0xb306a) [0x7f73cbab306a]
#10 std::unexpected() in /lib/x86_64-linux-gnu/libstdc++.so.6
#11 
/home/michi/development/git/qt5/qtbase/lib/libQt6Core.so.6(+0xed562) 
[0x7f73b78ed562]
#12 QMessageLogger::fatal() const at 
/home/michi/development/git/qt5/qtbase/src/corelib/global/qlogging.cpp:901
#13 qt_assert_x(char const*, char const*, char const*, int) at 
/home/michi/development/git/qt5/qtbase/src/corelib/global/qassert.cpp:0
#14 QWidgetPrivate::init(QWidget*, QFlags) at 
/home/michi/development/git/qt5/qtbase/src/widgets/kernel/qwidget.cpp:959
#15 QWidget::QWidget(QWidgetPrivate&, QWidget*, QFlags) 
at /home/michi/development/git/qt5/qtbase/src/widgets/kernel/qwidget.cpp:878
#16 QMenuBar::QMenuBar(QWidget*) at 
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qmenubar.cpp:715
#17 QMainWindow::menuBar() const at 
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qmainwindow.cpp:468
#18 QtFrame::menuBarOffset() const at 
/home/michi/development/git/libreoffice/vcl/qt6/../qt5/QtFrame.cxx:462
#19 QtFrame::SetDefaultPos() at 
/home/michi/development/git/libreoffice/vcl/qt6/../qt5/QtFrame.cxx:479
#20 QtFrame::SetPosSize(long, long, long, long, unsigned short) at 
/home/michi/development/git/libreoffice/vcl/qt6/../qt5/QtFrame.cxx:565
#21 vcl::Window::setPosSizePixel(long, long, long, long, PosSizeFlags) 
at /home/michi/development/git/libreoffice/vcl/source/window/window.cxx:2786
#22 vcl::Window::SetSizePixel(Size const&) at 
/home/michi/development/git/libreoffice/vcl/source/window/window2.cxx:1344
#23 SystemWindow::setOptimalLayoutSize(bool) at 
/home/michi/development/git/libreoffice/vcl/source/window/syswin.cxx:1085
#24 SystemWindow::DoInitialLayout() at 
/home/michi/development/git/libreoffice/vcl/source/window/syswin.cxx:1098
#25 Dialog::StateChanged(StateChangedType) at 
/home/michi/development/git/libreoffice/vcl/source/window/dialog.cxx:761
#26 MessageDialog::StateChanged(StateChangedType) at 
/home/michi/development/git/libreoffice/vcl/source/window/layout.cxx:2706
#27 vcl::Window::CompatStateChanged(StateChangedType) at 
/home/michi/development/git/libreoffice/vcl/source/window/window.cxx:3921
#28 vcl::Window::ImplCallInitShow() at 
/home/michi/development/git/libreoffice/vcl/source/window/event.cxx:496
#29 vcl::Window::Show(bool, ShowFlags) at 
/home/michi/development/git/libreoffice/vcl/source/window/window.cxx:2312
#30 Dialog::ImplStartExecute() at 
/home/michi/development/git/libreoffice/vcl/source/window/dialog.cxx:1021
#31 Dialog::Execute() at 
/home/michi/development/git/libreoffice/vcl/source/window/dialog.cxx:1071
#32 SalInstanceDialog::run() at 
/home/michi/development/git/libreoffice/vcl/source/app/salvtables.cxx:1898
#33 dp_gui::(anonymous 
namespace)::ProgressCmdEnv::handle(com::sun::star::uno::Reference
 const&) at 
/home/michi/development/git/libreoffice/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx:459
#34 dp_misc

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Midnightblue/content.xml |   48 -
 extras/source/templates/presnt/Midnightblue/meta.xml|5 
 extras/source/templates/presnt/Midnightblue/styles.xml  |  466 +++-
 3 files changed, 127 insertions(+), 392 deletions(-)

New commits:
commit e40544bcc5a671b2bc753faa5f843f8fe97ff793
Author: Laurent Balland 
AuthorDate: Sat Aug 3 14:19:14 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 17:56:42 2024 +0200

Update Midnightblue Impress template

  - change Source Sans Pro font to Noto Sans (as Source xxx Pro are no more 
bundled)
  - restore green border on Midnightblue2 master slide (resolution of 
tdf#114746)
  - styles.xml: set draw:fit-to-size at "false" instead of "shrink-to-fit" 
(suggested by Regina)
  https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
  - remove writing mode tags
  - add licence and initial creator in meta.xml according to

https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo51-templates
  - correct misalignment in Handout view of Header/Footer
  - remove bolding of Header/footer/... in Notes views
  - use base styles "Filled Blue", "Filled Green" for objects (so filling 
colors could easily be reused)
  - correct ODF validator error for graphic properties in Mdp2 style
  - remove text:span empty tags

Change-Id: I18e9c234b1f086f72e4d475d8861654459537b61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171511
Reviewed-by: Laurent Balland 
Tested-by: Jenkins

diff --git a/extras/source/templates/presnt/Midnightblue/content.xml 
b/extras/source/templates/presnt/Midnightblue/content.xml
index ec2638d15e3f..2defb1066062 100644
--- a/extras/source/templates/presnt/Midnightblue/content.xml
+++ b/extras/source/templates/presnt/Midnightblue/content.xml
@@ -1,11 +1,5 @@
 
 http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:presentat
 ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
-  
-  
-
-
-
-  
   
 
   
@@ -19,73 +13,47 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-
   
   
 
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
   
   
 
-
+
   
 
 
   
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/Midnightblue/meta.xml 
b/extras/source/templates/presnt/Midnightblue/meta.xml
index 8bef96d76264..fb048eb91

core.git: sw/CppunitTest_sw_core_theme.mk sw/inc sw/qa sw/source xmloff/source

[Mike Kaganski (via logerrit)]

 sw/CppunitTest_sw_core_theme.mk  |1 
 sw/inc/shellio.hxx   |7 +
 sw/qa/core/theme/ThemeTest.cxx   |  189 +++
 sw/qa/core/theme/data/theme_bar.odt  |binary
 sw/qa/core/theme/data/theme_foo.fodt |   39 +++
 sw/source/filter/basflt/shellio.cxx  |2 
 sw/source/filter/xml/swxml.cxx   |4 
 sw/source/uibase/dochdl/swdtflvr.cxx |1 
 xmloff/source/style/xmlstyle.cxx |   23 
 9 files changed, 266 insertions(+)

New commits:
commit 3cf243ac31098de2d275c722a474a36b330df6e1
Author: Mike Kaganski 
AuthorDate: Fri Aug 30 23:39:52 2024 +0500
Commit: Mike Kaganski 
CommitDate: Sat Aug 31 12:05:10 2024 +0200

tdf#162715: do not import theme when pasting from clipboard

This change makes the two code paths consistent, that are used to paste
native ODF data into the Writer document: that uses own transferable in
usual copy/paste procedure; and that uses "foreign" clipboard data from
another Writer session.  The path using own transferable already didn't
set document theme. This change passes the "IsInPaste" flag down to the
XML reader, to let the latter code path skip the theme when reading ODT.

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

diff --git a/sw/CppunitTest_sw_core_theme.mk b/sw/CppunitTest_sw_core_theme.mk
index 03b42a32e666..5938916bd9df 100644
--- a/sw/CppunitTest_sw_core_theme.mk
+++ b/sw/CppunitTest_sw_core_theme.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_theme, \
 docmodel \
 sal \
 sfx \
+sot \
 subsequenttest \
 sw \
 swqahelper \
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 5121d5371181..633dbacf9070 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -155,6 +155,7 @@ class SW_DLLPUBLIC SwReader: public SwDocFac
 OUString msBaseURL;
 bool mbSkipImages;
 bool mbSkipInvalidateNumRules = false;
+bool mbIsInPaste = false;
 
 public:
 
@@ -180,6 +181,8 @@ public:
 {
 mbSkipInvalidateNumRules = bSkipInvalidateNumRules;
 }
+void SetInPaste(bool val) { mbIsInPaste = val; }
+bool IsInPaste() const { return mbIsInPaste; }
 
 protected:
 voidSetBaseURL( const OUString& rURL ) { msBaseURL = rURL; 
}
@@ -232,6 +235,7 @@ protected:
 bool m_bHasAskTemplateName : 1;
 bool m_bIgnoreHTMLComments : 1;
 bool m_bSkipImages : 1;
+bool m_bIsInPaste : 1 = false;
 
 virtual OUString GetTemplateName(SwDoc& rDoc) const;
 
@@ -269,6 +273,9 @@ public:
 
 void SetIgnoreHTMLComments( bool bSet ) { m_bIgnoreHTMLComments = bSet; }
 
+bool IsInPaste() const { return m_bIsInPaste; }
+void SetInPaste(bool bSet) { m_bIsInPaste = bSet; }
+
 virtual bool HasGlossaries() const;
 virtual bool ReadGlossaries( SwTextBlocks&, bool bSaveRelFiles ) const;
 
diff --git a/sw/qa/core/theme/ThemeTest.cxx b/sw/qa/core/theme/ThemeTest.cxx
index ce2be76edc65..9f33bafe33c1 100644
--- a/sw/qa/core/theme/ThemeTest.cxx
+++ b/sw/qa/core/theme/ThemeTest.cxx
@@ -9,17 +9,25 @@
 
 #include 
 
+#include 
+#include 
+
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 
 using namespace css;
 
@@ -479,6 +487,187 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeChanging)
 }
 }
 
+// A simple transferable, that provides only EMBED_SOURCE and OBJECTDESCRIPTOR 
flavors, taking
+// data from an ODT file. This makes the transferable behave just like 
clipboard content created
+// by Writer in a different instance, taking SwTransferable::PasteOLE path.
+class TestSimpleFileTransferable : public 
cppu::WeakImplHelper
+{
+public:
+TestSimpleFileTransferable(const OUString& fileURL);
+css::uno::Any SAL_CALL getTransferData(const 
css::datatransfer::DataFlavor& flavor) override;
+css::uno::Sequence SAL_CALL 
getTransferDataFlavors() override;
+sal_Bool SAL_CALL isDataFlavorSupported(const 
css::datatransfer::DataFlavor& flavor) override;
+
+private:
+OUString m_fileURL;
+};
+
+TestSimpleFileTransferable::TestSimpleFileTransferable(const OUString& fileURL)
+: m_fileURL(fileURL)
+{
+}
+
+css::uno::Any
+TestSimpleFileTransferable::getTransferData(const 
css::datatransfer::DataFlavor& flavor)
+{
+if (flavor.MimeType == 
SotExchange::GetFormatMimeType(SotClipboardFormatId::EMBED_SOURCE))
+{
+auto 
xSFA(ucb::SimpleFileAccess::create(comphelper::getProcessComponentContext()));
+auto xInputStream = xSFA->openFileRead(m_fileURL);
+sal_Int32 bytes = xInputStream->available();
+css::uno::Sequence data;
+CPPUNIT_ASSERT_EQUAL(bytes, xInputStream->readBytes(data, bytes));
+return css::uno::Any(data);
+}
+if (flavor.MimeType == 
SotExchange::GetForma

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Portfolio/content.xml |   53 -
 extras/source/templates/presnt/Portfolio/meta.xml|5 
 extras/source/templates/presnt/Portfolio/styles.xml  |  608 +--
 3 files changed, 182 insertions(+), 484 deletions(-)

New commits:
commit aab11d61997d11c23facf9e2ab34b6a9d5787b68
Author: Laurent Balland 
AuthorDate: Mon Aug 12 18:08:00 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 20:26:15 2024 +0200

Update Portfolio template

  - simplify definition of font names
  - remove writing mode tags
  - correctly rename first master as "Portfolio"; see
https://bugs.documentfoundation.org/show_bug.cgi?id=158496
  - restore bullets for Portfolio-outline1 (bug was hidden due to a 
display-name different from its name)
  - styles.xml: set draw:fit-to-size at "false" instead of "shrink-to-fit" 
(suggested by Regina)
https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
  - add licence and initial creator in meta.xml according to
https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo-cft
  - remove unused styles
  - remove text:span empty tags

Change-Id: I3931f0ab80f0533e49496417e4852d7bfcabd778
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171799
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Portfolio/content.xml 
b/extras/source/templates/presnt/Portfolio/content.xml
index 96f2b5412377..add34f714cd0 100644
--- a/extras/source/templates/presnt/Portfolio/content.xml
+++ b/extras/source/templates/presnt/Portfolio/content.xml
@@ -1,9 +1,5 @@
 
 http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:presentat
 ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
-  
-  
-
-  
   
 
   
@@ -17,79 +13,50 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-
-
-  
-
   
   
 
-  
+  
 
-
+
   
 
 
   
-  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
   
   
 
-
+
   
 
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/Portfolio/meta.xml 
b/extras/source/templates/presnt/Portfolio/meta.xml
index 03e1d2c27903..3c0bff5e7048 100644
--- a/extras/source/templates/presnt/Portfolio/meta.xml
+++ b/extras/source/templates/presnt/Portfolio/meta.xml
@@ -2,8 +2,9 @@
 http://www.w3.org/1999/xli

core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit b28339494dcaf837a3dd45fc3fd3ae538bfad751
Author: Olivier Hallot 
AuthorDate: Sat Aug 31 14:05:09 2024 -0300
Commit: Gerrit Code Review 
CommitDate: Sat Aug 31 19:05:09 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to d41c733d4d966f47cc0212a526d78722eee81ca8
  - tdf#162607 Remove dup's in hid2file.js WIZARDS

+ Deleted dups for
 WIZARDS_HID_QUERYWIZARD_CMDMOVEUP
 WIZARDS_HID_DLGFORM_CMDNEXT
 WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN

+ refactor

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

diff --git a/helpcontent2 b/helpcontent2
index dc7a2b091a76..d41c733d4d96 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dc7a2b091a7652d4907391f8e39262b65ae6c780
+Subproject commit d41c733d4d966f47cc0212a526d78722eee81ca8

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Inspiration/content.xml |   22 -
 extras/source/templates/presnt/Inspiration/meta.xml|5 
 extras/source/templates/presnt/Inspiration/styles.xml  |  280 +++--
 3 files changed, 60 insertions(+), 247 deletions(-)

New commits:
commit e180a6657a68ad5d31e79e22c00b2fe4ace2cd2d
Author: Laurent Balland 
AuthorDate: Mon Jul 29 22:57:11 2024 +0200
Commit: Laurent Balland 
CommitDate: Sat Aug 31 16:08:19 2024 +0200

Update Inspiration Impress template

  - styles.xml: set draw:fit-to-size at "false" instead of "shrink-to-fit" 
(suggested by Regina)
  https://bugs.documentfoundation.org/show_bug.cgi?id=103317#c18
  - remove writing mode tags
  - remove unused styles
  - set font color to grey for subtitle and outlines
  - set font colot to black for Footer/Header/Date/Page in Notes
  - add licence and initial creator in meta.xml according to

https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo5-design-candidates
  - remove text:span empty tags

Change-Id: I7b739dc506cc4526c27c98a1496968aa289d52f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171221
Reviewed-by: Laurent Balland 
Tested-by: Jenkins

diff --git a/extras/source/templates/presnt/Inspiration/content.xml 
b/extras/source/templates/presnt/Inspiration/content.xml
index 3add273f2f72..9dde9c2090af 100644
--- a/extras/source/templates/presnt/Inspiration/content.xml
+++ b/extras/source/templates/presnt/Inspiration/content.xml
@@ -1,9 +1,5 @@
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x
 mlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:loext="urn:org:documentfoundation:
 names:experimental:office:xmlns:loext:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2">
-  
-  
-
-  
   
 
   
@@ -14,31 +10,19 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
   
   
 
   
-
+
   
 
-
+
   
 
 
   
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/Inspiration/meta.xml 
b/extras/source/templates/presnt/Inspiration/meta.xml
index 5b61fcc1c202..6640cb709df3 100644
--- a/extras/source/templates/presnt/Inspiration/meta.xml
+++ b/extras/source/templates/presnt/Inspiration/meta.xml
@@ -2,8 +2,9 @@
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.2">
   
 2017-11-22T23:08:53.592682645
-PT1M3S
-2
+Mateus Machado Luna
+This work is licensed under a Creative Commons 0 License.
+It makes use of the works of Mateus Machado Luna.
 LibreOffice/5.4.2.2$Linux_X86_64 
LibreOffice_project/22b09f6418e8c2d508a9eaf86b2399209b0990f4
 Inspiration
 2017-11-22T23:09:56.186914543
diff --git a/extras/source

core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/menu.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 372feea4bfc95454845b608d1d313a1402262203
Author: Caolán McNamara 
AuthorDate: Sat Aug 31 16:21:13 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:08:54 2024 +0200

cid#1607670 Overflowed constant

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

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 4ce56eb5af4c..3ad46e1f3768 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2185,7 +2185,8 @@ Menu* Menu::ImplFindMenu( sal_uInt16 nItemId )
 
 void Menu::RemoveDisabledEntries( bool bRemoveEmptyPopups )
 {
-for ( sal_uInt16 n = 0; n < GetItemCount(); n++ )
+sal_uInt16 n = 0;
+while (n < GetItemCount())
 {
 bool bRemove = false;
 MenuItemData* pItem = pItemList->GetDataFromPos( n );
@@ -2204,8 +2205,10 @@ void Menu::RemoveDisabledEntries( bool 
bRemoveEmptyPopups )
 bRemove = true;
 }
 
-if ( bRemove )
-RemoveItem( n-- );
+if (bRemove)
+RemoveItem(n);
+else
+++n;
 }
 
 if ( GetItemCount() )

core.git: vcl/skia

[Patrick Luby (via logerrit)]

 vcl/skia/gdiimpl.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 9147506aa6c4d5b783a367d89609ec1e8d7fe966
Author: Patrick Luby 
AuthorDate: Sat Aug 31 17:27:04 2024 -0400
Commit: Patrick Luby 
CommitDate: Sun Sep 1 03:22:25 2024 +0200

tdf#162646 don't move orthogonal polypolygons when scaling

Previously, polypolygons would be moved slightly but this causes
misdrawing of orthogonal polypolygons (i.e. polypolygons with only
vertical and horizontal lines) when using a Retina display on
macOS.

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

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 267ea0f15f88..290483d3aa80 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -927,6 +927,14 @@ void SkiaSalGraphicsImpl::performDrawPolyPolygon(const 
basegfx::B2DPolyPolygon&
 // So if AA is enabled, avoid this fixup for rectangular areas.
 if (!useAA || !hasOnlyOrthogonal)
 {
+#ifdef MACOSX
+// tdf#162646 don't move orthogonal polypolygons when scaling
+// Previously, polypolygons would be moved slightly but this causes
+// misdrawing of orthogonal polypolygons (i.e. polypolygons with only
+// vertical and horizontal lines) when using a Retina display on
+// macOS and antialiasing is disabled.
+if ((!isUnitTestRunning() && (useAA || !hasOnlyOrthogonal)) || 
getWindowScaling() == 1)
+#else
 // We normally use pixel at their center positions, but slightly off 
(see toSkX/Y()).
 // With AA lines that "slightly off" causes tiny changes of color, 
making some tests
 // fail. Since moving AA-ed line slightly to a side doesn't cause any 
real visual
@@ -934,6 +942,7 @@ void SkiaSalGraphicsImpl::performDrawPolyPolygon(const 
basegfx::B2DPolyPolygon&
 // When running on macOS with a Retina display, one BackendTest unit
 // test will fail if the position is adjusted.
 if (!isUnitTestRunning() || getWindowScaling() == 1)
+#endif
 {
 const SkScalar posFix = useAA ? toSkXYFix : 0;
 polygonPath.offset(toSkX(0) + posFix, toSkY(0) + posFix, nullptr);

help.git: source/text

[Pierre F (via logerrit)]

 source/text/sbasic/shared/03120401.xhp |   44 +++--
 1 file changed, 21 insertions(+), 23 deletions(-)

New commits:
commit dc7a2b091a7652d4907391f8e39262b65ae6c780
Author: Pierre F 
AuthorDate: Fri Aug 16 04:46:32 2024 +0200
Commit: Alain Romedenne 
CommitDate: Sat Aug 31 18:39:55 2024 +0200

clarify Instr(). tdf#129436, tdf#139840

Change-Id: I14f70db80e2a09f9c1e614d0e079830016cbea0f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171778
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/source/text/sbasic/shared/03120401.xhp 
b/source/text/sbasic/shared/03120401.xhp
index 49b2ade943..99de8ca13e 100644
--- a/source/text/sbasic/shared/03120401.xhp
+++ b/source/text/sbasic/shared/03120401.xhp
@@ -17,54 +17,52 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
-
 
   
-InStr Function
+InStr Function
 /text/sbasic/shared/03120401.xhp
   
 
-
 
-
-
 
-
+
   InStr function
 
 
 InStr 
Function
-Returns the 
position of a string within another string.
+Returns the position of a 
string within another string.
 
-The Instr 
function returns the position at which the match was found. If the string was 
not found, the function returns 0.
+The Instr function returns the 
position at which the match was found. If the string was not found, the 
function returns 0.
 
 
 
-InStr ([Start As 
Long,] String1 As String, String2 As String[, Compare]) As Integer
+InStr ([Start As Long,] String1 
As String, String2 As String[, Compare As Integer]) As Integer
 
 
 
 Integer
 
 
- 
Start: A numeric expression that marks the position in a string 
where the search for the specified substring starts. If you omit this 
parameter, the search starts at the first character of the string. The minimum 
allowed value is 1. The maximum allowed value is 2,147,483,648.see 
i17928
- 
String1: The string expression that you want to search.
- 
String2: The string expression that you want to search 
for.
- 
Compare: Optional numeric expression that defines the type of 
comparison. The value of this parameter can be 0 or 1. The default value of 1 
specifies a text comparison that is not case-sensitive. The value of 0 
specifies a binary comparison that is case-sensitive.fixes 
i17929
-To avoid a 
run-time error, do not set the Compare parameter if the first optional 
parameter is omitted.
+ Start: A numeric 
expression that marks the position in a string where the search for the 
specified substring starts. If you omit this parameter, the search starts at 
the first character of the string. The minimum allowed value is 1. The maximum 
allowed value is 2,147,483,648.see i17928
+ String1: The 
string expression being searched.
+ String2: The 
string expression that you want to search for.
+ Compare: Optional 
type of comparison. The value can be 0 or 1. The default value of 1 specifies 
case-insensitive. The value of 0 specifies case-sensitive.
+Case-insensitive comparison may use locale specifics, 
for example, "s" may match "β".
+To avoid a run-time error, do 
not set the Compare parameter if the Start parameter 
is omitted.
 
 
 
 Example:
 
-Sub ExamplePosition
-Dim sInput As String
-Dim iPos As Integer
-sInput = "Office"
-iPos = Instr(sInput,"c")
-Print iPos
-End Sub
+Sub 
ExamplePosition
+  Const 
sCalc = "LibreOffice Calc"
+
+  Instr(sCalc, 
"calc") ' returns 13
+  Instr(String1:=sCalc, 
String2:="calc", Start:=1)  ' returns 13
+  Instr(11, sCalc, 
"c") ' returns 13
+  Instr(11, sCalc, 
"c",  1) ' returns 13
+  Instr(11, sCalc, 
"c",  0) ' returns 16
+End 
Sub
 
 
-
-
+
\ No newline at end of file

core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 7944f998a3e2d14b29fdd1e00a9ad539324e2328
Author: Olivier Hallot 
AuthorDate: Sat Aug 31 09:31:14 2024 -0300
Commit: Gerrit Code Review 
CommitDate: Sat Aug 31 14:31:14 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to eee5d2a36a440d54d5e793ea747239f9f782b9cf
  - tdf#162607 Remove dup's in hid2file.js, bad hid

+ Deleted HID_GLOBAL_FALLBACK, removed long time ago, pre-LibreOffice
+ refactor simpress/main0210.xhp

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

diff --git a/helpcontent2 b/helpcontent2
index 759025310872..eee5d2a36a44 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 759025310872d7c8ad6d360e15ec4af55e7012ac
+Subproject commit eee5d2a36a440d54d5e793ea747239f9f782b9cf

core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/core/data/queryiter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95f23282edb0bdf834b71d7dec2b584e18c82015
Author: Caolán McNamara 
AuthorDate: Sat Aug 31 16:43:00 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 31 22:56:09 2024 +0200

cid#1608435 Use of auto that causes a copy

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

diff --git a/sc/source/core/data/queryiter.cxx 
b/sc/source/core/data/queryiter.cxx
index f1d246868275..aa65424254a5 100644
--- a/sc/source/core/data/queryiter.cxx
+++ b/sc/source/core/data/queryiter.cxx
@@ -572,7 +572,7 @@ bool ScQueryCellIteratorBase< accessType, queryType 
>::BinarySearch( SCCOLROW co
 return false;
 }
 
-auto aIndexer(maParam.bByRow ? MakeBinarySearchIndexer(&pCol->maCells, 
nRow, maParam.nRow2) :
+const auto& aIndexer(maParam.bByRow ? 
MakeBinarySearchIndexer(&pCol->maCells, nRow, maParam.nRow2) :
 MakeBinarySearchIndexer(nullptr, nCol, maParam.nCol2));
 
 if (!aIndexer.isValid())