mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#4817 Chaos with multiple body tags

Browse Source 
Change-Id: I4f2ab3a3be0909176599963c8ca113e3af85c832
Reviewed-on: https://gerrit.libreoffice.org/47159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-12-28 22:28:08 +00:00
parent 4475ffbdae
commit 1f349bb10c
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sw/source/filter/html/swhtml.cxx
View File

@@ -298,6 +298,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
m_bInFootEndNoteSymbol( false ), m_bInFootEndNoteSymbol( false ),
m_bIgnoreHTMLComments( bNoHTMLComments ), m_bIgnoreHTMLComments( bNoHTMLComments ),
m_bRemoveHidden( false ), m_bRemoveHidden( false ),
m_bBodySeen( false ),
m_pTempViewFrame(nullptr) m_pTempViewFrame(nullptr)
{ {
m_nEventId = nullptr; m_nEventId = nullptr;
@@ -1257,25 +1258,31 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
switch( nToken ) switch( nToken )
{ {
case HtmlTokenId::BODY_ON: case HtmlTokenId::BODY_ON:
if( !m_aStyleSource.isEmpty() ) if (m_bBodySeen)
eState = SvParserState::Error;
else
{ {
m_pCSS1Parser->ParseStyleSheet( m_aStyleSource ); m_bBodySeen = true;
m_aStyleSource.clear(); if( !m_aStyleSource.isEmpty() )
}
if( IsNewDoc() )
{
InsertBodyOptions();
// If there is a template for the first or the right page,
// it is set here.
const SwPageDesc *pPageDesc = nullptr;
if( m_pCSS1Parser->IsSetFirstPageDesc() )
pPageDesc = m_pCSS1Parser->GetFirstPageDesc();
else if( m_pCSS1Parser->IsSetRightPageDesc() )
pPageDesc = m_pCSS1Parser->GetRightPageDesc();
if( pPageDesc )
{ {
m_xDoc->getIDocumentContentOperations().InsertPoolItem( *m_pPam, SwFormatPageDesc( pPageDesc ) ); m_pCSS1Parser->ParseStyleSheet( m_aStyleSource );
m_aStyleSource.clear();
}
if( IsNewDoc() )
{
InsertBodyOptions();
// If there is a template for the first or the right page,
// it is set here.
const SwPageDesc *pPageDesc = nullptr;
if( m_pCSS1Parser->IsSetFirstPageDesc() )
pPageDesc = m_pCSS1Parser->GetFirstPageDesc();
else if( m_pCSS1Parser->IsSetRightPageDesc() )
pPageDesc = m_pCSS1Parser->GetRightPageDesc();
if( pPageDesc )
{
m_xDoc->getIDocumentContentOperations().InsertPoolItem( *m_pPam, SwFormatPageDesc( pPageDesc ) );
}
} }
} }
break; break;

2
sw/source/filter/html/swhtml.hxx
View File

@@ -483,6 +483,8 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
bool m_bIgnoreHTMLComments : 1; bool m_bIgnoreHTMLComments : 1;
bool m_bRemoveHidden : 1; // the filter implementation might set the hidden flag bool m_bRemoveHidden : 1; // the filter implementation might set the hidden flag
bool m_bBodySeen : 1;
/// the names corresponding to the DOCINFO field subtypes INFO[1-4] /// the names corresponding to the DOCINFO field subtypes INFO[1-4]
OUString m_InfoNames[4]; OUString m_InfoNames[4];