Permalink
Browse files

Make virtual ~ScValidationDlg non-inline

...otherwise, GCC 6 would aggressively inline ScValidationDlg destruction of the
VclPtr<ScValidationDlg> in ScValidityRefChildWin::ScValidityRefChildWin
(sc/source/ui/view/reffact.cxx, in sc library), checking whether the vtable
points at ~ScValidationDlg (instead of a derived class dtor) to directly inline
the ~ScValidationDlg code, which requires the ScValidateionDlg vtable (to store
it in the object's vtable during destruction), which requires the code of inline
virtual ScValidationDlg::dispose and ScValidationDlg::Close, which in turn need
the addresses of (non-inline) ScValidationDlg::RemoveRefDlg and
ScTPValidationValue::RemoveRefDlg, both defined in the scui library and not
exported from there.

Change-Id: I7eb96f42deb5edd844d91e999aa5511679302c01
  • Loading branch information...
1 parent 6dfcaa8 commit 8d1a24dae03690b576310e3539369916f31ac475 @stbergmann stbergmann committed Jan 19, 2016
Showing with 6 additions and 1 deletion.
  1. +5 −0 sc/source/ui/dbgui/validate.cxx
  2. +1 −1 sc/source/ui/inc/validate.hxx
@@ -96,6 +96,11 @@ ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet
get(m_pHBox, "refinputbox");
}
+ScValidationDlg::~ScValidationDlg()
+{
+ disposeOnce();
+}
+
void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pDoc )
{
if ( rRange.aStart != rRange.aEnd )
@@ -176,7 +176,7 @@ class ScValidationDlg
public:
explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = nullptr );
- virtual ~ScValidationDlg() { disposeOnce(); }
+ virtual ~ScValidationDlg();
virtual void dispose() override
{
if( m_bOwnRefHdlr )

0 comments on commit 8d1a24d

Please sign in to comment.