formula/source/ui/dlg/formula.cxx | 4 ++++
include/formula/formula.hxx | 3 +++
2 files changed, 7 insertions(+)
New commits:
commit 3fdd4f069d5436cf39708004af7fda8175fbc4c2
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date: Tue Jul 8 22:44:11 2014 -0400
Explicit virtual dtor needed for auto_ptr member for MSVC.
Else it won't build.
Change-Id: I6d857ffc7a444abaf477ee820e577757287a707c
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index b4fc563..3377565 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1654,6 +1654,8 @@ FormulaModalDialog::FormulaModalDialog( Window* pParent
SetText(m_pImpl->aTitle1);
}
+FormulaModalDialog::~FormulaModalDialog() {}
+
void FormulaModalDialog::Update(const OUString& _sExp)
{
m_pImpl->Update(_sExp);
@@ -1738,6 +1740,8 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow*
pCW,
SetText(m_pImpl->aTitle1);
}
+FormulaDlg::~FormulaDlg() {}
+
void FormulaDlg::Update(const OUString& _sExp)
{
m_pImpl->Update(_sExp);
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 28ecc1e..6aa3f4d 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -56,6 +56,8 @@ public:
, bool _bSupportMatrix
,IFunctionManager* _pFunctionMgr
,IControlReferenceHandler* _pDlg =
NULL );
+ virtual ~FormulaModalDialog();
+
private:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FormulaDlg_Impl> m_pImpl;
@@ -95,6 +97,7 @@ public:
, bool _bSupportMatrix
, IFunctionManager* _pFunctionMgr
, IControlReferenceHandler* _pDlg = NULL );
+ virtual ~FormulaDlg();
private:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FormulaDlg_Impl> m_pImpl;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
