summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-18 21:45:26 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-10-18 21:45:26 +0100
commit3b696181ebf1fd4c3ecff4a1fc9ed84a5db9b3e3 (patch)
tree2a97407f6c70a8fee96b691fed855f08cf7db44e
parent4e5fdfb31e62300b20f8122a73206722b1d4fc0f (diff)
SetMaxWidthInChars should be SetMinWidthInChars
Change-Id: I5cf508e7930eb7e04016ffa43683f76a07e5173e
-rw-r--r--vcl/inc/vcl/edit.hxx2
-rw-r--r--vcl/source/control/combobox.cxx6
-rw-r--r--vcl/source/control/edit.cxx4
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 1fd016805811..7ddab48fa1a6 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -199,7 +199,7 @@ public:
virtual void SetMaxTextLen( xub_StrLen nMaxLen = EDIT_NOLIMIT );
virtual xub_StrLen GetMaxTextLen() const { return mnMaxTextLen; }
- void SetMaxWidthInChars(sal_Int32 nMinWidthInChars);
+ void SetMinWidthInChars(sal_Int32 nMinWidthInChars);
sal_Int32 GetMinWidthInChars() const { return mnMinWidthInChars; }
virtual void SetSelection( const Selection& rSelection );
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 90515ccb29cd..3ec6e64f1933 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -61,7 +61,7 @@ ComboBox::ComboBox( WindowType nType ) :
Edit( nType )
{
ImplInitComboBoxData();
- SetMaxWidthInChars(0);
+ SetMinWidthInChars(0);
}
// -----------------------------------------------------------------------
@@ -71,7 +71,7 @@ ComboBox::ComboBox( Window* pParent, WinBits nStyle ) :
{
ImplInitComboBoxData();
ImplInit( pParent, nStyle );
- SetMaxWidthInChars(0);
+ SetMinWidthInChars(0);
}
// -----------------------------------------------------------------------
@@ -85,7 +85,7 @@ ComboBox::ComboBox( Window* pParent, const ResId& rResId ) :
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
- SetMaxWidthInChars(0);
+ SetMinWidthInChars(0);
if ( !(nStyle & WB_HIDE ) )
Show();
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 962df08168ce..7d2c47630a7a 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -219,7 +219,7 @@ Edit::Edit( Window* pParent, const ResId& rResId ) :
Show();
}
-void Edit::SetMaxWidthInChars(sal_Int32 nMinWidthInChars)
+void Edit::SetMinWidthInChars(sal_Int32 nMinWidthInChars)
{
if (mnMinWidthInChars != nMinWidthInChars)
{
@@ -231,7 +231,7 @@ void Edit::SetMaxWidthInChars(sal_Int32 nMinWidthInChars)
bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
if (rKey == "width-chars")
- SetMaxWidthInChars(rValue.toInt32());
+ SetMinWidthInChars(rValue.toInt32());
else if (rKey == "editable")
SetReadOnly(!toBool(rValue));
else if (rKey == "visibility")