pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1174

Browse Source
This commit is contained in:
Fridrich Strba 2024-07-09 15:04:58 +00:00 committed by Git OBS Bridge
parent d6bfce491b
commit 7543ff5469
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pdfium-optional.patch
View File

@ -1,19 +1,29 @@
--- external/pdfium/annot.patch.1 --- external/pdfium/annot.patch.1
+++ external/pdfium/annot.patch.1 +++ external/pdfium/annot.patch.1
@@ -2,7 +2,15 @@ diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp @@ -2,6 +2,17 @@ diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
index bc1f7f7eb..075baf1df 100644 index bc1f7f7eb..075baf1df 100644
--- a/fpdfsdk/fpdf_annot.cpp --- a/fpdfsdk/fpdf_annot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp +++ b/fpdfsdk/fpdf_annot.cpp
-@@ -1366,6 +1366,42 @@ FPDFAnnot_GetFontSize(FPDF_FORMHANDLE hHandle, +@@ -8,6 +8,10 @@
+@@ -5,6 +5,7 @@
+ #include "public/fpdf_annot.h"
+
+ #include <memory>
++#include <optional>
+ #include <sstream> + #include <sstream>
+ #include <utility> + #include <utility>
+ #include <vector> + #include <vector>
+@@ -1366,6 +1367,42 @@ FPDFAnnot_GetFontSize(FPDF_FORMHANDLE hHandle, ++#ifdef USE_SYSTEM_ABSEIL
++#include <optional>
++#include <absl/types/optional.h>
++#endif
+
+ #include "constants/annotation_common.h"
+ #include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
@@ -1366,6 +1366,42 @@ FPDFAnnot_GetFontSize(FPDF_FORMHANDLE hHandle,
return true; return true;
} }
@@ -32,7 +40,7 @@ index bc1f7f7eb..075baf1df 100644
+ if (!pWidget)
+ return false;
+
-+ std::optional<FX_COLORREF> text_color = pWidget->GetTextColor();
++ absl::optional<FX_COLORREF> text_color = pWidget->GetTextColor();
+ if (!text_color)
+ return false;
+