summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-14 17:09:01 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-25 10:54:53 +0200
commitb9a8ac48d7a57f5dcb8dfa9c0400fb9e977c4bf8 (patch)
tree98cabff542158e60984653acbb7514b68f466799 /cui
parent83de03e077d219c881626de43960ae4756284371 (diff)
Rename GetSelectEntryData -> GetSelectedEntryData
Change-Id: Ia6402f6d2c978cbd5557052a43e9728ca9e11173 Reviewed-on: https://gerrit.libreoffice.org/42285 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/CommandCategoryListBox.cxx2
-rw-r--r--cui/source/dialogs/pastedlg.cxx2
-rw-r--r--cui/source/options/optgdlg.cxx4
-rw-r--r--cui/source/options/optsave.cxx6
-rw-r--r--cui/source/tabpages/backgrnd.cxx2
-rw-r--r--cui/source/tabpages/numpages.cxx2
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx4
7 files changed, 11 insertions, 11 deletions
diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index c41fcc45b362..d3c714c0db63 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -198,7 +198,7 @@ OUString CommandCategoryListBox::MapCommand2UIName(const OUString& sCommand)
void CommandCategoryListBox::categorySelected( const VclPtr<SfxConfigFunctionListBox>& pFunctionListBox,
const OUString& filterTerm )
{
- SfxGroupInfo_Impl *pInfo = static_cast<SfxGroupInfo_Impl*>(GetSelectEntryData());
+ SfxGroupInfo_Impl *pInfo = static_cast<SfxGroupInfo_Impl*>(GetSelectedEntryData());
pFunctionListBox->SetUpdateMode(false);
pFunctionListBox->ClearAll();
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 3a312da170ee..721cf06e1821 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -198,7 +198,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe
if( Dialog::Execute() == RET_OK )
{
- nSelFormat = static_cast<SotClipboardFormatId>(reinterpret_cast<sal_uLong>(ObjectLB().GetSelectEntryData()));
+ nSelFormat = static_cast<SotClipboardFormatId>(reinterpret_cast<sal_uLong>(ObjectLB().GetSelectedEntryData()));
}
return nSelFormat;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index bf89e846c98c..b27de607befe 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1329,7 +1329,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
// handle settings for UI Language
// a change of setting needs to bring up a warning message
OUString aLangString;
- sal_Int32 d = (sal_Int32)reinterpret_cast<sal_IntPtr>(m_pUserInterfaceLB->GetSelectEntryData());
+ sal_Int32 d = (sal_Int32)reinterpret_cast<sal_IntPtr>(m_pUserInterfaceLB->GetSelectedEntryData());
if( d > 0 && seqInstalledLanguages.getLength() > d-1)
aLangString = seqInstalledLanguages[d-1];
@@ -1408,7 +1408,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
// Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default.
OUString sOldCurr = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
- const NfCurrencyEntry* pCurr = static_cast<const NfCurrencyEntry*>(m_pCurrencyLB->GetSelectEntryData());
+ const NfCurrencyEntry* pCurr = static_cast<const NfCurrencyEntry*>(m_pCurrencyLB->GetSelectedEntryData());
OUString sNewCurr;
if ( pCurr )
sNewCurr = SvtSysLocaleOptions::CreateCurrencyConfigString(
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 048ac415d8d6..276aa8d4ad78 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -260,7 +260,7 @@ bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet )
if ( aODFVersionLB->IsValueChangedFromSaved() )
{
- sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectEntryData() );
+ sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectedEntryData() );
aSaveOpt.SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion( nVersion ) );
}
@@ -631,7 +631,7 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void )
IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void)
{
- sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectEntryData() );
+ sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectedEntryData() );
bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST;
if ( bShown )
{
@@ -647,7 +647,7 @@ IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void)
}
bShown = !bHasODFFormat
- || ( aSaveAsLB->GetSelectEntryData() != nullptr );
+ || ( aSaveAsLB->GetSelectedEntryData() != nullptr );
}
aODFWarningFI->Show( bShown );
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 39e0e8413393..6d483aecb0f1 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -101,7 +101,7 @@ struct SvxBackgroundPage_Impl
/// Returns the fill style of the currently selected entry.
static drawing::FillStyle lcl_getFillStyle(ListBox const * pLbSelect)
{
- return (drawing::FillStyle)reinterpret_cast<sal_uLong>(pLbSelect->GetSelectEntryData());
+ return (drawing::FillStyle)reinterpret_cast<sal_uLong>(pLbSelect->GetSelectedEntryData());
}
// Selects the entry matching the specified fill style.
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 89a4c14b63f4..fd4a5368e4b9 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1781,7 +1781,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
// PAGEDESC does not exist
- SvxNumType nNumType = (SvxNumType)reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData());
+ SvxNumType nNumType = (SvxNumType)reinterpret_cast<sal_uLong>(rBox.GetSelectedEntryData());
aNumFmt.SetNumberingType(nNumType);
sal_uInt16 nNumberingType = aNumFmt.GetNumberingType();
if(SVX_NUM_BITMAP == (nNumberingType&(~LINK_TOKEN)))
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 9900c356ad8a..f12851c2d1da 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1304,7 +1304,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
{
if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
- nRel = static_cast<RelationMap *>(pRelLB->GetSelectEntryData())->nRelation;
+ nRel = static_cast<RelationMap *>(pRelLB->GetSelectedEntryData())->nRelation;
FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT);
}
@@ -1421,7 +1421,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo
{
if (rRelationLB.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
{
- LB nRel = static_cast<RelationMap *>(rRelationLB.GetSelectEntryData())->nLBRelation;
+ LB nRel = static_cast<RelationMap *>(rRelationLB.GetSelectedEntryData())->nLBRelation;
std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap);
SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId;