diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-06 15:49:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-12 11:56:43 +0200 |
| commit | ed55bea114561e3fbcbd472964527ccddcb34af2 (patch) | |
| tree | 6ff83d91b8ff7880ae36da498b0b53d98a219bc9 /vcl/source/control/ilstbox.cxx | |
| parent | 4c3cfe059057f403de3de8889ddead963e4b6952 (diff) | |
convert vcl mnemonicengine.hxx and quickselectionengine.hxx
.. from String to OUString.
These 2 API's are tied together, necessitating their conversion in
one step.
Change-Id: Ibcc05d8d3617253adf49edb4a244542d32b38224
Diffstat (limited to 'vcl/source/control/ilstbox.cxx')
| -rw-r--r-- | vcl/source/control/ilstbox.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index f406d285b16c..68c01ea787b0 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -273,7 +273,7 @@ sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, sal_Bool bSearchMR sal_uInt16 nEntries = maEntries.size(); for ( sal_uInt16 n = bSearchMRUArea ? 0 : GetMRUCount(); n < nEntries; n++ ) { - String aComp( vcl::I18nHelper::filterFormattingChars( maEntries[n].maStr ) ); + OUString aComp( vcl::I18nHelper::filterFormattingChars( maEntries[n].maStr ) ); if ( aComp == rString ) return n; } @@ -758,7 +758,7 @@ void ImplListBoxWindow::ImplCallSelect() // Insert the selected entry as MRU, if not already first MRU sal_uInt16 nSelected = GetEntryList()->GetSelectEntryPos( 0 ); sal_uInt16 nMRUCount = GetEntryList()->GetMRUCount(); - String aSelected = GetEntryList()->GetEntryText( nSelected ); + OUString aSelected = GetEntryList()->GetEntryText( nSelected ); sal_uInt16 nFirstMatchingEntryPos = GetEntryList()->FindEntry( aSelected, sal_True ); if ( nFirstMatchingEntryPos || !nMRUCount ) { @@ -1704,7 +1704,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- namespace { - static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_uInt16 _nPos, String& _out_entryText ) + static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_uInt16 _nPos, OUString& _out_entryText ) { OSL_PRECOND( ( _nPos != LISTBOX_ENTRY_NOTFOUND ), "lcl_getEntry: invalid position!" ); sal_uInt16 nEntryCount( _rList.GetEntryCount() ); @@ -1725,13 +1725,13 @@ namespace } // ----------------------------------------------------------------------- -::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( String& _out_entryText ) const +::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const { return lcl_getEntry( *GetEntryList(), ( mnCurrentPos == LISTBOX_ENTRY_NOTFOUND ) ? 0 : mnCurrentPos + 1, _out_entryText ); } // ----------------------------------------------------------------------- -::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const +::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const { sal_uInt16 nNextPos = lcl_getEntryPos( _currentEntry ) + 1; return lcl_getEntry( *GetEntryList(), nNextPos, _out_entryText ); |