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/portab.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/portab.hxx')
| -rw-r--r-- | sw/source/core/text/portab.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx index aa0ba81e94e3..fa635c1f0359 100644 --- a/sw/source/core/text/portab.hxx +++ b/sw/source/core/text/portab.hxx @@ -28,13 +28,13 @@ class SwTabPortion : public SwFixPortion const bool bAutoTabStop; // Format() branches either into PreFormat() or PostFormat() - bool PreFormat( SwTxtFormatInfo &rInf ); + bool PreFormat( SwTextFormatInfo &rInf ); public: SwTabPortion( const sal_uInt16 nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; - virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; - bool PostFormat( SwTxtFormatInfo &rInf ); + virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + bool PostFormat( SwTextFormatInfo &rInf ); inline bool IsFilled() const { return 0 != cFill; } inline sal_uInt16 GetTabPos() const { return nTabPos; } inline bool IsAutoTabStop() const { return bAutoTabStop; } @@ -112,7 +112,7 @@ public: const sal_Unicode cFillChar = '\0' ) : SwTabDecimalPortion( nTabPosVal, cTab, cFillChar ) { SetLen( 0 ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; }; #endif |