[Libreoffice-commits] .: sw/source
David Tardon
dtardon at kemper.freedesktop.org
Mon Nov 22 09:11:11 PST 2010
sw/source/filter/rtf/rtffld.cxx | 7 ---
sw/source/filter/rtf/rtffly.cxx | 44 -------------------
sw/source/filter/rtf/rtfnum.cxx | 18 --------
sw/source/filter/rtf/rtftbl.cxx | 68 ------------------------------
sw/source/filter/rtf/swparrtf.cxx | 78 +----------------------------------
sw/source/filter/writer/writer.cxx | 5 --
sw/source/filter/writer/wrtswtbl.cxx | 11 ----
sw/source/filter/ww1/fltshell.cxx | 38 ++++++-----------
sw/source/filter/ww1/w1class.cxx | 9 ----
sw/source/filter/ww1/w1filter.cxx | 41 ++----------------
sw/source/filter/ww1/w1sprm.cxx | 24 +++-------
11 files changed, 34 insertions(+), 309 deletions(-)
New commits:
commit dbe4b5136bbb3922faac344fe8d0dc15230e0e4c
Author: Kayo Hamid <revol.code at yahoo.com>
Date: Mon Nov 22 18:10:55 2010 +0100
clean code
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index a7280cd..ebe67fa 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -155,7 +155,6 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext )
( !nFndPos || !isalpha(sNm.GetChar( static_cast< xub_StrLen >(nFndPos-1) )) ) &&
( nFndPos+nLen == sNm.Len() || !isalpha(sNm.GetChar( static_cast< xub_StrLen >(nFndPos+nLen) ) ) ) )
{
-// rName = sNm.Copy( nFndPos, nLen );
rName = rName.Copy( nFndPos, static_cast< xub_StrLen >(nLen) );
nFndPos += nTokenStt + static_cast< xub_StrLen >(nLen);
while( rNext.GetChar( nFndPos ) == ' ' ) ++nFndPos;
@@ -407,9 +406,6 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
break;
case RTFFLD_IMPORT:
{
-//JP 11.03.96: vertraegt sich nicht so ganz mit Internet!
-// if( STRING_NOTFOUND != ( nPos = aSaveStr.Search( '.' )))
-// aSaveStr.Erase( nPos+4 );
aSaveStr.EraseLeadingAndTrailingChars();
if( aSaveStr.Len() )
@@ -425,7 +421,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
INetURLObject(GetBaseURL()), aSaveStr,
URIHelper::GetMaybeFileHdl() );
}
-// SkipGroup(); // ueberlese den Rest
+
}
break;
@@ -687,7 +683,6 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
case 1: aData.nJustificationCode = 3; break;
case 2: aData.nJustificationCode = 4; break;
case 4: aData.nJustificationCode = 2; break;
-// case 3:
default: aData.nJustificationCode = 0; break;
}
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 2cfc999..470dbcf 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -465,7 +465,6 @@ void SwRTFParser::SetFlysInDoc()
if( !bSwPageDesc || 5430 < GetVersionNo() )
pFlySave->nSttNd++;
-// if( !pFlySave->nSttNd.GetNode().IsCntntNode() )
{
// Seitenumbrueche in den Bodybereich verschieben!
SwCntntNode* pSrcNd = aRg.aStart.GetNode().GetCntntNode();
@@ -981,16 +980,6 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
nTmp *= USHRT_MAX;
nTmp /= nWidth;
pCol->SetWishWidth( USHORT(nTmp) );
-/*
- JP 07.07.95: der Dialog kennt nur eine Breite fuer alle Spalten
- darum hier nicht weiter beachten
- nTmp = aColumns[ n+1 ];
- if( nTmp )
- pCol->SetRight( USHORT(nTmp) );
- else
- pCol->SetRight( 0 );
- pCol->SetLeft( 0 );
-*/
}
}
pSet->Put( aCol );
@@ -1113,8 +1102,6 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
pPam->GetPoint()->nNode == pFlySave->nSttNd &&
!pPam->GetPoint()->nContent.GetIndex() )
{
-// // dann erzeuge mindestens einen leeren TextNode
-// pDoc->AppendTxtNode(*pPam);
// dann zerstoere den FlySave wieder.
aFlyArr.DeleteAndDestroy( --nFlyArrCnt );
@@ -1249,7 +1236,6 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
SwGrfNode * pGrfNd;
// --> OD 2008-12-22 #i83368#
// Assure that graphic node is enclosed by fly frame node.
-// if( bReadSwFly )
if ( bReadSwFly && !mbReadCellWhileReadSwFly )
// <--
{
@@ -1277,8 +1263,7 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
else
{
// wenn normale RTF-Grafik, dann steht diese im Textfluss !
- SwAttrSet aFlySet( pDoc->GetAttrPool(), RES_OPAQUE, /*RES_OPAQUE,
- RES_VERT_ORIENT,*/ RES_ANCHOR );
+ SwAttrSet aFlySet( pDoc->GetAttrPool(), RES_OPAQUE, RES_ANCHOR );
const SwPosition* pPos = pPam->GetPoint();
SwFmtAnchor aAnchor( FLY_AS_CHAR );
@@ -1408,33 +1393,6 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd,
BOOL bChg = FALSE;
SwCropGrf aCrop;
-/*
- JP 28.07.99: Bug 67800 - no crop by MAC_QUICKDRAW. At time i dont know why
- it has been coded. But this has used for any
- RTF-File, but i dont found them.
- if( SvxRTFPictureType::MAC_QUICKDRAW == pPicType->eStyle )
- {
- // evt. ein wenig Croppen ??
- // IMMER auf 72 DPI bezogen, also 1pt == 20 Twip !!
- long nTmp = pPicType->nWidth * 20;
- if( nTmp != aSize.Width() )
- {
- // in der Breite (also rechts) croppen
- aCrop.Right() = nTmp - aSize.Width();
- aSize.Width() = nTmp;
- bChg = TRUE;
- }
-
- nTmp = pPicType->nHeight * 20;
- if( nTmp != aSize.Height() )
- {
- // in der Hoehe (also unten) croppen
- aCrop.Bottom() = nTmp - aSize.Height();
- aSize.Height() = nTmp;
- bChg = TRUE;
- }
- }
-*/
if( pPicType->nCropT )
{
aCrop.SetTop( pPicType->nCropT );
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 213dc19..45d583a 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -114,9 +114,6 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
// Unknown und alle bekannten nicht ausgewerteten Gruppen
// sofort ueberspringen
else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ))
-// RTF_PANOSE != nToken && RTF_FALT != nToken &&
-// RTF_FALT != nToken && RTF_FNAME != nToken &&
-// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken )
nToken = SkipToken( -2 );
else
{
@@ -326,9 +323,6 @@ void SwRTFParser::ReadListTable()
// Unknown und alle bekannten nicht ausgewerteten Gruppen
// sofort ueberspringen
else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ))
-// RTF_PANOSE != nToken && RTF_FALT != nToken &&
-// RTF_FALT != nToken && RTF_FNAME != nToken &&
-// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken )
nToken = SkipToken( -2 );
else
{
@@ -608,17 +602,7 @@ void SwRTFParser::ReadListOverrideTable()
const SwNumRule *pNumRule = 0;
SvxRTFStyleType* pStyle = GetStyleTbl().First();
do {
- // --> OD 2007-12-17 #151213#
- // suppress deletion of outline list style.
- // refactoring of code: no assignments in if-condition
-// if( MAXLEVEL > pStyle->nOutlineNo &&
-// 0 != ( pColl = aTxtCollTbl.Get( (USHORT)GetStyleTbl().
-// GetCurKey() )) &&
-// SFX_ITEM_SET == pColl->GetItemState( RES_PARATR_NUMRULE,
-// FALSE, &pItem ) &&
-// USHRT_MAX != (nRulePos = pDoc->FindNumRule(
-// ((SwNumRuleItem*)pItem)->GetValue() )) &&
-// (pNumRule = pDoc->GetNumRuleTbl()[ nRulePos ])->IsAutoRule() )
+ // #151213#
if ( MAXLEVEL > pStyle->nOutlineNo )
{
pColl = aTxtCollTbl.Get( (USHORT)GetStyleTbl().GetCurKey() );
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx
index 674bc57..929de88 100644
--- a/sw/source/filter/rtf/rtftbl.cxx
+++ b/sw/source/filter/rtf/rtftbl.cxx
@@ -353,73 +353,6 @@ void SwRTFParser::ReadTable( int nToken )
aBox.SetDistance( static_cast< USHORT >(nTopCellPad), BOX_LINE_LEFT);
- /*#106415# The Cell Borders are now balanced on import to
- improve the layout of tables.
- */
-/*
- if ( aBoxFmts.Count()>1)
- {
-
- SwTableBoxFmt* prevpFmt = aBoxFmts[ aBoxFmts.Count()-2 ];
- SvxBoxItem prevaBox(prevpFmt->GetBox());
- USHORT prevWidthRight=0;
- USHORT currWidthLeft=0;
- bool bDoubleLine=false;
- const SvxBorderLine* brdrline ;
- const Color* pPrevRightColor;
- if(prevaBox.GetRight())
- {
- brdrline=prevaBox.GetRight();
- prevWidthRight = brdrline->GetOutWidth();
- pPrevRightColor = &brdrline->GetColor();
- if(brdrline->GetInWidth())
- bDoubleLine=true;
- }
- if(aBox.GetLeft())
- {
- brdrline=aBox.GetLeft();
- currWidthLeft = brdrline->GetOutWidth();
- if(brdrline->GetInWidth())
- bDoubleLine=true;
- }
-
- if((currWidthLeft >0 || prevWidthRight >0) &&
- !bDoubleLine)
- {
- USHORT newBorderWidth=(currWidthLeft+prevWidthRight)/2 ;
- if(newBorderWidth /2 ==DEF_LINE_WIDTH_0 )
- {
- newBorderWidth =DEF_LINE_WIDTH_0;
- }
- else if(newBorderWidth /2 >=(DEF_LINE_WIDTH_4-DEF_LINE_WIDTH_3))
- {
- newBorderWidth =DEF_LINE_WIDTH_4;
- }
- else if(newBorderWidth /2 >=(DEF_LINE_WIDTH_3-DEF_LINE_WIDTH_2))
- {
- newBorderWidth =DEF_LINE_WIDTH_3;
- }
- else if(newBorderWidth /2>=(DEF_LINE_WIDTH_2-DEF_LINE_WIDTH_1))
- {
- newBorderWidth =DEF_LINE_WIDTH_2;
- }
- else if(newBorderWidth /2>=(DEF_LINE_WIDTH_1 - DEF_LINE_WIDTH_0) )
- {
- newBorderWidth =DEF_LINE_WIDTH_1;
- }
- else
- {
- newBorderWidth =DEF_LINE_WIDTH_0;
- }
- const SvxBorderLine newbrdrline(pPrevRightColor, newBorderWidth,0,0);
- aBox.SetLine(&newbrdrline,BOX_LINE_LEFT);
- prevaBox.SetLine(&newbrdrline,BOX_LINE_RIGHT);
- prevpFmt->SetAttr(prevaBox);
- }
-
- }
-*/
-
pFmt->SetFmtAttr(aBox);
bUseLeftCellPad = false;
@@ -964,7 +897,6 @@ void SwRTFParser::NewTblLine()
pLns = &pTableNode->GetTable().GetTabLines();
}
else
-// pDoc->InsertRow( aBoxes );
pTableNode->GetTable().AppendRow( pDoc );
pBox = (*pLns)[ pLns->Count()-1 ]->GetTabBoxes()[0];
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 02452b8..d81702d 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -747,10 +747,7 @@ void rtfSections::SetSegmentToPageDesc(const rtfSection &rSection,
{
SwPageDesc &rPage = bTitlePage ? *rSection.mpTitlePage : *rSection.mpPage;
-// SetNumberingType(rSection, rPage);
-
SwFrmFmt &rFmt = rPage.GetMaster();
-// mrReader.SetDocumentGrid(rFmt, rSection);
wwULSpaceData aULData;
GetPageULData(rSection, bTitlePage, aULData);
@@ -790,15 +787,11 @@ void rtfSections::MoveFrom(SwPageDesc &rFrom, SwPageDesc &rDest)
SwFrmFmt &rFromMaster = rFrom.GetMaster();
rDestMaster.SetFmtAttr(rFromMaster.GetHeader());
rDestMaster.SetFmtAttr(rFromMaster.GetFooter());
- //rFromMaster.SetAttr(SwFmtHeader()); //$flr uncommented due to bug fix #117882#
- //rFromMaster.SetAttr(SwFmtFooter()); //$flr uncommented due to bug fix #117882#
SwFrmFmt &rDestLeft = rDest.GetLeft();
SwFrmFmt &rFromLeft = rFrom.GetLeft();
rDestLeft.SetFmtAttr(rFromLeft.GetHeader());
rDestLeft.SetFmtAttr(rFromLeft.GetFooter());
- //rFromLeft.SetAttr(SwFmtHeader()); //$flr uncommented due to bug fix #117882#
- //rFromLeft.SetAttr(SwFmtFooter()); //$flr uncommented due to bug fix #117882#
}
void rtfSections::SetHdFt(rtfSection &rSection)
@@ -1241,15 +1234,7 @@ void SwRTFParser::ReadDrawingObject()
}
}
SkipToken(-1);
- /*
- const Point aPointC1( 0, 0 );
- const Point aPointC2( 100, 200 );
- const Point aPointC3( 300, 400 );
- XPolygon aPolygonC(3);
- aPolygonC[0] = aPointC1;
- aPolygonC[1] = aPointC2;
- aPolygonC[2] = aPointC3;
- */
+
if(bPolygonActive && aPolygon.count())
{
SdrPathObj* pStroke = new SdrPathObj(OBJ_PLIN, ::basegfx::B2DPolyPolygon(aPolygon));
@@ -1260,10 +1245,7 @@ void SwRTFParser::ReadDrawingObject()
aFlySet.Put( aSur );
SwFmtFollowTextFlow aFollowTextFlow( FALSE );
aFlySet.Put( aFollowTextFlow );
- /*
- sw::util::SetLayer aSetLayer(*pDoc);
- aSetLayer.SendObjectToHeaven(*pStroke);
- */
+
SwFmtAnchor aAnchor( FLY_AT_PARA );
aAnchor.SetAnchor( pPam->GetPoint() );
aFlySet.Put( aAnchor );
@@ -1316,7 +1298,7 @@ void SwRTFParser::ReadDrawingObject()
pStroke->SetSnapRect(aRect);
- /* SwFrmFmt* pRetFrmFmt = */pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
+ pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
}
}
@@ -1348,7 +1330,7 @@ void SwRTFParser::InsertShpObject(SdrObject* pStroke, int _nZOrder)
SdrPage* pDrawPg = pDrawModel->GetPage(0);
pDrawPg->InsertObject(pStroke);
pDrawPg->SetObjectOrdNum(pStroke->GetOrdNum(), _nZOrder);
- /* SwFrmFmt* pRetFrmFmt = */pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
+ pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
}
::basegfx::B2DPoint rotate(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd)
@@ -1536,7 +1518,6 @@ void SwRTFParser::ReadShapeObject()
SdrPathObj* pStroke = new SdrPathObj(OBJ_PLIN, ::basegfx::B2DPolyPolygon(aLine));
pSdrObject = pStroke;
- //pStroke->SetSnapRect(aRect);
InsertShpObject(pStroke, this->nZOrder++);
SfxItemSet aSet(pStroke->GetMergedItemSet());
@@ -1575,7 +1556,6 @@ extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
USHORT SwRTFParser::ReadRevTbl()
{
- // rStr.Erase( 0 );
int nNumOpenBrakets = 1, nToken; // die erste wurde schon vorher erkannt !!
USHORT nAuthorTableIndex = 0;
@@ -2733,11 +2713,8 @@ void SwRTFParser::MakeStyleTab()
if( !IsNewDoc() )
{
// search all outlined collections
- //BYTE nLvl;
const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
for( USHORT n = rColls.Count(); n; )
- //if( MAXLEVEL > (nLvl = rColls[ --n ]->GetOutlineLevel() ))//#outline level,zhaojianwei
- // nValidOutlineLevels |= 1 << nLvl;
if( rColls[ --n ]->IsAssignedToListLevelOfOutlineStyle())
nValidOutlineLevels |= 1 << rColls[ n ]->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
}
@@ -3516,20 +3493,6 @@ void SwRTFParser::ReadPageDescTbl()
SkipToken( -1 );
}
-// -------------- Methoden --------------------
-
-/*
-void SwRTFParser::ReadUnknownData()
-{
- SvRTFParser::ReadUnknownData();
-}
-
-void SwRTFParser::ReadOLEData()
-{
- SvRTFParser::ReadOLEData();
-}
-*/
-
void SwRTFParser::ReadPrtData()
{
while( IsParserWorking() )
@@ -3876,29 +3839,6 @@ void SwRTFParser::SetSwgValues( SfxItemSet& rSet )
}
-
-/*
- ????????????????????????????????????????????????????????????????????
- ?? muss die LineSpacing Hoehe 200Twip betragen ??
- ?? in rtfitem.hxx wird es auf 0 defaultet. Wenn ja, dann muss hier
- ?? ein neues Item gesetzt werden!!!!
- ????????????????????????????????????????????????????????????????????
-
- // LineSpacing korrigieren
- if( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_LINESPACING, FALSE, &pItem ))
- {
- const SvxLineSpacingItem* pLS = (const SvxLineSpacingItem*)pItem;
- SvxLineSpacingItem aNew;
-
- aNew.SetInterLineSpace( pLS->GetInterLineSpace() );
- aNew.GetLineSpaceRule() = pLS->GetLineSpaceRule();
- aNew.SetPropLineSpace( pLS->GetPropLineSpace() );
- aNew.GetInterLineSpaceRule() = pLS->GetInterLineSpaceRule();
-
- rSet.Put( aNew );
- }
-?????????????????????????????????????????????????????????????????? */
-
}
@@ -3906,7 +3846,6 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
BYTE nOutlineLevel, bool& rbCollExist)
{
if( BYTE(-1) == nOutlineLevel )
- //nOutlineLevel = NO_NUMBERING;
nOutlineLevel = MAXLEVEL;//#outline level,zhaojianwei
rbCollExist = false;
@@ -3918,7 +3857,6 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
if( !nPos )
{
pColl = pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false );
- //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei
if(nOutlineLevel < MAXLEVEL ) //->add by zhaojianwei
pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
else
@@ -3946,7 +3884,6 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
if (!rbCollExist)
{
- //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei
if(nOutlineLevel < MAXLEVEL) //->add by zhaojianwei
pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
else
@@ -4279,13 +4216,6 @@ void SwRTFParser::UnknownAttrToken( int nToken, SfxItemSet* pSet )
}
break;
-/*
- case RTF_SBYS:
- case RTF_EXPND:
- case RTF_KEEP:
- case RTF_KEEPN:
-*/
-
}
}
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 708ab29..857c9de 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -363,9 +363,6 @@ BOOL Writer::CopyLocalFileToINet( String& rFileNm )
BOOL bRet = FALSE;
INetURLObject aFileUrl( rFileNm ), aTargetUrl( *pOrigFileName );
-// JP 01.11.00: what is the correct question for the portal??
-// if( aFileUrl.GetProtocol() == aFileUrl.GetProtocol() )
-// return bRet;
// this is our old without the Mail-Export
if( ! ( INET_PROT_FILE == aFileUrl.GetProtocol() &&
INET_PROT_FILE != aTargetUrl.GetProtocol() &&
@@ -427,8 +424,6 @@ void Writer::PutNumFmtFontsInAttrPool()
const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
const SwNumRule* pRule;
const SwNumFmt* pFmt;
- // --> OD 2006-06-27 #b644095#
-// const Font *pFont, *pDefFont = &SwNumRule::GetDefBulletFont();
const Font* pFont;
const Font* pDefFont = &numfunc::GetDefBulletFont();
// <--
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 8918bcc..ab18945 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -609,7 +609,6 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
SwWriteTableRow *pRow = aRows[nOldRow];
SwWriteTableRow *pEndRow = aRows[nRow];
-// if( nLine==0 && nParentLineHeight==0 )
if( nLine+1==nNumOfHeaderRows && nParentLineHeight==0 )
nHeadEndRow = nRow;
@@ -740,16 +739,6 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
pEndRow->nBottomBorder = nBottomBorder;
}
}
-// MIB: 13.12.2000: Why should a cell that contains a subtable
-// not have borders? Moreover, switching them, off switches off
-// the fill border lines between the columns and rows. (#74222#)
-// else
-// {
-// aCols[nOldCol]->bLeftBorder = FALSE;
-// aCols[nCol]->bRightBorder = FALSE;
-// pRow->bTopBorder = FALSE;
-// pEndRow->bBottomBorder = FALSE;
-// }
}
else
{
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index da7d4ea..d4db641 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -370,9 +370,6 @@ static void MakeBookRegionOrPoint(SwFltStackEntry* pEntry, SwDoc* pDoc,
{
if (pEntry->MakeRegion(pDoc, rRegion, bCheck )){
const SwNodes& rNds = pDoc->GetNodes();
-// BOOL b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
-// const SwStartNode* p1 = rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode();
-// const SwStartNode* p2 = rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode();
if( rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode()
!= rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode() ){
rRegion.Exchange(); // Ungueltiger Bereich
@@ -632,7 +629,6 @@ const SfxPoolItem* SwFltControlStack::GetFmtAttr(const SwPosition& rPos, USHORT
return (const SfxPoolItem*)pHt;
// im Stack ist das Attribut nicht vorhanden, also befrage das Dokument
-// SwCntntNode * pNd = rPaM.GetCntntNode();
SwCntntNode * pNd = pDoc->GetNodes()[ rPos.nNode ]->GetCntntNode();
if (!pNd) // kein ContentNode, dann das dflt. Attribut
@@ -1732,9 +1728,9 @@ SwFrmFmt* SwFltOutDoc::MakeFly( RndStdIds eAnchor, SfxItemSet* pSet )
return pFly;
}
-BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
- BOOL bAbsolutePos /*= FALSE*/,
- const SfxItemSet* pMoreAttrs /*= 0*/ )
+BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor,
+ BOOL bAbsolutePos ,
+ const SfxItemSet* pMoreAttrs)
{
SwFltOutBase::BeginFly( eAnchor, bAbsolutePos, 0 );
@@ -1759,7 +1755,6 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
// dieses NICHT bei Seitengebundenem Fly mit Seiten-NUMMER !
aAnchor.SetAnchor(pPaM->GetPoint()); // braucht erstaunlicherweise
// den Stack nicht
-// aStack.NewAttr( *pPaM->GetPoint(), SwFltAnchor( pFly ) );
pSet->Put( aAnchor );
SwFrmFmt* pF = MakeFly( eAnchor, pSet );
@@ -1831,16 +1826,15 @@ void SwFltOutDoc::EndFly()
/*virtual*/ const SfxPoolItem& SwFltFormatCollection::GetFlyFrmAttr(USHORT nWhich)
{
-// ASSERT( pFlyAttrs, "GetFlyFrmAttr ohne Coll-FlyAttrs" );
if( pFlyAttrs )
return pFlyAttrs->Get( nWhich, FALSE );
else
return GetDoc().GetAttrPool().GetDefaultItem(nWhich);
}
-BOOL SwFltFormatCollection::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
- BOOL bAbsolutePos /*= FALSE*/,
- const SfxItemSet* pMoreAttrs /*= 0*/ )
+BOOL SwFltFormatCollection::BeginFly( RndStdIds eAnchor,
+ BOOL bAbsolutePos,
+ const SfxItemSet* pMoreAttrs)
{
SwFltOutBase::BeginFly( eAnchor, bAbsolutePos, pMoreAttrs );
@@ -1866,8 +1860,8 @@ BOOL SwFltFormatCollection::BeginStyleFly( SwFltOutDoc* pOutDoc )
// Flys in SwFltShell
//-----------------------------------------------------------------------------
-BOOL SwFltShell::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
- BOOL bAbsolutePos /*= FALSE*/ )
+BOOL SwFltShell::BeginFly( RndStdIds eAnchor,
+ BOOL bAbsolutePos)
{
if (pOut->IsInFly()){
@@ -1883,14 +1877,14 @@ BOOL SwFltShell::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
return TRUE;
}
-void SwFltShell::SetFlyXPos( short nXPos, sal_Int16 eHRel /*= text::RelOrientation::FRAME*/,
- sal_Int16 eHAlign /*= text::HoriOrientation::NONE*/ )
+void SwFltShell::SetFlyXPos( short nXPos, sal_Int16 eHRel,
+ sal_Int16 eHAlign)
{
SetFlyFrmAttr( SwFmtHoriOrient( nXPos, eHAlign, eHRel ) );
}
-void SwFltShell::SetFlyYPos( short nYPos, sal_Int16 eVRel /*= text::RelOrientation::FRAME*/,
- sal_Int16 eVAlign /*= text::VertOrientation::NONE*/ )
+void SwFltShell::SetFlyYPos( short nYPos, sal_Int16 eVRel,
+ sal_Int16 eVAlign)
{
SetFlyFrmAttr( SwFmtVertOrient( nYPos, eVAlign, eVRel ) );
}
@@ -1928,7 +1922,6 @@ void SwFltShell::BeginFootnote()
// Alle Attribute schliessen, da sonst Attribute entstehen koennen,
// die in Fussnoten reinragen
aStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
-// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber
// Fussnoten im PMW uebernommen werden
@@ -1958,7 +1951,6 @@ void SwFltShell::EndFootnote()
// Alle Attribute schliessen, da sonst Attribute
// entstehen koennen, die aus Fussnoten rausragen
aStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
-// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber
// Fussnoten im PMW uebernommen werden
@@ -1969,8 +1961,7 @@ void SwFltShell::EndFootnote()
void SwFltShell::BeginHeader(SwPageDesc* /*pPD*/)
{
- SwFrmFmt* pFmt = &pCurrentPageDesc->GetMaster(
- ); //(bUseLeft) ? &pCurrentPageDesc->GetLeft() :
+ SwFrmFmt* pFmt = &pCurrentPageDesc->GetMaster();
SwFrmFmt* pHdFtFmt;
pFmt->SetFmtAttr(SwFmtHeader(TRUE));
pHdFtFmt = (SwFrmFmt*)pFmt->GetHeader().GetHeaderFmt();
@@ -1986,8 +1977,7 @@ void SwFltShell::BeginHeader(SwPageDesc* /*pPD*/)
void SwFltShell::BeginFooter(SwPageDesc* /*pPD*/)
{
- SwFrmFmt* pFmt = &pCurrentPageDesc->GetMaster(
- ); //(bUseLeft) ? &pCurrentPageDesc->GetLeft() :
+ SwFrmFmt* pFmt = &pCurrentPageDesc->GetMaster();
SwFrmFmt* pHdFtFmt;
pFmt->SetFmtAttr(SwFmtFooter(TRUE));
pHdFtFmt = (SwFrmFmt*)pFmt->GetFooter().GetFooterFmt();
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index efd0c78..2ed5235 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -501,7 +501,6 @@ USHORT Ww1SingleSprmByteSized::Size(BYTE* pSprm)
USHORT nRet;
nRet = SVBT8ToByte(pSprm);
nRet += sizeof(SVBT8); // var. l. byte-size
-// pSprm += sizeof(SVBT8); // var. l. byte-size
nRet = nRet + nCountBytes;
return nRet;
}
@@ -511,7 +510,6 @@ USHORT Ww1SingleSprmWordSized::Size(BYTE* pSprm)
USHORT nRet;
nRet = SVBT16ToShort(pSprm);
nRet += sizeof(SVBT16); // var. l. word-size
-// pSprm += sizeof(SVBT16); // var. l. word-size
nRet = nRet + nCountBytes;
return nRet;
}
@@ -520,7 +518,6 @@ static BYTE nLast = 0;
static BYTE nCurrent = 0;
USHORT Ww1Sprm::GetSize(BYTE nId, BYTE* pSprm)
{
- //DBG_ASSERT( nId < sizeof(aTab) / sizeof(*aTab), "Ww1Sprm" );
USHORT nL = 0;
nL = GetTab(nId).Size(pSprm);
nLast = nCurrent;
@@ -530,7 +527,6 @@ USHORT Ww1Sprm::GetSize(BYTE nId, BYTE* pSprm)
BOOL Ww1Sprm::Fill(USHORT index, BYTE& nId, USHORT& nL, BYTE*& pSprm)
{
- //DBG_ASSERT( nId < sizeof(aTab) / sizeof(*aTab), "Ww1Sprm");
DBG_ASSERT(index < Count(), "Ww1Sprm");
pSprm = p + pArr[index];
nId = SVBT8ToByte(pSprm);
@@ -993,7 +989,6 @@ BOOL Ww1FkpPap::Fill(USHORT nIndex, BYTE*& p, USHORT& rnCountBytes)
if (nOffset)
{
DBG_ASSERT(nOffset>(USHORT)(Count()*sizeof(SVBT32)), "calc error");
-// rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2 + 1; // SH: +1 ?????
rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2;
nOffset += sizeof(SVBT8);
if( nOffset + rnCountBytes < 511 ) // SH: Assert schlug 1 zu frueh zu
@@ -1095,7 +1090,6 @@ ULONG Ww1Pap::Where( BOOL bSetIndex )
nFkpIndex = 0;
}
if (pPap != NULL)
-// if (nFkpIndex < pPap->Count())
if (nFkpIndex <= pPap->Count())
ulRet = pPap->Where(nFkpIndex) - rFib.GetFIB().fcMinGet();
return ulRet;
@@ -1104,7 +1098,6 @@ ULONG Ww1Pap::Where( BOOL bSetIndex )
void Ww1Pap::operator++(int)
{
if (pPap != NULL)
-// if (++nFkpIndex >= pPap->Count())
if (++nFkpIndex > pPap->Count())
{
delete pPap;
@@ -1196,7 +1189,6 @@ ULONG Ww1Chp::Where( BOOL bSetIndex )
nFkpIndex = 0;
}
if (pChp != NULL)
-// if (nFkpIndex < pChp->Count())
if (nFkpIndex <= pChp->Count())
ulRet = pChp->Where(nFkpIndex) -
rFib.GetFIB().fcMinGet() - ulOffset;
@@ -1206,7 +1198,6 @@ ULONG Ww1Chp::Where( BOOL bSetIndex )
void Ww1Chp::operator++(int)
{
if (pChp != NULL)
-// if (++nFkpIndex >= pChp->Count())
if (++nFkpIndex > pChp->Count())
{
delete pChp;
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index c33b233..9bf6a8b 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -253,7 +253,6 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
break;
case 0x0b: // linebreak
if (rOut.IsInTable())
-// rOut.NextBand(); // war Stuss
;
else
rOut.NextLine();
@@ -402,7 +401,6 @@ void Ww1Footnotes::Stop(Ww1Shell& /*rOut*/, Ww1Manager& rMan, sal_Unicode& c)
if (bStarted && rMan.Where() > Where())
{
DBG_ASSERT(nPlcIndex < Count(), "Ww1Footnotes");
-// DBG_ASSERT(c==0x02, "Ww1Footnotes"); // scheint Stuss zu sein
c = ' ';
(*this)++;
}
@@ -636,10 +634,7 @@ oncemore:
REF_BOOKMARK,
0,
REF_CONTENT );
-// pField = new SwGetExpField((SwGetExpFieldType*)
-// rOut.GetSysFldType(RES_GETEXPFLD), sFormel, nsSwGetSetExpType::GSE_STRING);
-// ,
-// nsSwGetSetExpType::GSE_STRING, VVF_SYS);
+
break;
case 6: // set command
{
@@ -854,10 +849,6 @@ oncemore:
break;
aFName.SearchAndReplaceAscii( "\\\\", String( '\\' ));
-// char* pBook = FindNextPara( pNext, 0 ); //!! Bookmark/Feld-Name
-// //!! erstmal nicht
-
-// ConvertFFileName( aPara, pFName ); //!! WW1 ????
aFName = URIHelper::SmartRel2Abs(
INetURLObject(rOut.GetBaseURL()), aFName );
@@ -890,9 +881,6 @@ oncemore:
pField = new SwSetExpField((SwSetExpFieldType*)pFT, aStr );
((SwSetExpField*)pField)->SetInputFlag( TRUE );
((SwSetExpField*)pField)->SetSubType(nsSwExtendedSubType::SUB_INVISIBLE);
-// pField.SetPromptText( aQ ); //!! fehlt noch
-// aFld.SetPar2( aDef ); //!! dito
- // das Ignorieren des Bookmarks ist nicht implementiert
}
case 39: // fillin command
pField = new SwInputField(
@@ -963,9 +951,6 @@ oncemore:
case 4: // index entry
// wwpar5: 1351/1454
case 5: // footnote ref
-// pField = new SwGetRefField(
-// (SwGetRefFieldType*)rDoc.GetSysFldType(RES_GETREFFLD),
-// sFormel, REF_FOOTNOTE, 0, REF_BEGIN);
case 7: // if command
case 8: // create index
// wwpar5: 1351/1454
@@ -1076,7 +1061,6 @@ void Ww1Pap::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
aSprm.Stop(rOut, rMan);
}else{
DBG_ASSERT( !nPlcIndex || rMan.IsStopAll(), "Pap-Attribut-Stop verloren" );
-// rMan.IsStopAll() ist nicht schoen.
}
}
}
@@ -1455,7 +1439,6 @@ SvxFontItem Ww1Fonts::GetFont(USHORT nFCode)
void Ww1Dop::Out(Ww1Shell& rOut)
{
//~ mdt: fehlt
- // aDop.fWidowControlGet(); // keine Absatztrennung fuer einzelne Zeilen
long nDefTabSiz = aDop.dxaTabGet();
if (nDefTabSiz < 56)
nDefTabSiz = 709;
@@ -1487,7 +1470,6 @@ void Ww1Dop::Out(Ww1Shell& rOut)
case 2: aInfo.ePos = FTNPOS_PAGE; break;
default: aInfo.ePos = FTNPOS_CHAPTER; break;
}
-// aInfo.eNum = ( rDOP.fFtnRestartGet() ) ? FTNNUM_CHAPTER : FTNNUM_DOC;
// Da Sw unter Chapter anscheinend was anderes versteht als PMW
// hier also immer Doc !
aInfo.eNum = FTNNUM_DOC;
@@ -1640,12 +1622,7 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
{
const RES_POOL_COLLFMT_TYPE RES_NONE = RES_POOLCOLL_DOC_END;
RES_POOL_COLLFMT_TYPE aType = RES_NONE;
-// aType = RES_POOLCOLL_JAKETADRESS; break;
-// aType = RES_POOLCOLL_LISTS_BEGIN; break;
-// aType = RES_POOLCOLL_SENDADRESS; break;
-// aType = RES_POOLCOLL_SIGNATURE; break;
-// aType = RES_POOLCOLL_TEXT_NEGIDENT; break;
-// aType = RES_POOLCOLL_TOX_IDXH; break;
+
switch (stc)
{
case 222: // Null
@@ -1718,7 +1695,6 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
aType = RES_POOLCOLL_TEXT_IDENT; break;
case 0: // Normal
aType = RES_POOLCOLL_STANDARD; break;
-// aType = RES_POOLCOLL_TEXT; break; // Das ist "textkoerper"
}
if (aType == RES_NONE)
rOut.BeginStyle(stc, GetStyle(stc).GetName() );
@@ -1727,7 +1703,6 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
OutDefaults(rOut, rMan, stc);
GetStyle(stc).Out(rOut, rMan);
rOut.EndStyle();
-// rMan.SetInApo(FALSE);
}
// OutOneWithBase() liest einen Style mit OutOne() einen Style ein
// Jedoch liest er, wenn noch nicht geschehen, den Basisstyle rekursiv ein
@@ -1794,8 +1769,8 @@ void Ww1Picture::WriteBmp(SvStream& rOut)
USHORT padx = ((maxx + 7) / 8) * 8;
USHORT maxy = pPic->mfp.yExtGet();
- /*USHORT unknown1 = SVBT16ToShort(p);*/ p+= sizeof(SVBT16); nSize -= sizeof(SVBT16);
- /*USHORT unknown2 = SVBT16ToShort(p);*/ p+= sizeof(SVBT16); nSize -= sizeof(SVBT16);
+ p+= sizeof(SVBT16); nSize -= sizeof(SVBT16);
+ p+= sizeof(SVBT16); nSize -= sizeof(SVBT16);
#if OSL_DEBUG_LEVEL > 1
USHORT x = SVBT16ToShort(p);
(void) x;
@@ -1955,13 +1930,11 @@ void Ww1Picture::Out(Ww1Shell& rOut, Ww1Manager& /*rMan*/)
String aDir( (sal_Char*)pPic->rgbGet(),
(USHORT)(pPic->lcbGet() - (sizeof(*pPic)-sizeof(pPic->rgb))),
RTL_TEXTENCODING_MS_1252 );
- //SvFileStream aOut(aDir, STREAM_READ|STREAM_WRITE|STREAM_TRUNC);
+
rOut.AddGraphic( aDir );
}
break;
case 97: // embedded bitmap
-// case 99: // SH: bei meinem BspDoc 41738.doc auch embedded Bitmap,
- // aber leider anderes Format
{
ULONG nSiz = GuessPicSize(pPic);
SvMemoryStream aOut(nSiz, 8192);
@@ -2045,9 +2018,7 @@ void Ww1HeaderFooter::Start(Ww1Shell& rOut, Ww1Manager& rMan)
void Ww1HeaderFooter::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
{
- if (!rMan.Pushed() && eHeaderFooterMode != None
-// && rMan.GetText().Where() >= rMan.GetText().Count()
- )
+ if (!rMan.Pushed() && eHeaderFooterMode != None)
{
Start(rOut, rMan);
}
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index d497cd0..54693c7 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -66,7 +66,6 @@ using namespace ::com::sun::star;
void Ww1Sprm::Stop( Ww1Shell& rOut, Ww1Manager& rMan)
{
if(IsUsed())
-// for(USHORT i=0;i<Count();i++)
for(short i=Count()-1;i>=0;i--){ // rueckwaerts
BYTE nId;
USHORT nSize;
@@ -308,7 +307,6 @@ void Ww1SingleSprmPBrc10::Start(
rOut.GetFlyFrmAttr(RES_BOX) :rOut.GetAttr(RES_BOX));
const SvxBoxItem &rBoxItem = (const SvxBoxItem&)rItem;
SvxBoxItem aBox( rBoxItem );
-// rOut >> aBox;
SvxBorderLine aLine;
aBox.SetLine(SetBorder(&aLine, pBrc), nBrcTrans[nLine] );
Ww1SingleSprmPBrc::Start(rOut, nId, pBrc, nSize, rMan, aBox);
@@ -366,12 +364,8 @@ void Ww1SingleSprmPDyaLine::Start(
void Ww1SingleSprmPChgTabsPapx::Start(
Ww1Shell& rOut, BYTE /*nId*/, BYTE* pSprm, USHORT /*nSize*/, Ww1Manager& /*rMan*/)
{
-#if OSL_DEBUG_LEVEL > 1
-// rOut << 'T';
-#endif
+
short nLeftPMgn = 0; // Koordinaten etwa gleich ??
-// ( pAktColl ) ? pCollA[nAktColl].nLeftParaMgn
-// : nLeftParaMgn; // Absatz L-Space
short i;
BYTE nDel = pSprm[1];
@@ -501,8 +495,6 @@ void Ww1SingleSprmTDefTable10::Start(
// Erstmal die Zellenpositionen einlesen
short nPos = SVBT16ToShort( p ); // signed, kann auch neg. sein !!!
-// if( !rOut.IsTableWidthSet() ){ // Muss Tabellenbreite und -Ausrichtung
- // noch gesetzt werden ?
{
short nWholeWidth = SVBT16ToShort( p + 2 * nCount ) - nPos;
rOut.SetTableWidth( (USHORT)nWholeWidth ); // Tabellenbreite setzen
@@ -548,7 +540,6 @@ void Ww1SingleSprmTDefTable10::Start(
if( pTc0 ){ // gibts TCs ueberhaupt ?
W1_TC* pTc2 = (W1_TC*)pTc0;
BOOL bMerged2 = pTc2->fMergedGet();
-// ASSERT( !bMerged2, "Gemergte Tabellenzellen noch nicht vollstaendig implementiert" );
if( !bMerged2 ){
// und nun die Umrandungen
SvxBoxItem aBox( (SvxBoxItem&)rOut.GetCellAttr( RES_BOX ));
@@ -595,10 +586,9 @@ void Ww1SingleSprmPpc::Start(
switch ( ( nPpc & 0x30 ) >> 4 ){ // Y - Bindung bestimmt Sw-Bindung
case 0: eAnchor = FLY_AT_PARA; // Vert Margin
eVRel = text::RelOrientation::PRINT_AREA;
-// if( nYPos < 0 )
-// nYPos = 0; // koennen wir nicht
+
break;
-/* case 1:*/ // Vert. Seite
+
default:eAnchor = FLY_AT_PAGE; // Vert Page oder unknown
eVRel = text::RelOrientation::FRAME;
break; // 2=Vert. Paragraph, 3=Use Default
@@ -608,9 +598,9 @@ void Ww1SingleSprmPpc::Start(
case 0: // Hor. Spalte
case 1: // Hor. Absatz
eHRel = text::RelOrientation::PRINT_AREA;
-// nXPos += nPgLeft; // in Seiten-Koordinaten umrechnen
+
break;
-/* case 2:*/ // Hor. Seite
+
default:
eHRel = text::RelOrientation::FRAME;
break;
@@ -643,7 +633,7 @@ void Ww1SingleSprmPDxaAbs::Start(
case -4: eHAlign = text::HoriOrientation::CENTER; nXPos = 0; break; // zentriert
case -8: // rechts
case -16: eHAlign = text::HoriOrientation::RIGHT; nXPos = 0; break; // Mogel: aussen -> rechts
-// default: nXPos += (short)nIniFlyDx; break; // Korrekturen per Ini-Datei
+
}
rOut.SetFlyXPos( nXPos, eHRel, eHAlign );
}
@@ -659,7 +649,7 @@ void Ww1SingleSprmPDyaAbs::Start(
case -4: eVAlign = text::VertOrientation::TOP; nYPos = 0; break; // oben
case -8: eVAlign = text::VertOrientation::CENTER; nYPos = 0; break; // zentriert
case -12: eVAlign = text::VertOrientation::BOTTOM; nYPos = 0; break; // unten
-// default: nYPos += (short)nIniFlyDy; break; // Korrekturen per Ini-Datei
+
}
rOut.SetFlyYPos( nYPos, eVRel, eVAlign );
}
More information about the Libreoffice-commits
mailing list