[Libreoffice-commits] core.git: 8 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source include/vcl sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk vcl/source

Thu May 16 06:35:07 PDT 2013

cui/UIConfig_cui.mk                            |    1 
 cui/source/inc/helpid.hrc                      |    1 
 cui/source/options/optinet2.cxx                |  271 ++++++---------
 cui/source/options/optinet2.hrc                |   34 -
 cui/source/options/optinet2.hxx                |   53 +--
 cui/source/options/optinet2.src                |  220 ------------
 cui/uiconfig/ui/optonlineupdatepage.ui         |    1 
 cui/uiconfig/ui/optproxypage.ui                |  304 +++++++++++++++++
 cui/uiconfig/ui/personalization_tab.ui         |   16 
 extras/source/glade/libreoffice-catalog.xml.in |   16 
 include/vcl/builder.hxx                        |    3 
 sc/UIConfig_scalc.mk                           |    1 
 sc/inc/helpids.h                               |    1 
 sc/source/ui/cctrl/editfield.cxx               |   12 
 sc/source/ui/inc/editfield.hxx                 |    1 
 sc/source/ui/inc/optdlg.hrc                    |   21 -
 sc/source/ui/inc/tpcalc.hxx                    |   44 +-
 sc/source/ui/optdlg/tpcalc.cxx                 |  158 ++++-----
 sc/source/ui/src/optdlg.src                    |  147 --------
 sc/uiconfig/scalc/ui/optcalculatepage.ui       |  429 +++++++++++++++++++++++++
 sc/uiconfig/scalc/ui/protectsheetdlg.ui        |    2 
 vcl/source/window/builder.cxx                  |   14 
 22 files changed, 1006 insertions(+), 744 deletions(-)

New commits:
commit 859f28865c9761a3ea8608ef919fce1ff4037ac4
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu May 16 12:43:32 2013 +0100

    make nospace edit not allow space in numbers only mode
    
    Change-Id: Ie20dacb14b89d872045e58c84d4bf7804f4bee35

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 261058e..b48986c 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -106,22 +106,20 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNoSpaceEdit(Window *pPar
 
 void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent )
 {
-    if ( bOnlyNumeric )
+    bool bValid = rKEvent.GetKeyCode().GetCode() != KEY_SPACE;
+    if (bValid && bOnlyNumeric)
     {
         const KeyCode& rKeyCode = rKEvent.GetKeyCode();
         sal_uInt16 nGroup = rKeyCode.GetGroup();
         sal_uInt16 nKey = rKeyCode.GetCode();
-        sal_Bool bValid = ( KEYGROUP_NUM == nGroup || KEYGROUP_CURSOR == nGroup ||
-                        ( KEYGROUP_MISC == nGroup && ( nKey < KEY_ADD || nKey > KEY_EQUAL ) ) );
+        bValid = ( KEYGROUP_NUM == nGroup || KEYGROUP_CURSOR == nGroup ||
+                 ( KEYGROUP_MISC == nGroup && ( nKey < KEY_ADD || nKey > KEY_EQUAL ) ) );
         if ( !bValid && ( rKeyCode.IsMod1() && (
              KEY_A == nKey || KEY_C == nKey || KEY_V == nKey || KEY_X == nKey || KEY_Z == nKey ) ) )
             // Erase, Copy, Paste, Select All und Undo soll funktionieren
             bValid = sal_True;
-
-        if ( bValid )
-            Edit::KeyInput(rKEvent);
     }
-    else if( rKEvent.GetKeyCode().GetCode() != KEY_SPACE )
+    if (bValid)
         Edit::KeyInput(rKEvent);
 }
 
commit 545e810da6758f78de45a00374877bd091dc051f
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu May 16 11:29:46 2013 +0100

    convert proxy page to .ui
    
    Change-Id: I61db7bf0def96209a85656128188f85899b72292

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 25fbc0c..c065510 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/optmemorypage \
 	cui/uiconfig/ui/optonlineupdatepage \
 	cui/uiconfig/ui/optpathspage \
+	cui/uiconfig/ui/optproxypage \
 	cui/uiconfig/ui/optsavepage \
 	cui/uiconfig/ui/optsecuritypage \
 	cui/uiconfig/ui/optuserpage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index c2cd4a9..5991d1d 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -29,7 +29,6 @@
 #define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
 #define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS"
 #define HID_OPTIONS_CTL "CUI_HID_OPTIONS_CTL"
-#define HID_OPTIONS_PROXY "CUI_HID_OPTIONS_PROXY"
 #define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT"
 #define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS"
 #define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES"
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 9ceec02..261058e 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -99,6 +99,11 @@ using namespace ::sfx2;
 
 // -----------------------------------------------------------------------
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNoSpaceEdit(Window *pParent, VclBuilder::stringmap &)
+{
+    return new SvxNoSpaceEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
+}
+
 void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent )
 {
     if ( bOnlyNumeric )
@@ -136,57 +141,60 @@ void SvxNoSpaceEdit::Modify()
     }
 }
 
+bool SvxNoSpaceEdit::set_property(const OString &rKey, const OString &rValue)
+{
+    if (rKey == "only-numeric")
+        bOnlyNumeric = toBool(rValue);
+    else
+        return Edit::set_property(rKey, rValue);
+    return true;
+}
+
+
 /********************************************************************/
 /*                                                                  */
 /*  SvxProxyTabPage                                                 */
 /*                                                                  */
 /********************************************************************/
 
-SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_PROXY ), rSet ),
-    aOptionGB   (this, CUI_RES(GB_SETTINGS)),
-
-    aProxyModeFT  (this, CUI_RES(FT_PROXYMODE)),
-    aProxyModeLB  (this, CUI_RES(LB_PROXYMODE)),
-
-    aHttpProxyFT      (this, CUI_RES( FT_HTTP_PROXY   )),
-    aHttpProxyED      (this, CUI_RES( ED_HTTP_PROXY     )),
-    aHttpPortFT       (this, CUI_RES( FT_HTTP_PORT      )),
-    aHttpPortED       (this, CUI_RES( ED_HTTP_PORT      ), sal_True),
-
-    aHttpsProxyFT      (this, CUI_RES( FT_HTTPS_PROXY     )),
-    aHttpsProxyED      (this, CUI_RES( ED_HTTPS_PROXY     )),
-    aHttpsPortFT       (this, CUI_RES( FT_HTTPS_PORT      )),
-    aHttpsPortED       (this, CUI_RES( ED_HTTPS_PORT      ), sal_True),
-
-    aFtpProxyFT       (this, CUI_RES( FT_FTP_PROXY      )),
-    aFtpProxyED       (this, CUI_RES( ED_FTP_PROXY      )),
-    aFtpPortFT        (this, CUI_RES( FT_FTP_PORT       )),
-    aFtpPortED        (this, CUI_RES( ED_FTP_PORT       ), sal_True),
-
-    aNoProxyForFT     (this, CUI_RES( FT_NOPROXYFOR     )),
-    aNoProxyForED     (this, CUI_RES( ED_NOPROXYFOR     )),
-    aNoProxyDescFT    (this, CUI_RES( ED_NOPROXYDESC    )),
-    aProxyModePN("ooInetProxyType"),
-    aHttpProxyPN("ooInetHTTPProxyName"),
-    aHttpPortPN("ooInetHTTPProxyPort"),
-    aHttpsProxyPN("ooInetHTTPSProxyName"),
-    aHttpsPortPN("ooInetHTTPSProxyPort"),
-    aFtpProxyPN("ooInetFTPProxyName"),
-    aFtpPortPN("ooInetFTPProxyPort"),
-    aNoProxyDescPN("ooInetNoProxy")
+SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet)
+    : SfxTabPage(pParent, "OptProxyPage","cui/ui/optproxypage.ui", rSet)
+    , aProxyModePN("ooInetProxyType")
+    , aHttpProxyPN("ooInetHTTPProxyName")
+    , aHttpPortPN("ooInetHTTPProxyPort")
+    , aHttpsProxyPN("ooInetHTTPSProxyName")
+    , aHttpsPortPN("ooInetHTTPSProxyPort")
+    , aFtpProxyPN("ooInetFTPProxyName")
+    , aFtpPortPN("ooInetFTPProxyPort")
+    , aNoProxyDescPN("ooInetNoProxy")
 {
-    FreeResource();
+    get(m_pProxyModeLB, "proxymode");
+
+    get(m_pHttpProxyFT, "httpft");
+    get(m_pHttpProxyED, "http");
+    get(m_pHttpPortFT, "httpportft");
+    get(m_pHttpPortED, "httpport");
+
+    get(m_pHttpsProxyFT, "httpsft");
+    get(m_pHttpsProxyED, "https");
+    get(m_pHttpsPortFT, "httpsportft");
+    get(m_pHttpsPortED, "httpsport");
+
+    get(m_pFtpProxyFT, "ftpft");
+    get(m_pFtpProxyED, "ftp");
+    get(m_pFtpPortFT, "ftpportft");
+    get(m_pFtpPortED, "ftpport");
+
+    get(m_pNoProxyForFT, "noproxyft");
+    get(m_pNoProxyForED, "noproxy");
+    get(m_pNoProxyDescFT, "noproxydesc");
 
-    aHttpPortED.SetMaxTextLen(5);
-    aHttpsPortED.SetMaxTextLen(5);
-    aFtpPortED.SetMaxTextLen(5);
     Link aLink = LINK( this, SvxProxyTabPage, LoseFocusHdl_Impl );
-    aHttpPortED.SetLoseFocusHdl( aLink );
-    aHttpsPortED.SetLoseFocusHdl( aLink );
-    aFtpPortED.SetLoseFocusHdl( aLink );
+    m_pHttpPortED->SetLoseFocusHdl( aLink );
+    m_pHttpsPortED->SetLoseFocusHdl( aLink );
+    m_pFtpPortED->SetLoseFocusHdl( aLink );
 
-    aProxyModeLB.SetSelectHdl(LINK( this, SvxProxyTabPage, ProxyHdl_Impl ));
+    m_pProxyModeLB->SetSelectHdl(LINK( this, SvxProxyTabPage, ProxyHdl_Impl ));
 
     Reference< com::sun::star::lang::XMultiServiceFactory >
         xConfigurationProvider(
@@ -205,8 +213,6 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
     m_xConfigurationUpdateAccess = xConfigurationProvider->createInstanceWithArguments(
         OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ),
         aArgumentList );
-
-    ArrangeControls_Impl();
 }
 
 SvxProxyTabPage::~SvxProxyTabPage()
