[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 15 commits - download.lst external/libtommath external/poppler readlicense_oo/license svx/source sw/qa sw/source vcl/qa vcl/skia vcl/source vcl/unx

Patrick Luby (via logerrit) Wed, 27 Sep 2023 12:28:01 -0700

 download.lst                                      |   12 
 external/libtommath/README                        |    2 
 external/libtommath/UnpackedTarball_libtommath.mk |    2 
 external/libtommath/clang-cl.patch                |   16 
 external/libtommath/libtommath-msvc.patch         |   12 
 external/poppler/ExternalPackage_poppler_data.mk  |   24 
 external/poppler/README                           |    2 
 external/poppler/StaticLibrary_poppler.mk         |   52 
 external/poppler/UnpackedTarball_poppler.mk       |    8 
 external/poppler/disable-freetype.patch.1         |   18 
 external/poppler/disable-nss-and-gpgmepp.patch.1  |   76 
 external/poppler/gcc7-EntityInfo.patch.1          |   43 
 external/poppler/gcc7-GfxFont.patch.1             |   94 
 external/poppler/inc/pch/precompiled_poppler.hxx  |   30 
 external/poppler/poppler-config.patch.1           |   42 
 readlicense_oo/license/CREDITS.fodt               | 3266 +++++++++++-----------
 svx/source/styles/CommonStylePreviewRenderer.cxx  |   16 
 sw/qa/extras/layout/data/tdf155177-1-min.odt      |binary
 sw/qa/extras/layout/layout2.cxx                   |   57 
 sw/source/core/crsr/crsrsh.cxx                    |    6 
 sw/source/core/layout/tabfrm.cxx                  |    6 
 sw/source/core/text/txtfrm.cxx                    |   23 
 sw/source/core/text/widorp.cxx                    |   44 
 sw/source/core/text/widorp.hxx                    |    6 
 vcl/qa/cppunit/pdfexport/pdfexport.cxx            |    3 
 vcl/skia/gdiimpl.cxx                              |    8 
 vcl/source/gdi/pdfwriter_impl.cxx                 |   10 
 vcl/unx/generic/gdi/cairotextrender.cxx           |   11 
 vcl/unx/gtk3/gtkinst.cxx                          |   13 
 29 files changed, 2110 insertions(+), 1792 deletions(-)


New commits:
commit db5384361773a63e292f27af05b1f4fd844c5c4a
Author:     Patrick Luby <plub...@neooffice.org>
AuthorDate: Thu Sep 21 20:20:33 2023 -0400
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:35 2023 +0200

    tdf#157312 Don't change priority
    
    Instances of this class are constructed with
    TaskPriority::POST_PAINT, but then it was set to
    TaskPriority::HIGHEST when reused. Flushing
    seems to be expensive (at least with Skia/Metal) so keep the
    existing priority when reused.
    
    Change-Id: Ieb40cd6122f543f76e66456cc92a8643e2320d73
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157162
    Tested-by: Jenkins
    Reviewed-by: Patrick Luby <plub...@neooffice.org>
    (cherry picked from commit daa4a29c993df2e137b222ac3e60aa4b417a2d2d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157123
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 677d8c117835..b88ed673f282 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -254,7 +254,13 @@ public:
     {
         mpGraphics->performFlush();
         Stop();
-        SetPriority(TaskPriority::HIGHEST);
+        // tdf#157312 Don't change priority
+        // Instances of this class are constructed with
+        // TaskPriority::POST_PAINT, but then it was set to
+        // TaskPriority::HIGHEST when reused. Flushing
+        // seems to be expensive (at least with Skia/Metal) so keep the
+        // existing priority when reused.
+        SetPriority(TaskPriority::POST_PAINT);
     }
 };
 
commit 5574ab430d14a8e2d2c170181e51d7dcac55b68e
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Aug 25 14:20:34 2023 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:35 2023 +0200

    tdf#155177 sw: fix 2-line bug in WidowsAndOrphans::WouldFit()
    
    The problem is that the check if the line contains a non-fly portion
    was only done in the loop, but the first line is already handled before
    the loop, so its non-fly portions are ignored and never less than 2
    lines are moved, regardless of widow/orphan settings.
    
    (regression from commit 8c32cc17ce914188ea6783b0f79e19c5ddbf0b8d)
    
    Change-Id: Ic017a17233fcd58e22d54386650328f00fb3e9f7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156121
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit fe89122c15744afcaccaa6d6628fa0436adf12e1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156197
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/qa/extras/layout/data/tdf155177-1-min.odt 
b/sw/qa/extras/layout/data/tdf155177-1-min.odt
new file mode 100644
index 000000000000..68363860f05d
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf155177-1-min.odt differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index f1a4c436ce32..bce3121ab3d0 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -2426,6 +2426,63 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf109077)
     CPPUNIT_ASSERT_LESS(static_cast<sal_Int32>(15), nTextBoxTop - nShapeTop);
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf155177)
+{
+    createSwDoc("tdf155177-1-min.odt");
+
+    uno::Reference<beans::XPropertySet> 
xStyle(getStyles("ParagraphStyles")->getByName("Text Body"),
+                                               uno::UNO_QUERY_THROW);
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(210), getProperty<sal_Int32>(xStyle, 
"ParaTopMargin"));
+
+    {
+        xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+        assertXPath(pXmlDoc, "/root/page[2]/body/txt", 6);
+        assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[6]/SwParaPortion/SwLineLayout", 2);
+        assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[6]/SwParaPortion/SwLineLayout[2]", "portion",
+                    "long as two lines.");
+        assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 3);
+        assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+                    "This paragraph is even longer so that ");
+        discardDumpedLayout();
+    }
+
+    // this should bring one line back
+    xStyle->setPropertyValue("ParaTopMargin", uno::Any(sal_Int32(200)));
+
+    Scheduler::ProcessEventsToIdle();
+
+    {
+        xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+        assertXPath(pXmlDoc, "/root/page[2]/body/txt", 7);
+        assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout", 1);
+        assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[1]", "portion",
+                    "This paragraph is even longer so that ");
+        assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 2);
+        assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+                    "it is now three lines long though ");
+        discardDumpedLayout();
+    }
+
+    // this should bring second line back
+    xStyle->setPropertyValue("ParaTopMargin", uno::Any(sal_Int32(120)));
+
+    Scheduler::ProcessEventsToIdle();
+
+    {
+        xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+        assertXPath(pXmlDoc, "/root/page[2]/body/txt", 7);
+        assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout", 2);
+        assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[1]", "portion",
+                    "This paragraph is even longer so that ");
+        assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[2]", "portion",
+                    "it is now three lines long though ");
+        assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 1);
+        assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+                    "containing a single sentence.");
+        discardDumpedLayout();
+    }
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testUserFieldTypeLanguage)
 {
     // Set the system locale to German, the document will be English.
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 7ac2a5183114..e29bbdfe18c9 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -3807,28 +3807,7 @@ sal_uInt16 SwTextFrame::FirstLineHeight() const
     for (SwLineLayout const* pLine = pPara; pLine; pLine = pLine->GetNext())
     {
         nHeight += pLine->Height();
-        bool hasNonFly(false);
-        for (SwLinePortion const* pPortion = pLine->GetFirstPortion();
-                pPortion; pPortion = pPortion->GetNextPortion())
-        {
-            switch (pPortion->GetWhichPor())
-            {
-                case PortionType::Fly:
-                case PortionType::Glue:
-                case PortionType::Margin:
-                    break;
-                default:
-                {
-                    hasNonFly = true;
-                    break;
-                }
-            }
-            if (hasNonFly)
-            {
-                break;
-            }
-        }
-        if (hasNonFly)
+        if (::sw::FindNonFlyPortion(*pLine))
         {
             break;
         }
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 195601f5478d..1cd6cacae72d 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -573,6 +573,30 @@ bool WidowsAndOrphans::FindWidows( SwTextFrame *pFrame, 
SwTextMargin &rLine )
     return true;
 }
 
+namespace sw {
+
+auto FindNonFlyPortion(SwLineLayout const& rLine) -> bool
+{
+    for (SwLinePortion const* pPortion = rLine.GetFirstPortion();
+            pPortion; pPortion = pPortion->GetNextPortion())
+    {
+        switch (pPortion->GetWhichPor())
+        {
+            case PortionType::Fly:
+            case PortionType::Glue:
+            case PortionType::Margin:
+                break;
+            default:
+            {
+                return true;
+            }
+        }
+    }
+    return false;
+};
+
+} // namespace sw
+
 bool WidowsAndOrphans::WouldFit( SwTextMargin &rLine, SwTwips &rMaxHeight, 
bool bTst, bool bMoveBwd )
 {
     // Here it does not matter, if pFrame is swapped or not.
@@ -592,6 +616,10 @@ bool WidowsAndOrphans::WouldFit( SwTextMargin &rLine, 
SwTwips &rMaxHeight, bool
 
     // tdf#146500 for MoveBwd(), want at least 1 line with non-fly
     bool hasNonFly(!bMoveBwd);
+    if (!hasNonFly)
+    {
+        hasNonFly = ::sw::FindNonFlyPortion(*rLine.GetCurr());
+    }
     while (nMinLines > rLine.GetLineNr() || !hasNonFly)
     {
         if( !rLine.NextLine() )
@@ -602,21 +630,9 @@ bool WidowsAndOrphans::WouldFit( SwTextMargin &rLine, 
SwTwips &rMaxHeight, bool
                 break;
         }
         nLineSum += rLine.GetLineHeight();
-        for (SwLinePortion const* pPortion = 
rLine.GetCurr()->GetFirstPortion();
-                !hasNonFly && pPortion; pPortion = pPortion->GetNextPortion())
+        if (!hasNonFly)
         {
-            switch (pPortion->GetWhichPor())
-            {
-                case PortionType::Fly:
-                case PortionType::Glue:
-                case PortionType::Margin:
-                    break;
-                default:
-                {
-                    hasNonFly = true;
-                    break;
-                }
-            }
+            hasNonFly = ::sw::FindNonFlyPortion(*rLine.GetCurr());
         }
     }
 
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 193d27f633fe..996a7fc913bc 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -79,4 +79,10 @@ public:
     }
 };
 
+namespace sw {
+
+auto FindNonFlyPortion(SwLineLayout const& rLine) -> bool;
+
+} // namespace sw
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ee69342eba786deffaccf425c66a9ffd52e29c3f
Author:     Aron Budea <aron.bu...@collabora.com>
AuthorDate: Tue Sep 26 00:09:52 2023 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:35 2023 +0200

    tdf#152675 treat all cairo versions <= 1.17.8 the same (actually)
    
    Use correct condition.
    
    Follow-up to 1dd357ccf7ca9edbe5f2ef60465c2559f678d306.
    
    Change-Id: Icc2d04c0023b0a6595ece89d389919f3821aacbc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157260
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit 5b52a7c3154f5263db82f19f7cc7d0e7b32da603)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157220

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 5a54f8c9b08c..e7e57b42313e 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -321,7 +321,7 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
                 // See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
                 // b) tdf#152675 a similar report for cairo: 1.16.0-4ubuntu1,
                 // assume that everything <= 1.17.8 is unsafe to disable this
