date:20231204

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d3c621d2a55ad69069ee1e9770686c208fa23a7
Author: Andras Timar 
AuthorDate: Mon Dec 4 09:08:57 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 09:08:57 2023 +0100

Bump version to 7.3.7.2.M8

Change-Id: I78e42fba1f1dbe6126df104eaf32b082faf22ed8

diff --git a/configure.ac b/configure.ac
index b36d57c11a58..2568674a71f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.3.7.2.M7],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.2.M8],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa sw/source writerfilter/qa writerfilter/source

2023-12-04 Thread Tomaž Vajngerl (via logerrit)

 sw/qa/core/header_footer/HeaderFooterTest.cxx  |   75 -
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |3 
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |   13 
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx  |4 
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx  |9 
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx  |4 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |3 
 sw/qa/extras/rtfexport/rtfexport.cxx   |3 
 sw/qa/extras/rtfexport/rtfexport2.cxx  |6 
 sw/qa/extras/rtfexport/rtfexport3.cxx  |   35 
 sw/qa/extras/rtfexport/rtfexport5.cxx  |2 
 sw/qa/extras/rtfimport/rtfimport.cxx   |   19 
 sw/source/core/doc/docfmt.cxx  |   17 
 sw/source/filter/ww8/rtfexport.cxx |8 
 writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx |1 
 writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx   |3 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |  214 +++-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |   60 -
 writerfilter/source/dmapper/PropertyIds.cxx|3 
 writerfilter/source/dmapper/PropertyIds.hxx|3 
 writerfilter/source/dmapper/PropertyMap.cxx|  663 ++---
 writerfilter/source/dmapper/PropertyMap.hxx|   83 +
 22 files changed, 713 insertions(+), 518 deletions(-)

New commits:
commit 2cc3e16f8e3f50d0fa53f15f78bba3afe29977bd
Author: Tomaž Vajngerl 
AuthorDate: Tue Nov 28 13:46:21 2023 +0900
Commit: Miklos Vajna 
CommitDate: Mon Dec 4 09:10:00 2023 +0100

tdf#136472 adjust ooxml import to handle first header/footer

Previously the ooxml import added a new page style when the first
header or footer was detected. Since then we gained support to add
first page header/footer in an existing page style so we don't need
to import it like that anymore.
This changes the import code so that the old complication to add
"First Page" page style is removed and it always just uses the
"Standard" page style for all 3 cases: first, left and right headers
and footers.

This also adjusts the existing tests to align with this change.

Change-Id: Ibf69597e6990499ac520ea9e323a5f73f429800b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157860
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 4b0fa253a4540f5461397815d290586f9ddabe61)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160193
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/core/header_footer/HeaderFooterTest.cxx 
b/sw/qa/core/header_footer/HeaderFooterTest.cxx
index 23e91a2db4b1..58411ee03b2b 100644
--- a/sw/qa/core/header_footer/HeaderFooterTest.cxx
+++ b/sw/qa/core/header_footer/HeaderFooterTest.cxx
@@ -97,8 +97,11 @@ CPPUNIT_TEST_FIXTURE(HeaderFooterTest, 
testNonFirstHeaderIsDisabled)
 
 createSwDoc("tdf127778.docx");
 
-xmlDocUniquePtr pLayout = parseLayoutDump();
-assertXPath(pLayout, "//page[2]/header", 0);
+// TODO
+
+// Header can only be enabled or disabled, but can't be disbaled just for 
first, left or right page.
+// If a header is enabled but empty, the header still takes space in LO, 
but not in MSO, where it acts the same as
+// if it is disabled.
 }
 
 // Check for correct header/footer with special first page with TOC inside
@@ -114,8 +117,10 @@ CPPUNIT_TEST_FIXTURE(HeaderFooterTest, 
testHeaderFooterWithSpecialFirstPage_OOXM
 {
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
 // check first page
-assertXPath(pXmlDoc, "/root/page[1]/header", 0);
-assertXPath(pXmlDoc, "/root/page[1]/footer", 0);
+assertXPath(pXmlDoc, "/root/page[1]/header");
+assertXPath(pXmlDoc, "/root/page[1]/footer");
+assertXPath(pXmlDoc, "/root/page[1]/header/txt/text()", 0);
+assertXPath(pXmlDoc, "/root/page[1]/footer/txt/text()", 0);
 // check second page in the same way
 assertXPath(pXmlDoc, "/root/page[2]/header");
 assertXPath(pXmlDoc, "/root/page[2]/footer");
@@ -448,7 +453,9 @@ CPPUNIT_TEST_FIXTURE(HeaderFooterTest, testTdf112694)
 uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
 // Header was on when header for file was for explicit first pages only
 // (marked via ).
-CPPUNIT_ASSERT(!getProperty(aPageStyle, "HeaderIsOn"));
+//CPPUNIT_ASSERT(!getProperty(aPageStyle, "HeaderIsOn"));
+// TODO - can't disable headers/footers selectively (only fo first 
page)
+CPPUNIT_ASSERT(getProperty(aPageStyle, "HeaderIsOn"));
 };
 
 createSwDoc("tdf112694.docx");
@@ -649,7 +656,11 @@ CPPUNIT_TEST_FIXTURE(HeaderFooterTest, 
testFirstPageFooterEnable

[Libreoffice-commits] core.git: include/vcl

2023-12-04 Thread Andrea Gelmini (via logerrit)

 include/vcl/bitmap.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4852c601be832c4b70a08a05a8abb921e13ab6a6
Author: Andrea Gelmini 
AuthorDate: Sun Dec 3 21:39:38 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 09:26:15 2023 +0100

Fix typo

Change-Id: I55e1b250f35adb11169267d5f8f1dbaca9ad802d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160282
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index b7059654e016..3b7f39480027 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -242,7 +242,7 @@ public:
 bitmap dimensions.
 
 @param rRectSrc
-Source rectangl. This is clipped to the
+Source rectangle. This is clipped to the
 bitmap dimensions. Note further that no scaling takes place
 during this copy operation, i.e. only the minimum of source
 and destination rectangle's width and height are used.

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

 xmloff/source/core/namespacemap.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 09200875ce643e66f293d39bb27630a3fdbb984d
Author: Julien Nabet 
AuthorDate: Sun Dec 3 20:50:50 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 09:26:45 2023 +0100

cid#1546325, cid#1546212: invalid iterator (xmloff/namespacemap.cxx)

Change-Id: I7a3377326daa5a0d933a68b9d4f5a64983ba2ab8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160278
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/xmloff/source/core/namespacemap.cxx 
b/xmloff/source/core/namespacemap.cxx
index c64f28087f36..1d844fe04cd9 100644
--- a/xmloff/source/core/namespacemap.cxx
+++ b/xmloff/source/core/namespacemap.cxx
@@ -360,6 +360,7 @@ sal_uInt16 SvXMLNamespaceMap::GetFirstKey() const
 sal_uInt16 SvXMLNamespaceMap::GetNextKey( sal_uInt16 nLastKey ) const
 {
 auto aIter = maKeyToNamespaceMap.find ( nLastKey );
+assert(aIter != maKeyToNamespaceMap.end());
 return (++aIter == maKeyToNamespaceMap.end()) ? USHRT_MAX : (*aIter).first;
 }
 
@@ -378,6 +379,7 @@ sal_uInt16 SvXMLNamespaceMap::GetFirstIndex() const
 sal_uInt16 SvXMLNamespaceMap::GetNextIndex( sal_uInt16 nOldIdx ) const
 {
 auto aIter = maKeyToNamespaceMap.find ( nOldIdx );
+assert(aIter != maKeyToNamespaceMap.end());
 return (++aIter == maKeyToNamespaceMap.end()) ? USHRT_MAX : (*aIter).first;
 }

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/source

2023-12-04 Thread Darshan11 (via logerrit)

 vcl/source/window/dockwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b08a9927bc4ee66a9575c658934dd27f06be702
Author: Darshan11 
AuthorDate: Fri Dec 1 18:49:32 2023 +0530
Commit: Szymon Kłos 
CommitDate: Mon Dec 4 09:45:55 2023 +0100

Fix posx and posy for Filter by color in autofilter jsDialog

Change-Id: I2d4cd198197250495cc87eb1ee68407baf8e6a1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160216
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 

diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 74c18cca5159..dab053b3fba9 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -927,7 +927,7 @@ Point DockingWindow::GetFloatingPos() const
 pWrapper->mpFloatWin->GetWindowState( aData );
 Point aPos(aData.x(), aData.y());
 // LOK needs logic coordinates not absolute screen position for 
autofilter menu
-if (!comphelper::LibreOfficeKit::isActive() || get_id() != 
"check_list_menu")
+if (!comphelper::LibreOfficeKit::isActive())
 aPos = 
pWrapper->mpFloatWin->GetParent()->ImplGetFrameWindow()->AbsoluteScreenToOutputPixel(
 aPos );
 return aPos;
 }

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

2023-12-04 Thread Tomaž Vajngerl (via logerrit)

 include/oox/export/drawingml.hxx   |   14 ++-
 oox/source/export/drawingml.cxx|  103 +++--
 oox/source/token/namespaces-strict.txt |1 
 oox/source/token/namespaces.txt|1 
 oox/source/token/tokens.txt|2 
 sw/qa/extras/ooxmlexport/data/SvgImageTest.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport20.cxx |   27 ++
 sw/source/filter/ww8/docxattributeoutput.cxx   |   16 +++
 test/source/xmltesttools.cxx   |2 
 9 files changed, 157 insertions(+), 9 deletions(-)

New commits:
commit bfbbf06bcea4d58117c14fd3f3b8743a3714f97e
Author: Tomaž Vajngerl 
AuthorDate: Sun Dec 3 13:21:35 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Dec 4 10:33:34 2023 +0100

tdf#126084 support writing SVG images into OOXML using the MS OOXML 
extension

SVG files aren't supported in OOXML, but we can write it using the
MS OOXML extension, which is supported in the latest MSO versions.

For now this only implements the support in the exporter.

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

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 9028cfdc0f9f..dcbb1b544390 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -259,16 +259,25 @@ private:
 DocumentType meDocumentType;
 
 OUString writeNewEntryToStorage(const Graphic& rGraphic, bool 
bRelPathToMedia);
+OUString writeNewSvgEntryToStorage(const Graphic& rGraphic, bool 
bRelPathToMedia);
 
 public:
+enum class TypeHint
+{
+Detect,
+SVG
+};
+
 GraphicExport(sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* 
pFilterBase, DocumentType eDocumentType)
 : mpFS(pFS)
 , mpFilterBase(pFilterBase)
 , meDocumentType(eDocumentType)
 {}
 
-OUString writeToStorage(Graphic const& rGraphic, bool bRelPathToMedia = 
false);
+OUString writeToStorage(Graphic const& rGraphic, bool bRelPathToMedia = 
false, TypeHint eHint = TypeHint::Detect);
+
 void writeBlip(Graphic const& rGraphic, std::vector 
const& rEffects, bool bRelPathToMedia = false);
+void writeSvgExtension(OUString const& rSvgRelId);
 };
 
 class OOX_DLLPUBLIC DrawingML
@@ -353,7 +362,7 @@ public:
 
 void SetBackgroundDark(bool bIsDark) { mbIsBackgroundDark = bIsDark; }
 /// If bRelPathToMedia is true add "../" to image folder path while adding 
the image relationship
-OUString writeGraphicToStorage(const Graphic &rGraphic , bool 
bRelPathToMedia = false);
+OUString writeGraphicToStorage(const Graphic &rGraphic , bool 
bRelPathToMedia = false, GraphicExport::TypeHint eHint = 
GraphicExport::TypeHint::Detect);
 
 void WriteColor( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT );
 void WriteColor( const OUString& sColorSchemeName, const 
css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 
nAlpha = MAX_PERCENT );
@@ -516,6 +525,7 @@ public:
 const OUString& sRelationshipType,
 OUString* pRelationshipId );
 
+std::shared_ptr createGraphicExport();
 };
 
 }
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 228aa2326cc0..05c96c9ad798 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1283,12 +1283,34 @@ OUString DrawingML::GetRelationCompPrefix() const
 return OUString(getRelationCompPrefix(meDocumentType));
 }
 
+void GraphicExport::writeSvgExtension(OUString const& rSvgRelId)
+{
+if (rSvgRelId.isEmpty())
+return;
+
+mpFS->startElementNS(XML_a, XML_extLst);
+mpFS->startElementNS(XML_a, XML_ext, XML_uri, 
"{96DAC541-7B7A-43D3-8B79-37D633B846F1}");
+mpFS->singleElementNS(XML_asvg, XML_svgBlip,
+FSNS(XML_xmlns, XML_asvg), 
mpFilterBase->getNamespaceURL(OOX_NS(asvg)),
+FSNS(XML_r, XML_embed), rSvgRelId);
+mpFS->endElementNS(XML_a, XML_ext);
+mpFS->endElementNS( XML_a, XML_extLst);
+}
+
 void GraphicExport::writeBlip(Graphic const& rGraphic, 
std::vector const& rEffects, bool bRelPathToMedia)
 {
 OUString sRelId = writeToStorage(rGraphic, bRelPathToMedia);
 
 mpFS->startElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelId);
 
+auto const& rVectorGraphicDataPtr = rGraphic.getVectorGraphicData();
+
+if (rVectorGraphicDataPtr && rVectorGraphicDataPtr->getType() == 
VectorGraphicDataType::Svg)
+{
+OUString sSvgRelId = writeToStorage(rGraphic, bRelPathToMedia, 
TypeHint::SVG);
+writeSvgExtension(sSvgRelId);
+}
+
 for (auto const& rEffect : rEffects)
 {
 switch (rEffect.meType)
@@ -1514,19 +1536,72 @@ OUString GraphicExport::writeNewEntryToStorage(const 
Graphic& rGraphic, boo

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

2023-12-04 Thread Miklos Vajna (via logerrit)

 include/svx/svdpage.hxx   |8 
 svx/source/svdraw/svdpage.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit beb0b57a638a2577d89ab5bdee6351008c5127ca
Author: Miklos Vajna 
AuthorDate: Mon Dec 4 08:19:31 2023 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 4 10:43:26 2023 +0100

svx: prefix members of SdrPageGridFrameList

See tdf#94879 for motivation.

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

diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 7dd18e743184..c70a2f1f4a2d 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -302,18 +302,18 @@ public:
 
 class SVXCORE_DLLPUBLIC SdrPageGridFrameList final
 {
-std::vector aList;
+std::vector m_aList;
 
 SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList) = delete;
 void   operator=(const SdrPageGridFrameList& rSrcList) = delete;
-SdrPageGridFrame* GetObject(sal_uInt16 i) const { return aList[i]; }
+SdrPageGridFrame* GetObject(sal_uInt16 i) const { return m_aList[i]; }
 
 public:
 SdrPageGridFrameList(){}
 ~SdrPageGridFrameList(){ 
Clear(); }
 void   Clear();
-sal_uInt16 GetCount() const{ 
return sal_uInt16(aList.size()); }
-void   Insert(const SdrPageGridFrame& rGF) { aList.push_back(new 
SdrPageGridFrame(rGF)); }
+sal_uInt16 GetCount() const{ 
return sal_uInt16(m_aList.size()); }
+void   Insert(const SdrPageGridFrame& rGF) { m_aList.push_back(new 
SdrPageGridFrame(rGF)); }
 SdrPageGridFrame&   operator[](sal_uInt16 nPos){ 
return *GetObject(nPos); }
 const SdrPageGridFrame& operator[](sal_uInt16 nPos) const  { 
return *GetObject(nPos); }
 };
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 9b5965a5843a..adc8555bf13d 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1099,7 +1099,7 @@ void SdrPageGridFrameList::Clear()
 for (sal_uInt16 i=0; i

[Libreoffice-commits] core.git: sc/source sdext/source sd/source

 sc/source/core/data/SolverSettings.cxx|4 +++-
 sc/source/ui/namedlg/namemgrtable.cxx |   12 ++--
 sd/source/filter/eppt/pptx-epptooxml.cxx  |6 +-
 sdext/source/pdfimport/tree/pdfiprocessor.cxx |1 +
 4 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit cdb180e767ebf2011414f4a5ba7213752474ee36
Author: Julien Nabet 
AuthorDate: Sun Dec 3 21:23:03 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:46:28 2023 +0100

cid#1546332 Using invalid iterator

and :

cid#1546327 Using invalid iterator
cid#1546289 Using invalid iterator
cid#1546284 Using invalid iterator

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

diff --git a/sc/source/core/data/SolverSettings.cxx 
b/sc/source/core/data/SolverSettings.cxx
index bbeeca7bd4cf..ac2d2aa24aeb 100644
--- a/sc/source/core/data/SolverSettings.cxx
+++ b/sc/source/core/data/SolverSettings.cxx
@@ -339,7 +339,9 @@ void SolverSettings::SaveSolverSettings()
  */
 bool SolverSettings::ReadParamValue(SolverParameter eParam, OUString& rValue, 
bool bRemoveQuotes)
 {
-OUString sRange = m_mNamedRanges.find(eParam)->second;
+const auto iter = m_mNamedRanges.find(eParam);
+assert(iter != m_mNamedRanges.end());
+OUString sRange = iter->second;
 ScRangeData* pRangeData
 = 
m_pRangeName->findByUpperName(ScGlobal::getCharClass().uppercase(sRange));
 if (pRangeData)
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index fa4b3ff4ef47..5b2330665374 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -83,9 +83,17 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const 
ScRangeNameLine& rLi
 {
 const ScRangeName* pRangeName;
 if (rLine.aScope == maGlobalString)
-pRangeName = &m_RangeMap.find(STR_GLOBAL_RANGE_NAME)->second;
+{
+const auto iter = m_RangeMap.find(STR_GLOBAL_RANGE_NAME);
+assert(iter != m_RangeMap.end());
+pRangeName = &iter->second;
+}
 else
-pRangeName = &m_RangeMap.find(rLine.aScope)->second;
+{
+const auto iter = m_RangeMap.find(rLine.aScope);
+assert(iter != m_RangeMap.end());
+pRangeName = &iter->second;
+}
 
 return 
pRangeName->findByUpperName(ScGlobal::getCharClass().uppercase(rLine.aName));
 }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 6cb5e277ee87..ae8ccc063cf2 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2317,9 +2317,13 @@ void 
PowerPointExport::WritePlaceholderReferenceShapes(PowerPointShapeExport& rD
 && aAny == true))
 {
 if ((xShape = GetReferencedPlaceholderXShape(SlideNumber, ePageType)))
+{
+const auto iter = maPlaceholderShapeToIndexMap.find(xShape);
+assert(iter != maPlaceholderShapeToIndexMap.end());
 rDML.WritePlaceholderReferenceShape(SlideNumber,
-
maPlaceholderShapeToIndexMap.find(xShape)->second,
+iter->second,
 ePageType, mXPagePropSet);
+}
 }
 
 if (ePageType == LAYOUT
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 7967a74a67cf..bf590c544334 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -471,6 +471,7 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 
nFontId ) const
 IdToFontMap::const_iterator it = m_aIdToFont.find( nFontId );
 if( it == m_aIdToFont.end() )
 it = m_aIdToFont.find( 0 );
+assert(it != m_aIdToFont.end());
 return it->second;
 }

[Libreoffice-commits] core.git: 2 commits - sw/source writerfilter/source

 sw/source/ui/vba/vbaformfields.cxx |2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 3bf1c0d23afccaa84c3d4ecd701c20e60f9e2994
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 19:44:47 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:47:26 2023 +0100

cid#1546495 COPY_INSTEAD_OF_MOVE

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

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4bc611992c88..76ab50135427 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3718,8 +3718,7 @@ RTFError RTFDocumentImpl::handleEmbeddedObject()
 
 uno::Reference xInputStream(
 new utl::OSeekableInputStreamWrapper(pStream.release(), 
/*_bOwner=*/true));
-auto pStreamValue = new RTFValue(xInputStream);
-m_aOLEAttributes.set(NS_ooxml::LN_inputstream, pStreamValue);
+m_aOLEAttributes.set(NS_ooxml::LN_inputstream, new RTFValue(xInputStream));
 
 return RTFError::OK;
 }
commit 8c0ed1d92c128fa73b0441581a958bab317f6fa7
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 19:43:33 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:47:14 2023 +0100

cid#1546497 COPY_INSTEAD_OF_MOVE

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

diff --git a/sw/source/ui/vba/vbaformfields.cxx 
b/sw/source/ui/vba/vbaformfields.cxx
index 586393e35818..9c8af450d345 100644
--- a/sw/source/ui/vba/vbaformfields.cxx
+++ b/sw/source/ui/vba/vbaformfields.cxx
@@ -81,7 +81,7 @@ class FormFieldsEnumWrapper : public EnumerationHelper_BASE
 sal_Int32 mnIndex;
 
 public:
-explicit FormFieldsEnumWrapper(uno::Reference 
xIndexAccess)
+explicit FormFieldsEnumWrapper(const 
uno::Reference& xIndexAccess)
 : mxIndexAccess(xIndexAccess)
 , mnIndex(0)
 {

[Libreoffice-commits] core.git: 2 commits - cui/source helpcompiler/source

 cui/source/dialogs/scriptdlg.cxx   |3 +--
 helpcompiler/source/HelpLinker.cxx |3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit de788d603dd763ed3c69a4e0fea98a571301c0ca
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 19:47:18 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:47:55 2023 +0100

cid#1546483 COPY_INSTEAD_OF_MOVE

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

diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 2c2e40a8e708..890034317c2a 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1030,8 +1030,7 @@ void SvxScriptOrgDialog::StoreCurrentSelection()
 aDescription = ";" + aDescription;
 }
 while (bEntry);
-OUString sDesc( aDescription );
-m_lastSelection[ m_sLanguage ] = sDesc;
+m_lastSelection[m_sLanguage] = aDescription;
 }
 
 void SvxScriptOrgDialog::RestorePreviousSelection()
commit 7f713779949a2d971da3f1c327429cdd3cbe2a95
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 19:46:33 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:47:42 2023 +0100

cid#1546485 COPY_INSTEAD_OF_MOVE

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

diff --git a/helpcompiler/source/HelpLinker.cxx 
b/helpcompiler/source/HelpLinker.cxx
index 898a8b26392a..f585a4d33d6a 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -826,8 +826,7 @@ static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER 
void *, xmlErrorPtr
 if( error->file != nullptr )
 aXMLParsingFile = error->file;
 int nXMLParsingLine = error->line;
-HelpProcessingException* pException = new HelpProcessingException( 
aErrorMsg, aXMLParsingFile, nXMLParsingLine );
-GpXMLParsingException = pException;
+GpXMLParsingException = new HelpProcessingException( aErrorMsg, 
aXMLParsingFile, nXMLParsingLine );
 
 // Reset error handler
 xmlSetStructuredErrorFunc( nullptr, nullptr );

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

 xmloff/source/forms/layerexport.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 325ec1c1060ba29b24eb1acbc5451bc972b484fc
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 19:48:34 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:48:19 2023 +0100

cid#1546476 COPY_INSTEAD_OF_MOVE

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

diff --git a/xmloff/source/forms/layerexport.cxx 
b/xmloff/source/forms/layerexport.cxx
index a75bceada634..dac9297679ae 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -561,10 +561,8 @@ namespace xmloff
 
 // generate a new control id
 
-// find a free id
-OUString sCurrentId = lcl_findFreeControlId( m_aControlIds );
-// add it to the map
-m_aCurrentPageIds->second[ xColumnProperties ] = sCurrentId;
+// find a free id and add it to the map
+m_aCurrentPageIds->second[xColumnProperties] = 
lcl_findFreeControlId(m_aControlIds);
 
 // determine a number style, if needed
 xColumnPropertiesMeta = 
xColumnProperties->getPropertySetInfo();

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

 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9ddca3616fc8b91973b9f261fd53797f9c84570f
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 19:50:30 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:48:36 2023 +0100

cid#1546455 COPY_INSTEAD_OF_MOVE

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

diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx 
b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index f4291f4a5043..9930f80d6e3c 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -380,9 +380,8 @@ bool 
ResultSetDataSupplier::queryNamesOfChildren(std::unique_lock& /
 OUString
 ResultSetDataSupplier::assembleChildURL( std::u16string_view aName )
 {
-OUString aContURL
+OUString aURL
 = m_xContent->getIdentifier()->getContentIdentifier();
-OUString aURL( aContURL );
 
 sal_Int32 nUrlEnd = aURL.lastIndexOf( '/' );
 if ( nUrlEnd != aURL.getLength() - 1 )

[Libreoffice-commits] core.git: 2 commits - chart2/source cui/source dbaccess/source editeng/source framework/source i18npool/source include/svx include/vcl scripting/source starmath/inc sw/source ucb

 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx |3 
+--
 chart2/source/tools/InternalData.cxx|4 
+---
 cui/source/dialogs/scriptdlg.cxx|3 
+--
 dbaccess/source/ui/querydesign/QueryTableView.cxx   |6 
+-
 editeng/source/uno/unonrule.cxx |3 
+--
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx   |3 
+--
 framework/source/uiconfiguration/uiconfigurationmanager.cxx |4 
++--
 i18npool/source/localedata/localedata.cxx   |3 
+--
 include/svx/svdograf.hxx|2 
+-
 include/vcl/uitest/logger.hxx   |2 
+-
 scripting/source/stringresource/stringresource.cxx  |3 
+--
 starmath/inc/mathml/element.hxx |2 
+-
 sw/source/core/unocore/unocrsrhelper.cxx|7 
+++
 sw/source/uibase/shells/textsh2.cxx |3 
+--
 ucb/source/ucp/file/filtask.cxx |7 
++-
 xmloff/source/text/XMLFootnoteImportContext.cxx |3 
+--
 16 files changed, 20 insertions(+), 38 deletions(-)

New commits:
commit 90403600aaa997aaee3a9f1004786502f426ec5d
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 21:00:01 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:49:13 2023 +0100

cid#1545566 COPY_INSTEAD_OF_MOVE

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

diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 80f4785d773e..930f952d0019 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -2205,12 +2205,9 @@ TaskManager::load( const ContentMap::iterator& it, bool 
create )
 uno::Reference< ucb::XPersistentPropertySet > xS = 
m_xFileRegistry->openPropertySet( it->first,create );
 if( xS.is() )
 {
-uno::Reference< beans::XPropertyContainer > xC( xS,uno::UNO_QUERY );
-uno::Reference< beans::XPropertyAccess >xA( xS,uno::UNO_QUERY );
-
 it->second.xS = xS;
-it->second.xC = xC;
-it->second.xA = xA;
+it->second.xC.set(xS, uno::UNO_QUERY);
+it->second.xA.set(xS, uno::UNO_QUERY);
 
 // Now put in all values in the storage in the local hash;
 
commit d51640061809034006db6d7ba1205c1f1f8b5fad
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 20:02:30 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:48:59 2023 +0100

cid#1546422 COPY_INSTEAD_OF_MOVE

and

cid#1546416 COPY_INSTEAD_OF_MOVE
cid#1546415 COPY_INSTEAD_OF_MOVE
cid#1546391 COPY_INSTEAD_OF_MOVE
cid#1546390 COPY_INSTEAD_OF_MOVE
cid#1546317 COPY_INSTEAD_OF_MOVE
cid#1546252 COPY_INSTEAD_OF_MOVE
cid#1546251 COPY_INSTEAD_OF_MOVE
cid#1546249 COPY_INSTEAD_OF_MOVE
cid#1546243 COPY_INSTEAD_OF_MOVE
cid#1546195 COPY_INSTEAD_OF_MOVE
cid#1546193 COPY_INSTEAD_OF_MOVE
cid#1546137 COPY_INSTEAD_OF_MOVE
cid#1545738 COPY_INSTEAD_OF_MOVE
cid#1545782 COPY_INSTEAD_OF_MOVE

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

diff --git 
a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx 
b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index a50ac7527c76..e3ace3e9d4e2 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -160,8 +160,7 @@ void lcl_ConvertRangeToXML(
 lcl_getDataProviderFromContact( spChart2ModelContact ), 
uno::UNO_QUERY );
 if( xConverter.is())
 {
-OUString aResult = xConverter->convertRangeToXML( rInOutRange );
-rInOutRange = aResult;
+rInOutRange = xConverter->convertRangeToXML( rInOutRange );
 }
 }
 }
diff --git a/chart2/source/tools/InternalData.cxx 
b/chart2/source/tools/InternalData.cxx
index 38eb848815db..d6321d317914 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -261,9 +261,7 @@ void InternalData::swapRowWithNext( sal_Int32 nRowIndex )
 std::swap(m_aData[nIndex1], m_aData[nIndex2]);
 }
 
-std::vector< uno::Any > aTemp( m_aRowLabels[nRowIndex] );
-m_aRowLabels[nRowIndex] = m_aRowLabels[nRowIndex + 1];
-m_aRowLabels[nRowIndex + 1] = aTemp;
+std::swap(m_aRowLabels[nRowIndex], m_aRowLabels[nRowIndex + 1]);
 }
 
 void Int

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

 vcl/source/window/window.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1f31cfc305224d3494da1b4eeadbe56b7227bb38
Author: Caolán McNamara 
AuthorDate: Sun Dec 3 21:01:20 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 10:49:22 2023 +0100

cid#1545582 COPY_INSTEAD_OF_MOVE

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index be029ca9572f..c3fa7fb3d74a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3112,8 +3112,7 @@ const OUString& Window::GetHelpText() const
 static const char* pEnv = getenv( "HELP_DEBUG" );
 if( pEnv && *pEnv )
 {
-OUString aTxt = mpWindowImpl->maHelpText + 
"\n--\n" + aStrHelpId;
-mpWindowImpl->maHelpText = aTxt;
+mpWindowImpl->maHelpText = mpWindowImpl->maHelpText + 
"\n--\n" + aStrHelpId;
 }
 mpWindowImpl->mbHelpTextDynamic = false;
 }

Re: (new) non-ASCII filenames break unit tests on Linux

2023-12-04 Thread Michael Stahl

On 03/12/2023 12:59, Stephan Bergmann wrote:

On 12/2/23 16:38, Mike Kaganski wrote:

On 02.12.2023 17:46, Rene Engelhard wrote:
In any case this is bad. My filesystem (I think from 2020 or so)
apparently shows it (ls -l does) but I wouldn't be sure for other,
old ones (like Debians build machines). The locale this fails under
definitely is UTF-8 though.

Pre
"Make testHybridPDFFile Windows-only, and filenames in repo ASCII-only", I can reproduce the failure on Linux when not using an UTF-8 locale but explicitly specifying an e.g. ASCII locale (and thus an osl_getThreadTextEncoding value of RTL_TEXTENCODING_ASCII_US) with `LC_CTYPE=C make -O CppunitTest_filter_textfilterdetect CPPUNIT_TEST_NAME=testHybridPDFFile::TestBody`.

But if someone has an idea why LibreOffice fails handling files that
exist on system, with names representable in system encoding, it would
be nice.

For better or worse, the payload of LO "internal" file URLs is always
considered to be a UTF-8 encoding of the actual system pathname. It is
*not* a byte-for-byte representation of the bytes that make up the Unix
system pathname.

What thus happens here is that the file UCP's TaskManager::getv ->
osl::DirectoryItem::get -> osl_getDirectoryItem ->
osl::detail::convertUrlToPathname -> getSystemPathFromFileUrl ->
decodeFromUtf8 -> convert -> UnicodeToTextConverter_Impl::convert ->
rtl_convertUnicodeToText tries to translate the Unicode chars of
"hybrid_writer_абв_αβγ.pdf" to osl_getThreadTextEncoding() ==
RTL_TEXTENCODING_ASCII_US, but which doesn't work because ASCII has no
representation of the Cyrillic and Greek letters.

in the "C" locale, every 8-bit value is valid, but only ASCII (<128)
values are meaningful; the intent is that the application does not
interpret file-names, but uses them as-is, and replacing characters with
'?' (as apparently happens here) looks wrong to me.

probably there isn't yet a RTL_TEXTENCODING_C that behaves like this.

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

 sc/qa/unit/data/xls/tdf158483.xls   |  624 
 sc/qa/unit/subsequent_filters_test4.cxx |1 
 2 files changed, 625 insertions(+)

New commits:
commit f1f75b1f80e7ba45ccf970985fb9c82e1a6add82
Author: Xisco Fauli 
AuthorDate: Mon Dec 4 11:20:03 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 4 12:18:29 2023 +0100

tdf#158483: sc_subsequent_filters_test4: Add unittest

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

diff --git a/sc/qa/unit/data/xls/tdf158483.xls 
b/sc/qa/unit/data/xls/tdf158483.xls
new file mode 100644
index ..42f319d704bd
--- /dev/null
+++ b/sc/qa/unit/data/xls/tdf158483.xls
@@ -0,0 +1,624 @@
+
+
+
+Id
+
+
+9000
+36470
+False
+False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.w3.org/TR/REC-html40";
+ss:Type="String">
+
+
+
+Id
+
+
+
+
+
+
+
+
+C�digo
+
+
+
+Descri��o
+
+
+
+Pre�o
+
+
+
+Stock Custo - Pre�o
+m�dio
+
+
+
+Ativo
+
+
+
+
+
+101110001
+
+
+Alimentacao
+Extra
+
+
+
+
+
+0
+
+
+true
+
+
+
+
+101110003
+
+
+Buffet
+Especial
+
+
+
+
+
+0
+
+
+true
+
+
+
+
+101210009
+
+
+Garoto Cafe C/
+Leite
+
+
+(1: 100.00) (2:
+100.00)
+
+
+0
+
+
+true
+
+
+
+
+101210003
+
+
+Cafe
+Expresso
+
+
+(1: 100.00) (2:
+100.00) (4: 150.00) (5: 100.00)
+
+
+0
+
+
+true
+
+
+
+
+101211001
+
+
+Cha
+
+
+(1: 100.00) (2:
+100.00) (4: 200.00) (5: 120.00)
+
+
+0
+
+
+true
+
+
+
+
+101210007
+
+
+
+Descafeinado
+
+
+(1: 100.00) (2:
+100.00) (4: 250.00) (5: 100.00)
+
+

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

2023-12-04 Thread Samuel Mehrbrodt (via logerrit)

 cui/source/options/optaboutconfig.cxx |  140 --
 1 file changed, 83 insertions(+), 57 deletions(-)

New commits:
commit 7976f67600670f789f36232e390f838cf3e00830
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 4 10:54:28 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 4 12:29:58 2023 +0100

Expert config: Allow editing settings without default value

Fix fallout from 700ac29771ccec2d66934f66b45a33a48a5ac3f1

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

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 885ea189a8c5..a3ccf7fe0206 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -400,7 +400,7 @@ void CuiAboutConfigTabPage::FillItems(const 
Reference& xNameAccess,
 OUStringBuffer sValue;
 
 // Fall back to dynamic type when this is empty
-if (aType == cppu::UnoType::get())
+if (aType == cppu::UnoType::get() && sDynamicType != "void")
 {
 if (sDynamicType == "boolean")
 aType = cppu::UnoType::get();
@@ -436,151 +436,177 @@ void CuiAboutConfigTabPage::FillItems(const 
Reference& xNameAccess,
 sValue = it->sValue;
 else
 {
-if (aNode.getValueType().getTypeClass() == 
css::uno::TypeClass_VOID)
+bool bHasValue = sDynamicType != "void";
+if (aType == cppu::UnoType::get())
 {
-// Skip, no value set
-}
-else if (aType == cppu::UnoType::get())
-{
-sValue = OUString::boolean(aNode.get());
+if (bHasValue)
+sValue = OUString::boolean(aNode.get());
 sType = "boolean";
 }
 else if (aType == cppu::UnoType::get())
 {
-sValue = OUString::number(aNode.get());
+if (bHasValue)
+sValue = OUString::number(aNode.get());
 sType = "short";
 }
 else if (aType == cppu::UnoType::get())
 {
-sValue = OUString::number(aNode.get());
+if (bHasValue)
+sValue = OUString::number(aNode.get());
 sType = "int";
 }
 else if (aType == cppu::UnoType::get())
 {
-sValue = OUString::number(aNode.get());
+if (bHasValue)
+sValue = OUString::number(aNode.get());
 sType = "long";
 }
 else if (aType == cppu::UnoType::get())
 {
-sValue = OUString::number(aNode.get());
+if (bHasValue)
+sValue = OUString::number(aNode.get());
 sType = "double";
 }
 else if (aType == cppu::UnoType::get())
 {
-sValue = aNode.get();
+if (bHasValue)
+sValue = aNode.get();
 sType = "string";
 }
 else if (aType == 
cppu::UnoType>::get())
 {
-const uno::Sequence seq = 
aNode.get>();
-for (sal_Int8 j : seq)
+if (bHasValue)
 {
-OUString s = 
OUString::number(static_cast(j), 16);
-if (s.getLength() == 1)
+const uno::Sequence seq = 
aNode.get>();
+for (sal_Int8 j : seq)
 {
-sValue.append("0");
+OUString s = 
OUString::number(static_cast(j), 16);
+if (s.getLength() == 1)
+{
+sValue.append("0");
+}
+sValue.append(s.toAsciiUpperCase());
 }
-sValue.append(s.toAsciiUpperCase());
 }
 sType = "hexBinary";
 }
 else if (aType == 
cppu::UnoType>::get())
 {
-uno::Sequence seq = 
aNode.get>();
-for (sal_Int32 j = 0; j != seq.getLength(); ++j)
+if (bHasValue)
 {
-if (j != 0)
+uno::Sequence seq = 
aNode.get>();
+for (sal_Int32 j = 0; j != seq.getLength(); ++j)
 {
-

Re: (new) non-ASCII filenames break unit tests on Linux

2023-12-04 Thread Stephan Bergmann


On 12/4/23 12:10, Michael Stahl wrote:

On 03/12/2023 12:59, Stephan Bergmann wrote:
For better or worse, the payload of LO "internal" file URLs is always 
considered to be a UTF-8 encoding of the actual system pathname.  It 
is *not* a byte-for-byte representation of the bytes that make up the 
Unix system pathname.


What thus happens here is that the file UCP's TaskManager::getv -> 
osl::DirectoryItem::get -> osl_getDirectoryItem -> 
osl::detail::convertUrlToPathname -> getSystemPathFromFileUrl -> 
decodeFromUtf8 -> convert -> UnicodeToTextConverter_Impl::convert -> 
rtl_convertUnicodeToText tries to translate the Unicode chars of 
"hybrid_writer_абв_αβγ.pdf" to osl_getThreadTextEncoding() == 
RTL_TEXTENCODING_ASCII_US, but which doesn't work because ASCII has no 
representation of the Cyrillic and Greek letters.


in the "C" locale, every 8-bit value is valid, but only ASCII (<128) 
values are meaningful; the intent is that the application does not 
interpret file-names, but uses them as-is, and replacing characters with 
'?' (as apparently happens here) looks wrong to me.


probably there isn't yet a RTL_TEXTENCODING_C that behaves like this.


That's not the issue here (the issue is that "ASCII has no 
representation of the Cyrillic and Greek letters"), and the existing 
RTL_TEXTENCODING_UTF8 would do what you seek on that conversion step 
from a Unicode file URL payload to a byte sequence pathname.

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

 sw/qa/uitest/writer_tests/tdf156165.py |   70 +++--
 1 file changed, 33 insertions(+), 37 deletions(-)

New commits:
commit c14dd7d8ddbdb348aaefce575976c1e52b9967f8
Author: Xisco Fauli 
AuthorDate: Mon Dec 4 12:03:56 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 4 13:06:16 2023 +0100

uitest: sw: refactor test to reset config change at the end

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

diff --git a/sw/qa/uitest/writer_tests/tdf156165.py 
b/sw/qa/uitest/writer_tests/tdf156165.py
index de90eebdd54b..02353a533d47 100644
--- a/sw/qa/uitest/writer_tests/tdf156165.py
+++ b/sw/qa/uitest/writer_tests/tdf156165.py
@@ -15,22 +15,23 @@ from time import sleep
 
 class tdf156165(UITestCase):
 
-   def test_tdf156165(self):
+def change_autocorrect_option(self, enabled):
+with 
self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg") as xDialog:
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "2")
+xList = xDialog.getChild('list')
+xCheckbox = xList.getChild("17")
+self.assertEqual("Replace Custom Styles", 
get_state_as_dict(xCheckbox)["Text"])
+
+xCheckbox.executeAction("CLICK", tuple())
+self.assertEqual(enabled, 
get_state_as_dict(xCheckbox)["IsChecked"])
+
+def test_tdf156165(self):
 with self.ui_test.load_file(get_url_for_data_file("tdf156165.odt")):
 xMainWindow = self.xUITest.getTopFocusWindow()
 writer_edit = xMainWindow.getChild("writer_edit")
 style=xMainWindow.getChild('applystyle')
 
-with 
self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg") as xDialog:
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "2")
-options=xDialog.getChild('list')
-checkbox=options.getChild("17")
-self.assertEqual("Replace Custom Styles", 
get_state_as_dict(checkbox)["Text"])
-
-# Replace Custom Styles is default to be false
-self.assertEqual("false", 
get_state_as_dict(checkbox)["IsChecked"])
-
 # Replace Custom Styles when applying manually with it disabled, 
should not change style
 writer_edit.executeAction("SELECT", mkPropertyValues({"END_POS": 
"0", "START_POS": "12"}))
 self.xUITest.executeCommand(".uno:AutoFormatApply")
@@ -47,34 +48,29 @@ class tdf156165(UITestCase):
 writer_edit.executeAction("SELECT", mkPropertyValues({"END_POS": 
"0", "START_POS": "12"}))
 self.assertEqual(get_state_as_dict(style)["Text"], "eSelah") # 
original line
 
-with 
self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg") as xDialog:
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "2")
-options=xDialog.getChild('list')
-checkbox=options.getChild("17")
-self.assertEqual("Replace Custom Styles", 
get_state_as_dict(checkbox)["Text"])
-
-# set Replace Custom Styles to True
-checkbox.executeAction("CLICK", tuple())
-self.assertEqual("true", 
get_state_as_dict(checkbox)["IsChecked"])
+try:
+self.change_autocorrect_option("true")
 
-# Replace Custom Styles when applying manually with it enabled, 
should change style
-writer_edit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"DOWN"}))
-writer_edit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"DOWN"}))
-writer_edit.executeAction("SELECT", mkPropertyValues({"END_POS": 
"0", "START_POS": "12"}))
-self.xUITest.executeCommand(".uno:AutoFormatApply")
-sleep(1)
-self.assertEqual(get_state_as_dict(style)["Text"], "Body Text")
+# Replace Custom Styles when applying manually with it 
enabled, should change style
+writer_edit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"DOWN"}))
+writer_edit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"DOWN"}))
+writer_edit.executeAction("SELECT", 
mkPropertyValues({"END_POS": "0", "START_POS": "12"}))
+self.xUITest.executeCommand(".uno:AutoFormatApply")
+sleep(1)
+self.assertEqual(get_state_as_dict(style)["Text"], "Body Text")
 
