Kaydet (Commit) b3f41543 authored tarafından Michael Stahl's avatar Michael Stahl

SwHTMLParser: avoid a spurious ~SwindexReg assert

The pPam that is passed to SwHTMLParser would be reinitialized by
SwReader::Read anyway.  Can be reproduced with bugdoc from fdo#65935.

Change-Id: I3b7dcc9c83d9d2eac05ee6ec38909dea7350d245
üst 0ffab936
......@@ -237,7 +237,7 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, co
SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
const String& rPath,
const String& rBaseURL,
int bReadNewDoc,
......@@ -305,7 +305,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
eScriptLang = HTML_SL_UNKNOWN;
bAnyStarBasic = sal_True;
pPam = new SwPaM( *rCrsr.GetPoint() );
rCrsr.DeleteMark();
pPam = &rCrsr; // re-use existing cursor: avoids spurious ~SwIndexReg assert
memset( &aAttrTab, 0, sizeof( _HTMLAttrTable ));
// Die Font-Groessen 1-7 aus der INI-Datei lesen
......@@ -453,7 +454,6 @@ SwHTMLParser::~SwHTMLParser()
aSetAttrTab.clear();
}
delete pPam;
delete pCSS1Parser;
delete pNumRuleInfo;
DeleteFormImpl();
......
......@@ -894,7 +894,7 @@ protected:
public:
SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
SwHTMLParser( SwDoc* pD, SwPaM & rCrsr, SvStream& rIn,
const String& rFileName,
const String& rBaseURL,
int bReadNewDoc = sal_True,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment