Kaydet (Commit) 424966f0 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix strange memory leak in VclBuilder

Change-Id: Iba34c25b19a94a8d4c147f8ccaef95f34183414b
üst 342d3f45
...@@ -304,7 +304,7 @@ private: ...@@ -304,7 +304,7 @@ private:
bool m_bToplevelHasDeferredInit; bool m_bToplevelHasDeferredInit;
bool m_bToplevelHasDeferredProperties; bool m_bToplevelHasDeferredProperties;
bool m_bToplevelParentFound; bool m_bToplevelParentFound;
ParserState *m_pParserState; std::unique_ptr<ParserState> m_pParserState;
vcl::Window *get_by_name(const OString& sID); vcl::Window *get_by_name(const OString& sID);
void delete_by_name(const OString& sID); void delete_by_name(const OString& sID);
......
...@@ -484,7 +484,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr ...@@ -484,7 +484,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
} }
//drop maps, etc. that we don't need again //drop maps, etc. that we don't need again
delete m_pParserState; m_pParserState.reset();
SAL_WARN_IF(!m_sID.isEmpty() && (!m_bToplevelParentFound && !get_by_name(m_sID)), "vcl.layout", SAL_WARN_IF(!m_sID.isEmpty() && (!m_bToplevelParentFound && !get_by_name(m_sID)), "vcl.layout",
"Requested top level widget \"" << m_sID.getStr() << "Requested top level widget \"" << m_sID.getStr() <<
......
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