core.git: Branch 'distro/collabora/co-24.04' - comphelper/qa comphelper/source include/comphelper sfx2/qa sw/qa

[Mike Kaganski (via logerrit)]

 comphelper/qa/unit/propertyvalue.cxx |2 +-
 comphelper/source/misc/sequenceashashmap.cxx |   25 -
 include/comphelper/propertysequence.hxx  |2 +-
 sfx2/qa/cppunit/doc.cxx  |2 +-
 sw/qa/uibase/shells/shells.cxx   |   16 
 sw/qa/uibase/shells/textsh.cxx   |2 +-
 6 files changed, 24 insertions(+), 25 deletions(-)

New commits:
commit e0856bc538fb938af372ea7cd250a05a30025556
Author: Mike Kaganski 
AuthorDate: Mon Oct 21 19:56:59 2024 +0500
Commit: Miklos Vajna 
CommitDate: Tue Oct 22 09:00:27 2024 +0200

Optimize JsonToPropertyValues a bit

1. Make it take string view: helps to avoid extra string allocation
e.g. in desktop::jsonToPropertyValuesVector, and will help more,
when C++26 stringstream ctor taking string view is available.

2. Factor out a function taking boost::property_tree::ptree, making
implementation simpler for [][]com.sun.star.beans.PropertyValue and
[]com.sun.star.beans.PropertyValue, without writing a child node to
a JSON string, and parsing it again.

Change-Id: I16ac2641633ea67a7c9c054c9df09a790500e6fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175361
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 7b2ea917cecbaa7deb67559fe09531bb2a3d98eb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175384
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins CollaboraOffice 

diff --git a/comphelper/qa/unit/propertyvalue.cxx 
b/comphelper/qa/unit/propertyvalue.cxx
index a7cb204fc5e2..9c7b59f486d4 100644
--- a/comphelper/qa/unit/propertyvalue.cxx
+++ b/comphelper/qa/unit/propertyvalue.cxx
@@ -106,7 +106,7 @@ class MakePropertyValueTest : public CppUnit::TestFixture
 ]
 }
 }
-)json"_ostr);
+)json");
 CPPUNIT_ASSERT_EQUAL(static_cast(3), aRet.size());
 beans::PropertyValue aFirst = aRet[0];
 CPPUNIT_ASSERT_EQUAL(OUString("FieldType"), aFirst.Name);
diff --git a/comphelper/source/misc/sequenceashashmap.cxx 
b/comphelper/source/misc/sequenceashashmap.cxx
index 3c3ae6547ebe..928e8075f3d6 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -308,13 +308,10 @@ void SequenceAsHashMap::update(const SequenceAsHashMap& 
rUpdate)
 }
 }
 
