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

Zolnai Tamás zolnaitamas2000 at gmail.com
Sat Mar 9 03:00:54 PST 2013


 dbaccess/source/ui/querydesign/LimitBox.cxx           |    7 ++++---
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx |    2 +-
 dbaccess/uiconfig/ui/querypropertiesdialog.ui         |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 4c52c8bd73bb814a87df2c032faa164f21f9f73e
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sat Mar 9 11:41:54 2013 +0100

    fdo#61794 Allow greater value in LimitBox
    
    Increase the width of LimitBox
    *on toolbar: 6 digits
    *in dialog: 10 digits
    Set maximum value of LimitBox to the max value of Int32
    
    Change-Id: I6fcf0270b474eb46a29ff98ade9cd7ee8ba637f5

diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 36fb191..735bfa8 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -42,7 +42,9 @@ LimitBox::LimitBox( Window* pParent, WinBits nStyle )
     SetShowTrailingZeros( sal_False );
     SetDecimalDigits( 0 );
     SetMin( -1 );
-    SetMax( 9999 );
+
+    ///Use the maximum value of Int32
+    SetMax( 2147483647 );
     LoadDefaultLimits();
 
     Size aSize(
@@ -100,8 +102,7 @@ void LimitBox::ReformatAll()
 
 Size LimitBox::GetOptimalSize() const
 {
-    Size aSize = NumericBox::GetOptimalSize();
-    return Size( aSize.Width() + 20, aSize.Height());
+    return CalcSize(10,1);
 }
 
 ///Initialize entries
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index e49dfbc..e56f3b3 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -193,7 +193,7 @@ uno::Reference< awt::XWindow > SAL_CALL LimitBoxController::createItemWindow(
     {
         SolarMutexGuard aSolarMutexGuard;
         m_pLimitBox = new LimitBoxImpl(pParent, this);
-        m_pLimitBox->SetSizePixel(m_pLimitBox->GetOptimalSize());
+        m_pLimitBox->SetSizePixel(m_pLimitBox->CalcSize(6,1));
         xItemWindow = VCLUnoHelper::GetInterface( m_pLimitBox );
     }
 
diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
index d745c16..6f55af2 100644
--- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui
+++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
@@ -168,7 +168,7 @@
                       <object class="GtkGrid" id="grid3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="column_spacing">12</property>
+                        <property name="column_spacing">24</property>
                         <child>
                           <object class="GtkLabel" id="limit-label">
                             <property name="visible">True</property>


More information about the Libreoffice-commits mailing list