diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-16 17:17:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-17 22:21:54 +0200 |
| commit | e54762baa8019d02cadd311e750f6ff0d276f67b (patch) | |
| tree | cfc9596639edeab1a0f3d659c55be60dc138e145 /sc/inc | |
| parent | 05a0c51ced86460b273a24f5884c99f46d8aae0d (diff) | |
weld ScTPValidationValue and ScValidationDlg
Change-Id: I74b1569fe378f42c1cc78ca8d9b758c6e585c979
Reviewed-on: https://gerrit.libreoffice.org/70845
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/scmod.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 2a3fbc04b748..5b4e519fd693 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -75,7 +75,7 @@ class ScSelectionTransferObj; class ScFormEditData; class ScMarkData; struct ScDragData; -class SfxModelessDialogController; +class SfxDialogController; class ScModule: public SfxModule, public SfxListener, public utl::ConfigurationListener { @@ -109,7 +109,8 @@ class ScModule: public SfxModule, public SfxListener, public utl::ConfigurationL bool m_bIsInSharedDocSaving:1; std::map<sal_uInt16, std::vector<VclPtr<vcl::Window> > > m_mapRefWindow; - std::map<sal_uInt16, std::vector<SfxModelessDialogController*>> m_mapRefController; + // a way to find existing Dialogs for a given parent Window of the slot type + std::map<sal_uInt16, std::vector<std::pair<std::shared_ptr<SfxDialogController>, weld::Window*>>> m_mapRefController; css::uno::Reference< ooo::vba::XSinkCaller > mxAutomationApplicationEventsCaller; @@ -250,10 +251,10 @@ public: SC_DLLPUBLIC void RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); SC_DLLPUBLIC void UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); - SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ); - SC_DLLPUBLIC void RegisterRefController( sal_uInt16 nSlotId, SfxModelessDialogController *pWnd ); - SC_DLLPUBLIC void UnregisterRefController( sal_uInt16 nSlotId, SfxModelessDialogController *pWnd ); + SC_DLLPUBLIC void RegisterRefController(sal_uInt16 nSlotId, std::shared_ptr<SfxDialogController>& rWnd, weld::Window* pWndAncestor); + SC_DLLPUBLIC void UnregisterRefController(sal_uInt16 nSlotId, std::shared_ptr<SfxDialogController>& rWnd); + SC_DLLPUBLIC std::shared_ptr<SfxDialogController> Find1RefWindow(sal_uInt16 nSlotId, weld::Window *pWndAncestor); SC_DLLPUBLIC void RegisterAutomationApplicationEventsCaller(css::uno::Reference< ooo::vba::XSinkCaller > const& xCaller); SC_DLLPUBLIC void CallAutomationApplicationEventSinks(const OUString& Method, css::uno::Sequence< css::uno::Any >& Arguments); |