[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig

[Caolán McNamara]

 include/sfx2/templatedlg.hxx    |    2 +-
 sfx2/source/doc/templatedlg.cxx |    2 +-
 sfx2/uiconfig/ui/templatedlg.ui |    3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 60126254eba8a6a6b94c60b2101ee90986161e24
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 14 17:16:34 2014 +0100

    Resolves: fdo#72587 make template dialog Modal
    
    Change-Id: Iefb63bc7cdbff2217f16c1a72fc271361227588b

diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 984b06a..b9597cb 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 fd3fa77..bdd2b27 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 945fca2..0c7eec7 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>