[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/inc sfx2/source sfx2/uiconfig

[Caolán McNamara]

 sfx2/inc/templatedlg.hxx        |    4 ++--
 sfx2/source/doc/templatedlg.cxx |    4 +++-
 sfx2/uiconfig/ui/templatedlg.ui |    3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 1f42f9ada97acc625548c836c838a9fcb9d9361a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 14 17:25:18 2014 +0100

    Resolves: fdo#72587 make template dialog Modal
    
    (cherry picked from commit 60126254eba8a6a6b94c60b2101ee90986161e24)
    
    Change-Id: Ifb6d7ebbe297d17fc99426b501c92daf8577dd20
    Reviewed-on: https://gerrit.libreoffice.org/11978
    Reviewed-by: Muthu Subramanian K <muthusuba at gmail.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 58d18cf..6731b71 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -39,13 +39,13 @@ namespace com {
     }   }   }
 }
 
-class SfxTemplateManagerDlg : public ModelessDialog
+class SfxTemplateManagerDlg : public ModalDialog
 {
     typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*);
 
 public:
 
-    SfxTemplateManagerDlg (Window *parent = DIALOG_NO_PARENT);
+    SfxTemplateManagerDlg(Window *parent = NULL);
 
     virtual ~SfxTemplateManagerDlg ();
 
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 2f91796..94457a8 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(Window *parent)
-    : ModelessDialog(parent, "TemplateDialog", "sfx/ui/templatedlg.ui"),
+    : ModalDialog(parent, "TemplateDialog", "sfx/ui/templatedlg.ui"),
       maSelTemplates(cmpSelectionItems),
       maSelFolders(cmpSelectionItems),
       mbIsSaveMode(false),
@@ -183,6 +183,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(Window *parent)
       mbIsSynced(false),
       maRepositories()
 {
+    fprintf(stderr, "SfxTemplateManagerDlg::SfxTemplateManagerDlg\n");
+
     get(mpTabControl, "tab_control");
     get(mpSearchEdit, "search_edit");
     get(mpViewBar, "action_view");
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index b6ecee8..f6bcdff 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>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
@@ -326,6 +327,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>
@@ -339,6 +341,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>