diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source/core/text/porrst.hxx | |
parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/core/text/porrst.hxx')
-rw-r--r-- | sw/source/core/text/porrst.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx index 90ba3743f030..31f8ab0448bd 100644 --- a/sw/source/core/text/porrst.hxx +++ b/sw/source/core/text/porrst.hxx @@ -24,13 +24,13 @@ #define LINE_BREAK_WIDTH 150 #define SPECIAL_FONT_HEIGHT 200 -class SwTxtFormatInfo; +class SwTextFormatInfo; class SwTmpEndPortion : public SwLinePortion { public: explicit SwTmpEndPortion( const SwLinePortion &rPortion ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; OUTPUT_OPERATOR_OVERRIDE }; @@ -40,9 +40,9 @@ public: explicit SwBreakPortion( const SwLinePortion &rPortion ); // Returns 0 if we have no usable data virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler @@ -71,8 +71,8 @@ public: // of rPortion. It is only used for kerning portions for grid mode explicit SwKernPortion( const SwLinePortion &rPortion ); - virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; OUTPUT_OPERATOR_OVERRIDE }; @@ -83,8 +83,8 @@ class SwArrowPortion : public SwLinePortion bool bLeft; public: explicit SwArrowPortion( const SwLinePortion &rPortion ); - explicit SwArrowPortion( const SwTxtPaintInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + explicit SwArrowPortion( const SwTextPaintInfo &rInf ); + virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; virtual SwLinePortion *Compress() SAL_OVERRIDE; inline bool IsLeft() const { return bLeft; } inline const Point& GetPos() const { return aPos; } @@ -95,7 +95,7 @@ public: // other punctuation marks are allowed to display in the margin of the page // by a user option. // The SwHangingPortion is the corresponding textportion to do that. -class SwHangingPortion : public SwTxtPortion +class SwHangingPortion : public SwTextPortion { sal_uInt16 nInnerWidth; public: @@ -112,8 +112,8 @@ public: explicit SwHiddenTextPortion( sal_Int32 nLen ) { SetWhichPor( POR_HIDDEN_TXT ); SetLen( nLen ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; }; class SwControlCharPortion : public SwLinePortion @@ -132,9 +132,9 @@ public: SetWhichPor( POR_CONTROLCHAR ); SetLen( 1 ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo& rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo& rInf ) const SAL_OVERRIDE; }; #endif |