summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-14 16:57:06 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-21 12:45:38 +0200
commitd99b65c864cc3358238e4eac651f12a34d05e2d9 (patch)
treefcd7d6fefb9434c27533c826aabc639f68ba97ed /reportdesign
parentb649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (diff)
Rename GetSelectEntryPos -> GetSelectedEntryPos
Change-Id: I0bd4cb463575af843c72d9c8aaf91742203532a4 Reviewed-on: https://gerrit.libreoffice.org/42283 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/ui/dlg/Condition.hxx4
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx16
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.cxx4
3 files changed, 12 insertions, 12 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index 8fdfa0ad87ea..c084901df152 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -190,13 +190,13 @@ namespace rptui
inline ConditionType Condition::impl_getCurrentConditionType() const
{
- return sal::static_int_cast< ConditionType >( m_pConditionType->GetSelectEntryPos() );
+ return sal::static_int_cast< ConditionType >( m_pConditionType->GetSelectedEntryPos() );
}
inline ComparisonOperation Condition::impl_getCurrentComparisonOperation() const
{
- return sal::static_int_cast< ComparisonOperation >( m_pOperationList->GetSelectEntryPos() );
+ return sal::static_int_cast< ComparisonOperation >( m_pOperationList->GetSelectedEntryPos() );
}
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 3ffff9305280..e1031a202252 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -274,7 +274,7 @@ sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt
sal_Int8 nAction = DND_ACTION_NONE;
if ( IsEditing() )
{
- sal_Int32 nPos = m_pComboCell->GetSelectEntryPos();
+ sal_Int32 nPos = m_pComboCell->GetSelectedEntryPos();
if ( COMBOBOX_ENTRY_NOTFOUND != nPos || !m_pComboCell->GetText().isEmpty() )
SaveModified();
DeactivateCell();
@@ -458,7 +458,7 @@ bool OFieldExpressionControl::SaveModified()
xGroup = m_pParent->getGroup(m_aGroupPositions[nRow]);
if ( xGroup.is() )
{
- sal_Int32 nPos = m_pComboCell->GetSelectEntryPos();
+ sal_Int32 nPos = m_pComboCell->GetSelectedEntryPos();
OUString sExpression;
if ( COMBOBOX_ENTRY_NOTFOUND == nPos )
sExpression = m_pComboCell->GetText();
@@ -918,11 +918,11 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow)
uno::Reference< report::XGroup> xGroup = getGroup(nGroupPos);
if ( m_pHeaderLst->IsValueChangedFromSaved() )
- xGroup->setHeaderOn( m_pHeaderLst->GetSelectEntryPos() == 0 );
+ xGroup->setHeaderOn( m_pHeaderLst->GetSelectedEntryPos() == 0 );
if ( m_pFooterLst->IsValueChangedFromSaved() )
- xGroup->setFooterOn( m_pFooterLst->GetSelectEntryPos() == 0 );
+ xGroup->setFooterOn( m_pFooterLst->GetSelectedEntryPos() == 0 );
if ( m_pKeepTogetherLst->IsValueChangedFromSaved() )
- xGroup->setKeepTogether( m_pKeepTogetherLst->GetSelectEntryPos() );
+ xGroup->setKeepTogether( m_pKeepTogetherLst->GetSelectedEntryPos() );
if ( m_pGroupOnLst->IsValueChangedFromSaved() )
{
sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_pGroupOnLst->GetSelectEntryData()));
@@ -934,7 +934,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow)
m_pGroupIntervalEd->SaveValue();
}
if ( m_pOrderLst->IsValueChangedFromSaved() )
- xGroup->setSortAscending( m_pOrderLst->GetSelectEntryPos() == 0 );
+ xGroup->setSortAscending( m_pOrderLst->GetSelectedEntryPos() == 0 );
ListBox* pControls[] = { m_pHeaderLst, m_pFooterLst, m_pGroupOnLst, m_pKeepTogetherLst, m_pOrderLst};
for (ListBox* pControl : pControls)
@@ -1057,7 +1057,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void )
if ( rListBox.IsValueChangedFromSaved() )
SaveData(nRow);
if ( &rListBox == m_pGroupOnLst )
- m_pGroupIntervalEd->Enable( rListBox.GetSelectEntryPos() != 0 );
+ m_pGroupIntervalEd->Enable( rListBox.GetSelectedEntryPos() != 0 );
}
else if ( nGroupPos != NO_GROUP )
{
@@ -1071,7 +1071,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void )
else
aArgs[0].Name = PROPERTY_FOOTERON;
- aArgs[0].Value <<= rListBox.GetSelectEntryPos() == 0;
+ aArgs[0].Value <<= rListBox.GetSelectedEntryPos() == 0;
m_pController->executeChecked(m_pHeaderLst == &rListBox ? SID_GROUPHEADER : SID_GROUPFOOTER, aArgs);
m_pFieldExpression->InvalidateHandleColumn();
}
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index 04cb43486cdf..2459a1b676bf 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -86,7 +86,7 @@ short OPageNumberDialog::Execute()
sal_Int32 nPosX = 0;
sal_Int32 nPos2X = 0;
awt::Size aRptSize = getStyleProperty<awt::Size>(m_xHoldAlive,PROPERTY_PAPERSIZE);
- switch ( m_pAlignmentLst->GetSelectEntryPos() )
+ switch ( m_pAlignmentLst->GetSelectedEntryPos() )
{
case 0: // left
nPosX = getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_LEFTMARGIN);
@@ -105,7 +105,7 @@ short OPageNumberDialog::Execute()
default:
break;
}
- if ( m_pAlignmentLst->GetSelectEntryPos() > 2 )
+ if ( m_pAlignmentLst->GetSelectedEntryPos() > 2 )
nPosX = nPos2X;
uno::Sequence<beans::PropertyValue> aValues( comphelper::InitPropertySequence({