diff options
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/css1atr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 14 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index ab005119c1e6..6b72e561e4ec 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -3758,7 +3758,7 @@ SwAttrFnTab aCSS1AttrFnTab = { /* RES_TXTATR_CHARFMT */ 0, /* RES_TXTATR_CJK_RUBY */ 0, /* RES_TXTATR_UNKNOWN_CONTAINER */ 0, -/* RES_TXTATR_DUMMY5 */ 0, +/* RES_TXTATR_INPUTFIELD */ 0, /* RES_TXTATR_FIELD */ 0, /* RES_TXTATR_FLYCNT */ 0, diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 910b661aad55..c9dd2bf6239c 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2485,9 +2485,9 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) if( RES_TXTATR_FIELD == pHt->Which() ) // Felder nicht continue; // ausgeben - if ( pHt->GetEnd() && !pHt->HasDummyChar() ) + if ( pHt->End() && !pHt->HasDummyChar() ) { - xub_StrLen nHtEnd = *pHt->GetEnd(), + const xub_StrLen nHtEnd = *pHt->End(), nHtStt = *pHt->GetStart(); if( !rHTMLWrt.bWriteAll && nHtEnd <= nStrPos ) continue; @@ -2545,11 +2545,11 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) && nStrPos != nEnde ) { do { - if ( pHt->GetEnd() && !pHt->HasDummyChar() ) + if ( pHt->End() && !pHt->HasDummyChar() ) { if( RES_CHRATR_KERNING == pHt->Which() && rHTMLWrt.IsHTMLMode(HTMLMODE_FIRSTLINE) && - *pHt->GetEnd() - nStrPos == 1 && + *pHt->End() - nStrPos == 1 && ' ' == rStr.GetChar(nStrPos) && ((const SvxKerningItem&)pHt->GetAttr()).GetValue() > 0 ) { @@ -2564,13 +2564,13 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) // Der Hint braucht nun doch nicht weiter // beruecksichtigt werden. } - else if( *pHt->GetEnd() != nStrPos ) + else if( *pHt->End() != nStrPos ) { // Hints mit Ende einsortieren, wenn sie keinen // leeren Bereich aufspannen (Hints, die keinen // Bereich aufspannen werden ignoriert aEndPosLst.Insert( pHt->GetAttr(), nStrPos + nOffset, - *pHt->GetEnd() + nOffset, + *pHt->End() + nOffset, rHTMLWrt.aChrFmtInfos ); } } @@ -3413,7 +3413,7 @@ SwAttrFnTab aHTMLAttrFnTab = { /* RES_TXTATR_CHARFMT */ OutHTML_SwTxtCharFmt, /* RES_TXTATR_CJK_RUBY */ 0, /* RES_TXTATR_UNKNOWN_CONTAINER */ 0, -/* RES_TXTATR_DUMMY5 */ 0, +/* RES_TXTATR_INPUTFIELD */ OutHTML_SwFmtFld, /* RES_TXTATR_FIELD */ OutHTML_SwFmtFld, /* RES_TXTATR_FLYCNT */ OutHTML_SwFlyCnt, diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 51a6442d6708..e1caf2afb86b 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2265,11 +2265,7 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu if( GetNumInfo().GetDepth() ) { sal_uInt8 nLvl = GetNumInfo().GetLevel(); - // --> OD 2008-04-02 #refactorlists# -// SetNoNum (&nLvl, sal_True); -// SetNodeNum( nLvl); SetNodeNum( nLvl, false ); - // <-- } else pPam->GetNode()->GetTxtNode()->ResetAttr( RES_PARATR_NUMRULE ); @@ -2777,6 +2773,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, } break; case RES_TXTATR_FIELD: + case RES_TXTATR_INPUTFIELD: { sal_uInt16 nFldWhich = pPostIts diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 14bd9bd9b0c3..4a1d66149d95 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -891,7 +891,7 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs() for( sal_uInt16 i=0; i<nCntAttr; i++ ) { const SwTxtAttr *pHt = pTxtNd->GetSwpHints()[i]; - if( !pHt->GetEnd() ) + if( !pHt->End() ) { xub_StrLen nPos = *pHt->GetStart(); if( nPos-nOldPos > 1 || RES_TXTATR_FIELD != pHt->Which() ) |