diff options
Diffstat (limited to 'sw/source/core/text/txttab.cxx')
| -rw-r--r-- | sw/source/core/text/txttab.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index a86589b64851..4a715ba3b27b 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -76,7 +76,7 @@ const SvxTabStop *SwLineInfo::GetTabStop( const SwTwips nSearchPos, * SwLineInfo::NumberOfTabStops() *************************************************************************/ -USHORT SwLineInfo::NumberOfTabStops() const +sal_uInt16 SwLineInfo::NumberOfTabStops() const { return pRuler->Count(); } @@ -377,14 +377,14 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) ASSERT( rInf.X() <= GetTabPos(), "SwTabPortion::PreFormat: rush hour" ); // Hier lassen wir uns nieder... - Fix( static_cast<USHORT>(rInf.X()) ); + Fix( static_cast<sal_uInt16>(rInf.X()) ); const bool bTabCompat = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT); // Die Mindestbreite eines Tabs ist immer mindestens ein Blank // --> FME 2004-11-25 #i37686# In compatibility mode, the minimum width // should be 1, even for non-left tab stops. - USHORT nMinimumTabWidth = 1; + sal_uInt16 nMinimumTabWidth = 1; // <-- if ( !bTabCompat ) { @@ -414,7 +414,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) rInf.Width() <= rInf.X() + PrtWidth(); // #95477# Rotated tab stops get the width of one blank - const USHORT nDir = rInf.GetFont()->GetOrientation( rInf.GetTxtFrm()->IsVertical() ); + const sal_uInt16 nDir = rInf.GetFont()->GetOrientation( rInf.GetTxtFrm()->IsVertical() ); if( ! bFull && 0 == nDir ) { @@ -433,7 +433,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) } case POR_TABLEFT: { - PrtWidth( static_cast<USHORT>(GetTabPos() - rInf.X()) ); + PrtWidth( static_cast<sal_uInt16>(GetTabPos() - rInf.X()) ); bFull = rInf.Width() <= rInf.X() + PrtWidth(); // In tabulator compatibility mode, we reset the bFull flag @@ -460,7 +460,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) !rInf.GetFly() ) // <-- { - PrtWidth( static_cast<USHORT>(rInf.Width() - rInf.X()) ); + PrtWidth( static_cast<sal_uInt16>(rInf.Width() - rInf.X()) ); SetFixWidth( PrtWidth() ); } else |