@@ -228,42 +234,42 @@ void SvxProxyTabPage::ReadConfigData_Impl()
 
         if( xNameAccess->getByName(aProxyModePN) >>= nIntValue )
         {
-            aProxyModeLB.SelectEntryPos( (sal_uInt16) nIntValue );
+            m_pProxyModeLB->SelectEntryPos( (sal_uInt16) nIntValue );
         }
 
         if( xNameAccess->getByName(aHttpProxyPN) >>= aStringValue )
         {
-            aHttpProxyED.SetText( aStringValue );
+            m_pHttpProxyED->SetText( aStringValue );
         }
 
         if( xNameAccess->getByName(aHttpPortPN) >>= nIntValue )
         {
-            aHttpPortED.SetText( OUString::number( nIntValue ));
+            m_pHttpPortED->SetText( OUString::number( nIntValue ));
         }
 
         if( xNameAccess->getByName(aHttpsProxyPN) >>= aStringValue )
         {
-            aHttpsProxyED.SetText( aStringValue );
+            m_pHttpsProxyED->SetText( aStringValue );
         }
 
         if( xNameAccess->getByName(aHttpsPortPN) >>= nIntValue )
         {
-            aHttpsPortED.SetText( OUString::number( nIntValue ));
+            m_pHttpsPortED->SetText( OUString::number( nIntValue ));
         }
 
         if( xNameAccess->getByName(aFtpProxyPN) >>= aStringValue )
         {
-            aFtpProxyED.SetText( aStringValue );
+            m_pFtpProxyED->SetText( aStringValue );
         }
 
         if( xNameAccess->getByName(aFtpPortPN) >>= nIntValue )
         {
-            aFtpPortED.SetText( OUString::number( nIntValue ));
+            m_pFtpPortED->SetText( OUString::number( nIntValue ));
         }
 
         if( xNameAccess->getByName(aNoProxyDescPN) >>= aStringValue )
         {
-            aNoProxyForED.SetText( aStringValue );
+            m_pNoProxyForED->SetText( aStringValue );
         }
     }
 
@@ -292,37 +298,37 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl()
 
         if( xPropertyState->getPropertyDefault(aHttpProxyPN) >>= aStringValue )
         {
-            aHttpProxyED.SetText( aStringValue );
+            m_pHttpProxyED->SetText( aStringValue );
         }
 
         if( xPropertyState->getPropertyDefault(aHttpPortPN) >>= nIntValue )
         {
-            aHttpPortED.SetText( OUString::number( nIntValue ));
+            m_pHttpPortED->SetText( OUString::number( nIntValue ));
         }
 
         if( xPropertyState->getPropertyDefault(aHttpsProxyPN) >>= aStringValue )
         {
-            aHttpsProxyED.SetText( aStringValue );
+            m_pHttpsProxyED->SetText( aStringValue );
         }
 
         if( xPropertyState->getPropertyDefault(aHttpsPortPN) >>= nIntValue )
         {
-            aHttpsPortED.SetText( OUString::number( nIntValue ));
+            m_pHttpsPortED->SetText( OUString::number( nIntValue ));
         }
 
         if( xPropertyState->getPropertyDefault(aFtpProxyPN) >>= aStringValue )
         {
-            aFtpProxyED.SetText( aStringValue );
+            m_pFtpProxyED->SetText( aStringValue );
         }
 
         if( xPropertyState->getPropertyDefault(aFtpPortPN) >>= nIntValue )
         {
-            aFtpPortED.SetText( OUString::number( nIntValue ));
+            m_pFtpPortED->SetText( OUString::number( nIntValue ));
         }
 
         if( xPropertyState->getPropertyDefault(aNoProxyDescPN) >>= aStringValue )
         {
-            aNoProxyForED.SetText( aStringValue );
+            m_pNoProxyForED->SetText( aStringValue );
         }
     }
     catch (const beans::UnknownPropertyException &)
@@ -378,16 +384,16 @@ void SvxProxyTabPage::Reset(const SfxItemSet&)
 {
     ReadConfigData_Impl();
 
-    aProxyModeLB.SaveValue();
-    aHttpProxyED.SaveValue();
-    aHttpPortED.SaveValue();
-    aHttpsProxyED.SaveValue();
-    aHttpsPortED.SaveValue();
-    aFtpProxyED.SaveValue();
-    aFtpPortED.SaveValue();
-    aNoProxyForED.SaveValue();
+    m_pProxyModeLB->SaveValue();
+    m_pHttpProxyED->SaveValue();
+    m_pHttpPortED->SaveValue();
+    m_pHttpsProxyED->SaveValue();
+    m_pHttpsPortED->SaveValue();
+    m_pFtpProxyED->SaveValue();
+    m_pFtpPortED->SaveValue();
+    m_pNoProxyForED->SaveValue();
 
-    EnableControls_Impl( aProxyModeLB.GetSelectEntryPos() == 2 );
+    EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 );
 }
 
 sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
@@ -397,8 +403,8 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
     try {
         Reference< beans::XPropertySet > xPropertySet(m_xConfigurationUpdateAccess, UNO_QUERY_THROW );
 
-        sal_uInt16 nSelPos = aProxyModeLB.GetSelectEntryPos();
-        if(aProxyModeLB.GetSavedValue() != nSelPos)
+        sal_uInt16 nSelPos = m_pProxyModeLB->GetSelectEntryPos();
+        if(m_pProxyModeLB->GetSavedValue() != nSelPos)
         {
             if( nSelPos == 1 )
             {
@@ -411,45 +417,45 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
             bModified = sal_True;
         }
 
-        if(aHttpProxyED.GetSavedValue() != aHttpProxyED.GetText())
+        if(m_pHttpProxyED->GetSavedValue() != m_pHttpProxyED->GetText())
         {
-            xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(aHttpProxyED.GetText()));
+            xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(m_pHttpProxyED->GetText()));
             bModified = sal_True;
         }
 
-        if ( aHttpPortED.GetSavedValue() != aHttpPortED.GetText() )
+        if ( m_pHttpPortED->GetSavedValue() != m_pHttpPortED->GetText() )
         {
-            xPropertySet->setPropertyValue( aHttpPortPN, makeAny(aHttpPortED.GetText().toInt32()));
+            xPropertySet->setPropertyValue( aHttpPortPN, makeAny(m_pHttpPortED->GetText().toInt32()));
             bModified = sal_True;
         }
 
-        if( aHttpsProxyED.GetSavedValue() != aHttpsProxyED.GetText() )
+        if( m_pHttpsProxyED->GetSavedValue() != m_pHttpsProxyED->GetText() )
         {
-            xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(aHttpsProxyED.GetText()) );
+            xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(m_pHttpsProxyED->GetText()) );
             bModified = sal_True;
         }
 
-        if ( aHttpsPortED.GetSavedValue() != aHttpsPortED.GetText() )
+        if ( m_pHttpsPortED->GetSavedValue() != m_pHttpsPortED->GetText() )
         {
-            xPropertySet->setPropertyValue( aHttpsPortPN, makeAny(aHttpsPortED.GetText().toInt32()) );
+            xPropertySet->setPropertyValue( aHttpsPortPN, makeAny(m_pHttpsPortED->GetText().toInt32()) );
             bModified = sal_True;
         }
 
