[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - editeng/source include/editeng
Aron Budea
aron.budea at collabora.com
Mon Jul 3 15:11:10 UTC 2017
editeng/source/misc/svxacorr.cxx | 2 +-
include/editeng/svxacorr.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 89d56ad70a5b43509d647d89d0cd12e481642954
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.
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)
Change-Id: Ie9243cf928d952e28989dd981508de86cb7dbddb
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f9f701be04ae..27d721f2ab48 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1564,7 +1564,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 dbe2704ba728..b00acc862c36 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_pLangTable;
- std::map<LanguageTag, long> aLastFileTable;
+ std::map<LanguageTag, sal_Int64> aLastFileTable;
CharClass* pCharClass;
bool bRunNext;
More information about the Libreoffice-commits
mailing list