diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 14:48:35 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 21:03:18 +0200 |
commit | 349d0e679a4ee296c703145afe73e65efc5d2bff (patch) | |
tree | 0366283ed5245f10315eae53e518bea7299d65b1 /include/sfx2/basedlgs.hxx | |
parent | 19ec881034dbabbdc72779eb9382d0deb17ac569 (diff) |
Resolves: tdf#120277 special character dialog not appearing in Online
the magic smoke connecting the dialog to the viewshell was in
SfxModalDialog, so not inheriting from that drops the connection
add a SfxDialogController to enable setting up the connection
Change-Id: I29c45cd43e05295309fc647b039db0c6565ca0d1
Reviewed-on: https://gerrit.libreoffice.org/61304
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/sfx2/basedlgs.hxx')
-rw-r--r-- | include/sfx2/basedlgs.hxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 39f74dc024e8..bb861366f9d7 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -56,6 +56,7 @@ private: SAL_DLLPRIVATE void SetDialogData_Impl(); SAL_DLLPRIVATE void GetDialogData_Impl(); + DECL_DLLPRIVATE_LINK(InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*); protected: SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription); @@ -71,7 +72,6 @@ public: const SfxItemSet* GetOutputItemSet() const { return pOutputSet.get(); } const SfxItemSet* GetInputItemSet() const { return pInputSet; } - void StateChanged( StateChangedType nStateChange ) override; }; // class SfxModelessDialog -------------------------------------------------- @@ -87,6 +87,7 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog void Init(SfxBindings *pBindinx, SfxChildWindow *pCW); + DECL_DLLPRIVATE_LINK(InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*); protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, vcl::Window*, const OUString& rID, const OUString& rUIXMLDescription ); @@ -105,7 +106,6 @@ public: { return *pBindings; } DECL_LINK(TimerHdl, Timer *, void); - }; // class SfxFloatingWindow -------------------------------------------------- @@ -190,7 +190,15 @@ private: std::unique_ptr<SingleTabDlgImpl> pImpl; }; -class SFX2_DLLPUBLIC SfxSingleTabDialogController : public weld::GenericDialogController +class SFX2_DLLPUBLIC SfxDialogController : public weld::GenericDialogController +{ +private: + DECL_DLLPRIVATE_LINK(InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*); +public: + SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, const OString& rDialogId); +}; + +class SFX2_DLLPUBLIC SfxSingleTabDialogController : public SfxDialogController { private: VclPtr<SfxTabPage> m_xSfxPage; |