-        if( aFtpProxyED.GetSavedValue() != aFtpProxyED.GetText())
+        if( m_pFtpProxyED->GetSavedValue() != m_pFtpProxyED->GetText())
         {
-            xPropertySet->setPropertyValue( aFtpProxyPN, makeAny(aFtpProxyED.GetText()) );
+            xPropertySet->setPropertyValue( aFtpProxyPN, makeAny(m_pFtpProxyED->GetText()) );
             bModified = sal_True;
         }
 
-        if ( aFtpPortED.GetSavedValue() != aFtpPortED.GetText() )
+        if ( m_pFtpPortED->GetSavedValue() != m_pFtpPortED->GetText() )
         {
-            xPropertySet->setPropertyValue( aFtpPortPN, makeAny(aFtpPortED.GetText().toInt32()));
+            xPropertySet->setPropertyValue( aFtpPortPN, makeAny(m_pFtpPortED->GetText().toInt32()));
             bModified = sal_True;
         }
 
-        if ( aNoProxyForED.GetSavedValue() != aNoProxyForED.GetText() )
+        if ( m_pNoProxyForED->GetSavedValue() != m_pNoProxyForED->GetText() )
         {
-            xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( aNoProxyForED.GetText()));
+            xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( m_pNoProxyForED->GetText()));
             bModified = sal_True;
         }
 
@@ -480,76 +486,26 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
     return bModified;
 }
 
