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() &&
...@@ -121,12 +117,11 @@ void SwTxtFrm::ValidateFrm() ...@@ -121,12 +117,11 @@ 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 )\
...@@ -1143,11 +1102,10 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine, ...@@ -1143,11 +1102,10 @@ 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();
...@@ -1742,13 +1687,10 @@ void SwTxtFrm::_Format( SwParaPortion *pPara ) ...@@ -1742,13 +1687,10 @@ 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 * )
{ {
...@@ -1913,7 +1855,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) ...@@ -1913,7 +1855,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
} }
/************************************************************************* /*************************************************************************
* SwTxtFrm::FormatQuick() * SwTxtFrm::FormatQuick()
* *
* bForceQuickFormat is set if GetFormatted() has been called during the * bForceQuickFormat is set if GetFormatted() has been called during the
* painting process. Actually I cannot imagine a situation which requires * painting process. Actually I cannot imagine a situation which requires
......
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
#include <viewimp.hxx> // SwViewImp #include <viewimp.hxx> // SwViewImp
#include <viewopt.hxx> // SwViewOption #include <viewopt.hxx> // SwViewOption
#include <frmtool.hxx> // DrawGraphic #include <frmtool.hxx> // DrawGraphic
#include <txtfrm.hxx> // SwTxtFrm #include <txtfrm.hxx> // SwTxtFrm
#include <itrpaint.hxx> // SwTxtPainter #include <itrpaint.hxx> // SwTxtPainter
#include <txtpaint.hxx> // SwSaveClip #include <txtpaint.hxx> // SwSaveClip
#include <txtcache.hxx> // SwTxtLineAccess #include <txtcache.hxx> // SwTxtLineAccess
#include <flyfrm.hxx> // SwFlyFrm #include <flyfrm.hxx> // SwFlyFrm
#include <redlnitr.hxx> // SwRedlineItr #include <redlnitr.hxx> // SwRedlineItr
...@@ -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();
......
This diff is collapsed.
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