summaryrefslogtreecommitdiff
path: root/svtools
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 /svtools
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 'svtools')
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx2
-rw-r--r--svtools/source/control/ctrlbox.cxx4
-rw-r--r--svtools/source/dialogs/PlaceEditDialog.cxx2
-rw-r--r--svtools/source/dialogs/ServerDetailsControls.cxx2
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx2
-rw-r--r--svtools/source/dialogs/prnsetup.cxx4
-rw-r--r--svtools/source/filter/exportdialog.cxx28
7 files changed, 22 insertions, 22 deletions
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 1f0083646498..c94dfaa61bf4 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -146,7 +146,7 @@ namespace svt
(!pEvt->GetKeyCode().IsShift() && pEvt->GetKeyCode().IsMod1()))
{
// select next resp. previous entry
- sal_Int32 nPos = GetSelectEntryPos();
+ sal_Int32 nPos = GetSelectedEntryPos();
int nDir = (rKey.GetCode() == KEY_DOWN ? 1 : -1);
if (!((nPos == 0 && nDir == -1) || (nPos >= GetEntryCount() && nDir == 1)))
{
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 9d44beb2c593..5c5205fa965e 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -267,7 +267,7 @@ Color ImpLineListData::GetColorDist( const Color& rMain, const Color& rDefault )
SvxBorderLineStyle LineListBox::GetSelectEntryStyle() const
{
SvxBorderLineStyle nStyle = SvxBorderLineStyle::SOLID;
- sal_Int32 nPos = GetSelectEntryPos();
+ sal_Int32 nPos = GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
if (!m_sNone.isEmpty())
@@ -612,7 +612,7 @@ void LineListBox::UpdateEntries( long nOldWidth )
UpdatePaintLineColor( );
- sal_Int32 nSelEntry = GetSelectEntryPos();
+ sal_Int32 nSelEntry = GetSelectedEntryPos();
sal_Int32 nTypePos = GetStylePos( nSelEntry, nOldWidth );
// Remove the old entries
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index f4ea43e2a29d..0a7ac213d5e7 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -327,7 +327,7 @@ IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, ListBox&, void )
if (m_xCurrentDetails.get())
m_xCurrentDetails->show(false);
- const sal_Int32 nPos = m_pLBServerType->GetSelectEntryPos( );
+ const sal_Int32 nPos = m_pLBServerType->GetSelectedEntryPos( );
m_xCurrentDetails = m_aDetailsContainers[nPos];
m_nCurrentType = nPos;
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index f83b3c2032c7..4cb45ae21915 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -388,7 +388,7 @@ void CmisDetailsContainer::setPassword( const OUString& rPass )
void CmisDetailsContainer::selectRepository( )
{
// Get the repo ID and call the Change listener
- const sal_Int32 nPos = m_pLBRepository->GetSelectEntryPos( );
+ const sal_Int32 nPos = m_pLBRepository->GetSelectedEntryPos( );
if( static_cast<size_t>(nPos) < m_aRepoIds.size() )
{
m_sRepoId = m_aRepoIds[nPos];
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 8a16ab3a3091..c8af6214faee 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -956,7 +956,7 @@ void AssignmentPersistentData::ImplCommit()
"AddressBookSourceDialog::OnFieldScroll: invalid list box entry!");
// update the array where we remember the field selections
- if (0 == _rListbox.GetSelectEntryPos())
+ if (0 == _rListbox.GetSelectedEntryPos())
// it's the "no field selection" entry
m_pImpl->aFieldAssignments[m_pImpl->nFieldScrollPos * 2 + nListBoxIndex].clear();
else
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 22b6662d5e9a..d7a8b06a7900 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -53,7 +53,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox const * pBox, PushButton* pPropBtn,
Printer const * pPrinter, Printer* pTempPrinterIn )
{
VclPtr<Printer> pTempPrinter( pTempPrinterIn );
- if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
+ if ( pBox->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND )
{
const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectedEntry(), true );
if( pInfo)
@@ -109,7 +109,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinte
void ImplPrnDlgUpdateQueueInfo( ListBox const * pBox, QueueInfo& rInfo )
{
- if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
+ if ( pBox->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND )
{
const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectedEntry(), true );
if( pInfo )
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 57942a39f32a..27144326aaee 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -152,7 +152,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC
{
if ( bUpdateConfig )
{
- sal_Int32 nUnit = mpLbSizeX->GetSelectEntryPos();
+ sal_Int32 nUnit = mpLbSizeX->GetSelectedEntryPos();
if ( nUnit < 0 )
nUnit = UNIT_CM;
@@ -171,7 +171,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC
mpOptionsItem->WriteInt32("PixelExportUnit", nUnit);
mpOptionsItem->WriteInt32("PixelExportResolution", nResolution);
- mpOptionsItem->WriteInt32("PixelExportResolutionUnit", mpLbResolution->GetSelectEntryPos());
+ mpOptionsItem->WriteInt32("PixelExportResolutionUnit", mpLbResolution->GetSelectedEntryPos());
}
else
{
@@ -219,7 +219,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC
{
case FORMAT_JPG :
{
- sal_Int32 nColor = mpLbColorDepth->GetSelectEntryPos();
+ sal_Int32 nColor = mpLbColorDepth->GetSelectedEntryPos();
if ( nColor == 1 )
nColor = 0;
else
@@ -245,7 +245,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC
case FORMAT_BMP :
{
- pFilterOptions->WriteInt32("Color", mpLbColorDepth->GetSelectEntryPos() + 1);
+ pFilterOptions->WriteInt32("Color", mpLbColorDepth->GetSelectedEntryPos() + 1);
pFilterOptions->WriteBool("RLE_Coding", mpCbRLEEncoding->IsChecked());
}
break;
@@ -925,13 +925,13 @@ void ExportDialog::updateControls()
{
awt::Size aSize100thmm( maSize );
Size aSize( LogicToLogic( Size( aSize100thmm.Width * 100, aSize100thmm.Height * 100 ), MapUnit::Map100thMM,
- MapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) ) );
+ MapMode( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) ) ) );
mpMfSizeX->SetValue( aSize.Width() );
mpMfSizeY->SetValue( aSize.Height() );
}
else
{
- MapUnit aMapUnit( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) );
+ MapUnit aMapUnit( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) );
if ( aMapUnit == MapUnit::MapPixel )
{ // calculating pixel count via resolution and original graphic size
mpMfSizeX->SetDecimalDigits( 0 );
@@ -944,7 +944,7 @@ void ExportDialog::updateControls()
mpMfSizeX->SetDecimalDigits( 2 );
mpMfSizeY->SetDecimalDigits( 2 );
double fRatio;
- switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) )
+ switch( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) )
{
case MapUnit::MapInch : fRatio = static_cast< double >( maResolution.Width ) * 0.0254; break;
case MapUnit::MapMM : fRatio = static_cast< double >( maResolution.Width ) * 0.001; break;
@@ -957,7 +957,7 @@ void ExportDialog::updateControls()
}
}
sal_Int32 nResolution = 0;
- switch( mpLbResolution->GetSelectEntryPos() )
+ switch( mpLbResolution->GetSelectedEntryPos() )
{
case 0 : nResolution = maResolution.Width / 100; break; // pixels / cm
case 2 : nResolution = maResolution.Width; break; // pixels / meter
@@ -1082,7 +1082,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX, Edit&, void)
if ( mbIsPixelFormat )
{
- switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) )
+ switch( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) )
{
case MapUnit::MapInch : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * mpMfSizeX->GetValue() / 100.0 + 0.5 ); break;
case MapUnit::MapCM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.01 * mpMfSizeX->GetValue() / 100.0 + 0.5 ); break;
@@ -1099,7 +1099,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX, Edit&, void)
sal_Int32 nWidth = mpMfSizeX->GetValue();
sal_Int32 nHeight= static_cast< sal_Int32 >( nWidth * fRatio );
const Size aSource( nWidth, nHeight );
- MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ),Point(), aFract, aFract );
+ MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ),Point(), aFract, aFract );
Size aDest( LogicToLogic( aSource, aSourceMapMode, MapUnit::Map100thMM ) );
maSize.Width = aDest.Width();
@@ -1114,7 +1114,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY, Edit&, void)
if ( mbIsPixelFormat )
{
- switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) )
+ switch( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) )
{
case MapUnit::MapInch : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * mpMfSizeY->GetValue() / 100.0 + 0.5 ); break;
case MapUnit::MapCM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.01 * mpMfSizeY->GetValue() / 100.0 + 0.5 ); break;
@@ -1131,7 +1131,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY, Edit&, void)
sal_Int32 nHeight= mpMfSizeY->GetValue();
sal_Int32 nWidth = static_cast< sal_Int32 >( nHeight * fRatio );
const Size aSource( nWidth, nHeight );
- MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ),Point(), aFract, aFract );
+ MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ),Point(), aFract, aFract );
Size aDest( LogicToLogic( aSource, aSourceMapMode, MapUnit::Map100thMM ) );
maSize.Height = aDest.Height();
@@ -1143,9 +1143,9 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY, Edit&, void)
IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution, Edit&, void)
{
sal_Int32 nResolution = mpNfResolution->GetValue();
- if ( mpLbResolution->GetSelectEntryPos() == 0 ) // pixels / cm
+ if ( mpLbResolution->GetSelectedEntryPos() == 0 ) // pixels / cm
nResolution *= 100;
- else if ( mpLbResolution->GetSelectEntryPos() == 1 ) // pixels / inch
+ else if ( mpLbResolution->GetSelectedEntryPos() == 1 ) // pixels / inch
nResolution = static_cast< sal_Int32 >( ( ( static_cast< double >( nResolution ) + 0.5 ) / 0.0254 ) );
maResolution.Width = nResolution;
maResolution.Height= nResolution;