summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-14 16:50:25 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-21 12:44:00 +0200
commitb649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (patch)
treebd6937a0ece320c9545774dd5c9a68c68d04769e /sd/source
parent06ce312f79cb0871c0b110ba4bff16f5aaa0f538 (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 'sd/source')
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx2
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/dlg/copydlg.cxx4
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx4
-rw-r--r--sd/source/ui/dlg/present.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx10
-rw-r--r--sd/source/ui/dlg/tpaction.cxx4
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx2
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx2
10 files changed, 17 insertions, 17 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 89dae96b6ce9..29ba1d004a84 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -574,7 +574,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void)
const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos();
if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
{
- OUString sActEntry( pImagesLst->GetSelectEntry() );
+ OUString sActEntry( pImagesLst->GetSelectedEntry() );
OUString* pActData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
OUString sAct(*pActData);
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index d047d6a39f02..eaf00a4d3551 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -984,7 +984,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
sal_Int32 nPos = m_pLbLoopCount->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbLoopCount->GetEntryCount() - 1 ) // endless
- nLoopCount = m_pLbLoopCount->GetSelectEntry().toUInt32();
+ nLoopCount = m_pLbLoopCount->GetSelectedEntry().toUInt32();
aAnimBmp.aBmpEx = *pBitmapEx;
aAnimBmp.aPosPix = aPt;
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index d957d1706aa8..440fc909a8bd 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -239,9 +239,9 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) );
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) );
- NamedColor aColor = m_pLbStartColor->GetSelectEntry();
+ NamedColor aColor = m_pLbStartColor->GetSelectedEntry();
rOutAttrs.Put(XColorItem(ATTR_COPY_START_COLOR, aColor.second, aColor.first));
- aColor = m_pLbEndColor->GetSelectEntry();
+ aColor = m_pLbEndColor->GetSelectedEntry();
rOutAttrs.Put(XColorItem(ATTR_COPY_END_COLOR, aColor.second, aColor.first));
}
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 9659b87a0434..69cfb59a782b 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -413,7 +413,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void const * p)
for( sal_Int32 i = 0; i < nCount; i++ )
{
- OUString aStr = m_pLbPages->GetSelectEntry( i );
+ OUString aStr = m_pLbPages->GetSelectedEntry( i );
pEntry = m_pLbCustomPages->InsertEntry( aStr,
nullptr, false, nPosCP );
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index b77e744daf36..e3f405695030 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -315,7 +315,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
// if it is the active window, we jump to the page
if( pInfo && pInfo->IsActive() )
{
- OUString aStr( maTlbObjects->GetSelectEntry() );
+ OUString aStr( maTlbObjects->GetSelectedEntry() );
if( !aStr.isEmpty() )
{
@@ -345,7 +345,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, ListBox&, void)
{
- OUString aStrLb = maLbDocs->GetSelectEntry();
+ OUString aStrLb = maLbDocs->GetSelectedEntry();
long nPos = maLbDocs->GetSelectEntryPos();
bool bFound = false;
::sd::DrawDocShell* pDocShell = nullptr;
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index c4788163f413..d6087bfacdf6 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -294,7 +294,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
{
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll->IsChecked() ) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CUSTOMSHOW, aRbtCustomshow->IsChecked() ) );
- rAttr.Put( SfxStringItem ( ATTR_PRESENT_DIANAME, aLbDias->GetSelectEntry() ) );
+ rAttr.Put( SfxStringItem ( ATTR_PRESENT_DIANAME, aLbDias->GetSelectedEntry() ) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MANUEL, aCbxManuel->IsChecked() ) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MOUSE, aCbxMousepointer->IsChecked() ) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_PEN, aCbxPen->IsChecked() ) );
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index db86c1409ed7..c573ffdbf0f8 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -324,7 +324,7 @@ void SdPageObjsTLB::Clear()
maSelectionEntryText.clear();
maTreeItem.clear();
if (GetCurEntry())
- maSelectionEntryText = GetSelectEntry();
+ maSelectionEntryText = GetSelectedEntry();
SvTreeListEntry* pEntry = FirstChild(nullptr);
SaveExpandedTreeItemState(pEntry, maTreeItem);
}
@@ -420,7 +420,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, bool bAllPages,
OUString aSelection;
if( GetSelectionCount() > 0 )
{
- aSelection = GetSelectEntry();
+ aSelection = GetSelectedEntry();
Clear();
}
@@ -697,7 +697,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
/**
* @return selected string
*/
-OUString SdPageObjsTLB::GetSelectEntry()
+OUString SdPageObjsTLB::GetSelectedEntry()
{
return GetEntryText( GetCurEntry() );
}
@@ -1006,9 +1006,9 @@ void SdPageObjsTLB::DoDrag()
OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::File ).GetMainURL( INetURLObject::DecodeMechanism::NONE );
NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType();
- aURL += "#" + GetSelectEntry();
+ aURL += "#" + GetSelectedEntry();
- INetBookmark aBookmark( aURL, GetSelectEntry() );
+ INetBookmark aBookmark( aURL, GetSelectedEntry() );
sal_Int8 nDNDActions = DND_ACTION_COPYMOVE;
if( eDragType == NAVIGATOR_DRAGTYPE_LINK )
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 9f6b8f24bc3e..55afea747209 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -643,7 +643,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
{
- m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() );
+ m_pEdtBookmark->SetText( m_pLbTree->GetSelectedEntry() );
}
IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void)
@@ -835,7 +835,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination )
m_pLbTreeDocument->Control::IsVisible() &&
m_pLbTreeDocument->GetSelectionCount() > 0 )
{
- OUString aTmpStr( m_pLbTreeDocument->GetSelectEntry() );
+ OUString aTmpStr( m_pLbTreeDocument->GetSelectedEntry() );
if( !aTmpStr.isEmpty() )
{
aStr += OUStringLiteral1(DOCUMENT_TOKEN) + aTmpStr;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index db218e950787..245b94a37b3e 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -206,7 +206,7 @@ public:
bool IsEqualToDoc( const SdDrawDocument* pInDoc );
bool HasSelectedChildren( const OUString& rName );
bool SelectEntry( const OUString& rName );
- OUString GetSelectEntry();
+ OUString GetSelectedEntry();
//Mark Current Entry
void SetSdNavigatorWinFlag(bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;};
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 447386de9e27..8a521fcb0577 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -1032,7 +1032,7 @@ IMPL_LINK_NOARG(SlideBackground, AssignMasterPage, ListBox&, void)
break;
}
}
- OUString aLayoutName(mpMasterSlide->GetSelectEntry());
+ OUString aLayoutName(mpMasterSlide->GetSelectedEntry());
pDoc->SetMasterPage(nSelectedPage, aLayoutName, pDoc, false, false);
}