-void SvxProxyTabPage::ArrangeControls_Impl()
-{
-    // calculate dynamic width of controls, to not cut-off translated strings #i71445#
-    long nWidth = aProxyModeFT.GetCtrlTextWidth( aProxyModeFT.GetText() );
-    long nTemp = aHttpProxyFT.GetCtrlTextWidth( aHttpProxyFT.GetText() );
-    if ( nTemp > nWidth )
-        nWidth = nTemp;
-    nTemp = aHttpsProxyFT.GetCtrlTextWidth( aHttpsProxyFT.GetText() );
-    if ( nTemp > nWidth )
-        nWidth = nTemp;
-    nTemp = aFtpProxyFT.GetCtrlTextWidth( aFtpProxyFT.GetText() );
-    if ( nTemp > nWidth )
-        nWidth = nTemp;
-    nTemp = aNoProxyForFT.GetCtrlTextWidth( aNoProxyForFT.GetText() );
-    if ( nTemp > nWidth )
-        nWidth = nTemp;
-
-    nWidth += 10; // To be sure the length of the FixedText is enough on all platforms
-    const long nFTWidth = aProxyModeFT.GetSizePixel().Width();
-    if ( nWidth > nFTWidth )
-    {
-        Size aNewSize = aProxyModeFT.GetSizePixel();
-        aNewSize.Width() = nWidth;
-
-        aProxyModeFT.SetSizePixel( aNewSize );
-        aHttpProxyFT.SetSizePixel( aNewSize );
-        aHttpsProxyFT.SetSizePixel( aNewSize );
-        aFtpProxyFT.SetSizePixel( aNewSize );
-        aNoProxyForFT.SetSizePixel( aNewSize );
-
-        const long nDelta = nWidth - nFTWidth;
-        Point aNewPos = aProxyModeLB.GetPosPixel();
-        aNewPos.X() += nDelta;
-
-        aProxyModeLB.SetPosPixel( aNewPos );
-
-        aNewSize = aHttpProxyED.GetSizePixel();
-        aNewSize.Width() -= nDelta;
-
-        aNewPos.Y() = aHttpProxyED.GetPosPixel().Y();
-        aHttpProxyED.SetPosSizePixel( aNewPos, aNewSize );
-        aNewPos.Y() = aHttpsProxyED.GetPosPixel().Y();
-        aHttpsProxyED.SetPosSizePixel( aNewPos, aNewSize );
-        aNewPos.Y() = aFtpProxyED.GetPosPixel().Y();
-        aFtpProxyED.SetPosSizePixel( aNewPos, aNewSize );
-        aNewPos.Y() = aNoProxyForED.GetPosPixel().Y();
-        aNoProxyForED.SetPosSizePixel( aNewPos, aNewSize );
-    }
-}
-
 void SvxProxyTabPage::EnableControls_Impl(sal_Bool bEnable)
 {
-    aHttpProxyFT.Enable(bEnable);
-    aHttpProxyED.Enable(bEnable);
-    aHttpPortFT.Enable(bEnable);
-    aHttpPortED.Enable(bEnable);
-
-    aHttpsProxyFT.Enable(bEnable);
-    aHttpsProxyED.Enable(bEnable);
-    aHttpsPortFT.Enable(bEnable);
-    aHttpsPortED.Enable(bEnable);
-
-    aFtpProxyFT.Enable(bEnable);
-    aFtpProxyED.Enable(bEnable);
-    aFtpPortFT.Enable(bEnable);
-    aFtpPortED.Enable(bEnable);
-
-    aNoProxyForFT.Enable(bEnable);
-    aNoProxyForED.Enable(bEnable);
-    aNoProxyDescFT.Enable(bEnable);
+    m_pHttpProxyFT->Enable(bEnable);
+    m_pHttpProxyED->Enable(bEnable);
+    m_pHttpPortFT->Enable(bEnable);
+    m_pHttpPortED->Enable(bEnable);
+
+    m_pHttpsProxyFT->Enable(bEnable);
+    m_pHttpsProxyED->Enable(bEnable);
+    m_pHttpsPortFT->Enable(bEnable);
+    m_pHttpsPortED->Enable(bEnable);
+
+    m_pFtpProxyFT->Enable(bEnable);
+    m_pFtpProxyED->Enable(bEnable);
+    m_pFtpPortFT->Enable(bEnable);
+    m_pFtpPortED->Enable(bEnable);
+
+    m_pNoProxyForFT->Enable(bEnable);
+    m_pNoProxyForED->Enable(bEnable);
+    m_pNoProxyDescFT->Enable(bEnable);
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 986e9a6..25d1eae 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -22,26 +22,6 @@
 #include <sfx2/tabpage.hrc>
 #include <svtools/controldims.hrc>
 
-// Proxy ------------------------------------------------------------------
-#define GB_SETTINGS                 1
-#define FT_PROXYMODE                2
-#define LB_PROXYMODE                2
-#define FT_HTTP_PROXY               3
-#define ED_HTTP_PROXY               3
-#define FT_HTTP_PORT                4
-#define ED_HTTP_PORT                4
-#define FT_FTP_PROXY                5
-#define ED_FTP_PROXY                5
-#define FT_FTP_PORT                 6
-#define ED_FTP_PORT                 6
-#define FT_NOPROXYFOR               11
-#define ED_NOPROXYFOR               11
-#define ED_NOPROXYDESC              12
-#define FT_HTTPS_PROXY              14
-#define ED_HTTPS_PROXY              14
-#define FT_HTTPS_PORT               15
-#define ED_HTTPS_PORT               15
-
 // Defines - JavaScriptDisableQueryBox_Impl -------------------------------
 
 #define IMG_JSCPT_WARNING           220
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index e848a11..c19ff8d 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -44,14 +44,15 @@ namespace uno = ::com::sun::star::uno;
 class SvxNoSpaceEdit : public Edit
 {
 private:
-    sal_Bool            bOnlyNumeric;
-
+    bool bOnlyNumeric;
 public:
-    SvxNoSpaceEdit(Window* pParent, ResId rResId, sal_Bool bNum = sal_False ) :
-        Edit( pParent, rResId ), bOnlyNumeric( bNum ) {}
-
-    virtual void    KeyInput( const KeyEvent& rKEvent );
-    virtual void    Modify();
+    SvxNoSpaceEdit(Window* pParent, WinBits nStyle)
+        : Edit(pParent, nStyle)
+        , bOnlyNumeric(false)
+    {}
+    virtual void KeyInput(const KeyEvent& rKEvent);
+    virtual void Modify();
+    virtual bool set_property(const OString &rKey, const OString &rValue);
 };
 
 // class SvxProxyTabPage -------------------------------------------------
@@ -59,30 +60,27 @@ public:
 class SvxProxyTabPage : public SfxTabPage
 {
 private:
-    FixedLine       aOptionGB;
-
-    FixedText       aProxyModeFT;
-    ListBox         aProxyModeLB;
 
-    FixedText       aHttpProxyFT;
-    SvxNoSpaceEdit  aHttpProxyED;
-    FixedText       aHttpPortFT;
-    SvxNoSpaceEdit  aHttpPortED;
+    ListBox*        m_pProxyModeLB;
 
-    FixedText       aHttpsProxyFT;
-    SvxNoSpaceEdit  aHttpsProxyED;
-    FixedText       aHttpsPortFT;
-    SvxNoSpaceEdit  aHttpsPortED;
+    FixedText*      m_pHttpProxyFT;
+    SvxNoSpaceEdit* m_pHttpProxyED;
+    FixedText*      m_pHttpPortFT;
+    SvxNoSpaceEdit* m_pHttpPortED;
 
+    FixedText*      m_pHttpsProxyFT;
+    SvxNoSpaceEdit* m_pHttpsProxyED;
+    FixedText*      m_pHttpsPortFT;
+    SvxNoSpaceEdit* m_pHttpsPortED;
 
-    FixedText       aFtpProxyFT;
-    SvxNoSpaceEdit  aFtpProxyED;
-    FixedText       aFtpPortFT;
-    SvxNoSpaceEdit  aFtpPortED;
+    FixedText*      m_pFtpProxyFT;
+    SvxNoSpaceEdit* m_pFtpProxyED;
+    FixedText*      m_pFtpPortFT;
+    SvxNoSpaceEdit* m_pFtpPortED;
 
-    FixedText       aNoProxyForFT;
-    Edit            aNoProxyForED;
-    FixedText       aNoProxyDescFT;
+    FixedText*      m_pNoProxyForFT;
+    Edit*           m_pNoProxyForED;
+    FixedText*      m_pNoProxyDescFT;
 
     const OUString aProxyModePN;
     const OUString aHttpProxyPN;
@@ -95,7 +93,6 @@ private:
 
     uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess;
 
-    void ArrangeControls_Impl();
     void EnableControls_Impl(sal_Bool bEnable);
     void ReadConfigData_Impl();
     void ReadConfigDefaults_Impl();
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 92acefd..e572abe 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -22,157 +22,6 @@
 #include <cuires.hrc>
 #include "optinet2.hrc"
 
-/************************************************************************/
-/*                                                                      */
-/*  Proxy server                                                        */
-/*                                                                      */
-/************************************************************************/
-
-TabPage RID_SVXPAGE_INET_PROXY
-{
-    HelpId = HID_OPTIONS_PROXY ;
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-    Text [ en-US ] = "Proxy" ;
-                                    #define GB_TYPES_TOP 3
-                                    #define GB_TYPES_LEFT 6
-    FixedLine GB_SETTINGS
-    {
-        Pos = MAP_APPFONT ( GB_TYPES_LEFT , GB_TYPES_TOP ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Settings" ;
-    };
-    FixedText FT_PROXYMODE
-    {
-        Pos = MAP_APPFONT ( 12 , GB_TYPES_TOP + 13 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "Proxy s~erver" ;
-    };
-    ListBox LB_PROXYMODE
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE";
-        Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 11 ) ;
-        Size = MAP_APPFONT ( 49 , 48 ) ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "None" ; > ;
-            < "System" ; > ;
-            < "Manual" ; > ;
-        };
-    };
-    FixedText FT_HTTP_PROXY
-    {
-        Pos = MAP_APPFONT ( 12 , GB_TYPES_TOP + 29 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "HT~TP proxy" ;
-    };
-    Edit ED_HTTP_PROXY
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY";
-        Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 27 ) ;
-        Size = MAP_APPFONT ( 123 , 12 ) ;
-        Border = TRUE ;
-    };
-
-    #define FT_PORT_WIDTH       37
-    #define ED_PORT_WIDTH       20
-    #define ED_PORT_COL         229
-
-    FixedText FT_HTTP_PORT
-    {
-        Pos = MAP_APPFONT ( 190 , GB_TYPES_TOP + 29 ) ;
-        Size = MAP_APPFONT ( FT_PORT_WIDTH , 8 ) ;
-        Right = TRUE;
-        Text [ en-US ] = "~Port" ;
-    };
-    Edit ED_HTTP_PORT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT";
-        Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 27 ) ;
-        Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
-        Border = TRUE ;
-    };
-
-    FixedText FT_HTTPS_PROXY
-    {
-        Pos = MAP_APPFONT ( 12 , GB_TYPES_TOP + 45 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "HTTP~S proxy" ;
-    };
-    Edit ED_HTTPS_PROXY
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY";
-        Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 43 ) ;
-        Size = MAP_APPFONT ( 123 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_HTTPS_PORT
-    {
-        Pos = MAP_APPFONT ( 190 , GB_TYPES_TOP + 45 ) ;
-        Size = MAP_APPFONT ( FT_PORT_WIDTH , 8 ) ;
-        Right = TRUE;
-        Text [ en-US ] = "P~ort" ;
-    };
-    Edit ED_HTTPS_PORT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT";
-        Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 43 ) ;
-        Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
-        Border = TRUE ;
-    };
-
-    FixedText FT_FTP_PROXY
-    {
-        Pos = MAP_APPFONT ( 12 , GB_TYPES_TOP + 61 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "~FTP proxy" ;
-    };
-    Edit ED_FTP_PROXY
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY";
-        Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 59 ) ;
-        Size = MAP_APPFONT ( 123 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_FTP_PORT
-    {
-        Pos = MAP_APPFONT ( 190 , GB_TYPES_TOP + 61 ) ;
-        Size = MAP_APPFONT ( FT_PORT_WIDTH , 8 ) ;
-        Right = TRUE;
-        Text [ en-US ] = "P~ort" ;
-    };
-    Edit ED_FTP_PORT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT";
-        Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 59 ) ;
-        Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_NOPROXYFOR
-    {
-        Pos = MAP_APPFONT ( 12 , GB_TYPES_TOP + 93 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "~No proxy for:" ;
-    };
-    Edit ED_NOPROXYFOR
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR";
-        Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 91 ) ;
-        Size = MAP_APPFONT ( 123 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText ED_NOPROXYDESC
-    {
-        Pos = MAP_APPFONT ( 190 , GB_TYPES_TOP + 93 ) ;
-        Size = MAP_APPFONT ( 56 , 8 ) ;
-        Text [ en-US ] = "Separator ;" ;
-    };
-};
-
 ErrorBox RID_SVXERR_OPT_PROXYPORTS
 {
     BUTTONS = WB_OK ;
diff --git a/cui/uiconfig/ui/optproxypage.ui b/cui/uiconfig/ui/optproxypage.ui
new file mode 100644
index 0000000..d823a1c
--- /dev/null
+++ b/cui/uiconfig/ui/optproxypage.ui
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkFrame" id="OptProxyPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="label_xalign">0</property>
+    <property name="shadow_type">none</property>
+    <child>
+      <object class="GtkAlignment" id="alignment1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
+        <child>
+          <object class="GtkGrid" id="grid1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Proxy s_erver</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">proxymode</property>
+              </object>
+              <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>
+              <object class="cuilo-SvxNoSpaceEdit" id="http">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <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>
+            <child>
+              <object class="cuilo-SvxNoSpaceEdit" id="https">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="cuilo-SvxNoSpaceEdit" id="ftp">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="noproxy">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">â—</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="cuilo-SvxNoSpaceEdit" id="httpport">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">5</property>
+                <property name="width_chars">5</property>
+                <property name="only_numeric">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="cuilo-SvxNoSpaceEdit" id="httpsport">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">5</property>
+                <property name="width_chars">5</property>
+                <property name="only_numeric">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="cuilo-SvxNoSpaceEdit" id="ftpport">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">5</property>
+                <property name="width_chars">5</property>
+                <property name="only_numeric">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="proxymode">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="entry_text_column">0</property>
+                <property name="id_column">1</property>
+                <items>
+                  <item translatable="yes">None</item>
+                  <item translatable="yes">System</item>
+                  <item translatable="yes">Manual</item>
+                </items>
+              </object>
+              <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>
+              <object class="GtkLabel" id="httpft">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">HT_TP proxy</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">http</property>
+              </object>
+              <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>
+              <object class="GtkLabel" id="httpportft">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Port</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">httpport</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="httpsft">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">HTTP_S proxy</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">https</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="ftpft">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_FTP proxy</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">ftp</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="noproxyft">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_No proxy for:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">noproxy</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="httpsportft">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">P_ort</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">httpsport</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="ftpportft">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">P_ort</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">ftpport</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="noproxydesc">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Separator ;</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="width">2</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child type="label">
+      <object class="GtkLabel" id="label1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Settings</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index b04b95f..c369903 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -210,6 +210,18 @@
                         generic-name="NoSpace Edit" parent="GtkEntry"
                         icon-name="widget-gtk-textentry"/>
 
+    <glade-widget-class title="Another NoSpace Edit" name="cuilo-SvxNoSpaceEdit"
+                        generic-name="Another NoSpace Edit" parent="GtkEntry"
+                        icon-name="widget-gtk-textentry">
+      <properties>
+        <property save="True" query="False" id="only-numeric" default="False" name="Allow only numbers">
+          <parameter-spec>
+            <type>GParamBoolean</type>
+          </parameter-spec>
+        </property>
+      </properties>
+    </glade-widget-class>
+
     <glade-widget-class title="Double Field" name="scuilo-ScDoubleField"
                         generic-name="Double Field" parent="GtkEntry"
                         icon-name="widget-gtk-textentry"/>
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index bb63cf2..31a8241 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -283,6 +283,9 @@ public:
 
     static OString extractCustomProperty(stringmap &rMap);
 
+    //add a default value of 25 width-chars to a map if width-chars not set
+    static void ensureDefaultWidthChars(VclBuilder::stringmap &rMap);
+
     //see m_aDeferredProperties, you need this for toplevel dialogs
     //which build themselves from their ctor. The properties on
     //the top level are stored in m_aDeferredProperties and need
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8ce7445..3a58408 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -699,14 +699,14 @@ namespace
 
         return eUnit;
     }
