diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/docufld.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/fields/flddat.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/unocore/unofield.cxx | 7 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 |
5 files changed, 5 insertions, 13 deletions
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 4a0b91bd5224..f14b3b7b00b6 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -464,7 +464,7 @@ public: virtual SwField* Copy() const override; const DateTime& GetDateTime() const { return aDateTime; } - inline const Date GetDate() const { return aDateTime.GetDate(); } + inline const Date GetDate() const { return Date(aDateTime.GetDate()); } inline const tools::Time GetTime() const { return aDateTime.GetTime(); } /// Author diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index 358a20740e0c..e6e11451df72 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -152,7 +152,7 @@ tools::Time SwDateTimeField::GetTime() const { double fDummy; double fFract = modf(GetValue(), &fDummy); - DateTime aDT((long)fDummy, 0); + DateTime aDT(Date(static_cast<sal_Int32>(fDummy)), 0); aDT += fFract; return static_cast<tools::Time>(aDT); } diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 4e935d6fe8ea..462b19df73b6 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1192,8 +1192,7 @@ void makeRedline( SwPaM& rPaM, aDateTimeValue = aPropMap.getUnpackedValueOrDefault("RedlineDateTime", aDateTimeValue); if( aDateTimeValue >>= aStamp ) { - aRedlineData.SetTimeStamp( - DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); + aRedlineData.SetTimeStamp( DateTime( aStamp)); } SwRedlineExtraData_FormattingChanges* pRedlineExtraData = nullptr; diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index e2efdad70749..36bf54b9d291 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1357,12 +1357,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) DateTime aDateTime( DateTime::EMPTY ); if (m_pImpl->m_pProps->pDateTime) { - aDateTime.SetYear(m_pImpl->m_pProps->pDateTime->Year); - aDateTime.SetMonth(m_pImpl->m_pProps->pDateTime->Month); - aDateTime.SetDay(m_pImpl->m_pProps->pDateTime->Day); - aDateTime.SetHour(m_pImpl->m_pProps->pDateTime->Hours); - aDateTime.SetMin(m_pImpl->m_pProps->pDateTime->Minutes); - aDateTime.SetSec(m_pImpl->m_pProps->pDateTime->Seconds); + aDateTime = *(m_pImpl->m_pProps->pDateTime); } SwPostItField* pPostItField = new SwPostItField( static_cast<SwPostItFieldType*>(pFieldType), diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 4e55c49055fe..f4d2c8168410 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4584,9 +4584,7 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject) { css::util::Date aUNODate; aGrabBag[i].Value >>= aUNODate; - aOriginalDate.SetDay(aUNODate.Day); - aOriginalDate.SetMonth(aUNODate.Month); - aOriginalDate.SetYear(aUNODate.Year); + aOriginalDate = aUNODate; } else if (aGrabBag[i].Name == "CharFormat") aGrabBag[i].Value >>= aCharFormat; |