include/vcl/pdfwriter.hxx | 3 +-
toolkit/source/helper/formpdfexport.cxx | 32 +++++++++++++++++++++++++--
vcl/inc/pdf/pdfwriter_impl.hxx | 1
vcl/qa/cppunit/pdfexport/data/tdf105972.fodt | 32 ++++++++++++++++++++++++---
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 31 ++++++++++++++++++++------
vcl/source/gdi/pdfwriter_impl.cxx | 14 +++++++++++
6 files changed, 100 insertions(+), 13 deletions(-)
New commits:
commit 4bd95a0d5c962cc0bb8e90c32300c69ae8e92c1d
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed May 18 10:47:12 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed May 18 17:37:41 2022 +0200
tdf#105972: pdf form: export time fields as time type
using AFTime_FormatEx which allows to set a custom format
Change-Id: I2d30d9d8340782ed9ad53eb43e1f65728f926b23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134510
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 3717a40d8372..a375cc80e2c2 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -195,7 +195,7 @@ public:
enum FormatType
{
- Text, Number
+ Text, Number, Time
};
enum ErrorCode
@@ -388,6 +388,7 @@ public:
OUString CurrencySymbol;
sal_Int32 DecimalAccuracy;
bool PrependCurrencySymbol;
+ OUString TimeFormat;
EditWidget()
: AnyWidget( vcl::PDFWriter::Edit ),
diff --git a/toolkit/source/helper/formpdfexport.cxx
b/toolkit/source/helper/formpdfexport.cxx
index 28cfedf5e4ae..def4f38d8a61 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -496,6 +496,7 @@ namespace toolkitform
{
case FormComponentType::CURRENCYFIELD:
case FormComponentType::NUMERICFIELD:
+ {
pEditWidget->Format = vcl::PDFWriter::Number;
@@ -525,11 +526,38 @@ namespace toolkitform
SAL_WARN("toolkit.helper",
"describePDFControl: unable to get property " << FM_PROP_PREPENDCURRENCYSYMBOL);
pEditWidget->PrependCurrencySymbol =
bPrependCurrencySymbol;
}
- break;
+ } break;
+ case FormComponentType::TIMEFIELD:
+ {
+ pEditWidget->Format = vcl::PDFWriter::Time;
+
+ static constexpr OUStringLiteral FM_PROP_TIMEFORMAT =
u"TimeFormat";
+ if ( xPSI->hasPropertyByName( FM_PROP_TIMEFORMAT ) )
+ {
+ sal_Int32 nTimeFormat = 0;
+ if( ! (xModelProps->getPropertyValue(
FM_PROP_TIMEFORMAT ) >>= nTimeFormat) )
+ SAL_WARN("toolkit.helper",
"describePDFControl: unable to get property " << FM_PROP_TIMEFORMAT);
+
+ switch ( nTimeFormat )
+ {
+ case 0:
+ pEditWidget->TimeFormat = "HH:MM"; //13:45
+ break;
+ case 1:
+ pEditWidget->TimeFormat = "HH:MM:ss";
//13:45:00
+ break;
+ case 2:
+ pEditWidget->TimeFormat = "h:MMtt";
//01:45 PM
+ break;
+ case 3:
+ pEditWidget->TimeFormat = "h:MM:sstt";
//01:45:00 PM
+ break;
+ }
+ }
+ } break;
}
}
-
// buttons
if ( Descriptor->getType() == vcl::PDFWriter::PushButton )
{
diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx
index cd809e127cf1..4affbe40f24e 100644
--- a/vcl/inc/pdf/pdfwriter_impl.hxx
+++ b/vcl/inc/pdf/pdfwriter_impl.hxx
@@ -472,6 +472,7 @@ struct PDFWidget : public PDFAnnotation
OUString m_aCurrencySymbol;
sal_Int32 m_nDecimalAccuracy;
bool m_bPrependCurrencySymbol;
+ OUString m_aTimeFormat;
bool m_bSubmit;
bool m_bSubmitGet;
sal_Int32 m_nDest;
diff --git a/vcl/qa/cppunit/pdfexport/data/tdf105972.fodt
b/vcl/qa/cppunit/pdfexport/data/tdf105972.fodt
index 694c0ddb0b95..dd8081eafde1 100644
--- a/vcl/qa/cppunit/pdfexport/data/tdf105972.fodt
+++ b/vcl/qa/cppunit/pdfexport/data/tdf105972.fodt
@@ -1,6 +1,6 @@
<?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><meta:creation-date>2022-05-17T10:53:27.044915889</meta:creation-date><dc:date>2022-05-17T12:56:48.901634442</dc:date><meta:editing-duration>PT1M36S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:generator>LibreOfficeDev/7.4.0.0.alpha1$Linux_X86_64
LibreOffice_project/817b8fe7001a83cb74910eb09b7c14a3b95b8a39</meta:generator><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="1" meta:word-count="0"
meta:character-count="0" meta:non-whitespace-character-count="0"/></office:meta>
+
<office:meta><meta:creation-date>2022-05-17T10:53:27.044915889</meta:creation-date><dc:date>2022-05-18T10:38:21.488324901</dc:date><meta:editing-duration>PT2M19S</meta:editing-duration><meta:editing-cycles>5</meta:editing-cycles><meta:generator>LibreOfficeDev/7.4.0.0.alpha1$Linux_X86_64
LibreOffice_project/724710def53bf0a8948fcc3e83447a021aa20513</meta:generator><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="2" meta:word-count="0"
meta:character-count="0" meta:non-whitespace-character-count="0"/></office:meta>
<office:font-face-decls>
<style:font-face style:name="Liberation Serif" svg:font-family="'Liberation
Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
<style:font-face style:name="Lohit Devanagari1" svg:font-family="'Lohit
Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/>
@@ -82,7 +82,13 @@
<text:linenumbering-configuration text:number-lines="false"
text:offset="0.1965in" style:num-format="1" text:number-position="left"
text:increment="5"/>
</office:styles>
<office:automatic-styles>
- <style:style style:name="gr1" style:family="graphic">
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="gr1" style:family="graphic"
style:data-style-name="C63">
+ <style:graphic-properties style:wrap="run-through"
style:number-wrapped-paragraphs="no-limit" style:vertical-pos="middle"
style:vertical-rel="line" style:horizontal-pos="from-left"
style:horizontal-rel="paragraph"
draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true"
style:flow-with-text="false"/>
+ </style:style>
+ <style:style style:name="gr2" style:family="graphic">
<style:graphic-properties style:wrap="run-through"
style:number-wrapped-paragraphs="no-limit" style:vertical-pos="middle"
style:vertical-rel="line" style:horizontal-pos="from-left"
style:horizontal-rel="paragraph"
draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true"
style:flow-with-text="false"/>
</style:style>
<style:page-layout style:name="pm1">
@@ -95,6 +101,15 @@
<style:style style:name="dp1" style:family="drawing-page">
<style:drawing-page-properties draw:background-size="full"/>
</style:style>
+ <number:time-style style:name="C63" number:language="en" number:country="US">
+ <number:hours number:style="long"/>
+ <number:text>:</number:text>
+ <number:minutes number:style="long"/>
+ <number:text>:</number:text>
+ <number:seconds number:style="long"/>
+ <number:text> </number:text>
+ <number:am-pm/>
+ </number:time-style>
</office:automatic-styles>
<office:master-styles>
<style:master-page style:name="Standard" style:page-layout-name="pm1"
draw:style-name="dp1"/>
@@ -118,6 +133,15 @@
<form:property form:property-name="PrependCurrencySymbol"
office:value-type="boolean" office:boolean-value="true"/>
</form:properties>
</form:formatted-text>
+ <form:time form:name="TimeField"
form:control-implementation="ooo:com.sun.star.form.component.TimeField"
xml:id="control2" form:id="control2" form:value="P0D"
form:current-value="PT11H" form:max-value="PT23H58M58S"
form:input-required="false" form:validation="true">
+ <form:properties>
+ <form:property form:property-name="ControlTypeinMSO"
office:value-type="float" office:value="0"/>
+ <form:property form:property-name="DefaultControl"
office:value-type="string"
office:string-value="com.sun.star.form.control.TimeField"/>
+ <form:property form:property-name="MouseWheelBehavior"
office:value-type="float" office:value="0"/>
+ <form:property form:property-name="ObjIDinMSO"
office:value-type="float" office:value="65535"/>
+ <form:property form:property-name="Text" office:value-type="string"
office:string-value="11:00:00AM"/>
+ </form:properties>
+ </form:time>
</form:form>
</office:forms>
<text:sequence-decls>
@@ -127,7 +151,9 @@
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
<text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
</text:sequence-decls>
- <text:p text:style-name="Standard"><draw:control text:anchor-type="as-char"
draw:z-index="0" draw:name="Control 1" draw:style-name="gr1"
draw:text-style-name="P1" svg:width="2.563in" svg:height="0.5732in"
draw:control="control1"/></text:p>
+ <text:p text:style-name="Standard"><draw:control text:anchor-type="as-char"
draw:z-index="0" draw:name="Control 1" draw:style-name="gr2"
draw:text-style-name="P3" svg:width="2.563in" svg:height="0.5732in"
draw:control="control1"/></text:p>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="P1"><draw:control text:anchor-type="as-char"
draw:z-index="1" draw:name="Control 2" draw:style-name="gr1"
draw:text-style-name="P3" svg:width="2.4543in" svg:height="0.5732in"
draw:control="control2"/></text:p>
</office:text>
</office:body>
</office:document>
\ No newline at end of file
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 2cc5ec6345a4..6dc8f425ef67 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -866,8 +866,9 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105972)
auto pAnnots =
dynamic_cast<vcl::filter::PDFArrayElement*>(aPages[0]->Lookup("Annots"));
CPPUNIT_ASSERT(pAnnots);
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1),
pAnnots->GetElements().size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2),
pAnnots->GetElements().size());
+ sal_uInt32 nTextFieldCount = 0;
for (const auto& aElement : aDocument.GetElements())
{
auto pObject =
dynamic_cast<vcl::filter::PDFObjectElement*>(aElement.get());
@@ -876,20 +877,36 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105972)
auto pType =
dynamic_cast<vcl::filter::PDFNameElement*>(pObject->Lookup("FT"));
if (pType && pType->GetValue() == "Tx")
{
+ ++nTextFieldCount;
+
auto pT =
dynamic_cast<vcl::filter::PDFLiteralStringElement*>(pObject->Lookup("T"));
CPPUNIT_ASSERT(pT);
- CPPUNIT_ASSERT_EQUAL(OString("CurrencyField"), pT->GetValue());
-
auto pAA =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pObject->Lookup("AA"));
CPPUNIT_ASSERT(pAA);
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2),
pAA->GetItems().size());
-
auto pF =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pAA->LookupElement("F"));
CPPUNIT_ASSERT(pF);
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2),
pF->GetItems().size());
- auto pJS =
dynamic_cast<vcl::filter::PDFLiteralStringElement*>(pF->LookupElement("JS"));
- CPPUNIT_ASSERT_EQUAL(OString("AFNumber_Format\\(4, 0, 0, 0,
\"\\\\u20ac\",true\\);"),
- pJS->GetValue());
+
+ if (nTextFieldCount == 1)
+ {
+ CPPUNIT_ASSERT_EQUAL(OString("CurrencyField"), pT->GetValue());
+
+ auto pJS
+ =
dynamic_cast<vcl::filter::PDFLiteralStringElement*>(pF->LookupElement("JS"));
+ CPPUNIT_ASSERT_EQUAL(
+ OString("AFNumber_Format\\(4, 0, 0, 0,
\"\\\\u20ac\",true\\);"),
+ pJS->GetValue());
+ }
+ else
+ {
+ CPPUNIT_ASSERT_EQUAL(OString("TimeField"), pT->GetValue());
+
+ auto pJS
+ =
dynamic_cast<vcl::filter::PDFLiteralStringElement*>(pF->LookupElement("JS"));
+
CPPUNIT_ASSERT_EQUAL(OString("AFTime_FormatEx\\(\"h:MM:sstt\"\\);"),
+ pJS->GetValue());
+ }
}
}
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 9d8a66b108b4..7d5264af56ad 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4422,6 +4422,19 @@ bool PDFWriterImpl::emitWidgetAnnotations()
aLine.append("/S/JavaScript>>\n");
aLine.append(">>\n");
}
+ else if ( rWidget.m_nFormat == PDFWriter::Time )
+ {
+ aLine.append("/AA<<\n");
+ aLine.append("/F<</JS(AFTime_FormatEx\\(\"");
+ aLine.append(OUStringToOString(rWidget.m_aTimeFormat,
RTL_TEXTENCODING_ASCII_US));
+ aLine.append("\"\\);)");
+ aLine.append("/S/JavaScript>>\n");
+ aLine.append("/K<</JS(AFTime_KeystrokeEx\\(\"");
+ aLine.append(OUStringToOString(rWidget.m_aTimeFormat,
RTL_TEXTENCODING_ASCII_US));
+ aLine.append("\"\\);)");
+ aLine.append("/S/JavaScript>>\n");
+ aLine.append(">>\n");
+ }
}
if( rWidget.m_eType == PDFWriter::PushButton )
{
@@ -11015,6 +11028,7 @@ sal_Int32 PDFWriterImpl::createControl( const
PDFWriter::AnyWidget& rControl, sa
rNewWidget.m_aCurrencySymbol = rEdit.CurrencySymbol;
rNewWidget.m_nDecimalAccuracy = rEdit.DecimalAccuracy;
rNewWidget.m_bPrependCurrencySymbol = rEdit.PrependCurrencySymbol;
+ rNewWidget.m_aTimeFormat = rEdit.TimeFormat;
rNewWidget.m_aValue = rEdit.Text;
createDefaultEditAppearance( rNewWidget, rEdit );
