From af23aa9a763bd8ebe160b95a48e1b0e650ec9ed3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Apr 2016 15:08:57 +0200 Subject: loplugin:constantparam in xmloff Change-Id: I55c984abc1a026b6b9a2488dca35f5d8e587120f Reviewed-on: https://gerrit.libreoffice.org/23828 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmloff/inc/txtflde.hxx | 3 +-- xmloff/source/draw/ximp3dobject.cxx | 9 ++++----- xmloff/source/draw/ximp3dobject.hxx | 3 +-- xmloff/source/text/txtflde.cxx | 20 +++----------------- 4 files changed, 9 insertions(+), 26 deletions(-) (limited to 'xmloff') diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index 168214358386..515191b2646f 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -340,8 +340,7 @@ protected: /// export times, dates and durations according to ISO 8601 void ProcessDateTime( enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token - const css::util::DateTime& rTime, /// date/time value - bool bIsDate); /// export as date (rather than date/time)? + const css::util::DateTime& rTime); /// date/time value /// export time or dateTime void ProcessTimeOrDateTime( diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 3f8d16bd8723..d3dd4a255a22 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -307,9 +307,8 @@ SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext( sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, - uno::Reference< drawing::XShapes >& rShapes, - bool bTemporaryShape) -: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) + uno::Reference< drawing::XShapes >& rShapes) +: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -394,7 +393,7 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext( const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) -: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ) +: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) { } @@ -427,7 +426,7 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext( const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) -: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ) +: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) { } diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index db180dbbc9c6..ab9fef2ba05b 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -107,8 +107,7 @@ public: SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, - css::uno::Reference< css::drawing::XShapes >& rShapes, - bool bTemporaryShape); + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXML3DPolygonBasedShapeContext(); virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 3ccef24af2d2..2e3d293517e0 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1302,17 +1302,13 @@ void XMLTextFieldExport::ExportFieldHelper( // no value -> current date ProcessDateTime(XML_DATE_VALUE, GetDateTimeProperty(sPropertyDateTimeValue, - rPropSet), - // #96457#: date fields should also save time - false); + rPropSet)); } // TODO: remove double-handling after SRC614 else if (xPropSetInfo->hasPropertyByName(sPropertyDateTime)) { ProcessDateTime(XML_DATE_VALUE, - GetDateTimeProperty(sPropertyDateTime,rPropSet), - // #96457#: date fields should also save time - false); + GetDateTimeProperty(sPropertyDateTime,rPropSet)); } if (xPropSetInfo->hasPropertyByName(sPropertyIsFixed)) { @@ -2636,22 +2632,12 @@ void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName, /// export a date or time void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName, - const util::DateTime& rTime, - bool bIsDate) + const util::DateTime& rTime) { OUStringBuffer aBuffer; util::DateTime aDateTime(rTime); - // truncate dates - if(bIsDate) - { - aDateTime.NanoSeconds = 0; - aDateTime.Seconds = 0; - aDateTime.Minutes = 0; - aDateTime.Hours = 0; - } - // date/time value ::sax::Converter::convertDateTime(aBuffer, aDateTime, nullptr); -- cgit