summaryrefslogtreecommitdiff
path: root/sw/source/core/text
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/text')
-rw-r--r--sw/source/core/text/pordrop.hxx1
-rw-r--r--sw/source/core/text/porfld.cxx6
-rw-r--r--sw/source/core/text/porfld.hxx4
-rw-r--r--sw/source/core/text/portab.hxx1
-rw-r--r--sw/source/core/text/txtdrop.cxx2
-rw-r--r--sw/source/core/text/txttab.cxx4
-rw-r--r--sw/source/core/text/widorp.cxx2
-rw-r--r--sw/source/core/text/widorp.hxx2
8 files changed, 7 insertions, 15 deletions
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 4839a8f06224..05ff5a6bb084 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -72,7 +72,6 @@ class SwDropPortion : public SwTextPortion
bool FormatText( SwTextFormatInfo &rInf );
void PaintText( const SwTextPaintInfo &rInf ) const;
- inline void Fix( const sal_uInt16 nNew ) { nFix = nNew; }
public:
SwDropPortion( const sal_uInt16 nLineCnt,
const sal_uInt16 nDropHeight,
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index b06affbf068e..4f24e63b33f0 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -87,7 +87,7 @@ SwFieldPortion::SwFieldPortion( const SwFieldPortion& rField )
: SwExpandPortion( rField )
, aExpand( rField.GetExp() )
, nNextOffset( rField.GetNextOffset() )
- , nNextScriptChg( rField.GetNextScriptChg() )
+ , nNextScriptChg( rField.nNextScriptChg )
, nViewWidth( rField.nViewWidth )
, bFollow( rField.IsFollow() )
, bLeft( rField.IsLeft() )
@@ -839,7 +839,7 @@ bool SwGrfNumPortion::Format( SwTextFormatInfo &rInf )
if( bFly )
{
SetLen( 0 );
- SetNoPaint( true );
+ bNoPaint = true;
rInf.SetNumDone( false );
return true;
}
@@ -881,7 +881,7 @@ bool SwGrfNumPortion::Format( SwTextFormatInfo &rInf )
*/
void SwGrfNumPortion::Paint( const SwTextPaintInfo &rInf ) const
{
- if( DontPaint() )
+ if( bNoPaint )
return;
if ( IsHide() && rInf.GetParaPortion() && rInf.GetParaPortion()->GetNext() )
{
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 6fb6d2701011..740c2d93769a 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -92,8 +92,6 @@ public:
inline sal_Int32 GetNextOffset() const { return nNextOffset; }
inline void SetNextOffset( sal_Int32 nNew ) { nNextOffset = nNew; }
- inline sal_Int32 GetNextScriptChg() const { return nNextScriptChg; }
-
// Field cloner for SplitGlue
virtual SwFieldPortion *Clone( const OUString &rExpand ) const;
@@ -189,8 +187,6 @@ public:
inline bool IsAnimated() const { return bAnimated; }
inline void SetAnimated( bool bNew ) { bAnimated = bNew; }
- inline bool DontPaint() const { return bNoPaint; }
- inline void SetNoPaint( bool bNew ) { bNoPaint = bNew; }
inline void SetRelPos( SwTwips nNew ) { nYPos = nNew; }
inline void SetId( long nNew ) const
{ const_cast<SwGrfNumPortion*>(this)->nId = nNew; }
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index de1af65346d6..55f00ae83f7d 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -37,7 +37,6 @@ public:
bool PostFormat( SwTextFormatInfo &rInf );
inline bool IsFilled() const { return 0 != cFill; }
inline sal_uInt16 GetTabPos() const { return nTabPos; }
- inline bool IsAutoTabStop() const { return bAutoTabStop; }
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const override;
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index f831297ec784..7f3621304b58 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -934,7 +934,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf
bool SwDropPortion::Format( SwTextFormatInfo &rInf )
{
bool bFull = false;
- Fix( (sal_uInt16)rInf.X() );
+ nFix = (sal_uInt16)rInf.X();
SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() );
aLayoutModeModifier.SetAuto();
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 553376d18a0b..a188b3a11f56 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -384,11 +384,11 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
// tab stop position is outside the frame:
bool bAtParaEnd = rInf.GetIdx() + GetLen() == rInf.GetText().getLength();
if ( bFull && bTabCompat &&
- ( ( bTabOverflow && ( rInf.IsTabOverflow() || !IsAutoTabStop() ) ) || bAtParaEnd ) &&
+ ( ( bTabOverflow && ( rInf.IsTabOverflow() || !bAutoTabStop ) ) || bAtParaEnd ) &&
GetTabPos() >= rInf.GetTextFrame()->Frame().Width() )
{
bFull = false;
- if ( bTabOverflow && !IsAutoTabStop() )
+ if ( bTabOverflow && !bAutoTabStop )
rInf.SetTabOverflow( true );
}
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 02dea259920c..6d8c4f569bf2 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -522,7 +522,7 @@ bool WidowsAndOrphans::WouldFit( SwTextMargin &rLine, SwTwips &rMaxHeight, bool
// Widow lines would have wrong width.
// 2. Test formatting is only done up to the given space.
// we do not have any lines for widows at all.
- if( bTst || nLineCnt - nMinLines >= GetWidowsLines() )
+ if( bTst || nLineCnt - nMinLines >= nWidLines )
{
if( rMaxHeight >= nLineSum )
{
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 0e655985a6d2..1063f6313272 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -58,8 +58,6 @@ public:
WidowsAndOrphans( SwTextFrame *pFrame, const SwTwips nRst = 0,
bool bCheckKeep = true );
bool FindWidows( SwTextFrame *pFrame, SwTextMargin &rLine );
- sal_uInt16 GetWidowsLines() const
- { return nWidLines; }
sal_uInt16 GetOrphansLines() const
{ return nOrphLines; }
void ClrOrphLines(){ nOrphLines = 0; }