-# Replace Custom Styles when typing with it enabled, should not 
change style
-writer_edit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"DOWN"}))
-writer_edit.executeAction("SELECT", mkPropertyValues({"END_POS": 
"12", "START_POS": "12"}))
-writer_edit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"RETURN"}))
-sleep(1)
-

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/CppunitTest_sw_core_layout.mk sw/qa sw/source

2023-12-04 Thread Miklos Vajna (via logerrit)

 sw/CppunitTest_sw_core_layout.mk   
 |1 
 
sw/qa/core/layout/data/floattable-model-position-for-view-point-correction.docx 
|binary
 sw/qa/core/layout/trvlfrm.cxx  
 |   56 ++
 sw/source/core/layout/trvlfrm.cxx  
 |   25 
 4 files changed, 81 insertions(+), 1 deletion(-)

New commits:
commit 02db94e6a9d78fd56873bcca687e0b4b668bf828
Author: Miklos Vajna 
AuthorDate: Fri Dec 1 08:40:40 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 13:06:08 2023 +0100

sw floattable: fix finding the nearest text in split flys on mouse click

Clicking on the right of the floating table on the page 1 resulted
in a cursor position on page 2 instead of a position inside the floating
table on page 1.

What happens is that the anchor text frame on page 1 is wide enough to
contain the mouse click position, but then "before the first character
of the paragraph" is on page 2, so a page 1 click results in a page 2
cursor position, which is unexpected.

Fix the problem by first ignoring which dummy anchor frames (all
non-last ones) in SwLayoutFrame, so
SwLayoutFrame::GetModelPositionForViewPoint() in
SwPageFrame::GetModelPositionForViewPoint() fails for the perfect match
case, and then later looking for split flys explicitly, so the corrected
case finds the split fly on the page.

I imagine this is not only useful for mouse clicks, but it's also good
for everything else that uses GetModelPositionForViewPoint(), e.g.
keyboard page-down.

(cherry picked from commit f461853b11439c4e485a79174d34735395e5bf52)

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

diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index b77cf51e2799..5eb874400d53 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -23,6 +23,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,sw_core_layout, \
 sw/qa/core/layout/paintfrm \
 sw/qa/core/layout/sortedobjs \
 sw/qa/core/layout/tabfrm \
+sw/qa/core/layout/trvlfrm \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_core_layout, \
diff --git 
a/sw/qa/core/layout/data/floattable-model-position-for-view-point-correction.docx
 
b/sw/qa/core/layout/data/floattable-model-position-for-view-point-correction.docx
new file mode 100644
index ..1de36c6e0c1f
Binary files /dev/null and 
b/sw/qa/core/layout/data/floattable-model-position-for-view-point-correction.docx
 differ
diff --git a/sw/qa/core/layout/trvlfrm.cxx b/sw/qa/core/layout/trvlfrm.cxx
new file mode 100644
index ..dc8ba54f4feb
--- /dev/null
+++ b/sw/qa/core/layout/trvlfrm.cxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace
+{
+/// Covers sw/source/core/layout/trvlfrm.cxx fixes.
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/core/layout/data/")
+{
+}
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testSplitFlyModelPositionForViewPointCorrection)
+{
+// Given a 2 page floating table, 40% width, positioned on the left of the 
page:
+createSwDoc("floattable-model-position-for-view-point-correction.docx");
+
+// When clicking on the right side of the table:
+SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+SwDoc* pDoc = getSwDocShell()->GetDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+SwFrame* pPage = pLayout->GetLower();
+SwFrame* pBody = pPage->GetLower();
+const SwRect& rBodyRect = pBody->getFrameArea();
+// 1 line below the top center of the body frame.
+Point aDocPos(rBodyRect.Left() + rBodyRect.Width() / 2, rBodyRect.Top() + 
220);
+bool bOnlyText = false;
+pWrtShell->CallSetCursor(&aDocPos, bOnlyText);
+
+// Then make sure the cursor gets inside the table, and doesn't go to the 
anchor on page 2:
+SwCursor& rCursor = pWrtShell->GetCurrentShellCursor();
+SwTableNode* pTableNode = rCursor.GetPointNode().FindTableNode();
+// Without the accompanying fix in place, this test would have failed, the 
cursor was in the
+// anchor text node, not inside the split fly.
+CPPUNIT_ASSERT(pTableNode);
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/

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

 vcl/source/gdi/metaact.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8bf16dc47e518e3cd2a6611b1c768ae589ea206e
Author: Caolán McNamara 
AuthorDate: Mon Dec 4 10:58:35 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 13:10:23 2023 +0100

ofz#64680 Integer-overflow

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

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 1d5423cb6fed..2e1f3e4d8459 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1098,6 +1098,9 @@ MetaBmpExScalePartAction::MetaBmpExScalePartAction( const 
Point& rDstPt, const S
 
 void MetaBmpExScalePartAction::Execute( OutputDevice* pOut )
 {
+if (!AllowRect(pOut->LogicToPixel(tools::Rectangle(maDstPt, maDstSz
+return;
+
 pOut->DrawBitmapEx( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmpEx );
 }

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/source

 sw/source/ui/frmdlg/column.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e82062325cc00d2c2974d02d6759015bffdde03
Author: Julien Nabet 
AuthorDate: Thu Nov 30 17:46:08 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 4 13:20:28 2023 +0100

tdf#158450: fix crash when picking custom colour for column separator line

bt:
0x7ffeed9c4a2b in SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0::operator()() const 
(this=0x574a8e38) at 
/home/julien/lo/libreoffice/sw/source/ui/frmdlg/column.cxx:396
396 [this]{ return GetDialogController()->getDialog(); 
}))
0  0x7ffeed9c4a2b in SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0::operator()() const 
(this=0x574a8e38) at 
/home/julien/lo/libreoffice/sw/source/ui/frmdlg/column.cxx:396
1  0x7ffeed9c4a05 in std::__invoke_impl(std::__invoke_other, 
SwColumnPage::SwColumnPage(weld::Container*, weld::DialogController*, 
SfxItemSet const&)::$_0&) (__f=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/invoke.h:61
2  0x7ffeed9c4985 in std::__invoke_r(SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0&) (__fn=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/invoke.h:114
3  0x7ffeed9c489d in std::_Function_handler::_M_invoke(std::_Any_data const&) (__functor=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:290
4  0x71cb89e5 in std::function::operator()() 
const (this=0x574a8e38) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:591
5  0x71c94604 in ColorWindow::OpenPickerClickHdl(weld::Button&) 
(this=0x574a8db0) at 
/home/julien/lo/libreoffice/svx/source/tbxctrls/tbcontrl.cxx:2283
6  0x71c9356d in ColorWindow::LinkStubOpenPickerClickHdl(void*, 
weld::Button&) (instance=0x574a8db0, data=...) at 
/home/julien/lo/libreoffice/svx/source/tbxctrls/tbcontrl.cxx:2279

See complete bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=191146

Regression from:
862fd2fa19b64972247bde9b171ec828a30e1676
defer getting toplevel for color picker until we need it

Change-Id: I2932281cb3b1cb510013a19f6bcf3d9f9c6cdb7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160164
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4f8bb267489b14aa1dab360786d8f99c763f03b4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160224
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 028b9f1b209a..8caa69fade8c 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -393,7 +393,7 @@ SwColumnPage::SwColumnPage(weld::Container* pPage, 
weld::DialogController* pCont
 , m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft"))
 , m_xTextDirectionLB(new 
svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb")))
 , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"),
-[this]{ return GetDialogController()->getDialog(); }))
+[this]{ return GetFrameWeld(); }))
 , m_xLineTypeDLB(new 
SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
 , m_xEd1(new 
SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FieldUnit::CM)))
 , m_xEd2(new 
SwPercentField(m_xBuilder->weld_metric_spin_button("width2mf", FieldUnit::CM)))

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

2023-12-04 Thread Samuel Mehrbrodt (via logerrit)

 cui/source/options/optaboutconfig.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit a5418fbe09860f770e8aa2f478023c0843bb05d8
Author: Samuel Mehrbrodt 
AuthorDate: Thu Nov 30 16:53:01 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 4 14:40:41 2023 +0100

tdf#158457 Use proper parent

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

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index a3ccf7fe0206..b5d218ecadad 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -751,8 +751,8 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 sal_Int64 nMax = sPropertyType == "short"
  ? SAL_MAX_INT16
  : sPropertyType == "int" ? SAL_MAX_INT32 
: SAL_MAX_INT64;
-SvxNumberDialog aNumberDialog(m_pParent, sPropertyName, 
sDialogValue.toInt64(),
-  nMin, nMax);
+SvxNumberDialog aNumberDialog(m_xDialog.get(), sPropertyName,
+  sDialogValue.toInt64(), nMin, 
nMax);
 if (aNumberDialog.run() == RET_OK)
 {
 sal_Int64 nNewValue = aNumberDialog.GetNumber();
@@ -774,7 +774,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 }
 else if (sPropertyType == "double")
 {
-SvxDecimalNumberDialog aNumberDialog(m_pParent, sPropertyName,
+SvxDecimalNumberDialog aNumberDialog(m_xDialog.get(), 
sPropertyName,
  sDialogValue.toDouble());
 if (aNumberDialog.run() == RET_OK)
 {
@@ -786,7 +786,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 }
 else if (sPropertyType == "string")
 {
-SvxNameDialog aNameDialog(m_pParent, sDialogValue, 
sPropertyName);
+SvxNameDialog aNameDialog(m_xDialog.get(), sDialogValue, 
sPropertyName);
 aNameDialog.SetCheckNameHdl(LINK(this, CuiAboutConfigTabPage, 
ValidNameHdl));
 if (aNameDialog.run() == RET_OK)
 {
@@ -797,7 +797,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 }
 else if (sPropertyType == "short-list")
 {
-SvxListDialog aListDialog(m_pParent);
+SvxListDialog aListDialog(m_xDialog.get());
 aListDialog.SetEntries(commaStringToSequence(sDialogValue));
 aListDialog.SetMode(ListMode::Int16);
 if (aListDialog.run() == RET_OK)
@@ -814,7 +814,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 }
 else if (sPropertyType == "int-list")
 {
-SvxListDialog aListDialog(m_pParent);
+SvxListDialog aListDialog(m_xDialog.get());
 aListDialog.SetEntries(commaStringToSequence(sDialogValue));
 aListDialog.SetMode(ListMode::Int32);
 if (aListDialog.run() == RET_OK)
@@ -831,7 +831,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 }
 else if (sPropertyType == "long-list")
 {
-SvxListDialog aListDialog(m_pParent);
+SvxListDialog aListDialog(m_xDialog.get());
 aListDialog.SetEntries(commaStringToSequence(sDialogValue));
 aListDialog.SetMode(ListMode::Int64);
 if (aListDialog.run() == RET_OK)
@@ -848,7 +848,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 }
 else if (sPropertyType == "double-list")
 {
-SvxListDialog aListDialog(m_pParent);
+SvxListDialog aListDialog(m_xDialog.get());
 aListDialog.SetEntries(commaStringToSequence(sDialogValue));
 aListDialog.SetMode(ListMode::Double);
 if (aListDialog.run() == RET_OK)
@@ -865,7 +865,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 }
 else if (sPropertyType == "string-list")
 {
-SvxListDialog aListDialog(m_pParent);
+SvxListDialog aListDialog(m_xDialog.get());
 aListDialog.SetEntries(commaStringToSequence(sDialogValue));
 aListDialog.SetMode(ListMode::String);
 if (aListDialog.run() == RET_OK)

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

2023-12-04 Thread Andrea Gelmini (via logerrit)

 source/text/sbasic/shared/03/sf_database.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2517ad1832fb57f03f04741df091d5e885780057
Author: Andrea Gelmini 
AuthorDate: Mon Dec 4 13:08:59 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 14:54:30 2023 +0100

Fix typo

Change-Id: Iede79766f569d4384308a353c5f11062c96fd3ee
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160305
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/source/text/sbasic/shared/03/sf_database.xhp 
b/source/text/sbasic/shared/03/sf_database.xhp
index cc2ae5c00a..852fb6a0f4 100644
--- a/source/text/sbasic/shared/03/sf_database.xhp
+++ b/source/text/sbasic/shared/03/sf_database.xhp
@@ -347,7 +347,7 @@
   myDB.RunSql("UPDATE ...")
   myDB.Commit()
   myDB.RunSql("DELETE ...")
-  ' Test some 
condition before commiting
+  ' Test some 
condition before committing
   If 
bSomeCondition Then
  
 myDB.Commit()
   Else

[Libreoffice-commits] core.git: helpcontent2

2023-12-04 Thread Andrea Gelmini (via logerrit)

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

New commits:
commit 20831559b8ca8c0b171db2a74889c90a1414b7ab
Author: Andrea Gelmini 
AuthorDate: Mon Dec 4 14:54:31 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 4 14:54:31 2023 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2517ad1832fb57f03f04741df091d5e885780057
  - Fix typo

Change-Id: Iede79766f569d4384308a353c5f11062c96fd3ee
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160305
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/helpcontent2 b/helpcontent2
index 167b6b1ec40f..2517ad1832fb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 167b6b1ec40f44ab450a3c9a1fdaed8edac3742e
+Subproject commit 2517ad1832fb57f03f04741df091d5e885780057

[Libreoffice-commits] core.git: Branch 'distro/collabora/libreoffice-7-5+backports' - 14 commits - configure.ac desktop/source download.lst extensions/source external/libcmis include/curlinit.hxx ling

 configure.ac   
  |   20 
 desktop/source/app/updater.cxx 
  |4 
 desktop/source/minidump/minidump.cxx   
  |4 
 download.lst   
  |4 
 extensions/source/update/check/download.cxx
  |4 
 
external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch
 |   69 
 external/libcmis/UnpackedTarball_libcmis.mk
  |8 
 external/libcmis/libcmis-boost-string.patch
  |   11 
 external/libcmis/libcmis-libxml2_compatibility.patch   
  |   14 
 external/libcmis/libcmis_gdrive.patch.1
  |  702 -
 external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1  
  |  185 
 external/libcmis/libcmis_onedrive.patch
  |  445 -
 include/curlinit.hxx   
  |   59 
 lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx  
  |5 
 linguistic/source/translate.cxx
  |4 
 readlicense_oo/license/CREDITS.fodt
  | 4324 --
 solenv/bin/macosx-codesign-app-bundle  
  |6 
 svl/source/crypto/cryptosign.cxx   
  |6 
 sysui/desktop/macosx/sandbox_inherit.entitlements  
  |   10 
 ucb/source/ucp/cmis/auth_provider.hxx  
  |8 
 ucb/source/ucp/cmis/cmis_content.cxx   
  |5 
 ucb/source/ucp/ftp/ftploaderthread.cxx 
  |4 
 ucb/source/ucp/webdav-curl/CurlSession.cxx 
  |2 
 vcl/inc/osx/salframe.h 
  |3 
 vcl/osx/salframe.cxx   
  |9 
 vcl/osx/salframeview.mm
  |7 
 26 files changed, 2219 insertions(+), 3703 deletions(-)

New commits:
commit a55d094208916a82ba438cf5e1dd36e4ca7fa629
Author: Andras Timar 
AuthorDate: Mon Dec 4 14:55:02 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 14:55:02 2023 +0100

bump product version to 7.5.9.3

Change-Id: Idcf163d74fa4a72f48c60acb55abf61c40d8ff0c

diff --git a/configure.ac b/configure.ac
index 03c8d6c6aecf..123c56fc0852 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.5.9.2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.9.3],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit db9caa15f8a3aab24a8d0abc67ae6aaeb4d354fb
Author: Xisco Fauli 
AuthorDate: Tue Nov 28 13:22:09 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 14:53:44 2023 +0100

bump product version to 7.5.9.2

Change-Id: I39a0bacf61267b843216dabe559fa6b93385588f

diff --git a/configure.ac b/configure.ac
index c9b2c9ee72c9..03c8d6c6aecf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.5.9.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.9.2],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 042e7040c1fe3be2f5f802f851ab848a3460487c
Author: Xisco Fauli 
AuthorDate: Tue Nov 28 12:56:36 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 14:53:44 2023 +0100

update credits

Change-Id: I086375044292658c7bfb7b7d4a99d4d1e1313ac3
(cherry picked from commit 7b96db51608e237155a37c7b5d31ef408a19019b)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index da64bd3a45fe..046a641c4764 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/TR/css3-text/";

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

 sw/UITest_writer_tests8.mk|2 
 sw/qa/uitest/writer_tests8/tdf156243.py   |   53 +-
 sw/qa/uitest/writer_tests8_data/registrymodifications.xcu |   12 ---
 3 files changed, 36 insertions(+), 31 deletions(-)

New commits:
commit 14fd379f54c0a325d33e1c33c699de4d0f3ffe7f
Author: Xisco Fauli 
AuthorDate: Mon Dec 4 11:52:23 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 4 15:03:03 2023 +0100

UITest_writer_tests8: do not use custom configuration

Added with b6e273aaaf597b60f78c1dd3db8676eea958a9f5
"tdf#156243 Fix off-by-one bug for autocorrect"

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

diff --git a/sw/UITest_writer_tests8.mk b/sw/UITest_writer_tests8.mk
index a33fdedbe255..c951163c2128 100644
--- a/sw/UITest_writer_tests8.mk
+++ b/sw/UITest_writer_tests8.mk
@@ -15,6 +15,4 @@ $(eval $(call gb_UITest_set_defs,writer_tests8, \
 TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
 
-$(eval $(call 
gb_UITest_use_configuration,writer_tests8,$(SRCDIR)/sw/qa/uitest/writer_tests8_data/registrymodifications.xcu))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/uitest/writer_tests8/tdf156243.py 
b/sw/qa/uitest/writer_tests8/tdf156243.py
index fc4eecffdb7c..461c9b508b86 100644
--- a/sw/qa/uitest/writer_tests8/tdf156243.py
+++ b/sw/qa/uitest/writer_tests8/tdf156243.py
@@ -15,25 +15,44 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 
 class tdf156243(UITestCase):
 
-   def test_tdf156243_Autocorrect_dialog(self):
+def change_autocorrect_option(self, enabled):
+with 
self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg") as xDialog:
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "2")
+xList = xDialog.getChild('list')
+xCheckbox = xList.getChild("3")
+self.assertEqual("Automatic *bold*, /italic/, -strikeout- and 
_underline_", get_state_as_dict(xCheckbox)["Text"])
+
+xCheckbox.executeAction("CLICK", tuple())
+self.assertEqual(enabled, 
get_state_as_dict(xCheckbox)["IsChecked"])
+
+def test_tdf156243_Autocorrect_dialog(self):
 with self.ui_test.create_doc_in_start_center("writer") as document:
 xWriterDoc = self.xUITest.getTopFocusWindow()
 xWriterEdit = xWriterDoc.getChild("writer_edit")
-type_text(xWriterEdit, "*ab*")
-with 
self.ui_test.execute_dialog_through_command(".uno:AutoFormatRedlineApply", 
close_button="close") as xAutoFmt:
-xAcceptAll = xAutoFmt.getChild("acceptall")
-xAcceptAll.executeAction("CLICK", tuple())
-xWriterEdit.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"SHIFT+LEFT"}))
-with 
self.ui_test.execute_dialog_through_command(".uno:FontDialog", 
close_button="cancel") as xDialog:
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "0")
-xweststylelbcjk = xDialog.getChild("cbWestStyle")
-self.assertEqual(get_state_as_dict(xweststylelbcjk)["Text"], 
"Bold")
-self.xUITest.executeCommand(".uno:GoLeft")
-with 
self.ui_test.execute_dialog_through_command(".uno:FontDialog", 
close_button="cancel") as xDialog:
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "0")
-xweststylelbcjk = xDialog.getChild("cbWestStyle")
-self.assertEqual(get_state_as_dict(xweststylelbcjk)["Text"], 
"Bold")
+try:
+self.change_autocorrect_option("true")
+
+type_text(xWriterEdit, "*ab*")
+
+with 
self.ui_test.execute_dialog_through_command(".uno:AutoFormatRedlineApply", 
close_button="close") as xAutoFmt:
+xAcceptAll = xAutoFmt.getChild("acceptall")
+xAcceptAll.executeAction("CLICK", tuple())
+xWriterEdit.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"SHIFT+LEFT"}))
+with 
self.ui_test.execute_dialog_through_command(".uno:FontDialog", 
close_button="cancel") as xDialog:
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+xweststylelbcjk = xDialog.getChild("cbWestStyle")
+
self.assertEqual(get_state_as_dict(xweststylelbcjk)["Text"], "Bold")
+self.xUITest.executeCommand(".uno:GoLeft")
+with 
self.ui_test.execute_dialog_through_command(".uno:FontDialog", 
close_button="cancel") as xDialog:
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+xweststylelbcjk = xDialog.getChild("cbWestStyle")
+
self.assertEqual(get_state_as_dict(xweststylelbcjk)["Text"], "Bold")

