diff options
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltble.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 0ebe4a93c675..a15d23317dab 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -1510,7 +1510,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken ) case HtmlTokenId::LINEFEEDCHAR: if( m_pPam->GetPoint()->GetContentIndex() ) AppendTextNode(); - if (!m_xTable && !m_xDoc->IsInHeaderFooter(m_pPam->GetPoint()->nNode)) + if (!m_xTable && !m_xDoc->IsInHeaderFooter(m_pPam->GetPoint()->GetNode())) { NewAttr(m_xAttrTab, &m_xAttrTab->pBreak, SvxFormatBreakItem(SvxBreak::PageBefore, RES_BREAK)); EndAttr( m_xAttrTab->pBreak, false ); diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 81528e5b8c2f..da4b0473f4ad 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -1196,7 +1196,6 @@ void SwXMLTextParagraphExport::exportTable( OSL_ENSURE( pTableNd, "table node missing" ); if( bAutoStyles ) { - SwNodeIndex aIdx( *pTableNd ); // AUTOSTYLES: Optimization: Do not export table autostyle if // we are currently exporting the content.xml stuff and // the table is located in header/footer: @@ -1204,7 +1203,7 @@ void SwXMLTextParagraphExport::exportTable( // ALL flags are set at the same time. const bool bExportStyles = bool( GetExport().getExportFlags() & SvXMLExportFlags::STYLES ); if (!isAutoStylesCollected() - && (bExportStyles || !pFormat->GetDoc()->IsInHeaderFooter(aIdx))) + && (bExportStyles || !pFormat->GetDoc()->IsInHeaderFooter(*pTableNd))) { maTableNodes.push_back(pTableNd); m_TableFormats.emplace(pTableNd, ::std::make_pair(SwXMLTextParagraphExport::FormatMap(), SwXMLTextParagraphExport::FormatMap())); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 64be72d6146c..448ea1b79043 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -179,7 +179,7 @@ bool SwXMLTextImportHelper::IsInHeaderFooter() const SAL_WARN_IF(!pTextCursor, "sw.uno", "SwXTextCursor missing"); SwDoc *pDoc = pTextCursor ? pTextCursor->GetDoc() : nullptr; - return pDoc && pDoc->IsInHeaderFooter( pTextCursor->GetPaM()->GetPoint()->nNode ); + return pDoc && pDoc->IsInHeaderFooter( pTextCursor->GetPaM()->GetPoint()->GetNode() ); } static SwOLENode *lcl_GetOLENode( const SwFrameFormat *pFrameFormat ) |