diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-07 22:09:06 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-08 23:25:28 +0200 |
| commit | 03eb15938e04a8a28fc08ca7528b2f7068fe1c7a (patch) | |
| tree | 64a56e0d605757410bed25ad88735f5ac4339e73 /svx | |
| parent | af2d474ff9a91645043c1d4292891c313cceef5e (diff) | |
vcl, sw: fix the inheritance of SwComboBox from ComboBox a bit
Remove the silly overloading, and introduce virtual methods.
Change-Id: If54a6a3fb7464283f80d3387ae23db234690f8a3
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 2 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 11d235e57870..6d7cf6cb48d3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1547,7 +1547,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch ) // delete oldest entry at maximum occupancy (ListBox and Array) if(REMEMBER_SIZE < pArr->size()) { - pListBox->RemoveEntry( sal_uInt16(REMEMBER_SIZE - 1) ); + pListBox->RemoveEntryAt(static_cast<sal_uInt16>(REMEMBER_SIZE - 1)); (*pArr)[REMEMBER_SIZE - 1] = rStr; pArr->erase(pArr->begin() + REMEMBER_SIZE - 1); } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index ffca6817ff23..577e3e13cee6 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -4550,7 +4550,7 @@ void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 _Pos, sal_Int16 _Count ) t if ( m_pComboBox ) { for ( sal_uInt16 n = _Count; n; ) - m_pComboBox->RemoveEntry( _Pos + (--n) ); + m_pComboBox->RemoveEntryAt( _Pos + (--n) ); } } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 74a2abfbb2f3..07cedc30b064 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -147,7 +147,7 @@ void FindTextFieldControl::Remember_Impl(const String& rStr) } if (nCount == REMEMBER_SIZE) - RemoveEntry(REMEMBER_SIZE-1); + RemoveEntryAt(REMEMBER_SIZE-1); InsertEntry(rStr, 0); } |