summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorThomas Lange <tl@openoffice.org>2009-07-13 12:48:12 +0000
committerThomas Lange <tl@openoffice.org>2009-07-13 12:48:12 +0000
commit104e585e3db2e7a77e1de237ea68abaf38a44600 (patch)
tree2842b2f207e3a21c77aab4aaf286473316c63cc8 /unotools
parent1d9708f5e1f732eb84813e0eda6da8dd48623b82 (diff)
undoing r273933 which was accidently commited on master m51
Notes
split repo tag: libs-gui_ooo/DEV300_m51
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/i18n/transliterationwrapper.cxx23
1 files changed, 8 insertions, 15 deletions
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index 70d37ad54f6a..bd33e447471f 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -34,10 +34,11 @@
#include <unotools/transliterationwrapper.hxx>
#include <tools/debug.hxx>
#include <i18npool/mslangid.hxx>
+#ifndef _COMPHELPER_COMPONENTFACTORY_HXX_
#include <comphelper/componentfactory.hxx>
+#endif
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#define TRANSLIT_LIBRARYNAME "i18n"
#define TRANSLIT_SERVICENAME "com.sun.star.i18n.Transliteration"
@@ -167,22 +168,14 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang )
sal_Bool bLoad = bFirstCall;
bFirstCall = sal_False;
- if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::SENTENCE_CASE )
- {
- if( bLoad )
- loadModuleByImplName(String::CreateFromAscii("SENTENCE_CASE"), nLang);
- }
- else
+ if( nLanguage != nLang )
{
- if( nLanguage != nLang )
- {
- setLanguageLocaleImpl( nLang );
- if( !bLoad )
- bLoad = needLanguageForTheMode();
- }
- if( bLoad )
- loadModuleImpl();
+ setLanguageLocaleImpl( nLang );
+ if( !bLoad )
+ bLoad = needLanguageForTheMode();
}
+ if( bLoad )
+ loadModuleImpl();
}