summaryrefslogtreecommitdiff
path: root/linguistic
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-12-09 12:21:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-09 12:21:32 +0000
commit9adaeb8d7a49d36ae2bb691225a1ae3213b06dab (patch)
treeb4a131739e4ca3e725bef4a378a9c39cd6fc70b5 /linguistic
parentcf2344dd6e41785c76eee199eb79f6eb43ada6bc (diff)
cppcheck: can remove this code and these variables
Diffstat (limited to 'linguistic')
-rw-r--r--linguistic/source/lngsvcmgr.cxx30
-rw-r--r--linguistic/source/lngsvcmgr.hxx4
2 files changed, 4 insertions, 30 deletions
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 136d85d6bf27..47010171da93 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -579,10 +579,6 @@ LngSvcMgr::LngSvcMgr() :
utl::ConfigItem( String::CreateFromAscii( "Office.Linguistic" ) ),
aEvtListeners ( GetLinguMutex() )
{
- bHasAvailSpellLocales =
- bHasAvailGrammarLocales =
- bHasAvailHyphLocales =
- bHasAvailThesLocales =
bDisposing = FALSE;
pSpellDsp = 0;
@@ -1470,39 +1466,21 @@ uno::Sequence< lang::Locale > SAL_CALL
uno::Sequence< lang::Locale > aRes;
uno::Sequence< lang::Locale > *pAvailLocales = NULL;
- BOOL *pHasAvailLocales = NULL;
if (0 == rServiceName.compareToAscii( SN_SPELLCHECKER ))
- {
pAvailLocales = &aAvailSpellLocales;
- pHasAvailLocales = &bHasAvailSpellLocales;
- }
else if (0 == rServiceName.compareToAscii( SN_GRAMMARCHECKER ))
- {
pAvailLocales = &aAvailGrammarLocales;
- pHasAvailLocales = &bHasAvailGrammarLocales;
- }
else if (0 == rServiceName.compareToAscii( SN_HYPHENATOR ))
- {
pAvailLocales = &aAvailHyphLocales;
- pHasAvailLocales = &bHasAvailHyphLocales;
- }
else if (0 == rServiceName.compareToAscii( SN_THESAURUS ))
- {
pAvailLocales = &aAvailThesLocales;
- pHasAvailLocales = &bHasAvailThesLocales;
- }
- // about pHasAvailLocales: nowadays (with OOo lingu in SO) we want to know immediately about
+ // Nowadays (with OOo lingu in SO) we want to know immediately about
// new downloaded dictionaries and have them ready right away if the Tools/Options...
// is used to activate them. Thus we can not rely anymore on buffered data.
- if (pAvailLocales /*&& pHasAvailLocales */)
- {
-// if (!*pHasAvailLocales)
-// {
- *pAvailLocales = GetAvailLocales(
- getAvailableServices( rServiceName, lang::Locale() ) );
-// *pHasAvailLocales = TRUE;
-// }
+ if (pAvailLocales)
+ {
+ *pAvailLocales = GetAvailLocales(getAvailableServices(rServiceName, lang::Locale()));
aRes = *pAvailLocales;
}
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 186fc3eb4f9e..a7057daf079f 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -112,10 +112,6 @@ class LngSvcMgr :
SvcInfoArray * pAvailThesSvcs;
BOOL bDisposing;
- BOOL bHasAvailSpellLocales;
- BOOL bHasAvailGrammarLocales;
- BOOL bHasAvailHyphLocales;
- BOOL bHasAvailThesLocales;
// disallow copy-constructor and assignment-operator for now
LngSvcMgr(const LngSvcMgr &);