summaryrefslogtreecommitdiff
path: root/sw/source/core/text/widorp.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/widorp.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/widorp.hxx')
-rw-r--r--sw/source/core/text/widorp.hxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 117c6886c388..3d8ee94e9af0 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -18,23 +18,23 @@
*/
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
-class SwTxtFrm;
+class SwTextFrm;
#include "swtypes.hxx"
#include "itrtxt.hxx"
-class SwTxtFrmBreak
+class SwTextFrmBreak
{
private:
SwTwips nRstHeight;
SwTwips nOrigin;
protected:
- SwTxtFrm *pFrm;
+ SwTextFrm *pFrm;
bool bBreak;
bool bKeep;
public:
- SwTxtFrmBreak( SwTxtFrm *pFrm, const SwTwips nRst = 0 );
- bool IsBreakNow( SwTxtMargin &rLine );
+ SwTextFrmBreak( SwTextFrm *pFrm, const SwTwips nRst = 0 );
+ bool IsBreakNow( SwTextMargin &rLine );
bool IsBroken() const { return bBreak; }
bool IsKeepAlways() const { return bKeep; }
@@ -44,38 +44,38 @@ public:
inline bool GetKeep() const { return bKeep; }
inline void SetKeep( const bool bNew ) { bKeep = bNew; }
- bool IsInside( SwTxtMargin &rLine ) const;
+ bool IsInside( SwTextMargin &rLine ) const;
- // In order to be able to handle special cases with Ftn.
- // SetRstHeight sets the rest height for SwTxtFrmBreak. This is needed
+ // In order to be able to handle special cases with Footnote.
+ // SetRstHeight sets the rest height for SwTextFrmBreak. This is needed
// to call TruncLines() without IsBreakNow() returning another value.
// We assume that rLine is pointing to the last non-fitting line.
// OD 2004-02-27 #106629# - no longer inline
- void SetRstHeight( const SwTxtMargin &rLine );
+ void SetRstHeight( const SwTextMargin &rLine );
SwTwips GetRstHeight() const { return nRstHeight; }
};
-class WidowsAndOrphans : public SwTxtFrmBreak
+class WidowsAndOrphans : public SwTextFrmBreak
{
private:
sal_uInt16 nWidLines, nOrphLines;
public:
- WidowsAndOrphans( SwTxtFrm *pFrm, const SwTwips nRst = 0,
+ WidowsAndOrphans( SwTextFrm *pFrm, const SwTwips nRst = 0,
bool bCheckKeep = true );
- bool FindWidows( SwTxtFrm *pFrm, SwTxtMargin &rLine );
+ bool FindWidows( SwTextFrm *pFrm, SwTextMargin &rLine );
sal_uInt16 GetWidowsLines() const
{ return nWidLines; }
sal_uInt16 GetOrphansLines() const
{ return nOrphLines; }
void ClrOrphLines(){ nOrphLines = 0; }
- bool FindBreak( SwTxtFrm *pFrm, SwTxtMargin &rLine, bool bHasToFit );
- bool WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, bool bTest );
+ bool FindBreak( SwTextFrm *pFrm, SwTextMargin &rLine, bool bHasToFit );
+ bool WouldFit( SwTextMargin &rLine, SwTwips &rMaxHeight, bool bTest );
// OD 2004-02-25 #i16128# - rename method to avoid confusion with base class
- // method <SwTxtFrmBreak::IsBreakNow>, which isn't virtual.
- bool IsBreakNowWidAndOrp( SwTxtMargin &rLine )
+ // method <SwTextFrmBreak::IsBreakNow>, which isn't virtual.
+ bool IsBreakNowWidAndOrp( SwTextMargin &rLine )
{
return ( rLine.GetLineNr() > nOrphLines ) && IsBreakNow( rLine );
}