diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-22 08:23:38 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-22 08:37:26 +0100 |
commit | 60db0ded330f800306b9a829922bf389e1c0aa07 (patch) | |
tree | e11dc31f724045e05336e11bf1b12455fa5919b1 /sc/inc/scabstdlg.hxx | |
parent | tdf#96407 Provide OS X version info for About box (diff) | |
download | core-60db0ded330f800306b9a829922bf389e1c0aa07.tar.gz core-60db0ded330f800306b9a829922bf389e1c0aa07.zip |
Move sc/source/ui/dbgui/validate.cxx from scui to sc
8d1a24dae03690b576310e3539369916f31ac475 "Make virtual ~ScValidationDlg
non-inline" caused the RTTI for ScValidationDlg to only be emitted in library
scui instead of (weakly) wherever needed. That causes UBSan to fail when it
uses the RTTI in ScValidityRefChildWin::ScValidityRefChildWin
(sc/source/ui/view/reffact.cxx, in library sc, to check that operations on
VclPtr<ScValidationDlg> pDlg indeed operate on an ScValidationDlg object).
The cleanest fix appears to be to move ScValidationDlg from scui to sc. As
Moggi put it on IRC, "that dialog should be in sc as it is a modeless dialog; no
idea why it works for that dialog but all other modeless calc dialogs have to be
in sc to avoid linker problems."
One remaining question is whether it is save nowadays in ScCellShell::ExecuteDB
(sc/source/ui/view/cellsh2.cxx) to clean up the ScValidationDlg pointed to by
pDlg when that VclPtr<ScValidationDlg> variable goes out of scope, instead of
doing the PostUserEvent(... DelayDeleteAbstractDialog) dance that was there
before because "after end execute from !IsModalInputMode, it is safer to delay
deleting." Lets see.
Change-Id: I3ecfd4fafc7b37b2f30e75974ece9b0a23311ef4
Diffstat (limited to 'sc/inc/scabstdlg.hxx')
-rw-r--r-- | sc/inc/scabstdlg.hxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index d994763a3a20..52d8a62380e5 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -485,13 +485,10 @@ public: virtual SfxAbstractTabDialog * CreateScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) = 0; - virtual SfxAbstractTabDialog * CreateScValidationDlg(vcl::Window* pParent, - const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) = 0; virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) = 0; // for tabpage virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; - virtual GetTabPageRanges GetTabPageRangesFunc() = 0; protected: ~ScAbstractDialogFactory() {} |