2 files changed, 5 insertions, 4 deletions
diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 36fb191ad6bc..735bfa8d827b 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 e49dfbcf2bb8..e56f3b3f3c60 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 );
     }