diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-01-13 00:59:39 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-13 09:50:11 +0000 |
commit | 1b7a5c634a22dee2f7d6e9f3d82820765725943a (patch) | |
tree | 02e39564d6c8b33083a7581ec7aa51314b4e16ea /dbaccess/source | |
parent | 89f7e4ec62dd427168c46e7599f74a16a6a239b0 (diff) |
disentangle CalcSize
Change-Id: I42248ff611dbe7c109076da5d548717898341be3
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/ui/dlg/directsql.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/LimitBox.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 6e1d4077e3a5..ef2084fea9dd 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -43,17 +43,17 @@ DBG_NAME(DirectSQLDialog) ,m_xConnection(_rxConn) { get(m_pSQL,"sql"); - Size aSize(m_pSQL->CalcSize(60, 7)); + Size aSize(m_pSQL->CalcBlockSize(60, 7)); m_pSQL->set_width_request(aSize.Width()); m_pSQL->set_height_request(aSize.Height()); get(m_pExecute,"execute"); get(m_pSQLHistory,"sqlhistory"); get(m_pStatus,"status"); - aSize = m_pStatus->CalcSize(60, 5); + aSize = m_pStatus->CalcBlockSize(60, 5); m_pStatus->set_height_request(aSize.Height()); get(m_pShowOutput,"showoutput"); get(m_pOutput,"output"); - aSize = m_pOutput->CalcSize(60, 5); + aSize = m_pOutput->CalcBlockSize(60, 5); m_pOutput->set_height_request(aSize.Height()); get(m_pClose,"close"); diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx index 688758f87423..5f4510dbe5fd 100644 --- a/dbaccess/source/ui/querydesign/LimitBox.cxx +++ b/dbaccess/source/ui/querydesign/LimitBox.cxx @@ -96,7 +96,7 @@ void LimitBox::ReformatAll() Size LimitBox::GetOptimalSize() const { - return CalcSize(10,1); + return CalcBlockSize(10,1); } ///Initialize entries diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index a21f771998fd..67d20e03b381 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -208,7 +208,7 @@ uno::Reference< awt::XWindow > SAL_CALL LimitBoxController::createItemWindow( { SolarMutexGuard aSolarMutexGuard; m_pLimitBox = new LimitBoxImpl(pParent, this); - m_pLimitBox->SetSizePixel(m_pLimitBox->CalcSize(6,1)); + m_pLimitBox->SetSizePixel(m_pLimitBox->CalcBlockSize(6,1)); xItemWindow = VCLUnoHelper::GetInterface( m_pLimitBox ); } |