[Libreoffice-commits] core.git: 2 commits - sw/source sw/uiconfig

[Caolán McNamara]

 sw/source/ui/dbui/mmoutputpage.cxx           |    5 +++++
 sw/uiconfig/swriter/ui/printmonitordialog.ui |    2 ++
 2 files changed, 7 insertions(+)

New commits:
commit a7d61daf03f6410bc313961bd100faa4e4d33059
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 7 13:26:07 2013 +0100

    %1 placeholder never replaced with anything
    
    Change-Id: Icd7111ec044032fe76a19454bcf6b795229a0e56

diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 1239423..35d9881 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -170,6 +170,11 @@ SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(Window* pParent, const String& rFil
     aWarningImageIM.SetImage(WarningBox::GetStandardImage());
     aFileNameED.SetText(rFileName);
     aFileNameED.SetModifyHdl(LINK(this, SwSaveWarningBox_Impl, ModifyHdl));
+
+    INetURLObject aTmp(rFileName);
+    aWarningFI.SetText(aWarningFI.GetText().replaceAll("%1", aTmp.getName(
+            INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET)));
+
     ModifyHdl( &aFileNameED );
 }
 
commit 6da7cc143666a1e381f478d97ac7c1be7f3e436a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 7 13:25:50 2013 +0100

    set explicit default button
    
    Change-Id: I288c00b5eff6876ba9d790ee5ab4f0d1cbc2cd4f

diff --git a/sw/uiconfig/swriter/ui/printmonitordialog.ui b/sw/uiconfig/swriter/ui/printmonitordialog.ui
index 2924c3d..d6a7e0a 100644
--- a/sw/uiconfig/swriter/ui/printmonitordialog.ui
+++ b/sw/uiconfig/swriter/ui/printmonitordialog.ui
@@ -20,6 +20,8 @@
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>