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

[Caolán McNamara]

 sc/source/ui/dbgui/consdlg.cxx            |    2 ++
 sc/uiconfig/scalc/ui/consolidatedialog.ui |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 153e8749e4dbc493495938abd070589de834967b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 24 20:08:49 2013 +0100

    set widgets to use for extra title text in shrink mode
    
    Change-Id: I0796cd1d7ea167000b7cce0e3c16502cda8ccd90

diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 3fcdacd..558d68e 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -130,7 +130,9 @@ void ScConsolidateDlg::Init()
     sal_uInt16 i=0;
 
     pRbDataArea->SetReferences(this, pEdDataArea);
+    pEdDataArea->SetReferences(this, get<FixedText>("ftdataarea"));
     pRbDestArea->SetReferences(this, pEdDestArea);
+    pEdDestArea->SetReferences(this, get<FixedText>("ftdestarea"));
 
     pEdDataArea ->SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
     pEdDestArea ->SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
diff --git a/sc/uiconfig/scalc/ui/consolidatedialog.ui b/sc/uiconfig/scalc/ui/consolidatedialog.ui
index 9f039fb..a2bf82d 100644
--- a/sc/uiconfig/scalc/ui/consolidatedialog.ui
+++ b/sc/uiconfig/scalc/ui/consolidatedialog.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="ConsolidateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -144,7 +145,6 @@
               <object class="GtkTreeView" id="consareas">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="model">liststore1</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <child internal-child="selection">
@@ -385,6 +385,7 @@
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="spacing">12</property>