INTEGRATION: CWS tl07 (1.5.226); FILE MERGED

2005/02/14 14:06:24 tl 1.5.226.2: RESYNC: (1.5-1.6); FILE MERGED
2005/01/19 15:27:57 tl 1.5.226.1: #i37058# text conversion: improvments for secondary Chinese languages

1 files changed, 6 insertions, 7 deletions

diff --git a/svx/inc/textconv.hxx b/svx/inc/textconv.hxx
index 3cd3fa443942..4a61fde98e54 100644
--- a/svx/inc/textconv.hxx
+++ b/svx/inc/textconv.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textconv.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2005-01-21 15:39:44 $
+ *  last change: $Author: rt $ $Date: 2005-04-04 08:28:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,6 +79,7 @@ class ContentNode;
 class TextConvWrapper : public svx::HangulHanjaConversion
 {
     rtl::OUString   aConvText;      // convertible text part found last time
+    LanguageType    nConvTextLang;  // language of aConvText
     USHORT          nLastPos;       // starting position of the last found text portion (word)
     USHORT          nUnitOffset;    // offset of current unit in the current text portion (word)
 
@@ -89,9 +90,6 @@ class TextConvWrapper : public svx::HangulHanjaConversion
     EditView *      pEditView;
     Window *        pWin;
 
-//    LanguageType    nSourceLang;    // Language of text portions to look for
-//    LanguageType    nTargetLang;    // Language of replacement text
-
     sal_Bool        bStartChk;
     sal_Bool        bStartDone;
     sal_Bool        bEndDone;
@@ -115,13 +113,14 @@ class TextConvWrapper : public svx::HangulHanjaConversion
     TextConvWrapper & operator= (const TextConvWrapper &);
 
 protected:
-    virtual void    GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion );
+    virtual void    GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion, LanguageType& /* [out] */ rLangOfPortion );
     virtual void    HandleNewUnit( const sal_Int32 nUnitStart,
                                    const sal_Int32 nUnitEnd );
     virtual void    ReplaceUnit(
                         const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
                         const ::rtl::OUString& rReplaceWith,
-                        ReplacementAction eAction );
+                        ReplacementAction eAction,
+                        LanguageType *pNewUnitLanguage );
 
    virtual sal_Bool    HasRubySupport() const;