Kaydet (Commit) 80e977a3 authored tarafından David Tardon's avatar David Tardon

std::map* -> std::map

üst 93d3f625
...@@ -209,7 +209,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect ...@@ -209,7 +209,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
// all languages in a table // all languages in a table
SvxAutoCorrLanguageTable_Impl* pLangTable; SvxAutoCorrLanguageTable_Impl* pLangTable;
std::map<LanguageType, long>* pLastFileTable; std::map<LanguageType, long> aLastFileTable;
CharClass* pCharClass; CharClass* pCharClass;
bool bRunNext; bool bRunNext;
......
...@@ -342,7 +342,6 @@ SvxAutoCorrect::SvxAutoCorrect( const String& rShareAutocorrFile, ...@@ -342,7 +342,6 @@ SvxAutoCorrect::SvxAutoCorrect( const String& rShareAutocorrFile,
: sShareAutoCorrFile( rShareAutocorrFile ), : sShareAutoCorrFile( rShareAutocorrFile ),
sUserAutoCorrFile( rUserAutocorrFile ), sUserAutoCorrFile( rUserAutocorrFile ),
pLangTable( new SvxAutoCorrLanguageTable_Impl ), pLangTable( new SvxAutoCorrLanguageTable_Impl ),
pLastFileTable( new std::map<LanguageType, long> ),
pCharClass( 0 ), bRunNext( false ), pCharClass( 0 ), bRunNext( false ),
cStartDQuote( 0 ), cEndDQuote( 0 ), cStartSQuote( 0 ), cEndSQuote( 0 ) cStartDQuote( 0 ), cEndDQuote( 0 ), cStartSQuote( 0 ), cEndSQuote( 0 )
{ {
...@@ -359,7 +358,6 @@ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy ) ...@@ -359,7 +358,6 @@ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
aSwFlags( rCpy.aSwFlags ), aSwFlags( rCpy.aSwFlags ),
pLangTable( new SvxAutoCorrLanguageTable_Impl ), pLangTable( new SvxAutoCorrLanguageTable_Impl ),
pLastFileTable( new std::map<LanguageType, long> ),
pCharClass( 0 ), bRunNext( false ), pCharClass( 0 ), bRunNext( false ),
nFlags( rCpy.nFlags & ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad)), nFlags( rCpy.nFlags & ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad)),
...@@ -374,7 +372,6 @@ SvxAutoCorrect::~SvxAutoCorrect() ...@@ -374,7 +372,6 @@ SvxAutoCorrect::~SvxAutoCorrect()
{ {
lcl_ClearTable(*pLangTable); lcl_ClearTable(*pLangTable);
delete pLangTable; delete pLangTable;
delete pLastFileTable;
delete pCharClass; delete pCharClass;
} }
...@@ -1616,8 +1613,8 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi ...@@ -1616,8 +1613,8 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi
Time nMinTime( 0, 2 ), nAktTime( Time::SYSTEM ), nLastCheckTime( Time::EMPTY ); Time nMinTime( 0, 2 ), nAktTime( Time::SYSTEM ), nLastCheckTime( Time::EMPTY );
std::map<LanguageType, long>::iterator nFndPos = pLastFileTable->find(eLang); std::map<LanguageType, long>::iterator nFndPos = aLastFileTable.find(eLang);
if(nFndPos != pLastFileTable->end() && if(nFndPos != aLastFileTable.end() &&
(nLastCheckTime.SetTime(nFndPos->second), nLastCheckTime < nAktTime) && (nLastCheckTime.SetTime(nFndPos->second), nLastCheckTime < nAktTime) &&
nAktTime - nLastCheckTime < nMinTime) nAktTime - nLastCheckTime < nMinTime)
{ {
...@@ -1629,7 +1626,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi ...@@ -1629,7 +1626,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi
pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile,
sUserDirFile, eLang ); sUserDirFile, eLang );
pLangTable->Insert( sal_uLong(eLang), pLists ); pLangTable->Insert( sal_uLong(eLang), pLists );
pLastFileTable->erase(nFndPos); aLastFileTable.erase(nFndPos);
} }
} }
else if( ( FStatHelper::IsDocument( sUserDirFile ) || else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
...@@ -1640,11 +1637,11 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi ...@@ -1640,11 +1637,11 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi
pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile,
sUserDirFile, eLang ); sUserDirFile, eLang );
pLangTable->Insert( sal_uLong(eLang), pLists ); pLangTable->Insert( sal_uLong(eLang), pLists );
pLastFileTable->erase(nFndPos); aLastFileTable.erase(nFndPos);
} }
else if( !bNewFile ) else if( !bNewFile )
{ {
(*pLastFileTable)[eLang] = nAktTime.GetTime(); aLastFileTable[eLang] = nAktTime.GetTime();
} }
return pLists != 0; return pLists != 0;
} }
......
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