diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-20 19:45:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-21 13:00:00 +0200 |
| commit | 10df4750c18d18913f11f9d3224398499c9a3c01 (patch) | |
| tree | f7caf16bcf0393a83b911f779af15c3b9ca252ad | |
| parent | cd293966322a45dec000c6612979c267307a3868 (diff) | |
make info dialog a child of the dropdown dialog
instead of a child of the parent of the dropdown dialog
Change-Id: Ib94be49955efb4384a77a524f3614db7e56cd03c
Reviewed-on: https://gerrit.libreoffice.org/77860
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/ui/fldui/DropDownFormFieldDialog.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/inc/DropDownFormFieldDialog.hxx | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx index 7d703dee7122..4457b29f5eaf 100644 --- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx @@ -21,7 +21,6 @@ DropDownFormFieldDialog::DropDownFormFieldDialog(weld::Widget* pParent, mark::IFieldmark* pDropDownField) : GenericDialogController(pParent, "modules/swriter/ui/dropdownformfielddialog.ui", "DropDownFormFieldDialog") - , m_pParent(pParent) , m_pDropDownField(pDropDownField) , m_bListHasChanged(false) , m_xListItemEntry(m_xBuilder->weld_entry("item_entry")) @@ -135,7 +134,7 @@ void DropDownFormFieldDialog::AppendItemToList() if (m_xListItemsTreeView->n_children() >= ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT) { std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog( - m_pParent, VclMessageType::Info, VclButtonsType::Ok, + m_xDialog.get(), VclMessageType::Info, VclButtonsType::Ok, SwResId(STR_DROP_DOWN_FIELD_ITEM_LIMIT))); xInfoBox->run(); return; diff --git a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx index e3cf8032b97f..ae1e1b51db62 100644 --- a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx @@ -26,7 +26,6 @@ namespace sw class DropDownFormFieldDialog : public weld::GenericDialogController { private: - weld::Widget* const m_pParent; mark::IFieldmark* m_pDropDownField; bool m_bListHasChanged; |