summaryrefslogtreecommitdiff
path: root/svx/inc
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-10-05 13:37:19 +0000
committerKurt Zenker <kz@openoffice.org>2005-10-05 13:37:19 +0000
commit40e95651fcf156b42e40c84b5545b1c7c75912ad (patch)
tree995063c8874d4f86680d8648f3996ab308fed383 /svx/inc
parentaab62f22f2362613a6718778e765e60fb9d3efb2 (diff)
INTEGRATION: CWS tl12 (1.7.96); FILE MERGED
2005/09/26 13:47:01 tl 1.7.96.2: RESYNC: (1.7-1.8); FILE MERGED 2005/06/22 11:14:52 tl 1.7.96.1: #i44567# Chinese text conversion language attribute for non chinese non Asian text now set to target language also
Diffstat (limited to 'svx/inc')
-rw-r--r--svx/inc/textconv.hxx18
1 files changed, 14 insertions, 4 deletions
diff --git a/svx/inc/textconv.hxx b/svx/inc/textconv.hxx
index 4af350d01251..4c52ef67dbf5 100644
--- a/svx/inc/textconv.hxx
+++ b/svx/inc/textconv.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: textconv.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 19:19:51 $
+ * last change: $Author: kz $ $Date: 2005-10-05 14:37:19 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -67,6 +67,9 @@ class TextConvWrapper : public svx::HangulHanjaConversion
sal_Bool bStartChk;
sal_Bool bStartDone;
sal_Bool bEndDone;
+ sal_Bool bAllowChange; // storage for _bAllowImplicitChangesForNotConvertibleText
+ // paramters value of function GetNextPortion.
+ // used to transport the value to where it is needed.
// from SvxSpellWrapper copied and modified
@@ -87,7 +90,9 @@ class TextConvWrapper : public svx::HangulHanjaConversion
TextConvWrapper & operator= (const TextConvWrapper &);
protected:
- virtual void GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion, LanguageType& /* [out] */ rLangOfPortion );
+ virtual void GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion,
+ LanguageType& /* [out] */ rLangOfPortion,
+ sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText );
virtual void HandleNewUnit( const sal_Int32 nUnitStart,
const sal_Int32 nUnitEnd );
virtual void ReplaceUnit(
@@ -96,7 +101,12 @@ protected:
ReplacementAction eAction,
LanguageType *pNewUnitLanguage );
- virtual sal_Bool HasRubySupport() const;
+ virtual sal_Bool HasRubySupport() const;
+
+ void SetLanguageAndFont( const ESelection &rESel,
+ LanguageType nLang, USHORT nLangWhichId,
+ const Font *pFont, USHORT nFontWhichId );
+
public:
TextConvWrapper( Window* pWindow,