cui/source/dialogs/iconcdlg.cxx | 2 +- libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx | 2 -- sfx2/source/dialog/basedlgs.cxx | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit e262cf2eba1a9098297ee1e7a3a59d51def4b71e Author: Pranav Kant <pran...@collabora.co.uk> Date: Tue Nov 28 20:16:05 2017 +0530 gtv: Width, height properties should not be construct only Change-Id: I2d1b29f52c1fe0449cf9afe47c509ef6250804a8 diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx index 74cb58e09d48..9cad1e8fb117 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx @@ -459,7 +459,6 @@ gtv_lok_dialog_class_init(GtvLokDialogClass* klass) "Dialog width", 0, 1024, 0, static_cast<GParamFlags>(G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); properties[PROP_DIALOG_HEIGHT] = g_param_spec_uint("height", @@ -467,7 +466,6 @@ gtv_lok_dialog_class_init(GtvLokDialogClass* klass) "Dialog height", 0, 1024, 0, static_cast<GParamFlags>(G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); g_object_class_install_properties (G_OBJECT_CLASS(klass), PROP_LAST, properties); commit 9ad0c1815e137c55f2d356c46630e67570262196 Author: Pranav Kant <pran...@collabora.co.uk> Date: Tue Nov 28 20:08:44 2017 +0530 lokdialog: Fix hyperlink dialog; properly chain upto SfxModal's dispose Fallback from 3dfd42ec03da97f555869bd36393912b82836108 Change-Id: Ifd8c721b001b09ddab8d4fe06ae6818980d6ee76 diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 41475c00233b..ce3d292b97b0 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -245,7 +245,7 @@ void IconChoiceDialog::dispose() m_pHelpBtn.clear(); m_pResetBtn.clear(); m_pTabContainer.clear(); - ModalDialog::dispose(); + SfxModalDialog::dispose(); } /********************************************************************** commit 29f23a47f02b05ddd9a3a626a6cf8bfa7083d1bc Author: Pranav Kant <pran...@collabora.co.uk> Date: Tue Nov 28 16:59:26 2017 +0530 lokdialog: Make hyperlink dialog work Change-Id: Ia77998ef18060b999bae4e981a5dca3dd25f4953 diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index c20a046ec200..1c2d46d404ac 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -187,6 +187,11 @@ void SfxModalDialog::StateChanged(StateChangedType nType) if (comphelper::LibreOfficeKit::isActive() && nType == StateChangedType::InitShow) { + // There are some dialogs, like Hyperlink dialog, which inherit from + // ModalDialog even though they are modeless, i.e., their Execute method + // isn't called. We need to set the notifier for them. + if (!GetLOKNotifier()) + SetLOKNotifier(SfxViewShell::Current()); const Size aSize = GetOptimalSize(); std::vector<vcl::LOKPayloadItem> aItems; aItems.emplace_back(std::make_pair("size", aSize.toString())); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits