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

[Caolán McNamara]

 extensions/source/propctrlr/formcomponenthandler.cxx |   10 +++++-----
 sw/uiconfig/swriter/ui/insertfootnote.ui             |    6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 092281f1e7022ee26e3659cc1c54ac0dd73a4382
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 2 17:11:40 2013 +0100

    Resolves: fdo#66252 format->number for controls is busted
    
    Change-Id: I7c88f3acd9a6c5faa40a8fedc7c9f6e7817cefb7

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index e35dfd7..e29b892 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2716,20 +2716,20 @@ namespace pcr
             aCoreSet.Put( aFormatter );
 
             // a tab dialog with a single page
-            ::std::auto_ptr< SfxNoLayoutSingleTabDialog > pDialog( new SfxNoLayoutSingleTabDialog( impl_getDefaultDialogParent_nothrow(), aCoreSet, 0 ) );
+            boost::scoped_ptr< SfxSingleTabDialog > xDialog(new SfxSingleTabDialog(impl_getDefaultDialogParent_nothrow(), aCoreSet));
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT( pFact, "CreateFactory fail!" );
             ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
             if ( !fnCreatePage )
                 throw RuntimeException();   // caught below
 
-            SfxTabPage* pPage = (*fnCreatePage)( pDialog.get(), aCoreSet );
-            pDialog->SetTabPage( pPage );
+            SfxTabPage* pPage = (*fnCreatePage)( xDialog->get_content_area(), aCoreSet );
+            xDialog->setTabPage( pPage );
 
             _rClearBeforeDialog.clear();
-            if ( RET_OK == pDialog->Execute() )
+            if ( RET_OK == xDialog->Execute() )
             {
-                const SfxItemSet* pResult = pDialog->GetOutputItemSet();
+                const SfxItemSet* pResult = xDialog->GetOutputItemSet();
 
                 const SfxPoolItem* pItem = pResult->GetItem( SID_ATTR_NUMBERFORMAT_INFO );
                 const SvxNumberInfoItem* pInfoItem = dynamic_cast< const SvxNumberInfoItem* >( pItem );
commit 7b3839e0c3d9339b4469a808e2818cd3f3119cc4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 2 16:03:55 2013 +0100

    vertically align center widgets
    
    Change-Id: Iedd7fc4e05aa59e59725f2087ded704aae0b6115

diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index e23e9af..5a836a9 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -138,6 +138,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="valign">center</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -156,6 +157,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="valign">center</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">automatic</property>
@@ -175,6 +177,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">start</property>
+                            <property name="valign">center</property>
                             <property name="invisible_char">•</property>
                             <property name="width_chars">2</property>
                             <property name="progress_fraction">0.0099999997764825821</property>
@@ -202,6 +205,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="halign">start</property>
+                            <property name="valign">center</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -261,6 +265,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="valign">center</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -278,6 +283,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="valign">center</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">footnote</property>