diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-07-17 19:54:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-07-18 09:37:28 +0200 |
| commit | e2cd1f41b8cb8a27155ce1ddddfe5760f05b7129 (patch) | |
| tree | fffa1a6602ab9fa061b062bfe100e2a4d9a822fe /reportdesign | |
| parent | 9b25e24571cd6ee644416158b493188354d961f7 (diff) | |
cid#1448383 Resource leak in object
Change-Id: I07af4d48db887c184be824a2d1939b800f837d4e
Reviewed-on: https://gerrit.libreoffice.org/75801
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/Formula.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 919deaeec869..f4c46be3ce6c 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -52,7 +52,7 @@ FormulaDialog::FormulaDialog(weld::Window* pParent , svl::SharedStringPool& rStrPool ) : FormulaModalDialog( pParent, _pFunctionMgr.get(),this) ,m_aFunctionManager(_pFunctionMgr) - ,m_pFormulaData(new FormEditData()) + ,m_xFormulaData(new FormEditData()) ,m_pAddField(nullptr) ,m_xRowSet(_xRowSet) ,m_pEdit(nullptr) @@ -94,7 +94,7 @@ FormulaDialog::~FormulaDialog() aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WindowStateMask::X | WindowStateMask::Y | WindowStateMask::State | WindowStateMask::Minimized), RTL_TEXTENCODING_ASCII_US)); } - StoreFormEditData( m_pFormulaData ); + StoreFormEditData(m_xFormulaData.get()); m_pEdit = nullptr; m_pAddField.clear(); } @@ -145,7 +145,7 @@ void FormulaDialog::switchBack() } FormEditData* FormulaDialog::getFormEditData() const { - return m_pFormulaData; + return m_xFormulaData.get(); } void FormulaDialog::setCurrentFormula(const OUString& _sReplacement) { diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 394d0b147b4e..1335c6012dd8 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -45,8 +45,8 @@ class OAddFieldWindow; class FormulaDialog : public formula::FormulaModalDialog, public formula::IControlReferenceHandler { - std::shared_ptr< formula::IFunctionManager > m_aFunctionManager; - formula::FormEditData* const m_pFormulaData; + std::shared_ptr<formula::IFunctionManager> m_aFunctionManager; + std::unique_ptr<formula::FormEditData> m_xFormulaData; VclPtr<OAddFieldWindow> m_pAddField; css::uno::Reference < css::beans::XPropertySet > m_xRowSet; css::uno::Reference< css::report::meta::XFormulaParser> m_xParser; |