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

[Miklos Vajna]

 cui/source/dialogs/zoom.cxx   |    2 +-
 cui/source/inc/zoom.hxx       |    4 ++--
 cui/uiconfig/ui/zoomdialog.ui |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5fff8a99b344d92e6eb715fb59e2819b645787e5
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Mon Mar 4 16:26:44 2013 +0100

    SvxZoomDialog: m_pColumnsEdit can be a NumericField
    
    Change-Id: Ic5469c89587b509822be8e29febc9047548c07ab

diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index a3d5387..01a9031 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -355,7 +355,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, MetricField *, pEdt )
+IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, NumericField *, pEdt )
 {
     if ( pEdt == m_pColumnsEdit && !m_pColumnsBtn->IsChecked() )
         return 0;
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index b76d44f..75588a0 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -38,7 +38,7 @@ private:
     RadioButton*        m_pAutomaticBtn;
     RadioButton*        m_pSingleBtn;
     RadioButton*        m_pColumnsBtn;
-    MetricField*        m_pColumnsEdit;
+    NumericField*       m_pColumnsEdit;
     CheckBox*           m_pBookModeChk;
 
     OKButton*           m_pOKBtn;
@@ -51,7 +51,7 @@ private:
     DECL_LINK( UserHdl, RadioButton* );
     DECL_LINK(SpinHdl, void *);
     DECL_LINK( ViewLayoutUserHdl, RadioButton* );
-    DECL_LINK( ViewLayoutSpinHdl, MetricField* );
+    DECL_LINK( ViewLayoutSpinHdl, NumericField* );
     DECL_LINK( ViewLayoutCheckHdl, CheckBox* );
     DECL_LINK( OKHdl, Button* );
 #endif
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index 32e5a93..417a7e6 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -300,7 +300,7 @@
                                 <property name="draw_indicator">True</property>
                                 <property name="group">automatic</property>
                                 <accessibility>
-                                  <relation type="label-for" target="columnssb:0"/>
+                                  <relation type="label-for" target="columnssb"/>
                                   <relation type="label-for" target="bookmode"/>
                                 </accessibility>
                               </object>
@@ -311,7 +311,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinButton" id="columnssb:0">
+                              <object class="GtkSpinButton" id="columnssb">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">●</property>