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 /sfx2 | |
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 'sfx2')
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 20 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.hxx | 14 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/dialog/printopt.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/new.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/saveastemplatedlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/classificationcontroller.cxx | 2 |
9 files changed, 33 insertions, 33 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 01a5f47d6450..8bd88551c1e1 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -400,7 +400,7 @@ bool ContentListBox_Impl::EventNotify( NotifyEvent& rNEvt ) } -OUString ContentListBox_Impl::GetSelectEntry() const +OUString ContentListBox_Impl::GetSelectedEntry() const { OUString aRet; SvTreeListEntry* pEntry = FirstSelected(); @@ -776,7 +776,7 @@ void IndexTabPage_Impl::SetFactory( const OUString& rFactory ) } -OUString IndexTabPage_Impl::GetSelectEntry() const +OUString IndexTabPage_Impl::GetSelectedEntry() const { OUString aRet; IndexEntry_Impl* pEntry = static_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData( m_pIndexCB->GetEntryPos( m_pIndexCB->GetText() ) )); @@ -1080,7 +1080,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink ) } -OUString SearchTabPage_Impl::GetSelectEntry() const +OUString SearchTabPage_Impl::GetSelectedEntry() const { OUString aRet; OUString* pData = static_cast<OUString*>(m_pResultsLB->GetSelectEntryData()); @@ -1326,7 +1326,7 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink m_pBookmarksBox->SetDoubleClickHdl(rLink); } -OUString BookmarksTabPage_Impl::GetSelectEntry() const +OUString BookmarksTabPage_Impl::GetSelectedEntry() const { OUString aRet; OUString* pData = static_cast<OUString*>(m_pBookmarksBox->GetSelectEntryData()); @@ -1714,7 +1714,7 @@ void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive } } -OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const +OUString SfxHelpIndexWindow_Impl::GetSelectedEntry() const { OUString sRet; @@ -1722,19 +1722,19 @@ OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const if (sName == "contents") { - sRet = pCPage->GetSelectEntry(); + sRet = pCPage->GetSelectedEntry(); } else if (sName == "index") { - sRet = pIPage->GetSelectEntry(); + sRet = pIPage->GetSelectedEntry(); } else if (sName == "find") { - sRet = pSPage->GetSelectEntry(); + sRet = pSPage->GetSelectedEntry(); } else if (sName == "bookmarks") { - sRet = pBPage->GetSelectEntry(); + sRet = pBPage->GetSelectedEntry(); } return sRet; @@ -2804,7 +2804,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, Control*, bool) { pIndexWin->SelectExecutableEntry(); - OUString aEntry = pIndexWin->GetSelectEntry(); + OUString aEntry = pIndexWin->GetSelectedEntry(); if ( aEntry.isEmpty() ) return false; diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index c2d752e9c86f..3dea56bda052 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -69,7 +69,7 @@ public: virtual bool EventNotify( NotifyEvent& rNEvt ) override; void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); } - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; }; // class HelpTabPage_Impl ------------------------------------------------ @@ -106,7 +106,7 @@ public: virtual Control* GetLastFocusControl() override; void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); } - OUString GetSelectEntry() const { return m_pContentBox->GetSelectEntry(); } + OUString GetSelectedEntry() const { return m_pContentBox->GetSelectedEntry(); } void SetFocusOnBox() { m_pContentBox->GrabFocus(); } }; @@ -156,7 +156,7 @@ public: void SetDoubleClickHdl( const Link<ComboBox&,void>& rLink ); void SetFactory( const OUString& rFactory ); const OUString& GetFactory() const { return sFactory; } - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; void SetFocusOnBox() { m_pIndexCB->GrabFocus(); } bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); } @@ -233,7 +233,7 @@ public: void SetDoubleClickHdl( const Link<ListBox&,void>& rLink ); void SetFactory( const OUString& rFactory ) { aFactory = rFactory; } - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; void ClearPage(); void SetFocusOnBox() { m_pResultsLB->GrabFocus(); } bool HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); } @@ -274,7 +274,7 @@ public: virtual Control* GetLastFocusControl() override; void SetDoubleClickHdl( const Link<ListBox&,void>& rLink ); - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; void AddBookmarks( const OUString& rTitle, const OUString& rURL ); void SetFocusOnBox() { m_pBookmarksBox->GrabFocus(); } }; @@ -338,10 +338,10 @@ public: void SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; } void SetFactory( const OUString& rFactory, bool bActive ); OUString GetFactory() const { return pIPage->GetFactory(); } - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; void AddBookmarks( const OUString& rTitle, const OUString& rURL ); bool IsValidFactory( const OUString& _rFactory ); - OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectEntry(); } + OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectedEntry(); } void ClearSearchPage(); void GrabFocusBack(); bool HasFocusOnEdit() const; diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 11f7c9e0de15..66bb328dda24 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -289,7 +289,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, if ( pBox->IsEnabled() ) { // it is the current entry, which name was modified - const bool bSelect = pBox->GetSelectEntry() == aBuf; + const bool bSelect = pBox->GetSelectedEntry() == aBuf; pBox->RemoveEntry( aBuf ); pBox->InsertEntry( rNew ); @@ -337,7 +337,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, void ) { - OUString aTemplName(m_pFollowLb->GetSelectEntry()); + OUString aTemplName(m_pFollowLb->GetSelectedEntry()); OUString aEditTemplName(m_pNameRo->GetText()); if (!( aTemplName == aEditTemplName)) m_pEditStyleBtn->Enable(); @@ -347,7 +347,7 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, voi IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void ) { - OUString aTemplName(m_pFollowLb->GetSelectEntry()); + OUString aTemplName(m_pFollowLb->GetSelectedEntry()); if (Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() )) { } @@ -364,7 +364,7 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&, IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void ) { - OUString aTemplName(m_pBaseLb->GetSelectEntry()); + OUString aTemplName(m_pBaseLb->GetSelectedEntry()); if (aTemplName != SfxResId(STR_NONE)) Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() ); } @@ -619,7 +619,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) if ( pStyle->HasFollowSupport() && m_pFollowLb->IsEnabled() ) { - const OUString aFollowEntry( m_pFollowLb->GetSelectEntry() ); + const OUString aFollowEntry( m_pFollowLb->GetSelectedEntry() ); if ( pStyle->GetFollow() != aFollowEntry ) { @@ -636,7 +636,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) if ( m_pBaseLb->IsEnabled() ) { - OUString aParentEntry( m_pBaseLb->GetSelectEntry() ); + OUString aParentEntry( m_pBaseLb->GetSelectedEntry() ); if ( SfxResId(STR_NONE) == aParentEntry || aParentEntry == pStyle->GetName() ) aParentEntry.clear(); diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index a9fa42dad284..00270770863b 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -238,7 +238,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu } } - m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetSelectEntry() ); + m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetSelectedEntry() ); m_pReduceBitmapsTransparencyCB->Check( pCurrentOptions->IsReducedBitmapIncludesTransparency() ); m_pConvertToGreyscalesCB->Check( pCurrentOptions->IsConvertToGreyscales() ); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 19eda7892422..08166ceb8302 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1629,7 +1629,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void ) { - if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL) == rBox.GetSelectEntry()) + if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL) == rBox.GetSelectedEntry()) { EnableHierarchical(true); } diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 8ffb28820072..790a474509ce 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -242,7 +242,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) const sal_uInt16 nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0; m_pTemplateLb->SetUpdateMode(false); m_pTemplateLb->Clear(); - OUString aSel = m_pRegionLb->GetSelectEntry(); + OUString aSel = m_pRegionLb->GetSelectedEntry(); sal_Int32 nc = aSel.indexOf('('); if (nc != -1 && nc != 0) aSel = aSel.replaceAt(nc-1, 1, ""); @@ -290,7 +290,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile, Button*, void) sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const { sal_uInt16 nEntry = m_pTemplateLb->GetSelectEntryPos(); - OUString aSel = m_pRegionLb->GetSelectEntry(); + OUString aSel = m_pRegionLb->GetSelectedEntry(); sal_Int32 nc = aSel.indexOf('('); if (nc != -1 && nc != 0) aSel = aSel.replaceAt(nc-1, 1, ""); diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index 74883875e7a8..03d1ad6bc5b7 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -113,7 +113,7 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void) } else { - msSelectedCategory = mpLBCategory->GetSelectEntry(); + msSelectedCategory = mpLBCategory->GetSelectedEntry(); mpOKButton->Enable(!msTemplateName.isEmpty()); } } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index fbaaa1b70aa0..a65f11446ad6 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectApplicationHdl, ListBox&, void) IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) { - const OUString sSelectedRegion = mpCBFolder->GetSelectEntry(); + const OUString sSelectedRegion = mpCBFolder->GetSelectedEntry(); if(mpCBFolder->GetSelectEntryPos() == 0) { @@ -823,7 +823,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) mpLocalView->Show(); mpLocalView->filterItems(ViewFilter_Application(getCurrentApplicationFilter())); mpLocalView->reload(); - OUString sLastFolder = mpCBFolder->GetSelectEntry(); + OUString sLastFolder = mpCBFolder->GetSelectedEntry(); mpLocalView->showRegion(sLastFolder); mpActionMenu->ShowItem(MNI_ACTION_RENAME_FOLDER); } @@ -1124,7 +1124,7 @@ void SfxTemplateManagerDlg::OnCategoryNew() void SfxTemplateManagerDlg::OnCategoryRename() { - OUString sCategory = mpCBFolder->GetSelectEntry(); + OUString sCategory = mpCBFolder->GetSelectedEntry(); ScopedVclPtrInstance< InputDialog > dlg(SfxResId(STR_INPUT_NEW),this); dlg->SetEntryText(sCategory); @@ -1363,7 +1363,7 @@ IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, ListBox&, void) } else { - msSelectedCategory = mpLBCategory->GetSelectEntry(); + msSelectedCategory = mpLBCategory->GetSelectedEntry(); mpNewCategoryEdit->Disable(); mpOKButton->Enable(); } diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 93cbee5e8193..328466f908cc 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -179,7 +179,7 @@ uno::Reference<awt::XWindow> ClassificationCategoriesController::createItemWindo IMPL_STATIC_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, void) { - OUString aEntry = rCategory.GetSelectEntry(); + OUString aEntry = rCategory.GetSelectedEntry(); OUString aType = getCategoryType(); uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence({ |