[Libreoffice-commits] core.git: 3 commits - svx/uiconfig sw/source vcl/source

[Caolán McNamara]

 svx/uiconfig/ui/docrecoverybrokendialog.ui  |    8 ++++----
 svx/uiconfig/ui/docrecoveryrecoverdialog.ui |    1 -
 sw/source/filter/ww8/ww8graf.cxx            |    2 +-
 vcl/source/window/builder.cxx               |    2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit d8e976e365f34409b33546abc3820b9fcd7930cd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 26 12:11:20 2014 +0100

    name offending dialog
    
    Change-Id: I678627177dd81b422a66370cbc4ef7d7e740714b

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 00ba2b5..65cf06c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -488,7 +488,7 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString&
                 }
             }
         }
-        SAL_WARN_IF(nButtons && !bHasDefButton, "vcl.layout", "No default button defined");
+        SAL_WARN_IF(nButtons && !bHasDefButton, "vcl.layout", "No default button defined in " << sUIFile);
     }
 #endif
 }
commit 24024ccfbd6a4b56743cea5ebb20697aae8f282e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 26 11:59:23 2014 +0100

    set default buttons
    
    Change-Id: Id91f0d0bf3743e7304ff079bbc82bc8b347a9c74

diff --git a/svx/uiconfig/ui/docrecoverybrokendialog.ui b/svx/uiconfig/ui/docrecoverybrokendialog.ui
index bad017d..b0828ef 100644
--- a/svx/uiconfig/ui/docrecoverybrokendialog.ui
+++ b/svx/uiconfig/ui/docrecoverybrokendialog.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DocRecoveryBrokenDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -21,8 +22,9 @@
                 <property name="use_action_appearance">False</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_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -38,7 +40,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -152,7 +153,6 @@ The documents listed below will be saved in the folder noted below if you click
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
index 4de5a55..034380e 100644
--- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -39,7 +39,6 @@
                 <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>
commit ea1bb8be79f1daea1127e71e01a46989538dc2df
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 26 11:57:59 2014 +0100

    grapic->graphic
    
    Change-Id: I81bf188d1dc53783f5f9a3826497aba6c52d3f29

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 1abac07..a810e71 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2381,7 +2381,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     WW8PLCFspecial* pPF = pPlcxMan->GetFdoa();
     if( !pPF )
     {
-        OSL_ENSURE( false, "Where is the grapic (1) ?" );
+        OSL_ENSURE( false, "Where is the graphic (1) ?" );
         return 0;
     }