-                if (cairo_version() <= CAIRO_VERSION_ENCODE(1, 17, 8))
+                if (cairo_version() > CAIRO_VERSION_ENCODE(1, 17, 8))
                     cairo_font_options_set_hint_metrics(pOptions, 
CAIRO_HINT_METRICS_OFF);
             }
             cairo_set_font_options(cr, pOptions);
commit dab567226d20912efdd5ed74b625c700266d2eac
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Sep 25 15:50:43 2023 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:34 2023 +0200

    poppler: upgrade to release 23.09.0
    
    Fixes CVE-2023-34872
    
    Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157253
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/download.lst b/download.lst
index 90e31e173d44..5e87e03bfa12 100644
--- a/download.lst
+++ b/download.lst
@@ -522,8 +522,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
-POPPLER_TARBALL := poppler-23.06.0.tar.xz
+POPPLER_SHA256SUM := 
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
+POPPLER_TARBALL := poppler-23.09.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index c8c2e47c43d1..7b6f958245ac 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -13,7 +13,10 @@ $(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler))
 
 $(eval $(call 
gb_StaticLibrary_set_precompiled_header,poppler,external/poppler/inc/pch/precompiled_poppler))
 
-$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg))
+$(eval $(call gb_StaticLibrary_use_externals,poppler,\
+       libjpeg \
+       zlib \
+))
 
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler))
 
@@ -92,6 +95,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
        UnpackedTarball/poppler/poppler/FDPDFDocBuilder \
        UnpackedTarball/poppler/poppler/FILECacheLoader \
        UnpackedTarball/poppler/poppler/FileSpec \
+       UnpackedTarball/poppler/poppler/FlateEncoder \
        UnpackedTarball/poppler/poppler/FontEncodingTables \
        UnpackedTarball/poppler/poppler/FontInfo \
        UnpackedTarball/poppler/poppler/Form \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 77c643de40f5..3c4d1d0f7a8a 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -19,9 +19,9 @@ disable freetype dependent code
 -#include FT_FREETYPE_H
 +//#include <ft2build.h>
 +//#include FT_FREETYPE_H
+ #include <unordered_set>
  
  // helper for using std::visit to get a dependent false for static_asserts
- // to help get compile errors if one ever extends variants
 @@ -2760,6 +2760,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
&filepath, int faceIndex, const std::string &fontFamily, const std::string 
&fontStyle, bool forceName)
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index be8fc98556a7..8f71e987b2b9 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -2,7 +2,7 @@
 
 note: to get the 3rd one, use -DENABLE_CPP=on
 
-mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off 
-DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off 
-DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6
+mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off 
-DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off 
-DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6=off
 
 manually disabled these because cmake failed to do it:
 HAVE_CAIRO
@@ -37,9 +37,6 @@ index 0fbd336a..451213f8 100644
 +/* Do not hardcode the library location */
 +/* #undef ENABLE_RELOCATABLE */
 +
-+/* Build against zlib. */
-+/* #undef ENABLE_ZLIB */
-+
 +/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */
 +/* #undef ENABLE_ZLIB_UNCOMPRESS */
 +
@@ -182,7 +179,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_NAME "poppler"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "poppler 23.06.0"
++#define PACKAGE_STRING "poppler 23.09.0"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "poppler"
@@ -191,7 +188,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_URL ""
 +
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "23.06.0"
++#define PACKAGE_VERSION "23.09.0"
 +
 +/* Poppler data dir */
 +#define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -209,12 +206,15 @@ index 0fbd336a..451213f8 100644
 +/* #undef USE_FLOAT */
 +
 +/* Version number of package */
-+#define VERSION "23.06.0"
++#define VERSION "23.09.0"
 +
 +#if defined(__APPLE__)
 +#elif defined (_WIN32)
 +/* Use win32 font configuration backend */
 +#define WITH_FONTCONFIGURATION_WIN32 1
++#elif defined (__ANDROID__)
++/* Use android font configuration backend */
++#define WITH_FONTCONFIGURATION_ANDROID 1
 +#else
 +/* Use fontconfig font configuration backend */
 +#define WITH_FONTCONFIGURATION_FONTCONFIG 1
@@ -251,7 +251,7 @@ new file mode 100644
 index 0fbd336a..451213f8 100644
 --- /dev/null
 +++ b/poppler/poppler-config.h
-@@ -0,0 +1,161 @@
+@@ -0,0 +1,156 @@
 +//================================================= -*- mode: c++ -*- ====
 +//
 +// poppler-config.h
@@ -290,7 +290,7 @@ index 0fbd336a..451213f8 100644
 +
 +/* Defines the poppler version. */
 +#ifndef POPPLER_VERSION
-+#define POPPLER_VERSION "23.06.0"
++#define POPPLER_VERSION "23.09.0"
 +#endif
 +
 +/* Use single precision arithmetic in the Splash backend */
@@ -328,11 +328,6 @@ index 0fbd336a..451213f8 100644
 +/* #define ENABLE_LIBPNG 1 */
 +#endif
 +
-+/* Use zlib instead of builtin zlib decoder. */
-+#ifndef ENABLE_ZLIB
-+/* #undef ENABLE_ZLIB */
-+#endif
-+
 +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
 +   */
 +#ifndef HAVE_DIRENT_H
@@ -442,9 +437,9 @@ index 0fbd336a..451213f8 100644
 +
 +#include "poppler-global.h"
 +
-+#define POPPLER_VERSION "23.06.0"
++#define POPPLER_VERSION "23.09.0"
 +#define POPPLER_VERSION_MAJOR 23
-+#define POPPLER_VERSION_MINOR 06
++#define POPPLER_VERSION_MINOR 9
 +#define POPPLER_VERSION_MICRO 0
 +
 +namespace poppler
