diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-14 16:57:06 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-21 12:45:38 +0200 |
commit | d99b65c864cc3358238e4eac651f12a34d05e2d9 (patch) | |
tree | fcd7d6fefb9434c27533c826aabc639f68ba97ed /vcl | |
parent | b649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (diff) |
Rename GetSelectEntryPos -> GetSelectedEntryPos
Change-Id: I0bd4cb463575af843c72d9c8aaf91742203532a4
Reviewed-on: https://gerrit.libreoffice.org/42283
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 | 8 | ||||
-rw-r--r-- | vcl/source/control/imp_listbox.cxx | 32 | ||||
-rw-r--r-- | vcl/source/control/listbox.cxx | 10 | ||||
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/uitest/uiobject.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/generic/print/prtsetup.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/print/prtsetup.hxx | 2 | ||||
-rw-r--r-- | vcl/workben/vcldemo.cxx | 2 |
10 files changed, 39 insertions, 39 deletions
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index 09e1d0dbcd55..e7699b736064 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -131,7 +131,7 @@ public: sal_Int32 GetSelectEntryCount() const; OUString GetSelectedEntry( sal_Int32 nIndex ) const; - sal_Int32 GetSelectEntryPos( sal_Int32 nIndex ) const; + sal_Int32 GetSelectedEntryPos( sal_Int32 nIndex ) const; bool IsEntryPosSelected( sal_Int32 nIndex ) const; void SetLastSelected( sal_Int32 nPos ) { mnLastSelected = nPos; } diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 316677f9a102..54fb097c4c6c 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -384,7 +384,7 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) sal_Int32 nSelectedEntries = m_pImplLB->GetEntryList()->GetSelectEntryCount(); for ( sal_Int32 n = 0; n < nSelectedEntries; n++ ) { - sal_Int32 nP = m_pImplLB->GetEntryList()->GetSelectEntryPos( n ); + sal_Int32 nP = m_pImplLB->GetEntryList()->GetSelectedEntryPos( n ); if ( !aSelInText.count( nP ) ) { if (!aText.isEmpty() && (aText[aText.getLength()-1] != m_cMultiSep)) @@ -842,7 +842,7 @@ void ComboBox::Impl::ImplUpdateFloatSelection() } else { - nSelect = m_pImplLB->GetEntryList()->GetSelectEntryPos( 0 ); + nSelect = m_pImplLB->GetEntryList()->GetSelectedEntryPos( 0 ); if( nSelect != LISTBOX_ENTRY_NOTFOUND ) m_pImplLB->SelectEntry( nSelect, false ); m_pImplLB->ResetCurrentPos(); @@ -1347,9 +1347,9 @@ sal_Int32 ComboBox::GetSelectEntryCount() const return m_pImpl->m_pImplLB->GetEntryList()->GetSelectEntryCount(); } -sal_Int32 ComboBox::GetSelectEntryPos( sal_Int32 nIndex ) const +sal_Int32 ComboBox::GetSelectedEntryPos( sal_Int32 nIndex ) const { - sal_Int32 nPos = m_pImpl->m_pImplLB->GetEntryList()->GetSelectEntryPos( nIndex ); + sal_Int32 nPos = m_pImpl->m_pImplLB->GetEntryList()->GetSelectedEntryPos( nIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { if (nPos < m_pImpl->m_pImplLB->GetEntryList()->GetMRUCount()) diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index a06e2c31a01e..90b1c6bd9043 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -393,10 +393,10 @@ sal_Int32 ImplEntryList::GetSelectEntryCount() const OUString ImplEntryList::GetSelectedEntry( sal_Int32 nIndex ) const { - return GetEntryText( GetSelectEntryPos( nIndex ) ); + return GetEntryText( GetSelectedEntryPos( nIndex ) ); } -sal_Int32 ImplEntryList::GetSelectEntryPos( sal_Int32 nIndex ) const +sal_Int32 ImplEntryList::GetSelectedEntryPos( sal_Int32 nIndex ) const { sal_Int32 nSelEntryPos = LISTBOX_ENTRY_NOTFOUND; sal_Int32 nSel = 0; @@ -688,7 +688,7 @@ void ImplListBoxWindow::ImplCallSelect() if ( !IsTravelSelect() && GetEntryList()->GetMaxMRUCount() ) { // Insert the selected entry as MRU, if not already first MRU - sal_Int32 nSelected = GetEntryList()->GetSelectEntryPos( 0 ); + sal_Int32 nSelected = GetEntryList()->GetSelectedEntryPos( 0 ); sal_Int32 nMRUCount = GetEntryList()->GetMRUCount(); OUString aSelected = GetEntryList()->GetEntryText( nSelected ); sal_Int32 nFirstMatchingEntryPos = GetEntryList()->FindEntry( aSelected, true ); @@ -837,7 +837,7 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt ) if( nSelect != LISTBOX_ENTRY_NOTFOUND ) { if ( !mbMulti && GetEntryList()->GetSelectEntryCount() ) - mnTrackingSaveSelection = GetEntryList()->GetSelectEntryPos( 0 ); + mnTrackingSaveSelection = GetEntryList()->GetSelectedEntryPos( 0 ); else mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND; @@ -901,7 +901,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) // Select only visible Entries with MouseMove, otherwise Tracking... if ( IsVisible( nSelect ) && mpEntryList->IsEntrySelectable( nSelect ) && - ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectEntryCount() || ( nSelect != GetEntryList()->GetSelectEntryPos( 0 ) ) ) ) + ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectEntryCount() || ( nSelect != GetEntryList()->GetSelectedEntryPos( 0 ) ) ) ) { mbTrackingSelect = true; if ( SelectEntries( nSelect, LET_TRACKING ) ) @@ -929,7 +929,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) if ( rMEvt.IsLeft() && !rMEvt.IsSynthetic() ) { if ( !mbMulti && GetEntryList()->GetSelectEntryCount() ) - mnTrackingSaveSelection = GetEntryList()->GetSelectEntryPos( 0 ); + mnTrackingSaveSelection = GetEntryList()->GetSelectedEntryPos( 0 ); else mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND; @@ -946,7 +946,7 @@ void ImplListBoxWindow::DeselectAll() { while ( GetEntryList()->GetSelectEntryCount() ) { - sal_Int32 nS = GetEntryList()->GetSelectEntryPos( 0 ); + sal_Int32 nS = GetEntryList()->GetSelectedEntryPos( 0 ); SelectEntry( nS, false ); } } @@ -961,7 +961,7 @@ void ImplListBoxWindow::SelectEntry( sal_Int32 nPos, bool bSelect ) if( !mbMulti ) { // deselect the selected entry - sal_Int32 nDeselect = GetEntryList()->GetSelectEntryPos( 0 ); + sal_Int32 nDeselect = GetEntryList()->GetSelectedEntryPos( 0 ); if( nDeselect != LISTBOX_ENTRY_NOTFOUND ) { //SelectEntryPos( nDeselect, false ); @@ -1011,7 +1011,7 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo // here (Single-ListBox) only one entry can be deselected if( !mbMulti ) { - sal_Int32 nDeselect = mpEntryList->GetSelectEntryPos( 0 ); + sal_Int32 nDeselect = mpEntryList->GetSelectedEntryPos( 0 ); if( nSelect != nDeselect ) { SelectEntry( nSelect, true ); @@ -1076,7 +1076,7 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo sal_Int32 nAnchor = mpEntryList->GetSelectionAnchor(); if( ( nAnchor == LISTBOX_ENTRY_NOTFOUND ) && ( mpEntryList->GetSelectEntryCount() || mbStackMode ) ) { - nAnchor = mbStackMode ? 0 : mpEntryList->GetSelectEntryPos( mpEntryList->GetSelectEntryCount() - 1 ); + nAnchor = mbStackMode ? 0 : mpEntryList->GetSelectedEntryPos( mpEntryList->GetSelectEntryCount() - 1 ); } if( nAnchor != LISTBOX_ENTRY_NOTFOUND ) { @@ -1265,7 +1265,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) if ( !mbMulti && GetEntryList()->GetSelectEntryCount() ) { mbTrackingSelect = true; - SelectEntry( GetEntryList()->GetSelectEntryPos( 0 ), false ); + SelectEntry( GetEntryList()->GetSelectedEntryPos( 0 ), false ); mbTrackingSelect = false; } else if ( mbStackMode ) @@ -2261,8 +2261,8 @@ void ImplListBox::ImplCheckScrollBars() // check of the scrolled-out region if( GetEntryList()->GetSelectEntryCount() == 1 && - GetEntryList()->GetSelectEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND ) - ShowProminentEntry( GetEntryList()->GetSelectEntryPos( 0 ) ); + GetEntryList()->GetSelectedEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND ) + ShowProminentEntry( GetEntryList()->GetSelectedEntryPos( 0 ) ); else SetTopEntry( GetTopEntry() ); // MaxTop is being checked... } @@ -2298,8 +2298,8 @@ void ImplListBox::ImplCheckScrollBars() // check of the scrolled-out region if( GetEntryList()->GetSelectEntryCount() == 1 && - GetEntryList()->GetSelectEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND ) - ShowProminentEntry( GetEntryList()->GetSelectEntryPos( 0 ) ); + GetEntryList()->GetSelectedEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND ) + ShowProminentEntry( GetEntryList()->GetSelectedEntryPos( 0 ) ); else SetTopEntry( GetTopEntry() ); // MaxTop is being checked... } @@ -3050,7 +3050,7 @@ void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking ) SetSizePixel( aFloatSz ); mpImplLB->SetSizePixel( GetOutputSizePixel() ); - sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectEntryPos( 0 ); + sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectedEntryPos( 0 ); mnPopupModeStartSaveSelection = nPos; Size aSz = GetParent()->GetSizePixel(); diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 0a9475b01c0b..1a36cc9e6879 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -185,11 +185,11 @@ IMPL_LINK_NOARG(ListBox, ImplSelectHdl, LinkParamNone*, void) mpImplWin->GrabFocus(); } - mpImplWin->SetItemPos( GetSelectEntryPos() ); + mpImplWin->SetItemPos( GetSelectedEntryPos() ); mpImplWin->SetString( GetSelectedEntry() ); if( mpImplLB->GetEntryList()->HasImages() ) { - Image aImage = mpImplLB->GetEntryList()->GetEntryImage( GetSelectEntryPos() ); + Image aImage = mpImplLB->GetEntryList()->GetEntryImage( GetSelectedEntryPos() ); mpImplWin->SetImage( aImage ); } mpImplWin->Invalidate(); @@ -1018,7 +1018,7 @@ sal_Int32 ListBox::GetEntryCount() const OUString ListBox::GetSelectedEntry(sal_Int32 nIndex) const { - return GetEntry( GetSelectEntryPos( nIndex ) ); + return GetEntry( GetSelectedEntryPos( nIndex ) ); } sal_Int32 ListBox::GetSelectEntryCount() const @@ -1028,12 +1028,12 @@ sal_Int32 ListBox::GetSelectEntryCount() const return mpImplLB->GetEntryList()->GetSelectEntryCount(); } -sal_Int32 ListBox::GetSelectEntryPos( sal_Int32 nIndex ) const +sal_Int32 ListBox::GetSelectedEntryPos( sal_Int32 nIndex ) const { if (!mpImplLB || !mpImplLB->GetEntryList()) return LISTBOX_ENTRY_NOTFOUND; - sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectEntryPos( nIndex ); + sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectedEntryPos( nIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { if ( nPos < mpImplLB->GetEntryList()->GetMRUCount() ) diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index f5d00639009c..27d6ffee522e 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -990,7 +990,7 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl, ListBox&, void) { - SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) ); + SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectedEntryPos() ) ); } IMPL_LINK( TabControl, ImplWindowEventListener, VclWindowEvent&, rEvent, void ) diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index c977b7d56391..40b1f0bb9246 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -826,7 +826,7 @@ StringMap ListBoxUIObject::get_state() aMap["MultiSelect"] = OUString::boolean(mxListBox->IsMultiSelectionEnabled()); aMap["EntryCount"] = OUString::number(mxListBox->GetEntryCount()); aMap["SelectEntryCount"] = OUString::number(mxListBox->GetSelectEntryCount()); - aMap["SelectEntryPos"] = OUString::number(mxListBox->GetSelectEntryPos()); + aMap["SelectEntryPos"] = OUString::number(mxListBox->GetSelectedEntryPos()); aMap["SelectEntryText"] = mxListBox->GetSelectedEntry(); return aMap; @@ -841,7 +841,7 @@ OUString ListBoxUIObject::get_action(VclEventId nEvent) const { if (nEvent == VclEventId::ListboxSelect) { - sal_Int32 nPos = mxListBox->GetSelectEntryPos(); + sal_Int32 nPos = mxListBox->GetSelectedEntryPos(); return "Action on element: " + mxListBox->get_id() + " with action : SELECT and content {\"POS\": \"" + OUString::number(nPos) + "\"}"; } else diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 949ebaf7745f..34c605d43117 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -790,7 +790,7 @@ void PrintDialog::storeToSettings() bool PrintDialog::isPrintToFile() { - return ( maJobPage.mpPrinters->GetSelectEntryPos() == 0 ); + return ( maJobPage.mpPrinters->GetSelectedEntryPos() == 0 ); } bool PrintDialog::isCollate() @@ -1487,9 +1487,9 @@ void PrintDialog::updateNup() aMPS.bDrawBorder = maNUpPage.mpBorderCB->IsChecked(); - aMPS.nOrder = (NupOrderType)maNUpPage.mpNupOrderBox->GetSelectEntryPos(); + aMPS.nOrder = (NupOrderType)maNUpPage.mpNupOrderBox->GetSelectedEntryPos(); - int nOrientationMode = maNUpPage.mpNupOrientationBox->GetSelectEntryPos(); + int nOrientationMode = maNUpPage.mpNupOrientationBox->GetSelectedEntryPos(); if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE ) aMPS.aPaperSize = maNupLandscapeSize; else if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT ) @@ -1519,7 +1519,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void ) if( &rBox == maJobPage.mpPrinters ) { - if ( rBox.GetSelectEntryPos() != 0) + if ( rBox.GetSelectedEntryPos() != 0) { OUString aNewPrinter( rBox.GetSelectedEntry() ); // set new printer @@ -1804,7 +1804,7 @@ IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) { makeEnabled( &i_rBox ); - sal_Int32 nVal( i_rBox.GetSelectEntryPos() ); + sal_Int32 nVal( i_rBox.GetSelectedEntryPos() ); pVal->Value <<= nVal; //If we are in impress we start in print slides mode and get a diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 4d24260e8fbd..c692e1ec8304 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -282,7 +282,7 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) } else if( &rBox == m_pOrientBox ) { - m_pParent->m_aJobData.m_eOrientation = m_pOrientBox->GetSelectEntryPos() == 0 ? orientation::Portrait : orientation::Landscape; + m_pParent->m_aJobData.m_eOrientation = m_pOrientBox->GetSelectedEntryPos() == 0 ? orientation::Portrait : orientation::Landscape; } if( pKey ) { @@ -408,7 +408,7 @@ void RTSDevicePage::dispose() sal_uLong RTSDevicePage::getDepth() { - sal_uInt16 nSelectPos = m_pDepthBox->GetSelectEntryPos(); + sal_uInt16 nSelectPos = m_pDepthBox->GetSelectedEntryPos(); if (nSelectPos == 0) return 8; else @@ -417,7 +417,7 @@ sal_uLong RTSDevicePage::getDepth() sal_uLong RTSDevicePage::getColorDevice() { - sal_uInt16 nSelectPos = m_pSpaceBox->GetSelectEntryPos(); + sal_uInt16 nSelectPos = m_pSpaceBox->GetSelectedEntryPos(); switch (nSelectPos) { case 0: diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index f7f7a29fabf2..e343d6a319e0 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -97,7 +97,7 @@ public: void update(); - sal_Int32 getOrientation() const { return m_pOrientBox->GetSelectEntryPos(); } + sal_Int32 getOrientation() const { return m_pOrientBox->GetSelectedEntryPos(); } }; class RTSDevicePage : public TabPage diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index d6ea287da761..9155fb7db3ad 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1922,7 +1922,7 @@ public: IMPL_LINK_NOARG(DemoWidgets, GLTestClick, Button*, void) { - sal_Int32 nSelected = mpGLCombo->GetSelectEntryPos(); + sal_Int32 nSelected = mpGLCombo->GetSelectedEntryPos(); TimeValue aDelay; aDelay.Seconds = 0; |