diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-23 19:14:04 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-23 21:28:55 +0000 |
| commit | be945e8e54a93921a12597c7b3a5b012951600ac (patch) | |
| tree | 1b2626e366e4cf7ad0e4fb9f5a8f53dc2c97137d /reportdesign | |
| parent | 58a285d8d504c5ae952d314238dbbaa873b51db7 (diff) | |
fdo#67186 switch reporbuilder to null date == 1899-12-30
This brings it in line with the default for other LibreOffice
components (e.g. Calc), or with the only supported value (e.g. Writer
tables), respectively.
Configure Pentaho jfreereport to also take null date == 1899-12-30
This combined allows reportbuilder to make absolutely no fiddly
conversion itself, leaving them to jfreereport and Writer table
cell format.
Also:
- Make absolutely no conversion itself, also e.g. for booleans.
- ODF compliance: make the value-type match the set foo-value attribute.
- Use value-type="void" instead of empty value-type="string"
Conflicts:
reportdesign/source/core/sdr/RptObject.cxx
Change-Id: I67990232dbc9e86ac3fa37cd0c20edecb87cf8ee
Reviewed-on: https://gerrit.libreoffice.org/5054
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index b852cc4422cd..da1c4d834286 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -1238,8 +1238,8 @@ void OOle2Obj::initializeOle() { uno::Reference< beans::XPropertySet > xChartProps( xCompSupp->getComponent(), uno::UNO_QUERY ); if ( xChartProps.is() ) - xChartProps->setPropertyValue(OUString("NullDate"), - uno::makeAny(util::DateTime(0,0,0,0,1,1,1900,false))); + xChartProps->setPropertyValue("NullDate", + uno::makeAny(util::DateTime(0,0,0,0,30,12,1899,false))); } } } diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index a990058c3799..43ed0c639dcc 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -182,7 +182,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const m_xDelegatee->startElement(sTableCalc,NULL); pList = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xNullAttr = pList; - pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),OUString("1900-01-01")); + pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),OUString("1899-12-30")); const OUString sNullDate = lcl_createAttribute(XML_NP_TABLE,XML_NULL_DATE); m_xDelegatee->startElement(sNullDate,xNullAttr); |