Kaydet (Commit) 0473296b authored tarafından Caolán McNamara's avatar Caolán McNamara

nCurrentDataFilesChangedCheckValue is kind of pointless

Change-Id: Ibded6b0a72c9501d35fb884c93c505a2f716f678
üst b18e1e70
...@@ -55,7 +55,6 @@ class Window; ...@@ -55,7 +55,6 @@ class Window;
class SvxLinguConfigUpdate class SvxLinguConfigUpdate
{ {
static sal_Int32 nCurrentDataFilesChangedCheckValue;
static sal_Int16 nNeedUpdating; // n == -1 => needs to be checked static sal_Int16 nNeedUpdating; // n == -1 => needs to be checked
// n == 0 => already updated, nothing to be done // n == 0 => already updated, nothing to be done
// n == 1 => needs to be updated // n == 1 => needs to be updated
......
...@@ -208,7 +208,6 @@ Sequence< OUString > lcl_MergeSeq( ...@@ -208,7 +208,6 @@ Sequence< OUString > lcl_MergeSeq(
} }
sal_Int16 SvxLinguConfigUpdate::nNeedUpdating = -1; sal_Int16 SvxLinguConfigUpdate::nNeedUpdating = -1;
sal_Int32 SvxLinguConfigUpdate::nCurrentDataFilesChangedCheckValue = -1;
void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
{ {
...@@ -341,7 +340,6 @@ 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; Any aAny;
// for the time being (developer builds until OOo 3.0) // for the time being (developer builds until OOo 3.0)
...@@ -352,7 +350,6 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) ...@@ -352,7 +350,6 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
// Since the check is on-demand occuring and executed once it should // Since the check is on-demand occuring and executed once it should
// not be too troublesome. // not be too troublesome.
// In OOo 3.0 we will not need the respective code anymore at all. // 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' aAny <<= (sal_Int32) -1; // keep the value set to 'need to check'
aCfg.SetProperty( A2OU( "DataFilesChangedCheckValue" ), aAny ); aCfg.SetProperty( A2OU( "DataFilesChangedCheckValue" ), aAny );
...@@ -386,7 +383,7 @@ sal_Bool SvxLinguConfigUpdate::IsNeedUpdateAll( sal_Bool bForceCheck ) ...@@ -386,7 +383,7 @@ sal_Bool SvxLinguConfigUpdate::IsNeedUpdateAll( sal_Bool bForceCheck )
if (nNeedUpdating == -1 || bForceCheck ) // need to check if updating is necessary if (nNeedUpdating == -1 || bForceCheck ) // need to check if updating is necessary
{ {
// calculate hash value for current data files // 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 // compare hash value and check value to see if anything has changed
// and thus the configuration needs to be updated // and thus the configuration needs to be updated
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment