summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 10:54:32 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 10:54:32 +0000
commitbe65e15d90e76f63aec91565f360e5f3b823563a (patch)
tree09543b0224d3ce8065cfe43a1b0f6025a801ad53 /svx
parent2609bd2308bb9a2abe60840bbb71791bc1e96627 (diff)
INTEGRATION: CWS sb59 (1.19.14); FILE MERGED
2006/08/28 12:56:47 sb 1.19.14.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svxrtf.hxx21
1 files changed, 15 insertions, 6 deletions
diff --git a/svx/inc/svxrtf.hxx b/svx/inc/svxrtf.hxx
index 58b99668ef5b..8cdbcb14d08c 100644
--- a/svx/inc/svxrtf.hxx
+++ b/svx/inc/svxrtf.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: svxrtf.hxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: obo $ $Date: 2006-07-14 08:43:31 $
+ * last change: $Author: obo $ $Date: 2006-10-12 11:54:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -271,13 +271,25 @@ class SVX_DLLPUBLIC SvxRTFParser : public SvRTFParser
// setzt alle Attribute, die unterschiedlich zum aktuellen sind
void SetAttrSet( SfxItemSet& rAttrSet, SvxPosition& rSttPos );
void SetAttrSet( SvxRTFItemStackType &rSet );
- void SetDefault( int nToken, short nValue );
+ void SetDefault( int nToken, int nValue );
// pard / plain abarbeiten
void RTFPardPlain( int bPard, SfxItemSet** ppSet );
void BuildWhichTbl();
+ enum RTF_CharTypeDef
+ {
+ NOTDEF_CHARTYPE,
+ LOW_CHARTYPE,
+ HIGH_CHARTYPE,
+ DOUBLEBYTE_CHARTYPE
+ };
+
+ // set latin/asian/complex character attributes
+ void SetScriptAttr(
+ RTF_CharTypeDef eType, SfxItemSet& rSet, SfxPoolItem& rItem );
+
protected:
virtual void EnterEnvironment();
virtual void LeaveEnvironment();
@@ -369,9 +381,6 @@ protected:
// wird USHRT_MAX returnt, ansonsten die Anzahl der umgewandelten Ze.
xub_StrLen HexToBin( String& rToken );
- // set latin/asian/complex character attributes
- void SetScriptAttr( USHORT eType, SfxItemSet& rSet, SfxPoolItem& rItem );
-
public:
virtual SvParserState CallParser(); // Aufruf des Parsers