[Libreoffice-commits] translations.git: Branch 'distro/collabora/libreoffice-7-5+backports' - 2 commits - source/ab source/af source/an source/ast source/bg source/ca source/cs source/cy source/de sou

 source/ab/officecfg/registry/data/org/openoffice/Office.po|   12 
 source/ab/scp2/source/ooo.po  |   56 
 source/ab/sw/messages.po  |8 
 source/af/cui/messages.po |6 
 source/af/sc/messages.po  |   42 
 source/af/sw/messages.po  |   10 
 source/an/cui/messages.po |9 
 source/an/svx/messages.po |7 
 source/ast/accessibility/messages.po  |8 
 source/ast/avmedia/messages.po|8 
 source/ast/basctl/messages.po |   26 
 source/ast/basic/messages.po  |   12 
 source/ast/chart2/messages.po |   34 
 source/ast/connectivity/messages.po   |   32 
 source/ast/cui/messages.po|   15 
 source/ast/dbaccess/messages.po   |   14 
 source/ast/desktop/messages.po|6 
 source/ast/dictionaries/be_BY.po  |   12 
 source/ast/dictionaries/ckb.po|   12 
 source/ast/dictionaries/eo.po |   12 
 source/ast/dictionaries/es.po |   12 
 source/ast/dictionaries/fa_IR.po  |   12 
 source/ast/dictionaries/ko_KR.po  |   12 
 source/ast/dictionaries/mn_MN.po  |   12 
 source/ast/dictionaries/pt_BR.po  |   12 
 source/ast/dictionaries/pt_PT.po  |   12 
 source/ast/dictionaries/sq_AL.po  |8 
 source/ast/editeng/messages.po|6 
 source/ast/extensions/messages.po |8 
 source/ast/extras/source/autocorr/emoji.po|   11 
 source/ast/filter/messages.po |   20 
 source/ast/forms/messages.po  |6 
 source/ast/formula/messages.po|6 
 source/ast/fpicker/messages.po|8 
 source/ast/framework/messages.po  |6 
 source/ast/helpcontent2/source/text/sbasic/guide.po   |   12 
 source/ast/helpcontent2/source/text/sbasic/python.po  |6 
 source/ast/helpcontent2/source/text/sdatabase.po  |   26 
 source/ast/helpcontent2/source/text/shared/00.po  |6 
 source/ast/helpcontent2/source/text/shared/01.po  |   20 
 source/ast/helpcontent2/source/text/simpress.po   |6 
 source/ast/helpcontent2/source/text/simpress/01.po|8 
 source/ast/helpcontent2/source/text/smath/01.po   |  128 
 source/ast/helpcontent2/source/text/swriter/00.po |   22 
 source/ast/officecfg/registry/data/org/openoffice/Office.po   |   10 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po|   16 
 source/ast/oox/messages.po|8 
 source/ast/readlicense_oo/docs.po |   10 
 source/ast/reportdesign/messages.po   |9 
 source/ast/sc/messages.po |8 
 source/ast/scaddins/messages.po   |6 
 source/ast/sccomp/messages.po |   13 
 source/ast/sd/messages.po |9 
 source/ast/sfx2/classification.po |   12 
 source/ast/sfx2/messages.po   |6 
 source/ast/shell/messages.po  |8 
 source/ast/starmath/messages.po   |6 
 source/ast/svl/messages.po|   16 
 source/ast/svtools/messages.po|6 
 source/ast/svx/messages.po|9 
 source/ast/sw/messages.po |   11 
 source/ast/uui/messages.po|   20 
 source/ast/vcl/messages.po|6 
 source/ast/wizards/me

[Libreoffice-commits] core.git: Branch 'distro/collabora/libreoffice-7-5+backports' - translations

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

New commits:
commit 28180db1d5458441f688df10c0b9222d758e0d09
Author: Xisco Fauli 
AuthorDate: Mon Dec 4 15:03:45 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 4 15:03:45 2023 +0100

Update git submodules

* Update translations from branch 
'distro/collabora/libreoffice-7-5+backports'
  to 26b425218b8f4b5abd82a0add390ff8a03d0809d
  - update translations for 7.5.9 rc2

and force-fix errors using pocheck

Change-Id: I9622005d8a214b76e67862be7849d026f8a436d5
(cherry picked from commit e444a31e55cdebc80d0cc95b7f794be88ed72816)

  - update translations for 7.5.9 rc1

and force-fix errors using pocheck

Change-Id: Ibc4bab7ce4b458e8f96300cbb30e96dd568bcfda

diff --git a/translations b/translations
index a3650b30381b..26b425218b8f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a3650b30381bcd81e413f70ae117721ac5f0cae8
+Subproject commit 26b425218b8f4b5abd82a0add390ff8a03d0809d

[Libreoffice-commits] core.git: include/rtl

2023-12-04 Thread Stephan Bergmann (via logerrit)

 include/rtl/strbuf.hxx  |2 +-
 include/rtl/string.hxx  |2 +-
 include/rtl/stringutils.hxx |2 +-
 include/rtl/ustrbuf.hxx |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 312efd56ea810063848841df951aa13aa5859bbb
Author: Stephan Bergmann 
AuthorDate: Mon Dec 4 13:35:38 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 4 15:16:23 2023 +0100

At least VS 2022 Preview 17.9.0 Preview 1.1 needs the fix too

...from 3c6de7e20e35e37cbddd2d35e065525616deac00 "Fix build against VS 2022
17.7.5"

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

diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 56f3e2abcc38..5fa769241444 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -122,7 +122,7 @@ public:
 explicit OStringBuffer(bool) = delete;
 explicit OStringBuffer(char) = delete;
 explicit OStringBuffer(wchar_t) = delete;
-#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
+#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1939 && defined 
_MANAGED)
 explicit OStringBuffer(char8_t) = delete;
 #endif
 explicit OStringBuffer(char16_t) = delete;
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 55b83d675d8d..ce683beb5e60 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -102,7 +102,7 @@ public:
 std::copy_n(literal, N, more.buffer);
 }
 
-#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
+#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1939 && defined 
_MANAGED)
 #if HAVE_CPP_CONSTEVAL
 consteval
 #else
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 3cd66ee6c146..622542c7dab8 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -247,7 +247,7 @@ struct ConstCharArrayDetector< const char[ 1 ], T >
 #endif
 
 #if defined LIBO_INTERNAL_ONLY \
-&& !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
+&& !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1939 && defined 
_MANAGED)
 template
 struct ConstCharArrayDetector {
 using Type = T;
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index f41e34aa9d5d..30aa1959a67d 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -124,7 +124,7 @@ public:
 explicit OUStringBuffer(bool) = delete;
 explicit OUStringBuffer(char) = delete;
 explicit OUStringBuffer(wchar_t) = delete;
-#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
+#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1939 && defined 
_MANAGED)
 explicit OUStringBuffer(char8_t) = delete;
 #endif
 explicit OUStringBuffer(char16_t) = delete;

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

2023-12-04 Thread Olivier Hallot (via logerrit)

 source/text/scalc/main0105.xhp |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 645689dde4f47e1c9a765867d30b6ff2862b32dd
Author: Olivier Hallot 
AuthorDate: Sun Dec 3 12:45:25 2023 -0300
Commit: Olivier Hallot 
CommitDate: Mon Dec 4 15:20:03 2023 +0100

tdf#155876 UI cmds Calc-Format menu (25)

+ End of format menu for Calc
+ refactoring

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

diff --git a/source/text/scalc/main0105.xhp b/source/text/scalc/main0105.xhp
index 25355bff21..4f81b002bb 100644
--- a/source/text/scalc/main0105.xhp
+++ b/source/text/scalc/main0105.xhp
@@ -49,23 +49,21 @@
 
 
 
-
-
+
+
+Chart - Export as Image
+Exports directly the 
chart as image. Select the image file type in the Save dialog.
 
-
+
+
 
+
+
 
 
-
 
 
-
-
-Control
-
 
-Form
-

[Libreoffice-commits] core.git: helpcontent2

2023-12-04 Thread Olivier Hallot (via logerrit)

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

New commits:
commit f19399c486e55ac630dc762edba626bbf2b6db3e
Author: Olivier Hallot 
AuthorDate: Mon Dec 4 11:20:04 2023 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Dec 4 15:20:04 2023 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 645689dde4f47e1c9a765867d30b6ff2862b32dd
  - tdf#155876 UI cmds Calc-Format menu (25)

+ End of format menu for Calc
+ refactoring

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

diff --git a/helpcontent2 b/helpcontent2
index 2517ad1832fb..645689dde4f4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2517ad1832fb57f03f04741df091d5e885780057
+Subproject commit 645689dde4f47e1c9a765867d30b6ff2862b32dd

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

2023-12-04 Thread Stanislav Horacek (via logerrit)

 source/text/scalc/01/04060199.xhp |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit d20e738f1a2ace6618ad217ad42b17aac69e5762
Author: Stanislav Horacek 
AuthorDate: Sun Dec 3 12:25:54 2023 +0100
Commit: Olivier Hallot 
CommitDate: Mon Dec 4 15:21:58 2023 +0100

adjust operators priority part

remove note which is not directly related to "&" operator
fix link to ODF standard page
remove extra non-printing characters

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

diff --git a/source/text/scalc/01/04060199.xhp 
b/source/text/scalc/01/04060199.xhp
index eb5af00c9a..0fbf698e12 100644
--- a/source/text/scalc/01/04060199.xhp
+++ b/source/text/scalc/01/04060199.xhp
@@ -391,7 +391,7 @@

 &

-Binary operation string concatenation. Note that 
unary (prefix) + and - have a different precedence. Note that "&" shall be 
escaped when included in an XML document
+Binary operation string concatenation. Note that 
"&" shall be escaped when included in an XML document.



@@ -399,16 +399,15 @@

 =, <>, <, <=,>, >=

-Comparisonoperators equal to, not equal to, 
less than, less than or equal to, greater than, greater than or equal 
to
+Comparison operators equal to, not equal to, less 
than, less than or equal to, greater than, greater than or equal to.


 
-Prefix "-" has a higher precedence than 
"^", "^" is left-associative, and
-reference intersection has a higher precedence than reference union.
-Prefix "+" and "-" are defined to be 
right-associative. However, note that typical applications which implement at 
most the operators defined in this specification (as specified) may implement 
them as left-associative, because the calculated results will be 
identical.
+Prefix "-" has a higher precedence than "^", 
"^" is left-associative, and reference intersection has a higher precedence 
than reference union.
+Prefix "+" and "-" are defined to be 
right-associative. However, note that typical applications which implement at 
most the operators defined in this specification (as specified) may implement 
them as left-associative, because the calculated results will be 
identical.
 Precedence can be overridden by using 
parentheses, so "=2+3*4" computes to 14 but "=(2+3)*4" computes 20.
 
-OpenDocument
 v1.3 part4, Formula Operators
+https://docs.oasis-open.org/office/OpenDocument/v1.3/os/part4-formula/OpenDocument-v1.3-os-part4-formula.html#Operators";>OpenDocument
 v1.3 part 4, Formula Operators

[Libreoffice-commits] core.git: helpcontent2

2023-12-04 Thread Stanislav Horacek (via logerrit)

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

New commits:
commit d30870831f990287d8b371d947865ff575aa8f18
Author: Stanislav Horacek 
AuthorDate: Mon Dec 4 15:21:59 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 4 15:21:59 2023 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to d20e738f1a2ace6618ad217ad42b17aac69e5762
  - adjust operators priority part

remove note which is not directly related to "&" operator
fix link to ODF standard page
remove extra non-printing characters

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

diff --git a/helpcontent2 b/helpcontent2
index 645689dde4f4..d20e738f1a2a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 645689dde4f47e1c9a765867d30b6ff2862b32dd
+Subproject commit d20e738f1a2ace6618ad217ad42b17aac69e5762

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

 vcl/source/filter/png/PngImageReader.cxx |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit a5b6255ee4c4b4df8141235cd4ee392d86e7fb5c
Author: Caolán McNamara 
AuthorDate: Mon Dec 4 13:03:10 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 15:25:43 2023 +0100

ofz#64582 Out-of-memory

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

diff --git a/vcl/source/filter/png/PngImageReader.cxx 
b/vcl/source/filter/png/PngImageReader.cxx
index 860bd807a685..d29c0b90c473 100644
--- a/vcl/source/filter/png/PngImageReader.cxx
+++ b/vcl/source/filter/png/PngImageReader.cxx
@@ -209,7 +209,6 @@ void getImportantChunks(SvStream& rInStream, SvStream& 
rOutStream, sal_uInt32 nW
 sal_uInt32 nHeight)
 {
 sal_uInt64 nPos = rInStream.Tell();
-sal_uInt32 nChunkSize, nChunkType;
 rInStream.SetEndian(SvStreamEndian::BIG);
 rOutStream.SetEndian(SvStreamEndian::BIG);
 rOutStream.WriteUInt64(PNG_SIGNATURE);
@@ -232,6 +231,7 @@ void getImportantChunks(SvStream& rInStream, SvStream& 
rOutStream, sal_uInt32 nW
+ PNG_CRC_SIZE);
 while (rInStream.good())
 {
+sal_uInt32 nChunkSize(0), nChunkType(0);
 rInStream.ReadUInt32(nChunkSize);
 rInStream.ReadUInt32(nChunkType);
 bool bBreakOuter = false;
@@ -255,13 +255,20 @@ void getImportantChunks(SvStream& rInStream, SvStream& 
rOutStream, sal_uInt32 nW
 {
 // Seek back to start of chunk
 rInStream.SeekRel(-PNG_TYPE_SIZE - PNG_SIZE_SIZE);
+const size_t nDataSize = PNG_SIZE_SIZE + PNG_TYPE_SIZE
+ + static_cast(nChunkSize) + 
PNG_CRC_SIZE;
+if (nDataSize > rInStream.remainingSize())
+{
+SAL_WARN("vcl.filter", "png claims record of size: "
+   << nDataSize << ", but only "
+   << rInStream.remainingSize() << 
" available.");
+bBreakOuter = true;
+break;
+}
 // Copy chunk to rOutStream
-std::vector aData(nChunkSize + PNG_TYPE_SIZE + 
PNG_SIZE_SIZE
-   + PNG_CRC_SIZE);
-rInStream.ReadBytes(aData.data(),
-PNG_TYPE_SIZE + PNG_SIZE_SIZE + nChunkSize 
+ PNG_CRC_SIZE);
-rOutStream.WriteBytes(aData.data(),
-  PNG_TYPE_SIZE + PNG_SIZE_SIZE + 
nChunkSize + PNG_CRC_SIZE);
+std::vector aData(nDataSize);
+rInStream.ReadBytes(aData.data(), nDataSize);
+rOutStream.WriteBytes(aData.data(), nDataSize);
 break;
 }
 }

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

2023-12-04 Thread Sahil Gautam (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |1 
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |   12 +++
 sc/uiconfig/scalc/ui/tpviewpage.ui   |   25 +--
 4 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit a4d11d07fbace142cba82c30ecb09ff99b9bbb6f
Author: Sahil Gautam 
AuthorDate: Mon Nov 13 00:22:11 2023 +0530
Commit: Mike Kaganski 
CommitDate: Mon Dec 4 16:22:54 2023 +0100

tdf#33201 Checkbox Implementation for Col/row Highlight

Change-Id: I32aca7128a3f01be9fd5a7150243f8fd4e82f626
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159001
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Mike Kaganski 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index aa58fc81a9a7..e1fe88dfa1d9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -122,6 +122,7 @@
   false
 
 
+  
   
 Indicates whether the column/row highlight has been enabled 
or not.
 Column/row highlighting
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 65aed43031d8..72f3b7668732 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -37,6 +37,7 @@ class ScTpContentOptions : public SfxTabPage
 std::unique_ptr m_xAnnotCB;
 std::unique_ptr m_xFormulaMarkCB;
 std::unique_ptr m_xValueCB;
+std::unique_ptr m_xColRowHighCB;
 std::unique_ptr m_xAnchorCB;
 std::unique_ptr m_xRangeFindCB;
 
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index a31bc5d417fc..4b8595899f04 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -19,6 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
+#include 
 #include 
 #include 
 #include 
@@ -42,6 +43,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* 
pPage, weld::DialogContr
 , m_xAnnotCB(m_xBuilder->weld_check_button("annot"))
 , m_xFormulaMarkCB(m_xBuilder->weld_check_button("formulamark"))
 , m_xValueCB(m_xBuilder->weld_check_button("value"))
+, m_xColRowHighCB(m_xBuilder->weld_check_button("colrowhigh"))
 , m_xAnchorCB(m_xBuilder->weld_check_button("anchor"))
 , m_xRangeFindCB(m_xBuilder->weld_check_button("rangefind"))
 , m_xObjGrfLB(m_xBuilder->weld_combo_box("objgrf"))
@@ -71,6 +73,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* 
pPage, weld::DialogContr
 m_xAnnotCB->set_accessible_description(ScResId(STR_A11Y_DESC_ANNOT));
 m_xFormulaMarkCB->connect_toggled(aCBHdl);
 m_xValueCB->connect_toggled(aCBHdl);
+m_xColRowHighCB->connect_toggled(aCBHdl);
 m_xAnchorCB->connect_toggled(aCBHdl);
 
 m_xVScrollCB->connect_toggled(aCBHdl);
@@ -156,6 +159,13 @@ boolScTpContentOptions::FillItemSet( SfxItemSet* 
rCoreSet )
 rCoreSet->Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, 
m_xSyncZoomCB->get_active()));
 bRet = true;
 }
