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 /vcl | |
| parent | 89f7e4ec62dd427168c46e7599f74a16a6a239b0 (diff) | |
disentangle CalcSize
Change-Id: I42248ff611dbe7c109076da5d548717898341be3
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/edit/vclmedit.cxx | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 92ea28e40cd4..b725be4c3fc5 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -1114,7 +1114,7 @@ Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const aSz.Height() -= nTop+nBottom; if ( !IsDropDownBox() ) { - long nEntryHeight = CalcSize( 1, 1 ).Height(); + long nEntryHeight = CalcBlockSize( 1, 1 ).Height(); long nLines = aSz.Height() / nEntryHeight; if ( nLines < 1 ) nLines = 1; @@ -1133,7 +1133,7 @@ Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const // ----------------------------------------------------------------------- -Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const +Size ComboBox::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const { // show ScrollBars where appropriate Size aMinSz = CalcMinimumSize(); diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index fe358ae30b55..de38eaa617d2 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -1351,7 +1351,7 @@ Size ListBox::CalcAdjustedSize( const Size& rPrefSize ) const aSz.Height() -= nTop+nBottom; if ( !IsDropDownBox() ) { - long nEntryHeight = CalcSize( 1, 1 ).Height(); + long nEntryHeight = CalcBlockSize( 1, 1 ).Height(); long nLines = aSz.Height() / nEntryHeight; if ( nLines < 1 ) nLines = 1; @@ -1368,7 +1368,7 @@ Size ListBox::CalcAdjustedSize( const Size& rPrefSize ) const } -Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const +Size ListBox::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const { // ScrollBars are shown if needed Size aMinSz = CalcMinimumSize(); diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 3d9cec0b78d0..af2d417ce55d 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -143,7 +143,7 @@ public: void Enable( sal_Bool bEnable ); Size CalcMinimumSize() const; - Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; + Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; void SetAlign( WinBits nWinStyle ); @@ -646,7 +646,7 @@ Size ImpVclMEdit::CalcMinimumSize() const return aSz; } -Size ImpVclMEdit::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const +Size ImpVclMEdit::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const { static const sal_Unicode sampleChar = 'X'; @@ -1227,7 +1227,7 @@ Size VclMultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const // center vertically for whole lines long nHeight = aSz.Height() - nTop - nBottom; - long nLineHeight = pImpVclMEdit->CalcSize( 1, 1 ).Height(); + long nLineHeight = pImpVclMEdit->CalcBlockSize( 1, 1 ).Height(); long nLines = nHeight / nLineHeight; if ( nLines < 1 ) nLines = 1; @@ -1238,9 +1238,9 @@ Size VclMultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const return aSz; } -Size VclMultiLineEdit::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const +Size VclMultiLineEdit::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const { - Size aSz = pImpVclMEdit->CalcSize( nColumns, nLines ); + Size aSz = pImpVclMEdit->CalcBlockSize( nColumns, nLines ); sal_Int32 nLeft, nTop, nRight, nBottom; ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); |