commit 6233d0fdd6efbe5bc68c33149bd48a27549b90c0
Author:     Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 14 09:58:15 2023 +0900
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:34 2023 +0200

    poppler: upgrade to release 23.06.0
    
    Add external/poppler/disable-nss-and-gpgmepp.patch.1 to get rid of
    some code that requires NSS or GPGMEPP.
    
    Update external/poppler/inc/pch/precompiled_poppler.hxx.
    
    Change-Id: I5e61371776c64962452022516446b5079c3840e2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153097
    Tested-by: Jenkins
    Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
    (cherry picked from commit 27e1c198a504deb4634f5f6673a77b5944c9f8cc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157252
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/download.lst b/download.lst
index af6a5e82ed6a..90e31e173d44 100644
--- a/download.lst
+++ b/download.lst
@@ -522,8 +522,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
-POPPLER_TARBALL := poppler-23.03.0.tar.xz
+POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
+POPPLER_TARBALL := poppler-23.06.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/README b/external/poppler/README
index 35a640264618..08d3612c3542 100644
--- a/external/poppler/README
+++ b/external/poppler/README
@@ -1 +1 @@
-From [http://poppler.freedesktop.org/]. Not modified.  PDF rendering library 
based on the xpdf-3.0 code base. 
+From [https://poppler.freedesktop.org/]. Not modified.  PDF rendering library 
based on the xpdf-3.0 code base.
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index 6cbed9e103ec..73265d8ec65b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
        external/poppler/char_traits.patch \
        external/poppler/disable-freetype.patch.1 \
+       external/poppler/disable-nss-and-gpgmepp.patch.1 \
        external/poppler/gcc7-EntityInfo.patch.1 \
        external/poppler/gcc7-GfxFont.patch.1 \
        external/poppler/poppler-config.patch.1 \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 710742206925..77c643de40f5 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -1,8 +1,8 @@
 disable freetype dependent code
 
---- poppler/poppler/Form.cc.orig       2022-09-14 15:46:48.588316681 +0200
-+++ poppler/poppler/Form.cc    2022-09-14 15:48:01.468274551 +0200
-@@ -46,7 +46,7 @@
+--- poppler/poppler/Form.cc.orig       2023-06-05 19:29:14.000000000 +0900
++++ poppler/poppler/Form.cc    2023-06-14 18:50:22.232312300 +0900
+@@ -48,7 +48,7 @@
  #include <cstdlib>
  #include <cstring>
  #include <cctype>
@@ -11,7 +11,7 @@ disable freetype dependent code
  #include "goo/gmem.h"
  #include "goo/gfile.h"
  #include "goo/GooString.h"
-@@ -77,8 +77,8 @@
+@@ -78,8 +78,8 @@
  #include "fofi/FoFiTrueType.h"
  #include "fofi/FoFiIdentifier.h"
  
@@ -20,18 +20,18 @@ disable freetype dependent code
 +//#include <ft2build.h>
 +//#include FT_FREETYPE_H
  
- // return a newly allocated char* containing an UTF16BE string of size length
- char *pdfDocEncodingToUTF16(const std::string &orig, int *length)
-@@ -2743,6 +2743,8 @@
+ // helper for using std::visit to get a dependent false for static_asserts
+ // to help get compile errors if one ever extends variants
+@@ -2760,6 +2760,8 @@
  
- Form::AddFontResult Form::addFontToDefaultResources(const std::string 
&filepath, int faceIndex, const std::string &fontFamily, const std::string 
&fontStyle)
+ Form::AddFontResult Form::addFontToDefaultResources(const std::string 
&filepath, int faceIndex, const std::string &fontFamily, const std::string 
&fontStyle, bool forceName)
  {
 +    return {};
 +#if 0
      if (!GooString::endsWith(filepath, ".ttf") && 
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath, 
".otf")) {
          error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for 
now. The font file for {0:s} {1:s} was {2:s}", fontFamily.c_str(), 
fontStyle.c_str(), filepath.c_str());
          return {};
-@@ -2951,6 +2953,7 @@
+@@ -2994,6 +2996,7 @@
      }
  
      return { dictFontName, fontDictRef };
diff --git a/external/poppler/disable-nss-and-gpgmepp.patch.1 
b/external/poppler/disable-nss-and-gpgmepp.patch.1
new file mode 100644
index 000000000000..01b442f53a1c
--- /dev/null
+++ b/external/poppler/disable-nss-and-gpgmepp.patch.1
@@ -0,0 +1,76 @@
+disable NSS/GPGMEPP dependent code.
+
+--- poppler/poppler/Form.cc.orig       2023-06-05 19:29:14.000000000 +0900
++++ poppler/poppler/Form.cc    2023-06-17 16:51:27.873431500 +0900
+@@ -64,7 +64,7 @@
+ #include "Form.h"
+ #include "PDFDoc.h"
+ #include "DateInfo.h"
+-#include "CryptoSignBackend.h"
++/*#include "CryptoSignBackend.h"*/
+ #include "SignatureInfo.h"
+ #include "CertificateInfo.h"
+ #include "XRef.h"
+@@ -577,7 +577,7 @@
+ {
+     return static_cast<FormFieldSignature 
*>(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime, 
ocspRevocationCheck, enableAIA);
+ }
+-
++#if 0
+ // update hash with the specified range of data from the file
+ static bool hashFileRange(FILE *f, CryptoSign::SigningInterface *handler, 
Goffset start, Goffset end)
+ {
+@@ -607,10 +607,12 @@
+     delete[] buf;
+     return true;
+ }
++#endif
+ 
+ bool FormWidgetSignature::signDocument(const std::string &saveFilename, const 
std::string &certNickname, const std::string &password, const GooString 
*reason, const GooString *location, const std::optional<GooString> 
&ownerPassword,
+                                        const std::optional<GooString> 
&userPassword)
+ {
++#if 0
+     auto backend = CryptoSign::Factory::createActive();
+     if (!backend) {
+         return false;
+@@ -698,6 +700,8 @@
+     fclose(file);
+ 
+     return true;
++#endif
++    return false;
+ }
+ 
+ bool FormWidgetSignature::signDocumentWithAppearance(const std::string 
&saveFilename, const std::string &certNickname, const std::string &password, 
const GooString *reason, const GooString *location,
+@@ -2316,6 +2320,7 @@
+ 
+ void 
FormFieldSignature::hashSignedDataBlock(CryptoSign::VerificationInterface 
*handler, Goffset block_len)
+ {
++#if 0
+     if (!handler) {
+         return;
+     }
+@@ -2335,6 +2340,7 @@
+             i += BLOCK_SIZE;
+         }
+     }
++#endif
+ }
+ 
+ FormSignatureType FormWidgetSignature::signatureType() const
+@@ -2349,6 +2355,7 @@
+ 
+ SignatureInfo *FormFieldSignature::validateSignature(bool doVerifyCert, bool 
forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool 
enableAIA)
+ {
++#if 0
+     auto backend = CryptoSign::Factory::createActive();
+     if (!backend) {
+         return signature_info;
+@@ -2425,6 +2432,7 @@
+     const CertificateValidationStatus cert_val_state = 
signature_handler->validateCertificate(std::chrono::system_clock::from_time_t(validationTime),
 ocspRevocationCheck, enableAIA);
+     signature_info->setCertificateValStatus(cert_val_state);
+ 
++#endif
+     return signature_info;
+ }
+ 
diff --git a/external/poppler/gcc7-EntityInfo.patch.1 
b/external/poppler/gcc7-EntityInfo.patch.1
index b450bff93af9..1dd7c83ad475 100644
--- a/external/poppler/gcc7-EntityInfo.patch.1
+++ b/external/poppler/gcc7-EntityInfo.patch.1
@@ -2,28 +2,35 @@ gcc 7.3.1 says:
 
 workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:42:34: error: 
function ‘X509CertificateInfo::EntityInfo& 
X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo&&)’ 
defaulted on its redeclaration with an exception-specification that differs 
from the implicit exception-specification ‘’
 
---- poppler/poppler/CertificateInfo.h.orig     2022-09-14 19:32:12.426351385 
+0200
-+++ poppler/poppler/CertificateInfo.h  2022-09-14 19:32:18.947347812 +0200
-@@ -70,7 +70,7 @@
-         ~EntityInfo();
- 
-         EntityInfo(EntityInfo &&) noexcept;
--        EntityInfo &operator=(EntityInfo &&) noexcept;
-+        EntityInfo &operator=(EntityInfo &&) /*noexcept*/;
- 
-         EntityInfo(const EntityInfo &) = delete;
-         EntityInfo &operator=(const EntityInfo &) = delete;
---- poppler/poppler/CertificateInfo.cc.orig    2022-09-14 19:31:10.225385467 
+0200
-+++ poppler/poppler/CertificateInfo.cc 2022-09-14 19:31:12.572384182 +0200
-@@ -39,7 +39,7 @@
+workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc: In member function 
‘void 
X509CertificateInfo::setPublicKeyInfo(X509CertificateInfo::PublicKeyInfo&&)’:
+workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:106:39: error: use 
of deleted function ‘X509CertificateInfo::PublicKeyInfo& 
X509CertificateInfo::PublicKeyInfo::operator=(X509CertificateInfo::PublicKeyInfo&&)’
+     public_key_info = std::move(pkInfo);
+                                       ^
+In file included from 
workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:15:0:
+workdir/UnpackedTarball/poppler/poppler/CertificateInfo.h:58:24: note: 
‘X509CertificateInfo::PublicKeyInfo& 
X509CertificateInfo::PublicKeyInfo::operator=(X509CertificateInfo::PublicKeyInfo&&)
 noexcept’ is implicitly deleted because its exception-specification does not 
match the implicit exception-specification ‘’
+         PublicKeyInfo &operator=(PublicKeyInfo &&) noexcept = default;
+                        ^~~~~~~~
+
+--- poppler/poppler/CertificateInfo.h.orig     2023-06-05 19:29:14.000000000 
+0900
++++ poppler/poppler/CertificateInfo.h  2023-06-19 18:10:55.760031700 +0900
+@@ -55,7 +55,7 @@
+         PublicKeyInfo() = default;
  
- X509CertificateInfo::EntityInfo::EntityInfo(X509CertificateInfo::EntityInfo 
&&other) noexcept = default;
+         PublicKeyInfo(PublicKeyInfo &&) noexcept = default;
+-        PublicKeyInfo &operator=(PublicKeyInfo &&) noexcept = default;
++        PublicKeyInfo &operator=(PublicKeyInfo &&) /*noexcept*/ = default;
  
--X509CertificateInfo::EntityInfo 
&X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo 
&&other) noexcept = default;
-+X509CertificateInfo::EntityInfo 
&X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo 
&&other) /*noexcept*/ = default;
+         PublicKeyInfo(const PublicKeyInfo &) = delete;
+         PublicKeyInfo &operator=(const PublicKeyInfo &) = delete;
+@@ -71,7 +71,7 @@
+         ~EntityInfo() = default;
  
- X509CertificateInfo::X509CertificateInfo() : ku_extensions(KU_NONE), 
cert_version(-1), is_self_signed(false) { }
+         EntityInfo(EntityInfo &&) noexcept = default;
+-        EntityInfo &operator=(EntityInfo &&) noexcept = default;
++        EntityInfo &operator=(EntityInfo &&) /*noexcept*/ = default;
  
+         EntityInfo(const EntityInfo &) = delete;
+         EntityInfo &operator=(const EntityInfo &) = delete;
 --- poppler/poppler/GfxFont.cc.orig    2022-09-14 20:24:32.569607333 +0200
 +++ poppler/poppler/GfxFont.cc 2022-09-14 20:24:52.323596186 +0200
 @@ -180,7 +180,7 @@
diff --git a/external/poppler/inc/pch/precompiled_poppler.hxx 
b/external/poppler/inc/pch/precompiled_poppler.hxx
index 0b2824d753c9..50944b80daef 100644
--- a/external/poppler/inc/pch/precompiled_poppler.hxx
+++ b/external/poppler/inc/pch/precompiled_poppler.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2021-11-03 15:11:24 using:
+ Generated on 2023-06-18 21:15:26 using:
  ./bin/update_pch external/poppler poppler --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -22,7 +22,22 @@
 
 #include <sal/config.h>
 #if PCH_LEVEL >= 1
+#include <Object.h>
 #include <algorithm>
