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

[Caolán McNamara]

 sc/source/ui/miscdlgs/inscodlg.cxx   |    1 -
 sc/uiconfig/scalc/ui/pastespecial.ui |   11 ++++++++++-
 sfx2/uiconfig/ui/documentinfopage.ui |    1 +
 vcl/source/window/window2.cxx        |    5 +++++
 4 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 7701b0cbb932f4d75d5c82b66d4fcca4230222ff
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 21 16:04:51 2015 +0000

    add has-focus .ui support
    
    Change-Id: Ifd95d9fa74f6cbba989c05aae2a225a85b78c9f1

diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 0ac77f7..75e5bac 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -124,7 +124,6 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
     mpBtnShortCutPasteValuesOnly->SetClickHdl( LINK( this, ScInsertContentsDlg, ShortCutHdl ) );;
     mpBtnShortCutPasteValuesFormats->SetClickHdl( LINK( this, ScInsertContentsDlg, ShortCutHdl ) );;
     mpBtnShortCutPasteTranspose->SetClickHdl( LINK( this, ScInsertContentsDlg, ShortCutHdl ) );
-    mpBtnInsAll->GrabFocus();
 }
 
 InsertDeleteFlags ScInsertContentsDlg::GetInsContentsCmdBits() const
diff --git a/sc/uiconfig/scalc/ui/pastespecial.ui b/sc/uiconfig/scalc/ui/pastespecial.ui
index 1a5f4ff..552d2bf 100644
--- a/sc/uiconfig/scalc/ui/pastespecial.ui
+++ b/sc/uiconfig/scalc/ui/pastespecial.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="img_paste_transpose">
@@ -175,6 +175,7 @@
                             <property name="label" translatable="yes">_Paste all</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="has_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
@@ -316,6 +317,8 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -446,6 +449,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -537,6 +542,8 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -632,6 +639,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
           </object>
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui
index 494e20f..46e1c28 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -237,6 +237,7 @@
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="has_focus">True</property>
         <property name="receives_default">True</property>
         <property name="valign">center</property>
         <property name="use_underline">True</property>
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 2fa48ae..4c39be2 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1666,6 +1666,11 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
         //https://live.gnome.org/GnomeGoals/RemoveMarkupInMessages
         SAL_WARN_IF(toBool(rValue), "vcl.layout", "Use pango attributes instead of mark-up");
     }
+    else if (rKey == "has-focus")
+    {
+        if (toBool(rValue))
+            GrabFocus();
+    }
     else
     {
         SAL_INFO("vcl.layout", "unhandled property: " << rKey.getStr());