+}
 
-    void ensureDefaultWidthChars(VclBuilder::stringmap &rMap)
-    {
-        OString sWidthChars("width-chars");
-        VclBuilder::stringmap::iterator aFind = rMap.find(sWidthChars);
-        if (aFind == rMap.end())
-            rMap[sWidthChars] = "25";
-    }
+void VclBuilder::ensureDefaultWidthChars(VclBuilder::stringmap &rMap)
+{
+    OString sWidthChars("width-chars");
+    VclBuilder::stringmap::iterator aFind = rMap.find(sWidthChars);
+    if (aFind == rMap.end())
+        rMap[sWidthChars] = "25";
 }
 
 bool VclBuilder::extractGroup(const OString &id, stringmap &rMap)
commit b1415411a1f0f3ad5ad4c0f7b2600fb5ba1e6f82
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu May 16 11:41:48 2013 +0100

    turns out the socks options don't exist either
    
    Change-Id: Ib762aa6b98b5fcc72b4677aa52053a04cd264a73

diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 31b169f..986e9a6 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -34,10 +34,6 @@
 #define ED_FTP_PROXY                5
 #define FT_FTP_PORT                 6
 #define ED_FTP_PORT                 6
-#define FT_SOCKS_PROXY              7
-#define ED_SOCKS_PROXY              7
-#define FT_SOCKS_PORT               8
-#define ED_SOCKS_PORT               8
 #define FT_NOPROXYFOR               11
 #define ED_NOPROXYFOR               11
 #define ED_NOPROXYDESC              12
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index c396b50..92acefd 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -152,33 +152,6 @@ TabPage RID_SVXPAGE_INET_PROXY
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
     };
-    FixedText FT_SOCKS_PROXY
-    {
-        Pos = MAP_APPFONT ( 12 , GB_TYPES_TOP + 77 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        Text [ en-US ] = "~SOCKS proxy" ;
-    };
-    Edit ED_SOCKS_PROXY
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PROXY";
-        Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 75 ) ;
-        Size = MAP_APPFONT ( 123 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_SOCKS_PORT
-    {
-        Pos = MAP_APPFONT ( 190 , GB_TYPES_TOP + 77 ) ;
-        Size = MAP_APPFONT ( FT_PORT_WIDTH , 8 ) ;
-        Right = TRUE;
-        Text [ en-US ] = "Po~rt" ;
-    };
-    Edit ED_SOCKS_PORT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT";
-        Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 75 ) ;
-        Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
-        Border = TRUE ;
-    };
     FixedText FT_NOPROXYFOR
     {
         Pos = MAP_APPFONT ( 12 , GB_TYPES_TOP + 93 ) ;
commit 8ba847daf0c6dc4ce0100e4623b5b7b6c1d91ba7
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu May 16 11:26:44 2013 +0100

    sFromBrowser is unused
    
    Change-Id: I00d2b1f25f393c6d3835a39a4b4579e66b622838

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index bc3b032..9ceec02 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -167,7 +167,6 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
     aNoProxyForFT     (this, CUI_RES( FT_NOPROXYFOR     )),
     aNoProxyForED     (this, CUI_RES( ED_NOPROXYFOR     )),
     aNoProxyDescFT    (this, CUI_RES( ED_NOPROXYDESC    )),
-    sFromBrowser        (       CUI_RES( ST_PROXY_FROM_BROWSER ) ),
     aProxyModePN("ooInetProxyType"),
     aHttpProxyPN("ooInetHTTPProxyName"),
     aHttpPortPN("ooInetHTTPProxyPort"),
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index f28bb6d..31b169f 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -41,7 +41,6 @@
 #define FT_NOPROXYFOR               11
 #define ED_NOPROXYFOR               11
 #define ED_NOPROXYDESC              12
-#define ST_PROXY_FROM_BROWSER       13
 #define FT_HTTPS_PROXY              14
 #define ED_HTTPS_PROXY              14
 #define FT_HTTPS_PORT               15
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 2ef906b..e848a11 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -84,8 +84,6 @@ private:
     Edit            aNoProxyForED;
     FixedText       aNoProxyDescFT;
 
-    String          sFromBrowser;
-
     const OUString aProxyModePN;
     const OUString aHttpProxyPN;
     const OUString aHttpPortPN;
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index e20f6d1..c396b50 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -64,10 +64,6 @@ TabPage RID_SVXPAGE_INET_PROXY
             < "Manual" ; > ;
         };
     };
-    String ST_PROXY_FROM_BROWSER
-    {
-        Text [ en-US ] = "Use browser settings";
-    };
     FixedText FT_HTTP_PROXY
     {
         Pos = MAP_APPFONT ( 12 , GB_TYPES_TOP + 29 ) ;
commit 859406009481fc3a42d027608ca685fcd90537ff
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu May 16 11:25:09 2013 +0100

    drop unused dns entries from proxy dialog desc
    
    Change-Id: I98d240c3334358a5c2ec3b34e9967ebe945464f8

diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 6fe0a43..f28bb6d 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -47,15 +47,6 @@
 #define FT_HTTPS_PORT               15
 #define ED_HTTPS_PORT               15
 
-// Protocols  --------------------------------------------------------------
-#define GB_DNS                      105
-#define RB_DNS_AUTO                 106
-#define RB_DNS_MANUAL               107
-#define ED_DNS                      107
-
-#define ST_MSG_255_0                111
-#define ST_MSG_255_1                112
-
 // Defines - JavaScriptDisableQueryBox_Impl -------------------------------
 
 #define IMG_JSCPT_WARNING           220
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 9a8bf0c..e20f6d1 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -202,44 +202,6 @@ TabPage RID_SVXPAGE_INET_PROXY
         Size = MAP_APPFONT ( 56 , 8 ) ;
         Text [ en-US ] = "Separator ;" ;
     };
-    FixedLine GB_DNS
-    {
-        Pos = MAP_APPFONT( 6, 100 );
-        Size = MAP_APPFONT( 248, 8 );
-        Text [ en-US ] = "DNS server" ;
-    };
-    RadioButton RB_DNS_AUTO
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_AUTO";
-        Pos = MAP_APPFONT( 12, 111 );
-        Size = MAP_APPFONT( 236, 10 );
-        Text [ en-US ] = "~Automatic" ;
-    };
-    RadioButton RB_DNS_MANUAL
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_MANUAL";
-        Pos = MAP_APPFONT( 12, 124 );
-        Size = MAP_APPFONT( 75, 10 );
-        Text [ en-US ] = "~Manual" ;
-    };
-    PatternField ED_DNS
-    {
-        HelpID = "cui:PatternField:RID_SVXPAGE_INET_PROXY:ED_DNS";
-        Pos = MAP_APPFONT( 90, 126 );
-        Size = MAP_APPFONT( 66, 12 );
-        Border = TRUE ;
-        LiteralMask = "   .   .   .   " ;
-        EditMask = "nnnLnnnLnnnLnnn" ;
-        StrictFormat = TRUE ;
-    };
-    String ST_MSG_255_0
-    {
-        Text [ en-US ] = "is not a valid entry for this field. Please specify a value between 0 and 255." ;
-    };
-    String ST_MSG_255_1
-    {
-        Text [ en-US ] = "is not a valid entry for this field. Please specify a value between 1 and 255." ;
-    };
 };
 
 ErrorBox RID_SVXERR_OPT_PROXYPORTS
commit 3cf4fffee796a7ee810bb9575b65f381d1e2a8a2
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu May 16 10:59:27 2013 +0100

    SvxCheckListBox is in svxcore, not svx
    
    Change-Id: I2dbf51bbdd1cca6c934622066ac5da2c480effa8

diff --git a/sc/uiconfig/scalc/ui/protectsheetdlg.ui b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
index fcd7dd5..e6a8474 100644
--- a/sc/uiconfig/scalc/ui/protectsheetdlg.ui
+++ b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
@@ -224,7 +224,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-SvxCheckListBox" id="checklist:border">
+                          <object class="svxcorelo-SvxCheckListBox" id="checklist:border">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
commit 28ca8eeee8898c5cd3730ebfcbbf303b68d25150
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu May 16 10:53:38 2013 +0100

    Resolves: #i117782# convert calculate page to .ui format
    
    Change-Id: Iab0028ad1bfd8a841a3cf87aadbe0dc9d9ad830e

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 01b23c8..b04b95f 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -210,6 +210,10 @@
                         generic-name="NoSpace Edit" parent="GtkEntry"
                         icon-name="widget-gtk-textentry"/>
 
+    <glade-widget-class title="Double Field" name="scuilo-ScDoubleField"
+                        generic-name="Double Field" parent="GtkEntry"
+                        icon-name="widget-gtk-textentry"/>
+
     <glade-widget-class title="Cursor Reference Edit" name="sclo-ScCursorRefEdit"
                         generic-name="Cursor Reference Edit" parent="foruilo-RefEdit"
                         icon-name="widget-gtk-textentry"/>
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 40a7160..1f77cdd 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/leftfooterdialog \
 	sc/uiconfig/scalc/ui/leftheaderdialog \
 	sc/uiconfig/scalc/ui/managenamesdialog \