-std::vector JsonToPropertyValues(const OString& 
rJson)
+static std::vector JsonToPropertyValues(const 
boost::property_tree::ptree& aTree)
 {
 std::vector aArguments;
-boost::property_tree::ptree aTree, aNodeNull, aNodeValue;
-std::stringstream aStream((std::string(rJson)));
-boost::property_tree::read_json(aStream, aTree);
-
+boost::property_tree::ptree aNodeNull, aNodeValue;
 for (const auto& rPair : aTree)
 {
 const std::string& rType = rPair.second.get("type", "");
@@ -378,10 +375,7 @@ std::vector 
JsonToPropertyValues(const OString& rJson
 else if (rType == "[]com.sun.star.beans.PropertyValue")
 {
 aNodeValue = rPair.second.get_child("value", aNodeNull);
-std::stringstream s;
-boost::property_tree::write_json(s, aNodeValue);
-std::vector aPropertyValues = 
JsonToPropertyValues(OString(s.str()));
-aValue.Value <<= comphelper::containerToSequence(aPropertyValues);
+aValue.Value <<= 
comphelper::containerToSequence(JsonToPropertyValues(aNodeValue));
 }
 else if (rType == "[][]com.sun.star.beans.PropertyValue")
 {
@@ -389,10 +383,7 @@ std::vector 
JsonToPropertyValues(const OString& rJson
 std::vector> aSeqs;
 for (const auto& rItem : aNodeValue)
 {
-std::stringstream s;
-boost::property_tree::write_json(s, rItem.second);
-std::vector aPropertyValues = 
JsonToPropertyValues(OString(s.str()));
-
aSeqs.push_back(comphelper::containerToSequence(aPropertyValues));
+
aSeqs.push_back(comphelper::containerToSequence(JsonToPropertyValues(rItem.second)));
 }
 aValue.Value <<= comphelper::containerToSequence(aSeqs);
 }
@@ -403,6 +394,14 @@ std::vector 
JsonToPropertyValues(const OString& rJson
 return aArguments;
 }
 
+std::vector JsonToPropertyValues(std::string_view 
rJson)
+{
+boost::property_tree::ptree aTree;
+std::stringstream aStream((std::string(rJson)));
+boost::property_tree::read_json(aStream, aTree);
+return JsonToPropertyValues(aTree);
+}
+
 } // namespace comphelper
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertysequence.hxx 
b/include/comphelper/propertysequence.hxx
index e788f56f428f..787f96f3e855 100644
--- a/include/comphelper/propertysequence.hxx
+++ b/include/comphelper/propertysequence.hxx
@@ -53,7 +53,7 @@ namespace comphelper
 return vResult;
 }
 
-COMPHELPER_DLLPUBLIC s

core.git: ucb/source

[Bogdan Buzea (via logerrit)]

 ucb/source/ucp/file/filglob.cxx |   23 ++-
 1 file changed, 6 insertions(+), 17 deletions(-)

New commits:
commit a9b36e7af40b20ed75c9ff93e2f108a2d49265da
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 16:45:45 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 21:36:40 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 341, 
345, 348
V1037 Two or more case-branches perform the same actions. Check lines: 481, 
487
V1037 Two or more case-branches perform the same actions. Check lines: 689, 
700

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

diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index c25f21789313..7f10f8e5fe00 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -336,14 +336,8 @@ namespace fileaccess {
 // not enough memory for allocating structures
 ioErrorCode = IOErrorCode_OUT_OF_MEMORY;
 break;
-case FileBase::E_BUSY:
-// Text file busy
-ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
-break;
-case FileBase::E_AGAIN:
-// Operation would block
-ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
-break;
+case FileBase::E_BUSY:   // Text file busy
+case FileBase::E_AGAIN:  // Operation would block
 case FileBase::E_NOLCK:  // No record locks available
 ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
 break;
@@ -476,16 +470,13 @@ namespace fileaccess {
 // Is a directory
 ioErrorCode = IOErrorCode_NO_FILE;
 break;
-case FileBase::E_AGAIN:
-// Operation would block
+case FileBase::E_AGAIN:  // Operation would block
+case FileBase::E_NOLCK:  // No record locks available
 ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
 break;
 case FileBase::E_TIMEDOUT:
 ioErrorCode = IOErrorCode_DEVICE_NOT_READY;
 break;
-case FileBase::E_NOLCK:  // No record locks available
-ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
-break;
 case FileBase::E_IO: // I/O error
 case FileBase::E_BADF:   // Bad file
 case FileBase::E_FAULT:  // Bad address
@@ -686,6 +677,8 @@ namespace fileaccess {
 ioErrorCode = IOErrorCode_ACCESS_DENIED;
 break;
 case FileBase::E_PERM:  // Operation not permitted
+case FileBase::E_ISDIR: // Is a directory
+case FileBase::E_ROFS:  // Read-only file system
 ioErrorCode = IOErrorCode_NOT_SUPPORTED;
 break;
 case FileBase::E_NAMETOOLONG:   // File name too long
@@ -695,10 +688,6 @@ namespace fileaccess {
 case FileBase::E_NOENT: // No such file or directory
 ioErrorCode = IOErrorCode_NOT_EXISTING;
 break;
-case FileBase::E_ISDIR: // Is a directory
-case FileBase::E_ROFS:  // Read-only file system
-ioErrorCode = IOErrorCode_NOT_SUPPORTED;
-break;
 case FileBase::E_BUSY:  // Device or resource busy
 ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
 break;

core.git: sw/source

[Xisco Fauli (via logerrit)]

 sw/source/filter/xml/xmltbli.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a07b4b432f47902290ff698ec48c79c63d3419ad
Author: Xisco Fauli 
AuthorDate: Tue Oct 22 19:33:22 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 23:04:55 2024 +0200

tdf#163486: PVS: Expression is always true

V560A part of conditional expression is always true: pNumFormat.
V560A part of conditional expression is always true: pNumFormat != 
nullptr.

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

diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 76b62fe426f5..8bd58ca29baf 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1926,7 +1926,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
 // default num format?
 if( const SwTableBoxNumFormat* pNumFormat = 
pBoxFormat2->GetItemIfSet( RES_BOXATR_FORMAT, false ) )
 {
-if (pNumFormat && (pNumFormat->GetValue() % 
SV_COUNTRY_LANGUAGE_OFFSET) == 0)
+if ((pNumFormat->GetValue() % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
 {
 // only one text node?
 SwNodeIndex aNodeIndex( *(pCell->GetStartNode()), 1 );
@@ -1980,8 +1980,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
 const SwDoc* pDoc = m_pBoxFormat->GetDoc();
 const SvNumberFormatter* pNumberFormatter = pDoc ?
 pDoc->GetNumberFormatter() : nullptr;
-if( pNumFormat != nullptr && pNumberFormatter &&
-!pNumberFormatter->GetEntry( pNumFormat->GetValue() 
)->IsTextFormat() )
+if( pNumberFormatter && !pNumberFormatter->GetEntry( 
pNumFormat->GetValue() )->IsTextFormat() )
 m_pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
 }
 }

core.git: sw/qa sw/source

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

 sw/qa/extras/odfexport/data/tdf163575.docx |binary
 sw/qa/extras/odfexport/odfexport2.cxx  |6 ++
 sw/source/core/text/pormulti.cxx   |2 ++
 3 files changed, 8 insertions(+)

New commits:
commit 270c96e12c4a14c4f9e130d15310843da3a6af68
Author: László Németh 
AuthorDate: Tue Oct 22 16:59:24 2024 +0200
Commit: László Németh 
CommitDate: Tue Oct 22 23:11:28 2024 +0200

tdf#163575 sw smart justify: fix size resolution for SwBidiPortion

Negative space sizes (i.e. shrunk lines at image wrapping) stored
over LONG_MAX/2, and these values had no resolution in SwBidiPortion,
causing crash/assert in conversion of DOCX document containing e.g.
Arabic text wrapping around images.

Note: apply the resolution in SwDoubleLinePortion, too.

Regression since commit 1fb6de02709a5f420f21ebd683915da50ce0d198
"tdf#163149 sw smart justify: fix line shrinking at image wrapping".

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

diff --git a/sw/qa/extras/odfexport/data/tdf163575.docx 
b/sw/qa/extras/odfexport/data/tdf163575.docx
new file mode 100644
index ..8d6c8f17fe69
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf163575.docx differ
diff --git a/sw/qa/extras/odfexport/odfexport2.cxx 
b/sw/qa/extras/odfexport/odfexport2.cxx
index e4285bdbdb73..e365cf32ab08 100644
--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
@@ -550,6 +550,12 @@ CPPUNIT_TEST_FIXTURE(Test, tdf99631)
 assertXPathContent(pXmlDoc2, 
"//config:config-item[@config:name='VisibleAreaHeight']", u"1355");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, tdf163575)
+{
+// crashes/assert at export time
+loadAndReload("tdf163575.docx");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, tdf145871)
 {
 loadAndReload("tdf145871.odt");
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 1b9dcf6d0579..cdd52ee951fa 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -224,6 +224,7 @@ SwBidiPortion::SwBidiPortion(TextFrameIndex const nEnd, 
sal_uInt8 nLv)
 
 SwTwips SwBidiPortion::CalcSpacing( tools::Long nSpaceAdd, const 
SwTextSizeInfo& rInf ) const
 {
+nSpaceAdd = nSpaceAdd > LONG_MAX/2 ? LONG_MAX/2 - nSpaceAdd : nSpaceAdd;
 return HasTabulator() ? 0 : sal_Int32(GetSpaceCnt(rInf)) * nSpaceAdd / 
SPACING_PRECISION_FACTOR;
 }
 
@@ -510,6 +511,7 @@ void SwDoubleLinePortion::CalcBlanks( SwTextFormatInfo 
&rInf )
 
 SwTwips SwDoubleLinePortion::CalcSpacing( tools::Long nSpaceAdd, const 
SwTextSizeInfo & ) const
 {
+nSpaceAdd = nSpaceAdd > LONG_MAX/2 ? LONG_MAX/2 - nSpaceAdd : nSpaceAdd;
 return HasTabulator() ? 0 : sal_Int32(GetSpaceCnt()) * nSpaceAdd / 
SPACING_PRECISION_FACTOR;
 }
 

core.git: Branch 'libreoffice-24-2' - include/svtools lingucomponent/source sw/source

[Mike Kaganski (via logerrit)]

 include/svtools/strings.hrc   |3 
 lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx |   36 
++
 sw/source/core/edit/edlingu.cxx   |2 
 3 files changed, 29 insertions(+), 12 deletions(-)

New commits:
commit 59923249e45993805f1f82399d0251f4b63e549b
Author: Mike Kaganski 
AuthorDate: Wed Oct 16 17:12:12 2024 +0500
Commit: Thorsten Behrens 
CommitDate: Tue Oct 22 23:15:55 2024 +0200

tdf#160127: Improve grammar check popups from Duden

When there is a grammar check error that it has no suggestions for, Duden
may return a JSON without suggestions, but still informing about the type
of the error, like

  ...
  {
  "offset": 468,
  "length": 8,
  "errorcode": 21,
  "type": "orth",
  "proposals": []
  },
  ...

Before the change, we underlined the error, but right-clicking it would
only bring the normal Writer's context menu, as if there were no error.
This was made in commit 7697ef9d8fbbed7afba10c00ff9f5362d0540cdd (Proof
reading suggestions:, 2023-11-28); before that change, the context menu
was shown, but since it had no suggestions, and no explanation text, it
was considered better to just not show the grammar check results. But
no menu for an underlined word is no better; so let's instead show the
explanation, based on the type of the error reported by Duden - that is
stored in SingleProofreadingError::aShortComment. Also set aFullComment,
which is used in the grammar check dialog.

Incidentally, it even improves popups with suggestions, because it now
has the explanation as well, where previously only was an icon without
any text.

It may be further improved in a follow-up, because there is "errorcode"
in the message, which we may use to add more details to the explanation.

tdf#160127 should be fixed with this, too; but if there are cases when
there are neither suggestions, nor explanation available, it will need
further work.

Change-Id: I62cde204e0142d6226c9c9486f1cdb5ffc20dca8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175017
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
(cherry picked from commit 3233383b2631788e7cfb0dd0b92d879322561616)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175397
Reviewed-by: Thorsten Behrens 

diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index ab18119242b3..faa3e7cd4b2a 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -350,5 +350,8 @@
 #define STR_DESCRIPTION_MYTHES  NC_("STR_DESCRIPTION_MYTHES", 
"MyThes Thesaurus")
 #define STR_DESCRIPTION_IGNOREALLLIST   
NC_("STR_DESCRIPTION_IGNOREALLLIST", "List of Ignored Words")
 #define STR_DESCRIPTION_LANGUAGETOOL
NC_("STR_DESCRIPTION_LANGUAGETOOL", "LanguageTool Remote Grammar Checker")
+#define STR_DESCRIPTION_SPELLING_ERROR  
NC_("STR_DESCRIPTION_SPELLING_ERROR", "Spelling error")
+#define STR_DESCRIPTION_GRAMMAR_ERROR   
NC_("STR_DESCRIPTION_GRAMMAR_ERROR_LONG", "Grammar error")
+#define STR_DESCRIPTION_STYLE_ERROR 
NC_("STR_DESCRIPTION_STYLE_ERROR", "Bad style")
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx 
b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
index e0a9fd8a718d..00dccc9b2db2 100644
--- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
@@ -235,28 +235,42 @@ uno::Sequence 
parseJson(std::string&& json, std::string
 return {};
 }
 
+OUString DudenTypeToComment(const std::string& type, const Locale& rLocale)
+{
+// TODO: consider also "errorcode", some values of which are explained
+// at https://main.dks.epc.de/doc/Relnotes.html
+TranslateId id = STR_DESCRIPTION_SPELLING_ERROR; // matches both "orth" 
and "term"
+if (type == "gram")
+id = STR_DESCRIPTION_GRAMMAR_ERROR;
+else if (type == "style")
+id = STR_DESCRIPTION_STYLE_ERROR;
+std::locale loc(Translate::Create("svt", LanguageTag(rLocale)));
+return Translate::get(id, loc);
+}
+
 void parseDudenResponse(ProofreadingResult& rResult, std::string&& aJSONBody)
 {
 rResult.aErrors = parseJson(
 std::move(aJSONBody), "check-positions",
-[](const boost::property_tree::ptree& rPos, SingleProofreadingError& 
rError) {
+[& locale = rResult.aLocale](const boost::property_tree::ptree& rPos,
+ SingleProofreadingError& rError) {
 rError.nErrorStart = rPos.get("offset", 0);
 rError.nErrorLength = rPos.get("length", 0);
 rError.nErrorType = text::TextMarkupType::PROOFREADING;
-//rError.aShor

core.git: Branch 'libreoffice-24-8' - include/svtools lingucomponent/source sw/source

[Mike Kaganski (via logerrit)]

 include/svtools/strings.hrc   |3 
 lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx |   36 
++
 sw/source/core/edit/edlingu.cxx   |2 
 3 files changed, 29 insertions(+), 12 deletions(-)

New commits:
commit 7cf1c6c2ccd2d2aefed94f269e836eaeef5a807e
Author: Mike Kaganski 
AuthorDate: Wed Oct 16 17:12:12 2024 +0500
Commit: Thorsten Behrens 
CommitDate: Tue Oct 22 23:15:40 2024 +0200

tdf#160127: Improve grammar check popups from Duden

When there is a grammar check error that it has no suggestions for, Duden
may return a JSON without suggestions, but still informing about the type
of the error, like

  ...
  {
  "offset": 468,
  "length": 8,
  "errorcode": 21,
  "type": "orth",
  "proposals": []
  },
  ...

Before the change, we underlined the error, but right-clicking it would
only bring the normal Writer's context menu, as if there were no error.
This was made in commit 7697ef9d8fbbed7afba10c00ff9f5362d0540cdd (Proof
reading suggestions:, 2023-11-28); before that change, the context menu
was shown, but since it had no suggestions, and no explanation text, it
was considered better to just not show the grammar check results. But
no menu for an underlined word is no better; so let's instead show the
explanation, based on the type of the error reported by Duden - that is
stored in SingleProofreadingError::aShortComment. Also set aFullComment,
which is used in the grammar check dialog.

Incidentally, it even improves popups with suggestions, because it now
has the explanation as well, where previously only was an icon without
any text.

It may be further improved in a follow-up, because there is "errorcode"
in the message, which we may use to add more details to the explanation.

tdf#160127 should be fixed with this, too; but if there are cases when
there are neither suggestions, nor explanation available, it will need
further work.

Change-Id: I62cde204e0142d6226c9c9486f1cdb5ffc20dca8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175017
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
(cherry picked from commit 3233383b2631788e7cfb0dd0b92d879322561616)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175141
Reviewed-by: Thorsten Behrens 

diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index ab18119242b3..faa3e7cd4b2a 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -350,5 +350,8 @@
 #define STR_DESCRIPTION_MYTHES  NC_("STR_DESCRIPTION_MYTHES", 
"MyThes Thesaurus")
 #define STR_DESCRIPTION_IGNOREALLLIST   
NC_("STR_DESCRIPTION_IGNOREALLLIST", "List of Ignored Words")
 #define STR_DESCRIPTION_LANGUAGETOOL
NC_("STR_DESCRIPTION_LANGUAGETOOL", "LanguageTool Remote Grammar Checker")
+#define STR_DESCRIPTION_SPELLING_ERROR  
NC_("STR_DESCRIPTION_SPELLING_ERROR", "Spelling error")
+#define STR_DESCRIPTION_GRAMMAR_ERROR   
NC_("STR_DESCRIPTION_GRAMMAR_ERROR_LONG", "Grammar error")
+#define STR_DESCRIPTION_STYLE_ERROR 
NC_("STR_DESCRIPTION_STYLE_ERROR", "Bad style")
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx 
b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
index 08da873e64b7..5bc7ccf98c3b 100644
--- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
@@ -242,28 +242,42 @@ uno::Sequence 
parseJson(std::string&& json, std::string
 return {};
 }
 
+OUString DudenTypeToComment(const std::string& type, const Locale& rLocale)
+{
+// TODO: consider also "errorcode", some values of which are explained
+// at https://main.dks.epc.de/doc/Relnotes.html
+TranslateId id = STR_DESCRIPTION_SPELLING_ERROR; // matches both "orth" 
and "term"
+if (type == "gram")
+id = STR_DESCRIPTION_GRAMMAR_ERROR;
+else if (type == "style")
+id = STR_DESCRIPTION_STYLE_ERROR;
+std::locale loc(Translate::Create("svt", LanguageTag(rLocale)));
+return Translate::get(id, loc);
+}
+
 void parseDudenResponse(ProofreadingResult& rResult, std::string&& aJSONBody)
 {
 rResult.aErrors = parseJson(
 std::move(aJSONBody), "check-positions",
-[](const boost::property_tree::ptree& rPos, SingleProofreadingError& 
rError) {
+[& locale = rResult.aLocale](const boost::property_tree::ptree& rPos,
+ SingleProofreadingError& rError) {
 rError.nErrorStart = rPos.get("offset", 0);
 rError.nErrorLength = rPos.get("length", 0);
 rError.nErrorType = text::TextMarkupType::PROOFREADING;
-//rError.aShor

core.git: download.lst external/libvisio

[Xisco Fauli (via logerrit)]

 download.lst  |4 
 external/libvisio/UnpackedTarball_libvisio.mk |5 
 external/libvisio/solid-fill-style.patch  |  198 --
 external/libvisio/ubsan.patch |   11 -
 4 files changed, 2 insertions(+), 216 deletions(-)

New commits:
commit 0ffb4c73916321b12e7049e8f54b46ebc40a5266
Author: Xisco Fauli 
AuthorDate: Tue Oct 22 17:22:09 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 23:48:27 2024 +0200

libvisio: upgrade to 0.1.8

Generated with:
./autogen.sh
./configure
make dist-xz

Change-Id: I6ff112ab2669d8ca7903f685486b5cd0f0348fd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175442
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek 

diff --git a/download.lst b/download.lst
index 3a0b06c01114..c149907607f6 100644
--- a/download.lst
+++ b/download.lst
@@ -642,8 +642,8 @@ TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-VISIO_SHA256SUM := 
8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
-VISIO_TARBALL := libvisio-0.1.7.tar.xz
+VISIO_SHA256SUM := 
b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b
+VISIO_TARBALL := libvisio-0.1.8.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk 
b/external/libvisio/UnpackedTarball_libvisio.mk
index b5f530fb2763..b4a3d912ef63 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -15,9 +15,4 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libvisio))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
-external/libvisio/ubsan.patch \
-external/libvisio/solid-fill-style.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/solid-fill-style.patch 
b/external/libvisio/solid-fill-style.patch
deleted file mode 100644
index 53dc6a405e71..
--- a/external/libvisio/solid-fill-style.patch
+++ /dev/null
@@ -1,198 +0,0 @@
 src/lib/VSDStyles.h
-+++ src/lib/VSDStyles.h
-@@ -179,14 +177,13 @@ struct VSDFillStyle
- ASSIGN_OPTIONAL(style.qsFillMatrix, qsFillMatrix);
- if (theme)
- {
--  if (!!style.qsFillColour && style.qsFillColour.get() >= 0)
--ASSIGN_OPTIONAL(theme->getThemeColour(style.qsFillColour.get()), 
fgColour);
--
--  if (!!style.qsFillColour && style.qsFillColour.get() >= 0)
--ASSIGN_OPTIONAL(theme->getThemeColour(style.qsFillColour.get()), 
bgColour);
--
--  if (!!style.qsShadowColour && style.qsShadowColour.get() >= 0)
--ASSIGN_OPTIONAL(theme->getThemeColour(style.qsShadowColour.get()), 
shadowFgColour);
-+  // Quick Style Colour 100 is special. It is the default,
-+  // and it is not saved explicitely in the VSDX file.
-+  
ASSIGN_OPTIONAL(theme->getThemeColour(style.qsFillColour.value_or(100)), 
fgColour);
-+  
ASSIGN_OPTIONAL(theme->getThemeColour(style.qsFillColour.value_or(100)), 
bgColour);
-+  
ASSIGN_OPTIONAL(theme->getThemeColour(style.qsShadowColour.value_or(100)), 
shadowFgColour);
-+  if (!!style.qsFillMatrix && style.qsFillMatrix.get() >= 0)
-+ASSIGN_OPTIONAL(theme->getFillStyleColour(style.qsFillMatrix.get()), 
fgColour);
- }
- ASSIGN_OPTIONAL(style.fgColour, fgColour);
- ASSIGN_OPTIONAL(style.bgColour, bgColour);
 src/lib/VSDXTheme.cpp
-+++ src/lib/VSDXTheme.cpp
-@@ -63,7 +63,8 @@ libvisio::VSDXFontScheme::VSDXFontScheme()
- 
- libvisio::VSDXTheme::VSDXTheme()
-   : m_clrScheme(),
--m_fontScheme()
-+m_fontScheme(),
-+m_fillStyleLst(std::vector>(6))
- {
- }
- 
-@@ -102,6 +103,9 @@ bool 
libvisio::VSDXTheme::parse(librevenge::RVNGInputStream *input)
-   case XML_A_FONTSCHEME:
- readFontScheme(reader.get());
- break;
-+  case XML_A_FMTSCHEME:
-+readFmtScheme(reader.get());
-+break;
-   default:
- break;
-   }
-@@ -320,7 +324,7 @@ void libvisio::VSDXTheme::readClrScheme(xmlTextReaderPtr 
reader)
-   while ((XML_A_CLRSCHEME != tokenId || XML_READER_TYPE_END_ELEMENT != 
tokenType) && 1 == ret);
- }
- 
--void libvisio::VSDXTheme::readThemeColour(xmlTextReaderPtr reader, int 
idToken, Colour &clr)
-+bool libvisio::VSDXTheme::readThemeColour(xmlTextReaderPtr reader, int 
idToken, Colour &clr)
- {
-   int ret = 1;
-   int tokenId = XML_TOKEN_INVALID;
-@@ -350,7 +354,11 @@ void 
libvisio::VSDXTheme::readThemeColour(xmlTextReaderPtr reader, int idToken,
-   while ((idToken != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) && 
1 == ret);
- 
-   if (colour)
-+  {
- clr = *colour;
-+return true;
-+  }
-+  return false;
- }
- 
- void libvisio::VSDXTheme::readVariationClrSchemeLst(xmlTextReaderPtr reader)
-@@ -491,4 +499,96 @@ boost::optional 
libvisio::VSDXTheme::getThemeColou

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

[Andreas Heinisch (via logerrit)]

 vcl/source/edit/textview.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit cfc3997498d71089ad8fd403a6969d803f926fb8
Author: Andreas Heinisch 
AuthorDate: Wed Sep 25 10:04:29 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 21:32:01 2024 +0200

tdf#160202 - Don't extend selection over two words

Don't extend the selection over two separate string in the BASIC editor.
Probably, the BreakIteratorImpl::nextWord needs to be corrected which could 
lead to unwanted side effects.

Change-Id: I0e980006cca672fb63216dc860c12a7004bfd759
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173900
Reviewed-by: Mike Kaganski 
Reviewed-by: Andreas Heinisch 
Tested-by: Jenkins
(cherry picked from commit 489613b93846d77a8ee33f5069f079c59dee563b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174327
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 53ed200ce870..ffe10dfa05a2 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -1215,7 +1215,19 @@ TextPaM TextView::CursorWordRight( const TextPaM& rPaM )
 if ( aPaM.GetIndex() < pNode->GetText().getLength() )
 {
 css::uno::Reference < css::i18n::XBreakIterator > xBI = 
mpImpl->mpTextEngine->GetBreakIterator();
-aPaM.GetIndex() = xBI->nextWord(  pNode->GetText(), aPaM.GetIndex(), 
mpImpl->mpTextEngine->GetLocale(), 
css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ).endPos;
+// tdf#160202 - NextWord unexpectedly skips two words at the start of 
any word
+const auto aWordBoundary = xBI->getWordBoundary(
+pNode->GetText(), aPaM.GetIndex(), 
mpImpl->mpTextEngine->GetLocale(),
+css::i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
+
+// Check if the current index is inside the word boundary
+if (aWordBoundary.startPos <= aPaM.GetIndex() && aPaM.GetIndex() < 
aWordBoundary.endPos)
+aPaM.GetIndex() = aWordBoundary.startPos;
+else
+aPaM.GetIndex() = xBI->nextWord(pNode->GetText(), aPaM.GetIndex(),
+mpImpl->mpTextEngine->GetLocale(),
+
css::i18n::WordType::ANYWORD_IGNOREWHITESPACES)
+  .endPos;
 mpImpl->mpTextEngine->GetWord( aPaM, nullptr, &aPaM );
 }
 else if ( aPaM.GetPara() < ( 
mpImpl->mpTextEngine->mpDoc->GetNodes().size()-1) )

core.git: sw/source

[Xisco Fauli (via logerrit)]

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

New commits:
commit 95e7d7c2715b061409c84e1b7d2e1b750c47f8c7
Author: Xisco Fauli 
AuthorDate: Tue Oct 22 19:28:34 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 23:27:40 2024 +0200

tdf#163486: PVS: Expression is always true

V560A part of conditional expression is always true: 
pStyleSheetProperties.

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

diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx 
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index 75e758c40523..68b5c37aa2f1 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -2323,7 +2323,7 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
 pParaContext->Insert(PROP_PARA_LEFT_MARGIN, 
uno::Any(nParaLeftMargin), /*bOverwrite=*/false);
 
 // Override right margin value with value from current style, 
if any
-if (pStyleSheetProperties && 
pStyleSheetProperties->isSet(PROP_PARA_RIGHT_MARGIN))
+if (pStyleSheetProperties->isSet(PROP_PARA_RIGHT_MARGIN))
 nParaRightMargin = 
pStyleSheetProperties->getProperty(PROP_PARA_RIGHT_MARGIN)->second.get();
 
 pParaContext->Insert(PROP_PARA_RIGHT_MARGIN, 
uno::Any(nParaRightMargin), /*bOverwrite=*/false);

core.git: comphelper/source

[Bogdan Buzea (via logerrit)]

 comphelper/source/misc/diagnose_ex.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 661aee7aac989647e99b88f5ca70e7af4805cf89
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 17:56:12 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 19:34:34 2024 +0200

tdf#163486: PVS: Identical blocks

V760 Two identical blocks of text were found. The second block begins from 
line 325.

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

diff --git a/comphelper/source/misc/diagnose_ex.cxx 
b/comphelper/source/misc/diagnose_ex.cxx
index 487f98b637a0..27d15c930e2e 100644
--- a/comphelper/source/misc/diagnose_ex.cxx
+++ b/comphelper/source/misc/diagnose_ex.cxx
@@ -322,14 +322,6 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, 
const css::uno::Any &
 sMessage.append(toOString(comphelper::anyToString( 
css::uno::Any(specialized.Code) )));
 }
 }
-{
-css::xml::dom::DOMException specialized;
-if ( caught >>= specialized )
-{
-sMessage.append(" Code: ");
-sMessage.append(toOString(comphelper::anyToString( 
css::uno::Any(specialized.Code) )));
-}
-}
 {
 css::xml::sax::SAXException specialized;
 if ( caught >>= specialized )

core.git: vcl/headless vcl/inc vcl/quartz vcl/source

[Noel Grandin (via logerrit)]

 vcl/headless/svpgdi.cxx |7 +++
 vcl/inc/headless/svpgdi.hxx |2 +-
 vcl/inc/quartz/salgdi.h |2 +-
 vcl/inc/salgdi.hxx  |2 +-
 vcl/quartz/salgdi.cxx   |7 +++
 vcl/source/gdi/salgdilayout.cxx |5 ++---
 vcl/source/image/ImplImage.cxx  |4 ++--
 vcl/source/outdev/bitmap.cxx|2 +-
 8 files changed, 14 insertions(+), 17 deletions(-)

New commits:
commit 686b968ec3565c004d2d3e47dcf1370158b3dd90
Author: Noel Grandin 
AuthorDate: Tue Oct 22 15:39:42 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 19:31:28 2024 +0200

pass by reference for ShouldDownscaleIconsAtSurface

because the param is never null

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

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 81a35471dcc7..5542fd7c1da6 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -46,12 +46,11 @@ void SvpSalGraphics::GetResolution( sal_Int32& rDPIX, 
sal_Int32& rDPIY )
 rDPIX = rDPIY = 96;
 }
 
-bool SvpSalGraphics::ShouldDownscaleIconsAtSurface(double* pScaleOut) const
+bool SvpSalGraphics::ShouldDownscaleIconsAtSurface(double& rScaleOut) const
 {
 if (comphelper::LibreOfficeKit::isActive())
-return SalGraphics::ShouldDownscaleIconsAtSurface(pScaleOut);
-if (pScaleOut)
-*pScaleOut = m_aCairoCommon.m_fScale;
+return SalGraphics::ShouldDownscaleIconsAtSurface(rScaleOut);
+rScaleOut = m_aCairoCommon.m_fScale;
 return true;
 }
 
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 0c4476e9aa5b..89370154b014 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -80,7 +80,7 @@ public:
 virtual voidDrawTextLayout( const GenericSalLayout& ) override;
 virtual void DrawSalLayout(const GenericSalLayout& rLayout, void* 
pSurface, const basegfx::BColor& rTextColor, bool bAntiAliased) const override;
 
-virtual boolShouldDownscaleIconsAtSurface(double* pScaleOut) 
const override;
+virtual boolShouldDownscaleIconsAtSurface(double& rScaleOut) 
const override;
 
 virtual SystemGraphicsData GetGraphicsData() const override;
 
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index b7fb674f7553..f29f35948d5b 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -474,7 +474,7 @@ public:
 virtual voidDrawTextLayout( const GenericSalLayout& ) override;
 
 #ifdef MACOSX
-virtual boolShouldDownscaleIconsAtSurface(double* pScaleOut) 
const override;
+virtual boolShouldDownscaleIconsAtSurface(double& rScaleOut) 
const override;
 #endif
 
 virtual SystemGraphicsData
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 6fd58da78172..5a8a932ca559 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -399,7 +399,7 @@ public:
 // surface is hidpi then pScaleOut contains the scaling factor. So we can
 // create larger hires bitmaps which we know will be logically scaled down
 // by this factor but physically just copied
-virtual bool ShouldDownscaleIconsAtSurface(double* pScaleOut) const;
+virtual bool ShouldDownscaleIconsAtSurface(double& rScaleOut) const;
 
 
 #if ENABLE_CAIRO_CANVAS
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 115ca04b8f30..6673a6fd6824 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -331,12 +331,11 @@ void AquaSalGraphics::DrawTextLayout(const 
GenericSalLayout& rLayout)
 
 #ifdef MACOSX
 
-bool AquaSalGraphics::ShouldDownscaleIconsAtSurface(double* pScaleOut) const
+bool AquaSalGraphics::ShouldDownscaleIconsAtSurface(double& rScaleOut) const
 {
 if (comphelper::LibreOfficeKit::isActive())
-return SalGraphics::ShouldDownscaleIconsAtSurface(pScaleOut);
-if (pScaleOut)
-*pScaleOut = sal::aqua::getWindowScaling();
+return SalGraphics::ShouldDownscaleIconsAtSurface(rScaleOut);
+rScaleOut = sal::aqua::getWindowScaling();
 return true;
 }
 
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 2654b211a2ac..14dd62104fe3 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -917,10 +917,9 @@ OUString SalGraphics::getRenderBackendName() const
 return OUString();
 }
 
-bool SalGraphics::ShouldDownscaleIconsAtSurface(double* pScaleOut) const
+bool SalGraphics::ShouldDownscaleIconsAtSurface(double& rScaleOut) const
 {
-if (pScaleOut)
-*pScaleOut = comphelper::LibreOfficeKit::getDPIScale();
+rScaleOut = comphelper::LibreOfficeKit::getDPIScale();
 return comphelper::LibreOfficeKit::isActive();
 }
 
diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx
index fa469bc20e69..08bc9c64a836 100644
--- a/vcl/source/image/ImplImage.cxx

core.git: tools/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 746f66f4b1062f604cd1cfc638508c79477e13ee
Author: Caolán McNamara 
AuthorDate: Sat Oct 5 21:18:20 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 20:37:17 2024 +0200

cid#1607748 Overflowed constant

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

diff --git a/tools/source/misc/fix16.cxx b/tools/source/misc/fix16.cxx
index b726acb8f660..3e2abbb2a435 100644
--- a/tools/source/misc/fix16.cxx
+++ b/tools/source/misc/fix16.cxx
@@ -76,6 +76,8 @@ fix16_t fix16_mul(fix16_t inArg0, fix16_t inArg1)
 return result;
 }
 
+static uint32_t mask(int bits) { return (1 << bits) - 1; }
+
 /* 32-bit implementation of fix16_div. Fastest version for e.g. ARM Cortex M3.
  * Performs 32-bit divisions repeatedly to reduce the remainder. For this to
  * be efficient, the processor has to have 32-bit hardware division.
@@ -111,13 +113,13 @@ fix16_t fix16_div(fix16_t a, fix16_t b)
 bit_pos -= 4;
 }
 
-while (remainder && bit_pos >= 0)
+while (remainder > 0 && bit_pos >= 0)
 {
 // Shift remainder as much as we can without overflowing
 int shift = std::countl_zero(remainder);
 if (shift > bit_pos)
 shift = bit_pos;
-remainder <<= shift;
+remainder = (remainder & mask(32 - shift)) << shift;
 bit_pos -= shift;
 
 uint32_t div = remainder / divider;

core.git: sfx2/source

[Miklos Vajna (via logerrit)]

 sfx2/source/doc/objserv.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 4aa8d30c095e08825bc983c699e11f2e88182124
Author: Miklos Vajna 
AuthorDate: Tue Oct 22 14:02:57 2024 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 22 17:21:27 2024 +0200

cool#9992 lok doc sign: never remember previous .uno:Signature params

Do this explicitly, so it can't happen that .uno:Signature with params
gets dispatched, then .uno:Signature without params still has the old
XCertificate.

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

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index ff628d18059a..190b87ef2e1b 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -620,10 +620,15 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 }
 SfxViewFrame* pFrame = GetFrame();
 SfxViewShell* pViewShell = pFrame ? pFrame->GetViewShell() : 
nullptr;
-if (!aSignatureCert.empty() && !aSignatureKey.empty() && 
pViewShell)
+if (pViewShell)
 {
-xCertificate = 
SfxLokHelper::getSigningCertificate(aSignatureCert, aSignatureKey);
-pViewShell->SetSigningCertificate(xCertificate);
+uno::Reference xSigningCertificate;
+if (!aSignatureCert.empty() && !aSignatureKey.empty())
+{
+xSigningCertificate = 
SfxLokHelper::getSigningCertificate(aSignatureCert, aSignatureKey);
+}
+// Always set the signing certificate, to clear data from 
a previous dispatch.
+pViewShell->SetSigningCertificate(xSigningCertificate);
 }
 
 // Async, all code before return has to go into the callback.

Fwd: Your proposal: LibreOffice

[Italo Vignoli]

LibreOffice devroom confirmed, instructions will follow. I anticipate 
launching the call for papers next week, the devroom schedule will have 
to be published before Xmas, so start thinking about your talk now. I am 
happy, first objective achieved, now let's work at the booth proposal.



 Forwarded Message 
Subject:Your proposal: LibreOffice
Date:   Tue, 22 Oct 2024 16:26:16 -
From:   FOSDEM 2025 Call for devrooms 
Reply-To:   FOSDEM 2025 Call for devrooms 
To: it...@documentfoundation.org



FOSDEM 2025 Call for devrooms



  Your proposal: LibreOffice

Hi!

We are happy to tell you that we accept your proposal "LibreOffice" as a 
devroom at FOSDEM.


Expect mails with more instructions soon after this.

See you there! The devroom organisers

pretalx.fosdem.org  is powered by pretalx 





--
Italo Vignoli - LibreOffice Marketing & PR
mobile/signal +39.348.5653829 - email it...@libreoffice.org
GPG Key ID - 0xAAB8D5C0
DB75 1534 3FD0 EA5F 56B5 FDA6 DE82 934C AAB8 D5C0

core.git: Branch 'libreoffice-24-8' - 2 commits - sw/inc sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/inc/IDocumentSettingAccess.hxx|2 
 sw/qa/extras/layout/data/A020-min.rtf|   30 
 sw/qa/extras/layout/layout2.cxx  |   51 +
 sw/qa/extras/ooxmlexport/data/fdo74110.docx  |binary
 sw/source/core/doc/DocumentSettingManager.cxx|   23 +
 sw/source/core/inc/DocumentSettingManager.hxx|4 +
 sw/source/core/text/atrstck.cxx  |8 ++-
 sw/source/core/text/itratr.cxx   |   55 ++-
 sw/source/core/text/itratr.hxx   |5 ++
 sw/source/core/text/porlay.cxx   |   24 +-
 sw/source/core/text/txtfrm.cxx   |   17 +++
 sw/source/filter/ww8/ww8par.cxx  |3 -
 sw/source/filter/xml/xmlimp.cxx  |   14 ++---
 sw/source/uibase/uno/SwXDocumentSettings.cxx |   31 
 sw/source/writerfilter/dmapper/SettingsTable.cxx |4 +
 sw/source/writerfilter/filter/WriterFilter.cxx   |2 
 16 files changed, 257 insertions(+), 16 deletions(-)

New commits:
commit c0d114ab2460a925acf256c27d88aadffc61a571
Author: Michael Stahl 
AuthorDate: Fri Sep 27 14:28:45 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Oct 22 20:02:22 2024 +0200

tdf#162268 sw: IgnoreHiddenCharsForLineCalculation

The other problem here is that if hidden text isn't displayed,
SwLineLayout::CalcLine() doesn't ignore the hidden text portion when
calculating the line height.

This is apparently the case all the way back to OOo 3.3, but it doesn't
make much sense, so change the default to ignore hidden text here,
except if a pre-existing ODF document is imported.

Change-Id: Ief3f62bbdb6ac0ac79b54d6885a711128ad8d81f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174041
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 037a765f03c95301f987e1d1d4ef715b05b25c94)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174066
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index a1f3dbf36920..9bf26880c01f 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -64,6 +64,7 @@ enum class DocumentSettingId
 DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE,
 TABLE_ROW_KEEP,
 IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
+IGNORE_HIDDEN_CHARS_FOR_LINE_CALCULATION,
 CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME,
 
 // tdf#104349 tdf#104668
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 9ae3d2e4ea58..7fb6a0769473 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -2264,7 +2264,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, 
testParagraphMarkLineHeight)
 {
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
 assertXPath(pXmlDoc, 
"/root/page/header/txt[1]/SwParaPortion/SwLineLayout[1]"_ostr,
-"height"_ostr, "184"); // FIXME should be 253, but better 
than 0
+"height"_ostr, "253");
 discardDumpedLayout();
 }
 }
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 17ff9a630cf4..2bbff10db856 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -199,6 +199,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/ 
DocumentSettingId id) const
 case DocumentSettingId::NO_GAP_AFTER_NOTE_NUMBER: return 
mbNoGapAfterNoteNumber;
 case DocumentSettingId::TABLE_ROW_KEEP: return mbTableRowKeep;
 case DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION: 
return mbIgnoreTabsAndBlanksForLineCalculation;
+case DocumentSettingId::IGNORE_HIDDEN_CHARS_FOR_LINE_CALCULATION: 
return mbIgnoreHiddenCharsForLineCalculation;
 case DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE: return 
mbDoNotCaptureDrawObjsOnPage;
 // #i68949#
 case DocumentSettingId::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME: 
return mbClipAsCharacterAnchoredWriterFlyFrames;
@@ -361,6 +362,10 @@ void sw::DocumentSettingManager::set(/*[in]*/ 
DocumentSettingId id, /*[in]*/ boo
 mbIgnoreTabsAndBlanksForLineCalculation = value;
 break;
 
+case DocumentSettingId::IGNORE_HIDDEN_CHARS_FOR_LINE_CALCULATION:
+mbIgnoreHiddenCharsForLineCalculation = value;
+break;
+
 case DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE:
 mbDoNotCaptureDrawObjsOnPage = value;
 break;
@@ -942,6 +947,12 @@ void 
sw::DocumentSettingManager::dumpAsXml(xmlTextWriterPtr pWriter) const
 
BAD_CAST(OString::boolean(mbIgnoreTabsAndBlanksForLineCalculation).getStr()));
 (void)xmlTextWriterEndElement(pWriter);
 
+(void)xmlTextWriterStartElement(pWriter, 
BAD_CAST("mbIgnoreHiddenCharsFor

core.git: Branch 'libreoffice-24-8' - vcl/win

[Michael Weghorn (via logerrit)]

 vcl/win/gdi/salnativewidgets-luna.cxx |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 42c7e6848f61438f747c9509f17bef2dca29d937
Author: Michael Weghorn 
AuthorDate: Mon Oct 21 14:43:13 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 22 20:21:08 2024 +0200

tdf#152534 Win 11 Dark: Draw toolbar button bg + frame manually

When using the dark theme on Windows 11, the background
color for toolbar buttons is light blue as with the light
theme, which results in insufficient contrast.

According to the comments in tdf#152534, this is
is a in the Windows dark theme which can also be seen in
other apps or has been worked around there, like in
Notepad++ [1].

Work around the issue by not letting the theme draw the
background (using Win API function `DrawThemeBackground`)
when on Windows 11 and using dark theme, but manually draw
the background and a frame instead for now.

For the background color, use a color that's a bit
lighter than the background color for non-highlighted
items.

[1] 
https://github.com/notepad-plus-plus/notepad-plus-plus/commit/5d086f93a80d275fcc5e4047ae49c614680a7e5b

Change-Id: Ie35937fde2e8c7078c4979a2ef60c28fc4679574
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175334
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins
(cherry picked from commit 620b293808f6111556c31674437917e70b106e9e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175396
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx 
b/vcl/win/gdi/salnativewidgets-luna.cxx
index 318009acadae..4daad8eadc9b 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -39,6 +39,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -909,6 +910,28 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 iState = bChecked ? TS_HOTCHECKED : TS_HOT;
 else
 iState = bChecked ? TS_CHECKED : TS_NORMAL;
+
+if (bUseDarkMode && 
GetSalInstance()->getOSVersion().startsWith(u"Windows 11")
+&& (bChecked
+|| (nState & (ControlState::PRESSED) || (nState & 
ControlState::ROLLOVER
+{
+// tdf#152534 workaround bug with Windows 11 Dark theme using
+// light blue as highlight color which gives insufficient
+// contrast for hovered-over or pressed/checked toolbar 
buttons:
+// manually draw background (using color a bit lighter than 
background
+// for non-highlighted items) and draw a frame around it
+ScopedHBRUSH aBgColorBrush(CreateSolidBrush(RGB(38, 38, 38)));
+FillRect(hDC, &rc, aBgColorBrush.get());
+const Color aFrameColor = 
Application::GetSettings().GetStyleSettings().GetDisableColor();
+ScopedHBRUSH aFrameBrush(CreateSolidBrush(
+RGB(aFrameColor.GetRed(), aFrameColor.GetGreen(), 
aFrameColor.GetBlue(;
+FrameRect(hDC, &rc, aFrameBrush.get());
+
+DrawThemeText(hTheme, hDC, iPart, iState, 
o3tl::toW(aCaption.getStr()), -1,
+  DT_CENTER | DT_VCENTER | DT_SINGLELINE, 0, &rc);
+return true;
+}
+
 return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
 }
 else if( nPart == ControlPart::ThumbHorz || nPart == 
ControlPart::ThumbVert )

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

[Aditya Sahu (via logerrit)]

 extras/source/wordbook/technical.dic |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 659ea72fe166c1b0bc1df96d86e24660723300c2
Author: Aditya Sahu 
AuthorDate: Sat Oct 19 21:22:20 2024 -0400
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 22 20:21:50 2024 +0200

tdf#87605: Add new words to technical dictionary.

Change-Id: I02867aa8bce8b80cc905b8a1e1f80812bd84affe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175250
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 33af9a8fa15cbe2d3f02f98c2bbf5dc650aa68cd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175234
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/wordbook/technical.dic 
b/extras/source/wordbook/technical.dic
index 5c771fffda19..c450e694ef45 100644
--- a/extras/source/wordbook/technical.dic
+++ b/extras/source/wordbook/technical.dic
@@ -54,6 +54,7 @@ Carefx
 Cassandra
 CDMA
 CentOS=
+ChatGPT
 Chrome
 Cisco=
 CLI=
@@ -112,6 +113,8 @@ Fujitsu
 Gateway
 gcc
 gcj
+Gemini
+GenAI
 Gentoo
 Gerrit
 GHz
@@ -219,6 +222,7 @@ NNTP
 Nokia
 Novell
 NRadius
+Nvidia
 ODBC
 Ogg
 OnDemand
@@ -281,6 +285,7 @@ SMTP
 Solaris=
 Sony
 Soyuz
+SpaceX
 Spamassassin
 SPI
 SQLite

core.git: basctl/source basic/source chart2/source comphelper/source connectivity/source cppcanvas/source dbaccess/source extensions/source framework/source io/source package/source sc/source sd/sourc

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/documentenumeration.cxx|2 +-
 basic/source/classes/sbunoobj.cxx |2 +-
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx |2 +-
 chart2/source/controller/main/ShapeController.cxx |2 +-
 chart2/source/tools/LabeledDataSequence.cxx   |4 ++--
 comphelper/source/streaming/seekableinput.cxx |2 +-
 connectivity/source/cpool/ZConnectionPool.cxx |2 +-
 connectivity/source/cpool/ZPoolCollection.cxx |2 +-
 cppcanvas/source/mtfrenderer/textaction.cxx   |2 +-
 dbaccess/source/ui/app/AppController.cxx  |2 +-
 dbaccess/source/ui/dlg/CollectionView.cxx |2 +-
 extensions/source/abpilot/datasourcehandling.cxx  |2 +-
 framework/source/loadenv/loadenv.cxx  |4 ++--
 io/source/stm/odata.cxx   |2 +-
 package/source/xstor/owriteablestream.cxx |2 +-
 package/source/xstor/xstorage.cxx |2 +-
 sc/source/filter/excel/excimp8.cxx|2 +-
 sc/source/filter/excel/xechart.cxx|6 +++---
 sd/source/console/PresenterWindowManager.cxx  |2 +-
 sd/source/ui/animations/CustomAnimationPane.cxx   |2 +-
 sd/source/ui/unoidl/randomnode.cxx|2 +-
 sfx2/source/control/recentdocsviewitem.cxx|2 +-
 sfx2/source/doc/docfile.cxx   |2 +-
 svl/source/misc/sharecontrolfile.cxx  |2 +-
 svtools/source/misc/acceleratorexecute.cxx|6 +++---
 svtools/source/uno/popupmenucontrollerbase.cxx|2 +-
 svx/source/form/fmPropBrw.cxx |2 +-
 svx/source/form/fmshimp.cxx   |4 ++--
 sw/source/filter/ww8/ww8par3.cxx  |2 +-
 sw/source/uibase/dbui/mailmergehelper.cxx |2 +-
 toolkit/source/controls/grid/sortablegriddatamodel.cxx|4 ++--
 unoxml/source/dom/element.cxx |2 +-
 unoxml/source/dom/saxbuilder.cxx  |2 +-
 xmloff/source/core/xmlexp.cxx |2 +-
 xmloff/source/core/xmlimp.cxx |2 +-
 xmloff/source/text/XMLSectionExport.cxx   |2 +-
 36 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit ee4554b0ac88f673ac9998e317fb02dc5342de80
Author: Caolán McNamara 
AuthorDate: Tue Oct 22 12:26:04 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 17:53:07 2024 +0200

cid#1555259 COPY_INSTEAD_OF_MOVE

and

cid#1555264 COPY_INSTEAD_OF_MOVE
cid#1555280 COPY_INSTEAD_OF_MOVE
cid#1555303 COPY_INSTEAD_OF_MOVE
cid#1555313 COPY_INSTEAD_OF_MOVE
cid#1555314 COPY_INSTEAD_OF_MOVE
cid#1555323 COPY_INSTEAD_OF_MOVE
cid#1555333 COPY_INSTEAD_OF_MOVE
cid#1555338 COPY_INSTEAD_OF_MOVE
cid#1555349 COPY_INSTEAD_OF_MOVE
cid#1555364 COPY_INSTEAD_OF_MOVE
cid#1555379 COPY_INSTEAD_OF_MOVE
cid#1555398 COPY_INSTEAD_OF_MOVE
cid#1555410 COPY_INSTEAD_OF_MOVE
cid#1555411 COPY_INSTEAD_OF_MOVE
cid#1555416 COPY_INSTEAD_OF_MOVE
cid#1555429 COPY_INSTEAD_OF_MOVE
cid#1555434 COPY_INSTEAD_OF_MOVE
cid#1555441 COPY_INSTEAD_OF_MOVE
cid#1555446 COPY_INSTEAD_OF_MOVE
cid#1555480 COPY_INSTEAD_OF_MOVE
cid#1555490 COPY_INSTEAD_OF_MOVE
cid#124 COPY_INSTEAD_OF_MOVE
cid#127 COPY_INSTEAD_OF_MOVE
cid#131 COPY_INSTEAD_OF_MOVE
cid#178 COPY_INSTEAD_OF_MOVE
cid#181 COPY_INSTEAD_OF_MOVE
cid#191 COPY_INSTEAD_OF_MOVE
cid#1555614 COPY_INSTEAD_OF_MOVE
cid#1555619 COPY_INSTEAD_OF_MOVE
cid#1555633 COPY_INSTEAD_OF_MOVE
cid#1555654 COPY_INSTEAD_OF_MOVE
cid#1555707 COPY_INSTEAD_OF_MOVE
cid#1555712 COPY_INSTEAD_OF_MOVE
cid#1555746 COPY_INSTEAD_OF_MOVE
cid#1555763 COPY_INSTEAD_OF_MOVE

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

diff --git a/basctl/source/basicide/documentenumeration.cxx 
b/basctl/source/basicide/documentenumeration.cxx
index d71e02139e02..60ace06d2bac 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -117,7 +117,7 @@ namespace basctl::docs {
 
 // create a DocumentDescriptor
 DocumentDescriptor aDescriptor;
-aDescriptor.xModel = xModel;
+aDescriptor.xModel = std::move(xModel);
 lcl_getDocumentContro

Doxygen with WSL build on Windows

[Regina Henschel]

Hello all,

with help of Hossein, I could build LibreOffice as described on 
https://wiki.documentfoundation.org/Development/BuildingOnWSLWindows


But the autogen parameters in that instructions contain 
--without-doxygen. That means, that I cannot use --enable-odk.


How to build with --enable-odk?

It seems I need from somewhere doxygen?

Kind regards,
Regina

core.git: sd/source

[Javiya Vivekkumar Dineshbhai (via logerrit)]

 sd/source/ui/animations/SlideTransitionPane.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4da2a54aafa0450e74a3107c26b3a5ba6471858
Author: Javiya Vivekkumar Dineshbhai 
AuthorDate: Wed Aug 14 23:33:07 2024 +0530
Commit: Miklos Vajna 
CommitDate: Tue Oct 22 13:29:00 2024 +0200

lok: fix repeat slideshow after duration issue

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

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index 0ae1a5dd7d7a..ecf6d80784ca 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -842,7 +842,7 @@ impl::TransitionEffect 
SlideTransitionPane::getTransitionEffectFromControls() co
 if ( mxMF_REPEAT_AUTO_AFTER->get_sensitive() )
 {
 rSettings.mbEndless = true;
-rSettings.mnPauseTimeout = 
static_cast(mxMF_REPEAT_AUTO_AFTER->get_value(FieldUnit::SECOND));
+rSettings.mnPauseTimeout = 
static_cast(mxMF_REPEAT_AUTO_AFTER->get_value(FieldUnit::SECOND) / 
100.0) ;
 }
 }
 }

libvisio.git: 3 commits - configure.ac NEWS src/test

[Libreoffice Gerrit user]

 NEWS |   10 ++
 configure.ac |2 +-
 src/test/Makefile.am |4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 2d240ece062ed3dee77725b6f32767df2b43a0e3
Author: Xisco Fauli 
AuthorDate: Tue Oct 22 13:29:41 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 13:29:41 2024 +0200

bump release

Change-Id: Ida00d3a56dc5c14a7b282462971125274b834f44

diff --git a/configure.ac b/configure.ac
index 0dc29d0..782229b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libvisio_version_major],[0])
 m4_define([libvisio_version_minor],[1])
-m4_define([libvisio_version_micro],[8])
+m4_define([libvisio_version_micro],[9])
 
m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro])
 
 # =
commit 91c1e1c83f5b29f0f84b8797aadbcfa0d8d9e378
Author: Xisco Fauli 
AuthorDate: Tue Oct 22 13:29:19 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 13:29:19 2024 +0200

distribute new test files

Change-Id: I5e59dcc46b0cdf2e227076c5f542892c34a0fc1c

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 224d14b..0052ab1 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -66,7 +66,9 @@ EXTRA_DIST = \
data/qs-box.vsdx \
data/tdf76829-datetime-format.vsd \
data/tdf76829-numeric-format.vsd \
-   data/tdf136564-WhiteTextBackground.vsdx
+   data/tdf136564-WhiteTextBackground.vsdx \
+   data/tdf154379-DrawingUnits-type.vsd \
+   data/tdf154379-QuickStyleFillMatrix.vsdx
 
 # ImportTest::testVsdMetadataTitleUtf8 checks formatted date string
 AM_TESTS_ENVIRONMENT = TZ=UTC; export TZ;
commit 1a46ae002ba9717e9483ed5142acc5d93b96d355
Author: Xisco Fauli 
AuthorDate: Tue Oct 22 13:29:03 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 13:29:03 2024 +0200

update NEWS file for new release

Change-Id: I5ddd8d149f7f4f0f2f6bc8c0f9932c343d98f230

diff --git a/NEWS b/NEWS
index f8bde52..13318f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+libvisio 0.1.8
+
+- tests: Fix build with libxml 2.12
+- Add support for simple solid fill styles
+- Add support for TextBackground from SheetStyle (tdf136564)
+- Improve Arrowheads appearance (tdf#126402)
+- Fix reading FillStyleLst and TextBkgnd from shape (tdf#154379)
+- Add support to DrawingUnits types (tdf#154379)
+- Visio5: Provide cellType to collector in readTextField
+
 libvisio 0.1.7
 
 - Fix a few memory leaks found by oss-fuzz.

core.git: desktop/source

[Bogdan Buzea (via logerrit)]

 desktop/source/app/app.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 35e2aa6204925c74a988abc37d6486e5597b51c0
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 16:22:46 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 12:08:25 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 717, 
733

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

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a4ce4c965d3a..624b5cb0b6b4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -713,6 +713,8 @@ OUStringDesktop::CreateErrorMsgString(
 
 /// the bootstrap INI file could not be found or read
 case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE:
+/// the version locator INI file could not be found or read
+case ::utl::Bootstrap::MISSING_VERSION_FILE:
 {
 aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING);
 }
@@ -727,13 +729,6 @@ OUStringDesktop::CreateErrorMsgString(
 }
 break;
 
-/// the version locator INI file could not be found or read
-case ::utl::Bootstrap::MISSING_VERSION_FILE:
-{
-aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING);
-}
-break;
-
 /// the version locator INI has no entry for this version
 case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY:
 {

core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/wrtw8esh.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7c76f391296ef129e89c724bff26cc1bd3aefa27
Author: Caolán McNamara 
AuthorDate: Sun Oct 20 15:02:04 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 11:55:20 2024 +0200

cid#1607845 silence Overflowed constant

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

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index c1066d355569..69707aa46c24 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2208,8 +2208,10 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& 
rWW8Wrt)
 m_pTextBxs = mrWrt.m_pTextBxs.get();
 }
 
-for( ; i--; pSdrObjs = mrWrt.m_pSdrObjs.get(), m_pTextBxs = 
mrWrt.m_pTextBxs.get() )
+while (i > 0)
 {
+--i;
+
 // "dummy char" (or any Count ?) - why? Only Microsoft knows it.
 GetStream().WriteChar( i );
 
@@ -2308,6 +2310,9 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& 
rWW8Wrt)
 CloseContainer();   // ESCHER_SpContainer
 }
 CloseContainer();   // ESCHER_DgContainer
+
+pSdrObjs = mrWrt.m_pSdrObjs.get();
+m_pTextBxs = mrWrt.m_pTextBxs.get();
 }
 }
 

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

[Xisco Fauli (via logerrit)]

 sw/source/core/access/AccessibilityCheck.cxx |   27 +--
 1 file changed, 21 insertions(+), 6 deletions(-)

New commits:
commit e827d051971a331c16bca8a58ab1c921736810ee
Author: Xisco Fauli 
AuthorDate: Mon Oct 21 15:56:25 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 11:46:06 2024 +0200

tdf#163543: check GetDocShell()

Similar to
commit c5f4fe10589acff4d253cc3d32acaf67c7456bd7
Author: Caolán McNamara 
Date:   Thu Oct 3 15:14:05 2024 +0100

check for null DocShell before deref

Change-Id: I910fb934a36b0e68fd8bda59516c21aa9d27d09a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175338
Reviewed-by: Balazs Varga 
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175364

diff --git a/sw/source/core/access/AccessibilityCheck.cxx 
b/sw/source/core/access/AccessibilityCheck.cxx
index df4a710ecf9c..0d63ed192696 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -553,6 +553,10 @@ private:
 aBackgroundColor = nParaBackColor;
 else
 {
+SwDocShell* pDocShell = pTextNode->GetDoc().GetDocShell();
+if (!pDocShell)
+return;
+
 OUString sCharStyleName;
 Color nCharStyleBackColor(COL_AUTO);
 if (xProperties->getPropertyValue(u"CharStyleName"_ustr) >>= 
sCharStyleName)
@@ -560,7 +564,7 @@ private:
 try
 {
 uno::Reference 
xStyleFamiliesSupplier(
-pTextNode->GetDoc().GetDocShell()->GetModel(), 
uno::UNO_QUERY);
+pDocShell->GetModel(), uno::UNO_QUERY);
 uno::Reference xCont
 = xStyleFamiliesSupplier->getStyleFamilies();
 uno::Reference xStyleFamily(
@@ -1461,6 +1465,14 @@ public:
 
 SwTextNode* pTextNode = pCurrent->GetTextNode();
 SwDoc& rDocument = pTextNode->GetDoc();
+SwDocShell* pDocShell = rDocument.GetDocShell();
+if (!pDocShell)
+return;
+
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+if (!pWrtShell)
+return;
+
 auto nParagraphLength = pTextNode->GetText().getLength();
 if (nParagraphLength == 0)
 {
@@ -1468,8 +1480,7 @@ public:
 if (!pPrevTextNode)
 return;
 
-SwWrtShell* pWrtShell = rDocument.GetDocShell()->GetWrtShell();
-if (pWrtShell && 
pPrevTextNode->getLayoutFrame(pWrtShell->GetLayout()))
+if (pPrevTextNode->getLayoutFrame(pWrtShell->GetLayout()))
 {
 if (pPrevTextNode->GetText().getLength() == 0)
 {
@@ -1483,8 +1494,7 @@ public:
 }
 else
 {
-SwWrtShell* pWrtShell = rDocument.GetDocShell()->GetWrtShell();
-if (pWrtShell && pTextNode->getLayoutFrame(pWrtShell->GetLayout()))
+if (pTextNode->getLayoutFrame(pWrtShell->GetLayout()))
 {
 // Check for excess lines inside this paragraph
 const OUString& sParagraphText = pTextNode->GetText();
@@ -2179,7 +2189,12 @@ public:
 }
 void check(SwDoc* pDoc) override
 {
-uno::Reference xDoc = 
pDoc->GetDocShell()->GetBaseModel();
+SwDocShell* pDocShell = pDoc->GetDocShell();
+if (!pDocShell)
+return;
+uno::Reference xDoc = pDocShell->GetBaseModel();
+if (!xDoc)
+return;
 uno::Reference 
xStyleFamiliesSupplier(xDoc, uno::UNO_QUERY);
 if (!xStyleFamiliesSupplier.is())
 return;

core.git: include/svx svx/source

[Noel Grandin (via logerrit)]

 include/svx/svdograf.hxx|3 -
 svx/source/sdr/properties/graphicproperties.cxx |   11 
 svx/source/svdraw/svdograf.cxx  |   54 +---
 3 files changed, 21 insertions(+), 47 deletions(-)

New commits:
commit ce27c727294598eb99ac7b7e70e74a7dcecd87b3
Author: Noel Grandin 
AuthorDate: Mon Oct 21 20:27:40 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 11:44:10 2024 +0200

no need to cache GraphicAttr in SdrGrafObj

just retrieve the data when we need it, avoids marking
this object dirty unnecessarily

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

diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 88296f4a2629..fae28c0a72dc 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -78,9 +78,6 @@ private:
 SAL_DLLPRIVATE virtual std::unique_ptr 
CreateObjectSpecificViewContact() override;
 SAL_DLLPRIVATE virtual std::unique_ptr 
CreateObjectSpecificProperties() override;
 
-SAL_DLLPRIVATE void ImpSetAttrToGrafInfo(); // Copy values from the pool
-GraphicAttr m_aGrafInfo;
-
 OUString m_aFileName; // If it's a Link, the filename can be found in here
 OUString m_aFilterName;
 std::unique_ptr mpGraphicObject; // In order to speed up 
output of bitmaps, especially rotated ones
diff --git a/svx/source/sdr/properties/graphicproperties.cxx 
b/svx/source/sdr/properties/graphicproperties.cxx
index 90e7820f1200..0df3ee38bad1 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -101,14 +101,6 @@ namespace sdr::properties
 // local changes
 rObj.SetXPolyDirty();
 
-// #i29367# Update GraphicAttr, too. This was formerly
-// triggered by SdrGrafObj::Notify, which is no longer
-// called nowadays. BTW: strictly speaking, the whole
-// ImpSetAttrToGrafInfostuff could
-// be dumped, when SdrGrafObj::aGrafInfo is removed and
-// always created on the fly for repaint.
-rObj.ImpSetAttrToGrafInfo();
-
 // call parent
 RectangleProperties::ItemSetChanged(aChangedItems, nDeletedWhich, 
bAdjustTextFrameWidthAndHeight);
 }
@@ -122,9 +114,6 @@ namespace sdr::properties
 // local changes
 SdrGrafObj& rObj = static_cast(GetSdrObject());
 rObj.SetXPolyDirty();
-
-// local changes
-rObj.ImpSetAttrToGrafInfo();
 }
 
 void GraphicProperties::ForceDefaultAttributes()
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 57cb8780fef3..82a312c77d9c 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -252,8 +252,6 @@ SdrGrafObj::SdrGrafObj(SdrModel& rSdrModel, SdrGrafObj 
const & rSource)
 {
 SetGraphicLink( m_aFileName );
 }
-
-ImpSetAttrToGrafInfo();
 }
 
 SdrGrafObj::SdrGrafObj(
@@ -412,12 +410,22 @@ GraphicAttr SdrGrafObj::GetGraphicAttr( 
SdrGrafObjTransformsAttrs nTransformFlag
 const bool  bRotate = bool( nTransformFlags & 
SdrGrafObjTransformsAttrs::ROTATE ) &&
 (maGeo.m_nRotationAngle && maGeo.m_nRotationAngle != 18000_deg100);
 
-// Need cropping info earlier
-const_cast(this)->ImpSetAttrToGrafInfo();
-
 // Actually transform the graphic only in this case.
 // Cropping always happens, though.
-aActAttr = m_aGrafInfo;
+const SfxItemSet& rSet = GetObjectItemSet();
+const sal_uInt16 nTrans = rSet.Get( SDRATTR_GRAFTRANSPARENCE 
).GetValue();
+const SdrGrafCropItem&  rCrop = rSet.Get( SDRATTR_GRAFCROP );
+
+aActAttr.SetLuminance( rSet.Get( SDRATTR_GRAFLUMINANCE ).GetValue() );
+aActAttr.SetContrast( rSet.Get( SDRATTR_GRAFCONTRAST ).GetValue() );
+aActAttr.SetChannelR( rSet.Get( SDRATTR_GRAFRED ).GetValue() );
+aActAttr.SetChannelG( rSet.Get( SDRATTR_GRAFGREEN ).GetValue() );
+aActAttr.SetChannelB( rSet.Get( SDRATTR_GRAFBLUE ).GetValue() );
+aActAttr.SetGamma( rSet.Get( SDRATTR_GRAFGAMMA ).GetValue() * 0.01 );
+aActAttr.SetAlpha(255 - basegfx::fround(nTrans * 2.55));
+aActAttr.SetInvert( rSet.Get( SDRATTR_GRAFINVERT ).GetValue() );
+aActAttr.SetDrawMode( rSet.Get( SDRATTR_GRAFMODE ).GetValue() );
+aActAttr.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), 
rCrop.GetBottom() );
 
 if( bMirror )
 {
@@ -481,12 +489,14 @@ Size SdrGrafObj::getOriginalSize() const
 else
 aSize = OutputDevice::LogicToLogic(aSize, GetGrafPrefMapMode(), 
MapMode(getSdrModelFromSdrObject().GetScaleUnit()));
 
-if (m_aGrafInfo.IsCropped())
+const SfxItemSet& rSet = GetObjectItemSet();
+const SdrGrafCropItem&  rCrop

Ndidi Folasade Ogboi License Statement

[Ndidi Folasade Ogboi]

All my past & future contributions to LibreOffice may be licensed under the
MPLv2/LGPLv3+ dual license. Additionally, to the extent possible under law,
I waive all copyright and related neighbouring rights to my past & future
Artwork and Design contributions to the LibreOffice Project, and similarly
to the Document Foundation, placing such contributions under CC0:
https://creativecommons.org/publicdomain/zero/1.0

core.git: Branch 'libreoffice-24-8' - 2 commits - desktop/source

[Michael Weghorn (via logerrit)]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |9 +
 desktop/source/deployment/gui/dp_gui_dialog2.hxx |1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7266e872863625f32270f75080703ff923dd242e
Author: Michael Weghorn 
AuthorDate: Mon Oct 21 09:01:56 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 15:28:58 2024 +0200

tdf#161625 Use SolarMutex instead of std::mutex in ExtMgrDialog

Instead of using a custom (non-recursive) std::mutex in the
extension manager dialog, hold the (recursive) SolarMutex instead.

As the backtrace in attachment 197155 in tdf#161625 (s.a. below)
shows, a recursive mutex is needed:

dp_gui::ExtMgrDialog::TimeOutHdl (frame 17) locks the mutex, then
dp_gui::ExtMgrDialog::startProgress (frame 6) wants to lock it
again, causing a deadlock.

(Switching ExtMgrDialog::m_aMutex to be a std::recursive_mutex
could be an alternative, but follow the common pattern of holding
the SolarMutex while doing UI stuff instead.)

Somewhat similar commit:

commit 406a7e9d452201f3fd53abc770da6eb9589fff92
Date:   Wed Jul 10 12:46:50 2024 +0200

fix locking in UpdateRequiredDialog

Backtrace of deadlock:

#0  0x7f883f6adc70 in ?? () from /usr/lib/libc.so.6
#1  0x7f883f6b4b01 in pthread_mutex_lock () from /usr/lib/libc.so.6
#2  0x7f87f3ea068e in __gthread_mutex_lock (__mutex=0x5782aab26e48) 
at 
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/14.2.1/../../../../include/c++/14.2.1/x86_64-pc-linux-gnu/bits/gthr-default.h:762
#3  std::mutex::lock (this=0x5782aab26e48) at 
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/14.2.1/../../../../include/c++/14.2.1/bits/std_mutex.h:113
#4  std::unique_lock::lock (this=) at 
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/14.2.1/../../../../include/c++/14.2.1/bits/unique_lock.h:147
#5  std::unique_lock::unique_lock (__m=..., this=) at 
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/14.2.1/../../../../include/c++/14.2.1/bits/unique_lock.h:73
#6  dp_gui::ExtMgrDialog::startProgress (this=0x5782aab26de0, 
_bLockInterface=0x80) at 
/home/user/libreofficetwo/desktop/source/deployment/gui/dp_gui_dialog2.cxx:779
#7  0x7f883b4080a1 in Link::Call (this=0x7f86bc08, 
data=0x80) at include/tools/link.hxx:111
#8  ImplHandleUserEvent (pSVEvent=pSVEvent@entry=0x7f86bc00) at 
/home/user/libreofficetwo/vcl/source/window/winproc.cxx:2285
#9  0x7f883b40616a in ImplWindowFrameProc (_pWindow=0x5782a76df9f0, 
nEvent=SalEvent::UserEvent, pEvent=0x7f86bc00) at 
/home/user/libreofficetwo/vcl/source/window/winproc.cxx:2849
#10 0x7f883b6c711e in 
SalUserEventList::DispatchUserEvents(bool)::$_0::operator()() const 
(this=) at 
/home/user/libreofficetwo/vcl/source/app/salusereventlist.cxx:119
#11 SalUserEventList::DispatchUserEvents (this=0x5782a62edb08, 
bHandleAllCurrentEvents=false) at 
/home/user/libreofficetwo/vcl/source/app/salusereventlist.cxx:120
#12 0x7f8833fb7827 in QtInstance::ImplYield 
(this=this@entry=0x5782a62edad0, bWait=true, bHandleAllCurrentEvents=false) at 
vcl/qt6/../qt5/QtInstance.cxx:447
#13 0x7f8833fb9e11 in QtInstance::DoYield (this=0x5782a62edad0, 
bWait=true, bHandleAllCurrentEvents=false) at vcl/qt6/../qt5/QtInstance.cxx:469
#14 0x7f883b70fc72 in ImplYield (i_bWait=true, i_bAllEvents=false) 
at /home/user/libreofficetwo/vcl/source/app/svapp.cxx:385
#15 Application::Yield () at 
/home/user/libreofficetwo/vcl/source/app/svapp.cxx:473
#16 0x7f883b486415 in ProgressBar::SetValue (this=, 
nNewPercent=) at 
/home/user/libreofficetwo/vcl/source/control/prgsbar.cxx:199
#17 0x7f87f3ea14ca in dp_gui::ExtMgrDialog::TimeOutHdl 
(this=0x5782aab26de0) at 
/home/user/libreofficetwo/desktop/source/deployment/gui/dp_gui_dialog2.cxx:976
#18 0x7f883b6ff8c7 in Scheduler::CallbackTaskScheduling () at 
/home/user/libreofficetwo/vcl/source/app/scheduler.cxx:509
#19 0x7f8833fd4013 in SalTimer::CallCallback (this=0x5782a77b83d0) 
at vcl/inc/saltimer.hxx:53
#20 QtTimer::timeoutActivated (this=0x5782a77b83c0) at 
vcl/qt6/../qt5/QtTimer.cxx:51
#21 0x7f88341a3397 in ?? () from /usr/lib/libQt6Core.so.6
#22 0x7f88341ab5e5 in QTimer::timerEvent(QTimerEvent*) () from 
/usr/lib/libQt6Core.so.6
#23 0x7f883418d859 in QObject::event(QEvent*) () from 
/usr/lib/libQt6Core.so.6
#24 0x7f8832efc8cc in QApplicationPrivate::notify_helper(QObject*, 
QEvent*) () from /usr/lib/libQt6Widgets.so.6
#25 0x7f8834145aa8 in QCoreApplication::notifyInternal2(QObject*, 
QEvent*) () from /usr/lib/libQt6Core.so.6
#26 0x7f88342c7658 in QTimerInfoList::activateTimers() () from 
/usr/lib/libQt6Core.so.6
#27 0x7f88343a9f99 in ?? () from /usr/lib/libQt6Core.so.6
#28

core.git: Branch 'distro/allotropia/zeta-24-2' - sysui/Package_share.mk

[Stephan Bergmann (via logerrit)]

 sysui/Package_share.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c8d2595a1bf9908e46a7b780a4117ea0bd082983
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 20:39:55 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 08:25:33 2024 +0200

Branding-related build fix

...after 5ce7a548004c9e5cdcd8ee7eb5424f234219d180 "Branding for ZetaOffice
without any branding image" caused some Linux builds to fail 
Package_sysui_share
with

> /usr/bin/perl /home/me/lo/core/sysui/desktop/share/brand.pl -p 
'${PRODUCTNAME} ${PRODUCTVERSION}' -u  \
>\
>   --iconprefix '${UNIXBASISROOTNAME}-' 
/home/me/lo/core/sysui/desktop/menus/writer.desktop 
/home/me/lo/core/sysui/desktop/menus/calc.desktop 
/home/me/lo/core/sysui/desktop/menus/draw.desktop 
/home/me/lo/core/sysui/desktop/menus/impress.desktop 
/home/me/lo/core/sysui/desktop/menus/math.desktop 
/home/me/lo/core/sysui/desktop/menus/base.desktop 
/home/me/lo/core/sysui/desktop/menus/startcenter.desktop 
/home/me/lo/core/sysui/desktop/menus/xsltfilter.desktop 
/home/me/lo/core/workdir/CustomTarget/sysui/share/libreoffice
> Can't open input file ${UNIXBASISROOTNAME}-: No such file or directory
> make[1]: *** [/home/me/lo/core/sysui/CustomTarget_share.mk:208: 
/home/me/lo/core/workdir/CustomTarget/sysui/share/libreoffice/build.flag] Error 
1

(because the argument $(UNIXFILENAME.$*) for -u expanded to nothing in the
recipe for $(share_WORKDIR)/%/build.flag in sysui/CustomTarget_share.mk, 
due to
the changes to sysui/productlist.mk, so it mistakenly took --iconprefix as 
the
argument for -u; other Linux builds happened to not cause a failure, but 
rather
do something nonsensical, when $(brand_URIPARAM) expands to --urls, so that 
was
mistakenly taken as the argument for -u)

Change-Id: I9d957a94776a7d1b8e66121078e76e9df0be14ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175447
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk
index 25ae39bdf1b4..600b12029d84 100644
--- a/sysui/Package_share.mk
+++ b/sysui/Package_share.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,sysui_share,$(share_WORKDIR)/libreoffice))
+$(eval $(call gb_Package_Package,sysui_share,$(share_WORKDIR)/zetaoffice))
 
 $(eval $(call gb_Package_add_files,sysui_share,share/xdg,\
$(addsuffix .desktop,$(LAUNCHERLIST)) \

core.git: offapi/com offapi/UnoApi_offapi.mk

[Julien Nabet (via logerrit)]

 offapi/UnoApi_offapi.mk |3 
 offapi/com/sun/star/sdbc/RowIdLifetime.idl  |   42 +
 offapi/com/sun/star/sdbc/SQLState.idl   |   53 ++
 offapi/com/sun/star/sdbc/XDatabaseMetaData3.idl |  614 
 4 files changed, 712 insertions(+)

New commits:
commit 250e00a51dcf60ac2e028983f5d29c0f68748b38
Author: Julien Nabet 
AuthorDate: Tue Sep 17 15:49:36 2024 +0200
Commit: Julien Nabet 
CommitDate: Wed Oct 23 08:57:01 2024 +0200

Declare missing methods and constants to synchronize with JDBC 4.3

OpenJDK source has been used for the comments

Change-Id: Ic443ef1f50894eccd5233f2c629e227b8816a8fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173568
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 30dbe69773a6..34c1d2bfdf9c 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3292,7 +3292,9 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdbc,\
ProcedureResult \
ResultSetConcurrency \
ResultSetType \
+   RowIdLifetime \
SQLException \
+   SQLState \
SQLWarning \
TransactionIsolation \
XArray \
@@ -3306,6 +3308,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdbc,\
XDataSource \
XDatabaseMetaData \
XDatabaseMetaData2 \
+   XDatabaseMetaData3 \
XDriver \
XDriverAccess \
XDriverManager \
diff --git a/offapi/com/sun/star/sdbc/RowIdLifetime.idl 
b/offapi/com/sun/star/sdbc/RowIdLifetime.idl
new file mode 100644
index ..dad3ff14c6b6
--- /dev/null
+++ b/offapi/com/sun/star/sdbc/RowIdLifetime.idl
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+ module com {  module sun {  module star {  module sdbc {
+
+
+/** determines RowId life-time values.
+@since LibreOffice 25.2
+ */
+constants RowIdLifetime
+{
+/** Indicates that this data source does not support the ROWID type.
+ */
+const long ROWID_UNSUPPORTED = 0;
+
+/** Indicates that the lifetime of a RowId from this data source is, 
effectively, unlimited.
+ */
+const long ROWID_VALID_FOREVER = 1;
+
+/** Indicates that the lifetime of a RowId from this data source is 
indeterminate; but not one of ROWID_VALID_TRANSACTION, ROWID_VALID_SESSION, or, 
ROWID_VALID_FOREVER.
+ */
+const long ROWID_VALID_OTHER = 2;
+
+/** Indicates that the lifetime of a RowId from this data source is at 
least the containing session.
+ */
+const long ROWID_VALID_SESSION = 3;
+
+/** Indicates that the lifetime of a RowId from this data source is at 
least the containing transaction.
+ */
+const long ROWID_VALID_TRANSACTION = 4;
+};
+
+
+}; }; }; };
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/offapi/com/sun/star/sdbc/SQLState.idl 
b/offapi/com/sun/star/sdbc/SQLState.idl
new file mode 100644
index ..0ad319e91c10
--- /dev/null
+++ b/offapi/com/sun/star/sdbc/SQLState.idl
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+ module com {  module sun {  module star {  module sdbc {
+
+
+/** determines SQL State values.
+@since LibreOffice 25.2
+ */
+constants SQLState
+{
+/**
+ *  A possible return value for the method
+ * {@code DatabaseMetaData.getSQLStateType} which is used to indicate
+ * whether the value returned by the method
+ * {@code SQLException.getSQLState} is an
+ * X/Open (now know as Open Group) SQL CLI SQLSTATE value.
+ *
+ */
+const long sqlStateXOpen = 1;
+
+/**
+ *  A possible return value for the method
+ * {@code DatabaseMetaData.getSQLStateType} which is used to indicate
+ * whether the value returned by the method
+ * {@code SQLException.getSQLState} is an SQLSTATE value.
+ *
+ */
+const long sqlStateSQL = 2;
+
+ /**
+ *  A possible return value for the method
+ * {@code DatabaseMetaData.getSQLStateType} which is used to indicate
+ * whether the value returned by the method
+ * {@code SQLException.getSQLState} is an SQL99 SQLSTATE value.
+ * 
+ * Note:This constant remains only for compatibility reasons. 
Developers
+ * should use the constant {@c

core.git: sd/source

[Noel Grandin (via logerrit)]

 sd/source/ui/annotations/annotationmanager.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f7e405cfa797bba4f0c0b62e3d3739bb62071aba
Author: Noel Grandin 
AuthorDate: Tue Oct 22 14:44:06 2024 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 23 07:47:18 2024 +0200

tdf#162245 Insert->Comment in Draw/Impress not incrementally numbered

fix numbering.

regression from
commit e17c56bfc7930d3c14c3ff4cfd59828e8dcc0229
Author: Tomaž Vajngerl 
Date:   Thu Jun 6 10:52:35 2024 +0900
annot: new Annotation sdr object, replacing annotation tags

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

diff --git a/sd/source/ui/annotations/annotationmanager.cxx 
b/sd/source/ui/annotations/annotationmanager.cxx
index ad88bff0ca6e..e2e5977a7e1e 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1011,7 +1011,10 @@ void AnnotationManagerImpl::SyncAnnotationObjects()
 SdrObject* pObject = xAnnotation->findAnnotationObject();
 
 if (pObject)
+{
+nIndex++;
 continue;
+}
 
 if (!bAnnotatonInserted && mpDoc->IsUndoEnabled())
 mpDoc->BegUndo(SdResId(STR_ANNOTATION_UNDO_INSERT));

core.git: wizards/com

[Noel Grandin (via logerrit)]

 wizards/com/sun/star/wizards/ui/FieldSelection.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2c4108dcaf321d378ead479a181eda79a5200b5
Author: Noel Grandin 
AuthorDate: Tue Oct 22 16:40:37 2024 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 23 07:47:34 2024 +0200

tdf#144702 Base Fields in Report Label Display Clipped

This is probably not an ideal fix, I'm not sure where exactly the
positioning is off, but this does the job for now.

regression from
commit 95ccc26ba71259be29fde8ba6b6f52ffbe5bd3c7
Author: Tomaž Vajngerl 
Date:   Fri May 22 18:07:45 2015 +0900

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

diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java 
b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 97f19e4eb108..3483132d4cd0 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -169,7 +169,7 @@ public class FieldSelection
 Integer cmdShiftButtonPosX = Integer.valueOf((CompPosX + 
ListBoxWidth.intValue() + cmdButtonHoriDist));
 Integer ListBoxPosY = Integer.valueOf(CompPosY + lblVertiDist + 
lblHeight);
 Integer ListBoxHeight = Integer.valueOf(CompHeight - 8 - 2);
-Integer SelListBoxPosX = 
Integer.valueOf(cmdShiftButtonPosX.intValue() + cmdButtonWidth + 
cmdButtonHoriDist);
+Integer SelListBoxPosX = 
Integer.valueOf(cmdShiftButtonPosX.intValue() + cmdButtonWidth + 
cmdButtonHoriDist + 2);
 
 IStep = Integer.valueOf(_iStep);
 if (bshowFourButtons)

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

[Noel Grandin (via logerrit)]

 vcl/source/graphic/UnoGraphic.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 654869813b7014830ee4d0ea345655c3d6086c65
Author: Noel Grandin 
AuthorDate: Wed Oct 16 10:25:28 2024 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 22 11:14:59 2024 +0200

tdf#163381 XBitmap.getMaskDIB() is inverted

regression from the transparency->alpha work

Change-Id: I2aaf8262191ca6136f87c59629e95bd9a7e7e419
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174991
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
(cherry picked from commit bb6db3aa4c86b92e8321d6734bcb34ba28dfeb27)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174958
Reviewed-by: Xisco Fauli 
(cherry picked from commit 50c07bc4fc602887b48c36db82328e97b0395ff3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174960
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/graphic/UnoGraphic.cxx 
b/vcl/source/graphic/UnoGraphic.cxx
index 9036f54452ba..3ea6f107fde1 100644
--- a/vcl/source/graphic/UnoGraphic.cxx
+++ b/vcl/source/graphic/UnoGraphic.cxx
@@ -165,7 +165,10 @@ uno::Sequence SAL_CALL Graphic::getMaskDIB()
 {
 SvMemoryStream aMemoryStream;
 
-WriteDIB(maGraphic.GetBitmapEx().GetAlphaMask().GetBitmap(), 
aMemoryStream, false, true);
+AlphaMask aMask = maGraphic.GetBitmapEx().GetAlphaMask();
+// for backwards compatibility for extensions, we need to convert from 
alpha to transparency
+aMask.Invert();
+WriteDIB(aMask.GetBitmap(), aMemoryStream, false, true);
 return css::uno::Sequence( static_cast(aMemoryStream.GetData()), aMemoryStream.Tell() );
 }
 else

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

[Xisco Fauli (via logerrit)]

 sfx2/source/view/viewprn.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 3ee0b45513c1c82849dc43e2f2b76d598a206685
Author: Xisco Fauli 
AuthorDate: Fri Oct 18 16:40:05 2024 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 22 11:15:43 2024 +0200

tdf#163486: PVS: check mpViewShell

V595The 'mpViewShell' pointer was utilized before it was verified 
against nullptr. Check lines: 368, 380.

Change-Id: I5e8d53d3503ade1814d7436e89f0f407f1d9ccfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175164
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 3cc367f426506e3165dda06feeb20e0a9b4c6194)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175158
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index e1bc2c4ec915..319ecafbb7c8 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -365,11 +365,14 @@ void SfxPrinterController::jobFinished( 
css::view::PrintableState nState )
 case view::PrintableState_JOB_SPOOLED :
 case view::PrintableState_JOB_COMPLETED :
 {
-SfxBindings& rBind = mpViewShell->GetViewFrame().GetBindings();
-rBind.Invalidate( SID_PRINTDOC );
-rBind.Invalidate( SID_PRINTDOCDIRECT );
-rBind.Invalidate( SID_SETUPPRINTER );
-bCopyJobSetup = ! m_bTempPrinter;
+if (mpViewShell)
+{
+SfxBindings& rBind = mpViewShell->GetViewFrame().GetBindings();
+rBind.Invalidate( SID_PRINTDOC );
+rBind.Invalidate( SID_PRINTDOCDIRECT );
+rBind.Invalidate( SID_SETUPPRINTER );
+bCopyJobSetup = ! m_bTempPrinter;
+}
 break;
 }
 

core.git: 2 commits - accessibility/source basic/source chart2/source connectivity/source cppuhelper/source desktop/source extensions/source filter/source forms/source framework/source libreofficekit/

[Caolán McNamara (via logerrit)]

 accessibility/source/extended/accessibletabbar.cxx |6 --
 accessibility/source/helper/acc_factory.cxx|2 
 basic/source/runtime/runtime.cxx   |2 
 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |2 
 chart2/source/tools/WrappedPropertySet.cxx |2 
 connectivity/source/drivers/file/FConnection.cxx   |2 
 cppuhelper/source/component_context.cxx|2 
 cppuhelper/source/servicemanager.cxx   |4 -
 desktop/source/deployment/misc/dp_update.cxx   |2 
 extensions/source/update/check/updatehdl.cxx   |2 
 filter/source/msfilter/svdfppt.cxx |2 
 forms/source/component/Grid.cxx|2 
 forms/source/helper/controlfeatureinterception.cxx |2 
 framework/source/fwe/helper/propertysetcontainer.cxx   |2 
 framework/source/layoutmanager/toolbarlayoutmanager.cxx|2 
 libreofficekit/source/gtk/lokdocview.cxx   |   29 
++
 linguistic/source/spelldsp.cxx |4 -
 oox/source/ole/axcontrol.cxx   |2 
 reportdesign/source/core/sdr/RptObject.cxx |5 -
 sc/source/core/tool/formulaparserpool.cxx  |2 
 sc/source/filter/xml/xmlexprt.cxx  |2 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx   |2 
 sd/source/console/PresenterPaneContainer.cxx   |2 
 sd/source/core/CustomAnimationEffect.cxx   |2 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx  |2 
 sd/source/ui/unoidl/unosrch.cxx|2 
 sdext/source/minimizer/graphiccollector.cxx|2 
 sfx2/source/appl/sfxhelp.cxx   |4 -
 sfx2/source/doc/SfxDocumentMetaData.cxx|2 
 sfx2/source/view/lokcharthelper.cxx|2 
 slideshow/source/engine/animationnodes/animationcommandnode.cxx|2 
 stoc/source/servicemanager/servicemanager.cxx  |2 
 svx/source/fmcomp/fmgridif.cxx |2 
 svx/source/form/fmshimp.cxx|4 -
 svx/source/table/svdotable.cxx |2 
 sw/source/uibase/uiview/viewling.cxx   |2 
 vcl/unx/gtk3/gtkframe.cxx  |8 +-
 xmloff/source/core/xmlexp.cxx  |4 -
 xmloff/source/core/xmlimp.cxx  |2 
 xmloff/source/draw/shapeexport.cxx |2 
 xmloff/source/forms/layerexport.cxx|2 
 xmloff/source/transform/PersAttrListTContext.cxx   |2 
 xmlscript/source/xml_helper/xml_impctx.cxx |2 
 43 files changed, 70 insertions(+), 66 deletions(-)

New commits:
commit 2bafc7384ba546f810abbfe17ff25ff78c7ff88c
Author: Caolán McNamara 
AuthorDate: Tue Oct 22 08:28:57 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 11:56:02 2024 +0200

cid#1545605 COPY_INSTEAD_OF_MOVE

and

cid#1545841 COPY_INSTEAD_OF_MOVE
cid#1554682 COPY_INSTEAD_OF_MOVE
cid#1554686 COPY_INSTEAD_OF_MOVE
cid#1554715 COPY_INSTEAD_OF_MOVE
cid#1554750 COPY_INSTEAD_OF_MOVE
cid#1554759 COPY_INSTEAD_OF_MOVE
cid#1554770 COPY_INSTEAD_OF_MOVE
cid#1554779 COPY_INSTEAD_OF_MOVE
cid#1554794 COPY_INSTEAD_OF_MOVE
cid#1554800 COPY_INSTEAD_OF_MOVE
cid#1554826 COPY_INSTEAD_OF_MOVE
cid#1554836 COPY_INSTEAD_OF_MOVE
cid#1554862 COPY_INSTEAD_OF_MOVE
cid#1554865 COPY_INSTEAD_OF_MOVE
cid#1554872 COPY_INSTEAD_OF_MOVE
cid#1554883 COPY_INSTEAD_OF_MOVE
cid#1554906 COPY_INSTEAD_OF_MOVE
cid#1554921 COPY_INSTEAD_OF_MOVE
cid#1554926 COPY_INSTEAD_OF_MOVE
cid#1554946 COPY_INSTEAD_OF_MOVE
cid#1554956 COPY_INSTEAD_OF_MOVE
cid#1554970 COPY_INSTEAD_OF_MOVE
cid#1554986 COPY_INSTEAD_OF_MOVE
cid#1554991 COPY_INSTEAD_OF_MOVE
cid#1555013 COPY_INSTEAD_OF_MOVE
cid#1555037 COPY_INSTEAD_OF_MOVE
cid#1555050 COPY_INSTEAD_OF_MOVE
cid#1555057 COPY_INSTEAD_OF_MOVE
cid#1555066 COPY_INSTEAD_OF_MOVE
cid#1555067 COPY_INSTEAD_OF_MOVE
cid#1555083 COPY_INSTEAD_OF_MOVE
cid#1555097 COPY_INSTEAD_OF_MOVE
cid#1555135 COPY_INSTEAD_OF_MOVE
cid#1555140 COPY_INSTEAD_OF_MOVE
cid#1555146 COPY_INSTEAD_OF_MOVE
cid#1555148 COPY_INSTEAD_OF_MOVE
cid#1555149 COPY_INSTEAD_OF_MOVE
cid#1555155 COPY_INSTE

core.git: package/source

[Bogdan Buzea (via logerrit)]

 package/source/zipapi/Deflater.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a66a69795b6f98059feab22d3ee8afc1214bf57a
Author: Bogdan Buzea 
AuthorDate: Tue Oct 22 06:08:47 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 11:59:59 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 50, 
53

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

diff --git a/package/source/zipapi/Deflater.cxx 
b/package/source/zipapi/Deflater.cxx
index 9439e3f56bcb..c14765c00ec7 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -47,8 +47,6 @@ void Deflater::init (sal_Int32 nLevelArg, bool bNowrap)
 case Z_OK:
 break;
 case Z_MEM_ERROR:
-pStream.reset();
-break;
 case Z_STREAM_ERROR:
 pStream.reset();
 break;

core.git: vcl/headless

[Bogdan Buzea (via logerrit)]

 vcl/headless/CairoCommon.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit c91b61da00f418e20c28691b86f586ae10467961
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 16:43:50 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 12:02:29 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 674, 
677
V1037 Two or more case-branches perform the same actions. Check lines: 690, 
693

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

diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx
index a0c780d755b5..ea0cbdccd206 100644
--- a/vcl/headless/CairoCommon.cxx
+++ b/vcl/headless/CairoCommon.cxx
@@ -671,8 +671,6 @@ void CairoCommon::SetROPLineColor(SalROPColor nROPColor)
 m_oLineColor = Color(0, 0, 0);
 break;
 case SalROPColor::N1:
-m_oLineColor = Color(0xff, 0xff, 0xff);
-break;
 case SalROPColor::Invert:
 m_oLineColor = Color(0xff, 0xff, 0xff);
 break;
@@ -687,8 +685,6 @@ void CairoCommon::SetROPFillColor(SalROPColor nROPColor)
 m_oFillColor = Color(0, 0, 0);
 break;
 case SalROPColor::N1:
-m_oFillColor = Color(0xff, 0xff, 0xff);
-break;
 case SalROPColor::Invert:
 m_oFillColor = Color(0xff, 0xff, 0xff);
 break;

core.git: vcl/source

[Bogdan Buzea (via logerrit)]

 vcl/source/control/imivctl1.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit eff1137fd2a5a48bea44a05f7891c5a31fffda7f
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 17:24:11 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 12:05:35 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 627, 
632, 636

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

diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 0f6f59385ddb..c2c12162dfdc 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -624,14 +624,8 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& 
rKEvt )
 case KEY_ADD:
 case KEY_DIVIDE :
 case KEY_A:
-bKeyUsed = false;
-break;
-
 case KEY_SUBTRACT:
 case KEY_COMMA :
-bKeyUsed = false;
-break;
-
 case KEY_RETURN:
 bKeyUsed = false;
 break;

core.git: dbaccess/source

[Bogdan Buzea (via logerrit)]

 dbaccess/source/ui/querydesign/querycontroller.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 6884f6cd61b5a047375cf09c338c4055c919794b
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 16:42:11 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 12:09:01 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 692, 
695

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

diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx 
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index b13986769bb4..5134161cce5a 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -689,8 +689,6 @@ void OQueryController::impl_initialize(const 
::comphelper::NamedValueCollection&
 switch ( m_nCommandType )
 {
 case CommandType::QUERY:
-m_sName = sCommand;
-break;
 case CommandType::TABLE:
 m_sName = sCommand;
 break;

core.git: sc/source

[Bogdan Buzea (via logerrit)]

 sc/source/ui/view/tabvwshb.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9bcd990d5a287dbde14ccc77f214c8e469888140
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 17:14:23 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 12:09:48 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 628, 
638

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

diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 0a174df6d84b..a2b5fb9e8873 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -625,6 +625,7 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet)
 break;
 
 case SID_INSERT_SIGNATURELINE:
+case SID_INSERT_QRCODE:
 if ( bTabProt || bShared || (pSdrView && 
pSdrView->GetMarkedObjectList().GetMarkCount() != 0))
 rSet.DisableItem( nWhich );
 break;
@@ -634,10 +635,6 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet)
 rSet.DisableItem(nWhich);
 break;
 
-case SID_INSERT_QRCODE:
-if ( bTabProt || bShared || (pSdrView && 
pSdrView->GetMarkedObjectList().GetMarkCount() != 0))
-rSet.DisableItem( nWhich );
-break;
 case SID_EDIT_QRCODE:
 if (!IsQRCodeSelected())
 rSet.DisableItem(nWhich);

core.git: vcl/source

[Bogdan Buzea (via logerrit)]

 vcl/source/window/splitwin.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 993c87260690f79e1eb93ebe64a70d0af37490cd
Author: Bogdan Buzea 
AuthorDate: Fri Oct 18 22:49:23 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 12:14:48 2024 +0200

tdf#163486: PVS: Identical branches


V1037 Two or more case-branches perform the same actions. Check lines: 
1241, 1244. Also, 1247 and 1251.

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

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 26dfabf09beb..2e48a7282870 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1238,15 +1238,11 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& 
aNewSize )
 switch ( meAlign )
 {
 case WindowAlign::Top:
-aSize.AdjustHeight(nDelta );
-break;
 case WindowAlign::Bottom:
 aSize.AdjustHeight(nDelta );
 break;
-case WindowAlign::Left:
-aSize.AdjustWidth(nDelta );
-break;
 case WindowAlign::Right:
+case WindowAlign::Left:
 default:
 aSize.AdjustWidth(nDelta );
 break;

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

[Miklos Vajna (via logerrit)]

 sfx2/source/doc/objserv.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 2990c7ea4da17e555903ff8854c03b71aa7ecddd
Author: Miklos Vajna 
AuthorDate: Tue Oct 22 14:02:57 2024 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 22 15:16:36 2024 +0200

cool#9992 lok doc sign: never remember previous .uno:Signature params

Do this explicitly, so it can't happen that .uno:Signature with params
gets dispatched, then .uno:Signature without params still has the old
XCertificate.

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

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 096c97344b3b..35efc6dcf60c 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -630,10 +630,15 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 }
 SfxViewFrame* pFrame = GetFrame();
 SfxViewShell* pViewShell = pFrame ? pFrame->GetViewShell() : 
nullptr;
-if (!aSignatureCert.empty() && !aSignatureKey.empty() && 
pViewShell)
+if (pViewShell)
 {
-xCertificate = 
SfxLokHelper::getSigningCertificate(aSignatureCert, aSignatureKey);
-pViewShell->SetSigningCertificate(xCertificate);
+uno::Reference xSigningCertificate;
+if (!aSignatureCert.empty() && !aSignatureKey.empty())
+{
+xSigningCertificate = 
SfxLokHelper::getSigningCertificate(aSignatureCert, aSignatureKey);
+}
+// Always set the signing certificate, to clear data from 
a previous dispatch.
+pViewShell->SetSigningCertificate(xSigningCertificate);
 }
 
 // Async, all code before return has to go into the callback.

core.git: sfx2/sdi sfx2/source

[Miklos Vajna (via logerrit)]

 sfx2/sdi/sfx.sdi|1 +
 sfx2/source/doc/objserv.cxx |   22 ++
 2 files changed, 23 insertions(+)

New commits:
commit 47fd29a318513d26b86eb0cfa891969ce6c85879
Author: Miklos Vajna 
AuthorDate: Tue Oct 22 08:56:33 2024 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 22 11:56:52 2024 +0200

cool#9992 lok doc sign: allow late-init of the sign cert

The current setup is that doc_initializeForRendering() gets the signing
key/cert earlier, even if no signing will be performed for this
document.

This has the downside that we needlessly share sensitive info.

Add an alternative way so to only share the sign key/cert when the
.uno:Signature command gets dispatched. This works similarly well for
the signing, but this way the private info is only shared when we
actually use it.

The .uno:Signature UNO command brings up the interactive dialog on
success, so it's not easy to cover this from CppunitTest_sfx2_doc.
Anyhow, the format for these two parameters is PEM, i.e. base64 dump of
the data, with the usual markers to show which one is the key and the
cert.

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

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index eb70d5fe7c38..47780c70d666 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4771,6 +4771,7 @@ SfxVoidItem VersionDialog SID_VERSION
 ]
 
 SfxUInt16Item Signature SID_SIGNATURE
+(SfxStringItem SignatureCert FN_PARAM_1, SfxStringItem SignatureKey FN_PARAM_2)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 12c28f4e614d..2de634bc452c 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -90,6 +90,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -604,6 +605,27 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 }
 else
 {
+// See if a signing cert is passed as a parameter: if so, 
parse that.
+std::string aSignatureCert;
+std::string aSignatureKey;
+const SfxStringItem* pSignatureCert = 
rReq.GetArg(FN_PARAM_1);
+if (pSignatureCert)
+{
+aSignatureCert = pSignatureCert->GetValue().toUtf8();
+}
+const SfxStringItem* pSignatureKey = 
rReq.GetArg(FN_PARAM_2);
+if (pSignatureKey)
+{
+aSignatureKey = pSignatureKey->GetValue().toUtf8();
+}
+SfxViewFrame* pFrame = GetFrame();
+SfxViewShell* pViewShell = pFrame ? pFrame->GetViewShell() : 
nullptr;
+if (!aSignatureCert.empty() && !aSignatureKey.empty() && 
pViewShell)
+{
+xCertificate = 
SfxLokHelper::getSigningCertificate(aSignatureCert, aSignatureKey);
+pViewShell->SetSigningCertificate(xCertificate);
+}
+
 // Async, all code before return has to go into the callback.
 SignDocumentContent(pDialogParent, [this, pDialogParent] (bool 
bSigned) {
 AfterSignContent(bSigned, pDialogParent);

core.git: sfx2/source

[Bogdan Buzea (via logerrit)]

 sfx2/source/doc/objserv.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 92bc85c42211fcfc6d2bfdeeaa1eb2d5c40ab6e1
Author: Bogdan Buzea 
AuthorDate: Sun Oct 20 21:26:54 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 11:57:36 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 
1413, 1553

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

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 2de634bc452c..ff628d18059a 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1430,13 +1430,6 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
 {
 switch ( nWhich )
 {
-case SID_DOCTEMPLATE :
-{
-if ( isExportLocked())
-rSet.DisableItem( nWhich );
-break;
-}
-
 case SID_CHECKOUT:
 {
 bool bShow = false;
@@ -1563,6 +1556,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
 break;
 }
 
+case SID_DOCTEMPLATE:
 case SID_EXPORTDOC:
 case SID_EXPORTDOCASPDF:
 case SID_DIRECTEXPORTDOCASPDF:

core.git: vcl/source

[Bogdan Buzea (via logerrit)]

 vcl/source/outdev/font.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit b5b2291366a098c4495df274ae1513b6301692fc
Author: Bogdan Buzea 
AuthorDate: Tue Oct 22 06:11:22 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 11:59:32 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 465, 
472
V1037 Two or more case-branches perform the same actions. Check lines: 497, 
505

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

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 334f6a311eb0..45b773a20c01 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -462,9 +462,6 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType 
nType, LanguageType eLan
 {
 case DefaultFontType::SANS_UNICODE:
 case DefaultFontType::UI_SANS:
-aFont.SetFamily( FAMILY_SWISS );
-break;
-
 case DefaultFontType::SANS:
 case DefaultFontType::LATIN_HEADING:
 case DefaultFontType::LATIN_SPREADSHEET:
@@ -494,9 +491,6 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType 
nType, LanguageType eLan
 case DefaultFontType::CJK_SPREADSHEET:
 case DefaultFontType::CJK_HEADING:
 case DefaultFontType::CJK_DISPLAY:
-aFont.SetFamily( FAMILY_SYSTEM ); // don't care, but don't use 
font subst config later...
-break;
-
 case DefaultFontType::CTL_TEXT:
 case DefaultFontType::CTL_PRESENTATION:
 case DefaultFontType::CTL_SPREADSHEET:

core.git: svx/source

[Bogdan Buzea (via logerrit)]

 svx/source/customshapes/EnhancedCustomShape2d.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 14a3ed6149c54e214569a292b2d0bbc5e09aeaff
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 17:53:24 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 12:14:06 2024 +0200

tdf#163486: PVS: Identical branches

V1037 Two or more case-branches perform the same actions. Check lines: 
1048, 1053

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

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 644eee59dad7..49fd4d45110b 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1044,10 +1044,6 @@ void EnhancedCustomShape2d::GetParameter( double& 
rRetValue, const EnhancedCusto
 }
 break;
 case EnhancedCustomShapeParameterType::LEFT :
-{
-rRetValue  = 0.0;
-}
-break;
 case EnhancedCustomShapeParameterType::TOP :
 {
 rRetValue  = 0.0;

core.git: xmloff/source

[Noel Grandin (via logerrit)]

 xmloff/source/draw/layerimp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 75d6fd09138283b4af949d8071ecfee5e2545180
Author: Noel Grandin 
AuthorDate: Tue Oct 22 10:20:23 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 12:37:13 2024 +0200

tdf#163516 Draw fails to restore Layer data Title and Description

regression from
commit c7b7153213619859d5f049b7c60eafa4c81f5225
Author: Noel Grandin 
Date:   Fri Nov 20 14:24:51 2020 +0200
fastparser in SdXMLLayerContext

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

diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index aa87e0a48100..09812f6ad122 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -94,11 +94,11 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLLayerContext::cre
 sal_Int32 nElement,
 const css::uno::Reference< css::xml::sax::XFastAttributeList >&  )
 {
-if( nElement == XML_ELEMENT(SVG, XML_TITLE) )
+if( nElement == XML_ELEMENT(SVG, XML_TITLE) || nElement == 
XML_ELEMENT(SVG_COMPAT, XML_TITLE) )
 {
 return new XMLStringBufferImportContext( GetImport(), sTitleBuffer);
 }
-else if( nElement == XML_ELEMENT(SVG, XML_DESC) )
+else if( nElement == XML_ELEMENT(SVG, XML_DESC) || nElement == 
XML_ELEMENT(SVG_COMPAT, XML_DESC) )
 {
 return new XMLStringBufferImportContext( GetImport(), 
sDescriptionBuffer);
 }

core.git: l10ntools/source

[Xisco Fauli (via logerrit)]

 l10ntools/source/lngmerge.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f558eb09dc4f1707313f09118b8574e405c64beb
Author: Xisco Fauli 
AuthorDate: Mon Oct 21 17:21:02 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 12:43:28 2024 +0200

tdf#163486: PVS: check stream read instead of EOF

V1024   The 'aStream' stream is checked for EOF before reading from it, but 
is not checked after reading. Potential use of invalid data.

Change-Id: I4f7b10bc896d13a31a97ed0dbacd413de990eb89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175363
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Reviewed-by: Mike Kaganski 

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 7d3587e68067..9a1b172a0981 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -67,8 +67,7 @@ LngParser::LngParser(OString sLngFile)
 
 bool bFirstLine = true;
 std::string s;
-std::getline(aStream, s);
-while (!aStream.eof())
+while (std::getline(aStream, s))
 {
 OString sLine(s.data(), s.length());
 
@@ -80,7 +79,6 @@ LngParser::LngParser(OString sLngFile)
 }
 
 mvLines.push_back( sLine );
-std::getline(aStream, s);
 }
 mvLines.push_back( OString() );
 }

ESC meeting agenda: 2024-10-24 16:00 CEST

[Miklos Vajna]

Hi,

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

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

You can join using Jitsi here:

https://jitsi.documentfoundation.org/esc

Regards,

Miklos

---

* Present:
  +

* Completed Action Items:

* Pending Action Items:
  + create a https://wiki.documentfoundation.org/ReleasePlan/25.2 wiki page 
(Cloph)
+ alpha 1: week 47
+ code freeze: around week 1
  + Commit access: send the welcome mail to David (Xisco)

* Release Engineering update (Cloph)
  + 24.8.3 rc1 this week?
  + 24.2.7 rc2 this week?

* Documentation (Olivier)
+ Bugzilla Documentation statistics
229(229) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 2(2) 12(12)113(113)   257(257)
 commented 3(3) 33(33)346(346)   994(994)
  resolved 1(1)  5(5)  67(67)170(170)
+ top 10 contributors:
  Bogdan B made 10 changes in 1 month, and 22 changes in 1 year
  Nabet, Julien made 10 changes in 1 month, and 56 changes in 1 year
  Pierre F made 5 changes in 1 month, and 223 changes in 1 year
  Ilmari Lauhakangas made 4 changes in 1 month, and 120 changes in 1 
year
  m.a.riosv made 4 changes in 1 month, and 36 changes in 1 year
  Kaganski, Mike made 3 changes in 1 month, and 75 changes in 1 year
  Olivier Hallot made 3 changes in 1 month, and 336 changes in 1 year
  Dione Maddern made 2 changes in 1 month, and 106 changes in 1 year
  Ticrob made 2 changes in 1 month, and 2 changes in 1 year
  Xisco Fauli made 2 changes in 1 month, and 5 changes in 1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
234(234) (topicUI) bugs open, 38(38) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week 1 month3 months   12 months
 added  12(12) 21(21) 26(26)  33(33)
 commented 103(103)   162(162)   355(355)   1702(1702)
   removed   1(1)   2(2)   3(3)   12(12)
  resolved   8(8)  12(12) 57(57) 259(259)
+ top 10 contributors:
  Heiko Tietze made 76 changes in 1 month, and 913 changes in 1 year
  Vernon, Stuart Foote made 74 changes in 1 month, and 418 changes in 1 
year
  Eyal Rozenberg made 50 changes in 1 month, and 185 changes in 1 year
  Ilmari Lauhakangas made 24 changes in 1 month, and 178 changes in 1 
year
  Kelemen, Gabor made 23 changes in 1 month, and 42 changes in 1 year
  Dieter made 16 changes in 1 month, and 131 changes in 1 year
  Sarper Akdemir made 12 changes in 1 month, and 21 changes in 1 year
  Henschel, Regina made 8 changes in 1 month, and 54 changes in 1 year
  Aditya (Addy) Sahu made 7 changes in 1 month, and 7 changes in 1 year
  Seth Chaiklin made 7 changes in 1 month, and 27 changes in 1 year

* Crash Testing (Caolan)
+ 25(+0) import failure, 23(+0) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now

* Crash Reporting (Xisco)
+ 24.2.6.22845(+0)
+ 24.8.0.320784(+0)
+ 24.8.1.217181(+0)
+ 24.8.2.113860(+0)

* Mentoring (Hossein)
  committer...   1 week 1 month  3 months 12 months
  open  77(77) 110(110) 163(163)  166(166)
   reviews 458(458)   1158(1158)   3410(3410)   13344(13344)
merged 300(300)   1160(1160)   3620(3620)   13858(13858)
 abandoned   7(7)   38(38)  177(177)  763(763)
   own commits 198(198)804(804)2605(2605)9923(9923)
review commits  96(96) 246(246) 726(726) 3178(3178)
contributor...   1 week   1 month  3 months 12 months
  open  104(104) 345(345) 386(386)  388(388)
   reviews 1028(1028)   2768(2768)   8164(8164)   30764(30764)
merged   42(42)   94(94)  310(310) 1326(1326)
 abandoned3(3)11(11)   61(61)   555(555)
   own commits   53(53)  112(112) 306(306) 1321(1321)
review commits0(0) 0(0) 0(0)  0(0)
+ easyHack statistics:
   needsDevEval 8(8)   needsUXEval 1(1)   cleanup_comments 333(333)
   total 420(420)   assigned 28(28)   open 355(355)
+ top 10 contributors:
  Bogdan B made 23 patches in 1 month, and 110 patches in 1 year
  Mohit Marathe made 6 patches in 1 month, and 16 patches in 1 year
  Armin Le Grand (allotropia) made 6 patches in 1 month, and 83 patches 
in 1 year
  Dr. David Alan Gilbert made 6 patches in 1 month, and 31 patches in 1 
year
  Pierre F made 4 patches in 1 month, and 88 patche

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

[Noel Grandin (via logerrit)]

 xmloff/source/draw/layerimp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 98c886ae93526a38af825ac66627e1f2d5d4d073
Author: Noel Grandin 
AuthorDate: Tue Oct 22 10:20:23 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 14:27:49 2024 +0200

tdf#163516 Draw fails to restore Layer data Title and Description

regression from
commit c7b7153213619859d5f049b7c60eafa4c81f5225
Author: Noel Grandin 
Date:   Fri Nov 20 14:24:51 2020 +0200
fastparser in SdXMLLayerContext

Change-Id: I0db381fbd383efd23bb254703bea103ca0d270d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175378
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
(cherry picked from commit 75d6fd09138283b4af949d8071ecfee5e2545180)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175398
Reviewed-by: Xisco Fauli 

diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index aa87e0a48100..09812f6ad122 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -94,11 +94,11 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLLayerContext::cre
 sal_Int32 nElement,
 const css::uno::Reference< css::xml::sax::XFastAttributeList >&  )
 {
-if( nElement == XML_ELEMENT(SVG, XML_TITLE) )
+if( nElement == XML_ELEMENT(SVG, XML_TITLE) || nElement == 
XML_ELEMENT(SVG_COMPAT, XML_TITLE) )
 {
 return new XMLStringBufferImportContext( GetImport(), sTitleBuffer);
 }
-else if( nElement == XML_ELEMENT(SVG, XML_DESC) )
+else if( nElement == XML_ELEMENT(SVG, XML_DESC) || nElement == 
XML_ELEMENT(SVG_COMPAT, XML_DESC) )
 {
 return new XMLStringBufferImportContext( GetImport(), 
sDescriptionBuffer);
 }

core.git: sw/source

[Bogdan Buzea (via logerrit)]

 sw/source/filter/html/wrthtml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f85366c407e71fc4e382c449504940aaedab354f
Author: Bogdan Buzea 
AuthorDate: Mon Oct 21 18:06:31 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 14:30:26 2024 +0200

tdf#163486: PVS: Identical branches

Since
commit 97075a384aed0b4853b78bd5ffc681cdf9003f11
Author: Michael Brauer 
Date:   Wed Oct 24 13:16:17 2001 +

#91961#: Support of language

V1037 Two or more case-branches perform the same actions. Check lines: 
1462, 1465

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

diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index 3b7e2f887886..b4a277ec5df4 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1462,7 +1462,7 @@ TypedWhichId 
SwHTMLWriter::GetLangWhichIdFromScript( sal_uInt16
 nWhichId = RES_CHRATR_CJK_LANGUAGE;
 break;
 case CSS1_OUTMODE_CTL:
-nWhichId = RES_CHRATR_CJK_LANGUAGE;
+nWhichId = RES_CHRATR_CTL_LANGUAGE;
 break;
 default:
 nWhichId = RES_CHRATR_LANGUAGE;

core.git: sc/qa sc/sdi sc/source

[Jaume Pujantell (via logerrit)]

 sc/qa/unit/tiledrendering/tiledrendering.cxx |   70 +++
 sc/sdi/scalc.sdi |4 -
 sc/source/ui/view/tabvwsh3.cxx   |2 
 3 files changed, 64 insertions(+), 12 deletions(-)

New commits:
commit 02d1b4923a9d8d859a299b59ff07aa312da2270c
Author: Jaume Pujantell 
AuthorDate: Fri Oct 11 20:23:01 2024 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 22 10:33:42 2024 +0200

sc: change how .uno:FreezePanesColumn/Row get the index

On commit "sc: fix freeze row/column panes"
44362e588686e33ff60ddcb6c1cd0c6082073fb0 the type of FreezePanesColumn and 
FreezePanesRow was changed from Int32 to Point. Since then, calls
trying to set the frozen panes with this commands sending an index fail,
setting the index to 1.

This change allows again a way to set them passing only an index of type
Int32.

Change-Id: I9de12af5ec7dbb4e49b057c7c19c063424265581
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174825
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit 3eec1925788387c7c5996052388f3fcac518dfe7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174956
Tested-by: Jenkins

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 1c7e649d2e96..43569fa4fa47 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -617,20 +617,32 @@ public:
 case LOK_CALLBACK_STATE_CHANGED:
 {
 std::stringstream aStream(pPayload);
-if (!aStream.str().starts_with("{"))
+boost::property_tree::ptree aTree;
+std::string aCommandName;
+
+if (aStream.str().starts_with("{"))
 {
-break;
-}
+boost::property_tree::read_json(aStream, aTree);
+auto it = aTree.find("commandName");
+if (it == aTree.not_found())
+{
+break;
+}
 
-boost::property_tree::ptree aTree;
-boost::property_tree::read_json(aStream, aTree);
-auto it = aTree.find("commandName");
-if (it == aTree.not_found())
+aCommandName = it->second.get_value();
+}
+else
 {
-break;
+std::string aState = aStream.str();
+auto it = aState.find("=");
+if (it == std::string::npos)
+{
+break;
+}
+aCommandName = aState.substr(0, it);
+aTree.put("state", aState.substr(it + 1));
 }
 
-std::string aCommandName = it->second.get_value();
 m_aStateChanges[aCommandName] = aTree;
 }
 break;
@@ -3992,6 +4004,46 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, 
testLeftOverflowEdit)
 CPPUNIT_ASSERT_EQUAL(tools::Long(20), 
aView.m_aTextSelectionResult.m_aRefPoint.getX());
 }
 
+CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, testFreezeRowOrColumn)
+{
+createDoc("empty.ods");
+ViewCallback aView;
+SfxViewShell* pView = SfxViewShell::Current();
+
+// Freeze panes on a column and receive the proper state back
+aView.m_aStateChanges.clear();
+uno::Sequence aPropertyValues = {
+comphelper::makePropertyValue("Index",  
uno::Any(static_cast(8))),
+};
+comphelper::dispatchCommand(".uno:FreezePanesColumn", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
+pView->GetViewFrame().GetBindings().GetTimer().Invoke();
+pView->GetViewFrame().GetBindings().GetTimer().Invoke();
+auto it = aView.m_aStateChanges.find(".uno:FreezePanesColumn");
+CPPUNIT_ASSERT(it != aView.m_aStateChanges.end());
+std::string values = it->second.get("state");
+std::string index = values.substr(0, values.find(' '));
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 8
+// - Actual  : 1
+CPPUNIT_ASSERT_EQUAL(std::string("8"), index);
+
+// Freeze panes on a row and receive the proper state back
+aView.m_aStateChanges.clear();
+comphelper::dispatchCommand(".uno:FreezePanesRow", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
+pView->GetViewFrame().GetBindings().GetTimer().Invoke();
+pView->GetViewFrame().GetBindings().GetTimer().Invoke();
+it = aView.m_aStateChanges.find(".uno:FreezePanesRow");
+CPPUNIT_ASSERT(it != aView.m_aStateChanges.end());
+values = it->second.get("state");
+index = values.substr(0, values.find(' '));
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 8
+// - Actual  : 1
+CPPUNIT_ASSERT_EQUAL(std::string("8"), index);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git

core.git: hwpfilter/source

[folandidi (via logerrit)]

 hwpfilter/source/attributes.hxx |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 33ca469ee6f0249582e0ed7f623b79848edbccb1
Author: folandidi 
AuthorDate: Wed Oct 16 23:28:08 2024 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Tue Oct 22 14:06:42 2024 +0200

tdf#143148: Use pragma once instead of include guards

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

diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx
index 09dc26a03b1f..5b363e784327 100644
--- a/hwpfilter/source/attributes.hxx
+++ b/hwpfilter/source/attributes.hxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#ifndef INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
-#define INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
+#pragma once
 
 #include 
 #include 
@@ -55,7 +53,4 @@ private:
 std::unique_ptr m_pImpl;
 };
 
-#endif // INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Miklos Vajna (via logerrit)]

 sfx2/sdi/sfx.sdi|1 +
 sfx2/source/doc/objserv.cxx |   22 ++
 2 files changed, 23 insertions(+)

New commits:
commit d48264d51891d81f77fcfd77766e1d34ec17412b
Author: Miklos Vajna 
AuthorDate: Tue Oct 22 08:56:33 2024 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 22 14:09:13 2024 +0200

cool#9992 lok doc sign: allow late-init of the sign cert

The current setup is that doc_initializeForRendering() gets the signing
key/cert earlier, even if no signing will be performed for this
document.

This has the downside that we needlessly share sensitive info.

Add an alternative way so to only share the sign key/cert when the
.uno:Signature command gets dispatched. This works similarly well for
the signing, but this way the private info is only shared when we
actually use it.

The .uno:Signature UNO command brings up the interactive dialog on
success, so it's not easy to cover this from CppunitTest_sfx2_doc.
Anyhow, the format for these two parameters is PEM, i.e. base64 dump of
the data, with the usual markers to show which one is the key and the
cert.

(cherry picked from commit 47fd29a318513d26b86eb0cfa891969ce6c85879)

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

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 28ce62e6db32..eb39cafd5b30 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4754,6 +4754,7 @@ SfxVoidItem VersionDialog SID_VERSION
 ]
 
 SfxUInt16Item Signature SID_SIGNATURE
+(SfxStringItem SignatureCert FN_PARAM_1, SfxStringItem SignatureKey FN_PARAM_2)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index bb29a897f127..096c97344b3b 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -90,6 +90,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -614,6 +615,27 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 }
 else
 {
+// See if a signing cert is passed as a parameter: if so, 
parse that.
+std::string aSignatureCert;
+std::string aSignatureKey;
+const SfxStringItem* pSignatureCert = 
rReq.GetArg(FN_PARAM_1);
+if (pSignatureCert)
+{
+aSignatureCert = pSignatureCert->GetValue().toUtf8();
+}
+const SfxStringItem* pSignatureKey = 
rReq.GetArg(FN_PARAM_2);
+if (pSignatureKey)
+{
+aSignatureKey = pSignatureKey->GetValue().toUtf8();
+}
+SfxViewFrame* pFrame = GetFrame();
+SfxViewShell* pViewShell = pFrame ? pFrame->GetViewShell() : 
nullptr;
+if (!aSignatureCert.empty() && !aSignatureKey.empty() && 
pViewShell)
+{
+xCertificate = 
SfxLokHelper::getSigningCertificate(aSignatureCert, aSignatureKey);
+pViewShell->SetSigningCertificate(xCertificate);
+}
+
 // Async, all code before return has to go into the callback.
 SignDocumentContent(pDialogParent, [this, pDialogParent] (bool 
bSigned) {
 AfterSignContent(bSigned, pDialogParent);

AW: Cause of Cygwin terminal gets stuck during the build

[Juergen Funk ML]

HI Hossein,

I have Win11 with Cygwin 3.4.8 and now 3.4.10 but always the same
Git for Windows is 2.45.2, new Laptop Thinkpad L15, 64 GB, 12 threads

Build without unit-test 8:45h
After that I did the VS solution, which takes 12:30h

I have made a few observations:
Got an older laptop with Win10, Thinkpad P51 16GB Ram, 8 Threads
Git for Windows is 2.39.1

when I start the bash.exe on the new one, it takes 5sec until it is completely 
ready for input, on the old one it is there immediately.
When call autogen.sh, the new one is 45sec faster (only one task)
After autogen.sh I call make distclean which takes 15sec on the new one and 
3sec on the old one, whereby I exclude the output here.
But maybe it's a different problem with the new laptop, maybe Win11?

Or any ideas

Best
Juergen

-Ursprüngliche Nachricht-
Von: LibreOffice  Im Auftrag von 
Hossein Nourikhah
Gesendet: Montag, 21. Oktober 2024 16:19
An: Libreoffice 
Betreff: Cause of Cygwin terminal gets stuck during the build

Hello,

If you try the latest version of Cygwin (3.5.x) or Git for Windows
(2.47) to build LibreOffice, you may have faced the problem that terminal 
sometimes gets stuck during the build.

This is the result of my effort to understand the problem:

The issue first appeared in Cygwin shell 3.3 a while ago, and it became worse 
in Cygwin 3.5, but with the recent update of "Git for Windows", it is also 
visible on "Git bash".

Running "make -d", one can see a lot of debugging information. The process may 
hang in many places, but this is one of the hangs, which reaches mktemp utility:

$ make -d
...
[build DEP] LNK:Library/unobootstrapprotector.dll.d
CreateProcess(C:\cygwin64\bin\mktemp.exe,mktemp --tmpdir=C:/cygwin64/tmp
gbuild.XX,...)

[ Terminal hangs here ]

I could find the PID of hanging mktemp with:

$ ps ax | grep mktemp
 26144   1   23307  10708  cons1 197609 23:38:01
/usr/bin/mktemp


After several tries, I could get some meaningful backtrace from hanging mktemp 
by attaching gdb to that. I have installed make-debuginfo and 
coreutils-debuginfo alongside gdb-14 to be able to get the backtrace:

$ gdb -p 10708
GNU gdb (GDB) (Cygwin 14.2-1) 14.2
...
Attaching to process 10708
[New Thread 10708.0x80b0]
[New Thread 10708.0x81e8]
Reading symbols from /usr/bin/mktemp.exe...
Reading symbols from /usr/lib/debug//usr/bin/mktemp.exe.dbg...
(gdb) interrupt
(gdb) bt
#0  0x7ff8519e7a36 in fhandler_console::set_input_mode 
(m=m@entry=tty::cygwin,
 t=0x1a0030028, p=p@entry=0x88da8)
 at
/usr/src/debug/cygwin-3.5.4-1/winsup/cygwin/fhandler/console.cc:817
#1  0x7ff8519f175c in fhandler_console::post_open_setup (this=0x88ba8,
 fd=) at
/usr/src/debug/cygwin-3.5.4-1/winsup/cygwin/fhandler/console.cc:1910
#2  0x7ff851948796 in dtable::init_std_file_from_handle 
(this=this@entry=0x84870,
 fd=fd@entry=0, handle=0x, handle@entry=0x424)
 at /usr/src/debug/cygwin-3.5.4-1/winsup/cygwin/dtable.cc:425
#3  0x7ff851948a61 in dtable::stdio_init (this=0x84870)
 at /usr/src/debug/cygwin-3.5.4-1/winsup/cygwin/dtable.cc:162
#4  0x7ff8519370e7 in dll_crt0_1 ()
 at /usr/src/debug/cygwin-3.5.4-1/winsup/cygwin/dcrt0.cc:929
#5  0x7ff851935d51 in _cygtls::call2 (this=0x7ce00,
 func=0x7ff851936f10 , arg=0x0,
buf=buf@entry=0x7cdf0)
 at /usr/src/debug/cygwin-3.5.4-1/winsup/cygwin/cygtls.cc:41
#6  0x7ff851935dca in _cygtls::call (func=, arg=)
 at /usr/src/debug/cygwin-3.5.4-1/winsup/cygwin/cygtls.cc:28
#7  0x in ?? ()

As visible in the backtrace, the problem is in
fhandler_console::set_input_mode() in console.cc:817. Console hangs after 
attach_console() is invoked. There were known issues around multiple processes 
trying to access console at the same time, and this issue seems to be because 
of the exact same problem. Multiple processes want to write on the console at 
the same time, and then this concurrency problem happens, maybe a deadlock.

This is one of the patches that was supposed to fix the problem:

[PATCH] Cygwin: console: Fix race issue on allocating console simultaneously.
https://cygwin.com/pipermail/cygwin-patches/2024q3/012722.html

More "race" issues can be seen by searching "race" in newlib-cygwin:

https://cygwin.com/cgit/newlib-cygwin/log/?qt=grep&q=race

Looking into the sources of Cygwin 3.5.4-1 locally, one may see that fixes 
b160b690b6ace93ee4225f14a9287549e37f4a71 and
10477d95ec401213d5bded5ae3600ab0d2d5ed94 are already applied, but the problem 
still persists.

Also, the issue is not limited to Cygwin, and also happens in the recent 
version of "Git for Windows" shell. To describe the same issue on git bash, you 
can try 'uname -a' on git bash, which shares some sources with Cygwin.

On git bash version 2.46, you'll get 3.4.10-2e2ef940.x86_64, but with the 
latest, 2.47, you'll get 3.5.4-1e8cf1a5.x86_64. On git bash 2.46, you may not 
face the problem, but on git bash 2.47, you may face it imme

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

[Noel Grandin (via logerrit)]

 xmloff/source/draw/layerimp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fcfb116805d27e349622afe7dcfbb2f8f570712a
Author: Noel Grandin 
AuthorDate: Tue Oct 22 10:20:23 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 22 16:55:18 2024 +0200

tdf#163516 Draw fails to restore Layer data Title and Description

regression from
commit c7b7153213619859d5f049b7c60eafa4c81f5225
Author: Noel Grandin 
Date:   Fri Nov 20 14:24:51 2020 +0200
fastparser in SdXMLLayerContext

Change-Id: I0db381fbd383efd23bb254703bea103ca0d270d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175378
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
(cherry picked from commit 75d6fd09138283b4af949d8071ecfee5e2545180)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175399
Reviewed-by: Xisco Fauli 

diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index eeffae04e997..fae92380a257 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -98,11 +98,11 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLLayerContext::cre
 sal_Int32 nElement,
 const css::uno::Reference< css::xml::sax::XFastAttributeList >&  )
 {
-if( nElement == XML_ELEMENT(SVG, XML_TITLE) )
+if( nElement == XML_ELEMENT(SVG, XML_TITLE) || nElement == 
XML_ELEMENT(SVG_COMPAT, XML_TITLE) )
 {
 return new XMLStringBufferImportContext( GetImport(), sTitleBuffer);
 }
-else if( nElement == XML_ELEMENT(SVG, XML_DESC) )
+else if( nElement == XML_ELEMENT(SVG, XML_DESC) || nElement == 
XML_ELEMENT(SVG_COMPAT, XML_DESC) )
 {
 return new XMLStringBufferImportContext( GetImport(), 
sDescriptionBuffer);
 }

core.git: 2 commits - accessibility/source

[Michael Weghorn (via logerrit)]

 accessibility/source/extended/accessibletabbar.cxx |6 +
 accessibility/source/helper/acc_factory.cxx|   24 +
 2 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit c8371b5f1a84191d38185820915f0d93741df1fe
Author: Michael Weghorn 
AuthorDate: Tue Oct 22 12:23:36 2024 +0200
Commit: Michael Weghorn 
CommitDate: Tue Oct 22 15:42:52 2024 +0200

a11y: Return early in AccessibleFactory::createAccessibleContext

Return the XAccessibleContext reference right away, instead
of assigning it to a local variable and returning at the end
of the method.

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

diff --git a/accessibility/source/helper/acc_factory.cxx 
b/accessibility/source/helper/acc_factory.cxx
index d7df60d69ae0..d95d47b214d9 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -303,8 +303,6 @@ Reference< XAccessibleContext > 
AccessibleFactory::createAccessibleContext( VCLX
 
 Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( 
VCLXWindow* _pXWindow )
 {
-Reference< XAccessibleContext > xContext;
-
 VclPtr pWindow = _pXWindow->GetWindow();
 if ( pWindow )
 {
@@ -315,50 +313,50 @@ Reference< XAccessibleContext > 
AccessibleFactory::createAccessibleContext( VCLX
 Reference< XAccessible > xAcc( pWindow->GetAccessible() );
 if ( xAcc.is() )
 {
-Reference< XAccessibleContext > xCont( 
xAcc->getAccessibleContext() );
+Reference 
xContext(xAcc->getAccessibleContext());
 if ( pWindow->GetType() == WindowType::MENUBARWINDOW ||
-( xCont.is() && xCont->getAccessibleRole() == 
AccessibleRole::POPUP_MENU ) )
+( xContext.is() && xContext->getAccessibleRole() == 
AccessibleRole::POPUP_MENU ) )
 {
-xContext = std::move(xCont);
+return xContext;
 }
 }
 }
 
 else if ( nType == WindowType::STATUSBAR )
 {
-xContext = new VCLXAccessibleStatusBar(_pXWindow);
+return new VCLXAccessibleStatusBar(_pXWindow);
 }
 
 else if ( nType == WindowType::TABCONTROL )
 {
-xContext = new VCLXAccessibleTabControl(_pXWindow);
+return new VCLXAccessibleTabControl(_pXWindow);
 }
 
 else if ( nType == WindowType::TABPAGE && 
pWindow->GetAccessibleParentWindow() && 
pWindow->GetAccessibleParentWindow()->GetType() == WindowType::TABCONTROL )
 {
-xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
+return new VCLXAccessibleTabPageWindow(_pXWindow);
 }
 
 else if ( nType == WindowType::FLOATINGWINDOW )
 {
-xContext = new FloatingWindowAccessible( _pXWindow );
+return new FloatingWindowAccessible(_pXWindow);
 }
 
 else if ( nType == WindowType::BORDERWINDOW && hasFloatingChild( 
pWindow ) )
 {
-xContext = new FloatingWindowAccessible( _pXWindow );
+return new FloatingWindowAccessible(_pXWindow);
 }
 
 else if ( ( nType == WindowType::HELPTEXTWINDOW ) || ( nType == 
WindowType::FIXEDLINE ) )
 {
-xContext = new VCLXAccessibleFixedText(_pXWindow);
+return new VCLXAccessibleFixedText(_pXWindow);
 }
 else
 {
-xContext = new VCLXAccessibleComponent(_pXWindow);
+return new VCLXAccessibleComponent(_pXWindow);
 }
 }
-return xContext;
+return nullptr;
 }
 
 Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( 
VCLXToolBox* _pXWindow )
commit 51a482bc0452003dbbd396cb39bb9c2b1261df64
Author: Michael Weghorn 
AuthorDate: Tue Oct 22 12:17:03 2024 +0200
Commit: Michael Weghorn 
CommitDate: Tue Oct 22 15:42:46 2024 +0200

a11y: Return early in AccessibleTabBar::getAccessibleAtPoint

Just return `xAcc` right away instead of first assigning it to
a local variable.

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

diff --git a/accessibility/source/extended/accessibletabbar.cxx 
b/accessibility/source/extended/accessibletabbar.cxx
index 55318298d1ae..2b1522f30a28 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -354,7 +354,6 @@ namespace accessibility
 {
 OExternalLockGuard aGuard( this );
 
-Reference< XAccessible > xChild;
 for( sal_Int64 i = 0; i < getAccessibleChildCount(); ++i )
 {
 Reference< XAccessible 

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

[Xisco Fauli (via logerrit)]

 sfx2/source/view/viewprn.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb6df599f793e87f7af55a7029abcc3b76c5267a
Author: Xisco Fauli 
AuthorDate: Mon Oct 21 12:53:03 2024 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 22 11:16:51 2024 +0200

sfx2: check mpViewShell in another place

After
commit 3cc367f426506e3165dda06feeb20e0a9b4c6194
Author: Xisco Fauli 
Date:   Fri Oct 18 16:40:05 2024 +0200

tdf#163486: PVS: check mpViewShell

Kudos to M. Kaganski

Change-Id: Id1cfed6f199394720336581c87d11125cd147734
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175328
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit a2bed2a09185b2cb1a5aaf926544475a4cc4a2b0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175314
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 319ecafbb7c8..bc885e5670c7 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -341,7 +341,7 @@ void SfxPrinterController::jobFinished( 
css::view::PrintableState nState )
 {
 // "real" problem (not simply printing cancelled by user)
 OUString aMsg( SfxResId(STR_NOSTARTPRINTER) );
-if ( !m_bApi )
+if ( !m_bApi && mpViewShell )
 {
 std::unique_ptr 
xBox(Application::CreateMessageDialog(mpViewShell->GetFrameWeld(),
  
VclMessageType::Warning, VclButtonsType::Ok,

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

[Caolán McNamara (via logerrit)]

 include/svx/svdpage.hxx |2 --
 sd/inc/sdpage.hxx   |2 +-
 sd/source/core/drawdoc3.cxx |2 +-
 sd/source/core/stlfamily.cxx|   11 +--
 sd/source/ui/view/outlnvsh.cxx  |2 +-
 svx/source/svdraw/svdpage.cxx   |5 -
 sw/inc/doc.hxx  |8 
 sw/source/core/doc/DocumentStylePoolManager.cxx |4 ++--
 sw/source/core/doc/docfmt.cxx   |   10 +-
 9 files changed, 19 insertions(+), 27 deletions(-)

New commits:
commit 235c230cd348600ce7385cc580c45a7be3572704
Author: Caolán McNamara 
AuthorDate: Mon Oct 21 17:39:31 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 09:17:02 2024 +0200

We don't need a virtual here

Only known SdPages need this

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

diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index f64af22e1353..8371d080cbe2 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -528,8 +528,6 @@ public:
 const SdrLayerAdmin& GetLayerAdmin() const;
 SdrLayerAdmin& GetLayerAdmin();
 
-virtual OUString GetLayoutName() const;
-
 /// for snap-to-grid in Writer, also for AlignObjects if 1 object is marked
 /// if pRect != null, then the pages that are intersected by this Rect,
 /// otherwise the visible pages
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 317e99160a18..df3a657317b5 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -248,7 +248,7 @@ public:
  const ::tools::Rectangle& rOldBoundRect) override;
 
 void SetLayoutName(const OUString& aName);
-virtual OUString GetLayoutName() const override   { return 
maLayoutName; }
+const OUString& GetLayoutName() const { return maLayoutName; }
 
 voidSetFileName(const OUString& aName) { maFileName = aName; }
 const OUString& GetFileName() const   { return maFileName; }
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 3b2c64f10888..77975328daed 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1386,7 +1386,7 @@ static bool isMasterPageLayoutNameUnique(const 
SdDrawDocument& rDoc, std::u16str
 
 for(sal_uInt16 a(0); a < nPageCount; a++)
 {
-const SdrPage* pCandidate = rDoc.GetMasterPage(a);
+const SdPage* pCandidate = static_cast(rDoc.GetMasterPage(a));
 OUString aPageLayoutName(pCandidate->GetLayoutName());
 sal_Int32 nIndex = aPageLayoutName.indexOf(SD_LT_SEPARATOR);
 if( nIndex != -1 )
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 9696668dc326..2262ef1203d2 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -192,12 +192,11 @@ OUString SAL_CALL SdStyleFamily::getName()
 if( pPage == nullptr )
 throw DisposedException();
 
-OUString aLayoutName( pPage->GetLayoutName() );
-sal_Int32 nIndex = aLayoutName.indexOf(SD_LT_SEPARATOR);
-if( nIndex != -1 )
-aLayoutName = aLayoutName.copy(0, nIndex);
-
-return aLayoutName;
+const OUString& rLayoutName = pPage->GetLayoutName();
+sal_Int32 nIndex = rLayoutName.indexOf(SD_LT_SEPARATOR);
+if (nIndex != -1)
+return rLayoutName.copy(0, nIndex);
+return rLayoutName;
 }
 else
 {
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 8fcd132ff3de..90fa7e8cafdb 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1318,7 +1318,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
 if( nPos >= GetDoc()->GetSdPageCount( PageKind::Standard ) )
 nPos = 0;
 
-SdrPage* pPage = GetDoc()->GetSdPage( static_cast(nPos), 
PageKind::Standard );
+SdPage* pPage = GetDoc()->GetSdPage( static_cast(nPos), 
PageKind::Standard );
 
 if (GetDoc()->GetDocumentType() == DocumentType::Draw)
 aPageStr = SdResId(STR_SD_PAGE_COUNT_DRAW);
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index db4a041c577d..bb82ecb9289e 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1742,11 +1742,6 @@ SdrLayerAdmin& SdrPage::GetLayerAdmin()
 return *mpLayerAdmin;
 }
 
-OUString SdrPage::GetLayoutName() const
-{
-return OUString();
-}
-
 void SdrPage::SetInserted( bool bIns )
 {
 if( mbInserted == bIns )
commit 030cca8864262b65557f99df791900d52fee2f0e
Author: Caolán McNamara 
AuthorDate: Mon Oct 21 16:19:26 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 09:16:52 2024 +0200

drop newly unused Broadcast argument

Chang

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

[Caolán McNamara (via logerrit)]

 chart2/source/tools/InternalDataProvider.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a0b328f1329b325de939a8e59bddc0fdda0ee5d0
Author: Caolán McNamara 
AuthorDate: Sun Oct 20 14:43:04 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 09:19:07 2024 +0200

cid#1633319 Resource leak

Change-Id: Icdbc973b6c0d40366a1a261706e21bbb50a8826e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175261
Reviewed-by: Attila Szűcs 
Tested-by: Jenkins CollaboraOffice 

diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index 16a24836df0a..9d58f0bc7e8d 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1169,9 +1169,8 @@ void SAL_CALL 
InternalDataProvider::registerDataSequenceForChanges( const Refere
 void SAL_CALL InternalDataProvider::insertDataSeries(::sal_Int32 nAfterIndex)
 {
 // call the dialog insertion
-rtl::Reference xChartModel(m_xChartModel);
-DataBrowserModel* pDBM = new DataBrowserModel(xChartModel);
-pDBM->insertDataSeries(nAfterIndex);
+DataBrowserModel aDBM(m_xChartModel);
+aDBM.insertDataSeries(nAfterIndex);
 }
 
 //  XRangeXMLConversion 

core.git: svx/source

[Julien Nabet (via logerrit)]

 svx/source/tbxctrls/tbcontrl.cxx |   20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

New commits:
commit b2d35dfe19aec40d34f1a2cca0a83ef4cef23a7d
Author: Julien Nabet 
AuthorDate: Sat Oct 19 18:43:02 2024 +0200
Commit: Julien Nabet 
CommitDate: Tue Oct 22 17:14:02 2024 +0200

tdf#163284: Diagonal/criss-cross borders for tables is only implemented in 
Calc

Change-Id: I645fd2a6fafb2607d94607599366d9442b4423fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175199
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6cab2fac0af4..4380fbc2fe6c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -485,6 +485,7 @@ private:
 std::vector> aImgVec;
 boolbParagraphMode;
 boolm_bIsWriter;
+boolm_bIsCalc;
 
 void InitImageList();
 void CalcSizeValueSet();
@@ -2471,11 +2472,16 @@ 
SvxFrameWindow_Impl::SvxFrameWindow_Impl(SvxFrameToolBoxControl* pControl, weld:
 , mxFrameSetWin(new weld::CustomWeld(*m_xBuilder, u"valueset"_ustr, 
*mxFrameSet))
 , bParagraphMode(false)
 , m_bIsWriter(false)
+, m_bIsCalc(false)
 {
 
 // check whether the document is Writer or not
+// check also if it's Calc or not
 if (Reference xSI{ 
m_xFrame->getController()->getModel(), UNO_QUERY })
+{
 m_bIsWriter = 
xSI->supportsService(u"com.sun.star.text.TextDocument"_ustr);
+m_bIsCalc = 
xSI->supportsService(u"com.sun.star.sheet.SpreadsheetDocument"_ustr);
+}
 
 mxFrameSet->SetStyle(WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | 
WB_NO_DIRECTSELECT);
 AddStatusListener(u".uno:BorderReducedMode"_ustr);
@@ -2495,14 +2501,14 @@ 
SvxFrameWindow_Impl::SvxFrameWindow_Impl(SvxFrameToolBoxControl* pControl, weld:
 // diagonal borders available only for Calc.
 // Therefore, Calc uses 10 border types while
 // Writer uses 8 of them - for a single cell.
-for ( i=1; i < (m_bIsWriter ? 9 : 11); i++ )
+for ( i=1; i < (m_bIsCalc ? 11 : 9); i++ )
 mxFrameSet->InsertItem(i, Image(aImgVec[i-1].first), 
aImgVec[i-1].second);
 
 //bParagraphMode should have been set in StateChanged
 if ( !bParagraphMode )
 // when multiple cell selected:
 // Writer has 12 border types and Calc has 15 of them.
-for ( i = (m_bIsWriter ? 9 : 11); i < (m_bIsWriter ? 13 : 16); i++ )
+for ( i = (m_bIsCalc ? 11 : 9); i < (m_bIsCalc ? 16 : 13); i++ )
 mxFrameSet->InsertItem(i, Image(aImgVec[i-1].first), 
aImgVec[i-1].second);
 
 // adjust frame column for Writer
@@ -2568,7 +2574,7 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, 
ValueSet*, void)
 // nSel has 15 cases which means 15 border
 // types for Calc. But Writer uses only 12
 // of them - when diagonal borders excluded.
-if (m_bIsWriter)
+if (!m_bIsCalc)
 {
 // add appropriate increments
 // to match the correct borders.
@@ -2735,7 +2741,7 @@ void SvxFrameWindow_Impl::statusChanged( const 
css::frame::FeatureStateEvent& rE
 return;
 
 // set 12 border types for Writer, otherwise 15 for Calc.
-bool bTableMode = ( mxFrameSet->GetItemCount() == 
static_cast(m_bIsWriter ? 12 : 15) );
+bool bTableMode = ( mxFrameSet->GetItemCount() == 
static_cast(m_bIsCalc ? 15 : 12) );
 bool bResize= false;
 
 if ( bTableMode && bParagraphMode )
@@ -2769,10 +2775,10 @@ void SvxFrameWindow_Impl::CalcSizeValueSet()
 
 void SvxFrameWindow_Impl::InitImageList()
 {
-if (m_bIsWriter)
+if (!m_bIsCalc)
 {
-// Writer-specific aImgVec.
-// Since Writer doesn't have diagonal borders,
+// not Writer/Impress/Draw-specific aImgVec.
+// Since they don't have diagonal borders,
 // we have to use 12 border types here.
 aImgVec = {
 {BitmapEx(RID_SVXBMP_FRAME1), 
SvxResId(RID_SVXSTR_TABLE_PRESET_NONE)},