+#include <annot_stamp_approved.h>
+#include <annot_stamp_as_is.h>
+#include <annot_stamp_confidential.h>
+#include <annot_stamp_departmental.h>
+#include <annot_stamp_draft.h>
+#include <annot_stamp_experimental.h>
+#include <annot_stamp_expired.h>
+#include <annot_stamp_final.h>
+#include <annot_stamp_for_comment.h>
+#include <annot_stamp_for_public_release.h>
+#include <annot_stamp_not_approved.h>
+#include <annot_stamp_not_for_public_release.h>
+#include <annot_stamp_sold.h>
+#include <annot_stamp_top_secret.h>
 #include <array>
 #include <cassert>
 #include <cctype>
@@ -40,18 +55,23 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <gbase64.h>
+#include <gbasename.h>
 #include <gdir.h>
 #include <gfile.h>
 #include <glibc.h>
 #include <gmem.h>
 #include <grandom.h>
 #include <gstrtod.h>
+#include <iomanip>
+#include <iostream>
 #include <limits>
 #include <memory>
 #include <poppler-config.h>
 #include <random>
 #include <regex>
 #include <set>
+#include <sstream>
 #include <vector>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
@@ -65,6 +85,10 @@
 #include <goo/GooLikely.h>
 #include <goo/GooString.h>
 #include <goo/GooTimer.h>
+#include <goo/ImgWriter.h>
+#include <goo/JpegWriter.h>
+#include <goo/PNGWriter.h>
+#include <goo/TiffWriter.h>
 #include <goo/gdir.h>
 #include <goo/gfile.h>
 #include <goo/glibc.h>
@@ -72,6 +96,10 @@
 #include <goo/grandom.h>
 #include <goo/gstrtod.h>
 #include <poppler/Error.h>
+#include <poppler/GfxState.h>
+#include <poppler/GfxState_helpers.h>
+#include <splash/Splash.h>
+#include <splash/SplashBitmap.h>
 #include <splash/SplashTypes.h>
 #include <sys/stat.h>
 #endif // PCH_LEVEL >= 3
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index 503cf1c0ae46..be8fc98556a7 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -2,7 +2,7 @@
 
 note: to get the 3rd one, use -DENABLE_CPP=on
 
-mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off 
-DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off 
-DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off
+mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off 
-DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off 
-DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6
 
 manually disabled these because cmake failed to do it:
 HAVE_CAIRO
@@ -16,7 +16,7 @@ new file mode 100644
 index 0fbd336a..451213f8 100644
 --- /dev/null
 +++ b/config.h
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,229 @@
 +/* config.h.  Generated from config.h.cmake by cmake.  */
 +
 +/* Build against libcurl. */
@@ -46,6 +46,15 @@ index 0fbd336a..451213f8 100644
 +/* Build against libnss3 for digital signature validation */
 +/* #define ENABLE_NSS3 1 */
 +
++/* Build against libgpgme for digital signature validation */
++/* #undef ENABLE_GPGME */
++
++/* Signatures enabled */
++/* #define ENABLE_SIGNATURES 1 */
++
++/* Default signature backend */
++/* #define DEFAULT_SIGNATURE_BACKEND "NSS" */
++
 +/* Use cairo for rendering. */
 +/* #define HAVE_CAIRO 1 */
 +
@@ -173,7 +182,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_NAME "poppler"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "poppler 23.03.0"
++#define PACKAGE_STRING "poppler 23.06.0"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "poppler"
@@ -182,7 +191,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_URL ""
 +
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "23.03.0"
++#define PACKAGE_VERSION "23.06.0"
 +
 +/* Poppler data dir */
 +#define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -200,7 +209,7 @@ index 0fbd336a..451213f8 100644
 +/* #undef USE_FLOAT */
 +
 +/* Version number of package */
-+#define VERSION "23.03.0"
++#define VERSION "23.06.0"
 +
 +#if defined(__APPLE__)
 +#elif defined (_WIN32)
@@ -281,7 +290,7 @@ index 0fbd336a..451213f8 100644
 +
 +/* Defines the poppler version. */
 +#ifndef POPPLER_VERSION
-+#define POPPLER_VERSION "23.03.0"
++#define POPPLER_VERSION "23.06.0"
 +#endif
 +
 +/* Use single precision arithmetic in the Splash backend */
@@ -373,7 +382,7 @@ index 0fbd336a..451213f8 100644
 +//------------------------------------------------------------------------
 +
 +// copyright notice
-+#define popplerCopyright "Copyright 2005-2022 The Poppler Developers - 
http://poppler.freedesktop.org";
++#define popplerCopyright "Copyright 2005-2023 The Poppler Developers - 
http://poppler.freedesktop.org";
 +#define xpdfCopyright "Copyright 1996-2011, 2022 Glyph & Cog, LLC"
 +
 +//------------------------------------------------------------------------
@@ -433,9 +442,9 @@ index 0fbd336a..451213f8 100644
 +
 +#include "poppler-global.h"
 +
-+#define POPPLER_VERSION "23.03.0"
++#define POPPLER_VERSION "23.06.0"
 +#define POPPLER_VERSION_MAJOR 23
-+#define POPPLER_VERSION_MINOR 03
++#define POPPLER_VERSION_MINOR 06
 +#define POPPLER_VERSION_MICRO 0
 +
 +namespace poppler
commit e6d87feaa40771cc1de7de557789aeb4f0b2cacc
Author:     Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Mar 14 19:01:26 2023 +0900
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:34 2023 +0200

    poppler: upgrade to release 23.03.0
    
    * Upgrade poppler-data to 0.4.12
    * Update poppler-config.patch.1
    
    Change-Id: Ic2a3e8d4f801d52d1568210d0df064cacb51290f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148842
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157251

diff --git a/download.lst b/download.lst
index f0e0be7d83c7..af6a5e82ed6a 100644
--- a/download.lst
+++ b/download.lst
@@ -522,10 +522,10 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
-POPPLER_TARBALL := poppler-22.12.0.tar.xz
-POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
-POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
+POPPLER_SHA256SUM := 
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
+POPPLER_TARBALL := poppler-23.03.0.tar.xz
+POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
+POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/poppler/ExternalPackage_poppler_data.mk 
b/external/poppler/ExternalPackage_poppler_data.mk
index 78024d3fec8b..b85a73f0e663 100644
--- a/external/poppler/ExternalPackage_poppler_data.mk
+++ b/external/poppler/ExternalPackage_poppler_data.mk
@@ -100,6 +100,7 @@ poppler_cmap-files =                            \
        cMap/Adobe-GB1/GB-EUC-H                     \
        cMap/Adobe-GB1/GB-EUC-V                     \
        cMap/Adobe-GB1/GB-H                         \
+       cMap/Adobe-GB1/GB-V                         \
        cMap/Adobe-GB1/GBK2K-H                      \
        cMap/Adobe-GB1/GBK2K-V                      \
        cMap/Adobe-GB1/GBK-EUC-H                    \
@@ -114,10 +115,9 @@ poppler_cmap-files =                            \
        cMap/Adobe-GB1/GBT-EUC-H                    \
        cMap/Adobe-GB1/GBT-EUC-V                    \
        cMap/Adobe-GB1/GBT-H                        \
+       cMap/Adobe-GB1/GBT-V                        \
        cMap/Adobe-GB1/GBTpc-EUC-H                  \
        cMap/Adobe-GB1/GBTpc-EUC-V                  \
-       cMap/Adobe-GB1/GBT-V                        \
-       cMap/Adobe-GB1/GB-V                         \
        cMap/Adobe-GB1/UCS2-GBK-EUC                 \
        cMap/Adobe-GB1/UCS2-GBpc-EUC                \
        cMap/Adobe-GB1/UniGB-UCS2-H                 \
@@ -131,17 +131,17 @@ poppler_cmap-files =                            \
        cMap/Adobe-Japan1/78-EUC-H                  \
        cMap/Adobe-Japan1/78-EUC-V                  \
        cMap/Adobe-Japan1/78-H                      \
-       cMap/Adobe-Japan1/78ms-RKSJ-H               \
-       cMap/Adobe-Japan1/78ms-RKSJ-V               \
        cMap/Adobe-Japan1/78-RKSJ-H                 \
        cMap/Adobe-Japan1/78-RKSJ-V                 \
        cMap/Adobe-Japan1/78-V                      \
+       cMap/Adobe-Japan1/78ms-RKSJ-H               \
+       cMap/Adobe-Japan1/78ms-RKSJ-V               \
        cMap/Adobe-Japan1/83pv-RKSJ-H               \
-       cMap/Adobe-Japan1/90msp-RKSJ-H              \
-       cMap/Adobe-Japan1/90msp-RKSJ-V              \
        cMap/Adobe-Japan1/90ms-RKSJ-H               \
        cMap/Adobe-Japan1/90ms-RKSJ-UCS2            \
        cMap/Adobe-Japan1/90ms-RKSJ-V               \
+       cMap/Adobe-Japan1/90msp-RKSJ-H              \
+       cMap/Adobe-Japan1/90msp-RKSJ-V              \
        cMap/Adobe-Japan1/90pv-RKSJ-H               \
        cMap/Adobe-Japan1/90pv-RKSJ-UCS2            \
        cMap/Adobe-Japan1/90pv-RKSJ-UCS2C           \
@@ -201,9 +201,6 @@ poppler_cmap-files =                            \
        cMap/Adobe-Japan1/UniJIS2004-UTF32-V        \
        cMap/Adobe-Japan1/UniJIS2004-UTF8-H         \
        cMap/Adobe-Japan1/UniJIS2004-UTF8-V         \
-       cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V       \
-       cMap/Adobe-Japan1/UniJISPro-UCS2-V          \
-       cMap/Adobe-Japan1/UniJISPro-UTF8-V          \
        cMap/Adobe-Japan1/UniJIS-UCS2-H             \
        cMap/Adobe-Japan1/UniJIS-UCS2-HW-H          \
        cMap/Adobe-Japan1/UniJIS-UCS2-HW-V          \
