diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-15 17:57:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-20 21:24:50 +0200 |
| commit | e0750697dcd30848411a162453813c5b0fafc44b (patch) | |
| tree | 5bb7dc3f033eb27a180450bd7c54af7bd61047b7 /include/svtools | |
| parent | 910b8b04325e0103941b6c6d152e4ee5f0388fc2 (diff) | |
m_xVclDialog now unused
Change-Id: I12c11451af5c5c9fe0d635a077eee0c57c6aa14f
Reviewed-on: https://gerrit.libreoffice.org/78971
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 | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index bd091ee87ceb..4c8dc6ed768a 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -65,18 +65,12 @@ namespace svt public: struct Dialog { - VclPtr<::Dialog> m_xVclDialog; std::unique_ptr<weld::DialogController> m_xWeldDialog; Dialog() { } - Dialog(const VclPtr<::Dialog>& rVclDialog) - : m_xVclDialog(rVclDialog) - { - } - Dialog(std::unique_ptr<weld::DialogController> pWeldDialog) : m_xWeldDialog(std::move(pWeldDialog)) { @@ -84,32 +78,22 @@ namespace svt explicit operator bool() const { - return m_xVclDialog || m_xWeldDialog; + return static_cast<bool>(m_xWeldDialog); } void set_title(const OUString& rTitle) { - if (m_xWeldDialog) - m_xWeldDialog->set_title(rTitle); - else if (m_xVclDialog) - m_xVclDialog->SetText(rTitle); + m_xWeldDialog->set_title(rTitle); } OString get_help_id() const { - if (m_xWeldDialog) - return m_xWeldDialog->get_help_id(); - else if (m_xVclDialog) - return m_xVclDialog->GetHelpId(); - return OString(); + return m_xWeldDialog->get_help_id(); } void set_help_id(const OString& rHelpId) { - if (m_xWeldDialog) - return m_xWeldDialog->set_help_id(rHelpId); - else if (m_xVclDialog) - return m_xVclDialog->SetHelpId(rHelpId); + return m_xWeldDialog->set_help_id(rHelpId); } }; protected: @@ -178,7 +162,6 @@ namespace svt virtual void implInitialize(const css::uno::Any& _rValue); private: - DECL_LINK( OnDialogDying, VclWindowEvent&, void ); /** ensures that m_pDialog is not <NULL/> |