diff options
Diffstat (limited to 'sw/source/filter/html/wrthtml.cxx')
-rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 152 |
1 files changed, 76 insertions, 76 deletions
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 0d993fcde3d6..afc7e02f89fe 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -282,9 +282,9 @@ ErrCode SwHTMLWriter::WriteStream() if( IsHTMLMode(HTMLMODE_SOME_STYLES | HTMLMODE_FULL_STYLES) ) m_nHTMLMode |= HTMLMODE_PRINT_EXT; - m_eCSS1Unit = SW_MOD()->GetMetric( pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) ); + m_eCSS1Unit = SW_MOD()->GetMetric( m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) ); - bool bWriteUTF8 = bWriteClipboardDoc; + bool bWriteUTF8 = m_bWriteClipboardDoc; m_eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding(); const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( m_eDestEnc ); m_eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet ); @@ -305,7 +305,7 @@ ErrCode SwHTMLWriter::WriteStream() SwCharFormats::size_type nOldCharFormatCnt = 0; OSL_ENSURE( !m_xTemplate.is(), "Where is the HTML template coming from?" ); - m_xTemplate = static_cast<HTMLReader*>(ReadHTML)->GetTemplateDoc(*pDoc); + m_xTemplate = static_cast<HTMLReader*>(ReadHTML)->GetTemplateDoc(*m_pDoc); if( m_xTemplate.is() ) { bOldHTMLMode = m_xTemplate->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE); @@ -315,9 +315,9 @@ ErrCode SwHTMLWriter::WriteStream() nOldCharFormatCnt = m_xTemplate->GetCharFormats()->size(); } - if( bShowProgress ) - ::StartProgress( STR_STATSTR_W4WWRITE, 0, pDoc->GetNodes().Count(), - pDoc->GetDocShell()); + if( m_bShowProgress ) + ::StartProgress( STR_STATSTR_W4WWRITE, 0, m_pDoc->GetNodes().Count(), + m_pDoc->GetDocShell()); m_pDfltColor = nullptr; m_pFootEndNotes = nullptr; @@ -338,7 +338,7 @@ ErrCode SwHTMLWriter::WriteStream() m_nWhishLineLen = 70; m_nLastLFPos = 0; m_nDefListLvl = 0; - m_nDefListMargin = ((m_xTemplate.is() && !m_bCfgOutStyles) ? m_xTemplate.get() : pDoc) + m_nDefListMargin = ((m_xTemplate.is() && !m_bCfgOutStyles) ? m_xTemplate.get() : m_pDoc) ->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_HTML_DD, false ) ->GetLRSpace().GetTextLeft(); m_nHeaderFooterSpace = 0; @@ -357,7 +357,7 @@ ErrCode SwHTMLWriter::WriteStream() m_nCSS1Script = CSS1_OUTMODE_WESTERN; break; } - m_eLang = static_cast<const SvxLanguageItem&>(pDoc + m_eLang = static_cast<const SvxLanguageItem&>(m_pDoc ->GetDefault(GetLangWhichIdFromScript(m_nCSS1Script))).GetLanguage(); m_nFootNote = m_nEndNote = 0; @@ -370,26 +370,26 @@ ErrCode SwHTMLWriter::WriteStream() // respect table and section at document beginning { - SwTableNode * pTNd = pCurPam->GetNode().FindTableNode(); - if( pTNd && bWriteAll ) + SwTableNode * pTNd = m_pCurrentPam->GetNode().FindTableNode(); + if( pTNd && m_bWriteAll ) { // start with table node !! - pCurPam->GetPoint()->nNode = *pTNd; + m_pCurrentPam->GetPoint()->nNode = *pTNd; - if( bWriteOnlyFirstTable ) - pCurPam->GetMark()->nNode = *pTNd->EndOfSectionNode(); + if( m_bWriteOnlyFirstTable ) + m_pCurrentPam->GetMark()->nNode = *pTNd->EndOfSectionNode(); } // first node (with can contain a page break) - m_pStartNdIdx = new SwNodeIndex( pCurPam->GetPoint()->nNode ); + m_pStartNdIdx = new SwNodeIndex( m_pCurrentPam->GetPoint()->nNode ); - SwSectionNode * pSNd = pCurPam->GetNode().FindSectionNode(); + SwSectionNode * pSNd = m_pCurrentPam->GetNode().FindSectionNode(); while( pSNd ) { - if( bWriteAll ) + if( m_bWriteAll ) { // start with section node !! - pCurPam->GetPoint()->nNode = *pSNd; + m_pCurrentPam->GetPoint()->nNode = *pSNd; } else { @@ -434,9 +434,9 @@ ErrCode SwHTMLWriter::WriteStream() const SfxPoolItem *pItem; const SfxItemSet& rPageItemSet = m_pCurrPageDesc->GetMaster().GetAttrSet(); - if( !bWriteClipboardDoc && pDoc->GetDocShell() && - (!pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && - !pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE)) && + if( !m_bWriteClipboardDoc && m_pDoc->GetDocShell() && + (!m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && + !m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE)) && SfxItemState::SET == rPageItemSet.GetItemState( RES_HEADER, true, &pItem) ) { const SwFrameFormat *pHeaderFormat = @@ -446,7 +446,7 @@ ErrCode SwHTMLWriter::WriteStream() } m_nTextAttrsToIgnore = nHeaderAttrs; - Out_SwDoc( pOrigPam ); + Out_SwDoc( m_pOrigPam ); m_nTextAttrsToIgnore = 0; if( mxFormComps.is() ) @@ -455,8 +455,8 @@ ErrCode SwHTMLWriter::WriteStream() if( m_pFootEndNotes ) OutFootEndNotes(); - if( !bWriteClipboardDoc && pDoc->GetDocShell() && - (!pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && !pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE)) && + if( !m_bWriteClipboardDoc && m_pDoc->GetDocShell() && + (!m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && !m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE)) && SfxItemState::SET == rPageItemSet.GetItemState( RES_FOOTER, true, &pItem) ) { const SwFrameFormat *pFooterFormat = @@ -528,8 +528,8 @@ ErrCode SwHTMLWriter::WriteStream() m_aNonConvertableCharacters.clear(); - if( bShowProgress ) - ::EndProgress( pDoc->GetDocShell() ); + if( m_bShowProgress ) + ::EndProgress( m_pDoc->GetDocShell() ); if( m_xTemplate.is() ) { @@ -575,7 +575,7 @@ static bool lcl_html_IsMultiColStart( const SwHTMLWriter& rHTMLWrt, sal_uLong nI { bool bRet = false; const SwSectionNode *pSectNd = - rHTMLWrt.pDoc->GetNodes()[nIndex]->GetSectionNode(); + rHTMLWrt.m_pDoc->GetNodes()[nIndex]->GetSectionNode(); if( pSectNd ) { const SwSection& rSection = pSectNd->GetSection(); @@ -590,7 +590,7 @@ static bool lcl_html_IsMultiColStart( const SwHTMLWriter& rHTMLWrt, sal_uLong nI static bool lcl_html_IsMultiColEnd( const SwHTMLWriter& rHTMLWrt, sal_uLong nIndex ) { bool bRet = false; - const SwEndNode *pEndNd = rHTMLWrt.pDoc->GetNodes()[nIndex]->GetEndNode(); + const SwEndNode *pEndNd = rHTMLWrt.m_pDoc->GetNodes()[nIndex]->GetEndNode(); if( pEndNd ) bRet = lcl_html_IsMultiColStart( rHTMLWrt, pEndNd->StartOfSectionIndex() ); @@ -772,13 +772,13 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd ) { HTMLSaveData aSaveData( rHTMLWrt, - rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex()+1, + rHTMLWrt.m_pCurrentPam->GetPoint()->nNode.GetIndex()+1, rSectNd.EndOfSectionIndex(), false, pFormat ); - rHTMLWrt.Out_SwDoc( rHTMLWrt.pCurPam ); + rHTMLWrt.Out_SwDoc( rHTMLWrt.m_pCurrentPam ); } - rHTMLWrt.pCurPam->GetPoint()->nNode = *rSectNd.EndOfSectionNode(); + rHTMLWrt.m_pCurrentPam->GetPoint()->nNode = *rSectNd.EndOfSectionNode(); if( bEndTag ) lcl_html_OutSectionEndTag( rHTMLWrt ); @@ -796,24 +796,24 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd ) void SwHTMLWriter::Out_SwDoc( SwPaM* pPam ) { - bool bSaveWriteAll = bWriteAll; // save + bool bSaveWriteAll = m_bWriteAll; // save // search next text::Bookmark position from text::Bookmark table - m_nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1; + m_nBkmkTabPos = m_bWriteAll ? FindPos_Bkmk( *m_pCurrentPam->GetPoint() ) : -1; // output all areas of PaM's in the HTML file do { - bWriteAll = bSaveWriteAll; + m_bWriteAll = bSaveWriteAll; m_bFirstLine = true; // search for first on PaM created FlyFrame // still missing: - while( pCurPam->GetPoint()->nNode.GetIndex() < pCurPam->GetMark()->nNode.GetIndex() || - (pCurPam->GetPoint()->nNode.GetIndex() == pCurPam->GetMark()->nNode.GetIndex() && - pCurPam->GetPoint()->nContent.GetIndex() <= pCurPam->GetMark()->nContent.GetIndex()) ) + while( m_pCurrentPam->GetPoint()->nNode.GetIndex() < m_pCurrentPam->GetMark()->nNode.GetIndex() || + (m_pCurrentPam->GetPoint()->nNode.GetIndex() == m_pCurrentPam->GetMark()->nNode.GetIndex() && + m_pCurrentPam->GetPoint()->nContent.GetIndex() <= m_pCurrentPam->GetMark()->nContent.GetIndex()) ) { - SwNode& rNd = pCurPam->GetNode(); + SwNode& rNd = m_pCurrentPam->GetNode(); OSL_ENSURE( !(rNd.IsGrfNode() || rNd.IsOLENode()), "Unexpected Grf- or OLE-Node here" ); @@ -822,36 +822,36 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam ) SwTextNode* pTextNd = rNd.GetTextNode(); if( !m_bFirstLine ) - pCurPam->GetPoint()->nContent.Assign( pTextNd, 0 ); + m_pCurrentPam->GetPoint()->nContent.Assign( pTextNd, 0 ); OutHTML_SwTextNode( *this, *pTextNd ); } else if( rNd.IsTableNode() ) { OutHTML_SwTableNode( *this, *rNd.GetTableNode(), nullptr ); - m_nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1; + m_nBkmkTabPos = m_bWriteAll ? FindPos_Bkmk( *m_pCurrentPam->GetPoint() ) : -1; } else if( rNd.IsSectionNode() ) { OutHTML_Section( *this, *rNd.GetSectionNode() ); - m_nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1; + m_nBkmkTabPos = m_bWriteAll ? FindPos_Bkmk( *m_pCurrentPam->GetPoint() ) : -1; } - else if( &rNd == &pDoc->GetNodes().GetEndOfContent() ) + else if( &rNd == &m_pDoc->GetNodes().GetEndOfContent() ) break; - ++pCurPam->GetPoint()->nNode; // move - sal_uInt32 nPos = pCurPam->GetPoint()->nNode.GetIndex(); + ++m_pCurrentPam->GetPoint()->nNode; // move + sal_uInt32 nPos = m_pCurrentPam->GetPoint()->nNode.GetIndex(); - if( bShowProgress ) - ::SetProgressState( nPos, pDoc->GetDocShell() ); // How far ? + if( m_bShowProgress ) + ::SetProgressState( nPos, m_pDoc->GetDocShell() ); // How far ? /* If only the selected area should be saved, so only the complete * nodes should be saved, this means the first and n-th node * partly, the 2nd till n-1 node complete. (complete means with * all formats!) */ - bWriteAll = bSaveWriteAll || - nPos != pCurPam->GetMark()->nNode.GetIndex(); + m_bWriteAll = bSaveWriteAll || + nPos != m_pCurrentPam->GetMark()->nNode.GetIndex(); m_bFirstLine = false; m_bOutFooter = false; // after one node no footer anymore } @@ -861,7 +861,7 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam ) } while( CopyNextPam( &pPam ) ); // until all PaM's processed - bWriteAll = bSaveWriteAll; // reset to old values + m_bWriteAll = bSaveWriteAll; // reset to old values } // write the StyleTable, general data, header/footer/footnotes @@ -929,12 +929,12 @@ static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat, sal_uInt16 SwHTMLWriter::OutHeaderAttrs() { - sal_uLong nIdx = pCurPam->GetPoint()->nNode.GetIndex(); - sal_uLong nEndIdx = pCurPam->GetMark()->nNode.GetIndex(); + sal_uLong nIdx = m_pCurrentPam->GetPoint()->nNode.GetIndex(); + sal_uLong nEndIdx = m_pCurrentPam->GetMark()->nNode.GetIndex(); SwTextNode *pTextNd = nullptr; while( nIdx<=nEndIdx && - nullptr==(pTextNd=pDoc->GetNodes()[nIdx]->GetTextNode()) ) + nullptr==(pTextNd=m_pDoc->GetNodes()[nIdx]->GetTextNode()) ) nIdx++; OSL_ENSURE( pTextNd, "No Text-Node found" ); @@ -996,7 +996,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) OString sIndent = GetIndentString(); uno::Reference<document::XDocumentProperties> xDocProps; - SwDocShell *pDocShell(pDoc->GetDocShell()); + SwDocShell *pDocShell(m_pDoc->GetDocShell()); if (pDocShell) { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( @@ -1019,11 +1019,11 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) // In none HTML documents the first set template will be exported // and if none is set the default template - sal_uLong nNodeIdx = pCurPam->GetPoint()->nNode.GetIndex(); + sal_uLong nNodeIdx = m_pCurrentPam->GetPoint()->nNode.GetIndex(); - while( nNodeIdx < pDoc->GetNodes().Count() ) + while( nNodeIdx < m_pDoc->GetNodes().Count() ) { - SwNode *pNd = pDoc->GetNodes()[ nNodeIdx ]; + SwNode *pNd = m_pDoc->GetNodes()[ nNodeIdx ]; if( pNd->IsContentNode() ) { pPageDesc = static_cast<const SwFormatPageDesc &>(pNd->GetContentNode() @@ -1041,7 +1041,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) } if( !pPageDesc ) - pPageDesc = &pDoc->GetPageDesc( 0 ); + pPageDesc = &m_pDoc->GetPageDesc( 0 ); if (!mbSkipHeaderFooter) { @@ -1052,7 +1052,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) } // and now ... the BASIC and JavaScript! - if( pDoc->GetDocShell() ) // only with DocShell BASIC is possible + if( m_pDoc->GetDocShell() ) // only with DocShell BASIC is possible OutBasic(); DecIndentLevel(); // indent content of <HEAD> @@ -1069,15 +1069,15 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) // output text colour, when it was set in the default template or was changed OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_text, - pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD, false ), + m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD, false ), *this ); // colour of (un)visited links OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_link, - pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( RES_POOLCHR_INET_NORMAL ), + m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( RES_POOLCHR_INET_NORMAL ), *this ); OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_vlink, - pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( RES_POOLCHR_INET_VISIT ), + m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( RES_POOLCHR_INET_VISIT ), *this ); const SfxItemSet& rItemSet = pPageDesc->GetMaster().GetAttrSet(); @@ -1095,7 +1095,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) OutCSS1_BodyTagStyleOpt( *this, rItemSet, OUString() ); } // append events - if( pDoc->GetDocShell() ) // only with DocShell BASIC is possible + if( m_pDoc->GetDocShell() ) // only with DocShell BASIC is possible OutBasicBodyEvents(); Strm().WriteChar( '>' ); @@ -1120,12 +1120,12 @@ void SwHTMLWriter::OutBookmarks() { // fetch current bookmark const ::sw::mark::IMark* pBookmark = nullptr; - IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); + IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess(); if(m_nBkmkTabPos != -1) pBookmark = (pMarkAccess->getAllMarksBegin() + m_nBkmkTabPos)->get(); // Output all bookmarks in this paragraph. The content position // for the moment isn't considered! - sal_uInt32 nNode = pCurPam->GetPoint()->nNode.GetIndex(); + sal_uInt32 nNode = m_pCurrentPam->GetPoint()->nNode.GetIndex(); while( m_nBkmkTabPos != -1 && pBookmark->GetMarkPos().nNode.GetIndex() == nNode ) { @@ -1162,7 +1162,7 @@ void SwHTMLWriter::OutPointFieldmarks( const SwPosition& rPos ) // "point" fieldmarks that occupy single character space, as opposed to // range fieldmarks that are associated with start and end points. - const IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess(); + const IDocumentMarkAccess* pMarkAccess = m_pDoc->getIDocumentMarkAccess(); if (!pMarkAccess) return; @@ -1474,7 +1474,7 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt, sal_uLong nEnd, bool bSaveNum, const SwFrameFormat *pFrameFormat) : rWrt(rWriter) - , pOldPam(rWrt.pCurPam) + , pOldPam(rWrt.m_pCurrentPam) , pOldEnd(rWrt.GetEndPaM()) , pOldNumRuleInfo(nullptr) , pOldNextNumRuleInfo(nullptr) @@ -1484,21 +1484,21 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt, , bOldOutFooter(rWrt.m_bOutFooter) , bOldOutFlyFrame(rWrt.m_bOutFlyFrame) { - bOldWriteAll = rWrt.bWriteAll; + bOldWriteAll = rWrt.m_bWriteAll; - rWrt.pCurPam = Writer::NewSwPaM( *rWrt.pDoc, nStt, nEnd ); + rWrt.m_pCurrentPam = Writer::NewSwPaM( *rWrt.m_pDoc, nStt, nEnd ); // recognize table in special areas - if( nStt != rWrt.pCurPam->GetMark()->nNode.GetIndex() ) + if( nStt != rWrt.m_pCurrentPam->GetMark()->nNode.GetIndex() ) { - const SwNode *pNd = rWrt.pDoc->GetNodes()[ nStt ]; + const SwNode *pNd = rWrt.m_pDoc->GetNodes()[ nStt ]; if( pNd->IsTableNode() || pNd->IsSectionNode() ) - rWrt.pCurPam->GetMark()->nNode = nStt; + rWrt.m_pCurrentPam->GetMark()->nNode = nStt; } - rWrt.SetEndPaM( rWrt.pCurPam ); - rWrt.pCurPam->Exchange( ); - rWrt.bWriteAll = true; + rWrt.SetEndPaM( rWrt.m_pCurrentPam ); + rWrt.m_pCurrentPam->Exchange( ); + rWrt.m_bWriteAll = true; rWrt.m_nDefListLvl = 0; rWrt.m_bOutHeader = rWrt.m_bOutFooter = false; @@ -1524,11 +1524,11 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt, HTMLSaveData::~HTMLSaveData() { - delete rWrt.pCurPam; // delete PaM again + delete rWrt.m_pCurrentPam; // delete PaM again - rWrt.pCurPam = pOldPam; + rWrt.m_pCurrentPam = pOldPam; rWrt.SetEndPaM( pOldEnd ); - rWrt.bWriteAll = bOldWriteAll; + rWrt.m_bWriteAll = bOldWriteAll; rWrt.m_nBkmkTabPos = bOldWriteAll ? rWrt.FindPos_Bkmk( *pOldPam->GetPoint() ) : -1; rWrt.m_nLastParaToken = HtmlTokenId::NONE; rWrt.m_nDefListLvl = nOldDefListLvl; |