@@ -214,10 +211,13 @@ poppler_cmap-files =                            \
        cMap/Adobe-Japan1/UniJIS-UTF32-V            \
        cMap/Adobe-Japan1/UniJIS-UTF8-H             \
        cMap/Adobe-Japan1/UniJIS-UTF8-V             \
-       cMap/Adobe-Japan1/UniJISX02132004-UTF32-H   \
-       cMap/Adobe-Japan1/UniJISX02132004-UTF32-V   \
+       cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V       \
+       cMap/Adobe-Japan1/UniJISPro-UCS2-V          \
+       cMap/Adobe-Japan1/UniJISPro-UTF8-V          \
        cMap/Adobe-Japan1/UniJISX0213-UTF32-H       \
        cMap/Adobe-Japan1/UniJISX0213-UTF32-V       \
+       cMap/Adobe-Japan1/UniJISX02132004-UTF32-H   \
+       cMap/Adobe-Japan1/UniJISX02132004-UTF32-V   \
        cMap/Adobe-Japan1/V                         \
        cMap/Adobe-Japan1/WP-Symbol                 \
        cMap/Adobe-Japan2/Adobe-Japan2-0            \
@@ -235,6 +235,7 @@ poppler_cmap-files =                            \
        cMap/Adobe-Korea1/KSC-H                     \
        cMap/Adobe-Korea1/KSC-Johab-H               \
        cMap/Adobe-Korea1/KSC-Johab-V               \
+       cMap/Adobe-Korea1/KSC-V                     \
        cMap/Adobe-Korea1/KSCms-UHC-H               \
        cMap/Adobe-Korea1/KSCms-UHC-HW-H            \
        cMap/Adobe-Korea1/KSCms-UHC-HW-V            \
@@ -244,7 +245,6 @@ poppler_cmap-files =                            \
        cMap/Adobe-Korea1/KSCpc-EUC-UCS2            \
        cMap/Adobe-Korea1/KSCpc-EUC-UCS2C           \
        cMap/Adobe-Korea1/KSCpc-EUC-V               \
-       cMap/Adobe-Korea1/KSC-V                     \
        cMap/Adobe-Korea1/UCS2-KSCms-UHC            \
        cMap/Adobe-Korea1/UCS2-KSCpc-EUC            \
        cMap/Adobe-Korea1/UniKS-UCS2-H              \
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index 2f6433f88f64..c8c2e47c43d1 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -55,24 +55,26 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,poppler,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
+       UnpackedTarball/poppler/goo/gbase64 \
+       UnpackedTarball/poppler/goo/gbasename \
        UnpackedTarball/poppler/goo/gfile \
-       UnpackedTarball/poppler/goo/GooTimer \
+       UnpackedTarball/poppler/goo/glibc \
+       UnpackedTarball/poppler/goo/glibc_strtok_r \
+       UnpackedTarball/poppler/goo/grandom \
+       UnpackedTarball/poppler/goo/gstrtod \
        UnpackedTarball/poppler/goo/GooString \
+       UnpackedTarball/poppler/goo/GooTimer \
+       UnpackedTarball/poppler/goo/ImgWriter \
+       UnpackedTarball/poppler/goo/JpegWriter \
        UnpackedTarball/poppler/goo/NetPBMWriter \
        UnpackedTarball/poppler/goo/PNGWriter \
        UnpackedTarball/poppler/goo/TiffWriter \
-       UnpackedTarball/poppler/goo/JpegWriter \
-       UnpackedTarball/poppler/goo/ImgWriter \
-       UnpackedTarball/poppler/goo/gstrtod \
-       UnpackedTarball/poppler/goo/grandom \
-       UnpackedTarball/poppler/goo/glibc \
-       UnpackedTarball/poppler/goo/glibc_strtok_r \
        UnpackedTarball/poppler/fofi/FoFiBase \
        UnpackedTarball/poppler/fofi/FoFiEncodings \
+       UnpackedTarball/poppler/fofi/FoFiIdentifier \
        UnpackedTarball/poppler/fofi/FoFiTrueType \
        UnpackedTarball/poppler/fofi/FoFiType1 \
        UnpackedTarball/poppler/fofi/FoFiType1C \
-       UnpackedTarball/poppler/fofi/FoFiIdentifier \
        UnpackedTarball/poppler/poppler/Annot \
        UnpackedTarball/poppler/poppler/AnnotStampImageHelper \
        UnpackedTarball/poppler/poppler/Array \
@@ -82,6 +84,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
        UnpackedTarball/poppler/poppler/CertificateInfo \
        UnpackedTarball/poppler/poppler/CharCodeToUnicode \
        UnpackedTarball/poppler/poppler/CMap \
+       UnpackedTarball/poppler/poppler/DCTStream \
        UnpackedTarball/poppler/poppler/DateInfo \
        UnpackedTarball/poppler/poppler/Decrypt \
        UnpackedTarball/poppler/poppler/Dict \
@@ -90,8 +93,8 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
        UnpackedTarball/poppler/poppler/FILECacheLoader \
        UnpackedTarball/poppler/poppler/FileSpec \
        UnpackedTarball/poppler/poppler/FontEncodingTables \
-       UnpackedTarball/poppler/poppler/Form \
        UnpackedTarball/poppler/poppler/FontInfo \
+       UnpackedTarball/poppler/poppler/Form \
        UnpackedTarball/poppler/poppler/Function \
        UnpackedTarball/poppler/poppler/Gfx \
        UnpackedTarball/poppler/poppler/GfxFont \
@@ -103,43 +106,42 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
        UnpackedTarball/poppler/poppler/JBIG2Stream \
        UnpackedTarball/poppler/poppler/JSInfo \
        UnpackedTarball/poppler/poppler/Lexer \
-       UnpackedTarball/poppler/poppler/Link \
        UnpackedTarball/poppler/poppler/Linearization \
+       UnpackedTarball/poppler/poppler/Link \
        UnpackedTarball/poppler/poppler/LocalPDFDocBuilder \
        UnpackedTarball/poppler/poppler/MarkedContentOutputDev \
+       UnpackedTarball/poppler/poppler/Movie \
        UnpackedTarball/poppler/poppler/NameToCharCode \
        UnpackedTarball/poppler/poppler/Object \
        UnpackedTarball/poppler/poppler/OptionalContent \
        UnpackedTarball/poppler/poppler/Outline \
        UnpackedTarball/poppler/poppler/OutputDev \
        UnpackedTarball/poppler/poppler/Page \
+       UnpackedTarball/poppler/poppler/PageLabelInfo \
        UnpackedTarball/poppler/poppler/PageTransition \
        UnpackedTarball/poppler/poppler/Parser \
        UnpackedTarball/poppler/poppler/PDFDoc \
        UnpackedTarball/poppler/poppler/PDFDocBuilder \
        UnpackedTarball/poppler/poppler/PDFDocEncoding \
        UnpackedTarball/poppler/poppler/PDFDocFactory \
-       UnpackedTarball/poppler/poppler/ProfileData \
        UnpackedTarball/poppler/poppler/PreScanOutputDev \
+       UnpackedTarball/poppler/poppler/ProfileData \
+       UnpackedTarball/poppler/poppler/PSOutputDev \
        UnpackedTarball/poppler/poppler/PSTokenizer \
+       UnpackedTarball/poppler/poppler/Rendition \
+       UnpackedTarball/poppler/poppler/SecurityHandler \
        UnpackedTarball/poppler/poppler/SignatureInfo \
+       UnpackedTarball/poppler/poppler/Sound \
        UnpackedTarball/poppler/poppler/Stream \
-       UnpackedTarball/poppler/poppler/StructTreeRoot \
        UnpackedTarball/poppler/poppler/StructElement \
+       UnpackedTarball/poppler/poppler/StructTreeRoot \
+       UnpackedTarball/poppler/poppler/TextOutputDev \
+       UnpackedTarball/poppler/poppler/UTF \
        UnpackedTarball/poppler/poppler/UnicodeMap \
        UnpackedTarball/poppler/poppler/UnicodeMapFuncs \
        UnpackedTarball/poppler/poppler/UnicodeTypeTable \
-       UnpackedTarball/poppler/poppler/UTF \
-       UnpackedTarball/poppler/poppler/XRef \
-       UnpackedTarball/poppler/poppler/PSOutputDev \
-       UnpackedTarball/poppler/poppler/TextOutputDev \
-       UnpackedTarball/poppler/poppler/PageLabelInfo \
-       UnpackedTarball/poppler/poppler/SecurityHandler \
-       UnpackedTarball/poppler/poppler/Sound \
        UnpackedTarball/poppler/poppler/ViewerPreferences \
-       UnpackedTarball/poppler/poppler/Movie \
-       UnpackedTarball/poppler/poppler/Rendition \
-       UnpackedTarball/poppler/poppler/DCTStream \
+       UnpackedTarball/poppler/poppler/XRef \
        UnpackedTarball/poppler/splash/SplashBitmap \
 ))
 
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index 62ed7a24ec1d..6cbed9e103ec 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -14,11 +14,12 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
 $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
-       external/poppler/poppler-config.patch.1 \
-       external/poppler/pch.patch.0 \
+       external/poppler/char_traits.patch \
        external/poppler/disable-freetype.patch.1 \
        external/poppler/gcc7-EntityInfo.patch.1 \
-       external/poppler/char_traits.patch \
+       external/poppler/gcc7-GfxFont.patch.1 \
+       external/poppler/poppler-config.patch.1 \
+       external/poppler/pch.patch.0 \
 ))
 
 ifneq ($(filter -fsanitize=%,$(CC)),)
