diff options
Diffstat (limited to 'sw/source/filter/html/htmlatr.cxx')
-rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 083b282c8693..65bb022a1dbd 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -149,7 +149,6 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl ) nDefListLvl = nNewLvl; } - void SwHTMLWriter::ChangeParaToken( sal_uInt16 nNew ) { if( nNew != nLastParaToken && HTML_PREFORMTXT_ON == nLastParaToken ) @@ -389,7 +388,6 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate, } } - // Die diversen default-Abstaende aus der Vorlage oder der // Vergleischs-Vorlage merken const SvxLRSpaceItem &rLRSpace = @@ -605,7 +603,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, pNodeItemSet ? ((const SvxULSpaceItem &)pNodeItemSet->Get(RES_UL_SPACE)) : rFmt.GetULSpace(); - if( (rHWrt.bOutHeader && rWrt.pCurPam->GetPoint()->nNode.GetIndex() == rWrt.pCurPam->GetMark()->nNode.GetIndex()) || @@ -639,7 +636,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, return; } - // soll ein ALIGN=... geschrieben werden? const SfxPoolItem* pAdjItem = 0; const SfxPoolItem* pItem; @@ -1040,7 +1036,6 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo ) } } - class HTMLSttEndPos { sal_Int32 nStart; @@ -1085,7 +1080,6 @@ enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut HTML_DROPCAP_VALUE, // DropCap-Attributs HTML_AUTOFMT_VALUE }; // Attribute for automatic character styles - class HTMLEndPosLst { _HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste @@ -1100,12 +1094,11 @@ class HTMLEndPosLst SwDoc *pDoc; // das aktuelle Dokument SwDoc* pTemplate; // die HTML-Vorlage (oder 0) const Color* pDfltColor;// die Default-Vordergrund-Farbe - std::set<OUString>& rScriptTxtStyles; // + std::set<OUString>& rScriptTxtStyles; sal_uLong nHTMLMode; sal_Bool bOutStyles : 1; // werden Styles exportiert - // die Position eines Items in der Start-/Ende-Liste suchen sal_uInt16 _FindStartPos( const HTMLSttEndPos *pPos ) const; sal_uInt16 _FindEndPos( const HTMLSttEndPos *pPos ) const; @@ -1126,7 +1119,6 @@ class HTMLEndPosLst sal_Bool ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos, sal_Int32 nEndPos ); - // das Ende eines gesplitteten Items anpassen void FixSplittedItem( HTMLSttEndPos *pPos, sal_Int32 nNewEnd, sal_uInt16 nStartPos ); @@ -1176,7 +1168,6 @@ public: sal_Bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; } }; - sal_uInt16 HTMLEndPosLst::_FindStartPos( const HTMLSttEndPos *pPos ) const { sal_uInt16 i; @@ -1200,7 +1191,6 @@ sal_uInt16 HTMLEndPosLst::_FindEndPos( const HTMLSttEndPos *pPos ) const return i==aEndLst.size() ? USHRT_MAX : i; } - void HTMLEndPosLst::_InsertItem( HTMLSttEndPos *pPos, sal_uInt16 nEndPos ) { // In der Start-Liste das Attribut hinter allen vorher und an @@ -1503,7 +1493,6 @@ void HTMLEndPosLst::FixSplittedItem( HTMLSttEndPos *pPos, sal_Int32 nNewEnd, } } - void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd ) { @@ -1536,8 +1525,6 @@ void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart, _InsertItem( new HTMLSttEndPos( rItem, nStart, nEnd ), i ); } - - void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd ) { @@ -1652,8 +1639,6 @@ HTMLEndPosLst::~HTMLEndPosLst() OSL_ENSURE(aEndLst.empty(), "End List not empty in destructor"); } - - void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd, SwHTMLFmtInfos& rFmtInfos, sal_Bool bParaAttrs ) @@ -2056,7 +2041,6 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, } } - /* Ausgabe der Nodes */ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) { @@ -2286,7 +2270,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) if( !bOldLFPossible && rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); - // dann die Bookmarks (inkl. End-Tag) rHTMLWrt.bOutOpts = sal_False; rHTMLWrt.OutBookmarks(); @@ -2334,7 +2317,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) rHTMLWrt.aChrFmtInfos, sal_False, sal_True ); } - if( !aOutlineTxt.isEmpty() || rHTMLWrt.pFmtFtn ) { // Absatz-Attribute ausgeben, damit der Text die Attribute des @@ -2361,7 +2343,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) // ausgegeben, so muessen auch da die Attribute stimmen!! rHTMLWrt.bTxtAttr = sal_True; - sal_uInt16 nAttrPos = 0; sal_Int32 nStrPos = rHTMLWrt.pCurPam->GetPoint()->nContent.GetIndex(); const SwTxtAttr * pHt = 0; @@ -2651,7 +2632,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) return rHTMLWrt; } - sal_uInt32 SwHTMLWriter::ToPixel( sal_uInt32 nVal, const bool bVert ) const { if( Application::GetDefaultDevice() && nVal ) @@ -2665,7 +2645,6 @@ sal_uInt32 SwHTMLWriter::ToPixel( sal_uInt32 nVal, const bool bVert ) const return nVal; } - static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt ) { // wenn gerade Hints geschrieben werden versuchen wir den Hint als @@ -2677,7 +2656,6 @@ static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - /* File CHRATR.HXX: */ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) @@ -2711,7 +2689,6 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutHTML_SwPosture( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2833,7 +2810,6 @@ static Writer& OutHTML_SwWeight( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2855,7 +2831,6 @@ static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2886,8 +2861,6 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - - static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2908,7 +2881,6 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2924,7 +2896,6 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - // Das ist jetzt unser Blink-Item. Blinkend wird eingeschaltet, indem man // das Item auf sal_True setzt! static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt ) @@ -3222,7 +3193,6 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ) * bekannt sein muessen. */ - SwAttrFnTab aHTMLAttrFnTab = { /* RES_CHRATR_CASEMAP */ OutHTML_CSS1Attr, /* RES_CHRATR_CHARSETCOLOR */ 0, |