[Libreoffice-commits] .: 2 commits - sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 23 13:13:11 PST 2010
sw/source/filter/html/parcss1.cxx | 3 +
sw/source/filter/ww8/rtfattributeoutput.cxx | 13 ----
sw/source/filter/ww8/rtfexport.cxx | 4 -
sw/source/filter/ww8/writerhelper.cxx | 10 ---
sw/source/filter/ww8/writerwordglue.cxx | 3 -
sw/source/filter/ww8/wrtw8esh.cxx | 20 -------
sw/source/filter/ww8/wrtw8nds.cxx | 10 ---
sw/source/filter/ww8/wrtw8num.cxx | 20 -------
sw/source/filter/ww8/wrtw8sty.cxx | 8 ---
sw/source/filter/ww8/wrtww8.cxx | 5 -
sw/source/filter/ww8/wrtww8gr.cxx | 15 -----
sw/source/filter/ww8/ww8atr.cxx | 73 ----------------------------
sw/source/filter/ww8/ww8graf.cxx | 35 -------------
sw/source/filter/ww8/ww8graf2.cxx | 35 -------------
sw/source/filter/ww8/ww8par.cxx | 32 ------------
sw/source/filter/ww8/ww8par2.cxx | 67 +------------------------
sw/source/filter/ww8/ww8par3.cxx | 14 -----
sw/source/filter/ww8/ww8par4.cxx | 1
sw/source/filter/ww8/ww8par5.cxx | 17 ------
sw/source/filter/ww8/ww8par6.cxx | 11 ----
sw/source/filter/ww8/ww8scan.cxx | 6 --
sw/source/filter/xml/swxml.cxx | 4 -
sw/source/filter/xml/wrtxml.cxx | 31 -----------
sw/source/filter/xml/xmlbrsh.cxx | 1
sw/source/filter/xml/xmlexp.cxx | 7 --
sw/source/filter/xml/xmlfmt.cxx | 6 --
sw/source/filter/xml/xmlimp.cxx | 23 --------
sw/source/filter/xml/xmlimpit.cxx | 3 -
sw/source/filter/xml/xmlmeta.cxx | 14 -----
sw/source/filter/xml/xmltble.cxx | 6 --
sw/source/filter/xml/xmltbli.cxx | 6 --
sw/source/filter/xml/xmltexte.cxx | 11 ----
32 files changed, 17 insertions(+), 497 deletions(-)
New commits:
commit 59a1122b58a7be5a1cb7dca9a4a70245aa49294c
Author: Kayo Hamid <revol.code at yahoo.com>
Date: Tue Nov 23 21:12:03 2010 +0000
remove dead comments
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 8e0ed40..b876a9e 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2462,10 +2462,7 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
const SwNumRule* pRule = pTxtNd->GetNumRule();
- // --> OD 2008-03-18 #refactorlists#
- // if( pRule && MAXLEVEL > pTxtNd->GetActualListLevel() )
if( pRule && pTxtNd->IsInList() )
- // <--
{
// --> OD 2008-03-18 #refactorlists#
ASSERT( pTxtNd->GetActualListLevel() >= 0 && pTxtNd->GetActualListLevel() < MAXLEVEL,
@@ -2551,13 +2548,7 @@ void RtfAttributeOutput::ParaScriptSpace( const SfxBoolItem& rScriptSpace )
case RES_PARATR_SCRIPTSPACE:
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ASPALPHA);
break;
- /* Is this needed?
- case RES_PARATR_HANGINGPUNCTUATION:
- m_aStyles.append(OOO_STRING_SVTOOLS_RTF_NOOVERFLOW);
- break;
- case RES_PARATR_FORBIDDEN_RULES:
- m_aStyles.append(OOO_STRING_SVTOOLS_RTF_NOCWRAP);
- break;*/
+
default:
break;
}
@@ -2574,7 +2565,7 @@ void RtfAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
case SvxParaVertAlignItem::BOTTOM: pStr = OOO_STRING_SVTOOLS_RTF_FAVAR; break;
case SvxParaVertAlignItem::CENTER: pStr = OOO_STRING_SVTOOLS_RTF_FACENTER; break;
case SvxParaVertAlignItem::BASELINE: pStr = OOO_STRING_SVTOOLS_RTF_FAROMAN; break;
- // default == SvxParaVertAlignItem::AUTOMATIC
+
default: pStr = OOO_STRING_SVTOOLS_RTF_FAAUTO; break;
}
m_aStyles.append(pStr);
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index b3c0828..c40a2ed 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -649,7 +649,6 @@ void RtfExport::ExportDocument_Impl()
{
case FTNNUM_PAGE: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break;
case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break;
- // case FTNNUM_CHAPTER:
default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break;
}
Strm() << pOut;
@@ -663,7 +662,6 @@ void RtfExport::ExportDocument_Impl()
case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC; break;
case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC; break;
case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break;
- // case SVX_NUM_ARABIC:
default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break;
}
Strm() << pOut;
@@ -684,7 +682,6 @@ void RtfExport::ExportDocument_Impl()
case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break;
case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break;
case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break;
- // case SVX_NUM_ARABIC:
default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break;
}
Strm() << pOut;
@@ -1207,7 +1204,6 @@ void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, BOOL bWriteReset,
AttrOutput().SectionPageNumbering(pAktPageDesc->GetNumType().GetNumberingType(), 0);
pAktPageDesc = pSave;
- //bOutPageDesc = bOldOut;
OSL_TRACE("%s end", OSL_THIS_FUNC);
}
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 9915fe1..9e10b7a 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -104,7 +104,6 @@ namespace
bool operator()(const SwTxtFmtColl *pA, const SwTxtFmtColl *pB) const
{
// --> OD 2009-02-04 #i98791#
-// return pA->GetAttrOutlineLevel() < pB->GetAttrOutlineLevel(); //<-end,zhaojianwei
bool bResult( false );
const bool bIsAAssignedToOutlineStyle( pA->IsAssignedToListLevelOfOutlineStyle() );
const bool bIsBAssignedToOutlineStyle( pB->IsAssignedToListLevelOfOutlineStyle() );
@@ -296,8 +295,6 @@ namespace sw
mxIPRef(rObj.GetObjRef()), mrPers(rPers),
mpGraphic( rObj.GetGraphic() )
{
- //rObj.SetPersistName(String());
- //rObj.SetObjRef(0);
rObj.AbandonObject();
}
@@ -320,7 +317,6 @@ namespace sw
rName,
::rtl::OUString() );
- //mxIPRef->changeState( embed::EmbedStates::LOADED );
mxIPRef = 0;
}
@@ -845,12 +841,6 @@ namespace sw
}
return nRet;
}
-/*
- std::vector<String> WrtRedlineAuthor::GetNames()
- {
- return maAuthors;
- }
-*/
}
}
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index b536524..b4a1b14 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -638,7 +638,6 @@ namespace sw
nScript);
if (nEnd2 < 0)
break;
-// nPos = writer_cast<xub_StrLen>(nEnd2);
nPos = static_cast< xub_StrLen >(nEnd2);
aScripts.push_back(ScriptEntry(nPos, nScript));
nScript = pBreakIt->GetBreakIter()->getScriptType(rTxt, nPos);
@@ -666,7 +665,6 @@ namespace sw
if (aBiDiIter != aBiDiEnd)
{
if (aBiDiIter->first < nMinPos)
-// nMinPos = writer_cast<xub_StrLen>(aBiDiIter->first);
nMinPos = static_cast< xub_StrLen >(aBiDiIter->first);
bCharIsRTL = aBiDiIter->second;
}
@@ -888,7 +886,6 @@ namespace sw
{
// MM We have to escape '/' in case it's used as a char
rParams.Replace(nI, 1, CREATE_CONST_ASC("\\/"));
- // rParams.Insert( nI, '\\' );
nI++;
nLen++;
}
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 866bb5f..3591eb7 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -867,7 +867,6 @@ xub_StrLen MSWord_SdrAttrIter::SearchNext( xub_StrLen nStartPos )
SetCharSet(rHt, true);
}
-//?? if( pHt->GetEnd() ) // Attr mit Ende
{
nPos = rHt.nEnd; // gibt letztes Attr-Zeichen + 1
if( nPos >= nStartPos && nPos < nMinPos )
@@ -876,16 +875,7 @@ xub_StrLen MSWord_SdrAttrIter::SearchNext( xub_StrLen nStartPos )
SetCharSet(rHt, false);
}
}
-/* else
- { // Attr ohne Ende
- nPos = rHt.nStart + 1; // Laenge 1 wegen CH_TXTATR im Text
- if( nPos >= nStartPos && nPos < nMinPos )
- {
- nMinPos = nPos;
- SetCharSet(rHt, false);
- }
- }
-*/
+
}
return nMinPos;
}
@@ -1567,7 +1557,6 @@ INT32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId)
instead ==> allows unicode text to be preserved
*/
#ifdef OLE_PREVIEW_AS_EMF
- //Graphic aGraphic = wwUtility::MakeSafeGDIMetaFile(xObj);
Graphic* pGraphic = rOLENd.GetGraphic();
#endif
OpenContainer(ESCHER_SpContainer);
@@ -2019,13 +2008,6 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
aPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 );
aPropOpt.AddOpt( ESCHER_Prop_lineWidth, 0 );
-// winword defaults!
-// aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 );
-// aPropOpt.AddOpt( ESCHER_Prop_lineWidth, 0 );
-// aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x80000 );
-// aPropOpt.AddOpt( ESCHER_Prop_bWMode, 0x9 );
-// aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 );
-
aPropOpt.Commit( *pStrm );
AddAtom( 4, ESCHER_ClientData );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 79da540..f470985 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1781,9 +1781,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
AppendWordBookmark( sBkmkName );
}
- //Would need to move into WW8Export, probably not worth it
- //ASSERT( pO->Count(), " pO ist am Zeilenanfang nicht leer" );
-
String aStr( rNode.GetTxt() );
xub_StrLen nAktPos = 0;
@@ -2568,13 +2565,6 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
}
if( !bDone )
{
- // ein NICHT zeichengebundener Rahmen liegt vor
-
- // --> OD 2007-04-19 #i43447# - removed
-// const SwFmtFrmSize& rS = rFrmFmt.GetFrmSize();
-// nFlyWidth = rS.GetWidth(); // Fuer Anpassung Graphic-Groesse
-// nFlyHeight = rS.GetHeight();
- // <--
m_rWW8Export.SaveData( nStt, nEnd );
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 56ffae3..9d9e3c8 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -609,10 +609,8 @@ void WW8Export::Out_WwNumLvl( BYTE nWwLevel )
void WW8Export::Out_SwNumLvl( BYTE nSwLevel )
{
- // --> OD 2008-04-02 #refactorlists#
-// ASSERT(IsNum(nSwLevel), "numbered?");
+
ASSERT( nSwLevel < MAXLEVEL, "numbered?");
- // <--
Out_WwNumLvl( nSwLevel + 1 );
}
@@ -650,9 +648,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, BYTE*& rpCh,
if (1 < rCharLen)
{
- // --> OD 2006-06-27 #b6440955#
-// const Font& rFont = rFmt.GetBulletFont() ? *rFmt.GetBulletFont()
-// : SwNumRule::GetDefBulletFont();
+ // --> #b6440955#
const Font& rFont = rFmt.GetBulletFont()
? *rFmt.GetBulletFont()
: numfunc::GetDefBulletFont();
@@ -922,11 +918,7 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
aFmt.GetNumberingType() == SVX_NUM_BITMAP
)
{
- // Aufzaehlung
- // --> OD 2008-04-02 #refactorlists#
-// Out_WwNumLvl(bNoNum ? 12 : 11);
Out_WwNumLvl(11);
- // <--
Out_NumRuleAnld(*pRul, aFmt, 11);
bRet = false;
}
@@ -935,21 +927,13 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
(pRul->Get(1).GetIncludeUpperLevels() <= 1)
)
{
- // Nummerierung
- // --> OD 2008-04-02 #refactorlists#
-// Out_WwNumLvl(bNoNum ? 12 : 10);
Out_WwNumLvl(10);
- // <--
Out_NumRuleAnld(*pRul, aFmt, 10);
bRet = false;
}
else
{
- // Gliederung
- // --> OD 2008-04-02 #refactorlists#
-// Out_SwNumLvl(bNoNum ? 12 : nSwLevel);
Out_SwNumLvl(nSwLevel);
- // <--
Out_NumRuleAnld(*pRul, aFmt, nSwLevel);
}
return bRet;
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index be01cee..7e55f86 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -197,8 +197,6 @@ USHORT MSWordStyles::BuildGetSlot( const SwFmt& rFmt )
nRet -= RES_POOLCOLL_HEADLINE1-1;
break;
- //case RES_POOLCHR_FOOTNOTE_ANCHOR: nRet =
- //case RES_POOLCHR_ENDNOTE_ANCHOR:
default:
nRet = nUsedSlots++;
break;
@@ -2157,7 +2155,6 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, BYTE nTTyp,
const SvULongs* pShapeIds = GetShapeIdArr();
ASSERT( pShapeIds, "wo sind die ShapeIds?" );
- // nLen = pTxtPos->Count();
for ( i = 0; i < nLen; ++i )
{
// write textbox story - FTXBXS
@@ -2248,11 +2245,6 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, BYTE nTTyp,
SwWW8Writer::FillCount(*rWrt.pTableStrm, 9 - nNameLen);
}
- //SVBT16 ibst; // index into GrpXstAtnOwners
- //SVBT16 ak; // not used
- //SVBT16 grfbmc; // not used
- //SVBT32 ITagBkmk; // when not -1, this tag identifies the
-
SwWW8Writer::WriteShort( *rWrt.pTableStrm, nFndPos );
SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 );
SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 );
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c878cd7..1e34fde 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -209,7 +209,6 @@ public:
void Write( WW8Export& rWrt );
void MoveFieldMarks(ULONG nFrom,ULONG nTo);
-// String GetWWBkmkName( const String& rName ) const;
};
#define ANZ_DEFAULT_STYLES 16
@@ -1797,7 +1796,6 @@ void MSWordExportBase::SaveData( ULONG nStt, ULONG nEnd )
bOutTable = false;
// Caution: bIsInTable should not be set here
bOutFlyFrmAttrs = false;
-// pAttrSet = 0;
bStartTOX = false;
bInWriteTOX = false;
@@ -2887,9 +2885,6 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
pFlyOffset = 0;
eNewAnchorType = FLY_AT_PAGE;
nTxtTyp = TXT_MAINTEXT;
- // --> OD 2007-04-19 #i43447# - removed
-// nFlyWidth = nFlyHeight = 0;
- // <--
nStyleBeforeFly = nLastFmtId = 0;
pStyAttr = 0;
pCurrentStyle = NULL;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 7988df8..1b7c356 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -697,21 +697,6 @@ void SwWW8WrGrf::WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rGrfNd,
String aFileN;
rGrfNd.GetFileFilterNms( &aFileN, 0 );
- // --> OD 2007-06-06 #i29408# - take the file URL as it is.
-// aFileN = URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(),
-// aFileN);
-// INetURLObject aUrl( aFileN );
-// if( aUrl.GetProtocol() == INET_PROT_FILE )
-// aFileN = aUrl.PathToFileName();
- // <--
-
-//JP 05.12.98: nach einigen tests hat sich gezeigt, das WW mit 99 nicht
-// klarkommt. Sie selbst schreiben aber bei Verknuepfunfen,
-// egal um welchen Type es sich handelt, immer den Wert 94.
-// Bug 59859
-// if ( COMPARE_EQUAL == aFiltN.ICompare( "TIF", 3 ) )
-// mm = 99; // 99 = TIFF
-// else
UINT16 mm = 94; // 94 = BMP, GIF
WritePICFHeader(rStrm, rFly, mm, nWidth, nHeight,
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index a2163be..88d990c 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -688,12 +688,9 @@ void WW8AttributeOutput::OutlineNumbering( BYTE nLvl, const SwNumFmt &rNFmt, con
else
{
m_rWW8Export.Out_SwNumLvl( nLvl );
- // --> OD 2008-06-03 #i86652#
-// if (rNFmt.GetAbsLSpace())
if ( rNFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
rNFmt.GetAbsLSpace() )
- // <--
{
SwNumFmt aNumFmt( rNFmt );
const SvxLRSpaceItem& rLR =
@@ -767,12 +764,9 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
if ( bStyDef )
AttrOutput().OutlineNumbering( static_cast< BYTE >( nLvl ), rNFmt, rFmt );
- // --> OD 2008-06-03 #i86652#
-// if (rNFmt.GetAbsLSpace())
if ( rNFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
rNFmt.GetAbsLSpace() )
- // <--
{
SfxItemSet aSet( rFmt.GetAttrSet() );
SvxLRSpaceItem aLR(
@@ -2089,8 +2083,6 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
}
break;
-// case TOX_AUTHORITIES: eCode = eTOA; sStr = ???; break;
-
case TOX_ILLUSTRATIONS:
case TOX_OBJECTS:
case TOX_TABLES:
@@ -2115,8 +2107,6 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
}
break;
-// case TOX_USER:
-// case TOX_CONTENT:
default:
{
sStr = FieldString(eCode);
@@ -2139,39 +2129,8 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
if( nsSwTOXElement::TOX_OUTLINELEVEL & pTOX->GetCreateType() )
{
- // --> OD 2009-02-27 #i99641#
- // The following code does not determine the minimum outline
- // level for the TOC
-// // Search over all the outline styles used and figure out
-// // what is the minimum outline level we need to display
-// // (ignoring headline styles 1-9)
-// //BYTE nLvl = 0, nMinLvl = 0; //#outline level, removed by zhaojianwei
-// int nLvl = 0, nMinLvl = 0; //<-end,add by zhaojianwei
-// const SwTxtFmtColls& rColls = *GetExport().pDoc->GetTxtFmtColls();
-// const SwTxtFmtColl* pColl;
-// for( n = rColls.Count(); n; )
-// {
-// pColl = rColls[ --n ];
-// //nLvl = pColl->GetOutlineLevel(); //#outline level,zhaojianwei
-// //USHORT nPoolId = pColl->GetPoolFmtId();
-// //if( MAXLEVEL > nLvl && nMinLvl < nLvl && //<-end, ->add by zhaojianwei
-// USHORT nPoolId = pColl->GetPoolFmtId();
-// if( pColl->IsAssignedToListLevelOfOutlineStyle() &&
-// nMinLvl < (nLvl = pColl->GetAssignedOutlineStyleLevel()) && //<-end,zhaojianwei
-// ( RES_POOLCOLL_HEADLINE1 > nPoolId ||
-// RES_POOLCOLL_HEADLINE9 < nPoolId ))
-// {
-// // If we are using the default heading styles then use nTOXLvl
-// if(!nMinLvl)
-// nLvl = nTOXLvl;
-// else
-// nLvl = nMinLvl < nTOXLvl ? nMinLvl : (BYTE)nTOXLvl;
-// nMinLvl = nLvl;
-// }
-// }
const int nMinLvl = nTOXLvl;
-// if( nLvl )
if ( nMinLvl > 0 )
{
int nTmpLvl = nMinLvl;
@@ -2183,34 +2142,6 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
sStr.AppendAscii(sEntryEnd);
}
- // <--
-
- // --> OD 2009-02-27 #i99641#
- // not needed to additional export paragraph style with
- // an outline level to the /t option
-// if( nMinLvl > 0 )
-// // <--
-// {
-// // collect this templates into the \t otion
-// const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
-// const SwTxtFmtColl* pColl;
-// int nLvl = 0;
-// for( n = rColls.Count(); n;)
-// {
-// pColl = rColls[--n];
-// //nLvl = pColl->GetOutlineLevel(); //#outline level, removed by zhaojianwei
-// //if (MAXLEVEL > nLvl && nMinLvl <= nLvl)
-// //{ //<-end, ->add by zhaojianwei
-// if( pColl->IsAssignedToListLevelOfOutlineStyle() &&
-// nMinLvl <= ( nLvl = pColl->GetAssignedOutlineStyleLevel()))
-// { //<-end,zhaojianwei
-// if( sTOption.Len() )
-// sTOption += ';';
-// (( sTOption += pColl->GetName() ) += ';' )
-// += String::CreateFromInt32( nLvl + 1 );
-// }
-// }
-// }
}
@@ -2416,7 +2347,6 @@ bool MSWordExportBase::GetNumberFmt(const SwField& rFld, String& rStr)
const SvNumberformat* pNumFmt = pNFmtr->GetEntry( nFmtIdx );
if( pNumFmt )
{
- //USHORT nLng = rFld.GetLanguage();
LocaleDataWrapper aLocDat( pNFmtr->GetServiceManager(),
MsLangId::convertLanguageToLocale( LANGUAGE_ENGLISH_US ) );
@@ -3644,9 +3574,6 @@ void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
{
switch ( rBreak.GetBreak() )
{
- // JP 21.06.99: column breaks never change to pagebreaks
- // case SVX_BREAK_COLUMN_BEFORE:
- // case SVX_BREAK_COLUMN_BOTH:
case SVX_BREAK_NONE:
case SVX_BREAK_PAGE_BEFORE:
case SVX_BREAK_PAGE_BOTH:
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 23bf0d6..295489c 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1055,14 +1055,12 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
aSprmIter++;
}
- //if( bRead_Obj || bRead_PicLoc ) break;
if( !nLoop )
{
pChp->GetPCDSprms( aDesc );
aSprmIter.SetSprms( aDesc.pMemPos,
aDesc.nSprmsLen );
}
- //if( bRead_Obj || bRead_PicLoc ) break;
}
aSave.Restore(this);
bEmbeddObj=bOldEmbeddObj;
@@ -1852,13 +1850,6 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
SdrShadowXDistItem);
const INT32 nShdDistY = WW8ITEMVALUE(rOldSet, SDRATTR_SHADOWYDIST,
SdrShadowYDistItem);
- //const USHORT nShdTrans= WW8ITEMVALUE(rOldSet,
- // SDRATTR_SHADOWTRANSPARENCE, SdrShadowTransparenceItem);
-
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- //
- // SfxVoidItem( SDRATTR_SHADOW3D )
- // SfxVoidItem( SDRATTR_SHADOWPERSP )
aShadow.SetColor( Color( aShdColor ) );
@@ -2034,16 +2025,6 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins(
//Remove top margin if aligned vertically inside margin
if ((rRecord.nYAlign == 4) && (nYRelTo == 0))
rUL.SetUpper((USHORT)0);
-
- /*
- // Something like this needs to be done once inside and outside are
- // fixed
- if (rRecord.nYAlign == 4)
- {
- if (rRecord.nYRelTo == 0)
- rUL.SetUpper((USHORT)0);
- }
- */
}
void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
@@ -2446,7 +2427,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
if ( nInTable &&
( eHoriRel == text::RelOrientation::FRAME || eHoriRel == text::RelOrientation::CHAR ) &&
pFSPA->nwr == 3 &&
-// pRecord->nLayoutInTableCell == 0x80000000 )
!IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell ) )
{
eHoriRel = text::RelOrientation::PAGE_PRINT_AREA;
@@ -2651,13 +2631,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
}
- // OD 14.10.2003 - keep wrapping of objects in page header/footer.
- /*
- //#108778# when in a header or footer word appears to treat all elements
- //are wrap through
- if (bIsHeader || bIsFooter)
- pF->nwr = 3;
- */
+ //#108778# when in a header or footer word appears to treat all elements as wrap through
// Umfluss-Modus ermitteln
SfxItemSet aFlySet(rDoc.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1);
@@ -2739,13 +2713,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
if (!pRecord)
return 0;
- // --> OD 2008-04-10 #i84783#
-// //cmc: We're in a table, and the element has the magic Word XP bit set
-// //to enable layout inside a cell
-// // --> OD 2005-08-10 #124714# - undo change made for issue #i33442#
-// bool bLayoutInTableCell = ( nInTable &&
-// pRecord->nLayoutInTableCell & 0x00008000 );
-// // <--
const bool bLayoutInTableCell =
nInTable && IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell );
// <--
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 29633f9..81a26dc 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -292,26 +292,6 @@ bool SwWW8ImplReader::ReadGrafFile(String& rFileName, Graphic*& rpGraphic,
if (pWwFib->envr != 1) // !MAC als Creator
{
-
-/* SJ: #i40742#, we will use the prefsize from the mtf directly.
-The scaling has been done in former days, because the wmf filter was sometimes not
-able to calculate the proper prefsize (especially if the wmf fileheader was missing)
-
-
- aWMF.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
- // MetaFile auf neue Groesse skalieren und
- // neue Groesse am MetaFile setzen
- if (rPic.MFP.xExt && rPic.MFP.yExt)
- {
- Size aOldSiz(aWMF.GetPrefSize());
- Size aNewSiz(rPic.MFP.xExt, rPic.MFP.yExt );
- Fraction aFracX(aNewSiz.Width(), aOldSiz.Width());
- Fraction aFracY(aNewSiz.Height(), aOldSiz.Height());
-
- aWMF.Scale(aFracX, aFracY);
- aWMF.SetPrefSize(aNewSiz);
- }
-*/
rpGraphic = new Graphic( aWMF );
return true;
}
@@ -785,21 +765,6 @@ void WW8PicShadowToReal( WW8_PIC_SHADOW * pPicS, WW8_PIC * pPic )
void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA )
{
- //long nSpId; //Shape Identifier. Used in conjunction with the office art data (found via fcDggInfo in the FIB) to find the actual data for this shape.
- //long nXaLeft; //left of rectangle enclosing shape relative to the origin of the shape
- //long nYaTop; //top of rectangle enclosing shape relative to the origin of the shape
- //long nXaRight; //right of rectangle enclosing shape relative to the origin of the shape
- //long nYaBottom;//bottom of the rectangle enclosing shape relative to the origin of the shape
- //USHORT bHdr:1;
- //USHORT nbx:2;
- //USHORT nby:2;
- //USHORT nwr:4;
- //USHORT nwrk:4;
- //USHORT bRcaSimple:1;
- //USHORT bAnchorLock:1;
- //long nTxbx; //count of textboxes in shape (undo doc only)
-
-
pFSPA->nSpId = SVBT32ToUInt32( pFSPAS->nSpId );
pFSPA->nXaLeft = SVBT32ToUInt32( pFSPAS->nXaLeft );
pFSPA->nYaTop = SVBT32ToUInt32( pFSPAS->nYaTop );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 261ab11..958b857 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -449,7 +449,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
(pImpRec->eShapeType == mso_sptTextSimple) ||
(
(pImpRec->eShapeType == mso_sptRectangle)
- // && (eWrapMode == mso_wrapSquare)
&& ShapeHasText(pImpRec->nShapeId, rObjData.rSpHd.GetRecBegFilePos() )
)
);
@@ -658,13 +657,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
eTVA = SDRTEXTVERTADJUST_BOTTOM;
}
break;
-/*
- case mso_anchorTopBaseline:
- case mso_anchorBottomBaseline:
- case mso_anchorTopCenteredBaseline:
- case mso_anchorBottomCenteredBaseline:
- break;
-*/
default:
;
}
@@ -1511,7 +1503,6 @@ void SwWW8ImplReader::ImportDop()
// #110055# disable form design mode to be able to use imported controls directly
// #i31239# always disable form design mode, not only in protected docs
-// if (pWDop->fProtEnabled)
{
using namespace com::sun::star;
@@ -1873,10 +1864,7 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
}
else
{
- // --> OD 2008-08-06 #150965#
- // Always read title page header/footer data - it could be used by following sections
-// nWhichItems =
-// rSection.maSep.grpfIhdt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST),
+ // #150965# - Always read title page header/footer data - it could be used by following sections
nWhichItems = ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST );
// <--
pPD = rSection.mpTitlePage;
@@ -3566,10 +3554,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
mySegIter &rStart, bool bIgnoreCols)
{
SwFmtPageDesc aEmpty;
- // --> OD 2008-08-06 #150965#
- // Always read title page header/footer data - it could be used by following sections
-// if (rIter->HasTitlePage())
- // <--
+ // #150965# - Always read title page header/footer data - it could be used by following sections
{
if (IsNewDoc() && rIter == rStart)
{
@@ -3948,7 +3933,6 @@ void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameCon
rtl::OUString templateNameWithExt = aObj.GetLastName();
rtl::OUString templateName;
sal_Int32 nIndex = templateNameWithExt.lastIndexOf( '.' );
- //xPrjNameCache->insertByName( templateNameWithExt, uno::makeAny( sVBAProjName ) );
if ( nIndex != -1 )
{
templateName = templateNameWithExt.copy( 0, nIndex );
@@ -4264,8 +4248,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
SwEndNoteInfo aInfo;
aInfo = rDoc.GetEndNoteInfo(); // parallel zu Ftn
- // Ich kann nicht setzen, wann neu nummerieren...
- // aInfo.eNum = eNumA[pWDop->pDop->rncEdn];
aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[pWDop->nfcEdnRef]) );
if( pWDop->nEdn )
aInfo.nFtnOffset = pWDop->nEdn - 1;
@@ -4836,7 +4818,6 @@ public:
outlineeq(BYTE nNum) : mnNum(nNum) {}
bool operator()(const SwTxtFmtColl *pTest) const
{
- //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei
return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei
}
};
@@ -4852,7 +4833,6 @@ void SwWW8ImplReader::SetOutLineStyles()
// <aOutlineRule>, because its used below to be compared this <&aOutlineRule>.
// But at the end of the method <mpChosenOutlineNumRule> has to be set to
// <rDoc.GetOutlineNumRule()>, because <aOutlineRule> will be destroyed.
-// mpChosenOutlineNumRule = rDoc.GetOutlineNumRule();
mpChosenOutlineNumRule = &aOutlineRule;
// <--
@@ -4875,8 +4855,6 @@ void SwWW8ImplReader::SetOutLineStyles()
for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter)
// <--
{
- //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei,
- //nFlagsStyleOutlLevel |= 1 << (*aIter)->GetOutlineLevel();
if ((*aIter)->IsAssignedToListLevelOfOutlineStyle())
nFlagsStyleOutlLevel |= 1 << (*aIter)->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
else
@@ -4946,8 +4924,6 @@ void SwWW8ImplReader::SetOutLineStyles()
for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter)
// <--
{
- //if ((*aIter)->GetOutlineLevel() < MAXLEVEL)//#outline level,zhaojianwei
- // (*aIter)->SetOutlineLevel(NO_NUMBERING);
if((*aIter)->IsAssignedToListLevelOfOutlineStyle())
(*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end
@@ -4977,7 +4953,6 @@ void SwWW8ImplReader::SetOutLineStyles()
*/
rSI.pFmt->SetFmtAttr(
SwNumRuleItem( rSI.pOutlineNumrule->GetName() ) );
- //((SwTxtFmtColl*)rSI.pFmt)->SetOutlineLevel(NO_NUMBERING);
((SwTxtFmtColl*)rSI.pFmt)->DeleteAssignmentToListLevelOfOutlineStyle();//#outline level,zhaojianwei
}
else
@@ -4999,7 +4974,6 @@ void SwWW8ImplReader::SetOutLineStyles()
myParaStyleIter aEnd = aOutLined.end();
while (aResult != aEnd && aCmp(*aResult))
{
- //(*aResult)->SetOutlineLevel(NO_NUMBERING);//#outline level,zhaojianwei
(*aResult)->DeleteAssignmentToListLevelOfOutlineStyle();
++aResult;
}
@@ -5019,8 +4993,6 @@ void SwWW8ImplReader::SetOutLineStyles()
BYTE nToLevel = rSI.nOutlineLevel;
const SwNumFmt& rRule=rSI.pOutlineNumrule->Get(nFromLevel);
aOutlineRule.Set(nToLevel, rRule);
- // Set my outline level
- //((SwTxtFmtColl*)rSI.pFmt)->SetOutlineLevel(nToLevel);//#outline level,zhaojianwei
((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei
// If there are more styles on this level ignore them
nFlagsStyleOutlLevel |= nAktFlags;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 9fa424f..3966867 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -132,11 +132,6 @@ struct WW8TabBandDesc
sal_uInt32* pNewSHDs;
WW8_BRC aDefBrcs[6];
-
- // nur fuer WW6-7: diese Zelle hat WW-Flag bMerged (horizontal) gesetzt
- //bool bWWMergedVer6[MAX_COL];
-
-
bool bExist[MAX_COL]; // Existiert diese Zelle ?
UINT8 nTransCell[MAX_COL + 2]; // UEbersetzung WW-Index -> SW-Index
@@ -652,7 +647,6 @@ static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV, BYTE nSwLevel )
if ((SVBT8ToByte(rAV.aBits1 ) & 0x4) >> 2)
rNum.SetIncludeUpperLevels(nSwLevel + 1);
rNum.SetStart( SVBT16ToShort( rAV.iStartAt ) );
-// rNum.eNumAdjust = eAdjA[rAV.jc];
rNum.SetNumAdjust( eAdjA[SVBT8ToByte( rAV.aBits1 ) & 0x3] );
rNum.SetCharTextDistance( SVBT16ToShort( rAV.dxaSpace ) );
@@ -716,8 +710,6 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV &rAV,
else
{ // Nummerierung / Aufzaehlung
bInsert = true;
-// if( SVBT16ToShort( rAV.ftc ) == 1
-// || SVBT16ToShort( rAV.ftc ) == 3 ){ // Symbol / WingDings
if( bListSymbol )
{
FontFamily eFamily;
@@ -726,18 +718,14 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV &rAV,
if( GetFontParams( SVBT16ToShort( rAV.ftc ), eFamily, aName,
ePitch, eCharSet ) ){
-// USHORT nSiz = ( SVBT16ToShort( rAV.hps ) ) ?
-// SVBT16ToShort( rAV.hps ) : 24; // Groesse in 1/2 Pt
-// darf nach JP nicht gesetzt werden, da immer die Size
-// genommen wird, die am ZeilenAnfang benutzt wird
+
Font aFont;
aFont.SetName( aName );
aFont.SetFamily( eFamily );
-// aFont.SetPitch( ePitch ); // darf nach JP nicht
+
aFont.SetCharSet( eCharSet );
rNum.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-// if( rAV.ico ) // geht in UI und SWG-Writer/Reader nicht
-// aFont.SetColor( Color( GetCol( rAV.ico ) ) );
+
rNum.SetBulletFont( &aFont );
// take only the very first character
@@ -800,7 +788,6 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) );
// --> OD 2008-06-04 #i86652#
-// USHORT nRul = rDoc.MakeNumRule( aName );
USHORT nRul = rDoc.MakeNumRule( aName, 0, FALSE,
SvxNumberFormat::LABEL_ALIGNMENT );
// <--
@@ -833,7 +820,6 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen )
{
nSwNumLevel = *pData - 1;
if (!bNoAttrImport)
- //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei
((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); //<-end,zhaojianwei
// Bei WW-NoNumbering koennte auch NO_NUMBERING gesetzt
// werden. ( Bei normaler Nummerierung muss NO_NUM gesetzt
@@ -1026,7 +1012,6 @@ void SwWW8ImplReader::StartAnl(const BYTE* pSprm13)
if (!pNumRule)
{
// --> OD 2008-06-04 #i86652#
-// pNumRule = rDoc.GetNumRuleTbl()[rDoc.MakeNumRule(sNumRule)];
pNumRule = rDoc.GetNumRuleTbl()[
rDoc.MakeNumRule( sNumRule, 0, FALSE,
SvxNumberFormat::LABEL_ALIGNMENT ) ];
@@ -2362,43 +2347,6 @@ void WW8TabDesc::CalcDefaults()
disjoint upper and lowers to see what happens there.
*/
- /* #i29550# FME 2004-06-02 Removed this code because of the implementation
- of the collapsing table borders model. So this should not be necessary
- anymore. */
-
- /* for (pR = pFirstBand; pR; pR = pR->pNextBand)
- {
- WW8TabBandDesc *pNext = pR->pNextBand;
- if (!pNext)
- break;
-
- for (int k = 0; k < pR->nWwCols; ++k)
- {
- WW8_BRC &rAbove = pR->pTCs[k].rgbrc[WW8_BOT];
- short nAboveThick = rAbove.IsEmpty(pIo->bVer67) ?
- 0 : rAbove.DetermineBorderProperties(pIo->bVer67);
- short nUpperLeft = pR->nCenter[k];
- short nUpperRight = pR->nCenter[k+1];
-
- for (int l = 0; l < pNext->nWwCols; ++l)
- {
- short nLowerLeft = pNext->nCenter[l];
- short nLowerRight = pNext->nCenter[l+1];
-
- if ((nLowerLeft < nUpperLeft) || (nLowerRight > nUpperRight))
- continue;
-
- WW8_BRC &rBelow = pNext->pTCs[l].rgbrc[WW8_TOP];
- short nBelowThick = rBelow.IsEmpty(pIo->bVer67) ?
- 0 : rBelow.DetermineBorderProperties(pIo->bVer67);
- if (nAboveThick > nBelowThick)
- rBelow = rAbove;
- }
-
- rAbove = WW8_BRC();
- }
- } */
-
if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) ||
(nMinLeft != -108 && bIsBiDi && text::HoriOrientation::RIGHT == eOri)) // Word sets the first nCenter value to -108 when no indent is used
eOri = text::HoriOrientation::LEFT_AND_WIDTH; // absolutely positioned
@@ -3931,10 +3879,6 @@ void WW8RStyle::Set1StyleDefaults()
if (!bFontChanged) // Style has no Font? set the default,
{
pIo->SetNewFontAttr(ftcAsci, true, RES_CHRATR_FONT);
- /* removed by a patch from cmc for #i52786#
- if (pIo->bVer67)
- SetStyleCharSet(pIo->pCollA[pIo->nAktColl]);
- */
}
if( !pIo->bNoAttrImport )
@@ -4177,10 +4121,6 @@ void WW8RStyle::PostProcessStyles()
void WW8RStyle::ScanStyles() // untersucht Style-Abhaengigkeiten
{ // und ermittelt die Filepos fuer jeden Style
- /*
- WW8_FC nStyleStart = rFib.fcStshf;
- pStStrm->Seek( nStyleStart );
- */
for (USHORT i = 0; i < cstd; ++i)
{
short nSkip;
@@ -4264,7 +4204,6 @@ std::vector<BYTE> ChpxToSprms(const Word2CHPX &rChpx)
SVBT16 a;
ShortToSVBT16(rChpx.hps, a);
aRet.push_back(a[0]);
-// aRet.push_back(a[1]);
}
if (rChpx.fsPos)
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index cae7e92..bbf36bf 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1033,7 +1033,6 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
if( !pFmt )
{
// --> OD 2006-06-27 #b6440955#
-// aFont = SwNumRule::GetDefBulletFont();
aFont = numfunc::GetDefBulletFont();
// <--
}
@@ -1060,7 +1059,6 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
String sPrefix(CREATE_CONST_ASC("WW8Num"));
sPrefix += String::CreateFromInt32(nUniqueList++);
// --> OD 2008-06-04 #i86652#
-// sal_uInt16 nRul = rDoc.MakeNumRule(rDoc.GetUniqueNumRuleName(&sPrefix));
sal_uInt16 nRul =
rDoc.MakeNumRule( rDoc.GetUniqueNumRuleName(&sPrefix), 0, FALSE,
SvxNumberFormat::LABEL_ALIGNMENT );
@@ -1518,7 +1516,6 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
// #i25545#
// --> OD 2009-03-12 #i100132# - a number format does not have to exist on given list level
-// SwNumFmt pFmt(*(pLFOInfo->pNumRule->GetNumFmt(nLevel)));
SwNumFmt pFmt(pLFOInfo->pNumRule->Get(nLevel));
// <--
if (rReader.IsRightToLeft() && nLastLFOPosition != nLFOPosition) {
@@ -1666,8 +1663,6 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
// could contain more than one outline numbering rule and the one
// of the text format isn't the one, which a chosen as the Writer
// outline rule.
-// pTxtNode->
-// SetLevel(((SwTxtFmtColl*) rStyleInfo.pFmt)->GetOutlineLevel());
pTxtNode->SetAttrListLevel( rStyleInfo.nOutlineLevel );
// <--
}
@@ -1845,11 +1840,6 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
}
}
// --> OD 2005-10-17 #126238#
- // - re-introduce fix for issue #i49037#, which got lost by
- // accident on a re-synchronisation on the master.
-// if (pTxtNd->IsOutline() && pTxtNd->Len() == 0)
-// pTxtNd->SetCounted(false);
- // <--
pTxtNd->SetAttrListLevel(nActLevel);
// --> OD 2005-11-01 #126924#
@@ -2014,10 +2004,6 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
else if (SwTxtNode* pTxtNode = pPaM->GetNode()->GetTxtNode())
{
// --> OD 2005-10-21 #i54393#
- // - Reset hard set numbering rule at paragraph instead of
- // setting hard no numbering.
-// pTxtNode->SwCntntNode::SetAttr
-// (*GetDfltAttr(RES_PARATR_NUMRULE));
pTxtNode->ResetAttr( RES_PARATR_NUMRULE );
// <--
pTxtNode->SetCountedInList(false);
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 897f36d..e684458 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -75,7 +75,6 @@ struct OLE_MFP
using namespace ::com::sun::star;
-// SV_IMPL_OP_PTRARR_SORT(WW8AuthorInfos, WW8AuthorInfo_Ptr)
SV_IMPL_OP_PTRARR_SORT(WW8OleMaps, WW8OleMap_Ptr)
static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index b6a55e5..b80cdcf 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -153,13 +153,12 @@ _ReadFieldParams::_ReadFieldParams( const String& _rData )
nFnd = nNext;
nSavPtr = nNext;
-// cLastChar = aData.GetChar( nSavPtr );
}
_ReadFieldParams::~_ReadFieldParams()
{
-// aData.SetChar( nSavPtr, cLastChar );
+
}
@@ -670,10 +669,6 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat,
// Am Ende des Einlesens entsprechende Felder updaten ( z.Zt. die Referenzen )
void SwWW8ImplReader::UpdateFields()
{
-// rDoc.GetSysFldType( RES_GETREFFLD )->UpdateFlds(); // Referenzen
-// rDoc.UpdateFlds(); // SetExp-Fields
-// rDoc.UpdateFlds(); // alles ???
-// rDoc.UpdateExpFlds(); // SetExp-Fields
rDoc.SetUpdateExpFldStat(true); // JP: neu fuer alles wichtige
rDoc.SetInitDBFields(true); // Datenbank-Felder auch
}
@@ -1725,13 +1720,6 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, String& rStr )
if( !bFldFound )
{
-/*
- SwUserFieldType aTmp( &rDoc, aDocProperty );
- aTmp.SetContent(GetFieldResult( pF ));
- SwUserField aUFld( (SwUserFieldType*)rDoc.InsertFldType( aTmp ));
- aUFld.ChangeFormat( UF_STRING );
- rDoc.Insert( *pPaM, SwFmtFld( aUFld ), 0);
-*/
SwDocInfoField aFld( (SwDocInfoFieldType*)
rDoc.GetSysFldType( RES_DOCINFOFLD ), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) );
rDoc.InsertPoolItem(*pPaM, SwFmtFld(aFld), 0);
@@ -2816,7 +2804,6 @@ bool SwWW8ImplReader::AddExtraOutlinesAsExtraStyles(SwTOXBase& rBase)
sal_uInt16 nStyleLevel = rSI.nOutlineLevel;
sal_uInt16 nMaxLevel = rBase.GetLevel();
if (
- //nStyleLevel != pFmt->GetOutlineLevel() && //#outline level,zhaojianwei
nStyleLevel != (pFmt->GetAttrOutlineLevel()-1) && //<-end,zhaojianwei
nStyleLevel < nMaxLevel
)
@@ -2968,7 +2955,6 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
::rtl::OUString aBookmarkName=(RTL_CONSTASCII_USTRINGPARAM("_TOC"));
maFieldStack.back().SetBookmarkName(aBookmarkName);
maFieldStack.back().SetBookmarkType(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_TOC)));
-// maFieldStack.back().AddParam(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")), aFormula.sToolTip);
return FLD_TEXT;
}
#endif
@@ -3496,7 +3482,6 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
::rtl::OUString aBookmarkName=(RTL_CONSTASCII_USTRINGPARAM("_HYPERLINK"));
maFieldStack.back().SetBookmarkName(aBookmarkName);
maFieldStack.back().SetBookmarkType(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_HYPERLINK)));
-// maFieldStack.back().AddParam(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")), aFormula.sToolTip);
return FLD_TEXT;
}
#endif
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index f93686c..9fa9f82 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -313,10 +313,6 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
aGrid.SetLines(writer_cast<sal_uInt16>(nTextareaHeight/nLinePitch));
aGrid.SetBaseHeight(writer_cast<sal_uInt16>(nLinePitch));
- // ruby height is not supported in ww8
- //sal_Int32 nRubyHeight = nLinePitch - nCharWidth;
- //if (nRubyHeight < 0)
- // nRubyHeight = 0;
sal_Int32 nRubyHeight = 0;
aGrid.SetRubyHeight(writer_cast<sal_uInt16>(nRubyHeight));
@@ -1234,12 +1230,6 @@ static bool _SetWW8_BRC(bool bVer67, WW8_BRC& rVar, const BYTE* pS)
BYTE lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap,
const WW8RStyle* pSty, const WW8PLCFx_SEPX* pSep)
{
-// Ausgegend von diesen defines:
-// #define WW8_TOP 0
-// #define WW8_LEFT 1
-// #define WW8_BOT 2
-// #define WW8_RIGHT 3
-// #define WW8_BETW 4
//returns a BYTE filled with a bit for each position that had a sprm
//setting that border
@@ -4764,7 +4754,6 @@ sal_uInt32 SwWW8ImplReader::ExtractColour(const BYTE* &rpData,
)
{
ASSERT(bVer67 == false, "Impossible");
- //ASSERT(SVBT32ToUInt32(rpData) == 0xFF000000, "Unknown 1 not 0xff000000");
sal_uInt32 nFore = wwUtility::BGRToRGB(SVBT32ToUInt32(rpData));
rpData+=4;
sal_uInt32 nBack = wwUtility::BGRToRGB(SVBT32ToUInt32(rpData));
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index ccb84ca..5199024 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5613,11 +5613,6 @@ WW8Fib::WW8Fib(BYTE nVer)
fExtChar = true;
fWord97Saved = fWord2000Saved = true;
- // diese Flags muessen nicht gesetzt werden; koennen aber.
- // wMagicCreated = wMagicRevised = 0x6a62;
- // wMagicCreatedPrivate = wMagicRevisedPrivate = 0xb3b2;
- //
-
wMagicCreated = 0x6143;
wMagicRevised = 0x6C6F;
wMagicCreatedPrivate = 0x6E61;
@@ -6741,7 +6736,6 @@ WW8Dop::WW8Dop(SvStream& rSt, INT16 nFib, INT32 nPos, sal_uInt32 nSize) : bUseTh
a32Bit = Get_Long( pData ); // 512 0x200
// i#78591#
- // fDontUseHTMLAutoSpacing = (a32Bit & 0x4) >> 2;
SetCompatabilityOptions2(a32Bit);
}
if (nRead >= 550)
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index e390c35..cebcaa6 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -445,10 +445,8 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
for ( USHORT n = 1; n < rColls.Count(); ++n )
{
SwTxtFmtColl* pColl = rColls[ n ];
- //if ( pColl->GetOutlineLevel() != NO_NUMBERING ) //#outline level zhaojianwei
if ( pColl->IsAssignedToListLevelOfOutlineStyle() )
{
- // aOutlineLevelAssigned[ pColl->GetOutlineLevel() ] = true;
aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;//<-end,zhaojianwei
}
@@ -471,14 +469,12 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
// --> OD 2007-01-11 #i73361#
// Do not change assignment of already created default outline style
// to a certain outline level.
-// if ( aCreatedDefaultOutlineStyles[ i ] != 0 && !aOutlineLevelAssigned[ i ] )
if ( !aOutlineLevelAssigned[ i ] &&
aCreatedDefaultOutlineStyles[ i ] != 0 &&
! aCreatedDefaultOutlineStyles[ i ]->IsAssignedToListLevelOfOutlineStyle() )
// <--
{
// apply outline level at created default outline style
- //aCreatedDefaultOutlineStyles[ i ]->SetOutlineLevel( i );
aCreatedDefaultOutlineStyles[ i ]->AssignToListLevelOfOutlineStyle(i);//#outline level added by zhaojianwei
// apply outline numbering rule, if none is set.
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index cf9f678..ac31a6b 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -204,35 +204,6 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
pStatusBarItem->GetValue() >>= xStatusIndicator;
}
-// try
-// {
-// uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel());
-// if (xModel.is())
-// {
-// uno::Sequence< beans::PropertyValue > xMediaDescr
-// uno::Reference<frame::XController> xController(
-// xModel->getCurrentController());
-// if( xController.is())
-// {
-// uno::Reference<frame::XFrame> xFrame( xController->getFrame());
-// if( xFrame.is())
-// {
-// uno::Reference<task::XStatusIndicatorFactory> xFactory(
-// xFrame, uno::UNO_QUERY );
-// if( xFactory.is())
-// {
-// xStatusIndicator =
-// xFactory->createStatusIndicator();
-// }
-// }
-// }
-// }
-// }
-// catch( const RuntimeException& )
-// {
-// xStatusIndicator = 0;
-// }
-
// set progress range and start status indicator
sal_Int32 nProgressRange(1000000);
if (xStatusIndicator.is())
@@ -472,8 +443,6 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
if( pDoc->GetRootFrm() && pDoc->GetDocStat().nPage > 1 &&
!(bOrganizerMode || bBlock || bErr) )
{
-// DBG_ASSERT( !pDoc->GetDocStat().bModified,
-// "doc stat is modified!" );
OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") );
try
{
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 06dcfe1..d2f555e 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -228,7 +228,6 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem )
{
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sValue );
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- // AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, ACP2WS(sXML_embed) );
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
}
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index ba0bde7..345c93d 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -321,7 +321,6 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
nRef += pDoc->GetCharFmts()->Count() - 1;
nRef += pDoc->GetFrmFmts()->Count() - 1;
nRef += pDoc->GetTxtFmtColls()->Count() - 1;
-// nRef += pDoc->GetPageDescCnt();
nRef *= 2; // for the above styles, xmloff will increment by 2!
// #i93174#: count all paragraphs for the progress bar
nRef += aDocStat.nAllPara; // 1: only content, no autostyle
@@ -813,9 +812,6 @@ Reference< XInterface > SAL_CALL SwXMLExportStyles_createInstance(
throw( Exception )
{
// #110680#
- //return (cppu::OWeakObject*)new SwXMLExport(
- // EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
- // EXPORT_FONTDECLS );
return (cppu::OWeakObject*)new SwXMLExport( rSMgr,
EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
EXPORT_FONTDECLS|EXPORT_OASIS );
@@ -840,9 +836,6 @@ Reference< XInterface > SAL_CALL SwXMLExportContent_createInstance(
throw( Exception )
{
// #110680#
- //return (cppu::OWeakObject*)new SwXMLExport(
- // EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS |
- // EXPORT_FONTDECLS );
return (cppu::OWeakObject*)new SwXMLExport(
rSMgr,
EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS |
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index e63a7ac..1d5ce7d 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -949,12 +949,6 @@ OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nFamily ) const
void SwXMLStylesContext_Impl::EndElement()
{
GetSwImport().InsertStyles( IsAutomaticStyle() );
- // --> OD 2006-10-11 #i69629#
- // assign paragraph styles to list levels of outline style after all styles
- // are imported and finished.
-// if( !bAutoStyles )
-// GetImport().GetTextImport()->SetOutlineStyles( sal_True );
- // <--
}
// ---------------------------------------------------------------------
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 7876719..a4ce7ea 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -240,10 +240,7 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
pContext = GetSwImport().CreateStylesContext( rLocalName, xAttrList,
sal_True );
break;
-// case XML_TOK_DOC_USESTYLES:
-// pContext = GetSwImport().CreateUseStylesContext( rLocalName,
-// xAttrList );
-// break;
+
case XML_TOK_DOC_MASTERSTYLES:
pContext = GetSwImport().CreateMasterStylesContext( rLocalName,
xAttrList );
@@ -407,10 +404,7 @@ SvXMLImportContext *SwXMLImport::CreateContext(
// --> OD 2006-10-11 #i69629#
// own subclasses for <office:document> and <office:document-styles>
if( XML_NAMESPACE_OFFICE==nPrefix &&
-// ( IsXMLToken( rLocalName, XML_DOCUMENT ) ||
-// ( IsXMLToken( rLocalName, XML_DOCUMENT_META ) ||
( IsXMLToken( rLocalName, XML_DOCUMENT_SETTINGS ) ||
-// IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) ||
IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) ))
pContext = new SwXMLDocContext_Impl( *this, nPrefix, rLocalName,
xAttrList );
@@ -921,10 +915,6 @@ void SwXMLImport::endDocument( void )
if( pNextNd->CanJoinPrev(/* &pPos->nNode*/ ) &&
*pSttNdIdx != pPos->nNode )
{
-// SwTxtNode* pPrevNd = pPos->nNode.GetNode().GetTxtNode();
-// pPos->nContent.Assign( pPrevNd, 0 );
-// pPaM->SetMark(); pPaM->DeleteMark();
-// pPrevNd->JoinNext();
pNextNd->JoinPrev();
}
}
@@ -1147,8 +1137,6 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps)
bChangeShowRedline = sal_True;
}
// #105372#: Headers and footers are not displayed in BrowseView anymore
-// else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "ShowHeaderWhileBrowsing" ) ) )
-// else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "ShowFooterWhileBrowsing" ) ) )
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "InBrowseMode" ) ) )
{
bBrowseMode = *(sal_Bool *)(pValue->Value.getValue());
@@ -1580,7 +1568,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(
throw( uno::Exception )
{
// #110680#
- // return (cppu::OWeakObject*)new SwXMLImport(IMPORT_ALL);
return (cppu::OWeakObject*)new SwXMLImport( rSMgr, IMPORT_ALL );
}
@@ -1603,9 +1590,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(
throw( uno::Exception )
{
// #110680#
- //return (cppu::OWeakObject*)new SwXMLImport(
- // IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
- // IMPORT_FONTDECLS );
return (cppu::OWeakObject*)new SwXMLImport(
rSMgr,
IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
@@ -1631,9 +1615,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(
throw( uno::Exception )
{
// #110680#
- //return (cppu::OWeakObject*)new SwXMLImport(
- // IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
- // IMPORT_FONTDECLS );
return (cppu::OWeakObject*)new SwXMLImport(
rSMgr,
IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
@@ -1659,7 +1640,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(
throw( uno::Exception )
{
// #110680#
- // return (cppu::OWeakObject*)new SwXMLImport( IMPORT_META );
return (cppu::OWeakObject*)new SwXMLImport( rSMgr, IMPORT_META );
}
@@ -1682,7 +1662,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(
throw( uno::Exception )
{
// #110680#
- // return (cppu::OWeakObject*)new SwXMLImport( IMPORT_SETTINGS );
return (cppu::OWeakObject*)new SwXMLImport( rSMgr, IMPORT_SETTINGS );
}
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 05ee1e1..f61cb3e 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -124,9 +124,6 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
if( 0 == (pEntry->nMemberId&MID_SW_FLAG_SPECIAL_ITEM_IMPORT) )
{
-// bPut = pNewItem->importXML( rValue,
-// pEntry->nMemberId & MID_SW_FLAG_MASK,
-// rUnitConverter );
bPut = PutXMLValue( *pNewItem, rValue,
static_cast<sal_uInt16>( pEntry->nMemberId & MID_SW_FLAG_MASK ),
rUnitConverter );
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index a0f23c4..247a8bc 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -97,20 +97,6 @@ enum SvXMLTokenMapAttrs
XML_TOK_META_STAT_END=XML_TOK_UNKNOWN
};
-/*
-static __FAR_DATA SvXMLTokenMapEntry aMetaStatAttrTokenMap[] =
-{
- { XML_NAMESPACE_META, XML_TABLE_COUNT, XML_TOK_META_STAT_TABLE },
- { XML_NAMESPACE_META, XML_IMAGE_COUNT, XML_TOK_META_STAT_IMAGE },
- { XML_NAMESPACE_META, XML_OBJECT_COUNT, XML_TOK_META_STAT_OLE },
- { XML_NAMESPACE_META, XML_PARAGRAPH_COUNT, XML_TOK_META_STAT_PARA },
- { XML_NAMESPACE_META, XML_PAGE_COUNT, XML_TOK_META_STAT_PAGE },
- { XML_NAMESPACE_META, XML_WORD_COUNT, XML_TOK_META_STAT_WORD },
- { XML_NAMESPACE_META, XML_CHARACTER_COUNT, XML_TOK_META_STAT_CHAR },
- XML_TOKEN_MAP_END
-};
-*/
-
struct statistic {
SvXMLTokenMapAttrs token;
const char* name;
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 4865ab3..4f1c6bc 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -180,11 +180,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
}
else
{
- /*
- ASSERT( SwXMLTableColumn_impl(nCheckPos) ==
- SwXMLTableColumn_Impl(nEndCPos),
- "rows have different total widths" );
- */
+
}
#endif
nCPos = (sal_uInt16)nWidth;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index fa24bb3..f818005 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -352,7 +352,6 @@ inline SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol ) const
ASSERT( nCol < USHRT_MAX,
"SwXMLTableRow_Impl::GetCell: column number is to big" );
// --> OD 2009-03-19 #i95726# - some fault tolerance
-// return aCells[(sal_uInt16)nCol];
ASSERT( nCol < aCells.Count(),
"SwXMLTableRow_Impl::GetCell: column number is out of bound" );
return nCol < aCells.Count() ? aCells[(sal_uInt16)nCol] : 0;
@@ -1155,11 +1154,6 @@ String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode)
{
sPrefixStr = String('_');
}
-// else if (sPrefixStr.Copy(0, 1).IsAlphaAscii())
-// {
-// sPrefixStr.Insert('_', 0);
-// }
- // else: name is OK.
// increase count until we find a name that is not yet taken
String sName;
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 22d684e..7c872cd 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -236,13 +236,6 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
pGrfNd->SwapOut();
}
}
-/*
-static void lcl_addParam ( SvXMLExport &rExport, const SvCommand &rCommand )
-{
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rCommand.GetCommand() );
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, rCommand.GetArgument() );
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True );
-}*/
static void lcl_addURL ( SvXMLExport &rExport, const String &rURL,
sal_Bool bToRel = sal_True )
@@ -292,22 +285,18 @@ void lcl_addOutplaceProperties(
if( aSize.Width() && aSize.Height() )
{
Any aAny;
- //aAny <<= (sal_Int32)rVisArea.Left();
aAny <<= 0L;
*pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), aAny );
pStates++;
- //aAny <<= (sal_Int32)rVisArea.Top();
aAny <<= 0L;
*pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), aAny );
pStates++;
- //aAny <<= (sal_Int32)rVisArea.GetWidth();
aAny <<= (sal_Int32)aSize.Width();
*pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), aAny );
pStates++;
- //aAny <<= (sal_Int32)rVisArea.GetHeight();
aAny <<= (sal_Int32)aSize.Height();
*pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), aAny );
pStates++;
commit 85829556e05073ef4a3d662cc8eccd45309c0549
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 23 20:38:17 2010 +0000
cppcheck: Member variable not initialized in the constructor
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 0e4ca96..b8fba65 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -1155,6 +1155,9 @@ CSS1Expression *CSS1Parser::ParseDeclaration( String& rProperty )
/* */
CSS1Parser::CSS1Parser()
+ : nValue(0)
+ , eState(CSS1_PAR_ACCEPTED)
+ , nToken(CSS1_NULL)
{
}
More information about the Libreoffice-commits
mailing list