diff --git a/external/poppler/gcc7-GfxFont.patch.1 
b/external/poppler/gcc7-GfxFont.patch.1
new file mode 100644
index 000000000000..a240b1b8bad2
--- /dev/null
+++ b/external/poppler/gcc7-GfxFont.patch.1
@@ -0,0 +1,94 @@
+Revert of upstream: 
https://gitlab.freedesktop.org/poppler/poppler/-/commit/d5ea5a24124badf2b32a7d08dd2c06a4a40f93fb
+
+gcc 7.5.0 says:
+
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc: In member function 
‘std::optional<GfxFontLoc> GfxFont::locateFont(XRef*, PSOutputDev*)’:
+/home/taichi/libo-core/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:660:24:
 error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to 
‘std::optional<GfxFontLoc>’
+                 return fontLoc;
+                        ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:671:16: error: could not 
convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+         return fontLoc;
+                ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:680:16: error: could not 
convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+         return fontLoc;
+                ^~~~~~~
+libo-core/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:711:24: error: 
could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+                 return fontLoc;
+                        ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:723:20: error: could not 
convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+             return fontLoc;
+                    ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:752:20: error: could not 
convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+             return fontLoc;
+                    ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc: In static member function 
‘static std::optional<GfxFontLoc> GfxFont::getExternalFont(GooString*, bool)’:
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:814:12: error: could not 
convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+     return fontLoc;
+
+diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
+index cc2ce038..b0d0d610 100644
+--- a/poppler/GfxFont.cc
++++ b/poppler/GfxFont.cc
+@@ -657,7 +657,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, 
PSOutputDev *ps)
+                 fontLoc.locType = gfxFontLocEmbedded;
+                 fontLoc.fontType = type;
+                 fontLoc.embFontID = embFontID;
+-                return fontLoc;
++                return std::move(fontLoc); // std::move only required to 
please g++-7
+             }
+         }
+     }
+@@ -668,7 +668,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, 
PSOutputDev *ps)
+         fontLoc.locType = gfxFontLocResident;
+         fontLoc.fontType = fontType1;
+         fontLoc.path = *name;
+-        return fontLoc;
++        return std::move(fontLoc); // std::move only required to please g++-7
+     }
+ 
+     //----- PS resident Base-14 font
+@@ -677,7 +677,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, 
PSOutputDev *ps)
+         fontLoc.locType = gfxFontLocResident;
+         fontLoc.fontType = fontType1;
+         fontLoc.path = ((Gfx8BitFont *)this)->base14->base14Name;
+-        return fontLoc;
++        return std::move(fontLoc); // std::move only required to please g++-7
+     }
+ 
+     //----- external font file (fontFile, fontDir)
+@@ -708,7 +708,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, 
PSOutputDev *ps)
+                 fontLoc.fontType = fontCIDType2;
+                 fontLoc.setPath(path);
+                 fontLoc.fontNum = fontNum;
+-                return fontLoc;
++                return std::move(fontLoc); // std::move only required to 
please g++-7
+             }
+         } else {
+             GfxFontLoc fontLoc;
+@@ -720,7 +720,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, 
PSOutputDev *ps)
+                 fontLoc.fontType = fontType1;
+                 fontLoc.fontNum = fontNum;
+             }
+-            return fontLoc;
++            return std::move(fontLoc); // std::move only required to please 
g++-7
+         }
+         delete path;
+     }
+@@ -749,7 +749,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, 
PSOutputDev *ps)
+             fontLoc.fontType = fontType1;
+             fontLoc.path = substName;
+             fontLoc.substIdx = substIdx;
+-            return fontLoc;
++            return std::move(fontLoc); // std::move only required to please 
g++-7
+         } else {
+             path = globalParams->findFontFile(substName);
+             if (path) {
+@@ -811,7 +811,7 @@ std::optional<GfxFontLoc> 
GfxFont::getExternalFont(GooString *path, bool cid)
+     fontLoc.locType = gfxFontLocExternal;
+     fontLoc.fontType = fontType;
+     fontLoc.setPath(path);
+-    return fontLoc;
++    return std::move(fontLoc); // std::move only required to please g++-7
+ }
+ 
+ std::optional<std::vector<unsigned char>> GfxFont::readEmbFontFile(XRef *xref)
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index 1e61b533d31b..503cf1c0ae46 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -173,7 +173,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_NAME "poppler"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "poppler 22.12.0"
++#define PACKAGE_STRING "poppler 23.03.0"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "poppler"
@@ -182,7 +182,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_URL ""
 +
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "22.12.0"
++#define PACKAGE_VERSION "23.03.0"
 +
 +/* Poppler data dir */
 +#define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -200,7 +200,7 @@ index 0fbd336a..451213f8 100644
 +/* #undef USE_FLOAT */
 +
 +/* Version number of package */
-+#define VERSION "22.12.0"
++#define VERSION "23.03.0"
 +
 +#if defined(__APPLE__)
 +#elif defined (_WIN32)
@@ -281,7 +281,7 @@ index 0fbd336a..451213f8 100644
 +
 +/* Defines the poppler version. */
 +#ifndef POPPLER_VERSION
-+#define POPPLER_VERSION "22.12.0"
++#define POPPLER_VERSION "23.03.0"
 +#endif
 +
 +/* Use single precision arithmetic in the Splash backend */
@@ -433,9 +433,9 @@ index 0fbd336a..451213f8 100644
 +
 +#include "poppler-global.h"
 +
-+#define POPPLER_VERSION "22.12.0"
-+#define POPPLER_VERSION_MAJOR 22
-+#define POPPLER_VERSION_MINOR 12
++#define POPPLER_VERSION "23.03.0"
++#define POPPLER_VERSION_MAJOR 23
++#define POPPLER_VERSION_MINOR 03
 +#define POPPLER_VERSION_MICRO 0
 +
 +namespace poppler
commit 60a9f4c934b395408beddb0f1ef73bdaadd7fc88
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Sep 25 14:22:40 2023 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:34 2023 +0200

    libtommath: upgrade to release 1.2.1
    
    Fixes CVE-2023-36328.
    
    Change-Id: I1193f5df789c7dd10855e35936fc2697697c464e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157246
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 3daab618c759be2b93ad337061ef347c76229a22)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157249
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/download.lst b/download.lst
index 4e5a1af22ae7..f0e0be7d83c7 100644
--- a/download.lst
+++ b/download.lst
@@ -393,8 +393,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
-LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
+LIBTOMMATH_SHA256SUM := 
986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f
+LIBTOMMATH_TARBALL := ltm-1.2.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
commit 8c16b30891eb881b5843290de822db47482b423f
Author:     Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 17:27:57 2023 +0900
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:34 2023 +0200

    LibTomMath: upgrade to release 1.2.0
    
    * external/libtommath/clang-cl.patch: removed "typedef unsigned __int128    