+if (m_xColRowHighCB->get_state_changed_from_saved())
+{
+auto pChange(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Calc::Content::Display::ColumnRowHighlighting::set(m_xColRowHighCB->get_active(),
 pChange);
+pChange->commit();
+bRet = true;
+}
 
 return bRet;
 }
@@ -171,6 +181,7 @@ voidScTpContentOptions::Reset( const SfxItemSet* 
rCoreSet )
 m_xAnnotCB   ->set_active(m_xLocalOptions->GetOption(VOPT_NOTES));
 
m_xFormulaMarkCB->set_active(m_xLocalOptions->GetOption(VOPT_FORMULAS_MARKS));
 m_xValueCB   ->set_active(m_xLocalOptions->GetOption(VOPT_SYNTAX));
+
m_xColRowHighCB->set_active(officecfg::Office::Calc::Content::Display::ColumnRowHighlighting::get());
 m_xAnchorCB  ->set_active(m_xLocalOptions->GetOption(VOPT_ANCHOR));
 
 m_xObjGrfLB  ->set_active( 
static_cast(m_xLocalOptions->GetObjMode(VOBJ_TYPE_OLE)) );
@@ -206,6 +217,7 @@ voidScTpContentOptions::Reset( const SfxItemSet* 
rCoreSet )
 m_xAnnotCB->save_state();
 m_xFormulaMarkCB->save_state();
 m_xValueCB->save_state();
+m_xColRowHighCB->save_state();
 m_xAnchorCB->save_state();
 m_xObjGrfLB->save_value();
 m_xDiagramLB->save_value();
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui 
b/sc/uiconfig/scalc/ui/tpviewpage.ui
index b96283d18b69..df87f8e27b3a 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -20,7 +20,7 @@
 0
 none
 
-  
+  
   
 True
 False
@@ -127,7 +127,7 @@
   
   
 0
-5
+6
   
 
 
@@ -146,7 +146,

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

 sw/source/uibase/shells/txtnum.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit f384dc0476e4730d3ccb7a7f56eae8452bce133a
Author: Justin Luth 
AuthorDate: Thu Nov 23 20:50:09 2023 -0500
Commit: Andras Timar 
CommitDate: Mon Dec 4 16:27:58 2023 +0100

related tdf#56258 sw sidebar SetOutline: do something without dropdown

The sidebar gained SetOutline in 7.6
with commit 3fd0b4053763aa91b0004c523e96e7d390c7b58e.

In the TOOLBAR, there is special code that tells the main button
to show the locale list outline choices - just like the dropdown does.
However, none of that code comes into play in the sidebar,
so add a special case to handle that situation.

It is easy to launch the dialog, focused on the outlinenum page.
Better yet would be to figure out how to launch the popup window
that the dropdown opens - so they do the same thing...

Change-Id: I3d6eeafaa8bdb45cfacc42e221820d664419e0e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159934
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Justin Luth 
Reviewed-by: Szymon Kłos 

diff --git a/sw/source/uibase/shells/txtnum.cxx 
b/sw/source/uibase/shells/txtnum.cxx
index 34a95d13ee8e..ae353ed0aa55 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -310,6 +310,14 @@ void SwTextShell::ExecSetNumber(SfxRequest const &rReq)
 GetShell().SetCurNumRule( aNewNumRule, bCreateNewList );
 }
 }
+else if (nSlot == FN_SVX_SET_OUTLINE)
+{
+// no outline provided: launch dialog to request a specific 
outline
+SfxBindings& rBindings = 
GetView().GetViewFrame()->GetBindings();
+const SfxStringItem aPage(FN_PARAM_1, "outlinenum");
+const SfxPoolItem* aItems[] = { &aPage, nullptr };
+rBindings.Execute(SID_OUTLINE_BULLET, aItems);
+}
 }
 break;

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/uiconfig

 sw/uiconfig/swriter/ui/translationdialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1f6bfc85032b10a52a9abe9fd104e92e5671ea81
Author: Andras Timar 
AuthorDate: Sun Dec 3 21:43:06 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 16:28:56 2023 +0100

Make OK/Cancel buttons translatable on Language Selection dialog

Change-Id: Ida5f6e2195bb388377e89f12d00431ba2d68cca7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160284
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sw/uiconfig/swriter/ui/translationdialog.ui 
b/sw/uiconfig/swriter/ui/translationdialog.ui
index a6aff92ab00c..26d4f33bfa56 100644
--- a/sw/uiconfig/swriter/ui/translationdialog.ui
+++ b/sw/uiconfig/swriter/ui/translationdialog.ui
@@ -25,7 +25,7 @@
 end
 
   
-_Cancel
+_Cancel
 True
 True
 True
@@ -39,7 +39,7 @@
 
 
   
-_OK
+_OK
 True
 True
 True

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - configure.ac

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4262992e6180874dbf2519e5c34384e9b2f0d5d6
Author: Andras Timar 
AuthorDate: Mon Dec 4 16:31:21 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 16:31:21 2023 +0100

Bump version to 23.05.6.1

Change-Id: Ife459f0e0646f73b0c8f87ce9ab308f0ede968fb

diff --git a/configure.ac b/configure.ac
index 60838676555c..25eb99556fe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[23.05.5.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.6.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-23.05.6-1'

Tag 'cp-23.05.6-1' created by Andras Timar  at 
2023-12-04 15:32 +

cp-23.05.6-1

Changes since cp-23.05.5-3-135:
---
 0 files changed
---

[Libreoffice-commits] core.git: translations

2023-12-04 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 78356d0db4a957a356a7e49e575b2fa8d3b9f902
Author: Christian Lohmaier 
AuthorDate: Mon Dec 4 16:31:14 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 4 16:31:14 2023 +0100

Update git submodules

* Update translations from branch 'master'
  to 9ad74762e8f15a51057ea53d95818c92f0adf341
  - update translations for master

and force-fix errors using pocheck

Change-Id: If3a600f16773aad9242bc3231788d8bfaf8227d1

diff --git a/translations b/translations
index 994b9356742b..9ad74762e8f1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 994b9356742bd38a188a376d41fca1bd9d0fa396
+Subproject commit 9ad74762e8f15a51057ea53d95818c92f0adf341

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-23.05.6-1'

Tag 'cp-23.05.6-1' created by Andras Timar  at 
2023-12-04 15:32 +

cp-23.05.6-1

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-23.05.6-1'

Tag 'cp-23.05.6-1' created by Andras Timar  at 
2023-12-04 15:32 +

cp-23.05.6-1

Changes since cp-23.05.5-4-1:
---
 0 files changed
---

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-23.05.6-1'

Tag 'cp-23.05.6-1' created by Andras Timar  at 
2023-12-04 15:32 +

cp-23.05.6-1

Changes since cp-23.05.5-4-2:
---
 0 files changed
---

[Libreoffice-commits] translations.git: source/ab source/af source/am source/an source/ar source/as source/ast source/az source/be source/bg source/bn source/bn-IN source/bo source/br source/brx sourc

2023-12-04 Thread Christian Lohmaier (via logerrit)

 source/ab/sc/messages.po|  104 
 source/af/sc/messages.po|  104 
 source/am/helpcontent2/source/text/scalc.po |   18 +-
 source/am/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/am/sc/messages.po|  104 
 source/an/sc/messages.po|  104 
 source/ar/helpcontent2/source/text/scalc.po |   18 +-
 source/ar/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/ar/sc/messages.po|  104 
 source/as/sc/messages.po|  104 
 source/ast/helpcontent2/source/text/scalc.po|   18 +-
 source/ast/helpcontent2/source/text/scalc/01.po |   22 +--
 source/ast/sc/messages.po   |  104 
 source/az/sc/messages.po|  104 
 source/be/sc/messages.po|  104 
 source/bg/helpcontent2/source/text/scalc.po |   18 +-
 source/bg/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/bg/sc/messages.po|  104 
 source/bn-IN/helpcontent2/source/text/scalc.po  |   18 +-
 source/bn-IN/helpcontent2/source/text/scalc/01.po   |   22 +--
 source/bn-IN/sc/messages.po |  104 
 source/bn/helpcontent2/source/text/scalc.po |   18 +-
 source/bn/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/bn/sc/messages.po|  104 
 source/bo/helpcontent2/source/text/scalc.po |   18 +-
 source/bo/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/bo/sc/messages.po|  104 
 source/br/sc/messages.po|  104 
 source/brx/sc/messages.po   |  104 
 source/bs/helpcontent2/source/text/scalc.po |   18 +-
 source/bs/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/bs/sc/messages.po|  104 
 source/ca-valencia/helpcontent2/source/text/scalc.po|   18 +-
 source/ca-valencia/helpcontent2/source/text/scalc/01.po |   22 +--
 source/ca-valencia/sc/messages.po   |  104 
 source/ca/helpcontent2/source/text/scalc.po |   18 +-
 source/ca/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/ca/sc/messages.po|  104 
 source/ckb/sc/messages.po   |  104 
 source/cs/helpcontent2/source/text/scalc.po |   18 +-
 source/cs/helpcontent2/source/text/scalc/01.po  |   32 ++--
 source/cs/sc/messages.po|  104 
 source/cy/sc/messages.po|  104 
 source/da/helpcontent2/source/text/scalc.po |   18 +-
 source/da/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/da/sc/messages.po|  104 
 source/de/helpcontent2/source/text/scalc.po |   18 +-
 source/de/helpcontent2/source/text/scalc/01.po  |   32 ++--
 source/de/sc/messages.po|  104 
 source/dgo/sc/messages.po   |  104 
 source/dsb/helpcontent2/source/text/scalc.po|   18 +-
 source/dsb/helpcontent2/source/text/scalc/01.po |   22 +--
 source/dsb/sc/messages.po   |  104 
 source/dz/helpcontent2/source/text/scalc.po |   18 +-
 source/dz/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/dz/sc/messages.po|  104 
 source/el/helpcontent2/source/text/scalc.po |   18 +-
 source/el/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/el/sc/messages.po|  104 
 source/en-GB/helpcontent2/source/text/scalc.po  |   18 +-
 source/en-GB/helpcontent2/source/text/scalc/01.po   |   22 +--
 source/en-GB/sc/messages.po |  104 
 source/en-ZA/helpcontent2/source/text/scalc.po  |   18 +-
 source/en-ZA/helpcontent2/source/text/scalc/01.po   |   22 +--
 source/en-ZA/sc/messages.po |  104 
 source/eo/helpcontent2/source/text/scalc.po |   18 +-
 source/eo/helpcontent2/source/text/scalc/01.po  |   22 +--
 source/eo/sc/messages.po|  104 
 s

[Libreoffice-commits] core.git: translations

2023-12-04 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 4b9823343777ca94bd1fa730e83f2729e55e80b6
Author: Christian Lohmaier 
AuthorDate: Mon Dec 4 17:08:58 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 4 17:08:58 2023 +0100

Update git submodules

* Update translations from branch 'master'
  to 5c0f8a2035b7a98ba0bce9e86e660db1e40e81c4
  - update translations for master

and force-fix errors using pocheck

Change-Id: I77488fda05cc237c8148a5307a2dd85937a42638

diff --git a/translations b/translations
index 9ad74762e8f1..5c0f8a2035b7 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 9ad74762e8f15a51057ea53d95818c92f0adf341
+Subproject commit 5c0f8a2035b7a98ba0bce9e86e660db1e40e81c4

[Libreoffice-commits] core.git: cui/inc cui/source

 cui/inc/personas.hrc   |   30 ++
 cui/source/options/personalization.cxx |9 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)

New commits:
commit a6dc2a42263816461600307b5f8271a5c5d8d031
Author: Julien Nabet 
AuthorDate: Sat Dec 2 11:36:06 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 17:20:07 2023 +0100

tdf#157402: translate personas

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

diff --git a/cui/inc/personas.hrc b/cui/inc/personas.hrc
new file mode 100644
index ..6b101717dcaa
--- /dev/null
+++ b/cui/inc/personas.hrc
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+#include 
+
+#include 
+
+#define NC_(Context, String) TranslateId(Context, u8##String)
+
+// it must be synchronized with 
extras/source/gallery/personas/personas_list.txt
+std::pair RID_PERSONAS_COLOR[] =
+{
+{ NC_("RID_CUI_PERSONAS_COLOR", "White") , 0 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Gray") , 1 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Dark") , 2 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Pink") , 3 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Sand") , 4 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Green") , 5 },
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 6311fd491141..657344d60c75 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -11,6 +11,8 @@
 
 #include "personalization.hxx"
 
+#include 
+
 #include 
 #include 
 #include 
@@ -21,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -144,6 +147,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 bool foundOne = false;
 
 OStringBuffer aLine;
+int nLineNumberFilePersona = 0;
 while (aStream.IsOpen() && !aStream.eof() && nIndex < MAX_DEFAULT_PERSONAS)
 {
 OUString aPersonaSetting, aPreviewFile, aName;
@@ -151,8 +155,8 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 
 aStream.ReadLine(aLine);
 aPersonaSetting = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8);
-aName = aPersonaSetting.getToken(1, ';', nParseIndex);
-aPreviewFile = aPersonaSetting.getToken(0, ';', nParseIndex);
+aName = CuiResId(RID_PERSONAS_COLOR[nLineNumberFilePersona].first);
+aPreviewFile = aPersonaSetting.getToken(2, ';', nParseIndex);
 
 if (aPreviewFile.isEmpty())
 break;
@@ -175,6 +179,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 m_vDefaultPersonaImages[nIndex]->set_tooltip_text(aName);
 m_vDefaultPersonaImages[nIndex++]->show();
 foundOne = true;
+++nLineNumberFilePersona;
 }
 
 m_xDefaultPersona->set_sensitive(foundOne);

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

 vcl/source/app/scheduler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 274e078a6e94e477b594839355cc709829d921dd
Author: Mike Kaganski 
AuthorDate: Mon Dec 4 14:45:57 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 4 17:26:37 2023 +0100

Relax assertion a bit

When running UITests on Windows with parallelism, I often see this
assertion failing. I don't know why; but every time I attach the
debugger to the failed process, I see mpSchedulerStack's mpTask
and mpNext are both nullptr. The only place where this can happen
is Task::~Task, which seems to suggest that this situation is
basically the same as no mpSchedulerStack.

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

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 098242fe6c70..e6893055f633 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -130,7 +130,7 @@ void Scheduler::ImplDeInitScheduler()
 #endif
 rSchedCtx.mbActive = false;
 
-assert( nullptr == rSchedCtx.mpSchedulerStack );
+assert( nullptr == rSchedCtx.mpSchedulerStack || 
(!rSchedCtx.mpSchedulerStack->mpTask && !rSchedCtx.mpSchedulerStack->mpNext) );
 
 if (rSchedCtx.mpSalTimer) rSchedCtx.mpSalTimer->Stop();
 delete rSchedCtx.mpSalTimer;

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

2023-12-04 Thread Samuel Mehrbrodt (via logerrit)

 cui/source/options/optaboutconfig.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1597968f5cd2534fb6e0be40fafecc305a004f4e
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 4 16:00:21 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 4 17:43:34 2023 +0100

