0f165b7f2f
Export the bugdoc to PDF, the orange "date" lost its font color.
This went wrong in commit 82d90529dc (sw
content controls, rich text: add initial PDF export, 2022-09-12), we
export the content control as a PDF form widget by default since then.
Various properties like checkbox status and dropdown items were handled
already, but not text color.
Fix the problem by mapping the SwFont color to the widget descriptor
color, this fixes the color of the already filled in content of the
widget.
Note that given this is a property of the form widget, the color is
correctly applied also to strings filled in via PDF readers, interacting
with the form.
Change-Id: Id3e8611e415c0d571afe1cd14561c97b8a910ce9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169317
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
65 lines
2.1 KiB
Groff
65 lines
2.1 KiB
Groff
diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
|
|
index bc1f7f7eb..075baf1df 100644
|
|
--- a/fpdfsdk/fpdf_annot.cpp
|
|
+++ b/fpdfsdk/fpdf_annot.cpp
|
|
@@ -1366,6 +1366,42 @@ FPDFAnnot_GetFontSize(FPDF_FORMHANDLE hHandle,
|
|
return true;
|
|
}
|
|
|
|
+FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
|
|
+FPDFAnnot_GetFontColor(FPDF_FORMHANDLE hHandle,
|
|
+ FPDF_ANNOTATION annot,
|
|
+ unsigned int* R,
|
|
+ unsigned int* G,
|
|
+ unsigned int* B) {
|
|
+ if (!R || !G || !B)
|
|
+ return false;
|
|
+
|
|
+ CPDFSDK_InteractiveForm* pForm = FormHandleToInteractiveForm(hHandle);
|
|
+ if (!pForm)
|
|
+ return false;
|
|
+
|
|
+ const CPDF_Dictionary* pAnnotDict = GetAnnotDictFromFPDFAnnotation(annot);
|
|
+ if (!pAnnotDict)
|
|
+ return false;
|
|
+
|
|
+ CPDF_InteractiveForm* pPDFForm = pForm->GetInteractiveForm();
|
|
+ CPDF_FormControl* pFormControl = pPDFForm->GetControlByDict(pAnnotDict);
|
|
+ if (!pFormControl)
|
|
+ return false;
|
|
+
|
|
+ CPDFSDK_Widget* pWidget = pForm->GetWidget(pFormControl);
|
|
+ if (!pWidget)
|
|
+ return false;
|
|
+
|
|
+ std::optional<FX_COLORREF> text_color = pWidget->GetTextColor();
|
|
+ if (!text_color)
|
|
+ return false;
|
|
+
|
|
+ *R = FXSYS_GetRValue(*text_color);
|
|
+ *G = FXSYS_GetGValue(*text_color);
|
|
+ *B = FXSYS_GetBValue(*text_color);
|
|
+ return true;
|
|
+}
|
|
+
|
|
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_IsChecked(FPDF_FORMHANDLE hHandle,
|
|
FPDF_ANNOTATION annot) {
|
|
const CPDFSDK_Widget* pWidget =
|
|
diff --git a/public/fpdf_annot.h b/public/fpdf_annot.h
|
|
index 337da58f1..27de4b1a8 100644
|
|
--- a/public/fpdf_annot.h
|
|
+++ b/public/fpdf_annot.h
|
|
@@ -845,6 +845,13 @@ FPDFAnnot_GetFontSize(FPDF_FORMHANDLE hHandle,
|
|
FPDF_ANNOTATION annot,
|
|
float* value);
|
|
|
|
+FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
|
|
+FPDFAnnot_GetFontColor(FPDF_FORMHANDLE hHandle,
|
|
+ FPDF_ANNOTATION annot,
|
|
+ unsigned int* R,
|
|
+ unsigned int* G,
|
|
+ unsigned int* B);
|
|
+
|
|
// Experimental API.
|
|
// Determine if |annot| is a form widget that is checked. Intended for use with
|
|
// checkbox and radio button widgets.
|