diff options
Diffstat (limited to 'sw/source/core/text/inftxt.hxx')
| -rw-r--r-- | sw/source/core/text/inftxt.hxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index a975d04776a4..d750eb3c1c3c 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -273,7 +273,7 @@ public: inline const SwViewOption &GetOpt() const { return *pOpt; } inline const XubString &GetTxt() const { return *pTxt; } - inline xub_Unicode GetChar( const xub_StrLen nPos ) const + inline sal_Unicode GetChar( const xub_StrLen nPos ) const { return pTxt->GetChar( nPos ); } inline KSHORT GetTxtHeight() const; @@ -404,7 +404,8 @@ protected: SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pSmartTags = 0; pSpaceAdd = 0; pBrushItem = ((SvxBrushItem*)-1);} #else - SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pWrongList = 0; pSmartTags = 0; pSpaceAdd = 0; pBrushItem = 0;} + SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pSmartTags = 0; pSpaceAdd = 0; + pBrushItem = 0;} #endif public: SwTxtPaintInfo( const SwTxtPaintInfo &rInf ); @@ -553,8 +554,8 @@ class SwTxtFormatInfo : public SwTxtPaintInfo // the beginning of a line sal_Bool bTabOverflow; // Tabs are expanding after the end margin - xub_Unicode cTabDecimal; // the current decimal delimiter - xub_Unicode cHookChar; // For tabs in fields etc. + sal_Unicode cTabDecimal; // the current decimal delimiter + sal_Unicode cHookChar; // For tabs in fields etc. sal_uInt8 nMaxHyph; // Max. line count of followup hyphenations sal_Bool bTestFormat; // Test formatting from WouldFit, no notification etc. @@ -660,16 +661,16 @@ public: // Tabs inline SwTabPortion *GetLastTab() { return pLastTab; } inline void SetLastTab( SwTabPortion *pNew ) { pLastTab = pNew; } - inline xub_Unicode GetTabDecimal() const { return cTabDecimal; } - inline void SetTabDecimal( const xub_Unicode cNew ) { cTabDecimal = cNew;} + inline sal_Unicode GetTabDecimal() const { return cTabDecimal; } + inline void SetTabDecimal( const sal_Unicode cNew ) { cTabDecimal = cNew;} // Last* inline SwFldPortion *GetLastFld() { return pLastFld; } inline void SetLastFld( SwFldPortion *pNew ) { pLastFld = pNew; } inline void ClearHookChar() { cHookChar = 0; } - inline void SetHookChar( const xub_Unicode cNew ) { cHookChar = cNew; } - inline xub_Unicode GetHookChar() const { return cHookChar; } + inline void SetHookChar( const sal_Unicode cNew ) { cHookChar = cNew; } + inline sal_Unicode GetHookChar() const { return cHookChar; } // Done-Flags inline sal_Bool IsFtnDone() const { return bFtnDone; } |