[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - editeng/source include/editeng

[Aron Budea]

 editeng/source/misc/svxacorr.cxx |    2 +-
 include/editeng/svxacorr.hxx     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef5d9650ecc034100fbf09005436fe75e7eccecb
Author: Aron Budea <aron.budea at collabora.com>
Date:   Fri Jun 30 23:57:35 2017 +0200

    tdf#108622: use correct type for last check timestamp during autocorrect
    
    It's only supposed to check the files once every 2-mins, with
    mismatching type that happens each time.
    
    Change-Id: Ie9243cf928d952e28989dd981508de86cb7dbddb
    Reviewed-on: https://gerrit.libreoffice.org/39428
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 51f616ddd7a2e3310e1b30dbd73d90e5138980ea)
    Reviewed-on: https://gerrit.libreoffice.org/39443

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index ba9da47e63d6..f112d3d536f8 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1571,7 +1571,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
 
     tools::Time nMinTime( 0, 2 ), nAktTime( tools::Time::SYSTEM ), nLastCheckTime( tools::Time::EMPTY );
 
-    std::map<LanguageTag, long>::iterator nFndPos = aLastFileTable.find(rLanguageTag);
+    auto nFndPos = aLastFileTable.find(rLanguageTag);
     if(nFndPos != aLastFileTable.end() &&
        (nLastCheckTime.SetTime(nFndPos->second), nLastCheckTime < nAktTime) &&
        nAktTime - nLastCheckTime < nMinTime)
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 10df11213dd3..1cc14c0214ae 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -233,7 +233,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
 
     // all languages in a table
     std::map<LanguageTag, std::unique_ptr<SvxAutoCorrectLanguageLists>> m_aLangTable;
-    std::map<LanguageTag, long> aLastFileTable;
+    std::map<LanguageTag, sal_Int64> aLastFileTable;
     std::unique_ptr<CharClass> pCharClass;
 
     bool bRunNext;