mp_word" from tommmath.h
    * external/libtommath/libtommath-msvc.patch: fixed upstream
    
    Change-Id: I38fe730ff0e9649c6a0ad8d64b723a27e3434012
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153871
    Tested-by: Jenkins
    Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
    (cherry picked from commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157248
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/download.lst b/download.lst
index 1e865c132092..4e5a1af22ae7 100644
--- a/download.lst
+++ b/download.lst
@@ -393,8 +393,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
-LIBTOMMATH_TARBALL := ltm-1.0.zip
+LIBTOMMATH_SHA256SUM := 
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
+LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libtommath/README b/external/libtommath/README
index 0da3128c5404..41f91970a71b 100644
--- a/external/libtommath/README
+++ b/external/libtommath/README
@@ -3,4 +3,4 @@ integer library written entirely in C.
 
 Used by embedded firebird (external/firebird).
 
-http://www.libtom.org/LibTomMath/
+From [https://www.libtom.net/LibTomMath/].
diff --git a/external/libtommath/UnpackedTarball_libtommath.mk 
b/external/libtommath/UnpackedTarball_libtommath.mk
index bb0b9e352930..8961a46162c5 100644
--- a/external/libtommath/UnpackedTarball_libtommath.mk
+++ b/external/libtommath/UnpackedTarball_libtommath.mk
@@ -14,8 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
-       external/libtommath/libtommath-msvc.patch \
-       external/libtommath/clang-cl.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libtommath/clang-cl.patch 
b/external/libtommath/clang-cl.patch
deleted file mode 100644
index 1cc92d380c62..000000000000
--- a/external/libtommath/clang-cl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tommath.h
-+++ tommath.h
-@@ -15,6 +15,13 @@
- #ifndef BN_H_
- #define BN_H_
- 
-+// Work around clang-cl issue when mp_word is a typedef for unsigned 
__int128, see
-+// <https://bugs.llvm.org/show_bug.cgi?id=25305> "Clang-cl generates a call 
to an undefined symbol
-+// _udivti3":
-+#if defined _WIN32 && defined __clang__
-+#define MP_8BIT
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdint.h>
diff --git a/external/libtommath/libtommath-msvc.patch 
b/external/libtommath/libtommath-msvc.patch
deleted file mode 100644
index 07884871aac9..000000000000
--- a/external/libtommath/libtommath-msvc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- makefile.msvc      2016-02-05 23:25:32.000000000 +0100
-+++ makefile.msvc      2016-07-21 11:34:20.618390100 +0200
-@@ -38,3 +38,9 @@
- 
- library: $(OBJECTS)
-       lib /out:tommath.lib $(OBJECTS)
-+
-+.cc.obj:
-+      $(CC) /nologo $(CFLAGS) /c $<
-+
-+.c.obj:
-+      $(CC) /nologo $(CFLAGS) /c $<
commit c5549584f00363e5f5ef327b18c089b06853c9f1
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Sep 23 07:16:06 2023 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:34 2023 +0200

    tdf#152675 treat all cairo versions <= 1.17.8 the same
    
    wrt unwanted sideeffects of CAIRO_HINT_METRICS_OFF seen
    in https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
    and https://bugs.documentfoundation.org/show_bug.cgi?id=152675
    
    Change-Id: Ib3f43fd3832083f1768b737e3a5fb28063c0ae23
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157177
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit 1dd357ccf7ca9edbe5f2ef60465c2559f678d306)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157126
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 9662c3e4bd11..5a54f8c9b08c 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -311,14 +311,17 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
                 cairo_font_options_set_antialias(pOptions, 
CAIRO_ANTIALIAS_NONE);
             if (!bAllowedHintStyle)
                 cairo_font_options_set_hint_style(pOptions, 
CAIRO_HINT_STYLE_SLIGHT);
-            // Disable private CAIRO_ROUND_GLYPH_POS_ON by merging with font 
options known to have
-            // CAIRO_ROUND_GLYPH_POS_OFF
             if (bResolutionIndependentLayoutEnabled)
             {
+                // Disable private CAIRO_ROUND_GLYPH_POS_ON by merging with
+                // font options known to have CAIRO_ROUND_GLYPH_POS_OFF
                 cairo_font_options_merge(pOptions, CairoFontOptions::get());
-                // tdf#153699 skip this with cairo 1.17.8 as it has a problem
+
+                // a) tdf#153699 skip this with cairo 1.17.8 as it has a 
problem
                 // See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
-                if (cairo_version() != CAIRO_VERSION_ENCODE(1,17,8))
+                // b) tdf#152675 a similar report for cairo: 1.16.0-4ubuntu1,
+                // assume that everything <= 1.17.8 is unsafe to disable this
+                if (cairo_version() <= CAIRO_VERSION_ENCODE(1, 17, 8))
                     cairo_font_options_set_hint_metrics(pOptions, 
CAIRO_HINT_METRICS_OFF);
             }
             cairo_set_font_options(cr, pOptions);
commit 9f3f385f6b3d2eae07271211c3fea1e4b8df797e
Author:     Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Sun Sep 24 18:10:21 2023 +0300
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:33 2023 +0200

    tdf#157067: Fix missing background color in style preview
    
    Set the colors after setting the font not before as otherwise they seem
    to get overridden.
    
    Change-Id: I258cb762fd2328369bd8adae63e94ec87c666bb7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157208
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@libreoffice.org>
    (cherry picked from commit d9eed9b489d8ad208df307588595f3a8d3b7539b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157212
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx 
b/svx/source/styles/CommonStylePreviewRenderer.cxx
index c23861e92a72..d92aac21d89c 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -335,12 +335,6 @@ bool CommonStylePreviewRenderer::render(const 
tools::Rectangle& aRectangle, Rend
         mrOutputDev.DrawRect(aRectangle);
     }
 
-    if (maFontColor != COL_AUTO)
-        mrOutputDev.SetTextColor(maFontColor);
-
-    if (maHighlightColor != COL_AUTO)
-        mrOutputDev.SetTextFillColor(maHighlightColor);
-
     Point aFontDrawPosition = aRectangle.TopLeft();
     aFontDrawPosition.AdjustY(mnBaseLine);
     if (eRenderAlign == RenderAlign::CENTER)
@@ -376,10 +370,16 @@ bool CommonStylePreviewRenderer::render(const 
tools::Rectangle& aRectangle, Rend
         mrOutputDev.Push(vcl::PushFlags::FONT);
 
         if (oFont)
-        {
             mrOutputDev.SetFont(*oFont);
+
+        if (maFontColor != COL_AUTO)
+            mrOutputDev.SetTextColor(maFontColor);
+
+        if (maHighlightColor != COL_AUTO)
+            mrOutputDev.SetTextFillColor(maHighlightColor);
+
+        if (oFont)
             oFont->QuickDrawText(&mrOutputDev, aFontDrawPosition, rText, 
nStart, nEnd - nStart, {});
-        }
         else
             mrOutputDev.DrawText(aFontDrawPosition, rText, nStart, nEnd - 
nStart);
 
commit eccbef8e9c4d2570bf192dd68a1dc0a162413075
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 22 19:59:31 2023 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:33 2023 +0200

    tdf#157168 GtkSpinButton ignores out-of-range value instead of limiting
    
    (to range)
    
    Change-Id: Ib25276ccea18b45756ac2769cb00cb9d7db0c400
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157125
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 17bbfe5d497e..70930a1267c0 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -17461,11 +17461,6 @@ public:
         m_aCustomFont.use_custom_font(&rFont, u"spinbutton");
     }
 
-    void set_update_policy_if_valid()
-    {
-        gtk_spin_button_set_update_policy(m_pButton, GTK_UPDATE_IF_VALID);
-    }
-
     virtual void disable_notify_events() override
     {
         g_signal_handler_block(m_pButton, m_nValueChangedSignalId);
@@ -24312,13 +24307,7 @@ public:
 
     virtual std::unique_ptr<weld::MetricSpinButton> 
weld_metric_spin_button(const OString& id, FieldUnit eUnit) override
     {
-        std::unique_ptr<weld::SpinButton> xButton(weld_spin_button(id));
-        if (xButton)
-        {
-            GtkInstanceSpinButton& rButton = 
dynamic_cast<GtkInstanceSpinButton&>(*xButton);
-            rButton.set_update_policy_if_valid();
-        }
-        return std::make_unique<weld::MetricSpinButton>(std::move(xButton), 
eUnit);
+        return std::make_unique<weld::MetricSpinButton>(weld_spin_button(id), 
eUnit);
     }
 
     virtual std::unique_ptr<weld::FormattedSpinButton> 
weld_formatted_spin_button(const OString &id) override
commit 995ec792ccc3434db00cc51238e759685f0b2918
Author:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Sep 22 20:05:54 2023 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 27 21:11:33 2023 +0200

    update credits
    
    Change-Id: I376459b1bee20e819ba3ee8fa6776d79fe84e8b8
    (cherry picked from commit 7d6ca465224e5e839055e9607deeb2a80a93621b)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 5a52cb29a58f..a694258542ec 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<office:document xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><dc:title>Credits » 
LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits
 for the LibreOffice 
development/coding.</dc:description><meta:generator>LibreOffice/7.5.5.2$Linux_X86_64
 
LibreOffice_project/ca8fe7424262805f223b9a2334bc7181abbcbf5e</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic
 meta:table-count="5" meta:image-count="1" meta:object-count="0" 
meta:page-count="2" meta:paragraph-count="4791" meta:word-count="17861" 
meta:character-count="129123" 
meta:non-whitespace-character-count="113229"/><meta:user-defined 
meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta>
+<office:document xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:formx="u
 rn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http:/
 /openoffice.org/2004/office" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:meta><dc:title>Credits » 
LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits
 for the LibreOffice 
development/coding.</dc:description><meta:generator>LibreOffice/7.6.1.2$MacOSX_AARCH64
 
LibreOffice_project/f5defcebd022c5bc36bbb79be232cb6926d8f674</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic
 meta:table-count="5" meta:image-count="1" meta:object-count="0" 
meta:page-count="3" meta:paragraph-count="4802" meta:word-count="17902" 
meta:character-count="129456" 
meta:non-whitespace-character-count="113526"/><meta:user-defined 
meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" 
config:type="long">2958</config:config-item>
+   <config:config-item config:name="ViewAreaTop" 
config:type="long">593</config:config-item>
    <config:config-item config:name="ViewAreaLeft" 
config:type="long">501</config:config-item>
-   <config:config-item config:name="ViewAreaWidth" 
config:type="long">21618</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" 
config:type="long">26328</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" 
config:type="long">16043</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" 
config:type="long">10241</config:config-item>
    <config:config-item config:name="ShowRedlineChanges" 
config:type="boolean">true</config:config-item>
    <config:config-item config:name="InBrowseMode" 
config:type="boolean">true</config:config-item>
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" 
config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" 
config:type="long">7751</config:config-item>
-     <config:config-item config:name="ViewTop" 
config:type="long">5336</config:config-item>
+     <config:config-item config:name="ViewLeft" 
config:type="long">3542</config:config-item>
+     <config:config-item config:name="ViewTop" 
config:type="long">3434</config:config-item>
      <config:config-item config:name="VisibleLeft" 
config:type="long">501</config:config-item>
-     <config:config-item config:name="VisibleTop" 
config:type="long">2958</config:config-item>
-     <config:config-item config:name="VisibleRight" 
config:type="long">22117</config:config-item>
-     <config:config-item config:name="VisibleBottom" 
config:type="long">29284</config:config-item>
+     <config:config-item config:name="VisibleTop" 
config:type="long">593</config:config-item>
+     <config:config-item config:name="VisibleRight" 
config:type="long">16542</config:config-item>
+     <config:config-item config:name="VisibleBottom" 
config:type="long">10832</config:config-item>
      <config:config-item config:name="ZoomType" 
config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" 
config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" 
config:type="boolean">false</config:config-item>
@@ -28,50 +28,113 @@
      <config:config-item config:name="AnchoredTextOverflowLegacy" 
config:type="boolean">false</config:config-item>
      <config:config-item config:name="LegacySingleLineFontwork" 
config:type="boolean">false</config:config-item>
      <config:config-item config:name="ConnectorUseSnapRect" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IgnoreBreakAfterMultilineField" 
config:type="boolean">false</config:config-item>
     </config:config-item-map-entry>
    </config:config-item-map-indexed>
   </config:config-item-set>
   <config:config-item-set config:name="ooo:configuration-settings">
-   <config:config-item config:name="PrintRightPages" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="PrintProspectRTL" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrintLeftPages" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="PrintPaperFromSetup" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrintControls" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintPageBackground" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintGraphics" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintTables" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintProspectRTL" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintFaxName" config:type="string"/>
    <config:config-item config:name="PrintProspect" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrintBlackFonts" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrintAnnotationMode" 
config:type="short">0</config:config-item>
+   <config:config-item config:name="PrintReversed" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrintEmptyPages" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="NoNumberingShowFollowBy" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrintSingleJobs" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DisableOffPagePositioning" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="HyphenateURLs" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="MsWordCompMinLineHeightByFly" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="FrameAutowidthWithMorePara" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="HeaderSpacingBelowLastPara" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintAnnotationMode" 
config:type="short">0</config:config-item>
+   <config:config-item config:name="ImagePreferredDPI" 
config:type="int">0</config:config-item>
+   <config:config-item config:name="LoadReadonly" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="ProtectBookmarks" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="ContinuousEndnotes" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="DisableOffPagePositioning" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="PrintTables" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UnbreakableNumberings" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="SubtractFlysAnchoredAtFlys" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PropLineSpacingShrinksFirstLine" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrintFaxName" config:type="string"/>
-   <config:config-item config:name="SurroundTextWrapSmall" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="TreatSingleColumnBreakAsPageBreak" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PropLineSpacingShrinksFirstLine" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="TabOverSpacing" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="TabOverMargin" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="EmbedComplexScriptFonts" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="EmbedLatinScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="ProtectFields" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="EmbedOnlyUsedFonts" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="EmbedFonts" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
+   <config:config-item config:name="StylesNoDefault" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="OutlineLevelYieldsNumbering" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="RedlineProtectionKey" 
config:type="base64Binary"/>
+   <config:config-item config:name="CollapseEmptyCellPara" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintBlackFonts" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="MsWordCompTrailingBlanks" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedSystemFonts" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="InvertBorderSpacing" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintRightPages" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="SmallCapsPercentage66" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="MathBaselineAlignment" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmptyDbFieldHidesPara" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="ClippedPictures" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="FrameAutowidthWithMorePara" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabAtLeftIndentForParagraphsInList" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ProtectForm" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ConsiderTextWrapOnObjPos" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabOverflow" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DropCapPunctuation" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsLabelDocument" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbeddedDatabaseName" 
config:type="string"/>
+   <config:config-item config:name="UnxForceZeroExtLeading" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="FloattableNomargins" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="UnbreakableNumberings" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="AllowPrintJobCancel" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="UseFormerObjectPositioning" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DoNotCaptureDrawObjsOnPage" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="GutterAtTop" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SurroundTextWrapSmall" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SaveGlobalDocumentLinks" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="CurrentDatabaseCommandType" 
config:type="int">0</config:config-item>
+   <config:config-item config:name="TableRowKeep" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DoNotResetParaAttrsForNumFont" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabOverMargin" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IgnoreFirstLineIndentInNumbering" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedFonts" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AlignTabStopPosition" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UseFormerTextWrapping" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="UseOldNumbering" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="BackgroundParaOverDrawings" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UseFormerObjectPositioning" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UseOldPrinterMetrics" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintTextPlaceholder" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabOverSpacing" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="CurrentDatabaseCommand" 
config:type="string"/>
+   <config:config-item config:name="AddParaLineSpacingToTableCells" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="FootnoteInColumnToPageEnd" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="AddParaSpacingToTableCells" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="AddParaTableSpacingAtStart" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="AddVerticalFrameOffsets" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ApplyUserData" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AllowPrintJobCancel" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintHiddenText" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="RsidRoot" 
config:type="int">1557161</config:config-item>
-   <config:config-item config:name="PrinterPaperFromSetup" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="CurrentDatabaseDataSource" 
config:type="string">Adressen</config:config-item>
+   <config:config-item config:name="TabsRelativeToIndent" 
config:type="boolean">true</config:config-item>
    <config:config-item config:name="UpdateFromTemplate" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="AddFrameOffsets" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SaveVersionOnClose" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="CurrentDatabaseDataSource" 
config:type="string">Adressen</config:config-item>
+   <config:config-item config:name="PrinterPaperFromSetup" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedAsianScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintPaperFromSetup" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrinterIndependentLayout" 
config:type="string">high-resolution</config:config-item>
+   <config:config-item config:name="LinkUpdateMode" 
config:type="short">1</config:config-item>
+   <config:config-item config:name="CharacterCompressionType" 
config:type="short">0</config:config-item>
+   <config:config-item config:name="FieldAutoUpdate" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UseFormerLineSpacing" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsKernAsianPunctuation" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintLeftPages" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="SaveThumbnail" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="AddParaTableSpacing" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintDrawings" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="EmbedLatinScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddExternalLeading" 
config:type="boolean">true</config:config-item>
    <config:config-item-map-indexed config:name="ForbiddenCharacters">
     <config:config-item-map-entry>
      <config:config-item config:name="Language" 
config:type="string">hu</config:config-item>
@@ -81,73 +144,11 @@
      <config:config-item config:name="EndLine" config:type="string"/>
     </config:config-item-map-entry>
    </config:config-item-map-indexed>
-   <config:config-item config:name="LoadReadonly" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="Rsid" 
config:type="int">12614934</config:config-item>
-   <config:config-item config:name="FootnoteInColumnToPageEnd" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="ProtectFields" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="SaveGlobalDocumentLinks" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="LinkUpdateMode" 
config:type="short">1</config:config-item>
-   <config:config-item config:name="AddExternalLeading" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="PrintGraphics" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="EmbedSystemFonts" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="IsLabelDocument" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="AddParaLineSpacingToTableCells" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="UseFormerTextWrapping" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="HyphenateURLs" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="AddParaTableSpacingAtStart" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="TabsRelativeToIndent" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="FieldAutoUpdate" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="SaveVersionOnClose" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="ChartAutoUpdate" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="ImagePreferredDPI" 
config:type="int">0</config:config-item>
-   <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
-   <config:config-item config:name="SmallCapsPercentage66" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="AlignTabStopPosition" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="DropCapPunctuation" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="MathBaselineAlignment" 
config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrinterName" config:type="string"/>
-   <config:config-item config:name="CharacterCompressionType" 
config:type="short">0</config:config-item>
-   <config:config-item config:name="AddParaTableSpacing" 
config:type="boolean">true</config:config-item>
    <config:config-item config:name="DoNotJustifyLinesWithManualBreak" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrintHiddenText" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="IsKernAsianPunctuation" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrinterIndependentLayout" 
config:type="string">high-resolution</config:config-item>
-   <config:config-item config:name="TabOverflow" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="AddParaSpacingToTableCells" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="AddVerticalFrameOffsets" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="TabAtLeftIndentForParagraphsInList" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="ApplyUserData" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="MsWordCompMinLineHeightByFly" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrintTextPlaceholder" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="IgnoreFirstLineIndentInNumbering" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="UseFormerLineSpacing" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrintPageBackground" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="RedlineProtectionKey" 
config:type="base64Binary"/>
-   <config:config-item config:name="EmbedAsianScriptFonts" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="BackgroundParaOverDrawings" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="SaveThumbnail" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="ConsiderTextWrapOnObjPos" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="EmbeddedDatabaseName" 
config:type="string"/>
-   <config:config-item config:name="ProtectForm" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="DoNotResetParaAttrsForNumFont" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="MsWordCompTrailingBlanks" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="EmptyDbFieldHidesPara" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="TableRowKeep" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="NoNumberingShowFollowBy" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="InvertBorderSpacing" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="DoNotCaptureDrawObjsOnPage" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="GutterAtTop" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="StylesNoDefault" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="UnxForceZeroExtLeading" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrintReversed" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="UseOldPrinterMetrics" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="CurrentDatabaseCommandType" 
config:type="int">0</config:config-item>
-   <config:config-item config:name="PrintDrawings" 
config:type="boolean">true</config:config-item>
-   <config:config-item config:name="OutlineLevelYieldsNumbering" 
config:type="boolean">false</config:config-item>
-   <config:config-item config:name="CurrentDatabaseCommand" 
config:type="string"/>
-   <config:config-item config:name="CollapseEmptyCellPara" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="ChartAutoUpdate" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="Rsid" 
config:type="int">12642695</config:config-item>
+   <config:config-item config:name="AddFrameOffsets" 
config:type="boolean">false</config:config-item>
   </config:config-item-set>
  </office:settings>
  <office:scripts>
@@ -173,10 +174,10 @@
  <office:styles>
   <style:default-style style:family="graphic">
    <style:graphic-properties svg:stroke-color="#3465a4" 
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" 
draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" 
draw:start-line-spacing-vertical="0.283cm" 
draw:end-line-spacing-horizontal="0.283cm" 
draw:end-line-spacing-vertical="0.283cm" style:writing-mode="lr-tb" 
style:flow-with-text="true"/>
-   <style:paragraph-properties style:text-autospace="ideograph-alpha" 
style:line-break="strict" style:writing-mode="lr-tb" 
style:font-independent-line-spacing="false">
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" 
style:line-break="strict" loext:tab-stop-distance="0cm" 
style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
-   <style:text-properties style:use-window-font-color="true" 
loext:opacity="0%" loext:color-lum-mod="100%" loext:color-lum-off="0%" 
style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="hu" 
fo:country="HU" style:letter-kerning="true" style:font-name-asian="SimSun" 
style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" 
style:font-name-complex="Mangal1" style:font-size-complex="12pt" 
style:language-complex="hi" style:country-complex="IN"/>
+   <style:text-properties style:use-window-font-color="true" 
loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" 
fo:language="hu" fo:country="HU" style:letter-kerning="true" 
style:font-name-asian="SimSun" style:font-size-asian="12pt" 
style:language-asian="zh" style:country-asian="CN" 
style:font-name-complex="Mangal1" style:font-size-complex="12pt" 
style:language-complex="hi" style:country-complex="IN"/>
   </style:default-style>
   <style:default-style style:family="paragraph">
    <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" 
style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" 
style:line-break="strict" style:tab-stop-distance="1.251cm" 
style:writing-mode="page"/>
@@ -285,13 +286,13 @@

... etc. - the rest is truncated

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 15 commits - download.lst external/libtommath external/poppler readlicense_oo/license svx/source sw/qa sw/source vcl/qa vcl/skia vcl/source vcl/unx

Reply via email to