[Libreoffice-commits] core.git: include/svx svx/source
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Fri Mar 23 10:04:19 UTC 2018
include/svx/langbox.hxx | 6 +++---
svx/source/dialog/langbox.cxx | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit deb2151d7392b8bbeb0f0287c17a3eb4f8eb42df
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Thu Mar 22 17:28:40 2018 +0100
Typo: ImplGetSelectEntryPos -> ImplGetSelectedEntryPos
Change-Id: I19233d37b2d72bef73659ddbb6d116d2632145c1
Reviewed-on: https://gerrit.libreoffice.org/51748
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index af16b7faf914..0e5bcd0f6234 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -110,7 +110,7 @@ protected:
SVX_DLLPRIVATE virtual void ImplClear() = 0;
SVX_DLLPRIVATE virtual sal_Int32 ImplInsertEntry( const OUString& rEntry, sal_Int32 nPos ) = 0;
SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) = 0;
- SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos() const = 0;
+ SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectedEntryPos() const = 0;
SVX_DLLPRIVATE virtual void* ImplGetEntryData( sal_Int32 nPos ) const = 0;
SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) = 0;
SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const = 0;
@@ -135,7 +135,7 @@ private:
SVX_DLLPRIVATE virtual void ImplClear() override;
SVX_DLLPRIVATE virtual sal_Int32 ImplInsertEntry( const OUString& rEntry, sal_Int32 nPos ) override;
SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) override;
- SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos() const override;
+ SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectedEntryPos() const override;
SVX_DLLPRIVATE virtual void* ImplGetEntryData( sal_Int32 nPos ) const override;
SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) override;
SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const override;
@@ -199,7 +199,7 @@ private:
SVX_DLLPRIVATE virtual void ImplClear() override;
SVX_DLLPRIVATE virtual sal_Int32 ImplInsertEntry( const OUString& rEntry, sal_Int32 nPos ) override;
SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) override;
- SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos() const override;
+ SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectedEntryPos() const override;
SVX_DLLPRIVATE virtual void* ImplGetEntryData( sal_Int32 nPos ) const override;
SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) override;
SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const override;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index f69eaefa74f7..6778ccc7fab3 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -447,7 +447,7 @@ void SvxLanguageBoxBase::RemoveLanguage( const LanguageType eLangType )
LanguageType SvxLanguageBoxBase::GetSelectedLanguage() const
{
- sal_Int32 nPos = ImplGetSelectEntryPos();
+ sal_Int32 nPos = ImplGetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
return LanguageType( reinterpret_cast<sal_uIntPtr>(ImplGetEntryData(nPos)) );
@@ -514,7 +514,7 @@ void SvxLanguageBoxBase::SaveValueLBB()
sal_Int32 SvxLanguageBoxBase::GetSelectedEntryPosLBB() const
{
- return ImplGetSelectEntryPos();
+ return ImplGetSelectedEntryPos();
}
void* SvxLanguageBoxBase::GetEntryDataLBB( sal_Int32 nPos ) const
@@ -859,12 +859,12 @@ void SvxLanguageComboBox::ImplSetEntryData( sal_Int32 nPos, void* pData )
}
-sal_Int32 SvxLanguageBox::ImplGetSelectEntryPos() const
+sal_Int32 SvxLanguageBox::ImplGetSelectedEntryPos() const
{
return GetSelectedEntryPos();
}
-sal_Int32 SvxLanguageComboBox::ImplGetSelectEntryPos() const
+sal_Int32 SvxLanguageComboBox::ImplGetSelectedEntryPos() const
{
return GetSelectedEntryPos();
}
@@ -986,7 +986,7 @@ IMPL_LINK_NOARG( SvxLanguageComboBox, EditModifyHdl, Edit&, void )
// Select the corresponding listbox entry if not current. This
// invalidates the Edit Selection thus has to happen between
// obtaining the Selection and setting the new Selection.
- sal_Int32 nSelPos = ImplGetSelectEntryPos();
+ sal_Int32 nSelPos = ImplGetSelectedEntryPos();
bool bSetEditSelection;
if (nSelPos == nPos)
bSetEditSelection = false;
More information about the Libreoffice-commits
mailing list