diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-22 17:36:51 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-23 08:26:14 +0100 |
commit | a82cdccb0c276ec10c35beec46fa7fa25fc95cd5 (patch) | |
tree | 73ad8a19584e75b18229f5c1c410569f2f6c8aec /sd | |
parent | c12fc293650a860d5e05c32000f904afaf0958b6 (diff) |
Typo: GetSelectItemId -> GetSelectedItemId
Change-Id: Ieebb50b73f1f341c924693f3966f8cd2b09a136b
Reviewed-on: https://gerrit.libreoffice.org/51750
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/html/pubdlg.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/controller/displaymodecontroller.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdpreslt.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 4 |
9 files changed, 23 insertions, 23 deletions
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index d28cead6f6cc..41cfa5431dea 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -887,7 +887,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) if( !pPage5_TextOnly->IsChecked() ) { aValue.Name = "UseButtonSet"; - aValue.Value <<= static_cast<sal_Int32>(pPage5_Buttons->GetSelectItemId() - 1); + aValue.Value <<= static_cast<sal_Int32>(pPage5_Buttons->GetSelectedItemId() - 1); aProps.push_back( aValue ); } @@ -1479,7 +1479,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) if(pPage5_TextOnly->IsChecked()) pDesign->m_nButtonThema = -1; else - pDesign->m_nButtonThema = pPage5_Buttons->GetSelectItemId() - 1; + pDesign->m_nButtonThema = pPage5_Buttons->GetSelectedItemId() - 1; pDesign->m_bUserAttr = pPage6_User->IsChecked(); pDesign->m_aBackColor = m_aBackColor; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 0fe9d7292996..f47e611216af 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -808,11 +808,11 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co // check first (aResult might be overwritten) if( mpVS_TRANSITION_ICONS->IsEnabled() && !mpVS_TRANSITION_ICONS->IsNoSelection() && - mpVS_TRANSITION_ICONS->GetSelectItemId() > 0 ) + mpVS_TRANSITION_ICONS->GetSelectedItemId() > 0 ) { const sd::TransitionPresetList& rPresetList = sd::TransitionPreset::getTransitionPresetList(); auto aSelected = rPresetList.begin(); - std::advance( aSelected, mpVS_TRANSITION_ICONS->GetSelectItemId() - 1); + std::advance( aSelected, mpVS_TRANSITION_ICONS->GetSelectedItemId() - 1); if( mpLB_VARIANT->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND ) { @@ -1046,7 +1046,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked, Button*, void) IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected, ValueSet *, void) { - updateVariants( mpVS_TRANSITION_ICONS->GetSelectItemId() - 1 ); + updateVariants( mpVS_TRANSITION_ICONS->GetSelectedItemId() - 1 ); applyToSelectedPages(); } diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index da3de53d4855..cfa7e70f7d29 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -208,12 +208,12 @@ void DisplayModeToolbarMenu::SelectHdl(void const * pControl) OUString sImage; if( pControl == mpDisplayModeSet1 ) { - sCommandURL = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msUnoCommand); - sImage = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msBmpResId); + sCommandURL = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectedItemId() - 1 ].msUnoCommand); + sImage = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectedItemId() - 1 ].msBmpResId); } else if( pControl == mpDisplayModeSet2 ) { - sCommandURL = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msUnoCommand); - sImage = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msBmpResId); + sCommandURL = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectedItemId() - 5 ].msUnoCommand); + sImage = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectedItemId() - 5 ].msBmpResId); } if (!sCommandURL.isEmpty()) diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 2f51e50c0f90..7e2842305781 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -284,11 +284,11 @@ void LayoutToolbarMenu::SelectHdl(void const * pControl) if( pControl == mpLayoutSet1 ) { - eLayout = static_cast< AutoLayout >(mpLayoutSet1->GetSelectItemId()-1); + eLayout = static_cast< AutoLayout >(mpLayoutSet1->GetSelectedItemId()-1); } else if( pControl == mpLayoutSet2 ) { - eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectItemId()-1); + eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectedItemId()-1); } if( eLayout != AUTOLAYOUT_END ) diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 27998d39e311..c4d16cd7037e 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -110,7 +110,7 @@ void SdPresLayoutDlg::Reset() */ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs) { - short nId = m_pVS->GetSelectItemId(); + short nId = m_pVS->GetSelectedItemId(); bool bLoad = nId > mnLayoutCount; rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad ) ); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 935f34d7be00..36dd97722232 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -219,9 +219,9 @@ AutoLayout LayoutMenu::GetSelectedAutoLayout() { AutoLayout aResult = AUTOLAYOUT_NONE; - if ( ! IsNoSelection() && GetSelectItemId()!=0) + if ( ! IsNoSelection() && GetSelectedItemId()!=0) { - AutoLayout* pLayout = static_cast<AutoLayout*>(GetItemData(GetSelectItemId())); + AutoLayout* pLayout = static_cast<AutoLayout*>(GetItemData(GetSelectedItemId())); if (pLayout != nullptr) aResult = *pLayout; } @@ -579,9 +579,9 @@ void LayoutMenu::Command (const CommandEvent& rEvent) } else { - if (GetSelectItemId() == sal_uInt16(-1)) + if (GetSelectedItemId() == sal_uInt16(-1)) return; - ::tools::Rectangle aBBox (GetItemRect(GetSelectItemId())); + ::tools::Rectangle aBBox (GetItemRect(GetSelectedItemId())); aMenuPosition = aBBox.Center(); } @@ -675,7 +675,7 @@ void LayoutMenu::UpdateSelection() if (*static_cast<AutoLayout*>(GetItemData(nId)) == aLayout) { // do not set selection twice to the same item - if (GetSelectItemId() != nId) + if (GetSelectedItemId() != nId) { SetNoSelection(); SelectItem(nId); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 53d13a1112e9..8fa6a644069b 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -205,7 +205,7 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent) { // Use the currently selected item and show the popup menu in its // center. - const sal_uInt16 nIndex = PreviewValueSet::GetSelectItemId(); + const sal_uInt16 nIndex = PreviewValueSet::GetSelectedItemId(); if (nIndex > 0) { // The position of the upper left corner of the context menu is @@ -305,7 +305,7 @@ void MasterPagesSelector::ExecuteCommand(const OString &rIdent) SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher(); if (pDispatcher != nullptr) { - sal_uInt16 nIndex = PreviewValueSet::GetSelectItemId(); + sal_uInt16 nIndex = PreviewValueSet::GetSelectedItemId(); pDispatcher->Execute(SID_MASTERPAGE, SfxCallMode::SYNCHRON); PreviewValueSet::SelectItem (nIndex); mrBase.GetDrawController().setCurrentPage(xSelectedMaster); @@ -324,7 +324,7 @@ SdPage* MasterPagesSelector::GetSelectedMasterPage() const ::osl::MutexGuard aGuard (maMutex); SdPage* pMasterPage = nullptr; - sal_uInt16 nIndex = PreviewValueSet::GetSelectItemId(); + sal_uInt16 nIndex = PreviewValueSet::GetSelectedItemId(); UserData* pData = GetUserData(nIndex); if (pData != nullptr) { diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index e06efb6994a7..0cfbdb0ce0af 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -129,7 +129,7 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList ( SdPage* pMasterPage, const std::shared_ptr<std::vector<SdPage*> >& rpPageList) { - sal_uInt16 nSelectedItemId = PreviewValueSet::GetSelectItemId(); + sal_uInt16 nSelectedItemId = PreviewValueSet::GetSelectedItemId(); MasterPagesSelector::AssignMasterPageToPageList(pMasterPage, rpPageList); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index c686ebab5305..2d4d751b6afb 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -168,7 +168,7 @@ void TableDesignWidget::ApplyStyle() try { OUString sStyleName; - sal_Int32 nIndex = static_cast< sal_Int32 >( m_pValueSet->GetSelectItemId() ) - 1; + sal_Int32 nIndex = static_cast< sal_Int32 >( m_pValueSet->GetSelectedItemId() ) - 1; if( (nIndex >= 0) && (nIndex < mxTableFamily->getCount()) ) { @@ -715,7 +715,7 @@ const BitmapEx CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle void TableDesignWidget::FillDesignPreviewControl() { - sal_uInt16 nSelectedItem = m_pValueSet->GetSelectItemId(); + sal_uInt16 nSelectedItem = m_pValueSet->GetSelectedItemId(); m_pValueSet->Clear(); try { |