[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source filter/source formula/source fpicker/source include/sfx2 include/svx include/vcl reportdesign/source sc/inc sc/source sd/source sfx2/source starmath/source svtools/source svx/source sw/source toolkit/source uui/source vcl/inc vcl/source vcl/unx vcl/workben xmlsecurity/source
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Thu Sep 21 10:46:21 UTC 2017
accessibility/inc/helper/IComboListBoxHelper.hxx | 2
accessibility/inc/helper/listboxhelper.hxx | 4
accessibility/source/standard/vclxaccessiblelist.cxx | 6
avmedia/source/framework/mediacontrol.cxx | 2
basctl/source/basicide/basicbox.cxx | 2
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/dlged/managelang.cxx | 8 -
chart2/source/controller/dialogs/res_BarGeometry.cxx | 4
chart2/source/controller/dialogs/res_BarGeometry.hxx | 2
chart2/source/controller/dialogs/res_DataLabel.cxx | 4
chart2/source/controller/dialogs/res_ErrorBar.cxx | 6
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 4
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 14 +-
chart2/source/controller/dialogs/tp_ChartType.cxx | 28 ++--
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 10 -
chart2/source/controller/main/ElementSelector.cxx | 2
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 2
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 2
chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 2
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 2
cui/source/customize/SvxMenuConfigPage.cxx | 4
cui/source/customize/SvxToolbarConfigPage.cxx | 10 -
cui/source/customize/cfg.cxx | 4
cui/source/customize/eventdlg.cxx | 2
cui/source/dialogs/cuicharmap.cxx | 4
cui/source/dialogs/cuifmsearch.cxx | 16 +-
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/hangulhanjadlg.cxx | 8 -
cui/source/dialogs/hldocntp.cxx | 8 -
cui/source/dialogs/hltpbase.cxx | 2
cui/source/dialogs/multipat.cxx | 4
cui/source/dialogs/showcols.cxx | 2
cui/source/dialogs/thesdlg.cxx | 2
cui/source/inc/autocdlg.hxx | 2
cui/source/inc/cfg.hxx | 2
cui/source/inc/cuigaldlg.hxx | 2
cui/source/options/fontsubs.cxx | 2
cui/source/options/optchart.cxx | 6
cui/source/options/optcolor.cxx | 2
cui/source/options/optctl.cxx | 2
cui/source/options/optdict.cxx | 10 -
cui/source/options/optgdlg.cxx | 24 +--
cui/source/options/optinet2.cxx | 6
cui/source/options/optjava.cxx | 6
cui/source/options/optjava.hxx | 6
cui/source/options/optlingu.cxx | 8 -
cui/source/options/optsave.cxx | 2
cui/source/options/personalization.cxx | 2
cui/source/options/tsaurls.cxx | 2
cui/source/tabpages/align.cxx | 4
cui/source/tabpages/autocdlg.cxx | 18 +-
cui/source/tabpages/backgrnd.cxx | 8 -
cui/source/tabpages/border.cxx | 4
cui/source/tabpages/chardlg.cxx | 54 +++----
cui/source/tabpages/connect.cxx | 4
cui/source/tabpages/labdlg.cxx | 6
cui/source/tabpages/measure.cxx | 4
cui/source/tabpages/numfmt.cxx | 28 ++--
cui/source/tabpages/numpages.cxx | 12 -
cui/source/tabpages/page.cxx | 14 +-
cui/source/tabpages/paragrph.cxx | 32 ++--
cui/source/tabpages/swpossizetabpage.cxx | 34 ++---
cui/source/tabpages/textanim.cxx | 4
cui/source/tabpages/tpbitmap.cxx | 20 +-
cui/source/tabpages/tpcolor.cxx | 8 -
cui/source/tabpages/tpgradnt.cxx | 8 -
cui/source/tabpages/tphatch.cxx | 8 -
cui/source/tabpages/tpline.cxx | 52 +++----
cui/source/tabpages/tplnedef.cxx | 18 +-
cui/source/tabpages/tplneend.cxx | 16 +-
cui/source/tabpages/tptrans.cxx | 8 -
dbaccess/source/ui/control/FieldDescControl.cxx | 10 -
dbaccess/source/ui/control/RelationControl.cxx | 2
dbaccess/source/ui/control/opendoccontrols.cxx | 8 -
dbaccess/source/ui/dlg/advancedsettings.cxx | 2
dbaccess/source/ui/dlg/directsql.cxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 12 -
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 2
dbaccess/source/ui/dlg/paramdialog.cxx | 4
dbaccess/source/ui/dlg/queryfilter.cxx | 6
dbaccess/source/ui/dlg/queryorder.cxx | 8 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 10 -
dbaccess/source/ui/querydesign/querydlg.cxx | 4
dbaccess/source/ui/tabledesign/TEditControl.cxx | 4
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2
extensions/source/bibliography/datman.cxx | 4
extensions/source/dbpilots/gridwizard.cxx | 6
extensions/source/dbpilots/groupboxwiz.cxx | 4
extensions/source/propctrlr/listselectiondlg.cxx | 2
extensions/source/scanner/grid.cxx | 2
extensions/source/scanner/sanedlg.cxx | 2
filter/source/pdf/impdialog.cxx | 4
formula/source/ui/dlg/funcpage.cxx | 6
fpicker/source/office/OfficeControlAccess.cxx | 6
fpicker/source/office/RemoteFilesDialog.cxx | 10 -
include/sfx2/controlwrapper.hxx | 2
include/svx/checklbx.hxx | 4
include/svx/fontlb.hxx | 2
include/vcl/combobox.hxx | 4
include/vcl/lstbox.hxx | 8 -
reportdesign/source/ui/dlg/Condition.hxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 16 +-
reportdesign/source/ui/dlg/PageNumber.cxx | 4
sc/inc/scabstdlg.hxx | 2
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 8 -
sc/source/ui/attrdlg/scdlgfact.cxx | 4
sc/source/ui/attrdlg/scdlgfact.hxx | 2
sc/source/ui/cctrl/cbnumberformat.cxx | 2
sc/source/ui/condformat/colorformat.cxx | 20 +-
sc/source/ui/condformat/condformatdlg.cxx | 4
sc/source/ui/condformat/condformatdlgentry.cxx | 30 ++--
sc/source/ui/dbgui/consdlg.cxx | 6
sc/source/ui/dbgui/dapidata.cxx | 4
sc/source/ui/dbgui/dapitype.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 68 +++++-----
sc/source/ui/dbgui/foptmgr.cxx | 2
sc/source/ui/dbgui/pfiltdlg.cxx | 30 ++--
sc/source/ui/dbgui/pvfundlg.cxx | 16 +-
sc/source/ui/dbgui/scuiasciiopt.cxx | 4
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 14 +-
sc/source/ui/dbgui/tpsubt.cxx | 8 -
sc/source/ui/dbgui/validate.cxx | 18 +-
sc/source/ui/formdlg/dwfunctr.cxx | 8 -
sc/source/ui/inc/shtabdlg.hxx | 2
sc/source/ui/miscdlgs/crnrdlg.cxx | 4
sc/source/ui/miscdlgs/instbdlg.cxx | 4
sc/source/ui/miscdlgs/mvtabdlg.cxx | 8 -
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/miscdlgs/scuiautofmt.cxx | 2
sc/source/ui/miscdlgs/shtabdlg.cxx | 4
sc/source/ui/miscdlgs/solveroptions.cxx | 2
sc/source/ui/navipi/scenwnd.cxx | 2
sc/source/ui/optdlg/calcoptionsdlg.cxx | 4
sc/source/ui/optdlg/tpcompatibility.cxx | 2
sc/source/ui/optdlg/tpformula.cxx | 6
sc/source/ui/optdlg/tpusrlst.cxx | 8 -
sc/source/ui/optdlg/tpview.cxx | 10 -
sc/source/ui/pagedlg/areasdlg.cxx | 4
sc/source/ui/pagedlg/scuitphfedit.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 10 -
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 4
sc/source/ui/view/gridwin.cxx | 4
sc/source/ui/view/tabvwsh3.cxx | 2
sd/source/filter/html/pubdlg.cxx | 6
sd/source/ui/animations/CustomAnimationDialog.cxx | 28 ++--
sd/source/ui/animations/CustomAnimationPane.cxx | 8 -
sd/source/ui/animations/SlideTransitionPane.cxx | 14 +-
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 18 +-
sd/source/ui/dlg/animobjs.cxx | 4
sd/source/ui/dlg/custsdlg.cxx | 16 +-
sd/source/ui/dlg/dlgfield.cxx | 8 -
sd/source/ui/dlg/gluectrl.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 8 -
sd/source/ui/dlg/present.cxx | 4
sd/source/ui/dlg/tpaction.cxx | 4
sd/source/ui/dlg/tpoption.cxx | 4
sd/source/ui/sidebar/SlideBackground.cxx | 18 +-
sfx2/source/appl/newhelp.cxx | 8 -
sfx2/source/dialog/mgetempl.cxx | 6
sfx2/source/dialog/printopt.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/new.cxx | 8 -
sfx2/source/doc/saveastemplatedlg.cxx | 2
sfx2/source/doc/templatedlg.cxx | 8 -
starmath/source/dialog.cxx | 2
starmath/source/utility.cxx | 2
svtools/source/brwbox/ebbcontrols.cxx | 2
svtools/source/control/ctrlbox.cxx | 4
svtools/source/dialogs/PlaceEditDialog.cxx | 2
svtools/source/dialogs/ServerDetailsControls.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 2
svtools/source/dialogs/prnsetup.cxx | 4
svtools/source/filter/exportdialog.cxx | 28 ++--
svx/source/dialog/checklbx.cxx | 4
svx/source/dialog/ctredlin.cxx | 6
svx/source/dialog/fontlb.cxx | 2
svx/source/dialog/frmdirlbox.cxx | 2
svx/source/dialog/langbox.cxx | 6
svx/source/dialog/papersizelistbox.cxx | 2
svx/source/dialog/rubydialog.cxx | 10 -
svx/source/dialog/srchdlg.cxx | 8 -
svx/source/dialog/txencbox.cxx | 2
svx/source/engine3d/float3d.cxx | 6
svx/source/fmcomp/gridcell.cxx | 12 -
svx/source/form/datanavi.cxx | 4
svx/source/gallery2/galbrws1.cxx | 6
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 24 +--
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 2
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 12 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 4
svx/source/tbxctrls/fillctrl.cxx | 10 -
svx/source/tbxctrls/grafctrl.cxx | 4
svx/source/tbxctrls/itemwin.cxx | 10 -
svx/source/tbxctrls/tbcontrl.cxx | 20 +-
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 6
sw/source/ui/chrdlg/break.cxx | 6
sw/source/ui/chrdlg/drpcps.cxx | 4
sw/source/ui/chrdlg/numpara.cxx | 10 -
sw/source/ui/chrdlg/swuiccoll.cxx | 2
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 20 +-
sw/source/ui/config/optpage.cxx | 20 +-
sw/source/ui/dbui/createaddresslistdialog.cxx | 2
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 12 -
sw/source/ui/dbui/dbinsdlg.cxx | 12 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 2
sw/source/ui/dbui/mmgreetingspage.cxx | 6
sw/source/ui/dbui/mmlayoutpage.cxx | 2
sw/source/ui/dbui/mmresultdialogs.cxx | 2
sw/source/ui/envelp/envfmt.cxx | 6
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labelexp.cxx | 4
sw/source/ui/envelp/mailmrge.cxx | 2
sw/source/ui/fldui/flddb.cxx | 8 -
sw/source/ui/fldui/flddinf.cxx | 14 +-
sw/source/ui/fldui/flddok.cxx | 26 +--
sw/source/ui/fldui/fldfunc.cxx | 12 -
sw/source/ui/fldui/fldref.cxx | 18 +-
sw/source/ui/fldui/fldvar.cxx | 28 ++--
sw/source/ui/frmdlg/column.cxx | 6
sw/source/ui/frmdlg/cption.cxx | 8 -
sw/source/ui/frmdlg/frmpage.cxx | 50 +++----
sw/source/ui/index/cnttab.cxx | 38 ++---
sw/source/ui/index/multmrk.cxx | 6
sw/source/ui/index/swuiidxmrk.cxx | 2
sw/source/ui/misc/docfnote.cxx | 6
sw/source/ui/misc/glosbib.cxx | 4
sw/source/ui/misc/linenum.cxx | 2
sw/source/ui/misc/num.cxx | 6
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/pgfnote.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 8 -
sw/source/ui/table/tabledlg.cxx | 4
sw/source/ui/table/tautofmt.cxx | 2
sw/source/uibase/inc/selglos.hxx | 2
sw/source/uibase/misc/numberingtypelistbox.cxx | 2
sw/source/uibase/ribbar/workctrl.cxx | 2
sw/source/uibase/sidebar/PageFooterPanel.cxx | 2
sw/source/uibase/sidebar/PageFormatPanel.cxx | 8 -
sw/source/uibase/sidebar/PageHeaderPanel.cxx | 2
sw/source/uibase/sidebar/PageStylesPanel.cxx | 16 +-
sw/source/uibase/uiview/viewling.cxx | 2
sw/source/uibase/utlui/gloslst.cxx | 6
sw/source/uibase/utlui/navipi.cxx | 2
sw/source/uibase/utlui/numfmtlb.cxx | 4
toolkit/source/awt/vclxwindows.cxx | 6
uui/source/fltdlg.cxx | 2
vcl/inc/listbox.hxx | 2
vcl/source/control/combobox.cxx | 8 -
vcl/source/control/imp_listbox.cxx | 32 ++--
vcl/source/control/listbox.cxx | 10 -
vcl/source/control/tabctrl.cxx | 2
vcl/source/uitest/uiobject.cxx | 4
vcl/source/window/printdlg.cxx | 10 -
vcl/unx/generic/print/prtsetup.cxx | 6
vcl/unx/generic/print/prtsetup.hxx | 2
vcl/workben/vcldemo.cxx | 2
xmlsecurity/source/dialogs/macrosecurity.cxx | 4
262 files changed, 1015 insertions(+), 1015 deletions(-)
New commits:
commit d99b65c864cc3358238e4eac651f12a34d05e2d9
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Thu Sep 14 16:57:06 2017 +0200
Rename GetSelectEntryPos -> GetSelectedEntryPos
Change-Id: I0bd4cb463575af843c72d9c8aaf91742203532a4
Reviewed-on: https://gerrit.libreoffice.org/42283
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx
index 8c60bc5b8070..75bd598a85ba 100644
--- a/accessibility/inc/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.hxx
@@ -55,7 +55,7 @@ namespace accessibility
virtual void SelectEntryPos( sal_Int32 nPos, bool bSelect = true ) = 0;
virtual sal_Int32 GetSelectEntryCount() const = 0;
virtual void SetNoSelection() = 0;
- virtual sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex ) const = 0;
+ virtual sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex ) const = 0;
virtual bool IsInDropDown() const = 0;
virtual tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
virtual long GetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0;
diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
index 8bc7e2dae2ef..0ef5d9f57509 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -147,9 +147,9 @@ public:
m_aComboListBox.SetNoSelection();
}
- virtual sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const override
+ virtual sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex = 0 ) const override
{
- return m_aComboListBox.GetSelectEntryPos(nSelIndex);
+ return m_aComboListBox.GetSelectedEntryPos(nSelIndex);
}
virtual bool IsInDropDown() const override
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index f5cb1602f0f3..cd3021437a5d 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -90,7 +90,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
UpdateVisibleLineCount();
if(m_pListBoxHelper)
{
- m_nCurSelectedPos=m_pListBoxHelper->GetSelectEntryPos(0);
+ m_nCurSelectedPos=m_pListBoxHelper->GetSelectedEntryPos(0);
}
sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount());
m_aAccessibleChildren.reserve(nCount);
@@ -330,7 +330,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
{
uno::Any aOldValue,
aNewValue;
- sal_Int32 nPos = m_nCurSelectedPos; //m_pListBoxHelper->GetSelectEntryPos();
+ sal_Int32 nPos = m_nCurSelectedPos; //m_pListBoxHelper->GetSelectedEntryPos();
if ( nPos == LISTBOX_ENTRY_NOTFOUND )
nPos = m_pListBoxHelper->GetTopEntry();
@@ -831,7 +831,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild
if ( m_pListBoxHelper )
{
checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,true);
- return getAccessibleChild( m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) );
+ return getAccessibleChild( m_pListBoxHelper->GetSelectedEntryPos( (sal_uInt16)nSelectedChildIndex ) );
}
return nullptr;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 98706fc8a679..a50b7d236722 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -327,7 +327,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox&, p, void )
MediaItem aExecItem;
css::media::ZoomLevel eLevel;
- switch( p.GetSelectEntryPos() )
+ switch( p.GetSelectedEntryPos() )
{
case AVMEDIA_ZOOMLEVEL_50: eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break;
case AVMEDIA_ZOOMLEVEL_100: eLevel = css::media::ZoomLevel_ORIGINAL; break;
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index e184dd74dc75..e0ee83e4beea 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -300,7 +300,7 @@ void LibBox::Select()
void LibBox::NotifyIDE()
{
- sal_Int32 nSelPos = GetSelectEntryPos();
+ sal_Int32 nSelPos = GetSelectedEntryPos();
if (LibEntry* pEntry = static_cast<LibEntry*>(GetEntryData(nSelPos)))
{
ScriptDocument aDocument( pEntry->GetDocument() );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 47d1ece3a936..48452341b4f2 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2696,7 +2696,7 @@ void CodeCompleteListBox::KeyInput( const KeyEvent& rKeyEvt )
OUString sTypedText = pCodeCompleteWindow->pParent->GetEditEngine()->GetText(aTextSelection);
if( !aFuncBuffer.isEmpty() )
{
- sal_Int32 nInd = GetSelectEntryPos();
+ sal_Int32 nInd = GetSelectedEntryPos();
if( nInd != LISTBOX_ENTRY_NOTFOUND )
{//if there is something selected
bool bFound = false;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index e165cabe2c1f..5bd4910b8dc0 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1388,7 +1388,7 @@ void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocati
void LibPage::SetCurLib()
{
- const sal_Int32 nSelPos = m_pBasicsBox->GetSelectEntryPos();
+ const sal_Int32 nSelPos = m_pBasicsBox->GetSelectedEntryPos();
DocumentEntry* pEntry = static_cast<DocumentEntry*>(m_pBasicsBox->GetEntryData( nSelPos ));
if ( pEntry )
{
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index b603bf41781c..2921e52f6b4c 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -167,12 +167,12 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void)
if ( aQBox->Execute() == RET_OK )
{
sal_Int32 nCount = m_pLanguageLB->GetSelectEntryCount();
- sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos();
// remove locales
Sequence< Locale > aLocaleSeq( nCount );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- const sal_Int32 nSelPos = m_pLanguageLB->GetSelectEntryPos(i);
+ const sal_Int32 nSelPos = m_pLanguageLB->GetSelectedEntryPos(i);
LanguageEntry* pEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nSelPos ));
if ( pEntry )
aLocaleSeq[i] = pEntry->m_aLocale;
@@ -192,7 +192,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void)
IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl, Button*, void)
{
- const sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos();
LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos ));
if ( pSelectEntry && !pSelectEntry->m_bIsDefault )
{
@@ -212,7 +212,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, ListBox&, void)
const sal_Int32 nCount = m_pLanguageLB->GetEntryCount();
bool bEmpty = ( !nCount ||
m_pLanguageLB->GetEntryPos( m_sCreateLangStr ) != LISTBOX_ENTRY_NOTFOUND );
- bool bSelect = ( m_pLanguageLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND );
+ bool bSelect = ( m_pLanguageLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND );
bool bEnable = !bEmpty && bSelect;
m_pDeletePB->Enable(bEnable);
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index f3602e44b536..b870fd1471c8 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -49,9 +49,9 @@ sal_Int32 BarGeometryResources::GetSelectEntryCount() const
return m_pLB_Geometry->GetSelectEntryCount();
}
-sal_Int32 BarGeometryResources::GetSelectEntryPos() const
+sal_Int32 BarGeometryResources::GetSelectedEntryPos() const
{
- return m_pLB_Geometry->GetSelectEntryPos();
+ return m_pLB_Geometry->GetSelectedEntryPos();
}
void BarGeometryResources::SelectEntryPos(sal_Int32 nPos)
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index 31936724669f..b0f4535cb9a1 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -35,7 +35,7 @@ public:
void Enable( bool bEnable );
sal_Int32 GetSelectEntryCount() const;
- sal_Int32 GetSelectEntryPos() const;
+ sal_Int32 GetSelectedEntryPos() const;
void SelectEntryPos(sal_Int32 nPos);
void SetSelectHdl( const Link<ListBox&,void>& rLink );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index d04eed5a484e..254eef40ee70 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -295,10 +295,10 @@ bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const
if( m_pCBWrapText->GetState()!= TRISTATE_INDET )
rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_WRAP_TEXT, m_pCBWrapText->IsChecked()) );
- OUString aSep = our_aLBEntryMap[m_pLB_Separator->GetSelectEntryPos()];
+ OUString aSep = our_aLBEntryMap[m_pLB_Separator->GetSelectedEntryPos()];
rOutAttrs->Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) );
- std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) );
+ std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectedEntryPos()) );
if(aIt!=m_aListBoxToPlacementMap.end())
{
sal_Int32 nValue = aIt->second;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 9a0c7ff53fee..45783bb1db2f 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -254,7 +254,7 @@ void ErrorBarResources::UpdateControlStates()
// unit for metric fields
bool bIsErrorMargin(
( m_pRbFunction->IsChecked()) &&
- ( m_pLbFunction->GetSelectEntryPos() == CHART_LB_FUNCTION_ERROR_MARGIN ));
+ ( m_pLbFunction->GetSelectedEntryPos() == CHART_LB_FUNCTION_ERROR_MARGIN ));
bool bIsPercentage( m_pRbPercent->IsChecked() || bIsErrorMargin );
FieldUnit eFieldUnit = FUNIT_NONE;
@@ -308,7 +308,7 @@ void ErrorBarResources::UpdateControlStates()
}
// all functions except error margin take no arguments
- if( m_pRbFunction->IsChecked() && ( m_pLbFunction->GetSelectEntryPos() != CHART_LB_FUNCTION_ERROR_MARGIN ))
+ if( m_pRbFunction->IsChecked() && ( m_pLbFunction->GetSelectedEntryPos() != CHART_LB_FUNCTION_ERROR_MARGIN ))
{
bPosEnabled = false;
bNegEnabled = false;
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, Button*, void )
{
if( m_pLbFunction->GetSelectEntryCount() == 1 )
{
- switch( m_pLbFunction->GetSelectEntryPos())
+ switch( m_pLbFunction->GetSelectedEntryPos())
{
case CHART_LB_FUNCTION_STD_ERROR:
m_eErrorKind = SvxChartKindError::StdError; break;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 9863f5ea615e..2a6589f07960 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -302,9 +302,9 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void)
uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( m_xChartModel ) );
- if( m_pLB_Scheme->GetSelectEntryPos() == POS_3DSCHEME_REALISTIC )
+ if( m_pLB_Scheme->GetSelectedEntryPos() == POS_3DSCHEME_REALISTIC )
ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic );
- else if( m_pLB_Scheme->GetSelectEntryPos() == POS_3DSCHEME_SIMPLE )
+ else if( m_pLB_Scheme->GetSelectedEntryPos() == POS_3DSCHEME_SIMPLE )
ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Simple );
else
{
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 6998113199cb..3027e3514fdd 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -116,18 +116,18 @@ VclPtr<SfxTabPage> AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxIt
bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
// axis line
- sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLB_CrossesAt->GetSelectedEntryPos();
rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 ));
if( nPos==2 )
{
double fCrossover = m_pED_CrossesAt->GetValue();
if( m_bCrossingAxisIsCategoryAxis )
- fCrossover = m_pED_CrossesAtCategory->GetSelectEntryPos()+1;
+ fCrossover = m_pED_CrossesAtCategory->GetSelectedEntryPos()+1;
rOutAttrs->Put(SvxDoubleItem(fCrossover,SCHATTR_AXIS_POSITION_VALUE));
}
// labels
- sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos();
+ sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectedEntryPos();
if( nLabelPos != LISTBOX_ENTRY_NOTFOUND )
rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos ));
@@ -147,7 +147,7 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks));
rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks));
- sal_Int32 nMarkPos = m_pLB_PlaceTicks->GetSelectEntryPos();
+ sal_Int32 nMarkPos = m_pLB_PlaceTicks->GetSelectedEntryPos();
if( nMarkPos != LISTBOX_ENTRY_NOTFOUND )
rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos ));
@@ -315,7 +315,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning
IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
{
- sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLB_CrossesAt->GetSelectedEntryPos();
m_pED_CrossesAt->Show( (nPos==2) && !m_bCrossingAxisIsCategoryAxis );
m_pED_CrossesAtCategory->Show( (nPos==2) && m_bCrossingAxisIsCategoryAxis );
@@ -329,12 +329,12 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void)
{
- sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos();
+ sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectedEntryPos();
bool bEnableTickmarkPlacement = (nLabelPos>1);
if( bEnableTickmarkPlacement )
{
- sal_Int32 nAxisPos = m_pLB_CrossesAt->GetSelectEntryPos();
+ sal_Int32 nAxisPos = m_pLB_CrossesAt->GetSelectedEntryPos();
if( nLabelPos-2 == nAxisPos )
bEnableTickmarkPlacement=false;
}
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 795571f6e569..b741b0812ce8 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -95,7 +95,7 @@ void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter& rParameter
void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter )
{
rParameter.b3DLook = m_pCB_3DLook->IsChecked();
- const sal_Int32 nPos = m_pLB_Scheme->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pLB_Scheme->GetSelectedEntryPos();
if( nPos == POS_3DSCHEME_SIMPLE )
rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
else if( nPos == POS_3DSCHEME_REALISTIC )
@@ -366,16 +366,16 @@ void SplinePropertiesDialog::fillControls( const ChartTypeParameter& rParameter
m_pMF_SplineResolution->SetValue( rParameter.nCurveResolution );
//dis/enabling
- m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS);
- m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS);
+ m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS);
+ m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS);
}
void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines )
{
if(!bSmoothLines)
rParameter.eCurveStyle=CurveStyle_LINES;
- else if(m_pLB_Spline_Type->GetSelectEntryPos() == CUBIC_SPLINE_POS)
+ else if(m_pLB_Spline_Type->GetSelectedEntryPos() == CUBIC_SPLINE_POS)
rParameter.eCurveStyle=CurveStyle_CUBIC_SPLINES;
- else if(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS)
+ else if(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS)
rParameter.eCurveStyle=CurveStyle_B_SPLINES;
rParameter.nCurveResolution = static_cast< sal_Int32 >( m_pMF_SplineResolution->GetValue());
@@ -383,8 +383,8 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool
}
IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void)
{
- m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS);
- m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS);
+ m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS);
+ m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS);
}
class SteppedPropertiesDialog : public ModalDialog
@@ -551,7 +551,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter )
}
void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter )
{
- switch (m_pLB_LineType->GetSelectEntryPos())
+ switch (m_pLB_LineType->GetSelectedEntryPos())
{
case POS_LINETYPE_SMOOTH:
getSplinePropertiesDialog().fillParameter( rParameter, true );
@@ -573,9 +573,9 @@ IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void)
{
ChartTypeParameter aOldParameter;
- getSplinePropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectEntryPos() == POS_LINETYPE_SMOOTH );
+ getSplinePropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectedEntryPos() == POS_LINETYPE_SMOOTH );
- const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos();
+ const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectedEntryPos();
m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH);
if( getSplinePropertiesDialog().Execute() == RET_OK )
{
@@ -593,9 +593,9 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void)
{
ChartTypeParameter aOldParameter;
- getSteppedPropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectEntryPos() == POS_LINETYPE_STEPPED );
+ getSteppedPropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectedEntryPos() == POS_LINETYPE_STEPPED );
- const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos();
+ const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectedEntryPos();
m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED);
if( getSteppedPropertiesDialog().Execute() == RET_OK )
{
@@ -650,7 +650,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter )
{
rParameter.nGeometry3D = 1;
if( m_aGeometryResources.GetSelectEntryCount() )
- rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos();
+ rParameter.nGeometry3D = m_aGeometryResources.GetSelectedEntryPos();
}
IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void)
@@ -847,7 +847,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType()
{
ChartTypeDialogController* pTypeController = nullptr;
std::vector< ChartTypeDialogController* >::size_type nM = static_cast< std::vector< ChartTypeDialogController* >::size_type >(
- m_pMainTypeList->GetSelectEntryPos() );
+ m_pMainTypeList->GetSelectedEntryPos() );
if( nM<m_aChartTypeDialogControllerList.size() )
pTypeController = m_aChartTypeDialogControllerList[nM];
return pTypeController;
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 34056ec9de3b..1004a9ab6dee 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -62,7 +62,7 @@ bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
long nSegs=32;
- long nShape = m_pGeometryResources->GetSelectEntryPos();
+ long nShape = m_pGeometryResources->GetSelectedEntryPos();
if(nShape==CHART_SHAPE3D_PYRAMID)
nSegs=4;
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 6f72cfaf3f4d..2a24efedfe11 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -254,7 +254,7 @@ enum AxisTypeListBoxEntry
IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void)
{
- const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pLB_AxisType->GetSelectedEntryPos();
if( nPos==TYPE_DATE )
m_nAxisType = chart2::AxisType::DATE;
else
@@ -276,7 +276,7 @@ bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
rOutAttrs->Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType));
if(m_bAllowDateAxis)
- rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, m_pLB_AxisType->GetSelectEntryPos()==TYPE_AUTO));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, m_pLB_AxisType->GetSelectedEntryPos()==TYPE_AUTO));
bool bAutoScale = false;
if( m_nAxisType==chart2::AxisType::CATEGORY )
@@ -438,9 +438,9 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
fOrigin = m_pFmtFldOrigin->GetValue();
fStepMain = bDateAxis ? m_pMt_MainDateStep->GetValue() : m_pFmtFldStepMain->GetValue();
nStepHelp = static_cast< sal_Int32 >( m_pMtStepHelp->GetValue());
- m_nTimeResolution = m_pLB_TimeResolution->GetSelectEntryPos();
- m_nMainTimeUnit = m_pLB_MainTimeUnit->GetSelectEntryPos();
- m_nHelpTimeUnit = m_pLB_HelpTimeUnit->GetSelectEntryPos();
+ m_nTimeResolution = m_pLB_TimeResolution->GetSelectedEntryPos();
+ m_nMainTimeUnit = m_pLB_MainTimeUnit->GetSelectedEntryPos();
+ m_nHelpTimeUnit = m_pLB_HelpTimeUnit->GetSelectedEntryPos();
if( m_nAxisType != chart2::AxisType::REALNUMBER )
m_pCbxLogarithm->Show( false );
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index c4d1ef375c2b..b2c2dd7c7737 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -187,7 +187,7 @@ void SelectorListBox::Select()
if ( !IsTravelSelect() )
{
- const sal_Int32 nPos = GetSelectEntryPos();
+ const sal_Int32 nPos = GetSelectedEntryPos();
if( static_cast<size_t>(nPos) < m_aEntries.size() )
{
ObjectIdentifier aOID = m_aEntries[nPos].OID;
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index cfad4732a591..baa15ff75ffb 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -374,7 +374,7 @@ IMPL_LINK(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void)
IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl, ListBox&, void)
{
OUString aCID = getCID(mxModel);
- sal_Int32 nPos = mpLBLabelPos->GetSelectEntryPos();
+ sal_Int32 nPos = mpLBLabelPos->GetSelectedEntryPos();
setLabelPosition(mxModel, aCID, nPos);
}
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 39607513f4f8..ae27888d4d86 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -579,7 +579,7 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void)
IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl, ListBox&, void)
{
- sal_Int32 nPos = mpLBLegendPosition->GetSelectEntryPos();
+ sal_Int32 nPos = mpLBLegendPosition->GetSelectedEntryPos();
setLegendPos(mxModel, nPos);
}
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 95100060cfb0..b4d68caee4d0 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -419,7 +419,7 @@ IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void)
IMPL_LINK_NOARG(ChartErrorBarPanel, ListBoxHdl, ListBox&, void)
{
OUString aCID = getCID(mxModel);
- sal_Int32 nPos = mpLBType->GetSelectEntryPos();
+ sal_Int32 nPos = mpLBType->GetSelectedEntryPos();
setTypePos(mxModel, aCID, nPos);
}
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 07cf968c2e7b..9d58aecbdcd5 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -478,7 +478,7 @@ IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl, ListBox&, void)
{
OUString aCID = getCID(mxModel);
- sal_Int32 nPos = mpLBLabelPlacement->GetSelectEntryPos();
+ sal_Int32 nPos = mpLBLabelPlacement->GetSelectedEntryPos();
setDataLabelPlacement(mxModel, aCID, nPos);
}
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 481723867af5..accd56afc670 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -282,7 +282,7 @@ short SvxMenuConfigPage::QueryReset()
OUString msg = CuiResId( RID_SVXSTR_CONFIRM_MENU_RESET );
OUString saveInName = m_pSaveInListBox->GetEntry(
- m_pSaveInListBox->GetSelectEntryPos() );
+ m_pSaveInListBox->GetSelectedEntryPos() );
OUString label = SvxConfigPageHelper::replaceSaveInName( msg, saveInName );
@@ -457,7 +457,7 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, ResetMenuHdl, Button *, void )
// So we are resetting only if it is a context menu
if (!m_bIsMenuBar && qbox->Execute() == RET_YES)
{
- sal_Int32 nPos = m_pTopLevelListBox->GetSelectEntryPos();
+ sal_Int32 nPos = m_pTopLevelListBox->GetSelectedEntryPos();
ContextMenuSaveInData* pSaveInData = static_cast< ContextMenuSaveInData* >(GetSaveInData());
pSaveInData->ResetContextMenu(pMenuData);
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 7112e6edbd7a..abc741297ff7 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -194,7 +194,7 @@ void SvxToolbarConfigPage::dispose()
void SvxToolbarConfigPage::DeleteSelectedTopLevel()
{
- const sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+ const sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos();
ToolbarSaveInData* pSaveInData = static_cast<ToolbarSaveInData*>( GetSaveInData() );
pSaveInData->RemoveToolbar( GetTopLevelSelection() );
@@ -361,14 +361,14 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, AddToolbarHdl, Button *, void )
}
pNameDialog->m_pSaveInListBox->SelectEntryPos(
- m_pSaveInListBox->GetSelectEntryPos() );
+ m_pSaveInListBox->GetSelectedEntryPos() );
if ( pNameDialog->Execute() == RET_OK )
{
aNewName = pNameDialog->GetName();
// Where to save the new toolbar? (i.e. Modulewise or documentwise)
- sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos();
+ sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectedEntryPos();
ToolbarSaveInData* pData =
static_cast<ToolbarSaveInData*>(
@@ -678,7 +678,7 @@ IMPL_LINK( SvxToolbarConfigPage, ModifyItemHdl, MenuButton *, pButton, void )
IMPL_LINK_NOARG( SvxToolbarConfigPage, ResetToolbarHdl, Button *, void )
{
- sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+ sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos();
SvxConfigEntry* pToolbar =
static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos ));
@@ -719,7 +719,7 @@ short SvxToolbarConfigPage::QueryReset()
OUString msg = CuiResId( RID_SVXSTR_CONFIRM_TOOLBAR_RESET );
OUString saveInName = m_pSaveInListBox->GetEntry(
- m_pSaveInListBox->GetSelectEntryPos() );
+ m_pSaveInListBox->GetSelectedEntryPos() );
OUString label = SvxConfigPageHelper::replaceSaveInName( msg, saveInName );
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 8626ddf68ba8..b342c42e327e 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1529,14 +1529,14 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* )
IMPL_LINK_NOARG( SvxConfigPage, SelectSaveInLocation, ListBox&, void )
{
pCurrentSaveInData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData(
- m_pSaveInListBox->GetSelectEntryPos()));
+ m_pSaveInListBox->GetSelectedEntryPos()));
Init();
}
void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry const * pToSelect )
{
- sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+ sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos();
m_pTopLevelListBox->Clear();
if ( GetSaveInData() && GetSaveInData()->GetEntries() )
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index a3ff1697629b..187f60af132d 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -166,7 +166,7 @@ void SvxEventConfigPage::ImplInitDocument()
IMPL_LINK_NOARG( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void )
{
bool* bApp = static_cast<bool*>(m_pSaveInListBox->GetEntryData(
- m_pSaveInListBox->GetSelectEntryPos()));
+ m_pSaveInListBox->GetSelectedEntryPos()));
mpImpl->pEventLB->SetUpdateMode( false );
if ( *bApp )
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 72d81f410f3f..770cd82a1ce7 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -635,7 +635,7 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph)
IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, ListBox&, void)
{
- const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pFontLB->GetSelectedEntryPos();
const sal_uInt16 nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos ));
aFont = GetDevFont( nFont );
aFont.SetWeight( WEIGHT_DONTKNOW );
@@ -722,7 +722,7 @@ void SvxCharacterMap::setCharName(sal_UCS4 nDecimalValue)
IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, ListBox&, void)
{
- const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pSubsetLB->GetSelectedEntryPos();
const Subset* pSubset = static_cast<const Subset*> (m_pSubsetLB->GetEntryData(nPos));
if( pSubset && !isSearchMode)
{
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 0227d3699cfc..9d025f17f7c2 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -297,7 +297,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void)
if (pButton == m_prbSingleField)
{
m_plbField->Enable();
- m_pSearchEngine->RebuildUsedFields(m_plbField->GetSelectEntryPos());
+ m_pSearchEngine->RebuildUsedFields(m_plbField->GetSelectedEntryPos());
}
else
{
@@ -409,17 +409,17 @@ IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void)
{
DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unexpected : not exactly one entry selected!");
- m_pSearchEngine->SetPosition(m_plbPosition->GetSelectEntryPos());
+ m_pSearchEngine->SetPosition(m_plbPosition->GetSelectedEntryPos());
}
IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void)
{
DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unexpected : not exactly one entry select!");
- m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectEntryPos());
+ m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectedEntryPos());
// calls m_pSearchEngine->InvalidatePreviousLoc too
- sal_Int32 nCurrentContext = m_plbForm->GetSelectEntryPos();
+ sal_Int32 nCurrentContext = m_plbForm->GetSelectedEntryPos();
if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND)
m_arrContextFields[nCurrentContext] = m_plbField->GetSelectedEntry();
}
@@ -551,7 +551,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox&, rBox, void)
{
- InitContext(rBox.GetSelectEntryPos());
+ InitContext(rBox.GetSelectedEntryPos());
}
void FmSearchDialog::EnableSearchUI(bool bEnable)
@@ -674,13 +674,13 @@ IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint, Timer *, void)
void FmSearchDialog::OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPos)
{
FmFoundRecordInformation friInfo;
- friInfo.nContext = m_plbForm->GetSelectEntryPos();
+ friInfo.nContext = m_plbForm->GetSelectedEntryPos();
// if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway
friInfo.aPosition = aCursorPos;
if (m_prbAllFields->IsChecked())
friInfo.nFieldPos = nFieldPos;
else
- friInfo.nFieldPos = m_plbField->GetSelectEntryPos();
+ friInfo.nFieldPos = m_plbField->GetSelectedEntryPos();
// this of course implies that I have really searched in the field that is selected in the listbox,
// which is made sure in RebuildUsedFields
@@ -736,7 +736,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
if (m_lnkCanceledNotFoundHdl.IsSet())
{
FmFoundRecordInformation friInfo;
- friInfo.nContext = m_plbForm->GetSelectEntryPos();
+ friInfo.nContext = m_plbForm->GetSelectedEntryPos();
// if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway
friInfo.aPosition = pProgress->aBookmark;
m_lnkCanceledNotFoundHdl.Call(friInfo);
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a6f3ff16084c..945ba73c3d53 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -289,7 +289,7 @@ void TakeThread::execute()
for( sal_Int32 i = 0; i < nEntries && schedule(); ++i )
{
- const sal_Int32 nPos = mpBrowser->bTakeAll ? i : mpBrowser->m_pLbxFound->GetSelectEntryPos( i );
+ const sal_Int32 nPos = mpBrowser->bTakeAll ? i : mpBrowser->m_pLbxFound->GetSelectedEntryPos( i );
const INetURLObject aURL( mpBrowser->aFoundList[ nPos ]);
mrTakenList.push_back( (sal_uLong)nPos );
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index d28cf058215c..ba8774d347c1 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -491,7 +491,7 @@ namespace svx
m_bInSelectionUpdate = true;
if( pControl == m_aListBox.get() )
{
- sal_uInt16 nPos = m_aListBox->GetSelectEntryPos();
+ sal_uInt16 nPos = m_aListBox->GetSelectedEntryPos();
m_aValueSet->SelectItem( nPos+1 ); //itemid == pos+1 (id 0 has special meaning)
}
else
@@ -1058,14 +1058,14 @@ namespace svx
DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" );
if( pEntry )
{
- ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this, m_aDictList, m_pDictsLB->GetSelectEntryPos());
+ ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this, m_aDictList, m_pDictsLB->GetSelectedEntryPos());
aEdDlg->Execute();
}
}
IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void)
{
- sal_uLong nSelPos = m_pDictsLB->GetSelectEntryPos();
+ sal_uLong nSelPos = m_pDictsLB->GetSelectedEntryPos();
if( nSelPos != TREELIST_ENTRY_NOTFOUND )
{
Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] );
@@ -1518,7 +1518,7 @@ namespace svx
IMPL_LINK_NOARG( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void )
{
- InitEditDictDialog( m_aBookLB->GetSelectEntryPos() );
+ InitEditDictDialog( m_aBookLB->GetSelectedEntryPos() );
}
IMPL_LINK_NOARG( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void )
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 64239c21d1bd..772360f4ab37 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -85,7 +85,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri
}
if ( bIsValidURL )
{
- sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
aURLObject.SetExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt );
}
@@ -337,7 +337,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
if ( !aStrNewName.isEmpty() )
{
// get private-url
- sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos();
if( nPos == LISTBOX_ENTRY_NOTFOUND )
nPos=0;
OUString aStrDocName ( static_cast<DocumentTypeData*>(
@@ -448,10 +448,10 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void)
INetURLObject aNewURL( aStrTmp );
if( !aStrName.isEmpty() && !aNewURL.getExtension().isEmpty() &&
- m_pLbDocTypes->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
+ m_pLbDocTypes->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND )
{
// get private-url
- const sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos();
aNewURL.setExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt );
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index bae6b299bd78..e09d52039381 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -427,7 +427,7 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( OUString& aStrName,
aStrIntName = mpEdText->GetText();
aStrName = mpEdIndication->GetText();
aStrFrame = mpCbbFrame->GetText();
- eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1);
+ eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectedEntryPos()+1);
// Ask dialog whether the current doc is a HTML-doc
if (static_cast<SvxHpLinkDlg*>(mpDialog.get())->IsHTMLDoc())
eMode = (SvxLinkInsertMode) ( sal_uInt16(eMode) | HLINK_HTMLMODE );
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 7bc05a3cdc43..9b521a28543a 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -51,7 +51,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void)
IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void)
{
sal_uLong nCount = m_pPathLB->GetEntryCount();
- bool bIsSelected = m_pPathLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND;
+ bool bIsSelected = m_pPathLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND;
bool bEnable = nCount > 1;
m_pDelBtn->Enable(bEnable && bIsSelected);
}
@@ -156,7 +156,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl, Button*, void)
{
- sal_Int32 nPos = m_pPathLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pPathLB->GetSelectedEntryPos();
m_pPathLB->RemoveEntry( nPos );
sal_Int32 nCnt = m_pPathLB->GetEntryCount();
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 50b35c157f6c..d2c950b8f6a2 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -59,7 +59,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk, Button*, void)
css::uno::Reference< css::beans::XPropertySet > xCol;
for (sal_Int32 i=0; i < m_pList->GetSelectEntryCount(); ++i)
{
- m_xColumns->getByIndex(sal::static_int_cast<sal_Int32>(reinterpret_cast<sal_uIntPtr>(m_pList->GetEntryData(m_pList->GetSelectEntryPos(i))))) >>= xCol;
+ m_xColumns->getByIndex(sal::static_int_cast<sal_Int32>(reinterpret_cast<sal_uIntPtr>(m_pList->GetEntryData(m_pList->GetSelectedEntryPos(i))))) >>= xCol;
if (xCol.is())
{
try
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 19f86c41b5de..6efcaa29d171 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -380,7 +380,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void )
{
if (!m_pWordCB->IsTravelSelect()) // act only upon return key and not when traveling with cursor keys
{
- const sal_Int32 nPos = rBox.GetSelectEntryPos();
+ const sal_Int32 nPos = rBox.GetSelectedEntryPos();
OUString aStr( rBox.GetEntry( nPos ) );
aStr = linguistic::GetThesaurusReplaceText( aStr );
m_pWordCB->SetText( aStr );
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 405a743efa34..372e0b99aa8c 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -80,7 +80,7 @@ class OfaACorrCheckListBox : public SvSimpleTable
void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
- sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
+ sal_uLong GetSelectedEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked);
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 9e6de15e9e91..81386ef877b2 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -478,7 +478,7 @@ public:
SvxConfigEntry* GetTopLevelSelection()
{
return static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData(
- m_pTopLevelListBox->GetSelectEntryPos() ));
+ m_pTopLevelListBox->GetSelectedEntryPos() ));
}
/** identifies the module in the given frame. If the frame is <NULL/>, a default
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 189a95e3b4f7..d4fdaa5ed54b 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -191,7 +191,7 @@ public:
GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm );
virtual ~GalleryIdDialog() override;
virtual void dispose() override;
- sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); }
+ sal_uLong GetId() const { return m_pLbResName->GetSelectedEntryPos(); }
};
class GalleryThemeProperties : public SfxTabDialog
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 0dfb9adcca7b..79c0e9f32f8f 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -196,7 +196,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
m_pNonPropFontsOnlyCB->IsChecked(), batch);
//font name changes cannot be detected by saved values
OUString sFontName;
- if(m_pFontNameLB->GetSelectEntryPos())
+ if(m_pFontNameLB->GetSelectedEntryPos())
sFontName = m_pFontNameLB->GetSelectedEntry();
officecfg::Office::Common::Font::SourceViewFont::FontName::set(
boost::optional< OUString >(sFontName), batch);
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 030dd28a4739..af7ce029c4b6 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -27,7 +27,7 @@
Color SvxDefaultColorOptPage::GetSelectEntryColor() const
{
- sal_Int32 nPos = m_pLbChartColors->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbChartColors->GetSelectedEntryPos();
Color aColor;
if (nPos != LISTBOX_ENTRY_NOTFOUND)
aColor = GetEntryColor(nPos);
@@ -288,7 +288,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor, Button*, void)
IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void )
{
- sal_Int32 nIndex = m_pLbChartColors->GetSelectEntryPos();
+ sal_Int32 nIndex = m_pLbChartColors->GetSelectedEntryPos();
if (m_pLbChartColors->GetSelectEntryCount() == 0)
return;
@@ -331,7 +331,7 @@ IMPL_LINK_NOARG( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, void )
IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void)
{
- sal_Int32 nIdx = m_pLbChartColors->GetSelectEntryPos();
+ sal_Int32 nIdx = m_pLbChartColors->GetSelectedEntryPos();
if( nIdx != LISTBOX_ENTRY_NOTFOUND )
{
const XColorEntry aEntry( m_pValSetColorBox->GetItemColor( m_pValSetColorBox->GetSelectItemId() ), m_pLbChartColors->GetSelectedEntry() );
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 7223e2f4b1a2..6b1223c4485a 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1135,7 +1135,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void )
if(RET_YES == aQuery->Execute())
{
OUString sDeleteScheme(m_pColorSchemeLB->GetSelectedEntry());
- m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos());
+ m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectedEntryPos());
m_pColorSchemeLB->SelectEntryPos(0);
m_pColorSchemeLB->GetSelectHdl().Call(*m_pColorSchemeLB);
//first select the new scheme and then delete the old one
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index ca8e9137ae8b..904e87796b6d 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -114,7 +114,7 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
if ( m_pNumeralsLB->IsValueChangedFromSaved() )
{
- const sal_Int32 nPos = m_pNumeralsLB->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pNumeralsLB->GetSelectedEntryPos();
aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos );
bModified = true;
}
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index feb5326cdffe..e546069a679a 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -290,7 +290,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
if ( nCount > 0 )
{
pAllDictsLB->SelectEntry( aLookUpEntry );
- sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos();
+ sal_Int32 nPos = pAllDictsLB->GetSelectedEntryPos();
if ( nPos == LISTBOX_ENTRY_NOTFOUND )
{
@@ -402,7 +402,7 @@ sal_uLong SvxEditDictionaryDialog::GetLBInsertPos(const OUString &rDicWord)
void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry)
{
- sal_Int32 nLBPos = pAllDictsLB->GetSelectEntryPos();
+ sal_Int32 nLBPos = pAllDictsLB->GetSelectedEntryPos();
if ( pEntry != nullptr && nLBPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -419,7 +419,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry)
IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void)
{
- sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos();
+ sal_Int32 nPos = pAllDictsLB->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -442,7 +442,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void)
IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void)
{
- sal_Int32 nDicPos = pAllDictsLB->GetSelectEntryPos();
+ sal_Int32 nDicPos = pAllDictsLB->GetSelectedEntryPos();
LanguageType nLang = pLangLB->GetSelectLanguage();
Reference< XDictionary > xDic( aDics.getConstArray()[ nDicPos ], UNO_QUERY );
LanguageType nOldLang = LanguageTag( xDic->getLocale() ).getLanguageType();
@@ -599,7 +599,7 @@ bool SvxEditDictionaryDialog::NewDelHdl(void const * pBtn)
OUString aReplaceStr(pReplaceED->GetText());
DictionaryError nAddRes = DictionaryError::UNKNOWN;
- sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos();
+ sal_Int32 nPos = pAllDictsLB->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && !aNewWord.isEmpty())
{
DBG_ASSERT(nPos < aDics.getLength(), "invalid dictionary index");
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index bba98cf6540c..bf89e846c98c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -722,7 +722,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
bool bRepaintWindows(false);
SvtMiscOptions aMiscOptions;
- const sal_Int32 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectEntryPos();
+ const sal_Int32 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectedEntryPos();
if( nSizeLB_InitialSelection != nSizeLB_NewSelection )
{
// from now on it's modified, even if via auto setting the same size was set as now selected in the LB
@@ -739,7 +739,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
aMiscOptions.SetSymbolsSize( eSet );
}
- const sal_Int32 nSidebarSizeLB_NewSelection = m_pSidebarIconSizeLB->GetSelectEntryPos();
+ const sal_Int32 nSidebarSizeLB_NewSelection = m_pSidebarIconSizeLB->GetSelectedEntryPos();
if( nSidebarSizeLB_InitialSelection != nSidebarSizeLB_NewSelection )
{
// from now on it's modified, even if via auto setting the same size was set as now selected in the LB
@@ -755,7 +755,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
aMiscOptions.SetSidebarIconSize( eSet );
}
- const sal_Int32 nNotebookbarSizeLB_NewSelection = m_pNotebookbarIconSizeLB->GetSelectEntryPos();
+ const sal_Int32 nNotebookbarSizeLB_NewSelection = m_pNotebookbarIconSizeLB->GetSelectedEntryPos();
if( nNotebookbarSizeLB_InitialSelection != nNotebookbarSizeLB_NewSelection )
{
// from now on it's modified, even if via auto setting the same size was set as now selected in the LB
@@ -771,7 +771,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
aMiscOptions.SetNotebookbarIconSize( eSet );
}
- const sal_Int32 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectEntryPos();
+ const sal_Int32 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectedEntryPos();
if( nStyleLB_InitialSelection != nStyleLB_NewSelection )
{
// 0 means choose style automatically
@@ -779,7 +779,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
aMiscOptions.SetIconTheme("auto");
else
{
- const sal_Int32 pos = m_pIconStyleLB->GetSelectEntryPos();
+ const sal_Int32 pos = m_pIconStyleLB->GetSelectedEntryPos();
const vcl::IconThemeInfo& iconThemeId = mInstalledIconThemes.at(pos-1);
aMiscOptions.SetIconTheme(iconThemeId.GetThemeId());
}
@@ -790,7 +790,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
// Mouse Snap Mode
SnapType eOldSnap = pAppearanceCfg->GetSnapMode();
- SnapType eNewSnap = (SnapType)m_pMousePosLB->GetSelectEntryPos();
+ SnapType eNewSnap = (SnapType)m_pMousePosLB->GetSelectedEntryPos();
if(eNewSnap > SnapType::NONE)
eNewSnap = SnapType::NONE;
@@ -802,7 +802,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
// Middle Mouse Button
MouseMiddleButtonAction eOldMiddleMouse = pAppearanceCfg->GetMiddleMouseButton();
- short eNewMiddleMouse = m_pMouseMiddleLB->GetSelectEntryPos();
+ short eNewMiddleMouse = m_pMouseMiddleLB->GetSelectedEntryPos();
if(eNewMiddleMouse > 2)
eNewMiddleMouse = 2;
@@ -834,9 +834,9 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
if(m_pMenuIconsLB->IsValueChangedFromSaved())
{
- aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectEntryPos() == 0 ?
+ aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectedEntryPos() == 0 ?
TRISTATE_INDET :
- static_cast<TriState>(m_pMenuIconsLB->GetSelectEntryPos() - 1));
+ static_cast<TriState>(m_pMenuIconsLB->GetSelectedEntryPos() - 1));
bModified = true;
bMenuOptModified = true;
bAppearanceChanged = true;
@@ -844,9 +844,9 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
if(m_pContextMenuShortcutsLB->IsValueChangedFromSaved())
{
- aMenuOpt.SetContextMenuShortcuts(m_pContextMenuShortcutsLB->GetSelectEntryPos() == 0 ?
+ aMenuOpt.SetContextMenuShortcuts(m_pContextMenuShortcutsLB->GetSelectedEntryPos() == 0 ?
TRISTATE_INDET :
- static_cast<TriState>(m_pContextMenuShortcutsLB->GetSelectEntryPos() - 1));
+ static_cast<TriState>(m_pContextMenuShortcutsLB->GetSelectedEntryPos() - 1));
bModified = true;
bMenuOptModified = true;
bAppearanceChanged = true;
@@ -1334,7 +1334,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
aLangString = seqInstalledLanguages[d-1];
/*
- if( m_pUserInterfaceLB->GetSelectEntryPos() > 0)
+ if( m_pUserInterfaceLB->GetSelectedEntryPos() > 0)
aLangString = ConvertLanguageToIsoString(m_pUserInterfaceLB->GetSelectLanguage());
*/
Reference< XMultiServiceFactory > theConfigProvider(
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 126017e2f9b8..4e6e90b6e998 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -400,7 +400,7 @@ void SvxProxyTabPage::Reset(const SfxItemSet*)
m_pFtpPortED->SaveValue();
m_pNoProxyForED->SaveValue();
- EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 );
+ EnableControls_Impl( m_pProxyModeLB->GetSelectedEntryPos() == 2 );
}
bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
@@ -410,7 +410,7 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
try {
Reference< beans::XPropertySet > xPropertySet(m_xConfigurationUpdateAccess, UNO_QUERY_THROW );
- sal_Int32 nSelPos = m_pProxyModeLB->GetSelectEntryPos();
+ sal_Int32 nSelPos = m_pProxyModeLB->GetSelectedEntryPos();
if(m_pProxyModeLB->IsValueChangedFromSaved())
{
if( nSelPos == 1 )
@@ -512,7 +512,7 @@ void SvxProxyTabPage::EnableControls_Impl(bool bEnable)
IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void )
{
- sal_Int32 nPos = rBox.GetSelectEntryPos();
+ sal_Int32 nPos = rBox.GetSelectedEntryPos();
// Restore original system values
if( nPos == 1 )
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 5bd4b65ad062..b619232e1c8f 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -782,7 +782,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void)
IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void)
{
- sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
+ sal_Int32 nPos = m_pAssignedList->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
m_pAssignedList->RemoveEntry( nPos );
@@ -803,7 +803,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void)
void SvxJavaParameterDlg::EditParameter()
{
- sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
+ sal_Int32 nPos = m_pAssignedList->GetSelectedEntryPos();
m_pParameterEdit->SetText( OUString() );
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -978,7 +978,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void)
{
- sal_Int32 nPos = m_pPathList->GetSelectEntryPos();
+ sal_Int32 nPos = m_pPathList->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
m_pPathList->RemoveEntry( nPos );
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 6598dfda5c70..064cacce64e0 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -138,13 +138,13 @@ private:
void EnableRemoveButton()
{ m_pRemoveBtn->Enable(
- m_pAssignedList->GetSelectEntryPos()
+ m_pAssignedList->GetSelectedEntryPos()
!= LISTBOX_ENTRY_NOTFOUND ); }
void EnableEditButton()
{ m_pEditBtn->Enable(
- m_pAssignedList->GetSelectEntryPos()
+ m_pAssignedList->GetSelectedEntryPos()
!= LISTBOX_ENTRY_NOTFOUND ); }
void DisableAssignButton()
@@ -190,7 +190,7 @@ private:
bool IsPathDuplicate( const OUString& _rPath );
void EnableRemoveButton()
{ m_pRemoveBtn->Enable(
- m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); }
+ m_pPathList->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ); }
public:
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 44fd520ba724..bc0690d3c26d 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1477,7 +1477,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void
if (pBox == m_pLinguModulesCLB)
{
DBG_ASSERT( pLinguData, "NULL pointer, LinguData missing" );
- sal_uLong nPos = m_pLinguModulesCLB->GetSelectEntryPos();
+ sal_uLong nPos = m_pLinguModulesCLB->GetSelectedEntryPos();
if (nPos != TREELIST_ENTRY_NOTFOUND && pLinguData)
{
pLinguData->Reconfigure( m_pLinguModulesCLB->GetText( nPos ),
@@ -1486,7 +1486,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void
}
else if (pBox == m_pLinguDicsCLB)
{
- sal_uLong nPos = m_pLinguDicsCLB->GetSelectEntryPos();
+ sal_uLong nPos = m_pLinguDicsCLB->GetSelectedEntryPos();
if (nPos != TREELIST_ENTRY_NOTFOUND)
{
const uno::Reference< XDictionary > &rDic = aDics.getConstArray()[ nPos ];
@@ -1865,7 +1865,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void )
ModuleUserData_Impl* pData = static_cast<ModuleUserData_Impl*>(pEntry->GetUserData());
if(!pData->IsParent() && pData->GetType() != TYPE_HYPH)
{
- sal_uLong nCurPos = static_cast<SvxCheckListBox*>(pBox)->GetSelectEntryPos();
+ sal_uLong nCurPos = static_cast<SvxCheckListBox*>(pBox)->GetSelectedEntryPos();
if(nCurPos < pBox->GetEntryCount() - 1)
{
bDisableDown = static_cast<ModuleUserData_Impl*>(pBox->
@@ -2181,7 +2181,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox const * pBox)
IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void )
{
bool bUp = m_pPrioUpPB == pBtn;
- sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos();
+ sal_uLong nCurPos = m_pModulesCLB->GetSelectedEntryPos();
SvTreeListEntry* pEntry;
if (nCurPos != TREELIST_ENTRY_NOTFOUND &&
nullptr != (pEntry = m_pModulesCLB->GetEntry(nCurPos)))
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 9876b2afa36a..048ac415d8d6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -560,7 +560,7 @@ static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties, con
IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void )
{
- const sal_Int32 nCurPos = aDocTypeLB->GetSelectEntryPos();
+ const sal_Int32 nCurPos = aDocTypeLB->GetSelectedEntryPos();
sal_IntPtr nData = -1;
if(nCurPos < APP_COUNT)
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 25237bbc7d07..f14a3a05cb0a 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -518,7 +518,7 @@ IMPL_LINK_NOARG( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox&, vo
// Get the details of the selected theme.
m_pExtensionPersonaPreview->Show();
- sal_Int32 nSelectedPos = m_pPersonaList->GetSelectEntryPos();
+ sal_Int32 nSelectedPos = m_pPersonaList->GetSelectedEntryPos();
OUString aSettings = m_vExtensionPersonaSettings[nSelectedPos];
sal_Int32 nIndex = aSettings.indexOf( ';' );
OUString aPreviewFile = aSettings.copy( 0, nIndex );
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 215a63454919..b53741f1691d 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -123,7 +123,7 @@ IMPL_LINK_NOARG(TSAURLsDialog, SelectHdl, ListBox&, void)
IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl, Button*, void)
{
- sal_Int32 nSel = m_pURLListBox->GetSelectEntryPos();
+ sal_Int32 nSel = m_pURLListBox->GetSelectedEntryPos();
if (nSel == LISTBOX_ENTRY_NOTFOUND)
return;
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 02c769659804..18d52e7d0a44 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -141,7 +141,7 @@ void lcl_MaybeResetAlignToDistro(
void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const ListBox& rLB, sal_uInt16 nListPos)
{
SvxCellJustifyMethod eJM = SvxCellJustifyMethod::Auto;
- if (rLB.GetSelectEntryPos() == nListPos)
+ if (rLB.GetSelectedEntryPos() == nListPos)
eJM = SvxCellJustifyMethod::Distribute;
SvxJustifyMethodItem aItem(eJM, nWhichJM);
@@ -369,7 +369,7 @@ void AlignmentTabPage::InitVsRefEgde()
void AlignmentTabPage::UpdateEnableControls()
{
- const sal_Int32 nHorAlign = m_pLbHorAlign->GetSelectEntryPos();
+ const sal_Int32 nHorAlign = m_pLbHorAlign->GetSelectedEntryPos();
bool bHorLeft = (nHorAlign == ALIGNDLG_HORALIGN_LEFT);
bool bHorBlock = (nHorAlign == ALIGNDLG_HORALIGN_BLOCK);
bool bHorFill = (nHorAlign == ALIGNDLG_HORALIGN_FILL);
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 5512f1a583b3..ec37b08ecf0f 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -119,7 +119,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
nLangList |= SvxLanguageListFlags::CJK;
m_pLanguageLB->SetLanguageList( nLangList, true, true );
m_pLanguageLB->SelectLanguage( LANGUAGE_NONE );
- sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos();
DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, "listbox entry missing" );
m_pLanguageLB->SetEntryData( nPos, reinterpret_cast<void*>((sal_uInt16)LANGUAGE_UNDETERMINED) );
@@ -160,7 +160,7 @@ static bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry,
CollatorWrapper const & rCmpClass )
{
sal_Int32 nCount = rLB.GetEntryCount();
- sal_Int32 nSelPos = rLB.GetSelectEntryPos();
+ sal_Int32 nSelPos = rLB.GetSelectedEntryPos();
sal_Int32 i;
for(i = 0; i < nCount; i++)
{
@@ -177,7 +177,7 @@ static bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry,
IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void)
{
- sal_Int32 nPos = rBox.GetSelectEntryPos();
+ sal_Int32 nPos = rBox.GetSelectedEntryPos();
void* pVoid = rBox.GetEntryData(nPos);
LanguageType eNewLang = LanguageType(reinterpret_cast<sal_IntPtr>(pVoid));
// save old settings and fill anew
@@ -729,7 +729,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, boo
IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void)
{
- sal_uLong nSelEntryPos = m_pCheckLB->GetSelectEntryPos();
+ sal_uLong nSelEntryPos = m_pCheckLB->GetSelectedEntryPos();
if( nSelEntryPos == REPLACE_BULLETS ||
nSelEntryPos == APPLY_NUMBERING)
{
@@ -843,7 +843,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
if(!rKEvt.GetKeyCode().GetModifier() &&
KEY_SPACE == rKEvt.GetKeyCode().GetCode())
{
- sal_uLong nSelPos = GetSelectEntryPos();
+ sal_uLong nSelPos = GetSelectedEntryPos();
sal_uInt16 nCol = GetCurrentTabPos() - 1;
if ( nCol < 2 )
{
@@ -2278,7 +2278,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
bModified |= nVal != pOpt->nAutoCmpltListLen;
pOpt->nAutoCmpltListLen = nVal;
- const sal_Int32 nPos = m_pDCBExpandKey->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pDCBExpandKey->GetSelectedEntryPos();
if( nPos < m_pDCBExpandKey->GetEntryCount() )
{
sal_uLong nKey = reinterpret_cast<sal_uLong>(m_pDCBExpandKey->GetEntryData( nPos ));
@@ -2360,7 +2360,7 @@ IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl, Button*, void)
(m_pAutoCompleteList) ? m_pLBEntries->GetSelectEntryCount() : 0;
while( nSelCnt )
{
- sal_Int32 nPos = m_pLBEntries->GetSelectEntryPos( --nSelCnt );
+ sal_Int32 nPos = m_pLBEntries->GetSelectedEntryPos( --nSelCnt );
OUString* pStr = static_cast<OUString*>(m_pLBEntries->GetEntryData(nPos));
m_pLBEntries->RemoveEntry( nPos );
editeng::IAutoCompleteString hack(*pStr); // UGLY
@@ -2572,7 +2572,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr )
*/
IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void)
{
- const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos();
+ const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectedEntryPos();
const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos);
const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData());
uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec;
@@ -2607,7 +2607,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl, SvTreeListBox*, void)
if ( m_pSmartTagTypesLB->GetEntryCount() < 1 )
return;
- const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos();
+ const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectedEntryPos();
const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos);
const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData());
uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index d38f5bfe67fb..39e0e8413393 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -522,7 +522,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
{
if(m_pTblLBox->IsVisible())
{
- sal_Int32 nValue = m_pTblLBox->GetSelectEntryPos();
+ sal_Int32 nValue = m_pTblLBox->GetSelectedEntryPos();
if ( pTableBck_Impl )
{
@@ -610,7 +610,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
if ( m_pTblLBox->IsVisible() )
{
- switch( m_pTblLBox->GetSelectEntryPos() )
+ switch( m_pTblLBox->GetSelectedEntryPos() )
{
case TBL_DEST_CELL:
nSlot = SID_ATTR_BRUSH;
@@ -806,7 +806,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
if( m_pTblLBox->IsValueChangedFromSaved() )
{
rCoreSet->Put( SfxUInt16Item( SID_BACKGRND_DESTINATION,
- m_pTblLBox->GetSelectEntryPos() ) );
+ m_pTblLBox->GetSelectedEntryPos() ) );
bModified = true;
}
}
@@ -1225,7 +1225,7 @@ void SvxBackgroundTabPage::ShowTblControl()
IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, void )
{
- sal_Int32 nSelPos = rBox.GetSelectEntryPos();
+ sal_Int32 nSelPos = rBox.GetSelectedEntryPos();
if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos)
{
std::unique_ptr<SvxBrushItem> xItemHolder;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 5b3d1ecefae8..f2b3e8cfe99c 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -585,7 +585,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
// - no line - should not be selected
- if ( m_pLbLineStyle->GetSelectEntryPos() == 0 )
+ if ( m_pLbLineStyle->GetSelectedEntryPos() == 0 )
{
m_pLbLineStyle->SelectEntryPos( 1 );
SelStyleHdl_Impl(*m_pLbLineStyle);
@@ -878,7 +878,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void)
if( m_pFrameSel->IsAnyBorderSelected() )
{
// any visible style, but "no-line" in line list box? -> use hair-line
- if( (m_pLbLineStyle->GetSelectEntryPos() == 0) || (m_pLbLineStyle->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND) )
+ if( (m_pLbLineStyle->GetSelectedEntryPos() == 0) || (m_pLbLineStyle->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND) )
m_pLbLineStyle->SelectEntryPos( 1 );
// set current style to all previously selected lines
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 7ca6d1931571..b1abbe7c39c2 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1488,11 +1488,11 @@ void SvxCharEffectsPage::UpdatePreview_Impl()
rCJKFont.SetColor(GetPreviewFontColor(rSelectedColor));
rCTLFont.SetColor(GetPreviewFontColor(rSelectedColor));
- sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pUnderlineLB->GetSelectedEntryPos();
FontLineStyle eUnderline = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData( nPos ));
- nPos = m_pOverlineLB->GetSelectEntryPos();
+ nPos = m_pOverlineLB->GetSelectedEntryPos();
FontLineStyle eOverline = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData( nPos ));
- nPos = m_pStrikeoutLB->GetSelectEntryPos();
+ nPos = m_pStrikeoutLB->GetSelectedEntryPos();
FontStrikeout eStrikeout = (FontStrikeout)reinterpret_cast<sal_uLong>(m_pStrikeoutLB->GetEntryData( nPos ));
rFont.SetUnderline( eUnderline );
rCJKFont.SetUnderline( eUnderline );
@@ -1506,8 +1506,8 @@ void SvxCharEffectsPage::UpdatePreview_Impl()
rCJKFont.SetStrikeout( eStrikeout );
rCTLFont.SetStrikeout( eStrikeout );
- nPos = m_pPositionLB->GetSelectEntryPos();
- sal_Int32 nEmphasis = m_pEmphasisLB->GetSelectEntryPos();
+ nPos = m_pPositionLB->GetSelectedEntryPos();
+ sal_Int32 nEmphasis = m_pEmphasisLB->GetSelectedEntryPos();
if (nEmphasis != LISTBOX_ENTRY_NOTFOUND)
{
bool bUnder = ( CHRDLG_POSITION_UNDER == reinterpret_cast<sal_uLong>(m_pPositionLB->GetEntryData( nPos )) );
@@ -1518,7 +1518,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl()
rCTLFont.SetEmphasisMark( eMark );
}
- sal_Int32 nRelief = m_pReliefLB->GetSelectEntryPos();
+ sal_Int32 nRelief = m_pReliefLB->GetSelectedEntryPos();
if (LISTBOX_ENTRY_NOTFOUND != nRelief)
{
rFont.SetRelief( (FontRelief)nRelief );
@@ -1534,7 +1534,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl()
rCJKFont.SetShadow( rFont.IsShadow() );
rCTLFont.SetShadow( rFont.IsShadow() );
- sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos();
+ sal_Int32 nCapsPos = m_pEffectsLB->GetSelectedEntryPos();
if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND )
{
SvxCaseMap eCaps = (SvxCaseMap)nCapsPos;
@@ -1653,22 +1653,22 @@ void SvxCharEffectsPage::SelectHdl_Impl( ListBox* pBox )
{
if ( m_pEmphasisLB == pBox )
{
- sal_Int32 nEPos = m_pEmphasisLB->GetSelectEntryPos();
+ sal_Int32 nEPos = m_pEmphasisLB->GetSelectedEntryPos();
bool bEnable = ( nEPos > 0 && nEPos != LISTBOX_ENTRY_NOTFOUND );
m_pPositionFT->Enable( bEnable );
m_pPositionLB->Enable( bEnable );
}
else if( m_pReliefLB == pBox)
{
- bool bEnable = ( pBox->GetSelectEntryPos() == 0 );
+ bool bEnable = ( pBox->GetSelectedEntryPos() == 0 );
m_pOutlineBtn->Enable( bEnable );
m_pShadowBtn->Enable( bEnable );
}
else if ( m_pPositionLB.get() != pBox )
{
- sal_Int32 nUPos = m_pUnderlineLB->GetSelectEntryPos(),
- nOPos = m_pOverlineLB->GetSelectEntryPos(),
- nSPos = m_pStrikeoutLB->GetSelectEntryPos();
+ sal_Int32 nUPos = m_pUnderlineLB->GetSelectedEntryPos(),
+ nOPos = m_pOverlineLB->GetSelectedEntryPos(),
+ nSPos = m_pStrikeoutLB->GetSelectedEntryPos();
bool bUEnable = ( nUPos > 0 && nUPos != LISTBOX_ENTRY_NOTFOUND );
bool bOEnable = ( nOPos > 0 && nOPos != LISTBOX_ENTRY_NOTFOUND );
m_pUnderlineColorFT->Enable( bUEnable );
@@ -1683,9 +1683,9 @@ void SvxCharEffectsPage::SelectHdl_Impl( ListBox* pBox )
IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void)
{
- bool bEnable = ( ( m_pUnderlineLB->GetSelectEntryPos() > 0 ) ||
- ( m_pOverlineLB->GetSelectEntryPos() > 0 ) ||
- ( m_pStrikeoutLB->GetSelectEntryPos() > 0 ) );
+ bool bEnable = ( ( m_pUnderlineLB->GetSelectedEntryPos() > 0 ) ||
+ ( m_pOverlineLB->GetSelectedEntryPos() > 0 ) ||
+ ( m_pStrikeoutLB->GetSelectedEntryPos() > 0 ) );
m_pIndividualWordsBtn->Enable( bEnable );
UpdatePreview_Impl();
@@ -2154,7 +2154,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
// Underline
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE );
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_UNDERLINE );
- sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pUnderlineLB->GetSelectedEntryPos();
FontLineStyle eUnder = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData( nPos ));
if ( pOld )
@@ -2188,7 +2188,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
// Overline
nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE );
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_OVERLINE );
- nPos = m_pOverlineLB->GetSelectEntryPos();
+ nPos = m_pOverlineLB->GetSelectedEntryPos();
FontLineStyle eOver = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData( nPos ));
if ( pOld )
@@ -2222,7 +2222,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
// Strikeout
nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT );
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_STRIKEOUT );
- nPos = m_pStrikeoutLB->GetSelectEntryPos();
+ nPos = m_pStrikeoutLB->GetSelectedEntryPos();
FontStrikeout eStrike = (FontStrikeout)reinterpret_cast<sal_uLong>(m_pStrikeoutLB->GetEntryData( nPos ));
if ( pOld )
@@ -2278,8 +2278,8 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
// Emphasis
nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK );
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_EMPHASISMARK );
- sal_Int32 nMarkPos = m_pEmphasisLB->GetSelectEntryPos();
- sal_Int32 nPosPos = m_pPositionLB->GetSelectEntryPos();
+ sal_Int32 nMarkPos = m_pEmphasisLB->GetSelectedEntryPos();
+ sal_Int32 nPosPos = m_pPositionLB->GetSelectedEntryPos();
FontEmphasisMark eMark = (FontEmphasisMark)nMarkPos;
if ( m_pPositionLB->IsEnabled() )
{
@@ -2316,7 +2316,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CASEMAP );
SvxCaseMap eCaseMap = SvxCaseMap::NotMapped;
bool bChecked = false;
- sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos();
+ sal_Int32 nCapsPos = m_pEffectsLB->GetSelectedEntryPos();
if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND )
{
eCaseMap = (SvxCaseMap)nCapsPos;
@@ -2352,7 +2352,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
if(m_pReliefLB->IsValueChangedFromSaved())
{
m_pReliefLB->SaveValue();
- SvxCharReliefItem aRelief((FontRelief)m_pReliefLB->GetSelectEntryPos(), nWhich);
+ SvxCharReliefItem aRelief((FontRelief)m_pReliefLB->GetSelectedEntryPos(), nWhich);
rSet->Put(aRelief);
}
@@ -3276,7 +3276,7 @@ IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void)
IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void )
{
- sal_Int32 nPos = rBox.GetSelectEntryPos();
+ sal_Int32 nPos = rBox.GetSelectedEntryPos();
if ( CHRDLG_ENCLOSE_SPECIAL_CHAR == reinterpret_cast<sal_uLong>(rBox.GetEntryData( nPos )) )
SelectCharacter( &rBox );
else
@@ -3339,9 +3339,9 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet )
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES );
const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_TWO_LINES );
bool bOn = m_pTwoLinesBtn->IsChecked();
- sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 )
+ sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectedEntryPos() > 0 )
? m_pStartBracketLB->GetSelectedEntry()[0] : 0;
- sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 )
+ sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectedEntryPos() > 0 )
? m_pEndBracketLB->GetSelectedEntry()[0] : 0;
if ( pOld )
@@ -3365,9 +3365,9 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet )
void SvxCharTwoLinesPage::UpdatePreview_Impl()
{
- sal_Unicode cStart = m_pStartBracketLB->GetSelectEntryPos() > 0
+ sal_Unicode cStart = m_pStartBracketLB->GetSelectedEntryPos() > 0
? m_pStartBracketLB->GetSelectedEntry()[0] : 0;
- sal_Unicode cEnd = m_pEndBracketLB->GetSelectEntryPos() > 0
+ sal_Unicode cEnd = m_pEndBracketLB->GetSelectedEntryPos() > 0
? m_pEndBracketLB->GetSelectedEntry()[0] : 0;
m_pPreviewWin->SetBrackets(cStart, cEnd);
m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked());
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 118bb62de742..25b1ecd170d9 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -362,7 +362,7 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs)
}
- sal_Int32 nPos = m_pLbType->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbType->GetSelectedEntryPos();
if( m_pLbType->IsValueChangedFromSaved() )
{
if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -450,7 +450,7 @@ void SvxConnectionPage::ChangeAttrHdl_Impl(void const * p)
if( p == m_pLbType )
{
- sal_Int32 nPos = m_pLbType->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbType->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
aAttrSet.Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) );
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index b2cd972394b1..02f5a1912156 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -201,7 +201,7 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs)
{
long nVal = 0;
- switch( m_pLB_ANSATZ_REL->GetSelectEntryPos() )
+ switch( m_pLB_ANSATZ_REL->GetSelectedEntryPos() )
{
case AT_OBEN: nVal=0;break;
case AT_MITTE: nVal=5000;break;
@@ -422,7 +422,7 @@ IMPL_LINK( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void )
{
if (&rListBox == m_pLB_ANSATZ)
{
- SetupAnsatz_Impl( m_pLB_ANSATZ->GetSelectEntryPos() );
+ SetupAnsatz_Impl( m_pLB_ANSATZ->GetSelectedEntryPos() );
}
}
@@ -430,7 +430,7 @@ IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox, void
{
if (&rListBox == m_pLB_ANSATZ_REL)
{
- nAnsatzRelPos = m_pLB_ANSATZ_REL->GetSelectEntryPos();
+ nAnsatzRelPos = m_pLB_ANSATZ_REL->GetSelectedEntryPos();
}
}
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 86a3481f0f23..9dc0230104bb 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -507,7 +507,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
bModified = true;
}
- sal_Int32 nPos = m_pLbUnit->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbUnit->GetSelectedEntryPos();
if( m_pLbUnit->IsValueChangedFromSaved() )
{
if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -735,7 +735,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void const * p )
if( p == m_pLbUnit )
{
- sal_Int32 nPos = m_pLbUnit->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbUnit->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pLbUnit->GetEntryData( nPos ));
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 6503b48fe9bb..f37ee3963c26 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -841,7 +841,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
}
else
{
- nTmpCatPos=m_pLbCategory->GetSelectEntryPos();
+ nTmpCatPos=m_pLbCategory->GetSelectedEntryPos();
}
switch (nTmpCatPos)
@@ -898,13 +898,13 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_False*/ )
{
OUString theFormat = m_pEdFormat->GetText();
- sal_Int32 nCurCategory = m_pLbCategory->GetSelectEntryPos();
+ sal_Int32 nCurCategory = m_pLbCategory->GetSelectedEntryPos();
sal_uInt16 nCategory = static_cast<sal_uInt16>(nCurCategory);
sal_uInt16 nDecimals = 0;
sal_uInt16 nZeroes = 0;
bool bNegRed = false;
bool bThousand = false;
- sal_Int32 nCurrencyPos =m_pLbCurrency->GetSelectEntryPos();
+ sal_Int32 nCurrencyPos =m_pLbCurrency->GetSelectedEntryPos();
if(bOneAreaFlag)
nCurCategory=nFixedCategory;
@@ -982,7 +982,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa
m_pFtLeadZeroes->Enable();
m_pEdLeadZeroes->Enable();
m_pBtnNegRed->Enable();
- if ( nCategory == CAT_NUMBER && m_pLbFormat->GetSelectEntryPos() == 0 )
+ if ( nCategory == CAT_NUMBER && m_pLbFormat->GetSelectedEntryPos() == 0 )
m_pEdDecimals->SetText( "" ); //General format tdf#44399
else
if ( nCategory == CAT_FRACTION )
@@ -1053,7 +1053,7 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
}
else
{
- nTmpCatPos=m_pLbCategory->GetSelectEntryPos();
+ nTmpCatPos=m_pLbCategory->GetSelectedEntryPos();
}
@@ -1139,7 +1139,7 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
void SvxNumberFormatTabPage::UpdateThousandEngineeringCheckBox()
{
- bool bIsScientific = m_pLbCategory->GetSelectEntryPos() == CAT_SCIENTIFIC;
+ bool bIsScientific = m_pLbCategory->GetSelectedEntryPos() == CAT_SCIENTIFIC;
m_pBtnThousand->Show( !bIsScientific );
m_pBtnEngineering->Show( bIsScientific );
}
@@ -1153,7 +1153,7 @@ void SvxNumberFormatTabPage::UpdateThousandEngineeringCheckBox()
void SvxNumberFormatTabPage::UpdateDecimalsDenominatorEditBox()
{
- bool bIsFraction = m_pLbCategory->GetSelectEntryPos() == CAT_FRACTION;
+ bool bIsFraction = m_pLbCategory->GetSelectedEntryPos() == CAT_FRACTION;
m_pFtDecimals->Show( !bIsFraction );
m_pEdDecimals->Show( !bIsFraction );
m_pFtDenominator->Show( bIsFraction );
@@ -1233,7 +1233,7 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb )
// And yes, m_pLbFormat is a SvxFontListBox with sal_uLong list positions,
// implementation returns a TREELIST_ENTRY_NOTFOUND if empty,
// comparison with sal_Int32 LISTBOX_ENTRY_NOTFOUND wouldn't match.
- if ( m_pLbFormat->GetSelectEntryPos() == TREELIST_ENTRY_NOTFOUND )
+ if ( m_pLbFormat->GetSelectedEntryPos() == TREELIST_ENTRY_NOTFOUND )
pLb = m_pLbCategory; // continue with the current category selected
else
pLb = m_pLbFormat; // continue with the current format selected
@@ -1247,12 +1247,12 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb )
}
else
{
- nTmpCatPos=m_pLbCategory->GetSelectEntryPos();
+ nTmpCatPos=m_pLbCategory->GetSelectedEntryPos();
}
if (nTmpCatPos==CAT_CURRENCY && pLb == m_pLbCurrency )
{
- sal_Int32 nCurrencyPos = m_pLbCurrency->GetSelectEntryPos();
+ sal_Int32 nCurrencyPos = m_pLbCurrency->GetSelectedEntryPos();
pNumFmtShell->SetCurrencySymbol(static_cast<sal_uInt32>(nCurrencyPos));
}
@@ -1260,7 +1260,7 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb )
// Format-ListBox ----------------------------------------------------
if (pLb == m_pLbFormat)
{
- sal_uLong nSelPos = m_pLbFormat->GetSelectEntryPos();
+ sal_uLong nSelPos = m_pLbFormat->GetSelectedEntryPos();
short nFmtLbSelPos = static_cast<short>(nSelPos);
OUString aFormat = pNumFmtShell->GetFormat4Entry(nFmtLbSelPos);
@@ -1625,7 +1625,7 @@ void SvxNumberFormatTabPage::OptHdl_Impl( void const * pOptCtrl )
pNumFmtShell->MakeFormat( aFormat,
bThousand, bNegRed,
nPrecision, nLeadZeroes,
- (sal_uInt16)m_pLbFormat->GetSelectEntryPos() );
+ (sal_uInt16)m_pLbFormat->GetSelectedEntryPos() );
m_pEdFormat->SetText( aFormat );
MakePreviewText( aFormat );
@@ -1675,7 +1675,7 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Control&, rControl, void)
m_pFtComment->Show();
if(!m_pIbAdd->IsEnabled())
{
- sal_uInt16 nSelPos = (sal_uInt16) m_pLbFormat->GetSelectEntryPos();
+ sal_uInt16 nSelPos = (sal_uInt16) m_pLbFormat->GetSelectedEntryPos();
pNumFmtShell->SetComment4Entry(nSelPos,
m_pEdComment->GetText());
m_pEdComment->SetText(m_pLbCategory->GetEntry(1)); // String for user defined
@@ -1783,7 +1783,7 @@ void SvxNumberFormatTabPage::FillCurrencyBox()
void SvxNumberFormatTabPage::SetCategory(sal_uInt16 nPos)
{
- sal_uInt16 nCurCategory = m_pLbCategory->GetSelectEntryPos();
+ sal_uInt16 nCurCategory = m_pLbCategory->GetSelectedEntryPos();
sal_uInt16 nTmpCatPos;
if(bOneAreaFlag)
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 9705062e4f77..0f65307f512a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1863,7 +1863,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void )
{
- sal_Int32 nPos = rBox.GetSelectEntryPos();
+ sal_Int32 nPos = rBox.GetSelectedEntryPos();
nPos ++; // no VERT_NONE
sal_uInt16 nMask = 1;
@@ -2212,7 +2212,7 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void )
IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void)
{
bAutomaticCharStyles = false;
- sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos();
+ sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectedEntryPos();
OUString sEntry = m_pCharFmtLB->GetSelectedEntry();
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -2261,7 +2261,7 @@ void SvxNumOptionsTabPage::EditModifyHdl_Impl( Edit* pEdit )
aNumFmt.SetStart( (sal_uInt16)m_pStartED->GetValue() );
else //align
{
- sal_Int32 nPos = m_pAlignLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pAlignLB->GetSelectedEntryPos();
SvxAdjust eAdjust = SvxAdjust::Center;
if(nPos == 0)
eAdjust = SvxAdjust::Left;
@@ -3190,8 +3190,8 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl, ListBox&, void)
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
const sal_Int32 nPos = m_pAlignLB->IsVisible()
- ? m_pAlignLB->GetSelectEntryPos()
- : m_pAlign2LB->GetSelectEntryPos();
+ ? m_pAlignLB->GetSelectedEntryPos()
+ : m_pAlign2LB->GetSelectedEntryPos();
SvxAdjust eAdjust = SvxAdjust::Center;
if(nPos == 0)
eAdjust = SvxAdjust::Left;
@@ -3360,7 +3360,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void)
// determine value to be set at the chosen list levels
SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB;
{
- const sal_Int32 nPos = m_pLabelFollowedByLB->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pLabelFollowedByLB->GetSelectedEntryPos();
if ( nPos == 1 )
{
eLabelFollowedBy = SvxNumberFormat::SPACE;
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 70b67024317f..6766784cf456 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -711,7 +711,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
// paper tray
nWhich = GetWhich( SID_ATTR_PAGE_PAPERBIN );
- sal_Int32 nPos = m_pPaperTrayBox->GetSelectEntryPos();
+ sal_Int32 nPos = m_pPaperTrayBox->GetSelectedEntryPos();
sal_uInt16 nBin = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pPaperTrayBox->GetEntryData( nPos ));
pOld = GetOldItem( *rSet, SID_ATTR_PAGE_PAPERBIN );
@@ -721,7 +721,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
bModified = true;
}
- nPos = m_pPaperSizeBox->GetSelectEntryPos();
+ nPos = m_pPaperSizeBox->GetSelectedEntryPos();
Paper ePaper = (Paper)reinterpret_cast<sal_uLong>(m_pPaperSizeBox->GetEntryData( nPos ));
const sal_Int32 nOld = m_pPaperSizeBox->GetSavedValue();
bool bChecked = m_pLandscapeBtn->IsChecked();
@@ -769,7 +769,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
if ( bMod )
aPage.SetPageUsage(
- ::PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ) );
+ ::PosToPageUsage_Impl( m_pLayoutBox->GetSelectedEntryPos() ) );
if ( m_pLandscapeBtn->IsValueChangedFromSaved() )
{
@@ -778,7 +778,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
}
//Get the NumType value
- nPos = m_pNumberFormatBox->GetSelectEntryPos();
+ nPos = m_pNumberFormatBox->GetSelectedEntryPos();
SvxNumType nEntryData = static_cast<SvxNumType>(reinterpret_cast<sal_uLong>(m_pNumberFormatBox->GetEntryData(nPos)));
if ( m_pNumberFormatBox->IsValueChangedFromSaved() )
{
@@ -868,7 +868,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void)
{
// switch inside outside
- const SvxPageUsage nUsage = PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() );
+ const SvxPageUsage nUsage = PosToPageUsage_Impl( m_pLayoutBox->GetSelectedEntryPos() );
if ( nUsage == SvxPageUsage::Mirror )
{
@@ -1119,7 +1119,7 @@ void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
m_pBspWin->SetRight( GetCoreValue( *m_pRightMarginEdit, MapUnit::MapTwip ) );
// Layout
- m_pBspWin->SetUsage( PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ) );
+ m_pBspWin->SetUsage( PosToPageUsage_Impl( m_pLayoutBox->GetSelectedEntryPos() ) );
if ( bResetbackground )
m_pBspWin->ResetBackground();
m_pBspWin->Invalidate();
@@ -1544,7 +1544,7 @@ IMPL_LINK( SvxPageDescPage, RegisterModify, Button*, pBox, void )
if(static_cast<CheckBox*>(pBox)->IsChecked())
{
bEnable = true;
- if(USHRT_MAX == m_pRegisterLB->GetSelectEntryPos())
+ if(USHRT_MAX == m_pRegisterLB->GetSelectedEntryPos())
m_pRegisterLB->SelectEntry(sStandardRegister);
}
m_pRegisterFT->Enable( bEnable );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 37d33d456e3a..6b5e19ea8b95 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -211,7 +211,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
bool bModified = false;
sal_uInt16 nWhich;
- sal_Int32 nPos = m_pLineDist->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLineDist->GetSelectedEntryPos();
if ( LISTBOX_ENTRY_NOTFOUND != nPos &&
( m_pLineDist->IsValueChangedFromSaved() ||
@@ -780,7 +780,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void )
{
- switch( rBox.GetSelectEntryPos() )
+ switch( rBox.GetSelectedEntryPos() )
{
case LLINESPACE_1:
case LLINESPACE_115:
@@ -885,7 +885,7 @@ void SvxStdParagraphTabPage::UpdateExample_Impl()
m_pExampleWin->SetUpper( (sal_uInt16)m_pTopDist->Denormalize( m_pTopDist->GetValue( FUNIT_TWIP ) ) );
m_pExampleWin->SetLower( (sal_uInt16)m_pBottomDist->Denormalize( m_pBottomDist->GetValue( FUNIT_TWIP ) ) );
- sal_Int32 nPos = m_pLineDist->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLineDist->GetSelectedEntryPos();
switch ( nPos )
{
@@ -1119,7 +1119,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
SvxAdjust eOneWord = m_pExpandCB->IsChecked() ? SvxAdjust::Block : SvxAdjust::Left;
- sal_Int32 nLBPos = m_pLastLineLB->GetSelectEntryPos();
+ sal_Int32 nLBPos = m_pLastLineLB->GetSelectedEntryPos();
SvxAdjust eLastBlock = SvxAdjust::Left;
if ( 1 == nLBPos )
@@ -1152,7 +1152,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
}
if(m_pVertAlignLB->IsValueChangedFromSaved())
{
- rOutSet->Put(SvxParaVertAlignItem((SvxParaVertAlignItem::Align)m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN )));
+ rOutSet->Put(SvxParaVertAlignItem((SvxParaVertAlignItem::Align)m_pVertAlignLB->GetSelectedEntryPos(), GetWhich( SID_PARA_VERTALIGN )));
bModified = true;
}
@@ -1282,7 +1282,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void)
bool bJustify = m_pJustify->IsChecked();
m_pLastLineFT->Enable(bJustify);
m_pLastLineLB->Enable(bJustify);
- bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2;
+ bool bLastLineIsBlock = m_pLastLineLB->GetSelectedEntryPos() == 2;
m_pExpandCB->Enable(bJustify && bLastLineIsBlock);
UpdateExample_Impl();
}
@@ -1290,7 +1290,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl, ListBox&, void)
{
//fdo#41350 only enable 'Expand last word' if last line is also justified
- bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2;
+ bool bLastLineIsBlock = m_pLastLineLB->GetSelectedEntryPos() == 2;
m_pExpandCB->Enable(bLastLineIsBlock);
UpdateExample_Impl();
}
@@ -1323,7 +1323,7 @@ void SvxParaAlignTabPage::UpdateExample_Impl()
{
m_pExampleWin->SetAdjust( SvxAdjust::Block );
SvxAdjust eLastBlock = SvxAdjust::Left;
- sal_Int32 nLBPos = m_pLastLineLB->GetSelectEntryPos();
+ sal_Int32 nLBPos = m_pLastLineLB->GetSelectedEntryPos();
if(nLBPos == 1)
eLastBlock = SvxAdjust::Center;
else if(nLBPos == 2)
@@ -1468,9 +1468,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
{
case TRISTATE_TRUE:
{
- bool bBefore = m_pBreakPositionLB->GetSelectEntryPos() == 0;
+ bool bBefore = m_pBreakPositionLB->GetSelectedEntryPos() == 0;
- if ( m_pBreakTypeLB->GetSelectEntryPos() == 0 )
+ if ( m_pBreakTypeLB->GetSelectedEntryPos() == 0 )
{
if ( bBefore )
aBreak.SetValue( SvxBreak::PageBefore );
@@ -2030,8 +2030,8 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void)
m_pBreakPositionFT->Enable();
m_pBreakPositionLB->Enable();
- if ( 0 == m_pBreakTypeLB->GetSelectEntryPos()&&
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list