summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basctl/source/basicide/baside2b.cxx2
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/LimitBox.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/limitboxcontroller.cxx2
-rw-r--r--include/vcl/combobox.hxx3
-rw-r--r--include/vcl/lstbox.hxx2
-rw-r--r--include/vcl/vclmedit.hxx3
-rw-r--r--svtools/source/uno/unoiface.cxx2
-rw-r--r--toolkit/source/awt/vclxwindows.cxx4
-rw-r--r--vcl/source/control/combobox.cxx4
-rw-r--r--vcl/source/control/lstbox.cxx4
-rw-r--r--vcl/source/edit/vclmedit.cxx10
12 files changed, 21 insertions, 23 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index fee2d61a2539..2ae6efd2b5a5 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2842,7 +2842,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox()
const sal_uInt16& nColumns = aLongestEntry.getLength();
const sal_uInt16& nLines = std::min( (sal_uInt16) 6, pListBox->GetEntryCount() );
- Size aSize = pListBox->CalcSize( nColumns, nLines );
+ Size aSize = pListBox->CalcBlockSize( nColumns, nLines );
//set the size
SetSizePixel( aSize );
//1 px smaller, to see the border
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 );
}
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 76533ab7ce16..6cd3d5c1c806 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -172,8 +172,7 @@ public:
Size CalcMinimumSize() const;
virtual Size GetOptimalSize() const;
Size CalcAdjustedSize( const Size& rPrefSize ) const;
- using Edit::CalcSize;
- 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 SetMRUEntries( const OUString& rEntries, sal_Unicode cSep = ';' );
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index cc63c2fdd452..e57ea803a7fc 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -196,7 +196,7 @@ public:
Size CalcMinimumSize() const; //size of lstbox area, i.e. including scrollbar/dropdown
virtual Size GetOptimalSize() const;
Size CalcAdjustedSize( const Size& rPrefSize ) 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;
sal_uInt16 GetMRUCount() const;
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index ce567e9b1fb3..e1c69e3564af 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -119,8 +119,7 @@ public:
virtual Size CalcMinimumSize() const;
Size CalcAdjustedSize( const Size& rPrefSize ) const;
- using Edit::CalcSize;
- 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 Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 6675253e2035..2793e1226d88 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -366,7 +366,7 @@ OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeE
::com::sun::star::awt::Size aSz;
MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
if ( pEdit )
- aSz = AWTSize(pEdit->CalcSize( nCols, nLines ));
+ aSz = AWTSize(pEdit->CalcBlockSize( nCols, nLines ));
return aSz;
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 21325def24f8..98c2fe1e7c57 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2015,7 +2015,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s
Size aSz;
ListBox* pListBox = (ListBox*) GetWindow();
if ( pListBox )
- aSz = pListBox->CalcSize( nCols, nLines );
+ aSz = pListBox->CalcBlockSize( nCols, nLines );
return AWTSize(aSz);
}
@@ -4522,7 +4522,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
Size aSz;
ComboBox* pComboBox = (ComboBox*) GetWindow();
if ( pComboBox )
- aSz = pComboBox->CalcSize( nCols, nLines );
+ aSz = pComboBox->CalcBlockSize( nCols, nLines );
return AWTSize(aSz);
}
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 );
generated by cgit (git 2.34.1) at 2024-07-27 22:24:16 +0000