tdf#155676 Properly support editing string lists

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

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index b5d218ecadad..ea63035471ca 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -866,7 +866,12 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 else if (sPropertyType == "string-list")
 {
 SvxListDialog aListDialog(m_xDialog.get());
-aListDialog.SetEntries(commaStringToSequence(sDialogValue));
+Reference xConfigAccess
+= getConfigAccess(pUserData->sPropertyPath, false);
+Any aNode = xConfigAccess->getByName(sPropertyName);
+uno::Sequence aList = 
aNode.get>();
+aListDialog.SetEntries(
+
comphelper::sequenceToContainer>(aList));
 aListDialog.SetMode(ListMode::String);
 if (aListDialog.run() == RET_OK)
 {

[Libreoffice-commits] core.git: Changes to 'feature/windowsupdater'

2023-12-04 Thread Thorsten Behrens (via logerrit)

New branch 'feature/windowsupdater' available with the following commits:
commit 93609732210532ab6bcdabf8fa12fa3dc6f06478
Author: Thorsten Behrens 
Date:   Mon Dec 4 13:56:55 2023 +0100

Remove hard limit to c89 for clang

Not sure this is still true? "Windows MSVC only supports C90 so force gnu89"

Change-Id: Id628131b4fa6b61e19da6d862d773ab36f201729

commit 3ccce9c631e22faa57cc4e24200f54c040589410
Author: Thorsten Behrens 
Date:   Mon Dec 4 13:56:12 2023 +0100

More buildfixes, also define XP_

commit a52a079d419c57a86f0ab2cced6e2b06d95f954b
Author: Thorsten Behrens 
Date:   Mon Dec 4 13:05:41 2023 +0100

Add more missing includes

commit 1e4fc549a4d0741b2d34a8b8bd9498a63d475506
Author: Thorsten Behrens 
Date:   Mon Dec 4 13:03:21 2023 +0100

Widen include path

Change-Id: I3e371acb4adaf92999c830c5f94ca321df89b7d5

commit 07e11e5f5d3dbb075aeb3ed579bc1c7b8a35c6a6
Author: Thorsten Behrens 
Date:   Mon Dec 4 09:20:32 2023 +0100

Add missing files, rename cpp->cxx, tweak makefiles

commit a5799d7b7dfb937c17b1fcab77b0eaa36f5c32bf
Author: Thorsten Behrens 
Date:   Mon Dec 4 04:29:25 2023 +0100

Fixup after clang-format

commit 0e79a73d1b3c76b766e3200396b123f10b71609c
Author: Thorsten Behrens 
Date:   Mon Dec 4 04:26:57 2023 +0100

Commit w/p clang-format

commit 35b02a6818882b0d310b1098b636467d8cae45bc
Author: Thorsten Behrens 
Date:   Mon Dec 4 03:44:23 2023 +0100

clang-format all of onlineupdate

In preparation of updating from upstream

Change-Id: I8f2ce1079f000ed79af594ea1a89f85fc994de3b

commit b0c47d7d873e40456079e2c99340a92da37239a4
Author: Thorsten Behrens 
Date:   Mon Dec 4 03:38:44 2023 +0100

Format updater code with clang-format

(instead of bespoke astyle rule)

Change-Id: I623b453c7662383ba35d98ecae03b61c5a98b29b

[Libreoffice-commits] core.git: dbaccess/source editeng/source slideshow/source svx/source sw/source vcl/unx

 dbaccess/source/core/api/OptimisticSet.cxx   |4 +++-
 editeng/source/misc/svxacorr.cxx |4 +++-
 slideshow/source/engine/box2dtools.cxx   |8 ++--
 svx/source/form/fmshimp.cxx  |3 +--
 sw/source/filter/ww8/docxattributeoutput.cxx |4 +++-
 vcl/unx/generic/fontmanager/fontmanager.cxx  |1 +
 6 files changed, 17 insertions(+), 7 deletions(-)

New commits:
commit b50da6f3a9109fc1d4468c15aa7d5c68773ec199
Author: Julien Nabet 
AuthorDate: Mon Dec 4 11:31:36 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 18:00:43 2023 +0100

cid#1546275 Using invalid iterator

and :

cid#1546219 Using invalid iterator
cid#1546088 Using invalid iterator
cid#1546070 Using invalid iterator
cid#1546061 Using invalid iterator
cid#1546055 Using invalid iterator
cid#1546049 Using invalid iterator

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

diff --git a/dbaccess/source/core/api/OptimisticSet.cxx 
b/dbaccess/source/core/api/OptimisticSet.cxx
index d1d70955f674..2a89974794ad 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -353,7 +353,9 @@ void OptimisticSet::executeDelete(const ORowSetRow& 
_rDeleteRow,const OUString&
 if(m_bDeleted)
 {
 sal_Int32 nBookmark = 
::comphelper::getINT32((*_rDeleteRow)[0].getAny());
-if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != 
m_aKeyMap.end())
+const auto iter = m_aKeyMap.find(nBookmark);
+assert(iter != m_aKeyMap.end());
+if(m_aKeyIter == iter && m_aKeyIter != m_aKeyMap.end())
 ++m_aKeyIter;
 m_aKeyMap.erase(nBookmark);
 m_bDeleted = true;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 61bc805993ce..8a28ccf42ada 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2077,7 +2077,9 @@ bool SvxAutoCorrect::FindInWordStartExceptList( 
LanguageType eLang,
 CreateLanguageFile(aLanguageTag, false))
 {
 //the language is available - so bring it on
-auto& rList = m_aLangTable.find(aLanguageTag)->second;
+const auto iter = m_aLangTable.find(aLanguageTag);
+assert(iter != m_aLangTable.end());
+auto& rList = iter->second;
 if(rList.GetWordStartExceptList()->find(sWord) != 
rList.GetWordStartExceptList()->end() )
 return true;
 }
diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 97e172a4eb4e..161bbe8c37f4 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -323,7 +323,9 @@ void box2DWorld::setShapeAngleByAngularVelocity(
 assert(mpBox2DWorld);
 if (fPassedTime > 0) // this only makes sense if there was an advance in 
time
 {
-Box2DBodySharedPtr pBox2DBody = mpXShapeToBodyMap.find(xShape)->second;
+const auto iter = mpXShapeToBodyMap.find(xShape);
+assert(iter != mpXShapeToBodyMap.end());
+Box2DBodySharedPtr pBox2DBody = iter->second;
 pBox2DBody->setAngleByAngularVelocity(fAngle, fPassedTime);
 }
 }
@@ -561,7 +563,9 @@ void box2DWorld::queueShapeAnimationEndUpdate(
 
 void box2DWorld::alertPhysicsAnimationEnd(const 
slideshow::internal::ShapeSharedPtr& pShape)
 {
-Box2DBodySharedPtr pBox2DBody = 
mpXShapeToBodyMap.find(pShape->getXShape())->second;
+const auto iter = mpXShapeToBodyMap.find(pShape->getXShape());
+assert(iter != mpXShapeToBodyMap.end());
+Box2DBodySharedPtr pBox2DBody = iter->second;
 // since the animation ended make the body static
 makeBodyStatic(pBox2DBody);
 pBox2DBody->setRestitution(fDefaultStaticBodyBounciness);
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index dd71f6999ade..a71f78f2296b 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3380,8 +3380,7 @@ void FmXFormShell::CreateExternalView_Lock()
 
 // value list
 MapUString2UstringSeq::const_iterator aCurrentValueList = 
aRadioValueLists.find(rCtrlSource.first);
-DBG_ASSERT(aCurrentValueList != aRadioValueLists.end(),
-"FmXFormShell::CreateExternalView : inconsistent radio 
descriptions !");
+assert(aCurrentValueList != aRadioValueLists.end());
 pListBoxDescription->Name = FM_PROP_STRINGITEMLIST;
 pListBoxDescription->Value <<= (*aCurrentValueList).second;
 ++pListBoxDescription;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8949ffe58a77..d84549d43066 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -315,7 +31

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

 qadevOOo/qa/registrymodifications.xcu |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a4a1f2ecee2e7b1d50e0065e25090e262863e1c4
Author: Mike Kaganski 
AuthorDate: Mon Dec 4 16:59:54 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 4 18:36:43 2023 +0100

Disallow crash reporting in UITests

Otherwise, after one crash, the next UITest starts with the crash report
dialog, and hangs, creating the noise in results. Seen when running
UITests on Windows with parallelism.

Crash reporting is unaffected by '--norestore', and handled separately
in Desktop::OpenClients (desktop/source/app/app.cxx).

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

diff --git a/qadevOOo/qa/registrymodifications.xcu 
b/qadevOOo/qa/registrymodifications.xcu
index 3ac099ff7f1e..0a4fccf18c88 100644
--- a/qadevOOo/qa/registrymodifications.xcu
+++ b/qadevOOo/qa/registrymodifications.xcu
@@ -3,6 +3,7 @@
  when building with non-en system locales -->
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
 true
+false
 false
 false
 en-US

[Libreoffice-commits] core.git: 2 commits - extras/source

2023-12-04 Thread Laurent Balland (via logerrit)

 extras/source/templates/presnt/Metropolis/styles.xml  |   54 --
 extras/source/templates/presnt/Nature_Illustration/styles.xml |   54 --
 2 files changed, 108 deletions(-)

New commits:
commit f1f8fd8455aee3cb07108696856c6026d453f372
Author: Laurent Balland 
AuthorDate: Sun Dec 3 14:30:10 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:13 2023 +0100

Nature Illustration template: remove unused styles

These old styles are used in the template and is no more in use in LO.
So they remain untranslated when changing UI language.

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

diff --git a/extras/source/templates/presnt/Nature_Illustration/styles.xml 
b/extras/source/templates/presnt/Nature_Illustration/styles.xml
index 200ec815019b..8c384e2ce424 100644
--- a/extras/source/templates/presnt/Nature_Illustration/styles.xml
+++ b/extras/source/templates/presnt/Nature_Illustration/styles.xml
@@ -65,63 +65,9 @@
   
   
 
-
-  
-
-
-  
-
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
 
   
   
commit d103f4afddd6360c3e09fde3cbe7c3f720ac7f65
Author: Laurent Balland 
AuthorDate: Sun Dec 3 14:19:42 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:00 2023 +0100

Metropolis Impress template: remove unused styles

These old styles are used in the template and is no more in use in LO.
So they remain untranslated when changing UI language.

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

diff --git a/extras/source/templates/presnt/Metropolis/styles.xml 
b/extras/source/templates/presnt/Metropolis/styles.xml
index cada57042c56..6a7a14efca6c 100644
--- a/extras/source/templates/presnt/Metropolis/styles.xml
+++ b/extras/source/templates/presnt/Metropolis/styles.xml
@@ -62,63 +62,9 @@
   
   
 
-
-  
-
-
-  
-
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-

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

2023-12-04 Thread Laurent Balland (via logerrit)

 extras/source/templates/presnt/Freshes/content.xml |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit a56003dc89903f2b03d041807d48bb1e004a3853
Author: Laurent Balland 
AuthorDate: Sat Dec 2 09:48:36 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:59 2023 +0100

tdf#158017 Freshes Impress template: color font

Color font was forced to black with 70% of transparency to render a grey
color. This trick fails with dark mode.
A standard grey color is restored with this commit (and 0% transparency)

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

diff --git a/extras/source/templates/presnt/Freshes/content.xml 
b/extras/source/templates/presnt/Freshes/content.xml
index d7699c7b4588..817414365b79 100644
--- a/extras/source/templates/presnt/Freshes/content.xml
+++ b/extras/source/templates/presnt/Freshes/content.xml
@@ -640,7 +640,7 @@
   
 
 
-  
+  
 
 
   
@@ -681,9 +681,6 @@
 
   
 
-
-  
-
 
   
 
@@ -1492,7 +1489,7 @@
 
   
 
-  Lorem ipsum dolor sit amet, 
consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
dolore magna aliqua.
+  Lorem ipsum dolor sit amet, 
consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
dolore magna aliqua.

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

 sw/uiconfig/swriter/ui/translationdialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 22e1cdd3a2fc142fc5313e1dba942810c7e91f95
Author: Andras Timar 
AuthorDate: Sun Dec 3 21:43:06 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 18:58:17 2023 +0100

Make OK/Cancel buttons translatable on Language Selection dialog

Change-Id: Ida5f6e2195bb388377e89f12d00431ba2d68cca7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160283
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sw/uiconfig/swriter/ui/translationdialog.ui 
b/sw/uiconfig/swriter/ui/translationdialog.ui
index c520fd851921..36f0015ae627 100644
--- a/sw/uiconfig/swriter/ui/translationdialog.ui
+++ b/sw/uiconfig/swriter/ui/translationdialog.ui
@@ -22,7 +22,7 @@
 end
 
   
-_OK
+_OK
 True
 True
 True
@@ -36,7 +36,7 @@
 
 
   
-_Cancel
+_Cancel
 True
 True
 True

[Libreoffice-commits] core.git: cui/source editeng/source oox/source reportdesign/source sc/source soltools/mkdepend sw/source vcl/source

 cui/source/dialogs/SpellDialog.cxx   |5 -
 editeng/source/misc/svxacorr.cxx |   10 --
 oox/source/drawingml/texteffectscontext.cxx  |5 +++--
 reportdesign/source/filter/xml/xmlExport.cxx |1 +
 sc/source/core/data/SolverSettings.cxx   |4 +++-
 sc/source/ui/namedlg/namedefdlg.cxx  |8 ++--
 soltools/mkdepend/collectdircontent.cxx  |1 +
 sw/source/core/layout/paintfrm.cxx   |2 +-
 vcl/source/cnttype/mcnttype.cxx  |4 +++-
 9 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit bc95ece0618b9886890d9c758b9d0ebc0fc41c69
Author: Julien Nabet 
AuthorDate: Mon Dec 4 18:03:27 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 19:21:31 2023 +0100

cid#1546021 Using invalid iterator

and :

cid#1545983 Using invalid iterator
cid#1545969 Using invalid iterator
cid#1545949 Using invalid iterator
cid#1545929 Using invalid iterator
cid#1545911 Using invalid iterator
cid#1545910 Using invalid iterator
cid#1545886 Using invalid iterator
cid#1545870 Using invalid iterator
cid#1545813 Using invalid iterator

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

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 3ad9c2b196b0..dfdad984ec41 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1247,7 +1247,10 @@ namespace
 void ExtractErrorDescription(const EECharAttrib& rEECharAttrib, 
SpellErrorDescription& rSpellErrorDescription)
 {
 css::uno::Sequence aSequence;
-static_cast(rEECharAttrib.pAttr)->GetGrabBag().find("SpellErrorDescription")->second
 >>= aSequence;
+const auto pGrabBag = static_cast(rEECharAttrib.pAttr)->GetGrabBag();
+const auto iter = pGrabBag.find("SpellErrorDescription");
+assert(iter != pGrabBag.end());
+iter->second >>= aSequence;
 rSpellErrorDescription.fromSequence(aSequence);
 }
 }
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8a28ccf42ada..6fdcbcca1ccf 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1750,7 +1750,11 @@ bool SvxAutoCorrect::AddWordStartException( const 
OUString& rNew,
 if (iter != m_aLangTable.end())
 pLists = &iter->second;
 else if(CreateLanguageFile(aLangTagUndetermined))
-pLists = &m_aLangTable.find(aLangTagUndetermined)->second;
+{
+iter = m_aLangTable.find(aLangTagUndetermined);
+assert(iter != m_aLangTable.end());
+pLists = &iter->second;
+}
 }
 OSL_ENSURE(pLists, "No auto correction file!");
 return pLists && pLists->AddToWordStartExceptList(rNew);
@@ -2030,7 +2034,9 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
 CreateLanguageFile(aLanguageTag, false))
 {
 //the language is available - so bring it on
-SvxAutoCorrectLanguageLists& rList = 
m_aLangTable.find(aLanguageTag)->second;
+const auto iter = m_aLangTable.find(aLanguageTag);
+assert(iter != m_aLangTable.end());
+SvxAutoCorrectLanguageLists& rList = iter->second;
 pRet = lcl_SearchWordsInList( &rList, rTxt, rStt, nEndPos );
 if( pRet )
 {
diff --git a/oox/source/drawingml/texteffectscontext.cxx 
b/oox/source/drawingml/texteffectscontext.cxx
index 0e33a4c3c13b..347971f4616b 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -91,8 +91,9 @@ OUString const & lclGetGrabBagName(sal_uInt32 aId)
 { OOX_TOKEN(w14, stylisticSets), "CharStylisticSetsTextEffect" },
 { OOX_TOKEN(w14, cntxtAlts), "CharCntxtAltsTextEffect" },
 };
-
-return aGrabBagNameMap.find(aId)->second;
+const auto iter = aGrabBagNameMap.find(aId);
+assert(iter != aGrabBagNameMap.end());
+return iter->second;
 }
 
 }
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 6e7104724704..c1b2c24232d9 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -755,6 +755,7 @@ void ORptExport::exportContainer(const Reference< 
XSection>& _xSection)
 TGrid::const_iterator aRowEnd = aFind->second.end();
 
 TGridStyleMap::const_iterator aRowFind = m_aRowStyleNames.find(_xSection);
+assert(aRowFind != m_aRowStyleNames.end());
 auto aHeightIter = aRowFind->second.cbegin();
 OSL_ENSURE(aRowFind->second.size() == aFind->second.size(),"Different 
count for rows");
 
diff --git a/sc/source/core/data/SolverSettings.cxx 
b/sc/source/core/data/SolverSettings.cxx
index ac2d2aa24aeb..60eb747f55f5 100644
--- a/sc/source/core/data/SolverS

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/inc sc/source

2023-12-04 Thread Henry Castro (via logerrit)

 sc/inc/globstr.hrc |1 +
 sc/source/ui/view/viewfunc.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit eccbe3bb4ed6f0bed4e7fbacfaf50762c93f9464
Author: Henry Castro 
AuthorDate: Mon Dec 4 10:33:01 2023 -0400
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 20:05:58 2023 +0100

sc: show a message dialog if insert cells fail

Use case, go to the max row and insert a row.

Signed-off-by: Henry Castro 
Change-Id: I930d7724b9c94e10e9207ec749b7249d2fee0e39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160314
Tested-by: Jenkins CollaboraOffice 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index f4afbb7de320..aff27e3608dd 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -550,6 +550,7 @@
 #define STR_UNDO_EDIT_SPARKLINE NC_("STR_UNDO_EDIT_SPARKLINE", 
"Edit Sparkline")
 #define STR_UNDO_THEME_CHANGE   NC_("STR_UNDO_THEME_CHANGE", 
"Theme Change")
 #define STR_UNDO_THEME_COLOR_CHANGE 
NC_("STR_UNDO_THEME_COLOR_CHANGE", "Theme Color Change")
+#define STR_ERR_INSERT_CELLSNC_("STR_ERR_INSERT_CELLS", 
"Failed to insert cells")
 
 #endif
 
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 13eb71acef52..15076f04a958 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1776,6 +1776,11 @@ bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool 
bRecord, bool bPartOfPaste )
 true /* 
bGroups */, GetViewData().GetTabNo());
 }
 }
+else
+{
+ErrorMessage(STR_ERR_INSERT_CELLS);
+}
+
 OUString aStartAddress =  aRange.aStart.GetColRowString();
 OUString aEndAddress = aRange.aEnd.GetColRowString();
 collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}}, 
"INSERT_CELLS");

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source

 sc/source/ui/docshell/docsh3.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4d30910523bccb3b965f254401e6341af2ee8704
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:22:17 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 20:09:29 2023 +0100

lok: Notify all tabs in the range

34d5abf464dfbf4bdc36f6b87e606c84a1f4d99d restricted this to the
first tab, but PostPaint(...) is sometimes called with a
0.. tab range, even if the change only affected somewhere
in between.

In addition, restrict range end to the last actual tab in the
spreadsheet.

Change-Id: I44a7bb351e17bf85b13fedfe2a9f3d76543c4372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160253
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 8b24cf81d727..0e2efa7f09fc 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -110,12 +110,13 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 {
 ScRangeList aPaintRanges;
 std::set aTabsInvalidated;
+const SCTAB nMaxTab = m_pDocument->GetTableCount() - 1;
 for (size_t i = 0, n = rRanges.size(); i < n; ++i)
 {
 const ScRange& rRange = rRanges[i];
 SCCOL nCol1 = rRange.aStart.Col(), nCol2 = rRange.aEnd.Col();
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
-SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
+SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = std::min(nMaxTab, 
rRange.aEnd.Tab());
 
 if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol();
 if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow();
@@ -168,7 +169,8 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 }
 }
 aPaintRanges.push_back(ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2));
-aTabsInvalidated.insert(nTab1);
+for (auto nTabNum = nTab1; nTabNum <= nTab2; ++nTabNum)
+aTabsInvalidated.insert(nTabNum);
 }
 
 Broadcast(ScPaintHint(aPaintRanges.Combine(), nPart));

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source

 sc/source/ui/docshell/docfunc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 67cdcf1ab2d2977fa79f9ecd7935ad8f3a8b4377
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:33:28 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 20:11:49 2023 +0100

sc SetLayoutRTL: Only call PostPaint for current tab

...instead of the usual 0-, a layout change of the current
sheet should have no effect on others.

Change-Id: I5a9a2da78daf1fab06da939574c0e8a027533fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160254
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index be844634ea25..12ff9a0f9908 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3485,7 +3485,7 @@ bool ScDocFunc::SetLayoutRTL( SCTAB nTab, bool bRTL )
 rDocShell.GetUndoManager()->AddUndoAction( 
std::make_unique( &rDocShell, nTab, bRTL ) );
 }
 
-rDocShell.PostPaint( 0,0,0,rDoc.MaxCol(),rDoc.MaxRow(),MAXTAB, 
PaintPartFlags::All );
+rDocShell.PostPaint( 0,0,nTab,rDoc.MaxCol(),rDoc.MaxRow(),nTab, 
PaintPartFlags::All );
 aModificator.SetDocumentModified();
 
 SfxBindings* pBindings = rDocShell.GetViewBindings();

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

2023-12-04 Thread Ilmari Lauhakangas (via logerrit)

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

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

tdf#158404 Start Center: remove ability to do multiselections

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

Multiselection still works as normal in Manage Templates dialog.

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

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

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

 svx/source/form/fmshimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bc0020108e8b45954727276ba11b462feb9a4bf
Author: Julien Nabet 
AuthorDate: Mon Dec 4 18:23:32 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 20:28:02 2023 +0100

Put back the message in assert after 
b50da6f3a9109fc1d4468c15aa7d5c68773ec199

Change-Id: Ie469e94ff51f1ca6dbbd65020f02fe43e0c1608c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160318
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index a71f78f2296b..5dce31f180ba 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3380,7 +3380,7 @@ void FmXFormShell::CreateExternalView_Lock()
 
 // value list
 MapUString2UstringSeq::const_iterator aCurrentValueList = 
aRadioValueLists.find(rCtrlSource.first);
-assert(aCurrentValueList != aRadioValueLists.end());
+assert(aCurrentValueList != aRadioValueLists.end() && 
"FmXFormShell::CreateExternalView : inconsistent radio descriptions !");
 pListBoxDescription->Name = FM_PROP_STRINGITEMLIST;
 pListBoxDescription->Value <<= (*aCurrentValueList).second;
 ++pListBoxDescription;

[Libreoffice-commits] core.git: connectivity/source editeng/source idl/source sc/source sd/source slideshow/source vcl/source

 connectivity/source/commontools/propertyids.cxx |1 +
 editeng/source/misc/svxacorr.cxx|6 +-
 idl/source/cmptools/hash.cxx|1 +
 sc/source/ui/namedlg/namedefdlg.cxx |8 ++--
 sd/source/ui/func/fupage.cxx|5 -
 slideshow/source/engine/box2dtools.cxx  |   24 ++--
 vcl/source/treelist/treelist.cxx|7 ---
 vcl/source/uitest/uiobject.cxx  |1 +
 8 files changed, 40 insertions(+), 13 deletions(-)

New commits:
commit 708e379994591c6e73f07bd2aba136841c9cf036
Author: Julien Nabet 
AuthorDate: Mon Dec 4 18:30:28 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 20:28:26 2023 +0100

cid#1545810 Using invalid iterator

and :

cid#1545802 Using invalid iterator
cid#1545745 Using invalid iterator
cid#1545717 Using invalid iterator
cid#1545675 Using invalid iterator
cid#1545668 Using invalid iterator
cid#1545639 Using invalid iterator
cid#1545634 Using invalid iterator
cid#1545629 Using invalid iterator
cid#1545620 Using invalid iterator
cid#1545608 Using invalid iterator
cid#1545607 Using invalid iterator
cid#1545601 Using invalid iterator

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

