Kaydet (Commit) 40db75b6 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

sw: fixed a few comments

Change-Id: Ibe34d977df2b2db42d60e45177865c0a6d11c643
üst 1cbe91a3
...@@ -91,7 +91,6 @@ ...@@ -91,7 +91,6 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
// OD 2004-03-23 #i26791
TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject); TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
/************************************************************************* /*************************************************************************
...@@ -102,10 +101,7 @@ TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject); ...@@ -102,10 +101,7 @@ TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
SwLayoutFrm( pFmt, pSib ), SwLayoutFrm( pFmt, pSib ),
// OD 2004-03-22 #i26791# SwAnchoredObject(), // #i26791#
SwAnchoredObject(),
// OD 2004-05-27 #i26791# - moved to <SwAnchoredObject>
// aRelPos(),
pPrevLink( 0 ), pPrevLink( 0 ),
pNextLink( 0 ), pNextLink( 0 ),
bInCnt( sal_False ), bInCnt( sal_False ),
...@@ -171,23 +167,21 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : ...@@ -171,23 +167,21 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
Frm().Width( rFrmSize.GetWidth() ); Frm().Width( rFrmSize.GetWidth() );
Frm().Height( rFrmSize.GetHeightSizeType() == ATT_VAR_SIZE ? MINFLY : rFrmSize.GetHeight() ); Frm().Height( rFrmSize.GetHeightSizeType() == ATT_VAR_SIZE ? MINFLY : rFrmSize.GetHeight() );
//Hoehe Fix oder Variabel oder was? // Fixed or variable Height?
if ( rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE ) if ( rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE )
bMinHeight = sal_True; bMinHeight = sal_True;
else if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE ) else if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE )
bFixSize = sal_True; bFixSize = sal_True;
// OD 2004-02-12 #110582#-2 - insert columns, if necessary // insert columns, if necessary
InsertColumns(); InsertColumns();
//Erst das Init, dann den Inhalt, denn zum Inhalt koennen widerum //Erst das Init, dann den Inhalt, denn zum Inhalt koennen widerum
//Objekte/Rahmen gehoeren die dann angemeldet werden. //Objekte/Rahmen gehoeren die dann angemeldet werden.
InitDrawObj( sal_False ); InitDrawObj( sal_False );
// OD 2004-01-19 #110582#
Chain( pAnch ); Chain( pAnch );
// OD 2004-01-19 #110582#
InsertCnt(); InsertCnt();
//Und erstmal in den Wald stellen die Kiste, damit bei neuen Dokument nicht //Und erstmal in den Wald stellen die Kiste, damit bei neuen Dokument nicht
...@@ -195,7 +189,6 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : ...@@ -195,7 +189,6 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
Frm().Pos().X() = Frm().Pos().Y() = FAR_AWAY; Frm().Pos().X() = Frm().Pos().Y() = FAR_AWAY;
} }
// OD 2004-01-19 #110582#
void SwFlyFrm::Chain( SwFrm* _pAnch ) void SwFlyFrm::Chain( SwFrm* _pAnch )
{ {
// Connect to chain neighboors. // Connect to chain neighboors.
...@@ -227,7 +220,6 @@ void SwFlyFrm::Chain( SwFrm* _pAnch ) ...@@ -227,7 +220,6 @@ void SwFlyFrm::Chain( SwFrm* _pAnch )
} }
} }
// OD 2004-01-19 #110582#
void SwFlyFrm::InsertCnt() void SwFlyFrm::InsertCnt()
{ {
if ( !GetPrevLink() ) if ( !GetPrevLink() )
...@@ -239,7 +231,7 @@ void SwFlyFrm::InsertCnt() ...@@ -239,7 +231,7 @@ void SwFlyFrm::InsertCnt()
::_InsertCnt( Lower() ? (SwLayoutFrm*)((SwLayoutFrm*)Lower())->Lower() : (SwLayoutFrm*)this, ::_InsertCnt( Lower() ? (SwLayoutFrm*)((SwLayoutFrm*)Lower())->Lower() : (SwLayoutFrm*)this,
GetFmt()->GetDoc(), nIndex ); GetFmt()->GetDoc(), nIndex );
//NoTxt haben immer eine FixHeight. // NoTxt always have a fixed height.
if ( Lower() && Lower()->IsNoTxtFrm() ) if ( Lower() && Lower()->IsNoTxtFrm() )
{ {
bFixSize = sal_True; bFixSize = sal_True;
...@@ -248,7 +240,6 @@ void SwFlyFrm::InsertCnt() ...@@ -248,7 +240,6 @@ void SwFlyFrm::InsertCnt()
} }
} }
// OD 2004-02-12 #110582#-2
void SwFlyFrm::InsertColumns() void SwFlyFrm::InsertColumns()
{ {
// #i97379# // #i97379#
......
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