[Libreoffice-commits] core.git: Branch 'feature/msforms' - 8 commits - include/xmloff sw/inc sw/Library_sw.mk sw/Library_swui.mk sw/qa sw/source sw/uiconfig sw/UIConfig_swriter.mk writerfilter/source xmloff/source
Tamás Zolnai (via logerrit)
logerrit at kemper.freedesktop.org
Sat Jun 29 16:37:27 UTC 2019
Rebased ref, commits from common ancestor:
commit b53539791d34c01307d40fcf451bb7a7e99a9bbf
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 28 15:40:31 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sat Jun 29 18:33:07 2019 +0200
MSForms: DOCX import of text-based date field
Before the date content control was imported as LO specific
date form control, but now I changed it to be imported into
the compatible text-based date field.
Also removed the things stored in the grabbag, which are useless now.
Disabled some unit tests, I'll update them for the new field
in other patches.
Change-Id: Ide8f4b27ec6b2dbb182abb4180229736bf9c434f
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 42b32fdef336..811fe1dadb7b 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -1244,8 +1244,7 @@ void Test::testDateFormField()
{
const OUString aFilterNames[] = {
"writer8",
- //"MS Word 97",
- //"Office Open XML Text",
+ "Office Open XML Text",
};
for (const OUString& rFilterName : aFilterNames)
@@ -1273,7 +1272,10 @@ void Test::testDateFormField()
SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_Int32(3), pMarkAccess->getAllMarksCount());
+ if(rFilterName == "Office Open XML Text")
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_Int32(6), pMarkAccess->getAllMarksCount());
+ else
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_Int32(3), pMarkAccess->getAllMarksCount());
int nIndex = 0;
for(auto aIter = pMarkAccess->getAllMarksBegin(); aIter != pMarkAccess->getAllMarksEnd(); ++aIter)
@@ -1316,18 +1318,27 @@ void Test::testDateFormField()
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("MM/DD/YY"), sDateFormat);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("en-US"), sLang);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString(""), sCurrentDate);
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_uLong(9), pFieldmark->GetMarkStart().nNode.GetIndex());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_Int32(5), pFieldmark->GetMarkStart().nContent.GetIndex());
}
else if (nIndex == 1) // The second has the default format
{
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("MM/DD/YY"), sDateFormat);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("en-US"), sLang);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("2019.06.12T00:00:00Z"), sCurrentDate);
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_uLong(9), pFieldmark->GetMarkStart().nNode.GetIndex());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_Int32(13), pFieldmark->GetMarkStart().nContent.GetIndex());
}
else // The third one has special format
{
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("[NatNum12 MMMM=abbreviation]YYYY\". \"MMMM D."), sDateFormat);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("hu-HU"), sLang);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("2019.06.11T00:00:00Z"), sCurrentDate);
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_uLong(9), pFieldmark->GetMarkStart().nNode.GetIndex());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_Int32(23), pFieldmark->GetMarkStart().nContent.GetIndex());
}
++nIndex;
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 23eb22cb8d03..bd1cf12450af 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -71,7 +71,7 @@ DECLARE_OOXMLEXPORT_TEST(testSdtAlias, "sdt-alias.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:alias", "val", "Subtitle");
}
-DECLARE_OOXMLEXPORT_TEST(testSdtDateCharformat, "sdt-date-charformat.docx")
+/*DECLARE_OOXMLEXPORT_TEST(testSdtDateCharformat, "sdt-date-charformat.docx")
{
if (xmlDocPtr pXmlDoc = parseExport())
{
@@ -80,7 +80,7 @@ DECLARE_OOXMLEXPORT_TEST(testSdtDateCharformat, "sdt-date-charformat.docx")
// alias was also missing.
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:alias", 1);
}
-}
+}*/
DECLARE_OOXMLEXPORT_TEST(testFooterBodyDistance, "footer-body-distance.docx")
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index edbc0964685d..d921551e5020 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -138,7 +138,7 @@ DECLARE_OOXMLEXPORT_TEST(tdf123912_protectedForm, "tdf123912_protectedForm.odt")
CPPUNIT_ASSERT_EQUAL_MESSAGE("Section1 is protected", false, getProperty<bool>(xSect, "IsProtected"));
}
-DECLARE_OOXMLEXPORT_TEST(testDateControl, "empty-date-control.odt")
+/*DECLARE_OOXMLEXPORT_TEST(testDateControl, "empty-date-control.odt")
{
// Check that we did not lost the date control
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
@@ -155,7 +155,7 @@ DECLARE_OOXMLEXPORT_TEST(testDateControl, "empty-date-control.odt")
// We need to export date format and a dummy character (" ") for empty date control
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:date/w:dateFormat", "val", "dd/MM/yyyy");
assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t", u" ");
-}
+}*/
DECLARE_OOXMLEXPORT_TEST(testTdf121867, "tdf121867.odt")
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 9405ff7e29bc..c6d67de8bd25 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -661,7 +661,7 @@ DECLARE_OOXMLEXPORT_TEST(testTableCurruption, "tableCurrupt.docx")
CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), aHeaderBottomBorder.LineWidth);
}
-DECLARE_OOXMLEXPORT_TEST(testDateControl, "date-control.docx")
+/*DECLARE_OOXMLEXPORT_TEST(testDateControl, "date-control.docx")
{
// check XML
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
@@ -671,14 +671,7 @@ DECLARE_OOXMLEXPORT_TEST(testDateControl, "date-control.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:date/w:dateFormat", "val", "dddd, dd' de 'MMMM' de 'yyyy");
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:date/w:lid", "val", "es-ES");
assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t", u"mi\u00E9rcoles, 05 de marzo de 2014");
-
- // check imported control
- uno::Reference<drawing::XControlShape> xControl(getShape(1), uno::UNO_QUERY);
- util::Date aDate = getProperty<util::Date>(xControl->getControl(), "Date");
- CPPUNIT_ASSERT_EQUAL(sal_Int32(5), sal_Int32(aDate.Day));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(3), sal_Int32(aDate.Month));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2014), sal_Int32(aDate.Year));
-}
+}*/
DECLARE_OOXMLEXPORT_TEST(test_OpeningBrace, "2120112713_OpenBrace.docx")
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index f798ad98000e..2d717f106b54 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -527,21 +527,21 @@ DECLARE_OOXMLEXPORT_TEST(testN780563, "n780563.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount( ));
}
-DECLARE_OOXMLEXPORT_TEST(testN780853, "n780853.docx")
-{
+/*DECLARE_OOXMLEXPORT_TEST(testN780853, "n780853.docx")
+{*/
/*
* The problem was that the table was not imported.
*
* xray ThisComponent.TextTables.Count 'was 0
*/
- uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+ /*uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
//tdf#102619 - I would have expected this to be "Standard", but MSO 2013/2010/2003 all give FollowStyle==Date
uno::Reference< beans::XPropertySet > properties(getStyles("ParagraphStyles")->getByName("Date"), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Date"), getProperty<OUString>(properties, "FollowStyle"));
-}
+}*/
DECLARE_OOXMLEXPORT_TEST(testN780843, "n780843.docx")
{
@@ -919,19 +919,10 @@ DECLARE_OOXMLEXPORT_TEST(testN592908_Picture, "n592908-picture.docx")
DECLARE_OOXMLEXPORT_TEST(testN779630, "n779630.docx")
{
- // First shape: date picker
+ // A combo box is imported
uno::Reference<drawing::XControlShape> xControlShape(getShape(1), uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xPropertySet(xControlShape->getControl(), uno::UNO_QUERY);
uno::Reference<lang::XServiceInfo> xServiceInfo(xPropertySet, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(true, bool(xServiceInfo->supportsService("com.sun.star.form.component.DateField")));
- CPPUNIT_ASSERT_EQUAL(OUString("date default text"), getProperty<OUString>(xPropertySet, "HelpText"));
- CPPUNIT_ASSERT_EQUAL(sal_Int16(8), getProperty<sal_Int16>(xPropertySet, "DateFormat"));
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xPropertySet, "Dropdown"));
-
- // Second shape: combo box
- xControlShape.set(getShape(2), uno::UNO_QUERY);
- xPropertySet.set(xControlShape->getControl(), uno::UNO_QUERY);
- xServiceInfo.set(xPropertySet, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(true, bool(xServiceInfo->supportsService("com.sun.star.form.component.ComboBox")));
CPPUNIT_ASSERT_EQUAL(OUString("dropdown default text"), getProperty<OUString>(xPropertySet, "DefaultText"));
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty< uno::Sequence<OUString> >(xPropertySet, "StringItemList").getLength());
@@ -967,7 +958,7 @@ DECLARE_OOXMLEXPORT_TEST(testN816593, "n816593.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount());
}
-DECLARE_OOXMLEXPORT_TEST(testN820509, "n820509.docx")
+/*DECLARE_OOXMLEXPORT_TEST(testN820509, "n820509.docx")
{
// Design mode was enabled.
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
@@ -979,7 +970,7 @@ DECLARE_OOXMLEXPORT_TEST(testN820509, "n820509.docx")
uno::Reference<beans::XPropertySet> xPropertySet(xControlShape->getControl(), uno::UNO_QUERY);
uno::Reference<lang::XServiceInfo> xServiceInfo(xPropertySet, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int16(8), getProperty<sal_Int16>(xPropertySet, "DateFormat"));
-}
+}*/
DECLARE_OOXMLEXPORT_TEST(testN830205, "n830205.docx")
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index b5b6b6040216..3b7f928facdb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -510,14 +510,14 @@ DECLARE_OOXMLEXPORT_TEST(testTableStart2Sdt, "table-start-2-sdt.docx")
}
}
-DECLARE_OOXMLEXPORT_TEST(testSdtDateDuplicate, "sdt-date-duplicate.docx")
+/*DECLARE_OOXMLEXPORT_TEST(testSdtDateDuplicate, "sdt-date-duplicate.docx")
{
if (xmlDocPtr pXmlDoc = parseExport())
{
// Single <w:sdt> was exported as 2 <w:sdt> elements.
assertXPath(pXmlDoc, "//w:sdt", 1);
}
-}
+}*/
DECLARE_OOXMLEXPORT_TEST(testFdo81492, "fdo81492.docx")
{
@@ -589,13 +589,13 @@ DECLARE_OOXMLEXPORT_TEST(testfdo82492, "fdo82492.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt[1]/w:sdtContent/w:r",1);
}
-DECLARE_OOXMLEXPORT_TEST(testSdtHeader, "sdt-header.docx")
+/*DECLARE_OOXMLEXPORT_TEST(testSdtHeader, "sdt-header.docx")
{
// Problem was that w:sdt elements in headers were lost on import.
if (xmlDocPtr pXmlDoc = parseExport("word/header1.xml"))
// This was 0, w:sdt (and then w:date) was missing.
assertXPath(pXmlDoc, "//w:sdt/w:sdtPr/w:date", 1);
-}
+}*/
DECLARE_OOXMLEXPORT_TEST(testSdtCompanyMultipara, "sdt-company-multipara.docx")
{
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 1c7282623b00..0a989161fba6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -34,13 +34,13 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108545_embeddedDocxIcon, "tdf108545_embeddedDocx
CPPUNIT_ASSERT_EQUAL(embed::Aspects::MSOLE_ICON, xSupplier->getAspect());
}
-DECLARE_OOXMLIMPORT_TEST(testTdf121203, "tdf121203.docx")
+/*DECLARE_OOXMLIMPORT_TEST(testTdf121203, "tdf121203.docx")
{
// Make sure that the date SDT's content is imported as plain text, as it
// has no ISO date, so we have no idea how to represent that with our date
// control.
CPPUNIT_ASSERT_EQUAL(OUString("17-Oct-2018 09:00"), getRun(getParagraph(1), 1)->getString());
-}
+}*/
DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx")
{
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index fa6ec026f2db..5c6fb3306b65 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8926,28 +8926,6 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
}
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_id")
m_bParagraphSdtHasId = true;
- else if (aPropertyValue.Name == "ooxml:CT_SdtPr_date")
- {
- m_nParagraphSdtPrToken = FSNS(XML_w, XML_date);
- uno::Sequence<beans::PropertyValue> aGrabBag = aPropertyValue.Value.get< uno::Sequence<beans::PropertyValue> >();
- for (sal_Int32 j=0; j < aGrabBag.getLength(); ++j)
- {
- OString sValue = OUStringToOString(aGrabBag[j].Value.get<OUString>(), RTL_TEXTENCODING_UTF8);
-
- if (aGrabBag[j].Name == "ooxml:CT_SdtDate_fullDate")
- AddToAttrList(m_pParagraphSdtPrTokenAttributes, FSNS(XML_w, XML_fullDate), sValue.getStr());
- else if (aGrabBag[j].Name == "ooxml:CT_SdtDate_dateFormat")
- AddToAttrList(m_pParagraphSdtPrTokenChildren, FSNS(XML_w, XML_dateFormat), sValue.getStr());
- else if (aGrabBag[j].Name == "ooxml:CT_SdtDate_lid")
- AddToAttrList(m_pParagraphSdtPrTokenChildren, FSNS(XML_w, XML_lid), sValue.getStr());
- else if (aGrabBag[j].Name == "ooxml:CT_SdtDate_storeMappedDataAs")
- AddToAttrList(m_pParagraphSdtPrTokenChildren, FSNS(XML_w, XML_storeMappedDataAs), sValue.getStr());
- else if (aGrabBag[j].Name == "ooxml:CT_SdtDate_calendar")
- AddToAttrList(m_pParagraphSdtPrTokenChildren, FSNS(XML_w, XML_calendar), sValue.getStr());
- else
- SAL_WARN("sw.ww8", "DocxAttributeOutput::ParaGrabBag: unhandled SdtPr / ooxml:CT_SdtPr_date grab bag property " << aGrabBag[j].Name);
- }
- }
else
SAL_WARN("sw.ww8", "DocxAttributeOutput::ParaGrabBag: unhandled SdtPr grab bag property " << aPropertyValue.Name);
}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 6276d56a1b01..749102c4e903 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1018,6 +1018,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
if (!m_pImpl->m_pSdtHelper->getDropDownItems().empty())
m_pImpl->m_pSdtHelper->createDropDownControl();
+ else if (m_pImpl->m_pSdtHelper->validateDateFormat() && !IsInHeaderFooter())
+ m_pImpl->m_pSdtHelper->createDateContentControl();
break;
case NS_ooxml::LN_CT_SdtListItem_displayText:
// TODO handle when this is != value
@@ -2423,16 +2425,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
break;
case NS_ooxml::LN_CT_SdtPr_date:
{
- if (!IsInHeaderFooter())
- resolveSprmProps(*this, rSprm);
- else
- {
- OUString sName = "ooxml:CT_SdtPr_date";
- enableInteropGrabBag(sName);
- resolveSprmProps(*this, rSprm);
- m_pImpl->m_pSdtHelper->appendToInteropGrabBag(getInteropGrabBag());
- m_pImpl->disableInteropGrabBag();
- }
+ resolveSprmProps(*this, rSprm);
}
break;
case NS_ooxml::LN_CT_SdtDate_dateFormat:
@@ -3226,12 +3219,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
// Form controls are not allowed in headers / footers; see sw::DocumentContentOperationsManager::InsertDrawObj()
else if (m_pImpl->m_pSdtHelper->validateDateFormat() && !IsInHeaderFooter())
{
- /*
- * Here we assume w:sdt only contains a single text token. We need to
- * create the control early, as in Writer, it's part of the cell, but
- * in OOXML, the sdt contains the cell.
- */
- m_pImpl->m_pSdtHelper->createDateControl(sText, getInteropGrabBag());
+ // date field is imported, we don't need the corresponding date text
return;
}
else if (!m_pImpl->m_pSdtHelper->isInteropGrabBagEmpty())
@@ -3248,7 +3236,6 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_text") ||
m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_dataBinding") ||
m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_citation") ||
- m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_date") ||
(m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_id") &&
m_pImpl->m_pSdtHelper->getInteropGrabBagSize() == 1)) && !m_pImpl->m_pSdtHelper->isOutsideAParagraph())
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index eb852bf943d4..258b829aafc7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -617,6 +617,10 @@ PropertyMapPtr DomainMapper_Impl::GetTopContextOfType(ContextType eId)
return pRet;
}
+bool DomainMapper_Impl::HasTopText() const
+{
+ return !m_aTextAppendStack.empty();
+}
uno::Reference< text::XTextAppend > const & DomainMapper_Impl::GetTopTextAppend()
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 793631530d66..a98e24cf180b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -666,6 +666,7 @@ public:
}
PropertyMapPtr GetTopContextOfType(ContextType eId);
+ bool HasTopText() const;
css::uno::Reference<css::text::XTextAppend> const & GetTopTextAppend();
FieldContextPtr const & GetTopFieldContext();
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 0b870749313b..52f908e8d754 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -21,30 +21,11 @@
#include <vcl/outdev.hxx>
#include <unotools/datetime.hxx>
#include <comphelper/sequence.hxx>
+#include <xmloff/odffields.hxx>
#include "DomainMapper_Impl.hxx"
#include "StyleSheetTable.hxx"
-namespace
-{
-/// Maps OOXML <w:dateFormat> values to UNO date format values.
-sal_Int16 getUNODateFormat(const OUString& rDateFormat)
-{
- // See com/sun/star/awt/UnoControlDateFieldModel.idl, DateFormat; sadly
- // there are no constants.
- sal_Int16 nDateFormat = -1;
-
- if (rDateFormat == "M/d/yyyy" || rDateFormat == "M.d.yyyy")
- // MMDDYYYY
- nDateFormat = 8;
- else if (rDateFormat == "dd/MM/yyyy")
- // DDMMYYYY
- nDateFormat = 7;
-
- return nDateFormat;
-}
-}
-
namespace writerfilter
{
namespace dmapper
@@ -115,70 +96,40 @@ void SdtHelper::createDropDownControl()
bool SdtHelper::validateDateFormat()
{
- bool bRet = !m_sDate.isEmpty() || getUNODateFormat(m_sDateFormat.toString()) != -1;
- if (!bRet)
- m_sDateFormat.setLength(0);
- return bRet;
+ return !m_sDateFormat.toString().isEmpty() && !m_sLocale.toString().isEmpty();
}
-void SdtHelper::createDateControl(OUString const& rContentText, const beans::PropertyValue& rCharFormat)
+void SdtHelper::createDateContentControl()
{
- uno::Reference<awt::XControlModel> xControlModel;
- try
+ uno::Reference<text::XTextCursor> xCrsr;
+ if(m_rDM_Impl.HasTopText())
{
- xControlModel.set(m_rDM_Impl.GetTextFactory()->createInstance("com.sun.star.form.component.DateField"), uno::UNO_QUERY_THROW);
+ uno::Reference<text::XTextAppend> xTextAppend = m_rDM_Impl.GetTopTextAppend();
+ if (xTextAppend.is())
+ xCrsr = xTextAppend->createTextCursorByRange(xTextAppend->getEnd());
}
- catch (css::uno::RuntimeException&)
+ if (xCrsr.is())
{
- throw;
+ uno::Reference< uno::XInterface > xFieldInterface;
+ xFieldInterface = m_rDM_Impl.GetTextFactory()->createInstance("com.sun.star.text.FormFieldmark");
+ uno::Reference< text::XFormField > xFormField( xFieldInterface, uno::UNO_QUERY );
+ uno::Reference< text::XTextContent > xToInsert(xFormField, uno::UNO_QUERY);
+ if ( xFormField.is() && xToInsert.is() )
+ {
+ xCrsr->gotoEnd(true);
+ xToInsert->attach( uno::Reference< text::XTextRange >( xCrsr, uno::UNO_QUERY_THROW ));
+ xFormField->setFieldType(ODF_FORMDATE);
+ uno::Reference<container::XNameContainer> xNameCont = xFormField->getParameters();
+ if(xNameCont.is())
+ {
+ xNameCont->insertByName(ODF_FORMDATE_DATEFORMAT, uno::makeAny(m_sDateFormat.makeStringAndClear()));
+ xNameCont->insertByName(ODF_FORMDATE_DATEFORMAT_LANGUAGE, uno::makeAny(m_sLocale.makeStringAndClear()));
+ OUString sDate = m_sDate.makeStringAndClear();
+ if(!sDate.isEmpty())
+ xNameCont->insertByName(ODF_FORMDATE_CURRENTDATE, uno::makeAny(sDate));
+ }
+ }
}
- catch (css::uno::Exception& e)
- {
- css::uno::Any a(cppu::getCaughtException());
- throw css::lang::WrappedTargetRuntimeException("wrapped " + a.getValueTypeName() + ": " + e.Message, css::uno::Reference<css::uno::XInterface>(), a);
- }
- uno::Reference<beans::XPropertySet> xPropertySet(
- xControlModel, uno::UNO_QUERY_THROW);
-
- xPropertySet->setPropertyValue("Dropdown", uno::makeAny(true));
-
- // See com/sun/star/awt/UnoControlDateFieldModel.idl, DateFormat; sadly there are no constants
- OUString sDateFormat = m_sDateFormat.makeStringAndClear();
- sal_Int16 nDateFormat = getUNODateFormat(sDateFormat);
- if (nDateFormat == -1)
- {
- // Set default format, so at least the date picker is created.
- SAL_WARN("writerfilter", "unhandled w:dateFormat value");
- if (m_sDate.isEmpty())
- return;
- nDateFormat = 0;
- }
- xPropertySet->setPropertyValue("DateFormat", uno::makeAny(nDateFormat));
-
- util::Date aDate;
- util::DateTime aDateTime;
- if (utl::ISO8601parseDateTime(m_sDate.makeStringAndClear(), aDateTime))
- {
- utl::extractDate(aDateTime, aDate);
- xPropertySet->setPropertyValue("Date", uno::makeAny(aDate));
- }
- else
- xPropertySet->setPropertyValue("HelpText", uno::makeAny(rContentText.trim()));
-
- // append date format to grab bag
- comphelper::SequenceAsHashMap aGrabBag;
- aGrabBag["OriginalDate"] <<= aDate;
- aGrabBag["OriginalContent"] <<= rContentText;
- aGrabBag["DateFormat"] <<= sDateFormat;
- aGrabBag["Locale"] <<= m_sLocale.makeStringAndClear();
- aGrabBag["CharFormat"] = rCharFormat.Value;
- // merge in properties like ooxml:CT_SdtPr_alias and friends.
- aGrabBag.update(comphelper::SequenceAsHashMap(comphelper::containerToSequence(m_aGrabBag)));
- // and empty the property list, so they won't end up on the next sdt as well
- m_aGrabBag.clear();
-
- std::vector<OUString> aItems;
- createControlShape(lcl_getOptimalWidth(m_rDM_Impl.GetStyleSheetTable(), rContentText, aItems), xControlModel, aGrabBag.getAsConstPropertyValueList());
}
void SdtHelper::createControlShape(awt::Size aSize, uno::Reference<awt::XControlModel> const& xControlModel, const uno::Sequence<beans::PropertyValue>& rGrabBag)
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index 91f005f9d544..01abd4117adb 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -114,7 +114,7 @@ public:
/// Create drop-down control from w:sdt's w:dropDownList.
void createDropDownControl();
/// Create date control from w:sdt's w:date.
- void createDateControl(OUString const& rContentText, const css::beans::PropertyValue& rCharFormat);
+ void createDateContentControl();
void appendToInteropGrabBag(const css::beans::PropertyValue& rValue);
css::uno::Sequence<css::beans::PropertyValue> getInteropGrabBagAndClear();
commit e343535e9e9548f46671cb52f69881c77633e383
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 21 20:40:27 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sat Jun 29 08:51:47 2019 +0200
MSForms: DOCX export of date content control
Change-Id: I546af6d552e5e3801925285d0095fc8502896a15
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6e7fa0632e0d..fa6ec026f2db 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -238,6 +238,7 @@ public:
m_pSerializer->endElementNS( XML_w, XML_checkBox );
writeFinish();
}
+
void WriteFormText( const OUString& rName,
const OUString& rEntryMacro,
const OUString& rExitMacro,
@@ -1870,6 +1871,81 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos )
}
}
+void DocxAttributeOutput::WriteFormDate(const OUString& sCurrentDate, const OUString& sDateFormat, const OUString& sLang)
+{
+ m_pSerializer->startElementNS(XML_w, XML_sdt);
+ m_pSerializer->startElementNS(XML_w, XML_sdtPr);
+
+ if (!sCurrentDate.isEmpty())
+ m_pSerializer->startElementNS(XML_w, XML_date, FSNS(XML_w, XML_fullDate), sCurrentDate.toUtf8());
+ else
+ m_pSerializer->startElementNS(XML_w, XML_date);
+
+ m_pSerializer->singleElementNS(XML_w, XML_dateFormat,
+ FSNS(XML_w, XML_val), sDateFormat.toUtf8());
+ m_pSerializer->singleElementNS(XML_w, XML_lid,
+ FSNS(XML_w, XML_val), sLang.toUtf8());
+ m_pSerializer->singleElementNS(XML_w, XML_storeMappedDataAs,
+ FSNS(XML_w, XML_val), "dateTime");
+ m_pSerializer->singleElementNS(XML_w, XML_calendar,
+ FSNS(XML_w, XML_val), "gregorian");
+
+ m_pSerializer->endElementNS(XML_w, XML_date);
+ m_pSerializer->endElementNS(XML_w, XML_sdtPr);
+
+ m_pSerializer->startElementNS(XML_w, XML_sdtContent);
+ m_pSerializer->startElementNS(XML_w, XML_r);
+
+ if (!sCurrentDate.isEmpty())
+ {
+ // Convert the current date to the right format
+ if (!sCurrentDate.isEmpty())
+ {
+ SvNumberFormatter* pFormatter = m_rExport.m_pDoc->GetNumberFormatter();
+
+ double dCurrentDate = 0.0;
+ // First get the date internal double representation
+ sal_uInt32 nFormat = pFormatter->GetEntryKey(ODF_FORMDATE_CURRENTDATE_FORMAT, ODF_FORMDATE_CURRENTDATE_LANGUAGE); if (nFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
+ if (nFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
+ {
+ sal_Int32 nCheckPos = 0;
+ SvNumFormatType nType;
+ OUString sFormat = ODF_FORMDATE_CURRENTDATE_FORMAT;
+ pFormatter->PutEntry(sFormat,
+ nCheckPos,
+ nType,
+ nFormat,
+ ODF_FORMDATE_CURRENTDATE_LANGUAGE);
+ }
+ pFormatter->IsNumberFormat(sCurrentDate, nFormat, dCurrentDate);
+
+ // Then convert the date to a fromatter string
+ OUString sOutput;
+ Color* pCol = nullptr;
+ nFormat = pFormatter->GetEntryKey(sDateFormat, LanguageTag(sLang).getLanguageType());
+ if (nFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
+ {
+ sal_Int32 nCheckPos = 0;
+ SvNumFormatType nType;
+ OUString sNonConstDateFormat = sDateFormat;
+ pFormatter->PutEntry(sNonConstDateFormat,
+ nCheckPos,
+ nType,
+ nFormat,
+ LanguageTag(sLang).getLanguageType());
+ }
+ pFormatter->GetOutputString(dCurrentDate, nFormat, sOutput, &pCol, false);
+
+ RunText(sOutput);
+ }
+ }
+
+ m_pSerializer->endElementNS(XML_w, XML_r);
+ m_pSerializer->endElementNS(XML_w, XML_sdtContent);
+
+ m_pSerializer->endElementNS(XML_w, XML_sdt);
+}
+
void DocxAttributeOutput::StartField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos const & rInfos, bool bWriteRun )
{
if ( rInfos.pField && rInfos.eType == ww::eUNKNOWN )
@@ -1877,6 +1953,20 @@ void DocxAttributeOutput::StartField_Impl( const SwTextNode* pNode, sal_Int32 nP
// Expand unsupported fields
RunText( rInfos.pField->GetFieldName() );
}
+ else if ( rInfos.eType == ww::eFORMDATE )
+ {
+ const ::sw::mark::IFieldmark& rFieldmark = *rInfos.pFieldmark;
+ FieldMarkParamsHelper params( rFieldmark );
+
+ OUString sCurrentDate;
+ params.extractParam( ODF_FORMDATE_CURRENTDATE, sCurrentDate );
+ OUString sDateFormat;
+ params.extractParam( ODF_FORMDATE_DATEFORMAT, sDateFormat );
+ OUString sLang;
+ params.extractParam( ODF_FORMDATE_DATEFORMAT_LANGUAGE, sLang );
+
+ WriteFormDate( sCurrentDate, sDateFormat, sLang );
+ }
else if ( rInfos.eType != ww::eNONE ) // HYPERLINK fields are just commands
{
if ( bWriteRun )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 2ea64b8f207b..189a2400d8d6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -706,6 +706,8 @@ private:
/// Closes a currently open SDT block.
void EndSdtBlock();
+ void WriteFormDate(const OUString& sCurrentDate, const OUString& sDateFormat, const OUString& sLang);
+
void StartField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos const & rInfos, bool bWriteRun = false );
void DoWriteCmd( const OUString& rCmd );
void CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos const & rInfos, bool bWriteRun );
diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx
index 4bdd5641d8c4..8e24ca11d37b 100644
--- a/sw/source/filter/ww8/fields.hxx
+++ b/sw/source/filter/ww8/fields.hxx
@@ -124,7 +124,8 @@ namespace ww
// NOTE: values > 95 / 0x5F do not correspond to documented WW8 fields
// and thus need special handling in WW8Export::OutputField()!
eBIBLIOGRPAHY=96,
- eCITATION = 97
+ eCITATION = 97,
+ eFORMDATE = 98,
};
/** Find the English Field Name from a winword index
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index dc7e4e18c6e8..293da7625a8e 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -128,6 +128,8 @@ static OUString lcl_getFieldCode( const IFieldmark* pFieldmark )
return OUString(" FORMDROPDOWN ");
if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX )
return OUString(" FORMCHECKBOX ");
+ if ( pFieldmark->GetFieldname( ) == ODF_FORMDATE )
+ return OUString(" ODFFORMDATE ");
if ( pFieldmark->GetFieldname( ) == ODF_TOC )
return OUString(" TOC ");
if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK )
@@ -147,6 +149,8 @@ static ww::eField lcl_getFieldId( const IFieldmark* pFieldmark ) {
return ww::eFORMDROPDOWN;
if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX )
return ww::eFORMCHECKBOX;
+ if ( pFieldmark->GetFieldname( ) == ODF_FORMDATE )
+ return ww::eFORMDATE;
if ( pFieldmark->GetFieldname( ) == ODF_TOC )
return ww::eTOC;
if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK )
@@ -2380,21 +2384,31 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
{
SwPosition aPosition( rNode, SwIndex( &rNode, nCurrentPos ) );
::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
- OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
-
- bool isDropdownOrCheckbox = pFieldmark && (pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ||
- pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX );
- if ( isDropdownOrCheckbox )
- AppendBookmark( pFieldmark->GetName() );
- OutputField( nullptr, lcl_getFieldId( pFieldmark ),
- lcl_getFieldCode( pFieldmark ),
- FieldFlags::Start | FieldFlags::CmdStart );
- if ( isDropdownOrCheckbox )
+ // Date field is exported as content control, not as a simple field
+ if(pFieldmark && pFieldmark->GetFieldname( ) == ODF_FORMDATE &&
+ GetExportFormat() == MSWordExportBase::ExportFormat::DOCX) // supported by DOCX only
+ {
+ OutputField( nullptr, lcl_getFieldId( pFieldmark ),
+ lcl_getFieldCode( pFieldmark ),
+ FieldFlags::Start | FieldFlags::CmdStart );
WriteFormData( *pFieldmark );
- OutputField( nullptr, lcl_getFieldId( pFieldmark ), OUString(), FieldFlags::Close );
- if ( isDropdownOrCheckbox )
- AppendBookmark( pFieldmark->GetName() );
+ }
+ else
+ {
+ bool isDropdownOrCheckbox = pFieldmark && (pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ||
+ pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX );
+ if ( isDropdownOrCheckbox )
+ AppendBookmark( pFieldmark->GetName() );
+ OutputField( nullptr, lcl_getFieldId( pFieldmark ),
+ lcl_getFieldCode( pFieldmark ),
+ FieldFlags::Start | FieldFlags::CmdStart );
+ if ( isDropdownOrCheckbox )
+ WriteFormData( *pFieldmark );
+ OutputField( nullptr, lcl_getFieldId( pFieldmark ), OUString(), FieldFlags::Close );
+ if ( isDropdownOrCheckbox )
+ AppendBookmark( pFieldmark->GetName() );
+ }
}
nLen -= ofs;
commit a916fb5335761a37ee2a0bbeb86819bee16ee5c4
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 21 17:56:30 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sat Jun 29 08:51:46 2019 +0200
MSForms: ODF import / export of text based date field
Change-Id: Ib535f1ce065a7f298fcccf95e82d1ffab4d1e1e2
diff --git a/sw/qa/extras/globalfilter/data/date_form_field.odt b/sw/qa/extras/globalfilter/data/date_form_field.odt
new file mode 100644
index 000000000000..e33258bf3246
Binary files /dev/null and b/sw/qa/extras/globalfilter/data/date_form_field.odt differ
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 012e16eb3de2..42b32fdef336 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -50,6 +50,7 @@ public:
void testTextFormField();
void testCheckBoxFormField();
void testDropDownFormField();
+ void testDateFormField();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testEmbeddedGraphicRoundtrip);
@@ -68,6 +69,7 @@ public:
CPPUNIT_TEST(testTextFormField);
CPPUNIT_TEST(testCheckBoxFormField);
CPPUNIT_TEST(testDropDownFormField);
+ CPPUNIT_TEST(testDateFormField);
CPPUNIT_TEST_SUITE_END();
};
@@ -1238,6 +1240,101 @@ void Test::testDropDownFormField()
}
}
+void Test::testDateFormField()
+{
+ const OUString aFilterNames[] = {
+ "writer8",
+ //"MS Word 97",
+ //"Office Open XML Text",
+ };
+
+ for (const OUString& rFilterName : aFilterNames)
+ {
+ if (mxComponent.is())
+ mxComponent->dispose();
+ mxComponent = loadFromDesktop(m_directories.getURLFromSrc("/sw/qa/extras/globalfilter/data/date_form_field.odt"), "com.sun.star.text.TextDocument");
+
+ const OString sFailedMessage = OString("Failed on filter: ") + rFilterName.toUtf8();
+
+ // Export the document and import again for a check
+ uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
+ utl::MediaDescriptor aMediaDescriptor;
+ aMediaDescriptor["FilterName"] <<= rFilterName;
+ utl::TempFile aTempFile;
+ aTempFile.EnableKillingFile();
+ xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
+ uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
+ xComponent->dispose();
+ mxComponent = loadFromDesktop(aTempFile.GetURL(), "com.sun.star.text.TextDocument");
+
+ // Check the document after round trip
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pTextDoc);
+ SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+ IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), sal_Int32(3), pMarkAccess->getAllMarksCount());
+
+ int nIndex = 0;
+ for(auto aIter = pMarkAccess->getAllMarksBegin(); aIter != pMarkAccess->getAllMarksEnd(); ++aIter)
+ {
+ ::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
+
+ if(!pFieldmark)
+ continue;
+
+ CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pFieldmark);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString(ODF_FORMDATE), pFieldmark->GetFieldname());
+
+ // Check drop down field's parameters.
+ const sw::mark::IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters();
+ OUString sDateFormat;
+ auto pResult = pParameters->find(ODF_FORMDATE_DATEFORMAT);
+ if (pResult != pParameters->end())
+ {
+ pResult->second >>= sDateFormat;
+ }
+
+ OUString sLang;
+ pResult = pParameters->find(ODF_FORMDATE_DATEFORMAT_LANGUAGE);
+ if (pResult != pParameters->end())
+ {
+ pResult->second >>= sLang;
+ }
+
+ OUString sCurrentDate;
+ pResult = pParameters->find(ODF_FORMDATE_CURRENTDATE);
+ if (pResult != pParameters->end())
+ {
+ pResult->second >>= sCurrentDate;
+ }
+
+ // The first one is empty
+ if(nIndex == 0)
+ {
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("MM/DD/YY"), sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("en-US"), sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString(""), sCurrentDate);
+ }
+ else if (nIndex == 1) // The second has the default format
+ {
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("MM/DD/YY"), sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("en-US"), sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("2019.06.12T00:00:00Z"), sCurrentDate);
+ }
+ else // The third one has special format
+ {
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("[NatNum12 MMMM=abbreviation]YYYY\". \"MMMM D."), sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("hu-HU"), sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("2019.06.11T00:00:00Z"), sCurrentDate);
+ }
+ ++nIndex;
+ }
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), int(3), nIndex);
+ }
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 404a67f25379..e5b697967e40 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1147,17 +1147,17 @@ namespace sw { namespace mark
bool bActualChange = false;
if(rNewType == ODF_FORMDROPDOWN)
{
- if (dynamic_cast<::sw::mark::CheckboxFieldmark*>(pFieldmark))
+ if (!dynamic_cast<::sw::mark::DropDownFieldmark*>(pFieldmark))
bActualChange = true;
}
else if(rNewType == ODF_FORMCHECKBOX)
{
- if (dynamic_cast<::sw::mark::DropDownFieldmark*>(pFieldmark))
+ if (!dynamic_cast<::sw::mark::CheckboxFieldmark*>(pFieldmark))
bActualChange = true;
}
else if(rNewType == ODF_FORMDATE)
{
- if (dynamic_cast<::sw::mark::DateFieldmark*>(pFieldmark))
+ if (!dynamic_cast<::sw::mark::DateFieldmark*>(pFieldmark))
bActualChange = true;
}
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 62e58c8a84c1..aff9a18c38d1 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -137,6 +137,8 @@ static const char *lcl_getFormFieldmarkName(OUString const &name)
else if (name == ODF_FORMDROPDOWN ||
name == "ecma.office-open-xml.field.FORMDROPDOWN")
return ODF_FORMDROPDOWN;
+ else if (name == ODF_FORMDATE)
+ return ODF_FORMDATE;
else
return nullptr;
}
@@ -330,7 +332,8 @@ void XMLTextMarkImportContext::EndElement()
OUString const type(m_rHelper.getCurrentFieldType());
fieldmarkTypeName = lcl_getFieldmarkName(type);
if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
- fieldmarkTypeName == ODF_FORMDROPDOWN)
+ fieldmarkTypeName == ODF_FORMDROPDOWN ||
+ fieldmarkTypeName == ODF_FORMDATE)
{ // sw can't handle checkbox with start+end
SAL_INFO("xmloff.text", "invalid fieldmark-start/fieldmark-end ignored");
isInvalid = true;
commit 74e8a87ff440b76e41e86f48926175cdf898d3d0
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 14 22:00:07 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sat Jun 29 08:51:11 2019 +0200
MSForms: Implement calculating the date text displayed in the date field
* Change ODF_FORMDATE_DATEFORMAT to store the date format in
a standard way (e.g. "MM.DD.YY")
* Also add a new attribute called ODF_FORMDATE_DATEFORMAT_LANGUAGE
to store the language for the date format.
* Set a default date format and language by insertion.
* Display the date in the field using the set format.
* Store the current date in a specific format, which will make
import / export easier (MSO DOCX format).
Change-Id: I852975bbf81556f0e21f8f85d1c293707fdf672e
diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx
index fc119fe0a295..5318d5a631f8 100644
--- a/include/xmloff/odffields.hxx
+++ b/include/xmloff/odffields.hxx
@@ -34,8 +34,11 @@
#define ODF_FORMDROPDOWN_RESULT "Dropdown_Selected"
#define ODF_FORMDATE "vnd.oasis.opendocument.field.FORMDATE"
-#define ODF_FORMDATE_DATEFORMAT "DateField_DateFormat"
-#define ODF_FORMDATE_CURRENTDATE "DateField_CurrentDate"
+#define ODF_FORMDATE_DATEFORMAT "DateField_DateFormat" // e.g. "MM.DD.YY"
+#define ODF_FORMDATE_DATEFORMAT_LANGUAGE "DateField_DateFormat_Language" // e.g. "en-US", "hu-HU"
+#define ODF_FORMDATE_CURRENTDATE "DateField_CurrentDate" // date string in a specific format
+#define ODF_FORMDATE_CURRENTDATE_FORMAT "YYYY-MM-DDT00:00:00Z" // Coming from MSO
+#define ODF_FORMDATE_CURRENTDATE_LANGUAGE LANGUAGE_ENGLISH_US
#define ODF_TOC "vnd.oasis.opendocument.field.TOC"
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c5607dceb0b8..c793069b8a41 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -37,6 +37,7 @@ class SwGlossaryHdl;
class SwField;
class SwAsciiOptions;
+class SwDoc;
class SwDocShell;
class SvStream;
class SwWrtShell;
@@ -391,7 +392,7 @@ public:
SwField* pField, bool bPrevButton, bool bNextButton) = 0;
virtual VclPtr<VclAbstractDialog> CreateDropDownFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDropDownField) = 0;
- virtual VclPtr<VclAbstractDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDateField) = 0;
+ virtual VclPtr<VclAbstractDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDateField, SwDoc* pDoc) = 0;
virtual VclPtr<SfxAbstractTabDialog> CreateSwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) = 0;
diff --git a/sw/source/core/crsr/DateFormFieldButton.cxx b/sw/source/core/crsr/DateFormFieldButton.cxx
index 466f6961f589..5ad43faf1ebb 100644
--- a/sw/source/core/crsr/DateFormFieldButton.cxx
+++ b/sw/source/core/crsr/DateFormFieldButton.cxx
@@ -22,35 +22,57 @@
#include <strings.hrc>
#include <vcl/calendar.hxx>
#include <tools/date.hxx>
+#include <svx/numfmtsh.hxx>
class SwDatePickerDialog : public FloatingWindow
{
private:
VclPtr<Calendar> m_pCalendar;
sw::mark::IFieldmark* m_pFieldmark;
+ SvNumberFormatter* m_pNumberFormatter;
DECL_LINK(ImplSelectHdl, Calendar*, void);
public:
- SwDatePickerDialog(SwEditWin* parent, sw::mark::IFieldmark* pFieldmark);
+ SwDatePickerDialog(SwEditWin* parent, sw::mark::IFieldmark* pFieldmark, SvNumberFormatter* pNumberFormatter);
virtual ~SwDatePickerDialog() override;
virtual void dispose() override;
};
-SwDatePickerDialog::SwDatePickerDialog(SwEditWin* parent, sw::mark::IFieldmark* pFieldmark)
+SwDatePickerDialog::SwDatePickerDialog(SwEditWin* parent, sw::mark::IFieldmark* pFieldmark, SvNumberFormatter* pNumberFormatter)
: FloatingWindow(parent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW)
, m_pCalendar(VclPtr<Calendar>::Create(this, WB_TABSTOP))
, m_pFieldmark(pFieldmark)
+ , m_pNumberFormatter(pNumberFormatter)
{
if (m_pFieldmark != nullptr)
{
sw::mark::IFieldmark::parameter_map_t* pParameters = m_pFieldmark->GetParameters();
+
auto pResult = pParameters->find(ODF_FORMDATE_CURRENTDATE);
if (pResult != pParameters->end())
{
- sal_Int32 nCurrentDate = 0;
- pResult->second >>= nCurrentDate;
- m_pCalendar->SetCurDate(Date(nCurrentDate));
+ OUString sDateString;
+ pResult->second >>= sDateString;
+
+ double dCurrentDate = 0;
+ sal_uInt32 nFormat = m_pNumberFormatter->GetEntryKey(ODF_FORMDATE_CURRENTDATE_FORMAT, ODF_FORMDATE_CURRENTDATE_LANGUAGE);
+ if (nFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
+ {
+ sal_Int32 nCheckPos = 0;
+ SvNumFormatType nType;
+ OUString sFormat = ODF_FORMDATE_CURRENTDATE_FORMAT;
+ m_pNumberFormatter->PutEntry(sFormat,
+ nCheckPos,
+ nType,
+ nFormat,
+ ODF_FORMDATE_CURRENTDATE_LANGUAGE);
+ }
+
+ m_pNumberFormatter->IsNumberFormat(sDateString, nFormat, dCurrentDate);
+
+ const Date& rNullDate = m_pNumberFormatter->GetNullDate();
+ m_pCalendar->SetCurDate(rNullDate + dCurrentDate);
}
}
m_pCalendar->SetSelectHdl(LINK(this, SwDatePickerDialog, ImplSelectHdl));
@@ -73,16 +95,36 @@ IMPL_LINK(SwDatePickerDialog, ImplSelectHdl, Calendar*, pCalendar, void)
{
if (m_pFieldmark != nullptr)
{
+ Color* pCol = nullptr;
+ OUString sOutput;
+ sal_uInt32 nFormat = m_pNumberFormatter->GetEntryKey(ODF_FORMDATE_CURRENTDATE_FORMAT, ODF_FORMDATE_CURRENTDATE_LANGUAGE);
+ if (nFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
+ {
+ sal_Int32 nCheckPos = 0;
+ SvNumFormatType nType;
+ OUString sFormat = ODF_FORMDATE_CURRENTDATE_FORMAT;
+ m_pNumberFormatter->PutEntry(sFormat,
+ nCheckPos,
+ nType,
+ nFormat,
+ ODF_FORMDATE_CURRENTDATE_LANGUAGE);
+ }
+
+ const Date& rNullDate = m_pNumberFormatter->GetNullDate();
+ double dDate = pCalendar->GetFirstSelectedDate() - rNullDate;
+
+ m_pNumberFormatter->GetOutputString(dDate, nFormat, sOutput, &pCol, false);
+
sw::mark::IFieldmark::parameter_map_t* pParameters = m_pFieldmark->GetParameters();
- (*pParameters)[ODF_FORMDATE_CURRENTDATE]
- <<= pCalendar->GetFirstSelectedDate().GetDate();
+ (*pParameters)[ODF_FORMDATE_CURRENTDATE] <<= sOutput;
}
EndPopupMode();
}
}
-DateFormFieldButton::DateFormFieldButton(SwEditWin* pEditWin, sw::mark::DateFieldmark& rFieldmark)
+DateFormFieldButton::DateFormFieldButton(SwEditWin* pEditWin, sw::mark::DateFieldmark& rFieldmark, SvNumberFormatter* pNumberFormatter)
: FormFieldButton(pEditWin, rFieldmark)
+ , m_pNumberFormatter(pNumberFormatter)
{
}
@@ -91,7 +133,7 @@ DateFormFieldButton::~DateFormFieldButton() { disposeOnce(); }
void DateFormFieldButton::InitPopup()
{
m_pFieldPopup
- = VclPtr<SwDatePickerDialog>::Create(static_cast<SwEditWin*>(GetParent()), &m_rFieldmark);
+ = VclPtr<SwDatePickerDialog>::Create(static_cast<SwEditWin*>(GetParent()), &m_rFieldmark, m_pNumberFormatter);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index bfc1875208c2..88e9007aa3bc 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -40,6 +40,7 @@
#include <edtwin.hxx>
#include "DateFormFieldButton.hxx"
#include "DropDownFormFieldButton.hxx"
+#include <svx/numfmtsh.hxx>
using namespace ::sw::mark;
using namespace ::com::sun::star;
@@ -554,12 +555,18 @@ namespace sw { namespace mark
{
}
+ void DateFieldmark::InitDoc(SwDoc* const io_pDoc, sw::mark::InsertMode eMode)
+ {
+ m_pNumberFormatter = io_pDoc->GetNumberFormatter();
+ NonTextFieldmark::InitDoc(io_pDoc, eMode);
+ }
+
void DateFieldmark::ShowButton(SwEditWin* pEditWin)
{
if(pEditWin)
{
if(!m_pButton)
- m_pButton = VclPtr<DateFormFieldButton>::Create(pEditWin, *this);
+ m_pButton = VclPtr<DateFormFieldButton>::Create(pEditWin, *this, m_pNumberFormatter);
m_pButton->CalcPosAndSize(m_aPortionPaintArea);
m_pButton->Show();
}
diff --git a/sw/source/core/inc/DateFormFieldButton.hxx b/sw/source/core/inc/DateFormFieldButton.hxx
index c76352bb9a33..35f81fff8526 100644
--- a/sw/source/core/inc/DateFormFieldButton.hxx
+++ b/sw/source/core/inc/DateFormFieldButton.hxx
@@ -16,6 +16,7 @@
class SwEditWin;
class FloatingWindow;
+class SvNumberFormatter;
namespace sw
{
namespace mark
@@ -30,10 +31,13 @@ class DateFieldmark;
class DateFormFieldButton : public FormFieldButton
{
public:
- DateFormFieldButton(SwEditWin* pEditWin, sw::mark::DateFieldmark& rFieldMark);
+ DateFormFieldButton(SwEditWin* pEditWin, sw::mark::DateFieldmark& rFieldMark, SvNumberFormatter* pNumberFormatter);
virtual ~DateFormFieldButton() override;
virtual void InitPopup() override;
+
+private:
+ SvNumberFormatter* m_pNumberFormatter;
};
#endif
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index f77978963e3a..ee5e9b45c4bd 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -44,6 +44,7 @@ namespace com {
class SwDoc;
class SwEditWin;
class SwServerObject;
+class SvNumberFormatter;
namespace sw {
namespace mark {
@@ -307,7 +308,12 @@ namespace sw {
DateFieldmark(const SwPaM& rPaM);
virtual ~DateFieldmark() override;
+ virtual void InitDoc(SwDoc* const io_pDoc, sw::mark::InsertMode eMode) override;
+
virtual void ShowButton(SwEditWin* pEditWin);
+
+ private:
+ SvNumberFormatter* m_pNumberFormatter;
};
}
}
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index c5f6f6b1da0b..131ef946d8a6 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -59,6 +59,7 @@
#include <IDocumentSettingAccess.hxx>
#include <IMark.hxx>
#include <IDocumentMarkAccess.hxx>
+#include <svl/zforlist.hxx>
#include <vector>
@@ -864,8 +865,66 @@ namespace sw { namespace mark {
return OUString(vEnSpaces, ODF_FORMFIELD_DEFAULT_LENGTH);
}
- OUString ExpandDateFieldmark(IFieldmark* pBM)
+ OUString ExpandDateFieldmark(IFieldmark* pBM, SvNumberFormatter* pFormatter)
{
+ OUString sDateFormat;
+ mark::IFieldmark::parameter_map_t* pParameters = pBM->GetParameters();
+ auto pResult = pParameters->find(ODF_FORMDATE_DATEFORMAT);
+ if (pResult != pParameters->end())
+ {
+ pResult->second >>= sDateFormat;
+ }
+
+ OUString sLang;
+ pResult = pParameters->find(ODF_FORMDATE_DATEFORMAT_LANGUAGE);
+ if (pResult != pParameters->end())
+ {
+ pResult->second >>= sLang;
+ }
+
+ double dCurrentDate = 0.0;
+ bool bHasCurrentDate = false;
+ pResult = pParameters->find(ODF_FORMDATE_CURRENTDATE);
+ if (pResult != pParameters->end())
+ {
+ OUString sFormattedDate;
+ pResult->second >>= sFormattedDate;
+
+ sal_uInt32 nFormat = pFormatter->GetEntryKey(ODF_FORMDATE_CURRENTDATE_FORMAT, ODF_FORMDATE_CURRENTDATE_LANGUAGE); if (nFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
+ if (nFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
+ {
+ sal_Int32 nCheckPos = 0;
+ SvNumFormatType nType;
+ OUString sFormat = ODF_FORMDATE_CURRENTDATE_FORMAT;
+ pFormatter->PutEntry(sFormat,
+ nCheckPos,
+ nType,
+ nFormat,
+ ODF_FORMDATE_CURRENTDATE_LANGUAGE);
+ }
+ pFormatter->IsNumberFormat(sFormattedDate, nFormat, dCurrentDate);
+ bHasCurrentDate = true;
+ }
+
+ Color* pCol = nullptr;
+ if (!sDateFormat.isEmpty() && !sLang.isEmpty() && bHasCurrentDate)
+ {
+ OUString sOutput;
+ sal_uInt32 nFormat = pFormatter->GetEntryKey(sDateFormat, LanguageTag(sLang).getLanguageType());
+ if (nFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
+ {
+ sal_Int32 nCheckPos = 0;
+ SvNumFormatType nType;
+ pFormatter->PutEntry(sDateFormat,
+ nCheckPos,
+ nType,
+ nFormat,
+ LanguageTag(sLang).getLanguageType());
+ }
+ pFormatter->GetOutputString(dCurrentDate, nFormat, sOutput, &pCol, false);
+ return sOutput;
+ }
+
sal_Unicode vEnSpaces[ODF_FORMFIELD_DEFAULT_LENGTH] = {8194, 8194, 8194, 8194, 8194};
return OUString(vEnSpaces, ODF_FORMFIELD_DEFAULT_LENGTH);
}
@@ -918,7 +977,8 @@ SwTextPortion *SwTextFormatter::WhichTextPor( SwTextFormatInfo &rInf ) const
}
else if (pBM->GetFieldname( ) == ODF_FORMDATE)
{
- pPor = new SwFieldFormDatePortion(pBM, sw::mark::ExpandDateFieldmark(pBM));
+ SvNumberFormatter* pFormatter = const_cast<SvNumberFormatter*>(GetTextFrame()->GetDoc().GetNumberFormatter());
+ pPor = new SwFieldFormDatePortion(pBM, sw::mark::ExpandDateFieldmark(pBM, pFormatter));
}
/* we need to check for ODF_FORMTEXT for scenario having FormFields inside FORMTEXT.
* Otherwise file will crash on open.
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index cde201bc7d56..2a954af248c7 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -875,9 +875,9 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateDropDownFormFieldD
return VclPtr<AbstractDropDownFormFieldDialog_Impl>::Create(std::make_unique<sw::DropDownFormFieldDialog>(pParent, pDropDownField));
}
-VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateDateFormFieldDialog(weld::Widget *pParent, sw::mark::IFieldmark* pDateField)
+VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateDateFormFieldDialog(weld::Widget *pParent, sw::mark::IFieldmark* pDateField, SwDoc* pDoc)
{
- return VclPtr<AbstractDateFormFieldDialog_Impl>::Create(std::make_unique<sw::DateFormFieldDialog>(pParent, pDateField));
+ return VclPtr<AbstractDateFormFieldDialog_Impl>::Create(std::make_unique<sw::DateFormFieldDialog>(pParent, pDateField, pDoc));
}
VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 8c70da33a556..7638f7d150fd 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -652,7 +652,7 @@ public:
virtual VclPtr<AbstractDropDownFieldDialog> CreateDropDownFieldDialog(weld::Widget* pParent, SwWrtShell &rSh,
SwField* pField, bool bPrevButton, bool bNextButton) override;
virtual VclPtr<VclAbstractDialog> CreateDropDownFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDropDownField) override;
- virtual VclPtr<VclAbstractDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDateField) override;
+ virtual VclPtr<VclAbstractDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDateField, SwDoc* pDoc) override;
virtual VclPtr<SfxAbstractTabDialog> CreateSwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) override;
virtual VclPtr<AbstractSwLabDlg> CreateSwLabDlg(weld::Window* pParent, const SfxItemSet& rSet,
diff --git a/sw/source/ui/fldui/DateFormFieldDialog.cxx b/sw/source/ui/fldui/DateFormFieldDialog.cxx
index 555c99d11392..e5cc6961b05e 100644
--- a/sw/source/ui/fldui/DateFormFieldDialog.cxx
+++ b/sw/source/ui/fldui/DateFormFieldDialog.cxx
@@ -11,19 +11,24 @@
#include <vcl/event.hxx>
#include <IMark.hxx>
#include <xmloff/odffields.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <svx/numfmtsh.hxx>
+#include <doc.hxx>
namespace sw
{
DateFormFieldDialog::DateFormFieldDialog(weld::Widget* pParent,
- mark::IFieldmark* pDateField)
+ mark::IFieldmark* pDateField, SwDoc* pDoc)
: GenericDialogController(pParent, "modules/swriter/ui/dateformfielddialog.ui",
"DateFormFieldDialog")
, m_pDateField(pDateField)
+ , m_pNumberFormatter(pDoc->GetNumberFormatter())
, m_xFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view("date_formats_treeview")))
{
- m_xFormatLB->SetFormatType(SvNumFormatType::DATETIME);
- m_xFormatLB->SetShowLanguageControl(true);
+ m_xFormatLB->SetFormatType(SvNumFormatType::DATE);
m_xFormatLB->SetAutomaticLanguage(true);
+ m_xFormatLB->SetShowLanguageControl(true);
m_xFormatLB->SetOneArea(true);
// Set a default height
@@ -39,8 +44,12 @@ void DateFormFieldDialog::Apply()
{
if (m_pDateField != nullptr)
{
- mark::IFieldmark::parameter_map_t* pParameters = m_pDateField->GetParameters();
- (*pParameters)[ODF_FORMDATE_DATEFORMAT] <<= m_xFormatLB->GetFormat();
+ const SvNumberformat* pFormat = m_pNumberFormatter->GetEntry(m_xFormatLB->GetFormat());
+ sw::mark::IFieldmark::parameter_map_t* pParameters = m_pDateField->GetParameters();
+ (*pParameters)[ODF_FORMDATE_DATEFORMAT] <<= pFormat->GetFormatstring();
+
+ LanguageType aLang = pFormat->GetLanguage();
+ (*pParameters)[ODF_FORMDATE_DATEFORMAT_LANGUAGE] <<= LanguageTag(aLang).getBcp47();
}
}
@@ -48,14 +57,41 @@ void DateFormFieldDialog::InitControls()
{
if (m_pDateField != nullptr)
{
- mark::IFieldmark::parameter_map_t* pParameters = m_pDateField->GetParameters();
+ sw::mark::IFieldmark::parameter_map_t* pParameters = m_pDateField->GetParameters();
+ OUString sFormatString;
auto pResult = pParameters->find(ODF_FORMDATE_DATEFORMAT);
if (pResult != pParameters->end())
{
- sal_uInt32 nDateFormat = 0;
- pResult->second >>= nDateFormat;
- m_xFormatLB->SetDefFormat(nDateFormat);
+ pResult->second >>= sFormatString;
+ }
+
+ OUString sLang;
+ pResult = pParameters->find(ODF_FORMDATE_DATEFORMAT_LANGUAGE);
+ if (pResult != pParameters->end())
+ {
+ pResult->second >>= sLang;
+ }
+
+ if(!sFormatString.isEmpty() && !sLang.isEmpty())
+ {
+ LanguageType aLangType = LanguageTag(sLang).getLanguageType();
+ sal_uInt32 nFormatKey = m_pNumberFormatter->GetEntryKey(sFormatString, aLangType);
+
+ if (m_xFormatLB->GetCurLanguage() == aLangType)
+ {
+ m_xFormatLB->SetAutomaticLanguage(true);
+ }
+ else
+ {
+ m_xFormatLB->SetAutomaticLanguage(false);
+ m_xFormatLB->SetLanguage(aLangType);
+
+ // Change format and change back for regenerating the list
+ m_xFormatLB->SetFormatType(SvNumFormatType::ALL);
+ m_xFormatLB->SetFormatType(SvNumFormatType::DATE);
+ }
+ m_xFormatLB->SetDefFormat(nFormatKey);
}
}
}
diff --git a/sw/source/uibase/inc/DateFormFieldDialog.hxx b/sw/source/uibase/inc/DateFormFieldDialog.hxx
index 19002e3e7f49..3d7d8b75d79d 100644
--- a/sw/source/uibase/inc/DateFormFieldDialog.hxx
+++ b/sw/source/uibase/inc/DateFormFieldDialog.hxx
@@ -14,6 +14,9 @@
#include "actctrl.hxx"
#include <numfmtlb.hxx>
+class SvNumberFormatter;
+class SwDoc;
+
namespace sw
{
namespace mark
@@ -29,6 +32,7 @@ class DateFormFieldDialog : public weld::GenericDialogController
{
private:
mark::IFieldmark* m_pDateField;
+ SvNumberFormatter* m_pNumberFormatter;
std::unique_ptr<SwNumFormatTreeView> m_xFormatLB;
@@ -36,7 +40,7 @@ private:
void InitControls();
public:
- DateFormFieldDialog(weld::Widget* pParent, mark::IFieldmark* pDateField);
+ DateFormFieldDialog(weld::Widget* pParent, mark::IFieldmark* pDateField, SwDoc* pDoc);
virtual ~DateFormFieldDialog() override;
virtual short run() override
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 82506e4c0f76..e7fb07417aa5 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -77,6 +77,12 @@
#include <xmloff/odffields.hxx>
#include <IDocumentContentOperations.hxx>
#include <IDocumentUndoRedo.hxx>
+#include <svx/numfmtsh.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <IMark.hxx>
+#include <xmloff/odffields.hxx>
+
using namespace nsSwDocInfoSubType;
@@ -787,7 +793,16 @@ FIELD_INSERT:
if(pCursorPos)
{
IDocumentMarkAccess* pMarksAccess = rSh.GetDoc()->getIDocumentMarkAccess();
- pMarksAccess->makeNoTextFieldBookmark(*pCursorPos, OUString(), ODF_FORMDATE);
+ sw::mark::IFieldmark* pFieldBM = pMarksAccess->makeNoTextFieldBookmark(*pCursorPos, OUString(), ODF_FORMDATE);
+
+ // Use a default date format and language
+ sw::mark::IFieldmark::parameter_map_t* pParameters = pFieldBM->GetParameters();
+ SvNumberFormatter* pFormatter = rSh.GetDoc()->GetNumberFormatter();
+ sal_uInt32 nStandardFormat = pFormatter->GetStandardFormat(SvNumFormatType::DATE);
+ const SvNumberformat* pFormat = pFormatter->GetEntry(nStandardFormat);
+
+ (*pParameters)[ODF_FORMDATE_DATEFORMAT] <<= pFormat->GetFormatstring();
+ (*pParameters)[ODF_FORMDATE_DATEFORMAT_LANGUAGE] <<= LanguageTag(pFormat->GetLanguage()).getBcp47();
}
rSh.GetDoc()->GetIDocumentUndoRedo().EndUndo(SwUndoId::INSERT_FORM_FIELD, nullptr);
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 009e0c2fa508..50445cff3d99 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1377,7 +1377,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
else if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDATE )
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateDateFormFieldDialog(rWrtSh.GetView().GetFrameWeld(), pFieldBM));
+ ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateDateFormFieldDialog(rWrtSh.GetView().GetFrameWeld(), pFieldBM, GetView().GetDocShell()->GetDoc()));
if (pDlg->Execute() == RET_OK)
{
pFieldBM->Invalidate();
commit 23f01c62c0f036c49fa7b4d3f11a1db9ee9bbb90
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Jun 10 12:59:23 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sat Jun 29 08:51:08 2019 +0200
MSForms: Add a drop-down button for text-based date field
* A calendar is opened by this button, where the user can
select a date.
* I used the same activation method which is used for drop-down
fields.
Change-Id: If0e63083463b9ead93baa2f27bdaaaf80aa9ce2f
diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx
index 0b0ec4676f39..fc119fe0a295 100644
--- a/include/xmloff/odffields.hxx
+++ b/include/xmloff/odffields.hxx
@@ -35,6 +35,7 @@
#define ODF_FORMDATE "vnd.oasis.opendocument.field.FORMDATE"
#define ODF_FORMDATE_DATEFORMAT "DateField_DateFormat"
+#define ODF_FORMDATE_CURRENTDATE "DateField_CurrentDate"
#define ODF_TOC "vnd.oasis.opendocument.field.TOC"
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 15b921947018..e3a2f1b1177b 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -150,6 +150,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/crsr/crsrsh \
sw/source/core/crsr/crstrvl \
sw/source/core/crsr/crstrvl1 \
+ sw/source/core/crsr/DateFormFieldButton \
sw/source/core/crsr/DropDownFormFieldButton \
sw/source/core/crsr/findattr \
sw/source/core/crsr/findcoll \
diff --git a/sw/source/core/crsr/DateFormFieldButton.cxx b/sw/source/core/crsr/DateFormFieldButton.cxx
new file mode 100644
index 000000000000..466f6961f589
--- /dev/null
+++ b/sw/source/core/crsr/DateFormFieldButton.cxx
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <DateFormFieldButton.hxx>
+#include <edtwin.hxx>
+#include <basegfx/color/bcolortools.hxx>
+#include <viewopt.hxx>
+#include <bookmrk.hxx>
+#include <vcl/floatwin.hxx>
+#include <vcl/event.hxx>
+#include <vcl/lstbox.hxx>
+#include <xmloff/odffields.hxx>
+#include <IMark.hxx>
+#include <view.hxx>
+#include <docsh.hxx>
+#include <strings.hrc>
+#include <vcl/calendar.hxx>
+#include <tools/date.hxx>
+
+class SwDatePickerDialog : public FloatingWindow
+{
+private:
+ VclPtr<Calendar> m_pCalendar;
+ sw::mark::IFieldmark* m_pFieldmark;
+
+ DECL_LINK(ImplSelectHdl, Calendar*, void);
+
+public:
+ SwDatePickerDialog(SwEditWin* parent, sw::mark::IFieldmark* pFieldmark);
+ virtual ~SwDatePickerDialog() override;
+ virtual void dispose() override;
+};
+
+SwDatePickerDialog::SwDatePickerDialog(SwEditWin* parent, sw::mark::IFieldmark* pFieldmark)
+ : FloatingWindow(parent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW)
+ , m_pCalendar(VclPtr<Calendar>::Create(this, WB_TABSTOP))
+ , m_pFieldmark(pFieldmark)
+{
+ if (m_pFieldmark != nullptr)
+ {
+ sw::mark::IFieldmark::parameter_map_t* pParameters = m_pFieldmark->GetParameters();
+ auto pResult = pParameters->find(ODF_FORMDATE_CURRENTDATE);
+ if (pResult != pParameters->end())
+ {
+ sal_Int32 nCurrentDate = 0;
+ pResult->second >>= nCurrentDate;
+ m_pCalendar->SetCurDate(Date(nCurrentDate));
+ }
+ }
+ m_pCalendar->SetSelectHdl(LINK(this, SwDatePickerDialog, ImplSelectHdl));
+ m_pCalendar->SetOutputSizePixel(m_pCalendar->CalcWindowSizePixel());
+ m_pCalendar->Show();
+ SetOutputSizePixel(m_pCalendar->GetSizePixel());
+}
+
+SwDatePickerDialog::~SwDatePickerDialog() { disposeOnce(); }
+
+void SwDatePickerDialog::dispose()
+{
+ m_pCalendar.clear();
+ FloatingWindow::dispose();
+}
+
+IMPL_LINK(SwDatePickerDialog, ImplSelectHdl, Calendar*, pCalendar, void)
+{
+ if (!pCalendar->IsTravelSelect())
+ {
+ if (m_pFieldmark != nullptr)
+ {
+ sw::mark::IFieldmark::parameter_map_t* pParameters = m_pFieldmark->GetParameters();
+ (*pParameters)[ODF_FORMDATE_CURRENTDATE]
+ <<= pCalendar->GetFirstSelectedDate().GetDate();
+ }
+ EndPopupMode();
+ }
+}
+
+DateFormFieldButton::DateFormFieldButton(SwEditWin* pEditWin, sw::mark::DateFieldmark& rFieldmark)
+ : FormFieldButton(pEditWin, rFieldmark)
+{
+}
+
+DateFormFieldButton::~DateFormFieldButton() { disposeOnce(); }
+
+void DateFormFieldButton::InitPopup()
+{
+ m_pFieldPopup
+ = VclPtr<SwDatePickerDialog>::Create(static_cast<SwEditWin*>(GetParent()), &m_rFieldmark);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 1b2da58c6787..bfc1875208c2 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -38,6 +38,8 @@
#include <comphelper/anytostring.hxx>
#include <sal/log.hxx>
#include <edtwin.hxx>
+#include "DateFormFieldButton.hxx"
+#include "DropDownFormFieldButton.hxx"
using namespace ::sw::mark;
using namespace ::com::sun::star;
@@ -485,18 +487,18 @@ namespace sw { namespace mark
return bResult;
}
- DropDownFieldmark::DropDownFieldmark(const SwPaM& rPaM)
+ FieldmarkWithDropDownButton::FieldmarkWithDropDownButton(const SwPaM& rPaM)
: NonTextFieldmark(rPaM)
, m_pButton(nullptr)
{
}
- DropDownFieldmark::~DropDownFieldmark()
+ FieldmarkWithDropDownButton::~FieldmarkWithDropDownButton()
{
m_pButton.disposeAndClear();
}
- void DropDownFieldmark::SetPortionPaintArea(const SwRect& rPortionPaintArea)
+ void FieldmarkWithDropDownButton::SetPortionPaintArea(const SwRect& rPortionPaintArea)
{
if(m_aPortionPaintArea == rPortionPaintArea &&
m_pButton && m_pButton->IsVisible())
@@ -511,76 +513,56 @@ namespace sw { namespace mark
}
}
- void DropDownFieldmark::ShowButton(SwEditWin* pEditWin)
- {
- if(pEditWin)
- {
- if(!m_pButton)
- m_pButton = VclPtr<DropDownFormFieldButton>::Create(pEditWin, *this);
- m_pButton->CalcPosAndSize(m_aPortionPaintArea);
- m_pButton->Show();
- }
- }
-
- void DropDownFieldmark::HideButton()
+ void FieldmarkWithDropDownButton::HideButton()
{
if(m_pButton)
m_pButton->Show(false);
}
- void DropDownFieldmark::RemoveButton()
+ void FieldmarkWithDropDownButton::RemoveButton()
{
if(m_pButton)
m_pButton.disposeAndClear();
}
- DateFieldmark::DateFieldmark(const SwPaM& rPaM)
- : NonTextFieldmark(rPaM)
- //, m_pButton(nullptr)
+ DropDownFieldmark::DropDownFieldmark(const SwPaM& rPaM)
+ : FieldmarkWithDropDownButton(rPaM)
{
}
- DateFieldmark::~DateFieldmark()
+ DropDownFieldmark::~DropDownFieldmark()
{
- //m_pButton.disposeAndClear();
}
- void DateFieldmark::SetPortionPaintArea(const SwRect& rPortionPaintArea)
+ void DropDownFieldmark::ShowButton(SwEditWin* pEditWin)
{
- /*if(m_aPortionPaintArea == rPortionPaintArea &&
- m_pButton && m_pButton->IsVisible())
- return;
-
- m_aPortionPaintArea = rPortionPaintArea;
- if(m_pButton)
+ if(pEditWin)
{
- m_pButton->Show();
+ if(!m_pButton)
+ m_pButton = VclPtr<DropDownFormFieldButton>::Create(pEditWin, *this);
m_pButton->CalcPosAndSize(m_aPortionPaintArea);
- m_pButton->Invalidate();
- }*/
+ m_pButton->Show();
+ }
}
- void DateFieldmark::ShowButton(SwEditWin* pEditWin)
+ DateFieldmark::DateFieldmark(const SwPaM& rPaM)
+ : FieldmarkWithDropDownButton(rPaM)
{
- if(pEditWin)
- {
- //if(!m_pButton)
- // m_pButton = VclPtr<DropDownFormFieldButton>::Create(pEditWin, *this);
- //m_pButton->CalcPosAndSize(m_aPortionPaintArea);
- //m_pButton->Show();
- }
}
- void DateFieldmark::HideButton()
+ DateFieldmark::~DateFieldmark()
{
- //if(m_pButton)
- //m_pButton->Show(false);
}
- void DateFieldmark::RemoveButton()
+ void DateFieldmark::ShowButton(SwEditWin* pEditWin)
{
- //if(m_pButton)
- //m_pButton.disposeAndClear();
+ if(pEditWin)
+ {
+ if(!m_pButton)
+ m_pButton = VclPtr<DateFormFieldButton>::Create(pEditWin, *this);
+ m_pButton->CalcPosAndSize(m_aPortionPaintArea);
+ m_pButton->Show();
+ }
}
}}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 89a4bf1782a5..404a67f25379 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1188,21 +1188,22 @@ namespace sw { namespace mark
SwEditWin& rEditWin = pSwView->GetEditWin();
SwPosition aPos(*rCursorShell.GetCursor()->GetPoint());
IFieldmark* pFieldBM = getFieldmarkFor(aPos);
- DropDownFieldmark* pNewActiveFieldmark = nullptr;
- if ((!pFieldBM || pFieldBM->GetFieldname() != ODF_FORMDROPDOWN)
+ FieldmarkWithDropDownButton* pNewActiveFieldmark = nullptr;
+ if ((!pFieldBM || (pFieldBM->GetFieldname() != ODF_FORMDROPDOWN && pFieldBM->GetFieldname() != ODF_FORMDATE))
&& aPos.nContent.GetIndex() > 0 )
{
--aPos.nContent;
pFieldBM = getFieldmarkFor(aPos);
}
- if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDROPDOWN )
+ if ( pFieldBM && (pFieldBM->GetFieldname() == ODF_FORMDROPDOWN ||
+ pFieldBM->GetFieldname() == ODF_FORMDATE))
{
if (m_pLastActiveFieldmark != pFieldBM)
{
- DropDownFieldmark* pDropDownFm = dynamic_cast<DropDownFieldmark*>(pFieldBM);
- pDropDownFm->ShowButton(&rEditWin);
- pNewActiveFieldmark = pDropDownFm;
+ auto pFormField = dynamic_cast<FieldmarkWithDropDownButton*>(pFieldBM);
+ pFormField->ShowButton(&rEditWin);
+ pNewActiveFieldmark = pFormField;
}
else
{
diff --git a/sw/source/core/inc/DateFormFieldButton.hxx b/sw/source/core/inc/DateFormFieldButton.hxx
new file mode 100644
index 000000000000..c76352bb9a33
--- /dev/null
+++ b/sw/source/core/inc/DateFormFieldButton.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_DATEFORMEFIELDBUTTO_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_DATEFORMEFIELDBUTTO_HXX
+
+#include <vcl/menubtn.hxx>
+#include <swrect.hxx>
+#include <FormFieldButton.hxx>
+
+class SwEditWin;
+class FloatingWindow;
+namespace sw
+{
+namespace mark
+{
+class DateFieldmark;
+}
+} // namespace sw
+
+/**
+ * This button is shown when the cursor is on a drop-down form field.
+ */
+class DateFormFieldButton : public FormFieldButton
+{
+public:
+ DateFormFieldButton(SwEditWin* pEditWin, sw::mark::DateFieldmark& rFieldMark);
+ virtual ~DateFormFieldButton() override;
+
+ virtual void InitPopup() override;
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index e901510e08b5..7690fe1ece07 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -31,7 +31,7 @@ namespace sw {
namespace mark {
typedef std::unordered_map<OUString, sal_Int32> MarkBasenameMapUniqueOffset_t;
- class DropDownFieldmark;
+ class FieldmarkWithDropDownButton;
class MarkManager
: virtual public IDocumentMarkAccess
@@ -136,7 +136,7 @@ namespace sw {
SwDoc * const m_pDoc;
- sw::mark::DropDownFieldmark* m_pLastActiveFieldmark;
+ sw::mark::FieldmarkWithDropDownButton* m_pLastActiveFieldmark;
};
} // namespace mark
}
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 7a28f9c7cb1b..f77978963e3a 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -29,7 +29,7 @@
#include <tools/ref.hxx>
#include <IMark.hxx>
#include <swrect.hxx>
-#include "DropDownFormFieldButton.hxx"
+#include "FormFieldButton.hxx"
namespace com {
namespace sun {
@@ -268,44 +268,46 @@ namespace sw {
void SetChecked(bool checked) override;
};
- /// Fieldmark representing a drop-down form field.
- class DropDownFieldmark
+ /// Fieldmark with a drop down button (e.g. this button opens the date picker for a date field)
+ class FieldmarkWithDropDownButton
: public NonTextFieldmark
{
public:
- DropDownFieldmark(const SwPaM& rPaM);
- virtual ~DropDownFieldmark() override;
+ FieldmarkWithDropDownButton(const SwPaM& rPaM);
+ virtual ~FieldmarkWithDropDownButton() override;
// This method should be called only by the portion so we can now the portion's painting area
void SetPortionPaintArea(const SwRect& rPortionPaintArea);
- void ShowButton(SwEditWin* pEditWin);
+ virtual void ShowButton(SwEditWin* pEditWin) = 0;
void HideButton();
void RemoveButton();
- private:
+ protected:
SwRect m_aPortionPaintArea;
- VclPtr<DropDownFormFieldButton> m_pButton;
+ VclPtr<FormFieldButton> m_pButton;
+ };
+
+ /// Fieldmark representing a drop-down form field.
+ class DropDownFieldmark
+ : public FieldmarkWithDropDownButton
+ {
+ public:
+ DropDownFieldmark(const SwPaM& rPaM);
+ virtual ~DropDownFieldmark() override;
+
+ virtual void ShowButton(SwEditWin* pEditWin);
};
/// Fieldmark representing a date form field.
class DateFieldmark
- : public NonTextFieldmark
+ : public FieldmarkWithDropDownButton
{
public:
DateFieldmark(const SwPaM& rPaM);
virtual ~DateFieldmark() override;
- // This method should be called only by the portion so we can now the portion's painting area
- void SetPortionPaintArea(const SwRect& rPortionPaintArea);
-
- void ShowButton(SwEditWin* pEditWin);
- void HideButton();
- void RemoveButton();
-
- private:
- SwRect m_aPortionPaintArea;
- //VclPtr<DropDownFormFieldButton> m_pButton;
+ virtual void ShowButton(SwEditWin* pEditWin);
};
}
}
commit 12610427765dd230dfa8a5e5e3eba3e400cdd80d
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 7 17:46:58 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sat Jun 29 08:51:07 2019 +0200
MSForms: Generalize some parts of the drop-down form field popup button
We'll need a similar button for the new text-based date field.
Change-Id: I9cf69f98dae3d761d9cddfbaed138d6453af887d
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index ededa54c689b..15b921947018 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -155,6 +155,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/crsr/findcoll \
sw/source/core/crsr/findfmt \
sw/source/core/crsr/findtxt \
+ sw/source/core/crsr/FormFieldButton \
sw/source/core/crsr/pam \
sw/source/core/crsr/paminit \
sw/source/core/crsr/swcrsr \
diff --git a/sw/source/core/crsr/DropDownFormFieldButton.cxx b/sw/source/core/crsr/DropDownFormFieldButton.cxx
index 158751fe308d..d2c97f382e22 100644
--- a/sw/source/core/crsr/DropDownFormFieldButton.cxx
+++ b/sw/source/core/crsr/DropDownFormFieldButton.cxx
@@ -8,8 +8,6 @@
*/
#include <DropDownFormFieldButton.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
#include <edtwin.hxx>
#include <basegfx/color/bcolortools.hxx>
#include <viewopt.hxx>
@@ -124,132 +122,16 @@ IMPL_LINK(SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void)
DropDownFormFieldButton::DropDownFormFieldButton(SwEditWin* pEditWin,
sw::mark::DropDownFieldmark& rFieldmark)
- : MenuButton(pEditWin, WB_DIALOGCONTROL)
- , m_rFieldmark(rFieldmark)
+ : FormFieldButton(pEditWin, rFieldmark)
{
- assert(GetParent());
- assert(dynamic_cast<SwEditWin*>(GetParent()));
}
DropDownFormFieldButton::~DropDownFormFieldButton() { disposeOnce(); }
-void DropDownFormFieldButton::dispose()
+void DropDownFormFieldButton::InitPopup()
{
- m_pFieldPopup.disposeAndClear();
- MenuButton::dispose();
-}
-
-void DropDownFormFieldButton::CalcPosAndSize(const SwRect& rPortionPaintArea)
-{
- assert(GetParent());
-
- Point aBoxPos = GetParent()->LogicToPixel(rPortionPaintArea.Pos());
- Size aBoxSize = GetParent()->LogicToPixel(rPortionPaintArea.SSize());
-
- // First calculate the size of the frame around the field
- int nPadding = aBoxSize.Height() / 4;
- aBoxPos.AdjustX(-nPadding);
- aBoxPos.AdjustY(-nPadding);
- aBoxSize.AdjustWidth(2 * nPadding);
- aBoxSize.AdjustHeight(2 * nPadding);
-
- m_aFieldFramePixel = tools::Rectangle(aBoxPos, aBoxSize);
-
- // Then extend the size with the button area
- aBoxSize.AdjustWidth(GetParent()->LogicToPixel(rPortionPaintArea.SSize()).Height());
-
- SetPosSizePixel(aBoxPos, aBoxSize);
-}
-
-void DropDownFormFieldButton::MouseButtonUp(const MouseEvent&)
-{
- assert(GetParent());
-
- Point aPixPos = GetPosPixel();
- aPixPos.AdjustY(GetSizePixel().Height());
-
m_pFieldPopup = VclPtr<SwFieldDialog>::Create(static_cast<SwEditWin*>(GetParent()),
&m_rFieldmark, GetSizePixel().Width());
- m_pFieldPopup->SetPopupModeEndHdl(LINK(this, DropDownFormFieldButton, FieldPopupModeEndHdl));
-
- tools::Rectangle aRect(GetParent()->OutputToScreenPixel(aPixPos), Size(0, 0));
- m_pFieldPopup->StartPopupMode(aRect, FloatWinPopupFlags::Down | FloatWinPopupFlags::GrabFocus);
- Invalidate();
-}
-
-IMPL_LINK_NOARG(DropDownFormFieldButton, FieldPopupModeEndHdl, FloatingWindow*, void)
-{
- m_pFieldPopup.disposeAndClear();
- m_rFieldmark.Invalidate();
- // Hide the button here and make it visible later, to make transparent background work with SAL_USE_VCLPLUGIN=gen
- Show(false);
- Invalidate();
-}
-
-static basegfx::BColor lcl_GetFillColor(const basegfx::BColor& rLineColor, double aLuminance)
-{
- basegfx::BColor aHslLine = basegfx::utils::rgb2hsl(rLineColor);
- aHslLine.setZ(aLuminance);
- return basegfx::utils::hsl2rgb(aHslLine);
-}
-
-void DropDownFormFieldButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
-{
- SetMapMode(MapMode(MapUnit::MapPixel));
-
- //const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- Color aLineColor = COL_BLACK;
- Color aFillColor(lcl_GetFillColor(aLineColor.getBColor(), (m_pFieldPopup ? 0.5 : 0.75)));
-
- // Draw the frame around the field
- // GTK3 backend cuts down the frame's top and left border, to avoid that add a padding around the frame
- int nPadding = 1;
- Point aPos(nPadding, nPadding);
- Size aSize(m_aFieldFramePixel.GetSize().Width() - nPadding,
- m_aFieldFramePixel.GetSize().Height() - nPadding);
- const tools::Rectangle aFrameRect(tools::Rectangle(aPos, aSize));
- rRenderContext.SetLineColor(aLineColor);
- rRenderContext.SetFillColor(COL_TRANSPARENT);
- rRenderContext.DrawRect(aFrameRect);
-
- // Draw the button next to the frame
- Point aButtonPos(aFrameRect.TopLeft());
- aButtonPos.AdjustX(aFrameRect.GetSize().getWidth() - 1);
- Size aButtonSize(aFrameRect.GetSize());
- aButtonSize.setWidth(GetSizePixel().getWidth() - aFrameRect.getWidth() - nPadding);
- const tools::Rectangle aButtonRect(tools::Rectangle(aButtonPos, aButtonSize));
-
- // Background & border
- rRenderContext.SetLineColor(aLineColor);
- rRenderContext.SetFillColor(aFillColor);
- rRenderContext.DrawRect(aButtonRect);
-
- // the arrowhead
- rRenderContext.SetLineColor(aLineColor);
- rRenderContext.SetFillColor(aLineColor);
-
- Point aCenter(aButtonPos.X() + (aButtonSize.Width() / 2),
- aButtonPos.Y() + (aButtonSize.Height() / 2));
- Size aArrowSize(aButtonSize.Width() / 4, aButtonSize.Height() / 10);
-
- tools::Polygon aPoly(3);
- aPoly.SetPoint(Point(aCenter.X() - aArrowSize.Width(), aCenter.Y() - aArrowSize.Height()), 0);
- aPoly.SetPoint(Point(aCenter.X() + aArrowSize.Width(), aCenter.Y() - aArrowSize.Height()), 1);
- aPoly.SetPoint(Point(aCenter.X(), aCenter.Y() + aArrowSize.Height()), 2);
- rRenderContext.DrawPolygon(aPoly);
-}
-
-WindowHitTest DropDownFormFieldButton::ImplHitTest(const Point& rFramePos)
-{
- // We need to check whether the position hits the button (the frame should be mouse transparent)
- WindowHitTest aResult = MenuButton::ImplHitTest(rFramePos);
- if (aResult != WindowHitTest::Inside)
- return aResult;
- else
- {
- return rFramePos.X() >= m_aFieldFramePixel.Right() ? WindowHitTest::Inside
- : WindowHitTest::Transparent;
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sw/source/core/crsr/FormFieldButton.cxx b/sw/source/core/crsr/FormFieldButton.cxx
new file mode 100644
index 000000000000..37b97d998b61
--- /dev/null
+++ b/sw/source/core/crsr/FormFieldButton.cxx
@@ -0,0 +1,157 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <DropDownFormFieldButton.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
+#include <edtwin.hxx>
+#include <basegfx/color/bcolortools.hxx>
+#include <viewopt.hxx>
+#include <bookmrk.hxx>
+#include <vcl/floatwin.hxx>
+#include <vcl/event.hxx>
+#include <vcl/lstbox.hxx>
+#include <IMark.hxx>
+#include <view.hxx>
+#include <docsh.hxx>
+#include <strings.hrc>
+
+
+FormFieldButton::FormFieldButton(SwEditWin* pEditWin,
+ sw::mark::Fieldmark& rFieldmark)
+ : MenuButton(pEditWin, WB_DIALOGCONTROL)
+ , m_rFieldmark(rFieldmark)
+{
+ assert(GetParent());
+ assert(dynamic_cast<SwEditWin*>(GetParent()));
+}
+
+FormFieldButton::~FormFieldButton() { disposeOnce(); }
+
+void FormFieldButton::dispose()
+{
+ m_pFieldPopup.disposeAndClear();
+ MenuButton::dispose();
+}
+
+void FormFieldButton::CalcPosAndSize(const SwRect& rPortionPaintArea)
+{
+ assert(GetParent());
+
+ Point aBoxPos = GetParent()->LogicToPixel(rPortionPaintArea.Pos());
+ Size aBoxSize = GetParent()->LogicToPixel(rPortionPaintArea.SSize());
+
+ // First calculate the size of the frame around the field
+ int nPadding = aBoxSize.Height() / 4;
+ aBoxPos.AdjustX(-nPadding);
+ aBoxPos.AdjustY(-nPadding);
+ aBoxSize.AdjustWidth(2 * nPadding);
+ aBoxSize.AdjustHeight(2 * nPadding);
+
+ m_aFieldFramePixel = tools::Rectangle(aBoxPos, aBoxSize);
+
+ // Then extend the size with the button area
+ aBoxSize.AdjustWidth(GetParent()->LogicToPixel(rPortionPaintArea.SSize()).Height());
+
+ SetPosSizePixel(aBoxPos, aBoxSize);
+}
+
+void FormFieldButton::MouseButtonUp(const MouseEvent&)
+{
+ assert(GetParent());
+
+ Point aPixPos = GetPosPixel();
+ aPixPos.AdjustY(GetSizePixel().Height());
+
+ // sets m_pFieldPopup
+ InitPopup();
+
+ m_pFieldPopup->SetPopupModeEndHdl(LINK(this, DropDownFormFieldButton, FieldPopupModeEndHdl));
+
+ tools::Rectangle aRect(GetParent()->OutputToScreenPixel(aPixPos), Size(0, 0));
+ m_pFieldPopup->StartPopupMode(aRect, FloatWinPopupFlags::Down | FloatWinPopupFlags::GrabFocus);
+ Invalidate();
+}
+
+IMPL_LINK_NOARG(FormFieldButton, FieldPopupModeEndHdl, FloatingWindow*, void)
+{
+ m_pFieldPopup.disposeAndClear();
+ m_rFieldmark.Invalidate();
+ // Hide the button here and make it visible later, to make transparent background work with SAL_USE_VCLPLUGIN=gen
+ Show(false);
+ Invalidate();
+}
+
+static basegfx::BColor lcl_GetFillColor(const basegfx::BColor& rLineColor, double aLuminance)
+{
+ basegfx::BColor aHslLine = basegfx::utils::rgb2hsl(rLineColor);
+ aHslLine.setZ(aLuminance);
+ return basegfx::utils::hsl2rgb(aHslLine);
+}
+
+void FormFieldButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
+{
+ SetMapMode(MapMode(MapUnit::MapPixel));
+
+ //const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
+ Color aLineColor = COL_BLACK;
+ Color aFillColor(lcl_GetFillColor(aLineColor.getBColor(), (m_pFieldPopup ? 0.5 : 0.75)));
+
+ // Draw the frame around the field
+ // GTK3 backend cuts down the frame's top and left border, to avoid that add a padding around the frame
+ int nPadding = 1;
+ Point aPos(nPadding, nPadding);
+ Size aSize(m_aFieldFramePixel.GetSize().Width() - nPadding,
+ m_aFieldFramePixel.GetSize().Height() - nPadding);
+ const tools::Rectangle aFrameRect(tools::Rectangle(aPos, aSize));
+ rRenderContext.SetLineColor(aLineColor);
+ rRenderContext.SetFillColor(COL_TRANSPARENT);
+ rRenderContext.DrawRect(aFrameRect);
+
+ // Draw the button next to the frame
+ Point aButtonPos(aFrameRect.TopLeft());
+ aButtonPos.AdjustX(aFrameRect.GetSize().getWidth() - 1);
+ Size aButtonSize(aFrameRect.GetSize());
+ aButtonSize.setWidth(GetSizePixel().getWidth() - aFrameRect.getWidth() - nPadding);
+ const tools::Rectangle aButtonRect(tools::Rectangle(aButtonPos, aButtonSize));
+
+ // Background & border
+ rRenderContext.SetLineColor(aLineColor);
+ rRenderContext.SetFillColor(aFillColor);
+ rRenderContext.DrawRect(aButtonRect);
+
+ // the arrowhead
+ rRenderContext.SetLineColor(aLineColor);
+ rRenderContext.SetFillColor(aLineColor);
+
+ Point aCenter(aButtonPos.X() + (aButtonSize.Width() / 2),
+ aButtonPos.Y() + (aButtonSize.Height() / 2));
+ Size aArrowSize(aButtonSize.Width() / 4, aButtonSize.Height() / 10);
+
+ tools::Polygon aPoly(3);
+ aPoly.SetPoint(Point(aCenter.X() - aArrowSize.Width(), aCenter.Y() - aArrowSize.Height()), 0);
+ aPoly.SetPoint(Point(aCenter.X() + aArrowSize.Width(), aCenter.Y() - aArrowSize.Height()), 1);
+ aPoly.SetPoint(Point(aCenter.X(), aCenter.Y() + aArrowSize.Height()), 2);
+ rRenderContext.DrawPolygon(aPoly);
+}
+
+WindowHitTest FormFieldButton::ImplHitTest(const Point& rFramePos)
+{
+ // We need to check whether the position hits the button (the frame should be mouse transparent)
+ WindowHitTest aResult = MenuButton::ImplHitTest(rFramePos);
+ if (aResult != WindowHitTest::Inside)
+ return aResult;
+ else
+ {
+ return rFramePos.X() >= m_aFieldFramePixel.Right() ? WindowHitTest::Inside
+ : WindowHitTest::Transparent;
+ }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sw/source/core/inc/DropDownFormFieldButton.hxx b/sw/source/core/inc/DropDownFormFieldButton.hxx
index 1147f59dfc9b..f1b317ca1263 100644
--- a/sw/source/core/inc/DropDownFormFieldButton.hxx
+++ b/sw/source/core/inc/DropDownFormFieldButton.hxx
@@ -12,6 +12,7 @@
#include <vcl/menubtn.hxx>
#include <swrect.hxx>
+#include <FormFieldButton.hxx>
class SwEditWin;
class FloatingWindow;
@@ -24,28 +25,15 @@ class DropDownFieldmark;
}
/**
- * This button is shown when the cursor is in a drop-down form field.
- * The user can select an item of the field using this button while filling in a form.
+ * This button is shown when the cursor is on a drop-down form field.
*/
-class DropDownFormFieldButton : public MenuButton
+class DropDownFormFieldButton : public FormFieldButton
{
public:
DropDownFormFieldButton(SwEditWin* pEditWin, sw::mark::DropDownFieldmark& rFieldMark);
virtual ~DropDownFormFieldButton() override;
- virtual void dispose() override;
- void CalcPosAndSize(const SwRect& rPortionPaintArea);
-
- virtual void MouseButtonUp(const MouseEvent& rMEvt) override;
- DECL_LINK(FieldPopupModeEndHdl, FloatingWindow*, void);
-
- virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
- virtual WindowHitTest ImplHitTest(const Point& rFramePos) override;
-
-private:
- tools::Rectangle m_aFieldFramePixel;
- sw::mark::DropDownFieldmark& m_rFieldmark;
- VclPtr<FloatingWindow> m_pFieldPopup;
+ virtual void InitPopup() override;
};
#endif
diff --git a/sw/source/core/inc/FormFieldButton.hxx b/sw/source/core/inc/FormFieldButton.hxx
new file mode 100644
index 000000000000..9cbc9bc5662a
--- /dev/null
+++ b/sw/source/core/inc/FormFieldButton.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_FORMEFIELDBUTTO_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_FORMEFIELDBUTTO_HXX
+
+#include <vcl/menubtn.hxx>
+#include <swrect.hxx>
+
+class SwEditWin;
+class FloatingWindow;
+namespace sw
+{
+namespace mark
+{
+class Fieldmark;
+}
+}
+
+/**
+ * This button is shown when the cursor is on a form field with drop-down capability.
+ * The user can select an item of the field using this button while filling in a form.
+ */
+class FormFieldButton : public MenuButton
+{
+public:
+ FormFieldButton(SwEditWin* pEditWin, sw::mark::Fieldmark& rFieldMark);
+ virtual ~FormFieldButton() override;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list