a1b41309db
Fix build with poppler 22.03.0. Staging M please when forwarded to Factory OBS-URL: https://build.opensuse.org/request/show/959715 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=994
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
|
index ad6320139..e5f6d9c68 100644
|
|
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
|
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
|
@@ -138,6 +138,15 @@ int main(int argc, char **argv)
|
|
_setmode( _fileno( g_binary_out ), _O_BINARY );
|
|
#endif
|
|
|
|
+#if POPPLER_CHECK_VERSION(22, 3, 0)
|
|
+ PDFDoc aDoc( std::make_unique<GooString>(pFileName),
|
|
+ GooString(pOwnerPasswordStr),
|
|
+ GooString(pUserPasswordStr) );
|
|
+
|
|
+ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
|
|
+ GooString(pOwnerPasswordStr),
|
|
+ GooString(pUserPasswordStr) );
|
|
+#else
|
|
PDFDoc aDoc( pFileName,
|
|
pOwnerPasswordStr,
|
|
pUserPasswordStr );
|
|
@@ -145,6 +154,7 @@ int main(int argc, char **argv)
|
|
PDFDoc aErrDoc( pErrFileName,
|
|
pOwnerPasswordStr,
|
|
pUserPasswordStr );
|
|
+#endif
|
|
|
|
// Check various permissions for aDoc.
|
|
PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
|
|
|