3 files changed, 12 insertions, 10 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index f524289e3647..c3f729a0e231 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -621,11 +621,8 @@ bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
 
 OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
 {
-    tools::Time aTime( tools::Time::EMPTY );
-    if ( eType == SvxTimeType::Fix )
-        aTime.SetTime(m_nFixTime);
-    else
-        aTime = tools::Time( tools::Time::SYSTEM ); // current time
+    tools::Time aTime(eType == SvxTimeType::Fix ? tools::Time::fromEncodedTime(m_nFixTime)
+                                                : tools::Time(tools::Time::SYSTEM)); // current time
     return GetFormatted( aTime, eFormat, rFormatter, eLang );
 }
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 055d46879aa6..0c3540051e49 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1891,12 +1891,17 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
 
     SvxAutoCorrectLanguageLists* pLists = nullptr;
 
-    tools::Time nMinTime( 0, 2 ), nAktTime( tools::Time::SYSTEM ), nLastCheckTime( tools::Time::EMPTY );
+    tools::Time nAktTime(tools::Time::SYSTEM);
 
     auto nFndPos = aLastFileTable.find(rLanguageTag);
-    if(nFndPos != aLastFileTable.end() &&
-       (nLastCheckTime.SetTime(nFndPos->second), nLastCheckTime < nAktTime) &&
-       nAktTime - nLastCheckTime < nMinTime)
+    bool lastCheckLessThan2MinutesAgo = nFndPos != aLastFileTable.end();
+    if (lastCheckLessThan2MinutesAgo)
+    {
+        const tools::Time nLastCheckTime(tools::Time::fromEncodedTime(nFndPos->second));
+        lastCheckLessThan2MinutesAgo
+            = nLastCheckTime < nAktTime && nAktTime - nLastCheckTime < tools::Time(0, 2);
+    }
+    if (lastCheckLessThan2MinutesAgo)
     {
         // no need to test the file, because the last check is not older then
         // 2 minutes.
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index ed8a0de01468..e474647450e9 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -206,7 +206,7 @@ static util::DateTime getTime(sal_Int64 const nTime)
 {
     util::DateTime aTime;
 
-    tools::Time aTempTime( nTime );
+    tools::Time aTempTime(tools::Time::fromEncodedTime(nTime));
 
     aTime.NanoSeconds = aTempTime.GetNanoSec();
     aTime.Seconds = aTempTime.GetSec();