summaryrefslogtreecommitdiff
path: root/app-office/libreoffice/files/libreoffice-25.2.7.2-poppler-25.10.patch
blob: ab6a3d18b073a27ab4119761848dbf9e8ddf056a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -181,7 +181,11 @@
     _setmode( _fileno( g_binary_out ), _O_BINARY );
 #endif
 
-#if POPPLER_CHECK_VERSION(22, 6, 0)
+#if POPPLER_CHECK_VERSION(25, 10, 0)
+    PDFDoc aDoc( pFileName->copy(),
+                 pOwnerPasswordStr ? std::optional<GooString>(pOwnerPasswordStr->toStr()) : std::nullopt,
+                 pUserPasswordStr ? std::optional<GooString>(pUserPasswordStr->toStr()) : std::nullopt );
+#elif POPPLER_CHECK_VERSION(22, 6, 0)
     PDFDoc aDoc( std::make_unique<GooString>(pFileName),
                  std::optional<GooString>(pOwnerPasswordStr),
                  std::optional<GooString>(pUserPasswordStr) );