+	sc/uiconfig/scalc/ui/optcalculatepage \
 	sc/uiconfig/scalc/ui/printeroptions \
 	sc/uiconfig/scalc/ui/protectsheetdlg \
 	sc/uiconfig/scalc/ui/sheetprintpage \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index e94b67f..5a3d028 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -60,7 +60,6 @@
 #define HID_SC_PIVOTSUBT                                        "SC_HID_SC_PIVOTSUBT"
 #define HID_SCPAGE_SUBT_OPTIONS                                 "SC_HID_SCPAGE_SUBT_OPTIONS"
 #define HID_SCPAGE_SUBT_GROUP                                   "SC_HID_SCPAGE_SUBT_GROUP"
-#define HID_SCPAGE_CALC                                         "SC_HID_SCPAGE_CALC"
 #define HID_SCPAGE_FORMULA                                      "SC_HID_SCPAGE_FORMULA"
 #define HID_SCPAGE_USERLISTS                                    "SC_HID_SCPAGE_USERLISTS"
 #define HID_SCPAGE_AREAS                                        "SC_HID_SCPAGE_AREAS"
diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index 71abbf9..481eef0 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/string.hxx>
 #include <rtl/math.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <vcl/builder.hxx>
 #include "global.hxx"
 
 // ============================================================================
@@ -50,6 +51,17 @@ ScDoubleField::ScDoubleField( Window* pParent, const ResId& rResId ) :
 {
 }
 
