diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-14 16:50:25 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-21 12:44:00 +0200 |
commit | b649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (patch) | |
tree | bd6937a0ece320c9545774dd5c9a68c68d04769e /vcl | |
parent | 06ce312f79cb0871c0b110ba4bff16f5aaa0f538 (diff) |
Rename GetSelectEntry -> GetSelectedEntry
Change-Id: Ibb7d8c59c0e61b0e87455bd78f241d8691dd9dce
Reviewed-on: https://gerrit.libreoffice.org/42282
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/listbox.hxx | 2 | ||||
-rw-r--r-- | vcl/source/control/combobox.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/imp_listbox.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/listbox.cxx | 6 | ||||
-rw-r--r-- | vcl/source/uitest/uiobject.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 6 | ||||
-rw-r--r-- | vcl/workben/svpclient.cxx | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index 2b52e43ff83e..09e1d0dbcd55 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -130,7 +130,7 @@ public: void SelectEntry( sal_Int32 nPos, bool bSelect ); sal_Int32 GetSelectEntryCount() const; - OUString GetSelectEntry( sal_Int32 nIndex ) const; + OUString GetSelectedEntry( sal_Int32 nIndex ) const; sal_Int32 GetSelectEntryPos( sal_Int32 nIndex ) const; bool IsEntryPosSelected( sal_Int32 nIndex ) const; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 824803b2f981..316677f9a102 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -399,7 +399,7 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) } else { - aText = m_pImplLB->GetEntryList()->GetSelectEntry( 0 ); + aText = m_pImplLB->GetEntryList()->GetSelectedEntry( 0 ); } m_pSubEdit->SetText( aText ); diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index 649a593abae9..a06e2c31a01e 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -391,7 +391,7 @@ sal_Int32 ImplEntryList::GetSelectEntryCount() const return nSelCount; } -OUString ImplEntryList::GetSelectEntry( sal_Int32 nIndex ) const +OUString ImplEntryList::GetSelectedEntry( sal_Int32 nIndex ) const { return GetEntryText( GetSelectEntryPos( nIndex ) ); } diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 932595276c37..0a9475b01c0b 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -186,7 +186,7 @@ IMPL_LINK_NOARG(ListBox, ImplSelectHdl, LinkParamNone*, void) } mpImplWin->SetItemPos( GetSelectEntryPos() ); - mpImplWin->SetString( GetSelectEntry() ); + mpImplWin->SetString( GetSelectedEntry() ); if( mpImplLB->GetEntryList()->HasImages() ) { Image aImage = mpImplLB->GetEntryList()->GetEntryImage( GetSelectEntryPos() ); @@ -392,7 +392,7 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, Dr if ( IsDropDownBox() ) { - OUString aText = GetSelectEntry(); + OUString aText = GetSelectedEntry(); long nTextHeight = pDev->GetTextHeight(); long nTextWidth = pDev->GetTextWidth( aText ); long nOffY = (aSize.Height()-nTextHeight) / 2; @@ -1016,7 +1016,7 @@ sal_Int32 ListBox::GetEntryCount() const return mpImplLB->GetEntryList()->GetEntryCount() - mpImplLB->GetEntryList()->GetMRUCount(); } -OUString ListBox::GetSelectEntry(sal_Int32 nIndex) const +OUString ListBox::GetSelectedEntry(sal_Int32 nIndex) const { return GetEntry( GetSelectEntryPos( nIndex ) ); } diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index 73c5aabcfab1..c977b7d56391 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -827,7 +827,7 @@ StringMap ListBoxUIObject::get_state() aMap["EntryCount"] = OUString::number(mxListBox->GetEntryCount()); aMap["SelectEntryCount"] = OUString::number(mxListBox->GetSelectEntryCount()); aMap["SelectEntryPos"] = OUString::number(mxListBox->GetSelectEntryPos()); - aMap["SelectEntryText"] = mxListBox->GetSelectEntry(); + aMap["SelectEntryText"] = mxListBox->GetSelectedEntry(); return aMap; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f8e29b94fa82..949ebaf7745f 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -776,7 +776,7 @@ void PrintDialog::storeToSettings() pItem->setValue( "PrintDialog", "LastPrinter", isPrintToFile() ? Printer::GetDefaultPrinterName() - : maJobPage.mpPrinters->GetSelectEntry() ); + : maJobPage.mpPrinters->GetSelectedEntry() ); pItem->setValue( "PrintDialog", "LastPage", @@ -1276,7 +1276,7 @@ static OUString searchAndReplace( const OUString& i_rOrig, const char* i_pRepl, void PrintDialog::updatePrinterText() { const OUString aDefPrt( Printer::GetDefaultPrinterName() ); - const QueueInfo* pInfo = Printer::GetQueueInfo( maJobPage.mpPrinters->GetSelectEntry(), true ); + const QueueInfo* pInfo = Printer::GetQueueInfo( maJobPage.mpPrinters->GetSelectedEntry(), true ); if( pInfo ) { maJobPage.mpLocationTxt->SetText( pInfo->GetLocation() ); @@ -1521,7 +1521,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void ) if ( rBox.GetSelectEntryPos() != 0) { - OUString aNewPrinter( rBox.GetSelectEntry() ); + OUString aNewPrinter( rBox.GetSelectedEntry() ); // set new printer maPController->setPrinter( VclPtrInstance<Printer>( aNewPrinter ) ); maPController->resetPrinterOptions( false ); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 8a3b2b75a4bc..81c8be25be4d 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -249,7 +249,7 @@ IMPL_STATIC_LINK_NOARG( MyWin, QuitHdl, Button*, void) IMPL_LINK_NOARG( MyWin, SelectHdl, ListBox&, void) { - OUString aEntry = m_aSvpBitmaps->GetSelectEntry(); + OUString aEntry = m_aSvpBitmaps->GetSelectedEntry(); sal_Int32 nPos = aEntry.indexOf( ": " ); if( nPos != -1 ) { |