summaryrefslogtreecommitdiff
path: root/sw/source/core/text/pordrop.hxx
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
commitab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch)
tree36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source/core/text/pordrop.hxx
parent0db96caf0fcce09b87621c11b584a6d81cc7df86 (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/pordrop.hxx')
-rw-r--r--sw/source/core/text/pordrop.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 815e9eb07beb..568b03ff48d5 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -58,7 +58,7 @@ public:
void SetJoinBorderWithNext( const bool bJoinNext ) { m_bJoinBorderWithNext = bJoinNext; }
};
-class SwDropPortion : public SwTxtPortion
+class SwDropPortion : public SwTextPortion
{
friend class SwDropCapCache;
SwDropPortionPart* pPart; // due to script/attribute changes
@@ -70,8 +70,8 @@ class SwDropPortion : public SwTxtPortion
short nX; // X PaintOffset
short nY; // Y Offset
- bool FormatTxt( SwTxtFormatInfo &rInf );
- void PaintTxt( const SwTxtPaintInfo &rInf ) const;
+ bool FormatText( SwTextFormatInfo &rInf );
+ void PaintText( const SwTextPaintInfo &rInf ) const;
inline void Fix( const sal_uInt16 nNew ) { nFix = nNew; }
public:
@@ -81,10 +81,10 @@ public:
const sal_uInt16 nDistance );
virtual ~SwDropPortion();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
- void PaintDrop( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ void PaintDrop( const SwTextPaintInfo &rInf ) const;
+ virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
inline sal_uInt16 GetLines() const { return nLines; }