summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-03-22 17:36:51 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-03-23 08:26:14 +0100
commita82cdccb0c276ec10c35beec46fa7fa25fc95cd5 (patch)
tree73ad8a19584e75b18229f5c1c410569f2f6c8aec /svx
parentc12fc293650a860d5e05c32000f904afaf0958b6 (diff)
Typo: GetSelectItemId -> GetSelectedItemId
Change-Id: Ieebb50b73f1f341c924693f3966f8cd2b09a136b Reviewed-on: https://gerrit.libreoffice.org/51750 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/_bmpmask.cxx8
-rw-r--r--svx/source/gallery2/galbrws2.cxx4
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.cxx2
-rw-r--r--svx/source/sidebar/shapes/DefaultShapesPanel.cxx2
-rw-r--r--svx/source/sidebar/tools/ValueSetWithTextControl.cxx4
-rw-r--r--svx/source/tbxctrls/SvxPresetListBox.cxx2
-rw-r--r--svx/source/tbxctrls/bulletsnumbering.cxx2
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx4
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx2
-rw-r--r--svx/source/tbxctrls/linectrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx6
12 files changed, 20 insertions, 20 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 33fd03046fc9..d436061d9511 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -530,28 +530,28 @@ void SvxBmpMask::SetColor( const Color& rColor )
void SvxBmpMask::PipetteClicked()
{
- if( m_pQSet1->GetSelectItemId() == 1 )
+ if( m_pQSet1->GetSelectedItemId() == 1 )
{
m_pCbx1->Check();
pData->CbxHdl(m_pCbx1);
m_pQSet1->SetItemColor( 1, aPipetteColor );
m_pQSet1->SetFormat();
}
- else if( m_pQSet2->GetSelectItemId() == 1 )
+ else if( m_pQSet2->GetSelectedItemId() == 1 )
{
m_pCbx2->Check();
pData->CbxHdl(m_pCbx2);
m_pQSet2->SetItemColor( 1, aPipetteColor );
m_pQSet2->SetFormat();
}
- else if( m_pQSet3->GetSelectItemId() == 1 )
+ else if( m_pQSet3->GetSelectedItemId() == 1 )
{
m_pCbx3->Check();
pData->CbxHdl(m_pCbx3);
m_pQSet3->SetItemColor( 1, aPipetteColor );
m_pQSet3->SetFormat();
}
- else if( m_pQSet4->GetSelectItemId() == 1 )
+ else if( m_pQSet4->GetSelectedItemId() == 1 )
{
m_pCbx4->Check();
pData->CbxHdl(m_pCbx4);
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 34eb599082bd..32fee03bee82 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -925,7 +925,7 @@ sal_uInt32 GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point&
if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
{
- nRet = ( ( GALLERYBROWSERMODE_ICON == meLastMode ) ? mpIconView->GetSelectItemId() : ( mpListView->FirstSelectedRow() + 1 ) );
+ nRet = ( ( GALLERYBROWSERMODE_ICON == meLastMode ) ? mpIconView->GetSelectedItemId() : ( mpListView->FirstSelectedRow() + 1 ) );
if( pSelPos )
rSelPos = GetPointerPosPixel();
@@ -941,7 +941,7 @@ sal_uInt32 GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point&
}
else
{
- nRet = mpIconView->GetSelectItemId();
+ nRet = mpIconView->GetSelectedItemId();
rSelPos = mpIconView->GetItemRect(nRet).Center();
}
}
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 72516cdc59d7..b3f4e3cbdb2e 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -112,7 +112,7 @@ LineWidthPopup::~LineWidthPopup()
IMPL_LINK(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void)
{
- sal_uInt16 iPos = m_xVSWidth->GetSelectItemId();
+ sal_uInt16 iPos = m_xVSWidth->GetSelectedItemId();
if (iPos >= 1 && iPos <= 8)
{
sal_IntPtr nVal = LogicToLogic(reinterpret_cast<sal_IntPtr>(m_xVSWidth->GetItemData( iPos )), MapUnit::MapPoint, m_eMapUnit);
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index dc074df94e6c..671eeeba55b4 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -112,7 +112,7 @@ IMPL_LINK(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void)
{
if(rValueSet == aSetMap.first)
{
- int aSelection = aSetMap.first->GetSelectItemId();
+ int aSelection = aSetMap.first->GetSelectedItemId();
comphelper::dispatchCommand(aSetMap.second[aSelection], {});
}
else
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 64bf618597a4..1f71d291fe23 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -69,7 +69,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt )
{
//draw background
- if ( GetSelectItemId() == nItemId )
+ if ( GetSelectedItemId() == nItemId )
{
tools::Rectangle aBackRect = aRect;
aBackRect.AdjustTop(3 );
@@ -83,7 +83,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt )
pDev->DrawRect(aRect);
}
- if ( GetSelectItemId() == nItemId )
+ if ( GetSelectedItemId() == nItemId )
{
aFont.SetColor( sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Color_HighlightText ) );
}
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index ba58a567313d..212e51f85653 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -55,7 +55,7 @@ void SvxPresetListBox::Command( const CommandEvent& rEvent )
{
case CommandEventId::ContextMenu:
{
- const sal_uInt16 nIndex = GetSelectItemId();
+ const sal_uInt16 nIndex = GetSelectedItemId();
if(nIndex > 0)
{
Point aPos(rEvent.GetMousePosPixel());
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index e010842c1adb..d01abc43ee0b 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -161,7 +161,7 @@ void NumberingPopup::VSSelectHdl(void const * pControl)
if ( pControl == mpValueSet )
{
- sal_uInt16 nSelItem = mpValueSet->GetSelectItemId();
+ sal_uInt16 nSelItem = mpValueSet->GetSelectedItemId();
if ( mePageType == NumberingPageType::BULLET )
{
auto aArgs( comphelper::InitPropertySequence( { { "SetBullet", css::uno::makeAny( nSelItem ) } } ) );
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 20af198b7c8d..637f2c4872ba 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -337,7 +337,7 @@ bool SvxColorDockingWindow::Close()
IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl, ValueSet*, void)
{
SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
- sal_uInt16 nPos = aColorSet->GetSelectItemId();
+ sal_uInt16 nPos = aColorSet->GetSelectedItemId();
Color aColor( aColorSet->GetItemColor( nPos ) );
OUString aStr( aColorSet->GetItemText( nPos ) );
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index b2ac8546c4d9..2b8ddd842639 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -271,7 +271,7 @@ void ExtrusionDirectionWindow::SelectHdl(void const * pControl)
{
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = OUString(g_sExtrusionDirection).copy(5);
- aArgs[0].Value <<= static_cast<sal_Int32>(gSkewList[mpDirectionSet->GetSelectItemId()-1]);
+ aArgs[0].Value <<= static_cast<sal_Int32>(gSkewList[mpDirectionSet->GetSelectedItemId()-1]);
mrController.dispatchCommand( g_sExtrusionDirection, aArgs );
}
@@ -785,7 +785,7 @@ void ExtrusionLightingWindow::SelectHdl(void const * pControl)
}
else
{
- sal_Int32 nDirection = mpLightingSet->GetSelectItemId();
+ sal_Int32 nDirection = mpLightingSet->GetSelectedItemId();
if( (nDirection > 0) && (nDirection < 10) )
{
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index c77ec207f98e..cca40d210b01 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -185,7 +185,7 @@ void FontWorkGalleryDialog::SetSdrObjectRef( SdrObject** ppSdrObject, SdrModel*
void FontWorkGalleryDialog::insertSelectedFontwork()
{
- sal_uInt16 nItemId = mpCtlFavorites->GetSelectItemId();
+ sal_uInt16 nItemId = mpCtlFavorites->GetSelectedItemId();
if( nItemId > 0 )
{
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index e7424b6af23c..e03effe1e119 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl, ValueSet*, void)
{
std::unique_ptr<XLineEndItem> pLineEndItem;
std::unique_ptr<XLineStartItem> pLineStartItem;
- sal_uInt16 nId = mpLineEndSet->GetSelectItemId();
+ sal_uInt16 nId = mpLineEndSet->GetSelectedItemId();
if( nId == 1 )
{
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 212afa8efe89..6ec04a941513 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1385,8 +1385,8 @@ void SvxColorWindow::KeyInput( const KeyEvent& rKEvt )
NamedColor SvxColorWindow::GetSelectEntryColor(ValueSet const * pColorSet)
{
- Color aColor = pColorSet->GetItemColor(pColorSet->GetSelectItemId());
- OUString sColorName = pColorSet->GetItemText(pColorSet->GetSelectItemId());
+ Color aColor = pColorSet->GetItemColor(pColorSet->GetSelectedItemId());
+ OUString sColorName = pColorSet->GetItemText(pColorSet->GetSelectedItemId());
return std::make_pair(aColor, sColorName);
}
@@ -1804,7 +1804,7 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void)
*pRight = nullptr,
*pTop = nullptr,
*pBottom = nullptr;
- sal_uInt16 nSel = aFrameSet->GetSelectItemId();
+ sal_uInt16 nSel = aFrameSet->GetSelectedItemId();
sal_uInt16 nModifier = aFrameSet->GetModifier();
FrmValidFlags nValidFlags = FrmValidFlags::NONE;