diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-09-17 12:45:29 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-17 12:45:29 +0000 |
commit | 040cd9fc74a7363b0a2b4187c5f0577eea5bb31c (patch) | |
tree | 07779e779b553f3643096cbdb57496fc823ccedb /svx | |
parent | be172c69333a18cb9f5fbed6033b4a94619a2908 (diff) |
INTEGRATION: CWS os34 (1.52.126); FILE MERGED
2004/07/29 09:01:46 tl 1.52.126.2: #i30303# implementation of simplified/traditional Chinese conversion
2004/07/27 14:21:42 tl 1.52.126.1: #i30303# implementation of simplified/traditional Chinese conversion
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/editeng/impedit4.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx index eca95f3e1609..b94adb12b85a 100644 --- a/svx/source/editeng/impedit4.cxx +++ b/svx/source/editeng/impedit4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impedit4.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: obo $ $Date: 2004-04-28 13:45:35 $ + * last change: $Author: rt $ $Date: 2004-09-17 13:45:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1586,7 +1586,8 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nLang ) void ImpEditEngine::Convert( EditView* pEditView, - LanguageType nLang, sal_Bool bMultipleDoc ) + LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, + INT32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc ) { // modified version of ImpEditEngine::Spell @@ -1614,7 +1615,10 @@ void ImpEditEngine::Convert( EditView* pEditView, Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); TextConvWrapper aWrp( Application::GetDefDialogParent(), xMSF, - SvxCreateLocale( nLang ), bIsStart, pEditView ); + SvxCreateLocale( nSrcLang ), SvxCreateLocale( nDestLang ), + pDestFont, + nOptions, bIsInteractive, + bIsStart, pEditView ); aWrp.Convert(); if ( !bMultipleDoc ) @@ -1634,7 +1638,7 @@ void ImpEditEngine::Convert( EditView* pEditView, String ImpEditEngine::ImpConvert( EditView* pEditView, - LanguageType nLang, const ESelection &rConvRange ) + LanguageType nSrcLang, const ESelection &rConvRange ) { // modified version of ImpEditEngine::ImpSpell @@ -1727,7 +1731,7 @@ String ImpEditEngine::ImpConvert( EditView* pEditView, } } - if ( aWord.Len() > 0 && GetLanguage( aCurSel.Max() ) == nLang ) + if ( aWord.Len() > 0 && GetLanguage( aCurSel.Max() ) == nSrcLang ) aRes = aWord; if ( !aRes.Len() ) |