+ScDoubleField::ScDoubleField( Window* pParent, WinBits nStyle ) :
+    Edit( pParent, nStyle )
+{
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDoubleField(Window *pParent, VclBuilder::stringmap &rMap)
+{
+    VclBuilder::ensureDefaultWidthChars(rMap);
+    return new ScDoubleField(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
+}
+
 bool ScDoubleField::GetValue( double& rfValue ) const
 {
     OUString aStr(comphelper::string::strip(GetText(), ' '));
diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx
index aae8aff..97aebe7 100644
--- a/sc/source/ui/inc/editfield.hxx
+++ b/sc/source/ui/inc/editfield.hxx
@@ -29,6 +29,7 @@ class ScDoubleField : public Edit
 {
 public:
     explicit            ScDoubleField( Window* pParent, const ResId& rResId );
+    explicit            ScDoubleField( Window* pParent, WinBits nStyle );
 
     bool                GetValue( double& rfValue ) const;
     void                SetValue( double fValue,
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 07fa080..ad60340 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -30,27 +30,6 @@
 #define TP_INPUT            13
 #define TP_FORMULA          15
 
-// TP_CALC:
-#define BTN_ITERATE         1
-#define FT_STEPS            2
-#define FT_EPS              3
-#define ED_STEPS            4
-#define ED_EPS              5
-#define GB_ZREFS            6
-#define ED_PREC             7
-#define FT_PREC             8
-#define BTN_DATESTD         9
-#define BTN_DATESC10        10
-#define BTN_DATE1904        11
-#define FT_VALUE            13
-#define GB_DATE             14
-#define BTN_CASE            15
-#define BTN_CALC            17
-#define BTN_MATCH           18
-#define BTN_LOOKUP          19
-#define BTN_REGEX           20
-#define BTN_GENERAL_PREC    21
-
 // TP_VIEW:
 #define BTN_GRID            6
 
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index e566ab9..645d98f 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -48,34 +48,30 @@ private:
                 ~ScTpCalcOptions();
 
 private:
-    FixedLine       aGbZRefs;
-    CheckBox        aBtnIterate;
-    FixedText       aFtSteps;
-    NumericField    aEdSteps;
-    FixedText       aFtEps;
-    ScDoubleField   aEdEps;
-
-    FixedLine       aSeparatorFL;
-    FixedLine       aGbDate;
-    RadioButton     aBtnDateStd;
-    RadioButton     aBtnDateSc10;
-    RadioButton     aBtnDate1904;
-
-    CheckBox        aBtnCase;
-    CheckBox        aBtnCalc;
-    CheckBox        aBtnMatch;
-    CheckBox        aBtnRegex;
-    CheckBox        aBtnLookUp;
-    CheckBox        aBtnGeneralPrec;
-
-    FixedText       aFtPrec;
-    NumericField    aEdPrec;
+    CheckBox*       m_pBtnIterate;
+    FixedText*      m_pFtSteps;
+    NumericField*   m_pEdSteps;
+    FixedText*      m_pFtEps;
+    ScDoubleField*  m_pEdEps;
+
+    RadioButton*    m_pBtnDateStd;
+    RadioButton*    m_pBtnDateSc10;
+    RadioButton*    m_pBtnDate1904;
+
+    CheckBox*       m_pBtnCase;
+    CheckBox*       m_pBtnCalc;
+    CheckBox*       m_pBtnMatch;
+    CheckBox*       m_pBtnRegex;
+    CheckBox*       m_pBtnLookUp;
+    CheckBox*       m_pBtnGeneralPrec;
+
+    FixedText*      m_pFtPrec;
+    NumericField*   m_pEdPrec;
 
     ScDocOptions*   pOldOptions;
     ScDocOptions*   pLocalOptions;
     sal_uInt16          nWhichCalc;
 
-#ifdef _TPCALC_CXX
 private:
     void            Init();
 
@@ -83,8 +79,6 @@ private:
     // Handler:
     DECL_LINK( RadioClickHdl, RadioButton* );
     DECL_LINK( CheckClickHdl, CheckBox* );
-
-#endif
 };
 
 
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 9a62e93..f476501 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -34,50 +34,38 @@
 #include "sc.hrc"       // -> Slot-IDs
 #include "optdlg.hrc"
 
-#define _TPCALC_CXX
 #include "tpcalc.hxx"
-#undef _TPCALC_CXX
 
 #include <math.h>
 
 //========================================================================
 
-ScTpCalcOptions::ScTpCalcOptions( Window*           pParent,
-                                  const SfxItemSet& rCoreAttrs )
-
-    :   SfxTabPage      ( pParent,
-                          ScResId( RID_SCPAGE_CALC ),
-                          rCoreAttrs ),
-
-        aGbZRefs        ( this, ScResId( GB_ZREFS ) ),
-        aBtnIterate     ( this, ScResId( BTN_ITERATE ) ),
-        aFtSteps        ( this, ScResId( FT_STEPS ) ),
-        aEdSteps        ( this, ScResId( ED_STEPS ) ),
-        aFtEps          ( this, ScResId( FT_EPS ) ),
-        aEdEps          ( this, ScResId( ED_EPS ) ),
-        aSeparatorFL    ( this, ScResId( FL_SEPARATOR ) ),
-        aGbDate         ( this, ScResId( GB_DATE ) ),
-        aBtnDateStd     ( this, ScResId( BTN_DATESTD ) ),
-        aBtnDateSc10    ( this, ScResId( BTN_DATESC10 ) ),
-        aBtnDate1904    ( this, ScResId( BTN_DATE1904 ) ),
-        aBtnCase        ( this, ScResId( BTN_CASE ) ),
-        aBtnCalc        ( this, ScResId( BTN_CALC ) ),
-        aBtnMatch       ( this, ScResId( BTN_MATCH ) ),
-        aBtnRegex       ( this, ScResId( BTN_REGEX ) ),
-        aBtnLookUp      ( this, ScResId( BTN_LOOKUP ) ),
-        aBtnGeneralPrec ( this, ScResId( BTN_GENERAL_PREC ) ),
-        aFtPrec         ( this, ScResId( FT_PREC ) ),
-        aEdPrec         ( this, ScResId( ED_PREC ) ),
-        pOldOptions     ( new ScDocOptions(
-                            ((const ScTpCalcItem&)rCoreAttrs.Get(
-                                GetWhich( SID_SCDOCOPTIONS ))).
-                                    GetDocOptions() ) ),
-        pLocalOptions   ( new ScDocOptions ),
-        nWhichCalc      ( GetWhich( SID_SCDOCOPTIONS ) )
+ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs)
+    : SfxTabPage(pParent, "OptCalculatePage",
+        "modules/scalc/ui/optcalculatepage.ui", rCoreAttrs)
+    , pOldOptions(new ScDocOptions(
+        ((const ScTpCalcItem&)rCoreAttrs.Get(
+            GetWhich(SID_SCDOCOPTIONS))).GetDocOptions()))
+    , pLocalOptions(new ScDocOptions)
+    , nWhichCalc(GetWhich(SID_SCDOCOPTIONS))
 {
-    aSeparatorFL.SetStyle( aSeparatorFL.GetStyle() | WB_VERT );
+    get(m_pBtnIterate, "iterate");
+    get(m_pFtSteps, "stepsft");
+    get(m_pEdSteps, "steps");
+    get(m_pFtEps, "minchangeft");
+    get(m_pEdEps, "minchange");
+    get(m_pBtnDateStd, "datestd");
+    get(m_pBtnDateSc10, "datesc10");
+    get(m_pBtnDate1904, "date1904");
+    get(m_pBtnCase, "case");
+    get(m_pBtnCalc, "calc");
+    get(m_pBtnMatch, "match");
+    get(m_pBtnRegex, "regex");
+    get(m_pBtnLookUp, "lookup");
+    get(m_pBtnGeneralPrec, "generalprec");
+    get(m_pFtPrec, "precft");
+    get(m_pEdPrec, "prec");
     Init();
-    FreeResource();
     SetExchangeSupport();
 }
 
@@ -93,11 +81,11 @@ ScTpCalcOptions::~ScTpCalcOptions()
 
 void ScTpCalcOptions::Init()
 {
-    aBtnIterate .SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
-    aBtnGeneralPrec.SetClickHdl( LINK(this, ScTpCalcOptions, CheckClickHdl) );
-    aBtnDateStd .SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
-    aBtnDateSc10.SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
-    aBtnDate1904.SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
+    m_pBtnIterate->SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
+    m_pBtnGeneralPrec->SetClickHdl( LINK(this, ScTpCalcOptions, CheckClickHdl) );
+    m_pBtnDateStd->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
+    m_pBtnDateSc10->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
+    m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
 }
 
 //-----------------------------------------------------------------------
@@ -115,46 +103,46 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
 
     *pLocalOptions  = *pOldOptions;
 
-    aBtnCase   .Check( !pLocalOptions->IsIgnoreCase() );
-    aBtnCalc   .Check( pLocalOptions->IsCalcAsShown() );
-    aBtnMatch  .Check( pLocalOptions->IsMatchWholeCell() );
-    aBtnRegex  .Check( pLocalOptions->IsFormulaRegexEnabled() );
-    aBtnLookUp .Check( pLocalOptions->IsLookUpColRowNames() );
-    aBtnIterate.Check( pLocalOptions->IsIter() );
-    aEdSteps   .SetValue( pLocalOptions->GetIterCount() );
-    aEdEps     .SetValue( pLocalOptions->GetIterEps(), 6 );
+    m_pBtnCase->Check( !pLocalOptions->IsIgnoreCase() );
+    m_pBtnCalc->Check( pLocalOptions->IsCalcAsShown() );
+    m_pBtnMatch->Check( pLocalOptions->IsMatchWholeCell() );
+    m_pBtnRegex->Check( pLocalOptions->IsFormulaRegexEnabled() );
+    m_pBtnLookUp->Check( pLocalOptions->IsLookUpColRowNames() );
+    m_pBtnIterate->Check( pLocalOptions->IsIter() );
+    m_pEdSteps->SetValue( pLocalOptions->GetIterCount() );
+    m_pEdEps->SetValue( pLocalOptions->GetIterEps(), 6 );
 
     pLocalOptions->GetDate( d, m, y );
 
     switch ( y )
     {
         case 1899:
-            aBtnDateStd.Check();
+            m_pBtnDateStd->Check();
             break;
         case 1900:
-            aBtnDateSc10.Check();
+            m_pBtnDateSc10->Check();
             break;
         case 1904:
-            aBtnDate1904.Check();
+            m_pBtnDate1904->Check();
             break;
     }
 
     sal_uInt16 nPrec = pLocalOptions->GetStdPrecision();
     if (nPrec == SvNumberFormatter::UNLIMITED_PRECISION)
     {
-        aFtPrec.Disable();
-        aEdPrec.Disable();
-        aBtnGeneralPrec.Check(false);
+        m_pFtPrec->Disable();
+        m_pEdPrec->Disable();
+        m_pBtnGeneralPrec->Check(false);
     }
     else
     {
-        aBtnGeneralPrec.Check();
-        aFtPrec.Enable();
-        aEdPrec.Enable();
-        aEdPrec.SetValue(nPrec);
+        m_pBtnGeneralPrec->Check();
+        m_pFtPrec->Enable();
+        m_pEdPrec->Enable();
+        m_pEdPrec->SetValue(nPrec);
     }
 
-    CheckClickHdl( &aBtnIterate );
+    CheckClickHdl(m_pBtnIterate);
 }
 
 
@@ -163,16 +151,16 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
 sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
 {
     // alle weiteren Optionen werden in den Handlern aktualisiert
-    pLocalOptions->SetIterCount( (sal_uInt16)aEdSteps.GetValue() );
-    pLocalOptions->SetIgnoreCase( !aBtnCase.IsChecked() );
-    pLocalOptions->SetCalcAsShown( aBtnCalc.IsChecked() );
-    pLocalOptions->SetMatchWholeCell( aBtnMatch.IsChecked() );
-    pLocalOptions->SetFormulaRegexEnabled( aBtnRegex.IsChecked() );
-    pLocalOptions->SetLookUpColRowNames( aBtnLookUp.IsChecked() );
-
-    if (aBtnGeneralPrec.IsChecked())
+    pLocalOptions->SetIterCount( (sal_uInt16)m_pEdSteps->GetValue() );
+    pLocalOptions->SetIgnoreCase( !m_pBtnCase->IsChecked() );
+    pLocalOptions->SetCalcAsShown( m_pBtnCalc->IsChecked() );
+    pLocalOptions->SetMatchWholeCell( m_pBtnMatch->IsChecked() );
+    pLocalOptions->SetFormulaRegexEnabled( m_pBtnRegex->IsChecked() );
+    pLocalOptions->SetLookUpColRowNames( m_pBtnLookUp->IsChecked() );
+
+    if (m_pBtnGeneralPrec->IsChecked())
         pLocalOptions->SetStdPrecision(
-            static_cast<sal_uInt16>(aEdPrec.GetValue()) );
+            static_cast<sal_uInt16>(m_pEdPrec->GetValue()) );
     else
         pLocalOptions->SetStdPrecision( SvNumberFormatter::UNLIMITED_PRECISION );
 
@@ -192,7 +180,7 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
     int nReturn = KEEP_PAGE;
 
     double fEps;
-    if( aEdEps.GetValue( fEps ) && (fEps > 0.0) )
+    if( m_pEdEps->GetValue( fEps ) && (fEps > 0.0) )
     {
         pLocalOptions->SetIterEps( fEps );
         nReturn = LEAVE_PAGE;
@@ -205,7 +193,7 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
                   ScGlobal::GetRscString( STR_INVALID_EPS )
                 ).Execute();
 
-        aEdEps.GrabFocus();
+        m_pEdEps->GrabFocus();
     }
     else if ( pSetP )
         FillItemSet( *pSetP );
@@ -218,15 +206,15 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
 
 IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn )
 {
-    if ( pBtn == &aBtnDateStd )
+    if (pBtn == m_pBtnDateStd)
     {
         pLocalOptions->SetDate( 30, 12, 1899 );
     }
-    else if ( pBtn == &aBtnDateSc10 )
+    else if (pBtn == m_pBtnDateSc10)
     {
         pLocalOptions->SetDate( 1, 1, 1900 );
     }
-    else if ( pBtn == &aBtnDate1904 )
+    else if (pBtn == m_pBtnDate1904)
     {
         pLocalOptions->SetDate( 1, 1, 1904 );
     }
@@ -238,32 +226,32 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn )
 
 IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn )
 {
-    if (pBtn == &aBtnGeneralPrec)
+    if (pBtn == m_pBtnGeneralPrec)
     {
         if (pBtn->IsChecked())
         {
-            aEdPrec.Enable();
-            aFtPrec.Enable();
+            m_pEdPrec->Enable();
+            m_pFtPrec->Enable();
         }
         else
         {
-            aEdPrec.Disable();
-            aFtPrec.Disable();
+            m_pEdPrec->Disable();
+            m_pFtPrec->Disable();
         }
     }
-    else if (pBtn == &aBtnIterate)
+    else if (pBtn == m_pBtnIterate)
     {
         if ( pBtn->IsChecked() )
         {
-            pLocalOptions->SetIter( sal_True );
-            aFtSteps.Enable();  aEdSteps.Enable();
-            aFtEps  .Enable();  aEdEps  .Enable();
+            pLocalOptions->SetIter( true );
+            m_pFtSteps->Enable();  m_pEdSteps->Enable();
+            m_pFtEps->Enable();  m_pEdEps->Enable();
         }
         else
         {
             pLocalOptions->SetIter( false );
-            aFtSteps.Disable(); aEdSteps.Disable();
-            aFtEps  .Disable(); aEdEps  .Disable();
+            m_pFtSteps->Disable(); m_pEdSteps->Disable();
+            m_pFtEps->Disable(); m_pEdEps->Disable();
         }
     }
 
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index c5bc6a6..4621c13 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -18,153 +18,6 @@
  */
 #include "optdlg.hrc"
 
-TabPage RID_SCPAGE_CALC
-{
-    HelpId = HID_SCPAGE_CALC ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    CheckBox BTN_ITERATE
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 112 , 10 ) ;
-        Text [ en-US ] = "~Iterations" ;
-    };
-    FixedText FT_STEPS
-    {
-        Pos = MAP_APPFONT ( 20 , 28 ) ;
-        Size = MAP_APPFONT ( 58 , 8 ) ;
-        Text [ en-US ] = "~Steps" ;
-    };
-    FixedText FT_EPS
-    {
-        Pos = MAP_APPFONT ( 20 , 42 ) ;
-        Size = MAP_APPFONT ( 58 , 16 ) ;
-        Text [ en-US ] = "~Minimum Change" ;
-        WordBreak = TRUE ;
-    };
-    NumericField ED_STEPS
-    {
-        HelpID = "sc:NumericField:RID_SCPAGE_CALC:ED_STEPS";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 82 , 26 ) ;
-        Size = MAP_APPFONT ( 42 , 12 ) ;
-        TabStop = TRUE ;
-        Minimum = 1 ;
-        Maximum = 1000 ;
-        Left = TRUE ;
-    };
-    Edit ED_EPS
-    {
-        HelpID = "sc:Edit:RID_SCPAGE_CALC:ED_EPS";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 82 , 42 ) ;
-        Size = MAP_APPFONT ( 42 , 12 ) ;
-    };
-    FixedLine GB_ZREFS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
-        Text [ en-US ] = "Iterative references" ;
-    };
-    RadioButton BTN_DATESTD
-    {
-        HelpID = "sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD";
-        Pos = MAP_APPFONT ( 139 , 14 ) ;
-        Size = MAP_APPFONT ( 112 , 10 ) ;
-        Text [ en-US ] = "12/30/1899 (defa~ult)" ;
-        QuickHelpText [ en-US ] = "Value 0 corresponds to 12/30/1899" ;
-    };
-    RadioButton BTN_DATESC10
-    {
-        HelpID = "sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10";
-        Pos = MAP_APPFONT ( 139 , 28 ) ;
-        Size = MAP_APPFONT ( 112 , 10 ) ;
-        Text [ en-US ] = "01/01/1900 (Star~Calc 1.0)" ;
-        QuickHelpText [ en-US ] = "Value 0 corresponds to 01/01/1900" ;
-    };
-    RadioButton BTN_DATE1904
-    {
-        HelpID = "sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904";
-        Pos = MAP_APPFONT ( 139 , 42 ) ;
-        Size = MAP_APPFONT ( 112 , 10 ) ;
-        Text [ en-US ] = "~01/01/1904" ;
-        QuickHelpText [ en-US ] = "0 corresponds to 01/01/1904" ;
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 130 , 14 ) ;
-        Size = MAP_APPFONT ( 1 , 44 ) ;
-    };
-    FixedLine GB_DATE
-    {
-        Pos = MAP_APPFONT ( 133 , 3 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
-        Text [ en-US ] = "Date" ;
-    };
-    CheckBox BTN_CASE
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_CASE";
-        Pos = MAP_APPFONT ( 12 , 77 ) ;
-        Size = MAP_APPFONT ( 130 , 10 ) ;
-        Text [ en-US ] = "Case se~nsitive" ;
-    };
-    CheckBox BTN_CALC
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC";
-        Pos = MAP_APPFONT ( 12 , 91 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "~Precision as shown" ;
-    };
-    CheckBox BTN_MATCH
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_MATCH";
-        Pos = MAP_APPFONT ( 12 , 105 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "Search criteria = and <> must apply to ~whole cells" ;
-    };
-    CheckBox BTN_REGEX
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX";
-        Pos = MAP_APPFONT ( 12 , 119 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "~Enable regular expressions in formulas" ;
-    };
-    CheckBox BTN_LOOKUP
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP";
-        Pos = MAP_APPFONT ( 12 , 133 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "~Automatically find column and row labels " ;
-    };
-    CheckBox BTN_GENERAL_PREC
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC";
-        Pos = MAP_APPFONT ( 12 , 147 ) ;
-        Size = MAP_APPFONT ( 164 , 10 ) ;
-        Text [ en-US ] = "~Limit decimals for general number format" ;
-    };
-    FixedText FT_PREC
-    {
-        Pos = MAP_APPFONT ( 169 , 147 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        Text [ en-US ] = "~Decimal places" ;
-        Right = TRUE ;
-    };
-    NumericField ED_PREC
-    {
-        HelpID = "sc:NumericField:RID_SCPAGE_CALC:ED_PREC";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 226 , 145 ) ;
-        Size = MAP_APPFONT ( 25 , 12 ) ;
-        Maximum = 20 ;
-        Spin = TRUE ;
-        Repeat = TRUE ;
-    };
-};
-
 TabPage RID_SCPAGE_FORMULA
 {
     HelpId = HID_SCPAGE_FORMULA ;
diff --git a/sc/uiconfig/scalc/ui/optcalculatepage.ui b/sc/uiconfig/scalc/ui/optcalculatepage.ui
new file mode 100644
index 0000000..322cd95
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/optcalculatepage.ui
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">1000</property>
+    <property name="value">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">20</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkGrid" id="OptCalculatePage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="row_spacing">12</property>
+    <property name="column_spacing">18</property>
+    <child>
+      <object class="GtkFrame" id="frame1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkGrid" id="grid3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkCheckButton" id="case">
+                    <property name="label" translatable="yes">Case se_nsitive</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="calc">
+                    <property name="label" translatable="yes">_Precision as shown</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="match">
+                    <property name="label" translatable="yes">Search criteria = and <> must apply to _whole cells</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="regex">
+                    <property name="label" translatable="yes">_Enable regular expressions in formulas</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="lookup">
+                    <property name="label" translatable="yes">_Automatically find column and row labels</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="generalprec">
+                    <property name="label" translatable="yes">_Limit decimals for general number format</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="hexpand">True</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="precft">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Decimal places</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">prec</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="prec">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">â—</property>
+                        <property name="adjustment">adjustment2</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">General Calculations</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
+        <property name="width">2</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkGrid" id="grid1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <property name="row_homogeneous">True</property>
+                <child>
+                  <object class="GtkCheckButton" id="iterate">
+                    <property name="label" translatable="yes">_Iterations</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="stepsft">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">12</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Steps</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">steps</property>
+                  </object>
+                  <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>
+                  <object class="GtkLabel" id="minchangeft">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">12</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Minimum Change</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">minchange</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="steps">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">â—</property>
+                    <property name="adjustment">adjustment1</property>
+                  </object>
+                  <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>
+                <child>
+                  <object class="scuilo-ScDoubleField" id="minchange">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">â—</property>
+                    <property name="width_chars">12</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Iterative references</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <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>
+      <object class="GtkFrame" id="frame3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkGrid" id="grid2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_homogeneous">True</property>
+                <child>
+                  <object class="GtkRadioButton" id="datestd">
+                    <property name="label" translatable="yes">12/30/1899 (defa_ult)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_markup" translatable="yes">Value 0 corresponds to 12/30/1899</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">datesc10</property>
+                  </object>
+                  <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>
+                  <object class="GtkRadioButton" id="datesc10">
+                    <property name="label" translatable="yes">01/01/1900 (Star_Calc 1.0)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_markup" translatable="yes">Value 0 corresponds to 01/01/1900</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">date1904</property>
+                  </object>
+                  <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>
+                  <object class="GtkRadioButton" id="date1904">
+                    <property name="label" translatable="yes">_01/01/1904</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_markup" translatable="yes">0 corresponds to 01/01/1904</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">datestd</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Date</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <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>
+  </object>
+</interface>
commit 35f846ffea29943729de98ae8d50adf4d82c4aa0
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu May 16 09:22:28 2013 +0100

    tidy up some of the options panes
    
    Change-Id: Iad307aedc68f0f515e38949ee36f3fdf1fd0b32a

diff --git a/cui/uiconfig/ui/optonlineupdatepage.ui b/cui/uiconfig/ui/optonlineupdatepage.ui
index dec4255..16bd6ca 100644
--- a/cui/uiconfig/ui/optonlineupdatepage.ui
+++ b/cui/uiconfig/ui/optonlineupdatepage.ui
@@ -5,6 +5,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
+    <property name="border_width">6</property>
     <property name="label_xalign">0</property>
     <property name="shadow_type">none</property>
     <child>
diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui
index 92e8d96..307891c 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -7,9 +7,6 @@
     <property name="border_width">6</property>
     <property name="spacing">12</property>
     <child>
-      <placeholder/>
-    </child>
-    <child>
       <object class="GtkFrame" id="frame2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -25,14 +22,13 @@
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkRadioButton" id="no_persona">
                     <property name="label" translatable="yes">Plain look, do not use Themes</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">default_persona</property>
@@ -46,11 +42,9 @@
                 <child>
                   <object class="GtkRadioButton" id="default_persona">
                     <property name="label" translatable="yes">Pre-installed Theme (if available)</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">own_persona</property>
@@ -65,15 +59,14 @@
                   <object class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkRadioButton" id="own_persona">
                         <property name="label" translatable="yes">Own Theme</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>

... etc. - the rest is truncated