diff --git a/connectivity/source/commontools/propertyids.cxx 
b/connectivity/source/commontools/propertyids.cxx
index 90c6beeede6a..cedd0f5f0614 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -95,6 +95,7 @@ namespace dbtools
 const OUString& OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const
 {
 std::map::const_iterator aIter = 
m_aPropertyMap.find(_nIndex);
+assert(aIter != m_aPropertyMap.end());
 return aIter->second;
 }
 }
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 6fdcbcca1ccf..c8891889b01d 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1728,7 +1728,11 @@ bool SvxAutoCorrect::AddCplSttException( const OUString& 
rNew,
 if (iter != m_aLangTable.end())
 pLists = &iter->second;
 else if(CreateLanguageFile(aLangTagUndetermined))
-pLists = &m_aLangTable.find(aLangTagUndetermined)->second;
+{
+iter = m_aLangTable.find(aLangTagUndetermined);
+assert(iter != m_aLangTable.end());
+pLists = &iter->second;
+}
 }
 OSL_ENSURE(pLists, "No auto correction data");
 return pLists && pLists->AddToCplSttExceptList(rNew);
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index d3993881a6ba..4420023bbc32 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -48,6 +48,7 @@ bool SvStringHashTable::Test( const OString& rElement, 
sal_uInt32 * pInsertPos )
 SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nInsertPos ) const
 {
 auto it = maInt2EntryMap.find(nInsertPos);
+assert(it != maInt2EntryMap.end());
 return it->second.get();
 }
 
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx 
b/sc/source/ui/namedlg/namedefdlg.cxx
index 5be3ddc7de25..3304f4d39b08 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -125,11 +125,15 @@ bool ScNameDefDlg::IsNameValid()
 ScRangeName* pRangeName = nullptr;
 if(aScope == maGlobalNameStr)
 {
-pRangeName = maRangeMap.find(STR_GLOBAL_RANGE_NAME)->second;
+const auto iter = maRangeMap.find(STR_GLOBAL_RANGE_NAME);
+assert(iter != maRangeMap.end());
+pRangeName = iter->second;
 }
 else
 {
-pRangeName = maRangeMap.find(aScope)->second;
+const auto iter = maRangeMap.find(aScope);
+assert(iter != maRangeMap.end());
+pRangeName = iter->second;
 }
 
 ScRangeData::IsNameValidType eType;
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 9401a56b30ec..6d0a59ac3a42 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -548,7 +548,10 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
 if (SfxItemState::SET == pArgs->GetItemState(SID_ATTR_CHAR_GRABBAG, true, 
&pPoolItem))
 {
 SfxGrabBagItem const*const pGrabBag(static_cast(pPoolItem));
-if (pGrabBag->GetGrabBag().find("BackgroundFullSize")->second >>= 
bFullSize)
+const auto pGrabBagInner = pGrabBag->GetGrabBag();
+const auto iter = pGrabBagInner.find("BackgroundFullSize");
+assert(iter != pGrabBagInner.end());
+if (iter->second >>= bFullSize)
 {
 if (pMasterPage->IsBackgroundFullSize() != bFullSize)
 {
diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engi

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

 sc/source/ui/docshell/docsh3.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c822a05625da33479527e11a80fe44d3d7b504c8
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:22:17 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 21:28:46 2023 +0100

lok: Notify all tabs in the range

34d5abf464dfbf4bdc36f6b87e606c84a1f4d99d restricted this to the
first tab, but PostPaint(...) is sometimes called with a
0.. tab range, even if the change only affected somewhere
in between.

In addition, restrict range end to the last actual tab in the
spreadsheet.

Change-Id: I44a7bb351e17bf85b13fedfe2a9f3d76543c4372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160253
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4d30910523bccb3b965f254401e6341af2ee8704)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160182
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 788aac9af86e..96546d11a5fe 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -110,12 +110,13 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 {
 ScRangeList aPaintRanges;
 std::set aTabsInvalidated;
+const SCTAB nMaxTab = m_pDocument->GetTableCount() - 1;
 for (size_t i = 0, n = rRanges.size(); i < n; ++i)
 {
 const ScRange& rRange = rRanges[i];
 SCCOL nCol1 = rRange.aStart.Col(), nCol2 = rRange.aEnd.Col();
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
-SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
+SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = std::min(nMaxTab, 
rRange.aEnd.Tab());
 
 if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol();
 if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow();
@@ -168,7 +169,8 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 }
 }
 aPaintRanges.push_back(ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2));
-aTabsInvalidated.insert(nTab1);
+for (auto nTabNum = nTab1; nTabNum <= nTab2; ++nTabNum)
+aTabsInvalidated.insert(nTabNum);
 }
 
 Broadcast(ScPaintHint(aPaintRanges.Combine(), nPart));

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

 sc/source/ui/docshell/docfunc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b4a705f7477da2b546d0658e46e96f4e69017e4
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:33:28 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 21:36:55 2023 +0100

sc SetLayoutRTL: Only call PostPaint for current tab

...instead of the usual 0-, a layout change of the current
sheet should have no effect on others.

Change-Id: I5a9a2da78daf1fab06da939574c0e8a027533fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160254
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 67cdcf1ab2d2977fa79f9ecd7935ad8f3a8b4377)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160181
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 7ad32d4963b9..1a8d902bea19 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3485,7 +3485,7 @@ bool ScDocFunc::SetLayoutRTL( SCTAB nTab, bool bRTL )
 rDocShell.GetUndoManager()->AddUndoAction( 
std::make_unique( &rDocShell, nTab, bRTL ) );
 }
 
-rDocShell.PostPaint( 0,0,0,rDoc.MaxCol(),rDoc.MaxRow(),MAXTAB, 
PaintPartFlags::All );
+rDocShell.PostPaint( 0,0,nTab,rDoc.MaxCol(),rDoc.MaxRow(),nTab, 
PaintPartFlags::All );
 aModificator.SetDocumentModified();
 
 SfxBindings* pBindings = rDocShell.GetViewBindings();

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

