summaryrefslogtreecommitdiff
path: root/sc
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 /sc
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 'sc')
-rw-r--r--sc/inc/scabstdlg.hxx4
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx8
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx4
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx10
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx4
-rw-r--r--sc/source/ui/dbgui/dapidata.cxx4
-rw-r--r--sc/source/ui/dbgui/dapitype.cxx2
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx10
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx2
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx8
-rw-r--r--sc/source/ui/inc/lbseldlg.hxx2
-rw-r--r--sc/source/ui/inc/navipi.hxx2
-rw-r--r--sc/source/ui/inc/shtabdlg.hxx2
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx8
-rw-r--r--sc/source/ui/miscdlgs/dataproviderdlg.cxx8
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/lbseldlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/linkarea.cxx2
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx4
-rw-r--r--sc/source/ui/miscdlgs/shtabdlg.cxx4
-rw-r--r--sc/source/ui/namedlg/namedefdlg.cxx4
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx4
-rw-r--r--sc/source/ui/navipi/navipi.cxx2
-rw-r--r--sc/source/ui/navipi/scenwnd.cxx8
-rw-r--r--sc/source/ui/optdlg/tpview.cxx2
-rw-r--r--sc/source/ui/view/cellsh2.cxx2
-rw-r--r--sc/source/ui/view/tabvwshf.cxx2
27 files changed, 60 insertions, 60 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index ccc684c69350..d5495c2234aa 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -220,7 +220,7 @@ class AbstractScSelEntryDlg : public VclAbstractDialog
protected:
virtual ~AbstractScSelEntryDlg() override = default;
public:
- virtual OUString GetSelectEntry() const = 0;
+ virtual OUString GetSelectedEntry() const = 0;
};
class AbstractScLinkedAreaDlg : public VclAbstractDialog
@@ -348,7 +348,7 @@ public:
virtual void Insert( const OUString& rString, bool bSelected ) = 0;
virtual sal_Int32 GetSelectEntryCount() const = 0;
virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0;
- virtual OUString GetSelectEntry(sal_Int32 nPos) const = 0;
+ virtual OUString GetSelectedEntry(sal_Int32 nPos) const = 0;
virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const = 0;
};
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index cca9632150f9..a96d31a233b3 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -389,9 +389,9 @@ const OUString* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN )
return pDlg->GetNextTable( pN );
}
-OUString AbstractScSelEntryDlg_Impl::GetSelectEntry() const
+OUString AbstractScSelEntryDlg_Impl::GetSelectedEntry() const
{
- return pDlg->GetSelectEntry();
+ return pDlg->GetSelectedEntry();
}
void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const OUString& rFile, const OUString& rFilter,
@@ -575,9 +575,9 @@ sal_Int32 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_Int32 nPos) const
return pDlg->GetSelectEntryPos( nPos);
}
-OUString AbstractScShowTabDlg_Impl::GetSelectEntry(sal_Int32 nPos) const
+OUString AbstractScShowTabDlg_Impl::GetSelectedEntry(sal_Int32 nPos) const
{
- return pDlg->GetSelectEntry(nPos);
+ return pDlg->GetSelectedEntry(nPos);
}
OUString AbstractScStringInputDlg_Impl::GetInputString() const
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index b22b68b2cd57..ee9d80af5842 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -230,7 +230,7 @@ class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg
class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg
{
DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg )
- virtual OUString GetSelectEntry() const override;
+ virtual OUString GetSelectedEntry() const override;
};
class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg
@@ -336,7 +336,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg
virtual void Insert( const OUString& rString, bool bSelected ) override;
virtual sal_Int32 GetSelectEntryCount() const override;
virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) override;
- virtual OUString GetSelectEntry(sal_Int32 nPos) const override;
+ virtual OUString GetSelectedEntry(sal_Int32 nPos) const override;
virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const override;
};
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 1e4e27272119..53b5da126957 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -296,7 +296,7 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const
}
}
- ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle->GetSelectEntry());
+ ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle->GetSelectedEntry());
return pEntry;
}
@@ -453,7 +453,7 @@ namespace {
void UpdateStyleList(ListBox& rLbStyle, const ScDocument* pDoc)
{
- OUString aSelectedStyle = rLbStyle.GetSelectEntry();
+ OUString aSelectedStyle = rLbStyle.GetSelectedEntry();
for(sal_Int32 i = rLbStyle.GetEntryCount(); i >= 1; --i)
{
rLbStyle.RemoveEntry(i);
@@ -528,7 +528,7 @@ void StyleSelect( ListBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow&
}
}
- OUString aStyleName = rLbStyle.GetSelectEntry();
+ OUString aStyleName = rLbStyle.GetSelectedEntry();
SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SfxStyleFamily::Para );
if(pStyleSheet)
{
@@ -607,7 +607,7 @@ ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const
if(aFormula.isEmpty())
return nullptr;
- ScFormatEntry* pEntry = new ScCondFormatEntry(SC_COND_DIRECT, aFormula, OUString(), mpDoc, maPos, maLbStyle->GetSelectEntry());
+ ScFormatEntry* pEntry = new ScCondFormatEntry(SC_COND_DIRECT, aFormula, OUString(), mpDoc, maPos, maLbStyle->GetSelectedEntry());
return pEntry;
}
@@ -1302,7 +1302,7 @@ ScFormatEntry* ScDateFrmtEntry::GetEntry() const
ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc);
condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(maLbDateEntry->GetSelectEntryPos());
pNewEntry->SetDateType(eType);
- pNewEntry->SetStyleName(maLbStyle->GetSelectEntry());
+ pNewEntry->SetStyleName(maLbStyle->GetSelectedEntry());
return pNewEntry;
}
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index c98ed9dc5f3c..e2bcac817219 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -425,7 +425,7 @@ void ScPivotLayoutDialog::UpdateSourceRange()
if (mpSourceRadioNamedRange->IsChecked())
{
- OUString aEntryString = mpSourceListBox->GetSelectEntry();
+ OUString aEntryString = mpSourceListBox->GetSelectedEntry();
ScRange aSourceRange = lclGetRangeForNamedRange(aEntryString, mpDocument);
if (!aSourceRange.IsValid() || aSourceSheet.GetSourceRange() == aSourceRange)
return;
@@ -610,7 +610,7 @@ bool ScPivotLayoutDialog::GetDestination(ScRange& aDestinationRange, bool& bToNe
if (mpDestinationRadioNamedRange->IsChecked())
{
- OUString aName = mpDestinationListBox->GetSelectEntry();
+ OUString aName = mpDestinationListBox->GetSelectedEntry();
aDestinationRange = lclGetRangeForNamedRange(aName, mpDocument);
if (!aDestinationRange.IsValid())
return false;
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 2fc447c3e314..c981c14817e1 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -99,7 +99,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc )
{
const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos();
- rDesc.aDBName = m_pLbDatabase->GetSelectEntry();
+ rDesc.aDBName = m_pLbDatabase->GetSelectedEntry();
rDesc.aObject = m_pCbObject->GetText();
if (rDesc.aDBName.isEmpty() || rDesc.aObject.isEmpty())
@@ -123,7 +123,7 @@ void ScDataPilotDatabaseDlg::FillObjects()
{
m_pCbObject->Clear();
- OUString aDatabaseName = m_pLbDatabase->GetSelectEntry();
+ OUString aDatabaseName = m_pLbDatabase->GetSelectedEntry();
if (aDatabaseName.isEmpty())
return;
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index a78442b32259..81320c4c1da1 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -138,7 +138,7 @@ void ScDataPilotServiceDlg::dispose()
OUString ScDataPilotServiceDlg::GetServiceName() const
{
- return m_pLbService->GetSelectEntry();
+ return m_pLbService->GetSelectedEntry();
}
OUString ScDataPilotServiceDlg::GetParSource() const
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index ad86c0eaef7c..74e5f947e9c8 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -237,7 +237,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const
DataPilotFieldReference aRef;
aRef.ReferenceType = mxLbTypeWrp->GetControlValue();
- aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectEntry());
+ aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectedEntry());
sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectEntryPos();
switch( nBaseItemPos )
@@ -252,7 +252,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const
{
aRef.ReferenceItemType = DataPilotFieldReferenceItemType::NAMED;
if( !mbEmptyItem || (nBaseItemPos > SC_BASEITEM_USER_POS) )
- aRef.ReferenceItemName = GetBaseItemName(mpLbBaseItem->GetSelectEntry());
+ aRef.ReferenceItemName = GetBaseItemName(mpLbBaseItem->GetSelectedEntry());
}
}
@@ -610,7 +610,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
else
rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::DATA;
- ScDPName aFieldName = GetFieldName(m_pLbSortBy->GetSelectEntry());
+ ScDPName aFieldName = GetFieldName(m_pLbSortBy->GetSelectedEntry());
if (!aFieldName.maName.isEmpty())
{
rLabelData.maSortInfo.Field =
@@ -626,7 +626,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
// *** AUTO SHOW ***
- aFieldName = GetFieldName(m_pLbShowUsing->GetSelectEntry());
+ aFieldName = GetFieldName(m_pLbShowUsing->GetSelectedEntry());
if (!aFieldName.maName.isEmpty())
{
rLabelData.maShowInfo.IsEnabled = m_pCbShow->IsChecked();
@@ -870,7 +870,7 @@ OUString ScDPShowDetailDlg::GetDimensionName() const
{
// Look up the internal dimension name which may be different from the
// displayed field name.
- OUString aSelectedName = mpLbDims->GetSelectEntry();
+ OUString aSelectedName = mpLbDims->GetSelectedEntry();
DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName);
if (itr == maNameIndexMap.end())
// This should never happen!
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 9ae6c8ecae24..38c967f01610 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -441,7 +441,7 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem )
IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void )
{
- OUString aSelEntry = rLb.GetSelectEntry();
+ OUString aSelEntry = rLb.GetSelectedEntry();
ScSortKeyItems::iterator pIter;
// If last listbox is enabled add one item
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 973dcd8f7d0c..5df386873520 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -186,7 +186,7 @@ void ScFunctionWin::SetDescription()
{
pDesc->initArgumentInfo(); // full argument info is needed
- OUStringBuffer aBuf(aFuncList->GetSelectEntry());
+ OUStringBuffer aBuf(aFuncList->GetSelectedEntry());
aBuf.append(":\n\n");
aBuf.append(pDesc->GetParamList());
aBuf.append("\n\n");
@@ -279,7 +279,7 @@ void ScFunctionWin::DoEnter()
{
OUString aFirstArgStr;
OUString aArgStr;
- OUString aString=aFuncList->GetSelectEntry();
+ OUString aString=aFuncList->GetSelectedEntry();
SfxViewShell* pCurSh = SfxViewShell::Current();
nArgs=0;
@@ -296,7 +296,7 @@ void ScFunctionWin::DoEnter()
if (OutputDevice::isDisposed())
return;
aString = "=";
- aString += aFuncList->GetSelectEntry();
+ aString += aFuncList->GetSelectedEntry();
if (pHdl)
pHdl->ClearText();
}
@@ -342,7 +342,7 @@ void ScFunctionWin::DoEnter()
if (pHdl->GetEditString().isEmpty())
{
aString = "=";
- aString += aFuncList->GetSelectEntry();
+ aString += aFuncList->GetSelectedEntry();
}
EditView *pEdView=pHdl->GetActiveView();
if(pEdView!=nullptr) // @ needed because of crash during setting a name
diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx
index a67e2972a5b8..0b45c70e8fa1 100644
--- a/sc/source/ui/inc/lbseldlg.hxx
+++ b/sc/source/ui/inc/lbseldlg.hxx
@@ -39,7 +39,7 @@ public:
virtual ~ScSelEntryDlg() override;
virtual void dispose() override;
- OUString GetSelectEntry() const;
+ OUString GetSelectedEntry() const;
};
#endif // INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 7e9ed521f2d2..0afc636c9072 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -74,7 +74,7 @@ private:
typedef ::std::vector< ScenarioEntry > ScenarioList;
private:
- const ScenarioEntry* GetSelectedEntry() const;
+ const ScenarioEntry* GetSelectedScenarioEntry() const;
void ExecuteScenarioSlot( sal_uInt16 nSlotId );
void SelectScenario();
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index 60823c4c4537..6230b9d14176 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -47,7 +47,7 @@ public:
void Insert( const OUString& rString, bool bSelected );
sal_Int32 GetSelectEntryCount() const;
- OUString GetSelectEntry(sal_Int32 nPos) const;
+ OUString GetSelectedEntry(sal_Int32 nPos) const;
sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const;
};
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index f2779fc15ea5..94a3a2b0eb0c 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -574,7 +574,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void)
{
- OUString aRangeStr = pLbRange->GetSelectEntry();
+ OUString aRangeStr = pLbRange->GetSelectedEntry();
sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos();
bool bColName =
(reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol);
@@ -642,7 +642,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void)
++nMoves;
pLbRange->SelectEntryPos( ++nSelectPos );
}
- OUString aRangeStr = pLbRange->GetSelectEntry();
+ OUString aRangeStr = pLbRange->GetSelectedEntry();
if ( nMoves )
{
if ( nSelectPos > 1 && nSelectPos >= nCnt )
@@ -650,14 +650,14 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void)
// do not stop at the delimiter
nSelectPos = nCnt - 2;
pLbRange->SelectEntryPos( nSelectPos );
- aRangeStr = pLbRange->GetSelectEntry();
+ aRangeStr = pLbRange->GetSelectedEntry();
}
else if ( nSelectPos > 2 && nSelectPos < nCnt && !aRangeStr.isEmpty()
&& aRangeStr == pEdAssign->GetText() )
{ // move upwards instead of below to the previous position
nSelectPos -= 2;
pLbRange->SelectEntryPos( nSelectPos );
- aRangeStr = pLbRange->GetSelectEntry();
+ aRangeStr = pLbRange->GetSelectedEntry();
}
}
NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 14cec83a8c68..b049344eb536 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -88,8 +88,8 @@ IMPL_LINK_NOARG(DataProviderDlg, SelectHdl, ListBox&, void)
void DataProviderDlg::UpdateEnable()
{
bool bEmptyEntry = m_pCbUrl->GetURL().isEmpty() ||
- m_pCBData->GetSelectEntry().isEmpty() ||
- m_pCBProvider->GetSelectEntry().isEmpty();
+ m_pCBData->GetSelectedEntry().isEmpty() ||
+ m_pCBProvider->GetSelectedEntry().isEmpty();
m_pBtnOk->Enable(!bEmptyEntry);
setOptimalLayoutSize();
}
@@ -117,11 +117,11 @@ void DataProviderDlg::StartImport()
if (aURL.isEmpty())
return;
- OUString maDBDataName = m_pCBData->GetSelectEntry();
+ OUString maDBDataName = m_pCBData->GetSelectedEntry();
if (maDBDataName.isEmpty())
return;
- OUString aProvider = m_pCBProvider->GetSelectEntry();
+ OUString aProvider = m_pCBProvider->GetSelectedEntry();
if (aProvider.isEmpty())
return;
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 04acdf5e530a..c19644070b04 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -212,7 +212,7 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
}
else if ( nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
{
- aStrCurSelTable = m_pLbTables->GetSelectEntry();
+ aStrCurSelTable = m_pLbTables->GetSelectedEntry();
pStr = &aStrCurSelTable;
if ( pN )
*pN = m_pLbTables->GetSelectEntryPos();
@@ -228,7 +228,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
if ( !m_pBtnNew->IsChecked() && nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
{
- aStrCurSelTable = m_pLbTables->GetSelectEntry( nSelTabIndex );
+ aStrCurSelTable = m_pLbTables->GetSelectedEntry( nSelTabIndex );
pStr = &aStrCurSelTable;
if ( pN )
*pN = m_pLbTables->GetSelectEntryPos( nSelTabIndex );
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index ff59830c1926..ce8d891f9f1d 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -53,9 +53,9 @@ void ScSelEntryDlg::dispose()
}
-OUString ScSelEntryDlg::GetSelectEntry() const
+OUString ScSelEntryDlg::GetSelectedEntry() const
{
- return m_pLb->GetSelectEntry();
+ return m_pLb->GetSelectedEntry();
}
IMPL_LINK_NOARG(ScSelEntryDlg, DblClkHdl, ListBox&, void)
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 2de2133121cd..b7c8fee457e3 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -319,7 +319,7 @@ OUString ScLinkedAreaDlg::GetSource()
{
if (i > 0)
aBuf.append(';');
- aBuf.append(m_pLbRanges->GetSelectEntry(i));
+ aBuf.append(m_pLbRanges->GetSelectedEntry(i));
}
return aBuf.makeStringAndClear();
}
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 3cbaff853680..3105cdd84c23 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -282,7 +282,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl, Button*, void)
if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) )
{
OUString aMsg = aStrDelMsg.getToken( 0, '#' )
- + m_pLbFormat->GetSelectEntry()
+ + m_pLbFormat->GetSelectedEntry()
+ aStrDelMsg.getToken( 1, '#' );
if ( RET_YES ==
@@ -318,7 +318,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, Button*, void)
while( !bOk )
{
- OUString aFormatName = m_pLbFormat->GetSelectEntry();
+ OUString aFormatName = m_pLbFormat->GetSelectedEntry();
OUString aEntry;
VclPtrInstance<ScStringInputDlg> pDlg( this,
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index 747351aef56e..b1b75f3b366e 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -71,9 +71,9 @@ sal_Int32 ScShowTabDlg::GetSelectEntryCount() const
return m_pLb->GetSelectEntryCount();
}
-OUString ScShowTabDlg::GetSelectEntry(sal_Int32 nPos) const
+OUString ScShowTabDlg::GetSelectedEntry(sal_Int32 nPos) const
{
- return m_pLb->GetSelectEntry(nPos);
+ return m_pLb->GetSelectedEntry(nPos);
}
sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 1e3631792ea8..a2f26e4d0f09 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -137,7 +137,7 @@ bool ScNameDefDlg::IsFormulaValid()
bool ScNameDefDlg::IsNameValid()
{
- OUString aScope = m_pLbScope->GetSelectEntry();
+ OUString aScope = m_pLbScope->GetSelectedEntry();
OUString aName = m_pEdName->GetText();
ScRangeName* pRangeName = nullptr;
@@ -194,7 +194,7 @@ bool ScNameDefDlg::IsNameValid()
void ScNameDefDlg::AddPushed()
{
- OUString aScope = m_pLbScope->GetSelectEntry();
+ OUString aScope = m_pLbScope->GetSelectedEntry();
OUString aName = m_pEdName->GetText();
OUString aExpression = m_pEdRange->GetText();
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 571dd6fbe02c..10d9f0b23433 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -268,7 +268,7 @@ void ScNameDlg::UpdateChecks(const ScRangeData* pData)
bool ScNameDlg::IsNameValid()
{
- OUString aScope = m_pLbScope->GetSelectEntry();
+ OUString aScope = m_pLbScope->GetSelectedEntry();
OUString aName = m_pEdName->GetText();
aName = aName.trim();
@@ -394,7 +394,7 @@ void ScNameDlg::NameModified()
if (aOldScope.isEmpty())
return;
OUString aExpr = m_pEdAssign->GetText();
- OUString aNewScope = m_pLbScope->GetSelectEntry();
+ OUString aNewScope = m_pLbScope->GetSelectedEntry();
ScRangeName* pOldRangeName = GetRangeName( aOldScope );
ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->uppercase(aOldName) );
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 5a70da276730..6ef08f8561fb 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -310,7 +310,7 @@ IMPL_LINK(ScNavigatorDlg, DocumentSelectHdl, ListBox&, rListBox, void)
{
ScNavigatorDlg::ReleaseFocus();
- OUString aDocName = rListBox.GetSelectEntry();
+ OUString aDocName = rListBox.GetSelectedEntry();
aLbEntries->SelectDoc(aDocName);
}
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 0d9d6e030f53..bd8175d056b3 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -98,7 +98,7 @@ void ScScenarioListBox::UpdateEntries( const std::vector<OUString> &aNewEntryLis
void ScScenarioListBox::Select()
{
- if( const ScenarioEntry* pEntry = GetSelectedEntry() )
+ if( const ScenarioEntry* pEntry = GetSelectedScenarioEntry() )
mrParent.SetComment( pEntry->maComment );
}
@@ -131,7 +131,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
if ( pCEvt && pCEvt->GetCommand() == CommandEventId::ContextMenu )
{
- if( const ScenarioEntry* pEntry = GetSelectedEntry() )
+ if( const ScenarioEntry* pEntry = GetSelectedScenarioEntry() )
{
if( !pEntry->mbProtected )
{
@@ -152,7 +152,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
return bHandled || ListBox::EventNotify(rNEvt);
}
-const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() const
+const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedScenarioEntry() const
{
size_t nPos = GetSelectEntryPos();
return (nPos < maEntries.size()) ? &maEntries[ nPos ] : nullptr;
@@ -162,7 +162,7 @@ void ScScenarioListBox::ExecuteScenarioSlot( sal_uInt16 nSlotId )
{
if( SfxViewFrame* pViewFrm = SfxViewFrame::Current() )
{
- SfxStringItem aStringItem( nSlotId, GetSelectEntry() );
+ SfxStringItem aStringItem( nSlotId, GetSelectedEntry() );
pViewFrm->GetDispatcher()->ExecuteList(nSlotId,
SfxCallMode::SLOT | SfxCallMode::RECORD, { &aStringItem } );
}
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index d8e242474293..4e4d0b6b622c 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -154,7 +154,7 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
pBreakCB ->IsValueChangedFromSaved() ||
pGuideLineCB ->IsValueChangedFromSaved())
{
- NamedColor aNamedColor = pColorLB->GetSelectEntry();
+ NamedColor aNamedColor = pColorLB->GetSelectedEntry();
pLocalOptions->SetGridColor(aNamedColor.first, aNamedColor.second);
rCoreSet->Put(ScTpViewItem(*pLocalOptions));
bRet = true;
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index fb7a2bdfd401..ff98bff748b2 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -741,7 +741,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
- OUString aName = pDlg->GetSelectEntry();
+ OUString aName = pDlg->GetSelectedEntry();
pTabViewShell->GotoDBArea( aName );
rReq.AppendItem( SfxStringItem( SID_SELECT_DB, aName ) );
rReq.Done();
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index c178a4033d66..676ce2c76f53 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -154,7 +154,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
const sal_Int32 nCount = pDlg->GetSelectEntryCount();
for (sal_Int32 nPos=0; nPos<nCount; ++nPos)
{
- aName = pDlg->GetSelectEntry(nPos);
+ aName = pDlg->GetSelectedEntry(nPos);
rReq.AppendItem( SfxStringItem( FID_TABLE_SHOW, aName ) );
rNames.push_back(aName);
}