diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 15:15:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 15:15:18 +0000 |
| commit | 8cbdc4006a576fc969cfc136b5db0caf2f48c3f0 (patch) | |
| tree | a98f6d781b618bf1c65ebd6fb3949e6bb12b016d /unotools/source/i18n | |
| parent | f25c0f0af782ed9c332cf86584bdd74d5729907d (diff) | |
INTEGRATION: CWS calc06 (1.9.42); FILE MERGED
2003/03/28 15:13:09 er 1.9.42.1: #106680# use XExtendedTransliteration::transliterateString2String() if no offset sequence needed
Diffstat (limited to 'unotools/source/i18n')
| -rw-r--r-- | unotools/source/i18n/transliterationwrapper.cxx | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 27218bec7751..20f9b335aa29 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: transliterationwrapper.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: er $ $Date: 2002-05-31 14:29:09 $ + * last change: $Author: rt $ $Date: 2003-04-08 16:15:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,11 +80,12 @@ #pragma hdrstop -#define _LIBRARYNAME "i18n" -#define _SERVICENAME "com.sun.star.i18n.Transliteration" +#define TRANSLIT_LIBRARYNAME "i18n" +#define TRANSLIT_SERVICENAME "com.sun.star.i18n.Transliteration" using namespace ::com::sun::star::lang; using namespace ::com::sun::star::i18n; +using namespace ::drafts::com::sun::star::i18n; using namespace ::com::sun::star::uno; using namespace ::utl; @@ -96,9 +97,10 @@ TransliterationWrapper::TransliterationWrapper( if( xSMgr.is() ) { try { - xTrans = Reference< XTransliteration > ( xSMgr->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( _SERVICENAME ) ) ), - UNO_QUERY ); + xTrans = Reference< XExtendedTransliteration > ( + xSMgr->createInstance( ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + TRANSLIT_SERVICENAME))), UNO_QUERY ); } catch ( Exception& ) { @@ -111,14 +113,14 @@ TransliterationWrapper::TransliterationWrapper( try { Reference< XInterface > xI = ::comphelper::getComponentInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - LLCF_LIBNAME( _LIBRARYNAME ) ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - _SERVICENAME ) ) ); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LLCF_LIBNAME( + TRANSLIT_LIBRARYNAME ))), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + TRANSLIT_SERVICENAME))); if ( xI.is() ) { Any x = xI->queryInterface( - ::getCppuType((const Reference< XTransliteration>*)0) ); + ::getCppuType((const Reference< XExtendedTransliteration>*)0) ); x >>= xTrans ; } } @@ -127,7 +129,7 @@ TransliterationWrapper::TransliterationWrapper( DBG_ERRORFILE( "getComponentInstance: Exception caught!" ); } } - DBG_ASSERT( xTrans.is(), "TransliterationWrapper: no Transliteraion avaible" ); + DBG_ASSERT( xTrans.is(), "TransliterationWrapper: no Transliteraion available" ); } @@ -151,10 +153,7 @@ String TransliterationWrapper::transliterate( if ( pOffset ) sRet = xTrans->transliterate( rStr, nStart, nLen, *pOffset ); else - { - Sequence <long> aOffset; - sRet = xTrans->transliterate( rStr, nStart, nLen, aOffset ); - } + sRet = xTrans->transliterateString2String( rStr, nStart, nLen); } catch( Exception& ) { @@ -178,10 +177,7 @@ String TransliterationWrapper::transliterate( if ( pOffset ) sRet = xTrans->transliterate( rStr, nStart, nLen, *pOffset ); else - { - Sequence <long> aOffset; - sRet = xTrans->transliterate( rStr, nStart, nLen, aOffset ); - } + sRet = xTrans->transliterateString2String( rStr, nStart, nLen); } catch( Exception& ) { |