2023-12-04 Thread László Németh (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf158436.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |6 ++
 sw/source/core/text/guess.cxx|5 -
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7059a1858ddb044c5f3f0c8e0386d3e1d9dd2b5f
Author: László Németh 
AuthorDate: Mon Dec 4 15:33:14 2023 +0100
Commit: László Németh 
CommitDate: Mon Dec 4 21:41:04 2023 +0100

tdf#119908 tdf#158439 sw smart justify: fix freezing with NBSP

Stop shrinking during underflow, because it resulted
endless layout loop, e.g. when a very short word followed
by a no-break space.

Regression from commit 7d08767b890e723cd502b1c61d250924f695eb98
"tdf#130088 tdf#119908 smart justify: fix DOCX line count + compat opt."

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf158436.docx 
b/sw/qa/extras/ooxmlexport/data/tdf158436.docx
new file mode 100644
index ..8cdcd21b4c1a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf158436.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index d9ef6b8a48d0..0656bb868795 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1408,6 +1408,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf130088, "tdf130088.docx")
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf158436, "tdf158436.docx")
+{
+// This resulted freezing
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testHyphenationAuto)
 {
 loadAndReload("hyphenation.odt");
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 5e66b366c63f..37a2147d0987 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -82,7 +82,10 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 
 // allow shrinking, i.e. more text in justified lines, depending on the 
justification algorithm
 if ( rAdjust == SvxAdjust::Block && 
rInf.GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(
-DocumentSettingId::JUSTIFY_LINES_WITH_SHRINKING))
+DocumentSettingId::JUSTIFY_LINES_WITH_SHRINKING) &&
+ // tdf#158436 avoid shrinking at underflow, e.g. no-break space
+ // after a very short word resulted endless loop
+ !rInf.IsUnderflow() )
 {
 // allow up to 2% shrinking of the line
 nLineWidth = nLineWidth / 0.98 + rInf.X() / 0.98 - rInf.X();

[Libreoffice-commits] core.git: vcl/source vcl/win

 vcl/source/app/svmain.cxx   |   18 +-
 vcl/win/dtrans/WinClipboard.cxx |   12 
 vcl/win/dtrans/WinClipboard.hxx |2 ++
 3 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit 8472365774b7471e96a025f424a6c7eb7b02db26
Author: Mike Kaganski 
AuthorDate: Mon Dec 4 15:08:26 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 4 21:49:03 2023 +0100

Avoid clipboard messages after Scheduler::ImplDeInitScheduler

When running UITests on Windows with parallelism, often there are
clipboard "content changed" messages that fail the assertion in
Scheduler::ImplDeInitScheduler. This is because the clipboard is
only uninitialized after the scheduler de-init; and even then,
the respective threads are not stopped yet.

Make sure that clipboard listeners are stopped before calling the
Scheduler::ImplDeInitScheduler in DeInitVCL.

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

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 71dcca106a57..3aa2cecf4ec8 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -507,15 +507,6 @@ void DeInitVCL()
 // as this processes all pending events in debug builds.
 ImplGetSystemDependentDataManager().flushAll();
 
-Scheduler::ImplDeInitScheduler();
-
-pSVData->mpWinData->maMsgBoxImgList.clear();
-pSVData->maCtrlData.maCheckImgList.clear();
-pSVData->maCtrlData.maRadioImgList.clear();
-pSVData->maCtrlData.moDisclosurePlus.reset();
-pSVData->maCtrlData.moDisclosureMinus.reset();
-pSVData->mpDefaultWin.disposeAndClear();
-
 #if defined _WIN32
 // See GetSystemClipboard (vcl/source/treelist/transfer2.cxx):
 if (auto const comp = css::uno::Reference(
@@ -527,6 +518,15 @@ void DeInitVCL()
 pSVData->m_xSystemClipboard.clear();
 #endif
 
+Scheduler::ImplDeInitScheduler();
+
+pSVData->mpWinData->maMsgBoxImgList.clear();
+pSVData->maCtrlData.maCheckImgList.clear();
+pSVData->maCtrlData.maRadioImgList.clear();
+pSVData->maCtrlData.moDisclosurePlus.reset();
+pSVData->maCtrlData.moDisclosureMinus.reset();
+pSVData->mpDefaultWin.disposeAndClear();
+
 #ifndef NDEBUG
 DbgGUIDeInitSolarMutexCheck();
 #endif
diff --git a/vcl/win/dtrans/WinClipboard.cxx b/vcl/win/dtrans/WinClipboard.cxx
index f82c56784523..1a8eaea151b5 100644
--- a/vcl/win/dtrans/WinClipboard.cxx
+++ b/vcl/win/dtrans/WinClipboard.cxx
@@ -82,6 +82,18 @@ CWinClipboard::~CWinClipboard()
 unregisterClipboardViewer();
 }
 
+void CWinClipboard::disposing(std::unique_lock& mutex)
+{
+{
+osl::MutexGuard aGuard(s_aClipboardSingletonMutex);
+s_pCWinClipbImpl = nullptr;
+}
+
+unregisterClipboardViewer();
+
+WeakComponentImplHelper::disposing(mutex);
+}
+
 // XClipboard
 
 // to avoid unnecessary traffic we check first if there is a clipboard
diff --git a/vcl/win/dtrans/WinClipboard.hxx b/vcl/win/dtrans/WinClipboard.hxx
index 779c272c56c9..fbaa1b206288 100644
--- a/vcl/win/dtrans/WinClipboard.hxx
+++ b/vcl/win/dtrans/WinClipboard.hxx
@@ -105,6 +105,8 @@ public:
 virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
 
 IDataObjectPtr getIDataObject();
+
+virtual void disposing(std::unique_lock&) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: codemaker/source dbaccess/source editeng/source forms/source oox/source sc/source sdext/source slideshow/source stoc/source sw/source toolkit/source

 codemaker/source/cppumaker/cpputype.cxx |8 ++--
 dbaccess/source/core/api/KeySet.cxx |4 +++-
 editeng/source/misc/svxacorr.cxx|   10 +++---
 forms/source/xforms/propertysetbase.cxx |2 +-
 oox/source/drawingml/texteffectscontext.cxx |5 +++--
 sc/source/ui/namedlg/namedlg.cxx|   12 ++--
 sdext/source/pdfimport/tree/pdfiprocessor.cxx   |1 +
 slideshow/source/engine/box2dtools.cxx  |5 -
 stoc/source/invocation_adapterfactory/iafactory.cxx |2 +-
 sw/source/uibase/utlui/uitool.cxx   |9 ++---
 toolkit/source/controls/unocontrolmodel.cxx |4 +++-
 11 files changed, 45 insertions(+), 17 deletions(-)

New commits:
commit 67c2a4786154a5c246998f119c3349e4d725e43b
Author: Julien Nabet 
AuthorDate: Mon Dec 4 18:59:43 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 22:10:20 2023 +0100

cid#1545597 Using invalid iterator

and :

cid#1545537 Using invalid iterator
cid#1545508 Using invalid iterator
cid#1545494 Using invalid iterator
cid#1545478 Using invalid iterator
cid#1545427 Using invalid iterator
cid#1545420 Using invalid iterator
cid#1545400 Using invalid iterator
cid#1545300 Using invalid iterator
cid#1545258 Using invalid iterator
cid#1545257 Using invalid iterator
cid#1545200 Using invalid iterator
cid#1545183 Using invalid iterator

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

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index 301714911a3b..1995ed73c9ea 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2279,8 +2279,10 @@ void 
PlainStructType::dumpComprehensiveGetCppuType(FileStream & out)
 for (std::vector< unoidl::PlainStructTypeEntity::Member >::const_iterator 
i(
  entity_->getDirectMembers().begin());
  i != entity_->getDirectMembers().end();) {
+const auto iter = types.find(i->type);
+assert(iter != types.end());
 out << indent() << "{ { " << getTypeClass(i->type, true)
-<< ", the_tname" << types.find(i->type)->second
+<< ", the_tname" << iter->second
 << ".pData, the_name" << n++ << ".pData }, false }";
 ++i;
 out << (i == entity_->getDirectMembers().end() ? " };" : ",") << "\n";
@@ -2851,8 +2853,10 @@ void 
PolyStructType::dumpComprehensiveGetCppuType(FileStream & out)
 sal_uInt32 k = parameters.find(i->type)->second;
 out << "the_pclass" << k << ", the_pname" << k << ".pData";
 } else {
+const auto iter = types.find(i->type);
+assert(iter != types.end());
 out << getTypeClass(i->type, true) << ", the_tname"
-<< types.find(i->type)->second << ".pData";
+<< iter->second << ".pData";
 }
 out << ", the_name" << n++ << ".pData }, "
 << (i->parameterized ? "true" : "false") << " }";
diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 7a2ec55fa5c2..cfbec6afecef 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -912,7 +912,9 @@ void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const 
connectivity::OSQLTa
 if(m_bDeleted)
 {
 sal_Int32 nBookmark = 
::comphelper::getINT32((*_rDeleteRow)[0].getAny());
-if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != 
m_aKeyMap.end())
+const auto iter = m_aKeyMap.find(nBookmark);
+assert(iter != m_aKeyMap.end());
+if(m_aKeyIter == iter && m_aKeyIter != m_aKeyMap.end())
 ++m_aKeyIter;
 m_aKeyMap.erase(nBookmark);
 m_bDeleted = true;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index c8891889b01d..15cbecc32db3 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1687,7 +1687,9 @@ SvxAutoCorrectLanguageLists& 
SvxAutoCorrect::GetLanguageList_(
 LanguageTag aLanguageTag( eLang);
 if (m_aLangTable.find(aLanguageTag) == m_aLangTable.end())
 (void)CreateLanguageFile(aLanguageTag);
-return m_aLangTable.find(aLanguageTag)->second;
+const auto iter = m_aLangTable.find(aLanguageTag);
+assert(iter != m_aLangTable.end());
+return iter->second;
 }
 
 void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
@@ -1912,14 +1914,16 @@ void SvxAutoCorrect::MakeCombinedChanges( 
std::vector& aNewEntr
   LanguageType eLang )
 {
 LanguageTag aLanguageTag( eLang);
-auto const iter = m_aLangTable.find(aLanguageTag);
+auto iter = m_aLangTable.find(aLa

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

 sw/source/uibase/shells/txtnum.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 1a74a87b442857567d20da5dc97bbbc278745afd
Author: Justin Luth 
AuthorDate: Thu Nov 23 20:50:09 2023 -0500
Commit: Justin Luth 
CommitDate: Mon Dec 4 22:40:54 2023 +0100

related tdf#56258 sw sidebar SetOutline: do something without dropdown

The sidebar gained SetOutline in 7.6
with commit 3fd0b4053763aa91b0004c523e96e7d390c7b58e.

In the TOOLBAR, there is special code that tells the main button
to show the locale list outline choices - just like the dropdown does.
However, none of that code comes into play in the sidebar,
so add a special case to handle that situation.

It is easy to launch the dialog, focused on the outlinenum page.
Better yet would be to figure out how to launch the popup window
that the dropdown opens - so they do the same thing...

Change-Id: I3d6eeafaa8bdb45cfacc42e221820d664419e0e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159934
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Justin Luth 
Reviewed-by: Szymon Kłos 
(cherry picked from commit f384dc0476e4730d3ccb7a7f56eae8452bce133a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160180
Tested-by: Jenkins

diff --git a/sw/source/uibase/shells/txtnum.cxx 
b/sw/source/uibase/shells/txtnum.cxx
index c577cdafdfcc..e769b7f46347 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -310,6 +310,14 @@ void SwTextShell::ExecSetNumber(SfxRequest const &rReq)
 GetShell().SetCurNumRule( aNewNumRule, bCreateNewList );
 }
 }
+else if (nSlot == FN_SVX_SET_OUTLINE)
+{
+// no outline provided: launch dialog to request a specific 
outline
+SfxBindings& rBindings = 
GetView().GetViewFrame().GetBindings();
+const SfxStringItem aPage(FN_PARAM_1, "outlinenum");
+const SfxPoolItem* aItems[] = { &aPage, nullptr };
+rBindings.Execute(SID_OUTLINE_BULLET, aItems);
+}
 }
 break;

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-23.05.6-1'

Tag 'co-23.05.6-1' created by Andras Timar  at 
2023-12-04 22:17 +

co-23.05.6-1

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/co-23.05.6-1'

Tag 'co-23.05.6-1' created by Andras Timar  at 
2023-12-04 22:17 +

co-23.05.6-1

Changes since cp-23.05.5-4-1:
---
 0 files changed
---

[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-23.05.6-1'

Tag 'co-23.05.6-1' created by Andras Timar  at 
2023-12-04 22:17 +

co-23.05.6-1

Changes since cp-23.05.5-4-2:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-23.05.6-1'

Tag 'co-23.05.6-1' created by Andras Timar  at 
2023-12-04 22:17 +

co-23.05.6-1

Changes since cp-23.05.6-1-2:
---
 0 files changed
---

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

2023-12-04 Thread Chris Sherlock (via logerrit)

 include/vcl/outdev.hxx |2 ++
 vcl/qa/cppunit/complextext.cxx |   37 ++---
 vcl/source/outdev/font.cxx |   32 +++-
 vcl/source/outdev/outdev.cxx   |6 --
 4 files changed, 71 insertions(+), 6 deletions(-)

New commits:
commit 042dc4a9186f526b625817dde50bb2f5a91fd2c6
Author: Chris Sherlock 
AuthorDate: Thu Nov 9 18:19:41 2023 +1100
Commit: Tomaž Vajngerl 
CommitDate: Tue Dec 5 04:39:05 2023 +0100

vcl: add unit tests for a mixture of CJK and latin characters

To influence the fallback fonts chosen, I have introduced a new
OutputDevice function ForceFallbackFont() which injects ("forces") a
font as the first one in the font fallback chain.

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index bea1e00d9b7f..329364559108 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -184,6 +184,7 @@ private:
 mutable VclPtrmpNextGraphics; ///< Next output 
device in list
 GDIMetaFile*mpMetaFile;
 mutable rtl::Reference mpFontInstance;
+rtl::Reference mpForcedFallbackInstance;
 mutable std::unique_ptr  
mpFontFaceCollection;
 std::vectormaOutDevStateStack;
 std::unique_ptr mpOutDevData;
@@ -1165,6 +1166,7 @@ public:
 SAL_DLLPRIVATE static void  ImplUpdateAllFontData( bool bNewFontLists );
 
 LogicalFontInstance const* GetFontInstance() const;
+bool ForceFallbackFont(vcl::Font const& rFallbackFont);
 
 protected:
 SAL_DLLPRIVATE tools::Long GetEmphasisAscent() const { return 
mnEmphasisAscent; }
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 633dc2210e07..d4eb3db67093 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -491,6 +491,40 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf153440)
 #endif
 }
 
+CPPUNIT_TEST_FIXTURE(VclComplexTextTest, 
testMixedCJKLatinScript_glyph_advancements)
+{
+#if HAVE_MORE_FONTS
+#if !defined _WIN32
+OUString aTestScript(u"根据10.1(37BA) Eng"_ustr);
+
+ScopedVclPtrInstance pOutDev;
+// note you can only run this once and it was designed for tdf#107718
+bool bAdded = addFont(pOutDev, u"tdf107718.otf", u"Source Han Sans");
+CPPUNIT_ASSERT_EQUAL(true, bAdded);
+
+vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72));
+pOutDev->SetFont( aFont );
+
+vcl::Font aFallbackFont("DejaVu Sans", "Book", Size(0, 72));
+pOutDev->ForceFallbackFont(aFallbackFont);
+
+// absolute character widths AKA text array.
+tools::Long nRefTextWidth = 704;
+std::vector aRefCharWidths = { 72, 144, 190, 236, 259, 305, 
333, 379, 425, 474, 523, 551, 567, 612, 658, 704 };
+KernArray aCharWidths;
+tools::Long nTextWidth = pOutDev->GetTextArray(aTestScript, &aCharWidths);
+
+CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths.get_subunit_array());
+CPPUNIT_ASSERT_EQUAL(nRefTextWidth, nTextWidth);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(nTextWidth), aCharWidths.back());
+
+// text advance width and line height
+CPPUNIT_ASSERT_EQUAL(nRefTextWidth, pOutDev->GetTextWidth(aTestScript));
+CPPUNIT_ASSERT_EQUAL(tools::Long(105), pOutDev->GetTextHeight());
+#endif
+#endif
+}
+
 CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
 {
 #if !defined _WIN32 // TODO: Fails on jenkins but passes locally
@@ -498,9 +532,6 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
 
 ScopedVclPtrInstance pOutDev;
 
-bool bAdded = addFont(pOutDev, u"tdf107718.otf", u"Source Han Sans");
-CPPUNIT_ASSERT_EQUAL(true, bAdded);
-
 OUString aText(u"\u4E16\u1109\u1168\u11BC\u302E"_ustr);
 for (bool bVertical : { false, true })
 {
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index ea0727b294f9..0e37c7613ded 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1020,6 +1020,22 @@ std::unique_ptr 
OutputDevice::getFallbackLayout(
 return pFallback;
 }
 
+bool OutputDevice::ForceFallbackFont(vcl::Font const& rFallbackFont)
+{
+vcl::Font aOldFont = GetFont();
+SetFont(rFallbackFont);
+InitFont();
+
+mpForcedFallbackInstance = mpFontInstance;
+SetFont(aOldFont);
+InitFont();
+
+if (mpForcedFallbackInstance)
+return true;
+
+return false;
+}
+
 std::unique_ptr OutputDevice::ImplGlyphFallbackLayout( 
std::unique_ptr pSalLayout,
 vcl::text::ImplLayoutArgs& rLayoutArgs, const SalLayoutGlyphs* pGlyphs ) 
const
 {
@@ -1051,12 +1067,22 @@ std::unique_ptr 
OutputDevice::ImplGlyphFallbackLayout( std::unique_pt
 vcl::font::FontSelectPattern 
aFontSelData(mpFontInstance->GetFontSelectPattern());
 SalLayoutGlyphsImpl* pGlyphsImpl = pGlyphs ? pGlyphs->Impl(1) : nullptr;
 
+bool bHasUsedFallba

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

 vcl/source/treelist/transfer.cxx |   46 +--
 1 file changed, 16 insertions(+), 30 deletions(-)

New commits:
commit 2bde39767ff2aead9d4cfddc37f32103bfc52f63
Author: Mike Kaganski 
AuthorDate: Mon Dec 4 13:40:04 2023 +0300
Commit: Mike Kaganski 
CommitDate: Tue Dec 5 05:40:32 2023 +0100

Drop own mutex to prevent lock order problem

When running UITests on Windows with parallelism, I often see deadlocks
in clipboard threads, where one thread holds own mutex and tries to lock
solar mutex, and the other holds it and waits for own mutex. The problem
is in TransferableDataHelper::GetAny, where solar mutex is released
temporarily.

Avoid it by dropping own mutex, and only using solar mutex.

Change-Id: Idbfa2e1399fe94d092b4090e7aa4956be4103744
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160296
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Reviewed-by: Mike Kaganski 

diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 955b47b7cdf2..7e6009de77dc 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -23,7 +23,6 @@
 #include 
 #endif
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1036,7 +1035,6 @@ namespace {
 class TransferableClipboardNotifier : public ::cppu::WeakImplHelper< 
XClipboardListener >
 {
 private:
-::osl::Mutex&   mrMutex;
 Reference< XClipboardNotifier > mxNotifier;
 TransferableDataHelper* mpListener;
 
@@ -1048,7 +1046,7 @@ protected:
 virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
 public:
-TransferableClipboardNotifier( const Reference< XClipboard >& 
_rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex );
+TransferableClipboardNotifier( const Reference< XClipboard >& 
_rxClipboard, TransferableDataHelper& _rListener );
 
 /// determines whether we're currently listening
 bool isListening() const { return mpListener != nullptr; }
@@ -1059,9 +1057,8 @@ public:
 
 }
 
-TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< 
XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& 
_rMutex )
-:mrMutex( _rMutex )
-,mxNotifier( _rxClipboard, UNO_QUERY )
+TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< 
XClipboard >& _rxClipboard, TransferableDataHelper& _rListener )
+:mxNotifier( _rxClipboard, UNO_QUERY )
 ,mpListener( &_rListener )
 {
 osl_atomic_increment( &m_refCount );
@@ -1079,11 +1076,6 @@ 
TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X
 void SAL_CALL TransferableClipboardNotifier::changedContents( const 
clipboard::ClipboardEvent& event )
 {
 SolarMutexGuard aSolarGuard;
-// the SolarMutex here is necessary, since
-// - we cannot call mpListener without our own mutex locked
-// - Rebind respectively InitFormats (called by Rebind) will
-// try to lock the SolarMutex, too
-::osl::MutexGuard aGuard( mrMutex );
 if( mpListener )
 mpListener->Rebind( event.Contents );
 }
@@ -1098,7 +1090,7 @@ void SAL_CALL TransferableClipboardNotifier::disposing( 
const EventObject& )
 
 void TransferableClipboardNotifier::dispose()
 {
-::osl::MutexGuard aGuard( mrMutex );
+SolarMutexGuard g;
 
 Reference< XClipboardListener > xKeepMeAlive( this );
 
@@ -,7 +1103,6 @@ void TransferableClipboardNotifier::dispose()
 
 struct TransferableDataHelper_Impl
 {
-::osl::MutexmaMutex;
 rtl::Reference  mxClipboardListener;
 
 TransferableDataHelper_Impl()
@@ -1155,7 +1146,7 @@ TransferableDataHelper& 
TransferableDataHelper::operator=( const TransferableDat
 {
 if ( this != &rDataHelper )
 {
-::osl::MutexGuard aGuard(mxImpl->maMutex);
+SolarMutexGuard g;
 
 const bool bWasClipboardListening = mxImpl->mxClipboardListener.is();
 
@@ -1176,7 +1167,7 @@ TransferableDataHelper& 
TransferableDataHelper::operator=( const TransferableDat
 
 TransferableDataHelper& 
TransferableDataHelper::operator=(TransferableDataHelper&& rDataHelper)
 {
-::osl::MutexGuard aGuard(mxImpl->maMutex);
+SolarMutexGuard g;
 
 const bool bWasClipboardListening = mxImpl->mxClipboardListener.is();
 
@@ -1198,7 +1189,7 @@ TransferableDataHelper::~TransferableDataHelper()
 {
 StopClipboardListening( );
 {
-::osl::MutexGuard aGuard(mxImpl->maMutex);
+SolarMutexGuard g;
 maFormats.clear();
 mxObjDesc.reset();
 }
@@ -1302,7 +1293,6 @@ void TransferableDataHelper::FillDataFlavorExVector( 
const Sequence< DataFlavor
 void TransferableDataHelper::InitFormats()
 {
 SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard(mxImpl->maMutex);
 
 maFormats.clear();
 mxObjDesc.reset(new TransferableObjectDescriptor);
@@ -1328,14 +1318,14 @@ void Transferab

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

 sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat.rtf |   34 ++
 sw/qa/extras/rtfexport/rtfexport6.cxx |   14 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   11 
 3 files changed, 58 insertions(+), 1 deletion(-)

New commits:
commit 59a0be15b097dc4f2529837d128f52cc3fb497d9
Author: Justin Luth 
AuthorDate: Fri Dec 1 10:34:36 2023 -0500
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:30:29 2023 +0100

tdf#108505 writerfilter: fix legacy dropdown fields direct bold setting

Any character property should be passed on,
but do that in a follow-up commit, so that
at least the bold case will remain intact
if the broader fix gets reverted for any reason.

make CppunitTest_sw_rtfexport6 \
CPPUNIT_TEST_NAME=testTdf108505_fieldCharFormat

Change-Id: Id77980b704db2ff118e89c29eb9d4db82e117cdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160221
Reviewed-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat.rtf 
b/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat.rtf
new file mode 100644
index ..b05c2deec6b6
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat.rtf
@@ -0,0 +1,34 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang2057\deflangfe2057\themelang3079\themelangfe0\themelangcs0
+
+\noqfpromote {\stylesheet{\ql 
\li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 
+\af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \snext0 \sqformat 
\spriority0 Normal;}{\s17\ql \li0\ri0\widctlpar
+\tqc\tx4819\tqr\tx9071\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \sbasedon0 \snext17 
\slink18 header;}
+}
+\paperw16834\paperh11913\margl1134\margr1418\margt1418\margb567\gutter0\ltrsect
 
+\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
+\showxmlerrors1\noextrasprl\prcolbl\cvmme\sprsspbf\brkfrm\swpbdr\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\lytprtmet\hyphcaps0\formshade\horzdoc\fracwidth\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow0\dgvshow0
+\jexpand\viewkind1\viewscale70\pgbrdrhead\pgbrdrfoot\nolnhtadjtbl\nojkernpunct\rsidroot3825670
 \fet0
+
+\ltrrow\trowd \irow0\irowband0\lastrow \ltrrow
+\ts11\trgaph70\trleft-70\trkeep\trftsWidth3\trwWidth8931\trftsWidthB3\trftsWidthA3\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3\tblrsid16408416\tblind0\tblindtype3
 \clvertalc\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cltxlrtb\clftsWidth3\clwWidth1276\clshdrawnil 
\cellx1206\clvertalc\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl 
\clbrdrr\brdrs\brdrw30 \cltxlrtb\clftsWidth3\clwWidth3969\clshdrawnil 
\cellx5175\clvertalt\clbrdrt\brdrs\brdrw30 \clbrdrl\brdrs\brdrw30 
+\clbrdrb\brdrs\brdrw30 \clbrdrr\brdrs\brdrw30 
\cltxlrtb\clftsWidth3\clwWidth2126\clshdrawnil 
\cellx7301\clvertalt\clbrdrt\brdrtbl \clbrdrl\brdrs\brdrw30 \clbrdrb\brdrtbl 
\clbrdrr\brdrs\brdrw30 \cltxlrtb\clftsWidth3\clwWidth1560\clshdrawnil \cellx8861
+\pard\plain \ltrpar\s17\ql 
\li72\ri0\sb120\sa120\widctlpar\intbl\tqr\tx1561\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin72\pararsid8918882
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079
+
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New 
Roman;}{\f5\fnil\fprq2\fcharset128 Linux Biolinum Keyboard O;}}
+
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
+
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \f5\fs32\chcbpat7\insrsid16408416 
Header}{\rtlch\fcs1 \af0 \ltrch\fcs0 \fs32\insrsid16408416\charrsid8918882 
\cell }\pard\plain \ltrpar\ql 
\li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\pararsid5246913
 
+\rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 {\rtlch\fcs1 \af0 
\ltrch\fcs0 \insrsid16408416\charrsid8918882 Normal\cell }\pard \ltrpar
+\qc 
\li0\ri0\sb120\sa120\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0
 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid5701682\charrsid5701682 {\*\bkmkstart 
Dropdown1}x}{\field\fldpriv{\*\fldinst {\ltrch\fcs0 
+\b\fs48\cf4  FORMDROPDOWN }{{\*\datafield 0abcd}
+{\*\formfield{\fftype2\ffres25\fftypetxt0\ffh

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

2023-12-04 Thread Miklos Vajna (via logerrit)

 sw/inc/fmtrfmrk.hxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9c02160fc55bccc43d92c68ec5166a79d50e1528
Author: Miklos Vajna 
AuthorDate: Mon Dec 4 20:05:57 2023 +0100
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:31:19 2023 +0100

sw: document SwFormatRefMark

Explain where this can appear, who owns it and where it can be found on
the UI.

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

diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 8f708cf583ea..b41449fa97af 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -30,8 +30,13 @@
 class SwTextRefMark;
 class SwXReferenceMark;
 
-// ATT_REFMARK
-
+/// SfxPoolItem subclass that represents a reference mark (a position in the 
document with a name,
+/// which has a start and may or may not have an end).
+///
+/// This can be used as a character format in the hints array of a text node, 
it's owned by an
+/// SwTextRefMark.
+///
+/// It's Insert -> Cross-reference -> Cross-references -> set reference on the 
UI.
 class SAL_DLLPUBLIC_RTTI SwFormatRefMark final
 : public SfxPoolItem
 , public sw::BroadcastingModify

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

 sw/source/ui/frmdlg/column.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b6a1c05b03f2108ff48018606fde070d0b019bd
Author: Julien Nabet 
AuthorDate: Thu Nov 30 17:46:08 2023 +0100
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:41:10 2023 +0100

tdf#158450: fix crash when picking custom colour for column separator line

bt:
0x7ffeed9c4a2b in SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0::operator()() const 
(this=0x574a8e38) at 
/home/julien/lo/libreoffice/sw/source/ui/frmdlg/column.cxx:396
396 [this]{ return GetDialogController()->getDialog(); 
}))
0  0x7ffeed9c4a2b in SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0::operator()() const 
(this=0x574a8e38) at 
/home/julien/lo/libreoffice/sw/source/ui/frmdlg/column.cxx:396
1  0x7ffeed9c4a05 in std::__invoke_impl(std::__invoke_other, 
SwColumnPage::SwColumnPage(weld::Container*, weld::DialogController*, 
SfxItemSet const&)::$_0&) (__f=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/invoke.h:61
2  0x7ffeed9c4985 in std::__invoke_r(SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0&) (__fn=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/invoke.h:114
3  0x7ffeed9c489d in std::_Function_handler::_M_invoke(std::_Any_data const&) (__functor=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:290
4  0x71cb89e5 in std::function::operator()() 
const (this=0x574a8e38) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:591
5  0x71c94604 in ColorWindow::OpenPickerClickHdl(weld::Button&) 
(this=0x574a8db0) at 
/home/julien/lo/libreoffice/svx/source/tbxctrls/tbcontrl.cxx:2283
6  0x71c9356d in ColorWindow::LinkStubOpenPickerClickHdl(void*, 
weld::Button&) (instance=0x574a8db0, data=...) at 
/home/julien/lo/libreoffice/svx/source/tbxctrls/tbcontrl.cxx:2279

See complete bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=191146

Regression from:
862fd2fa19b64972247bde9b171ec828a30e1676
defer getting toplevel for color picker until we need it

Change-Id: I2932281cb3b1cb510013a19f6bcf3d9f9c6cdb7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160164
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4f8bb267489b14aa1dab360786d8f99c763f03b4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160178
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index c2a24ad18ef6..a64b6fe94eb5 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -393,7 +393,7 @@ SwColumnPage::SwColumnPage(weld::Container* pPage, 
weld::DialogController* pCont
 , m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft"))
 , m_xTextDirectionLB(new 
svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb")))
 , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"),
-[this]{ return GetDialogController()->getDialog(); }))
+[this]{ return GetFrameWeld(); }))
 , m_xLineTypeDLB(new 
SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
 , m_xEd1(new 
SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FieldUnit::CM)))
 , m_xEd2(new 
SwPercentField(m_xBuilder->weld_metric_spin_button("width2mf", FieldUnit::CM)))

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

 sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat2.rtf |   37 +
 sw/qa/extras/rtfexport/rtfexport6.cxx  |   21 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |   28 +++--
 3 files changed, 68 insertions(+), 18 deletions(-)

New commits:
commit caecfff1adbe9715260ef9e2009333e523d61123
Author: Justin Luth 
AuthorDate: Fri Dec 1 14:16:14 2023 -0500
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:48:38 2023 +0100

tdf#108505 writerfilter: fix field direct char settings

Instead of adding characters properties one at a time,
lets take care of everything all at once.

The results seem to be good so far.
There is even some similarity between
how MS Word has these properties on the
"in-between" pseudo end character, where
placing the cursor after the field gets these properties.
I don't see it happening in MS Word
at the pseudo start character, but it does in LO now...

Hopefully that doesn't end up doing bad things.

In the unit test, replacing the content ends up
in red, italic. However, I see the same thing in MSO
when testing with my second FORMTEXT example,
so I think everything is "working as expected".

I tried to see if I could limit doing this
for only certain types of fields or conditions.
However, pContext->GetResult() doesn't have a \fldrslt
yet at the time this is happening. Also, TextField.is()
happens less than I expected. I'm sure I could limit it
to just certain pContext->GetFieldId(),
but so far no problems are noticed for all field types.

make CppunitTest_sw_rtfexport6 \
CPPUNIT_TEST_NAME=testTdf108505_fieldCharFormat

make CppunitTest_sw_rtfexport6 \
CPPUNIT_TEST_NAME=testTdf108505_fieldCharFormat2

Change-Id: I3223437fd0d694f5e5733a9f7323f10f03d7802f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160232
Tested-by: Jenkins
Tested-by: Gabor Kelemen 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat2.rtf 
b/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat2.rtf
new file mode 100644
index ..bb45e3052011
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat2.rtf
@@ -0,0 +1,37 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang2057\deflangfe2057\themelang3079\themelangfe0\themelangcs0
+
+\noqfpromote {\stylesheet{\ql 
\li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 
+\af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \snext0 \sqformat 
\spriority0 Normal;}{\s17\ql \li0\ri0\widctlpar
+\tqc\tx4819\tqr\tx9071\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \sbasedon0 \snext17 
\slink18 header;}
+}
+\paperw16834\paperh11913\margl1134\margr1418\margt1418\margb567\gutter0\ltrsect
 
+\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
+\showxmlerrors1\noextrasprl\prcolbl\cvmme\sprsspbf\brkfrm\swpbdr\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\lytprtmet\hyphcaps0\formshade\horzdoc\fracwidth\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow0\dgvshow0
+\jexpand\viewkind1\viewscale70\pgbrdrhead\pgbrdrfoot\nolnhtadjtbl\nojkernpunct\rsidroot3825670
 \fet0
+
+\ltrrow\trowd \irow0\irowband0\lastrow \ltrrow
+\ts11\trgaph70\trleft-70\trkeep\trftsWidth3\trwWidth8931\trftsWidthB3\trftsWidthA3\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3\tblrsid16408416\tblind0\tblindtype3
 \clvertalc\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cltxlrtb\clftsWidth3\clwWidth1276\clshdrawnil 
\cellx1206\clvertalc\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl 
\clbrdrr\brdrs\brdrw30 \cltxlrtb\clftsWidth3\clwWidth3969\clshdrawnil 
\cellx5175\clvertalt\clbrdrt\brdrs\brdrw30 \clbrdrl\brdrs\brdrw30 
+\clbrdrb\brdrs\brdrw30 \clbrdrr\brdrs\brdrw30 
\cltxlrtb\clftsWidth3\clwWidth2126\clshdrawnil 
\cellx7301\clvertalt\clbrdrt\brdrtbl \clbrdrl\brdrs\brdrw30 \clbrdrb\brdrtbl 
\clbrdrr\brdrs\brdrw30 \cltxlrtb\clftsWidth3\clwWidth1560\clshdrawnil \cellx8861
+\pard\plain \ltrpar\s17\ql 
\li72\ri0\sb120\sa120\widctlpar\intbl\tqr\tx1561\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin72\pararsid8918882
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079
+
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New 
Roman;}{\f5\fnil\fprq2\fcharset128 Linux Biolinum Keyboard O;}}
+
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0

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