From 0473296bd9a71b81c6aa9638d8a231ace503dbb8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 10 Jul 2012 14:57:56 +0100 Subject: nCurrentDataFilesChangedCheckValue is kind of pointless Change-Id: Ibded6b0a72c9501d35fb884c93c505a2f716f678 --- editeng/inc/editeng/unolingu.hxx | 1 - editeng/source/misc/unolingu.cxx | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'editeng') diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx index 27730155f86c..5b41e48b8007 100644 --- a/editeng/inc/editeng/unolingu.hxx +++ b/editeng/inc/editeng/unolingu.hxx @@ -55,7 +55,6 @@ class Window; class SvxLinguConfigUpdate { - static sal_Int32 nCurrentDataFilesChangedCheckValue; static sal_Int16 nNeedUpdating; // n == -1 => needs to be checked // n == 0 => already updated, nothing to be done // n == 1 => needs to be updated diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index d9cc031c89f9..da2fac53cefb 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -208,7 +208,6 @@ Sequence< OUString > lcl_MergeSeq( } sal_Int16 SvxLinguConfigUpdate::nNeedUpdating = -1; -sal_Int32 SvxLinguConfigUpdate::nCurrentDataFilesChangedCheckValue = -1; void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) { @@ -341,7 +340,6 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) } } } - OSL_ENSURE( nCurrentDataFilesChangedCheckValue != -1, "SvxLinguConfigUpdate::UpdateAll DataFilesChangedCheckValue not yet calculated!" ); Any aAny; // for the time being (developer builds until OOo 3.0) @@ -352,7 +350,6 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) // Since the check is on-demand occuring and executed once it should // not be too troublesome. // In OOo 3.0 we will not need the respective code anymore at all. -// aAny <<= nCurrentDataFilesChangedCheckValue; aAny <<= (sal_Int32) -1; // keep the value set to 'need to check' aCfg.SetProperty( A2OU( "DataFilesChangedCheckValue" ), aAny ); @@ -386,7 +383,7 @@ sal_Bool SvxLinguConfigUpdate::IsNeedUpdateAll( sal_Bool bForceCheck ) if (nNeedUpdating == -1 || bForceCheck ) // need to check if updating is necessary { // calculate hash value for current data files - nCurrentDataFilesChangedCheckValue = CalcDataFilesChangedCheckValue(); + sal_Int32 nCurrentDataFilesChangedCheckValue = CalcDataFilesChangedCheckValue(); // compare hash value and check value to see if anything has changed // and thus the configuration needs to be updated -- cgit