diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-15 20:41:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-20 21:25:12 +0200 |
| commit | 024a57017384a61b4a61056f1de275f44642bef3 (patch) | |
| tree | 6d9896c34326c1ef79325dd6e8d8730a40df5c4a /include/svtools | |
| parent | e0750697dcd30848411a162453813c5b0fafc44b (diff) | |
drop newly unnecessary OGenericUnoDialog::Dialog
Change-Id: If047d08cea93fdfacff9ee00c69cf57ba08c916c
Reviewed-on: https://gerrit.libreoffice.org/78972
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/genericunodialog.hxx | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 4c8dc6ed768a..298d488d0d23 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -62,42 +62,8 @@ namespace svt ,public ::comphelper::OMutexAndBroadcastHelper ,public ::comphelper::OPropertyContainer { - public: - struct Dialog - { - std::unique_ptr<weld::DialogController> m_xWeldDialog; - - Dialog() - { - } - - Dialog(std::unique_ptr<weld::DialogController> pWeldDialog) - : m_xWeldDialog(std::move(pWeldDialog)) - { - } - - explicit operator bool() const - { - return static_cast<bool>(m_xWeldDialog); - } - - void set_title(const OUString& rTitle) - { - m_xWeldDialog->set_title(rTitle); - } - - OString get_help_id() const - { - return m_xWeldDialog->get_help_id(); - } - - void set_help_id(const OString& rHelpId) - { - return m_xWeldDialog->set_help_id(rHelpId); - } - }; protected: - OGenericUnoDialog::Dialog m_aDialog; /// the dialog to execute + std::unique_ptr<weld::DialogController> m_xDialog; /// the dialog to execute bool m_bExecuting : 1; /// we're currently executing the dialog bool m_bTitleAmbiguous : 1; /// m_sTitle has not been set yet bool m_bInitialized : 1; /// has "initialize" been called? @@ -143,7 +109,7 @@ namespace svt but the application-wide solar mutex is (to guard the not thread-safe ctor of the dialog). @param pParent the parent window for the new dialog */ - virtual OGenericUnoDialog::Dialog createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) = 0; + virtual std::unique_ptr<weld::DialogController> createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) = 0; /// called to destroy the dialog used. deletes m_pDialog and resets it to NULL void destroyDialog(); |