diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-14 10:40:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-14 16:04:17 +0000 |
| commit | 830f44b1ca0e121d3e27a031054313e3f194ab1d (patch) | |
| tree | 5e278495b667b8ca36d10770dc07d32134954e80 /dbaccess | |
| parent | d652af7d071bb5e5c3f7592d6dc7e7c400e711d3 (diff) | |
we only ever want the preferred window size from GetOptimalSize
so remove the MAX and MIN options and simplify the whole lot
Change-Id: Iaaf350c37e01f7fce434af760bcddb9b7d7135ea
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 2f9aa0dfbfdb..aa4627b7c377 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -470,7 +470,7 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const { if ( ppAggregates[i] ) { - const Size aTemp( ppAggregates[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) ); + const Size aTemp(ppAggregates[i]->GetOptimalSize()); if ( aTemp.Height() > aHeight.Height() ) aHeight.Height() = aTemp.Height(); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 554454972b11..c0532dc5541d 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -348,7 +348,7 @@ void OSelectionBrowseBox::Init() for (sal_Size i = 0; i < sizeof (pControls) / sizeof (pControls[0]); ++i) { - const Size aTemp( pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) ); + const Size aTemp(pControls[i]->GetOptimalSize()); if ( aTemp.Height() > aHeight.Height() ) aHeight.Height() = aTemp.Height(); } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index e5fd25185242..6fd7c3e5ee9f 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -295,7 +295,7 @@ void OTableEditorCtrl::InitCellController() const Control* pControls[] = { pTypeCell,pDescrCell,pNameCell,pHelpTextCell}; for(sal_Size i= 0; i < sizeof(pControls) / sizeof(pControls[0]);++i) { - const Size aTemp( pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) ); + const Size aTemp(pControls[i]->GetOptimalSize()); if ( aTemp.Height() > aHeight.Height() ) aHeight.Height() = aTemp.Height(); } |