Kaydet (Commit) fe436dfe authored tarafından Philipp Weissenbacher's avatar Philipp Weissenbacher

Remove visual navigator comments

Change-Id: I8e19021df0a904df0877aa58adc83571c5991b9b
üst dc4b91d3
...@@ -73,10 +73,6 @@ public: ...@@ -73,10 +73,6 @@ public:
}; };
MSHORT FormatLevel::nLevel = 0; MSHORT FormatLevel::nLevel = 0;
/*************************************************************************
* ValidateTxt/Frm()
*************************************************************************/
void ValidateTxt( SwFrm *pFrm ) // Friend of frame void ValidateTxt( SwFrm *pFrm ) // Friend of frame
{ {
if ( ( ! pFrm->IsVertical() && if ( ( ! pFrm->IsVertical() &&
...@@ -122,11 +118,10 @@ void SwTxtFrm::ValidateFrm() ...@@ -122,11 +118,10 @@ void SwTxtFrm::ValidateFrm()
/************************************************************************* /*************************************************************************
* ValidateBodyFrm() * ValidateBodyFrm()
*************************************************************************/ * After a RemoveFtn the BodyFrm and all Frms contained within it, need to be
* recalculated, so that the DeadLine is right.
// After a RemoveFtn the BodyFrm and all Frms contained within it, need to be * First we search outwards, on the way back we calculate everything.
// recalculated, so that the DeadLine is right. *************************************************************************/
// First we search outwards, on the way back we calculate everything.
void _ValidateBodyFrm( SwFrm *pFrm ) void _ValidateBodyFrm( SwFrm *pFrm )
{ {
...@@ -159,10 +154,6 @@ void SwTxtFrm::ValidateBodyFrm() ...@@ -159,10 +154,6 @@ void SwTxtFrm::ValidateBodyFrm()
UNDO_SWAP( this ) UNDO_SWAP( this )
} }
/*************************************************************************
* SwTxtFrm::FindBodyFrm()
*************************************************************************/
sal_Bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const sal_Bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const
{ {
SWAP_IF_NOT_SWAPPED( this ) SWAP_IF_NOT_SWAPPED( this )
...@@ -191,10 +182,6 @@ sal_Bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const ...@@ -191,10 +182,6 @@ sal_Bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const
return sal_False; return sal_False;
} }
/*************************************************************************
* SwTxtFrm::FindBodyFrm()
*************************************************************************/
const SwBodyFrm *SwTxtFrm::FindBodyFrm() const const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
{ {
if ( IsInDocBody() ) if ( IsInDocBody() )
...@@ -207,10 +194,6 @@ const SwBodyFrm *SwTxtFrm::FindBodyFrm() const ...@@ -207,10 +194,6 @@ const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
return 0; return 0;
} }
/*************************************************************************
* SwTxtFrm::CalcFollow()
*************************************************************************/
sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst ) sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
{ {
SWAP_IF_SWAPPED( this ) SWAP_IF_SWAPPED( this )
...@@ -375,10 +358,6 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst ) ...@@ -375,10 +358,6 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
return sal_False; return sal_False;
} }
/*************************************************************************
* SwTxtFrm::AdjustFrm()
*************************************************************************/
void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit ) void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
{ {
if( IsUndersized() ) if( IsUndersized() )
...@@ -535,15 +514,13 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit ) ...@@ -535,15 +514,13 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
/************************************************************************* /*************************************************************************
* SwTxtFrm::AdjustFollow() * SwTxtFrm::AdjustFollow()
*************************************************************************/ * AdjustFollow expects the following situtation:
/* AdjustFollow expects the following situtation:
* The SwTxtIter points to the lower end of the Master, the Offset is set in * The SwTxtIter points to the lower end of the Master, the Offset is set in
* the Follow. * the Follow.
* nOffset holds the Offset in the text string, from which the Master closes * nOffset holds the Offset in the text string, from which the Master closes
* and the Follow starts. * and the Follow starts.
* If it's 0, the FollowFrame is deleted. * If it's 0, the FollowFrame is deleted.
*/ *************************************************************************/
void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine, void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
const xub_StrLen nOffset, const xub_StrLen nEnd, const xub_StrLen nOffset, const xub_StrLen nEnd,
...@@ -601,10 +578,6 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine, ...@@ -601,10 +578,6 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
} }
} }
/*************************************************************************
* SwTxtFrm::JoinFrm()
*************************************************************************/
SwCntntFrm *SwTxtFrm::JoinFrm() SwCntntFrm *SwTxtFrm::JoinFrm()
{ {
OSL_ENSURE( GetFollow(), "+SwTxtFrm::JoinFrm: no follow" ); OSL_ENSURE( GetFollow(), "+SwTxtFrm::JoinFrm: no follow" );
...@@ -676,10 +649,6 @@ SwCntntFrm *SwTxtFrm::JoinFrm() ...@@ -676,10 +649,6 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
return pNxt; return pNxt;
} }
/*************************************************************************
* SwTxtFrm::SplitFrm()
*************************************************************************/
SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos ) SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
{ {
SWAP_IF_SWAPPED( this ) SWAP_IF_SWAPPED( this )
...@@ -759,11 +728,6 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos ) ...@@ -759,11 +728,6 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
return pNew; return pNew;
} }
/*************************************************************************
* virtual SwTxtFrm::SetOfst()
*************************************************************************/
void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst ) void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst )
{ {
// We do not need to invalidate out Follow. // We do not need to invalidate out Follow.
...@@ -781,10 +745,6 @@ void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst ) ...@@ -781,10 +745,6 @@ void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst )
InvalidateSize(); InvalidateSize();
} }
/*************************************************************************
* SwTxtFrm::CalcPreps
*************************************************************************/
sal_Bool SwTxtFrm::CalcPreps() sal_Bool SwTxtFrm::CalcPreps()
{ {
OSL_ENSURE( ! IsVertical() || ! IsSwapped(), "SwTxtFrm::CalcPreps with swapped frame" ); OSL_ENSURE( ! IsVertical() || ! IsSwapped(), "SwTxtFrm::CalcPreps with swapped frame" );
...@@ -965,12 +925,11 @@ sal_Bool SwTxtFrm::CalcPreps() ...@@ -965,12 +925,11 @@ sal_Bool SwTxtFrm::CalcPreps()
return bRet; return bRet;
} }
/************************************************************************* /*************************************************************************
* SwTxtFrm::FormatAdjust() * SwTxtFrm::FormatAdjust()
* We rewire the footnotes and the character bound objects
*************************************************************************/ *************************************************************************/
// We rewire the footnotes and the character bound objects
#define CHG_OFFSET( pFrm, nNew )\ #define CHG_OFFSET( pFrm, nNew )\
{\ {\
if( pFrm->GetOfst() < nNew )\ if( pFrm->GetOfst() < nNew )\
...@@ -1144,10 +1103,9 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine, ...@@ -1144,10 +1103,9 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
/************************************************************************* /*************************************************************************
* SwTxtFrm::FormatLine() * SwTxtFrm::FormatLine()
*************************************************************************/ * bPrev is set whether Reformat.Start() was called because of Prev().
* Else, wo don't know whether we can limit the repaint or not.
// bPrev is set whether Reformat.Start() was called because of Prev(). *************************************************************************/
// Else, wo don't know whether we can limit the repaint or not.
sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev ) sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
{ {
...@@ -1285,10 +1243,6 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev ) ...@@ -1285,10 +1243,6 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
return 0 != *(pPara->GetDelta()); return 0 != *(pPara->GetDelta());
} }
/*************************************************************************
* SwTxtFrm::_Format()
*************************************************************************/
void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf, void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
const sal_Bool bAdjust ) const sal_Bool bAdjust )
{ {
...@@ -1611,10 +1565,6 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf, ...@@ -1611,10 +1565,6 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
} }
} }
/*************************************************************************
* SwTxtFrm::Format()
*************************************************************************/
void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
{ {
OSL_ENSURE( ! IsVertical() || IsSwapped(), OSL_ENSURE( ! IsVertical() || IsSwapped(),
...@@ -1677,11 +1627,6 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) ...@@ -1677,11 +1627,6 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
} }
} }
/*************************************************************************
* SwTxtFrm::_Format()
*************************************************************************/
void SwTxtFrm::_Format( SwParaPortion *pPara ) void SwTxtFrm::_Format( SwParaPortion *pPara )
{ {
const xub_StrLen nStrLen = GetTxt().Len(); const xub_StrLen nStrLen = GetTxt().Len();
...@@ -1743,12 +1688,9 @@ void SwTxtFrm::_Format( SwParaPortion *pPara ) ...@@ -1743,12 +1688,9 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
/************************************************************************* /*************************************************************************
* SwTxtFrm::Format() * SwTxtFrm::Format()
*************************************************************************/
/*
* We calculate the text frame's size and send a notification. * We calculate the text frame's size and send a notification.
* Shrink() or Grow() to adjust the frame's size to the changed required space. * Shrink() or Grow() to adjust the frame's size to the changed required space.
*/ *************************************************************************/
void SwTxtFrm::Format( const SwBorderAttrs * ) void SwTxtFrm::Format( const SwBorderAttrs * )
{ {
......
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
#include <IDocumentStylePoolAccess.hxx> #include <IDocumentStylePoolAccess.hxx>
#include <IDocumentLineNumberAccess.hxx> #include <IDocumentLineNumberAccess.hxx>
//
// variable moved to class <numfunc:GetDefBulletConfig> // variable moved to class <numfunc:GetDefBulletConfig>
//extern const sal_Char sBulletFntName[]; //extern const sal_Char sBulletFntName[];
namespace numfunc namespace numfunc
...@@ -194,10 +193,6 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh, ...@@ -194,10 +193,6 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh,
} }
} }
/*************************************************************************
* SwExtraPainter::PaintExtra()
**************************************************************************/
void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, sal_Bool bRed ) void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, sal_Bool bRed )
{ {
//Zeilennummer ist staerker als der Teiler //Zeilennummer ist staerker als der Teiler
...@@ -421,10 +416,6 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const ...@@ -421,10 +416,6 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
} }
} }
/*************************************************************************
* SwTxtFrm::Paint()
*************************************************************************/
SwRect SwTxtFrm::Paint() SwRect SwTxtFrm::Paint()
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
...@@ -468,10 +459,6 @@ SwRect SwTxtFrm::Paint() ...@@ -468,10 +459,6 @@ SwRect SwTxtFrm::Paint()
return aRet; return aRet;
} }
/*************************************************************************
* SwTxtFrm::Paint()
*************************************************************************/
sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const
{ {
ViewShell *pSh = getRootFrm()->GetCurrShell(); ViewShell *pSh = getRootFrm()->GetCurrShell();
...@@ -592,10 +579,6 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const ...@@ -592,10 +579,6 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const
return sal_False; return sal_False;
} }
/*************************************************************************
* SwTxtFrm::Paint()
*************************************************************************/
void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
{ {
ResetRepaint(); ResetRepaint();
......
...@@ -95,7 +95,6 @@ using namespace ::com::sun::star::beans; ...@@ -95,7 +95,6 @@ using namespace ::com::sun::star::beans;
#define DRAW_SPECIAL_OPTIONS_CENTER 1 #define DRAW_SPECIAL_OPTIONS_CENTER 1
#define DRAW_SPECIAL_OPTIONS_ROTATE 2 #define DRAW_SPECIAL_OPTIONS_ROTATE 2
//
// variable moved to class <numfunc:GetDefBulletConfig> // variable moved to class <numfunc:GetDefBulletConfig>
//extern const sal_Char sBulletFntName[]; //extern const sal_Char sBulletFntName[];
namespace numfunc namespace numfunc
...@@ -108,10 +107,6 @@ namespace numfunc ...@@ -108,10 +107,6 @@ namespace numfunc
sal_Bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); } sal_Bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
#endif #endif
/*************************************************************************
* SwLineInfo::SwLineInfo()
*************************************************************************/
SwLineInfo::SwLineInfo() SwLineInfo::SwLineInfo()
: pRuler( 0 ), : pRuler( 0 ),
pSpace( 0 ), pSpace( 0 ),
...@@ -171,10 +166,6 @@ void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet, ...@@ -171,10 +166,6 @@ void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
nDefTabStop = MSHRT_MAX; nDefTabStop = MSHRT_MAX;
} }
/*************************************************************************
* SwTxtInfo::CtorInitTxtInfo()
*************************************************************************/
void SwTxtInfo::CtorInitTxtInfo( SwTxtFrm *pFrm ) void SwTxtInfo::CtorInitTxtInfo( SwTxtFrm *pFrm )
{ {
pPara = pFrm->GetPara(); pPara = pFrm->GetPara();
...@@ -194,9 +185,6 @@ SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf ) ...@@ -194,9 +185,6 @@ SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf )
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
/*************************************************************************
* ChkOutDev()
*************************************************************************/
void ChkOutDev( const SwTxtSizeInfo &rInf ) void ChkOutDev( const SwTxtSizeInfo &rInf )
{ {
...@@ -365,10 +353,6 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const XubString &rTxt, ...@@ -365,10 +353,6 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const XubString &rTxt,
SetLen( GetMinLen( *this ) ); SetLen( GetMinLen( *this ) );
} }
/*************************************************************************
* SwTxtSizeInfo::SelectFont()
*************************************************************************/
void SwTxtSizeInfo::SelectFont() void SwTxtSizeInfo::SelectFont()
{ {
// 8731: Der Weg muss ueber ChgPhysFnt gehen, sonst geraet // 8731: Der Weg muss ueber ChgPhysFnt gehen, sonst geraet
...@@ -379,10 +363,6 @@ void SwTxtSizeInfo::SelectFont() ...@@ -379,10 +363,6 @@ void SwTxtSizeInfo::SelectFont()
GetFont()->ChgPhysFnt( pVsh, *GetOut() ); GetFont()->ChgPhysFnt( pVsh, *GetOut() );
} }
/*************************************************************************
* SwTxtSizeInfo::NoteAnimation()
*************************************************************************/
void SwTxtSizeInfo::NoteAnimation() const void SwTxtSizeInfo::NoteAnimation() const
{ {
if( OnWin() ) if( OnWin() )
...@@ -392,10 +372,6 @@ void SwTxtSizeInfo::NoteAnimation() const ...@@ -392,10 +372,6 @@ void SwTxtSizeInfo::NoteAnimation() const
"SwTxtSizeInfo::NoteAnimation() changed pOut" ); "SwTxtSizeInfo::NoteAnimation() changed pOut" );
} }
/*************************************************************************
* SwTxtSizeInfo::GetTxtSize()
*************************************************************************/
SwPosSize SwTxtSizeInfo::GetTxtSize( OutputDevice* pOutDev, SwPosSize SwTxtSizeInfo::GetTxtSize( OutputDevice* pOutDev,
const SwScriptInfo* pSI, const SwScriptInfo* pSI,
const XubString& rTxt, const XubString& rTxt,
...@@ -412,10 +388,6 @@ SwPosSize SwTxtSizeInfo::GetTxtSize( OutputDevice* pOutDev, ...@@ -412,10 +388,6 @@ SwPosSize SwTxtSizeInfo::GetTxtSize( OutputDevice* pOutDev,
return aSize; return aSize;
} }
/*************************************************************************
* SwTxtSizeInfo::GetTxtSize()
*************************************************************************/
SwPosSize SwTxtSizeInfo::GetTxtSize() const SwPosSize SwTxtSizeInfo::GetTxtSize() const
{ {
const SwScriptInfo& rSI = const SwScriptInfo& rSI =
...@@ -437,10 +409,6 @@ SwPosSize SwTxtSizeInfo::GetTxtSize() const ...@@ -437,10 +409,6 @@ SwPosSize SwTxtSizeInfo::GetTxtSize() const
return pFnt->_GetTxtSize( aDrawInf ); return pFnt->_GetTxtSize( aDrawInf );
} }
/*************************************************************************
* SwTxtSizeInfo::GetTxtSize()
*************************************************************************/
void SwTxtSizeInfo::GetTxtSize( const SwScriptInfo* pSI, const xub_StrLen nIndex, void SwTxtSizeInfo::GetTxtSize( const SwScriptInfo* pSI, const xub_StrLen nIndex,
const xub_StrLen nLength, const sal_uInt16 nComp, const xub_StrLen nLength, const sal_uInt16 nComp,
sal_uInt16& nMinSize, sal_uInt16& nMaxSizeDiff ) const sal_uInt16& nMinSize, sal_uInt16& nMaxSizeDiff ) const
...@@ -455,10 +423,6 @@ void SwTxtSizeInfo::GetTxtSize( const SwScriptInfo* pSI, const xub_StrLen nIndex ...@@ -455,10 +423,6 @@ void SwTxtSizeInfo::GetTxtSize( const SwScriptInfo* pSI, const xub_StrLen nIndex
nMinSize = aSize.Width(); nMinSize = aSize.Width();
} }
/*************************************************************************
* SwTxtSizeInfo::GetTxtBreak()
*************************************************************************/
xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth, xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
const xub_StrLen nMaxLen, const xub_StrLen nMaxLen,
const sal_uInt16 nComp ) const const sal_uInt16 nComp ) const
...@@ -478,10 +442,6 @@ xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth, ...@@ -478,10 +442,6 @@ xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
return pFnt->GetTxtBreak( aDrawInf, nLineWidth ); return pFnt->GetTxtBreak( aDrawInf, nLineWidth );
} }
/*************************************************************************
* SwTxtSizeInfo::GetTxtBreak()
*************************************************************************/
xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth, xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
const xub_StrLen nMaxLen, const xub_StrLen nMaxLen,
const sal_uInt16 nComp, const sal_uInt16 nComp,
...@@ -502,10 +462,6 @@ xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth, ...@@ -502,10 +462,6 @@ xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
return pFnt->GetTxtBreak( aDrawInf, nLineWidth ); return pFnt->GetTxtBreak( aDrawInf, nLineWidth );
} }
/*************************************************************************
* SwTxtPaintInfo::CtorInitTxtPaintInfo()
*************************************************************************/
void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPaint ) void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPaint )
{ {
CtorInitTxtSizeInfo( pFrame ); CtorInitTxtSizeInfo( pFrame );
...@@ -722,10 +678,6 @@ void SwTxtPaintInfo::_DrawText( const XubString &rText, const SwLinePortion &rPo ...@@ -722,10 +678,6 @@ void SwTxtPaintInfo::_DrawText( const XubString &rText, const SwLinePortion &rPo
} }
} }
/*************************************************************************
* SwTxtPaintInfo::CalcRect()
*************************************************************************/
void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor, void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
SwRect* pRect, SwRect* pIntersect ) const SwRect* pRect, SwRect* pIntersect ) const
{ {
...@@ -929,10 +881,6 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP ...@@ -929,10 +881,6 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
((SwTxtPaintInfo&)rInf).SetPos( aOldPos ); ((SwTxtPaintInfo&)rInf).SetPos( aOldPos );
} }
/*************************************************************************
* SwTxtPaintInfo::DrawRect()
*************************************************************************/
void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic, void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic,
sal_Bool bRetouche ) const sal_Bool bRetouche ) const
{ {
...@@ -951,10 +899,6 @@ void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic, ...@@ -951,10 +899,6 @@ void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic,
} }
} }
/*************************************************************************
* SwTxtPaintInfo::DrawTab()
*************************************************************************/
void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const
{ {
if( OnWin() ) if( OnWin() )
...@@ -973,10 +917,6 @@ void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const ...@@ -973,10 +917,6 @@ void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const
} }
} }
/*************************************************************************
* SwTxtPaintInfo::DrawLineBreak()
*************************************************************************/
void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const
{ {
if( OnWin() ) if( OnWin() )
...@@ -999,11 +939,6 @@ void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const ...@@ -999,11 +939,6 @@ void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const
} }
} }
/*************************************************************************
* SwTxtPaintInfo::DrawRedArrow()
*************************************************************************/
void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
{ {
Size aSize( SPECIAL_FONT_HEIGHT, SPECIAL_FONT_HEIGHT ); Size aSize( SPECIAL_FONT_HEIGHT, SPECIAL_FONT_HEIGHT );
...@@ -1038,11 +973,6 @@ void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const ...@@ -1038,11 +973,6 @@ void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
} }
} }
/*************************************************************************
* SwTxtPaintInfo::DrawPostIts()
*************************************************************************/
void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, sal_Bool bScript ) const void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, sal_Bool bScript ) const
{ {
if( OnWin() && pOpt->IsPostIts() ) if( OnWin() && pOpt->IsPostIts() )
...@@ -1119,9 +1049,7 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked) ...@@ -1119,9 +1049,7 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked)
pOut->Pop(); pOut->Pop();
} }
} }
/*************************************************************************
* SwTxtPaintInfo::DrawBackGround()
*************************************************************************/
void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
{ {
OSL_ENSURE( OnWin(), "SwTxtPaintInfo::DrawBackground: printer polution ?" ); OSL_ENSURE( OnWin(), "SwTxtPaintInfo::DrawBackground: printer polution ?" );
...@@ -1216,10 +1144,6 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const ...@@ -1216,10 +1144,6 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
} }
} }
/*************************************************************************
* SwTxtPaintInfo::DrawViewOpt()
*************************************************************************/
void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor, void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
const MSHORT nWhich ) const const MSHORT nWhich ) const
{ {
...@@ -1259,10 +1183,6 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor, ...@@ -1259,10 +1183,6 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
} }
} }
/*************************************************************************
* SwTxtPaintInfo::_NotifyURL()
*************************************************************************/
void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const
{ {
OSL_ENSURE( pNoteURL, "NotifyURL: pNoteURL gone with the wind!" ); OSL_ENSURE( pNoteURL, "NotifyURL: pNoteURL gone with the wind!" );
...@@ -1284,10 +1204,6 @@ void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const ...@@ -1284,10 +1204,6 @@ void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const
} }
} }
/*************************************************************************
* lcl_InitHyphValues()
*************************************************************************/
static void lcl_InitHyphValues( PropertyValues &rVals, static void lcl_InitHyphValues( PropertyValues &rVals,
sal_Int16 nMinLeading, sal_Int16 nMinTrailing ) sal_Int16 nMinLeading, sal_Int16 nMinTrailing )
{ {
...@@ -1317,10 +1233,6 @@ static void lcl_InitHyphValues( PropertyValues &rVals, ...@@ -1317,10 +1233,6 @@ static void lcl_InitHyphValues( PropertyValues &rVals,
} }
} }
/*************************************************************************
* SwTxtFormatInfo::GetHyphValues()
*************************************************************************/
const PropertyValues & SwTxtFormatInfo::GetHyphValues() const const PropertyValues & SwTxtFormatInfo::GetHyphValues() const
{ {
OSL_ENSURE( 2 == aHyphVals.getLength(), OSL_ENSURE( 2 == aHyphVals.getLength(),
...@@ -1328,10 +1240,6 @@ const PropertyValues & SwTxtFormatInfo::GetHyphValues() const ...@@ -1328,10 +1240,6 @@ const PropertyValues & SwTxtFormatInfo::GetHyphValues() const
return aHyphVals; return aHyphVals;
} }
/*************************************************************************
* SwTxtFormatInfo::InitHyph()
*************************************************************************/
sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen ) sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
{ {
const SwAttrSet& rAttrSet = GetTxtFrm()->GetTxtNode()->GetSwAttrSet(); const SwAttrSet& rAttrSet = GetTxtFrm()->GetTxtNode()->GetSwAttrSet();
...@@ -1353,10 +1261,6 @@ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen ) ...@@ -1353,10 +1261,6 @@ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
return bAuto; return bAuto;
} }
/*************************************************************************
* SwTxtFormatInfo::CtorInitTxtFormatInfo()
*************************************************************************/
void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool bNewInterHyph, void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool bNewInterHyph,
const sal_Bool bNewQuick, const sal_Bool bTst ) const sal_Bool bNewQuick, const sal_Bool bTst )
{ {
...@@ -1390,14 +1294,13 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool b ...@@ -1390,14 +1294,13 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool b
/************************************************************************* /*************************************************************************
* SwTxtFormatInfo::IsHyphenate() * SwTxtFormatInfo::IsHyphenate()
* Trennen oder nicht trennen, das ist hier die Frage:
* - in keinem Fall trennen, wenn der Hyphenator ERROR zurueckliefert,
* oder wenn als Sprache NOLANGUAGE eingestellt ist.
* - ansonsten immer trennen, wenn interaktive Trennung vorliegt
* - wenn keine interakt. Trennung, dann nur trennen, wenn im ParaFmt
* automatische Trennung eingestellt ist.
*************************************************************************/ *************************************************************************/
// Trennen oder nicht trennen, das ist hier die Frage:
// - in keinem Fall trennen, wenn der Hyphenator ERROR zurueckliefert,
// oder wenn als Sprache NOLANGUAGE eingestellt ist.
// - ansonsten immer trennen, wenn interaktive Trennung vorliegt
// - wenn keine interakt. Trennung, dann nur trennen, wenn im ParaFmt
// automatische Trennung eingestellt ist.
sal_Bool SwTxtFormatInfo::IsHyphenate() const sal_Bool SwTxtFormatInfo::IsHyphenate() const
{ {
if( !bInterHyph && !bAutoHyph ) if( !bInterHyph && !bAutoHyph )
...@@ -1418,9 +1321,9 @@ sal_Bool SwTxtFormatInfo::IsHyphenate() const ...@@ -1418,9 +1321,9 @@ sal_Bool SwTxtFormatInfo::IsHyphenate() const
/************************************************************************* /*************************************************************************
* SwTxtFormatInfo::GetDropFmt() * SwTxtFormatInfo::GetDropFmt()
*************************************************************************/ * Dropcaps vom SwTxtFormatter::CTOR gerufen.
*************************************************************************/
// Dropcaps vom SwTxtFormatter::CTOR gerufen.
const SwFmtDrop *SwTxtFormatInfo::GetDropFmt() const const SwFmtDrop *SwTxtFormatInfo::GetDropFmt() const
{ {
const SwFmtDrop *pDrop = &GetTxtFrm()->GetTxtNode()->GetSwAttrSet().GetDrop(); const SwFmtDrop *pDrop = &GetTxtFrm()->GetTxtNode()->GetSwAttrSet().GetDrop();
...@@ -1430,10 +1333,6 @@ const SwFmtDrop *SwTxtFormatInfo::GetDropFmt() const ...@@ -1430,10 +1333,6 @@ const SwFmtDrop *SwTxtFormatInfo::GetDropFmt() const
return pDrop; return pDrop;
} }
/*************************************************************************
* SwTxtFormatInfo::Init()
*************************************************************************/
void SwTxtFormatInfo::Init() void SwTxtFormatInfo::Init()
{ {
// Nicht initialisieren: pRest, nLeft, nRight, nFirst, nRealWidth // Nicht initialisieren: pRest, nLeft, nRight, nFirst, nRealWidth
...@@ -1535,11 +1434,6 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf, ...@@ -1535,11 +1434,6 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
SetMulti( sal_True ); SetMulti( sal_True );
SetFirstMulti( rInf.IsFirstMulti() ); SetFirstMulti( rInf.IsFirstMulti() );
} }
/*************************************************************************
* SwTxtFormatInfo::_CheckFtnPortion()
*************************************************************************/
sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr ) sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
{ {
KSHORT nHeight = pCurr->GetRealHeight(); KSHORT nHeight = pCurr->GetRealHeight();
...@@ -1559,12 +1453,6 @@ sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr ) ...@@ -1559,12 +1453,6 @@ sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
return bRet; return bRet;
} }
/*************************************************************************
* SwTxtFormatInfo::ScanPortionEnd()
*************************************************************************/
xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart, xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart,
const xub_StrLen nEnd ) const xub_StrLen nEnd )
{ {
...@@ -1689,10 +1577,6 @@ sal_Bool SwTxtFormatInfo::LastKernPortion() ...@@ -1689,10 +1577,6 @@ sal_Bool SwTxtFormatInfo::LastKernPortion()
return sal_False; return sal_False;
} }
/*************************************************************************
* class SwTxtSlot
*************************************************************************/
SwTxtSlot::SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor, SwTxtSlot::SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor,
bool bTxtLen, bool bExgLists, const sal_Char *pCh ) bool bTxtLen, bool bExgLists, const sal_Char *pCh )
: pOldTxt( 0 ), : pOldTxt( 0 ),
...@@ -1758,10 +1642,6 @@ SwTxtSlot::SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor, ...@@ -1758,10 +1642,6 @@ SwTxtSlot::SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor,
} }
} }
/*************************************************************************
* SwTxtSlot::~SwTxtSlot()
*************************************************************************/
SwTxtSlot::~SwTxtSlot() SwTxtSlot::~SwTxtSlot()
{ {
if( bOn ) if( bOn )
...@@ -1780,10 +1660,6 @@ SwTxtSlot::~SwTxtSlot() ...@@ -1780,10 +1660,6 @@ SwTxtSlot::~SwTxtSlot()
} }
} }
/*************************************************************************
* SwFontSave::SwFontSave()
*************************************************************************/
SwFontSave::SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pNew, SwFontSave::SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pNew,
SwAttrIter* pItr ) SwAttrIter* pItr )
: pFnt( pNew ? ((SwTxtSizeInfo&)rInf).GetFont() : 0 ) : pFnt( pNew ? ((SwTxtSizeInfo&)rInf).GetFont() : 0 )
...@@ -1820,10 +1696,6 @@ SwFontSave::SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pNew, ...@@ -1820,10 +1696,6 @@ SwFontSave::SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pNew,
} }
} }
/*************************************************************************
* SwFontSave::~SwFontSave()
*************************************************************************/
SwFontSave::~SwFontSave() SwFontSave::~SwFontSave()
{ {
if( pFnt ) if( pFnt )
...@@ -1839,10 +1711,6 @@ SwFontSave::~SwFontSave() ...@@ -1839,10 +1711,6 @@ SwFontSave::~SwFontSave()
} }
} }
/*************************************************************************
* SwDefFontSave::SwDefFontSave()
*************************************************************************/
SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf ) SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf )
: pFnt( ((SwTxtSizeInfo&)rInf).GetFont() ) : pFnt( ((SwTxtSizeInfo&)rInf).GetFont() )
{ {
...@@ -1882,10 +1750,6 @@ SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf ) ...@@ -1882,10 +1750,6 @@ SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf )
} }
} }
/*************************************************************************
* SwDefFontSave::~SwDefFontSave()
*************************************************************************/
SwDefFontSave::~SwDefFontSave() SwDefFontSave::~SwDefFontSave()
{ {
if( pFnt ) if( pFnt )
...@@ -1897,10 +1761,6 @@ SwDefFontSave::~SwDefFontSave() ...@@ -1897,10 +1761,6 @@ SwDefFontSave::~SwDefFontSave()
} }
} }
/*************************************************************************
* SwTxtFormatInfo::ChgHyph()
*************************************************************************/
sal_Bool SwTxtFormatInfo::ChgHyph( const sal_Bool bNew ) sal_Bool SwTxtFormatInfo::ChgHyph( const sal_Bool bNew )
{ {
const sal_Bool bOld = bAutoHyph; const sal_Bool bOld = bAutoHyph;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment