diff options
Diffstat (limited to 'sw/source/core/text/itratr.cxx')
-rw-r--r-- | sw/source/core/text/itratr.cxx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 1fc277d439ed..c2212c44e2a2 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,13 +47,13 @@ #include <frmfmt.hxx> #include <fmtfld.hxx> #include <doc.hxx> -#include <viewsh.hxx> // ViewShell +#include <viewsh.hxx> // ViewShell #include <rootfrm.hxx> #include <docary.hxx> #include <ndtxt.hxx> #include <dcontact.hxx> #include <fldbas.hxx> // SwField -#include <pam.hxx> // SwPosition (lcl_MinMaxNode) +#include <pam.hxx> // SwPosition (lcl_MinMaxNode) #include <itratr.hxx> #include <htmltbl.hxx> #include <swtable.hxx> @@ -68,7 +68,7 @@ using namespace ::com::sun::star::i18n; using namespace ::com::sun::star; /************************************************************************* - * SwAttrIter::Chg() + * SwAttrIter::Chg() *************************************************************************/ void SwAttrIter::Chg( SwTxtAttr *pHt ) @@ -82,7 +82,7 @@ void SwAttrIter::Chg( SwTxtAttr *pHt ) } /************************************************************************* - * SwAttrIter::Rst() + * SwAttrIter::Rst() *************************************************************************/ void SwAttrIter::Rst( SwTxtAttr *pHt ) @@ -97,7 +97,7 @@ void SwAttrIter::Rst( SwTxtAttr *pHt ) } /************************************************************************* - * virtual SwAttrIter::~SwAttrIter() + * virtual SwAttrIter::~SwAttrIter() *************************************************************************/ SwAttrIter::~SwAttrIter() @@ -107,7 +107,7 @@ SwAttrIter::~SwAttrIter() } /************************************************************************* - * SwAttrIter::GetAttr() + * SwAttrIter::GetAttr() * * Liefert fuer eine Position das Attribut, wenn das Attribut genau auf * der Position nPos liegt und kein EndIndex besitzt. @@ -127,7 +127,7 @@ SwTxtAttr *SwAttrIter::GetAttr( const xub_StrLen nPosition ) const } /************************************************************************* - * SwAttrIter::SeekAndChg() + * SwAttrIter::SeekAndChg() *************************************************************************/ sal_Bool SwAttrIter::SeekAndChgAttrIter( const xub_StrLen nNewPos, OutputDevice* pOut ) @@ -161,7 +161,7 @@ sal_Bool SwAttrIter::IsSymbol( const xub_StrLen nNewPos ) } /************************************************************************* - * SwAttrIter::SeekStartAndChg() + * SwAttrIter::SeekStartAndChg() *************************************************************************/ sal_Bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const sal_Bool bParaFont ) @@ -219,7 +219,7 @@ sal_Bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const sal_Bool } /************************************************************************* - * SwAttrIter::SeekFwd() + * SwAttrIter::SeekFwd() *************************************************************************/ // AMA: Neuer AttrIter Nov 94 @@ -239,7 +239,7 @@ void SwAttrIter::SeekFwd( const xub_StrLen nNewPos ) { // schliesse die TextAttribute, deren StartPos vor // oder an der alten nPos lag, die z.Z. geoeffnet sind. - if (*pTxtAttr->GetStart() <= nPos) Rst( pTxtAttr ); + if (*pTxtAttr->GetStart() <= nPos) Rst( pTxtAttr ); nEndIndex++; } } @@ -264,7 +264,7 @@ void SwAttrIter::SeekFwd( const xub_StrLen nNewPos ) } /************************************************************************* - * SwAttrIter::Seek() + * SwAttrIter::Seek() *************************************************************************/ sal_Bool SwAttrIter::Seek( const xub_StrLen nNewPos ) @@ -313,7 +313,7 @@ sal_Bool SwAttrIter::Seek( const xub_StrLen nNewPos ) } /************************************************************************* - * SwAttrIter::GetNextAttr() + * SwAttrIter::GetNextAttr() *************************************************************************/ xub_StrLen SwAttrIter::GetNextAttr( ) const @@ -339,7 +339,7 @@ xub_StrLen SwAttrIter::GetNextAttr( ) const nNext=p; else nNext=p+1; - } + } if( pRedln ) return pRedln->GetNextRedln( nNext ); return nNext; @@ -347,7 +347,7 @@ xub_StrLen SwAttrIter::GetNextAttr( ) const #if OSL_DEBUG_LEVEL > 1 /************************************************************************* - * SwAttrIter::Dump() + * SwAttrIter::Dump() *************************************************************************/ void SwAttrIter::Dump( SvStream &/*rOS*/ ) const @@ -445,12 +445,12 @@ class SwMinMaxNodeArgs { public: ULONG nMaxWidth; // Summe aller Rahmenbreite - long nMinWidth; // Breitester Rahmen + long nMinWidth; // Breitester Rahmen long nLeftRest; // noch nicht von Rahmen ueberdeckter Platz im l. Rand long nRightRest; // noch nicht von Rahmen ueberdeckter Platz im r. Rand - long nLeftDiff; // Min/Max-Differenz des Rahmens im linken Rand + long nLeftDiff; // Min/Max-Differenz des Rahmens im linken Rand long nRightDiff; // Min/Max-Differenz des Rahmens im rechten Rand - ULONG nIndx; // Indexnummer des Nodes + ULONG nIndx; // Indexnummer des Nodes void Minimum( long nNew ) { if( nNew > nMinWidth ) nMinWidth = nNew; } }; @@ -772,7 +772,7 @@ void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, case RES_TXTATR_FTN : { const XubString aTxt = pHint->GetFtn().GetNumStr(); - if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0, + if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0, aTxt.Len() ) ) nAdd = 20; break; @@ -781,7 +781,7 @@ void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, { SwField *pFld = (SwField*)pHint->GetFld().GetFld(); const String aTxt = pFld->GetCntnt( FALSE ); - if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0, + if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0, aTxt.Len() ) ) nAdd = 20; break; @@ -817,7 +817,7 @@ void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, } /************************************************************************* - * SwTxtNode::GetScalingOfSelectedText() + * SwTxtNode::GetScalingOfSelectedText() * * Calculates the width of the text part specified by nStt and nEnd, * the height of the line containing nStt is devided by this width, @@ -828,7 +828,7 @@ void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, * changing this method very likely requires changing of "GetMinMaxSize" *************************************************************************/ -USHORT SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) +USHORT SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const { ViewShell* pSh = NULL; @@ -1012,7 +1012,7 @@ USHORT SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) SwTxtFrm* pTmpFrm = ( SwTxtFrm* )pLastFrm; if ( pTmpFrm->GetOfst() <= nStt && ( !pTmpFrm->GetFollow() || - pTmpFrm->GetFollow()->GetOfst() > nStt ) ) + pTmpFrm->GetFollow()->GetOfst() > nStt ) ) { pFrm = pTmpFrm; break; |