diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-14 17:16:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-14 17:16:34 +0100 |
| commit | 60126254eba8a6a6b94c60b2101ee90986161e24 (patch) | |
| tree | a14cd4a79a5291b1ff590ee1e0a7934793cf760a | |
| parent | b13591d48f58b45f4465ce03bd1248ec1e95584f (diff) | |
Resolves: fdo#72587 make template dialog Modal
Change-Id: Iefb63bc7cdbff2217f16c1a72fc271361227588b
| -rw-r--r-- | include/sfx2/templatedlg.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/templatedlg.ui | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 984b06a2d16d..b9597cb3d8c3 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -48,7 +48,7 @@ class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public ModelessDialog public: - SfxTemplateManagerDlg (vcl::Window *parent = DIALOG_NO_PARENT); + SfxTemplateManagerDlg(vcl::Window *parent = NULL); virtual ~SfxTemplateManagerDlg (); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index fd3fa77df054..bdd2b27e8856 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -175,7 +175,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV } SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) - : ModelessDialog(parent, "TemplateDialog", "sfx/ui/templatedlg.ui"), + : ModalDialog(parent, "TemplateDialog", "sfx/ui/templatedlg.ui"), maSelTemplates(cmpSelectionItems), maSelFolders(cmpSelectionItems), mbIsSaveMode(false), diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui index 945fca211075..0c7eec71756f 100644 --- a/sfx2/uiconfig/ui/templatedlg.ui +++ b/sfx2/uiconfig/ui/templatedlg.ui @@ -7,6 +7,7 @@ <property name="width_request">800</property> <property name="height_request">560</property> <property name="can_focus">False</property> + <property name="modal">True</property> <property name="title" translatable="yes">Template Manager</property> <child> <object class="GtkBox" id="box1"> @@ -327,6 +328,7 @@ <object class="sfxlo-TemplateSearchView" id="search_view"> <property name="can_focus">True</property> <property name="no_show_all">True</property> + <property name="margin">0</property> <property name="hexpand">True</property> <property name="vexpand">True</property> </object> @@ -340,6 +342,7 @@ <object class="sfxlo-TemplateRemoteView" id="remote_view"> <property name="can_focus">True</property> <property name="no_show_all">True</property> + <property name="margin">0</property> <property name="hexpand">True</property> <property name="vexpand">True</property> </object> |