summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-14 16:57:06 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-21 12:45:38 +0200
commitd99b65c864cc3358238e4eac651f12a34d05e2d9 (patch)
treefcd7d6fefb9434c27533c826aabc639f68ba97ed /cui/source/tabpages
parentb649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (diff)
Rename GetSelectEntryPos -> GetSelectedEntryPos
Change-Id: I0bd4cb463575af843c72d9c8aaf91742203532a4 Reviewed-on: https://gerrit.libreoffice.org/42283 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r--cui/source/tabpages/align.cxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx18
-rw-r--r--cui/source/tabpages/backgrnd.cxx8
-rw-r--r--cui/source/tabpages/border.cxx4
-rw-r--r--cui/source/tabpages/chardlg.cxx54
-rw-r--r--cui/source/tabpages/connect.cxx4
-rw-r--r--cui/source/tabpages/labdlg.cxx6
-rw-r--r--cui/source/tabpages/measure.cxx4
-rw-r--r--cui/source/tabpages/numfmt.cxx28
-rw-r--r--cui/source/tabpages/numpages.cxx12
-rw-r--r--cui/source/tabpages/page.cxx14
-rw-r--r--cui/source/tabpages/paragrph.cxx32
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx34
-rw-r--r--cui/source/tabpages/textanim.cxx4
-rw-r--r--cui/source/tabpages/tpbitmap.cxx20
-rw-r--r--cui/source/tabpages/tpcolor.cxx8
-rw-r--r--cui/source/tabpages/tpgradnt.cxx8
-rw-r--r--cui/source/tabpages/tphatch.cxx8
-rw-r--r--cui/source/tabpages/tpline.cxx52
-rw-r--r--cui/source/tabpages/tplnedef.cxx18
-rw-r--r--cui/source/tabpages/tplneend.cxx16
-rw-r--r--cui/source/tabpages/tptrans.cxx8
22 files changed, 182 insertions, 182 deletions
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()&&
- 0 == m_pBreakPositionLB->GetSelectEntryPos() )
+ if ( 0 == m_pBreakTypeLB->GetSelectedEntryPos()&&
+ 0 == m_pBreakPositionLB->GetSelectedEntryPos() )
{
m_pApplyCollBtn->Enable();
@@ -2148,7 +2148,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, void)
IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, void )
{
- if ( 0 == rListBox.GetSelectEntryPos() )
+ if ( 0 == rListBox.GetSelectedEntryPos() )
{
m_pApplyCollBtn->Enable();
@@ -2162,7 +2162,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, voi
m_pPagenumEdit->Enable(bEnable && m_pPageNumBox->GetState() == TRISTATE_TRUE);
}
}
- else if ( 1 == rListBox.GetSelectEntryPos() )
+ else if ( 1 == rListBox.GetSelectedEntryPos() )
{
m_pApplyCollBtn->SetState( TRISTATE_FALSE );
m_pApplyCollBtn->Enable(false);
@@ -2175,8 +2175,8 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, voi
IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox&, rListBox, void )
{
//column break or break break after
- sal_Int32 nBreakPos = m_pBreakPositionLB->GetSelectEntryPos();
- if ( rListBox.GetSelectEntryPos() == 1 || 1 == nBreakPos)
+ sal_Int32 nBreakPos = m_pBreakPositionLB->GetSelectedEntryPos();
+ if ( rListBox.GetSelectedEntryPos() == 1 || 1 == nBreakPos)
{
m_pApplyCollBtn->SetState( TRISTATE_FALSE );
m_pApplyCollBtn->Enable(false);
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 399f674306cf..08d2014f676a 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1260,11 +1260,11 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void )
if(bHori)
{
sal_uInt16 nRel = GetRelation(*m_pHoriToLB);
- if(RelOrientation::PRINT_AREA == nRel && 0 == m_pVertLB->GetSelectEntryPos())
+ if(RelOrientation::PRINT_AREA == nRel && 0 == m_pVertLB->GetSelectedEntryPos())
{
m_pVertLB->SelectEntryPos(1);
}
- else if(RelOrientation::CHAR == nRel && 1 == m_pVertLB->GetSelectEntryPos())
+ else if(RelOrientation::CHAR == nRel && 1 == m_pVertLB->GetSelectedEntryPos())
{
m_pVertLB->SelectEntryPos(0);
}
@@ -1303,7 +1303,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
if (rLB.GetSelectEntryCount())
{
- if (pRelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
+ if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
nRel = static_cast<RelationMap *>(pRelLB->GetSelectEntryData())->nRelation;
FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT);
@@ -1322,7 +1322,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
// on the right only below is allowed - from the left only at the top
// from the left at the character -> below
if((HoriOrientation::LEFT == nAlign || HoriOrientation::RIGHT == nAlign) &&
- 0 == m_pVertLB->GetSelectEntryPos())
+ 0 == m_pVertLB->GetSelectedEntryPos())
{
if(RelOrientation::FRAME == nRel)
m_pVertLB->SelectEntryPos(1);
@@ -1330,12 +1330,12 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
m_pVertLB->SelectEntryPos(0);
bSet = true;
}
- else if(HoriOrientation::LEFT == nAlign && 1 == m_pVertLB->GetSelectEntryPos())
+ else if(HoriOrientation::LEFT == nAlign && 1 == m_pVertLB->GetSelectedEntryPos())
{
m_pVertLB->SelectEntryPos(0);
bSet = true;
}
- else if(HoriOrientation::NONE == nAlign && 1 == m_pVertLB->GetSelectEntryPos())
+ else if(HoriOrientation::NONE == nAlign && 1 == m_pVertLB->GetSelectedEntryPos())
{
m_pVertLB->SelectEntryPos(0);
bSet = true;
@@ -1347,7 +1347,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
{
if(VertOrientation::TOP == nAlign)
{
- if(1 == m_pHoriLB->GetSelectEntryPos())
+ if(1 == m_pHoriLB->GetSelectedEntryPos())
{
m_pHoriLB->SelectEntryPos(0);
bSet = true;
@@ -1356,7 +1356,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
}
else if(VertOrientation::CHAR_BOTTOM == nAlign)
{
- if(2 == m_pHoriLB->GetSelectEntryPos())
+ if(2 == m_pHoriLB->GetSelectedEntryPos())
{
m_pHoriLB->SelectEntryPos(0);
bSet = true;
@@ -1399,7 +1399,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, Button*, void)
short SvxSwPosSizeTabPage::GetRelation(ListBox const &rRelationLB)
{
short nRel = 0;
- sal_Int32 nPos = rRelationLB.GetSelectEntryPos();
+ sal_Int32 nPos = rRelationLB.GetSelectedEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -1419,7 +1419,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo
if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap ||
pMap == aVCharMap )
{
- if (rRelationLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
+ if (rRelationLB.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
{
LB nRel = static_cast<RelationMap *>(rRelationLB.GetSelectEntryData())->nLBRelation;
std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap);
@@ -1448,7 +1448,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo
sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox const &rAlignLB)
{
sal_uInt16 nMapPos = 0;
- sal_Int32 nLBSelPos = rAlignLB.GetSelectEntryPos();
+ sal_Int32 nLBSelPos = rAlignLB.GetSelectedEntryPos();
if (nLBSelPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -1485,21 +1485,21 @@ void SvxSwPosSizeTabPage::InitPos(RndStdIds nAnchor,
long nX,
long nY)
{
- sal_Int32 nPos = m_pVertLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pVertLB->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pVMap )
{
m_nOldV = m_pVMap[nPos].nAlign;
- nPos = m_pVertToLB->GetSelectEntryPos();
+ nPos = m_pVertToLB->GetSelectedEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
m_nOldVRel = static_cast<RelationMap *>(m_pVertToLB->GetEntryData(nPos))->nRelation;
}
- nPos = m_pHoriLB->GetSelectEntryPos();
+ nPos = m_pHoriLB->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pHMap )
{
m_nOldH = m_pHMap[nPos].nAlign;
- nPos = m_pHoriToLB->GetSelectEntryPos();
+ nPos = m_pHoriToLB->GetSelectedEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
m_nOldHRel = static_cast<RelationMap *>(m_pHoriToLB->GetEntryData(nPos))->nRelation;
}
@@ -1628,7 +1628,7 @@ void SvxSwPosSizeTabPage::InitPos(RndStdIds nAnchor,
void SvxSwPosSizeTabPage::UpdateExample()
{
- sal_Int32 nPos = m_pHoriLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pHoriLB->GetSelectedEntryPos();
if ( m_pHMap && nPos != LISTBOX_ENTRY_NOTFOUND )
{
sal_uInt16 nMapPos = GetMapPos(m_pHMap, *m_pHoriLB);
@@ -1639,7 +1639,7 @@ void SvxSwPosSizeTabPage::UpdateExample()
m_pExampleWN->SetHoriRel(nRel);
}
- nPos = m_pVertLB->GetSelectEntryPos();
+ nPos = m_pVertLB->GetSelectedEntryPos();
if ( m_pVMap && nPos != LISTBOX_ENTRY_NOTFOUND )
{
sal_uInt16 nMapPos = GetMapPos(m_pVMap, *m_pVertLB);
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 4670e462f455..55c293510656 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -367,7 +367,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs)
TriState eState;
// animation type
- nPos = m_pLbEffect->GetSelectEntryPos();
+ nPos = m_pLbEffect->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND &&
m_pLbEffect->IsValueChangedFromSaved() )
{
@@ -482,7 +482,7 @@ VclPtr<SfxTabPage> SvxTextAnimationPage::Create( vcl::Window* pWindow,
IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void)
{
- sal_Int32 nPos = m_pLbEffect->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbEffect->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
eAniKind = (SdrTextAniKind) nPos;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index fa2e431f3cf3..8ec7516ae437 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -210,7 +210,7 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs )
rAttrs->Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject()));
}
- BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectEntryPos(); bool bIsStretched( eStylePos == STRETCHED );
+ BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectedEntryPos(); bool bIsStretched( eStylePos == STRETCHED );
bool bIsTiled( eStylePos == TILED );
rAttrs->Put( XFillBmpTileItem(bIsTiled) );
@@ -255,14 +255,14 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs )
}
if(m_pPositionLB->IsEnabled())
- rAttrs->Put( XFillBmpPosItem( static_cast<RectPoint>( m_pPositionLB->GetSelectEntryPos() ) ) );
+ rAttrs->Put( XFillBmpPosItem( static_cast<RectPoint>( m_pPositionLB->GetSelectedEntryPos() ) ) );
if(m_pPositionOffX->IsEnabled())
rAttrs->Put( XFillBmpPosOffsetXItem( m_pPositionOffX->GetValue() ) );
if(m_pPositionOffY->IsEnabled())
rAttrs->Put( XFillBmpPosOffsetYItem( m_pPositionOffY->GetValue() ) );
if(m_pTileOffBox->IsEnabled())
{
- TileOffset eValue = static_cast<TileOffset>(m_pTileOffLB->GetSelectEntryPos());
+ TileOffset eValue = static_cast<TileOffset>(m_pTileOffLB->GetSelectedEntryPos());
sal_uInt16 nOffsetValue = static_cast<sal_uInt16>(m_pTileOffset->GetValue());
sal_uInt16 nRowOff = (eValue == ROW) ? nOffsetValue : 0;
sal_uInt16 nColOff = (eValue == COLUMN) ? nOffsetValue : 0;
@@ -329,7 +329,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
}
}
- if( m_pBitmapStyleLB->GetSelectEntryPos() == 0 && rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SfxItemState::DONTCARE)
+ if( m_pBitmapStyleLB->GetSelectedEntryPos() == 0 && rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SfxItemState::DONTCARE)
{
if( static_cast<const XFillBmpStretchItem&>( rAttrs->Get( XATTR_FILLBMP_STRETCH ) ).GetValue() )
{
@@ -372,7 +372,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
nHeight = (OutputDevice::LogicToLogic(nHeight, mePoolUnit, MapUnit::Map100thMM )) / fUIScale;
}
- if(m_pBitmapStyleLB->GetSelectEntryPos() == 0)
+ if(m_pBitmapStyleLB->GetSelectedEntryPos() == 0)
{
if( nWidth == rBitmapSize.Width() && nHeight == rBitmapSize.Height() )
m_pBitmapStyleLB->SelectEntryPos( static_cast<sal_Int32>(ORIGINAL) );
@@ -618,7 +618,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void)
IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapSizeHdl, Edit&, void )
{
- if( m_pTsbScale->GetState() != TRISTATE_TRUE && static_cast<BitmapStyle>(m_pBitmapStyleLB->GetSelectEntryPos()) != TILED )
+ if( m_pTsbScale->GetState() != TRISTATE_TRUE && static_cast<BitmapStyle>(m_pBitmapStyleLB->GetSelectedEntryPos()) != TILED )
{
sal_Int64 nWidthPercent = m_pBitmapWidth->Denormalize( m_pBitmapWidth->GetValue() );
sal_Int64 nHeightPercent = m_pBitmapHeight->Denormalize( m_pBitmapHeight->GetValue() );
@@ -644,7 +644,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, Button*, void )
IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void )
{
- BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectEntryPos();
+ BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectedEntryPos();
bool bIsStretched( eStylePos == STRETCHED );
bool bIsTiled( eStylePos == TILED );
@@ -719,7 +719,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void )
IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void)
{
if(m_pPositionLB->IsEnabled())
- m_rXFSet.Put( XFillBmpPosItem( static_cast< RectPoint >( m_pPositionLB->GetSelectEntryPos() ) ) );
+ m_rXFSet.Put( XFillBmpPosItem( static_cast< RectPoint >( m_pPositionLB->GetSelectedEntryPos() ) ) );
m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
m_pCtlBitmapPreview->Invalidate();
@@ -742,10 +742,10 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void)
sal_uInt16 nTileXOff = 0;
sal_uInt16 nTileYOff = 0;
- if(m_pTileOffLB->GetSelectEntryPos() == static_cast<sal_Int32>(ROW))
+ if(m_pTileOffLB->GetSelectedEntryPos() == static_cast<sal_Int32>(ROW))
nTileXOff = m_pTileOffset->GetValue();
- if(m_pTileOffLB->GetSelectEntryPos() == static_cast<sal_Int32>(COLUMN))
+ if(m_pTileOffLB->GetSelectedEntryPos() == static_cast<sal_Int32>(COLUMN))
nTileYOff = m_pTileOffset->GetValue();
m_rXFSet.Put( XFillBmpTileOffsetXItem(nTileXOff) );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index fdbd86392a1e..9b20e7090a07 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -219,7 +219,7 @@ void SvxColorTabPage::FillPaletteLB()
}
OUString aPaletteName( officecfg::Office::Common::UserColors::PaletteName::get() );
m_pSelectPalette->SelectEntry(aPaletteName);
- if (m_pSelectPalette->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
+ if (m_pSelectPalette->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
{
SelectPaletteLBHdl( *m_pSelectPalette );
}
@@ -444,7 +444,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void)
{
sal_uInt16 nId = m_pValSetColorList->GetSelectItemId();
size_t nPos = m_pValSetColorList->GetSelectItemPos();
- if(m_pSelectPalette->GetSelectEntryPos() == 0 && nPos != VALUESET_ITEM_NOTFOUND )
+ if(m_pSelectPalette->GetSelectedEntryPos() == 0 && nPos != VALUESET_ITEM_NOTFOUND )
{
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create(m_context));
css::uno::Sequence< sal_Int32 > aCustomColorList(officecfg::Office::Common::UserColors::CustomColor::get());
@@ -475,7 +475,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void)
{
m_pValSetColorList->Clear();
- sal_Int32 nPos = m_pSelectPalette->GetSelectEntryPos();
+ sal_Int32 nPos = m_pSelectPalette->GetSelectedEntryPos();
maPaletteManager.SetPalette( nPos );
maPaletteManager.ReloadColorSet( *m_pValSetColorList );
@@ -521,7 +521,7 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void)
if(pValSet == m_pValSetColorList)
{
m_pValSetRecentList->SetNoSelection();
- if(m_pSelectPalette->GetSelectEntryPos() == 0 && m_pValSetColorList->GetSelectItemId() != 0)
+ if(m_pSelectPalette->GetSelectedEntryPos() == 0 && m_pValSetColorList->GetSelectItemId() != 0)
m_pBtnDelete->Enable();
else
m_pBtnDelete->Disable();
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 6d060e4b16ab..0dd20ccd3feb 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -237,7 +237,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
aString = "gradient";
pXGradient.reset(new XGradient( m_pLbColorFrom->GetSelectEntryColor(),
m_pLbColorTo->GetSelectEntryColor(),
- (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(),
+ (css::awt::GradientStyle) m_pLbGradientType->GetSelectedEntryPos(),
static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource
(sal_uInt16) m_pMtrCenterX->GetValue(),
(sal_uInt16) m_pMtrCenterY->GetValue(),
@@ -330,7 +330,7 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void const * pControl )
if(pControl == m_pSliderIncrement)
m_pMtrIncrement->SetValue( m_pSliderIncrement->GetThumbPos() );
- css::awt::GradientStyle eXGS = (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos();
+ css::awt::GradientStyle eXGS = (css::awt::GradientStyle) m_pLbGradientType->GetSelectedEntryPos();
XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(),
m_pLbColorTo->GetSelectEntryColor(),
@@ -410,7 +410,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
{
XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(),
m_pLbColorTo->GetSelectEntryColor(),
- (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(),
+ (css::awt::GradientStyle) m_pLbGradientType->GetSelectedEntryPos(),
static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource
(sal_uInt16) m_pMtrCenterX->GetValue(),
(sal_uInt16) m_pMtrCenterY->GetValue(),
@@ -449,7 +449,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void)
XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(),
m_pLbColorTo->GetSelectEntryColor(),
- (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(),
+ (css::awt::GradientStyle) m_pLbGradientType->GetSelectedEntryPos(),
static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource
(sal_uInt16) m_pMtrCenterX->GetValue(),
(sal_uInt16) m_pMtrCenterY->GetValue(),
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index c6d9eab34265..9c2e44e91d73 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -261,7 +261,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
else
{
pXHatch.reset(new XHatch( m_pLbLineColor->GetSelectEntryColor(),
- (css::drawing::HatchStyle) m_pLbLineType->GetSelectEntryPos(),
+ (css::drawing::HatchStyle) m_pLbLineType->GetSelectedEntryPos(),
GetCoreValue( *m_pMtrDistance, m_ePoolUnit ),
static_cast<long>(m_pMtrAngle->GetValue() * 10) ));
}
@@ -362,7 +362,7 @@ void SvxHatchTabPage::ModifiedHdl_Impl( void const * p )
m_pMtrAngle->SetValue( m_pSliderAngle->GetThumbPos() );
XHatch aXHatch( m_pLbLineColor->GetSelectEntryColor(),
- (css::drawing::HatchStyle) m_pLbLineType->GetSelectEntryPos(),
+ (css::drawing::HatchStyle) m_pLbLineType->GetSelectedEntryPos(),
GetCoreValue( *m_pMtrDistance, m_ePoolUnit ),
static_cast<long>(m_pMtrAngle->GetValue() * 10) );
@@ -478,7 +478,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
if( !nError )
{
XHatch aXHatch( m_pLbLineColor->GetSelectEntryColor(),
- (css::drawing::HatchStyle) m_pLbLineType->GetSelectEntryPos(),
+ (css::drawing::HatchStyle) m_pLbLineType->GetSelectedEntryPos(),
GetCoreValue( *m_pMtrDistance, m_ePoolUnit ),
static_cast<long>(m_pMtrAngle->GetValue() * 10) );
@@ -507,7 +507,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void)
OUString aName( m_pHatchingList->GetHatch( static_cast<sal_uInt16>(nPos) )->GetName() );
XHatch aXHatch( m_pLbLineColor->GetSelectEntryColor(),
- (css::drawing::HatchStyle) m_pLbLineType->GetSelectEntryPos(),
+ (css::drawing::HatchStyle) m_pLbLineType->GetSelectedEntryPos(),
GetCoreValue( *m_pMtrDistance, m_ePoolUnit ),
static_cast<long>(m_pMtrAngle->GetValue() * 10) );
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 6c4d2c1a8dce..f99dcc975607 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -519,19 +519,19 @@ void SvxLineTabPage::SymbolSelected(MenuButton const * pButton)
void SvxLineTabPage::FillListboxes()
{
// Line styles
- sal_Int32 nOldSelect = m_pLbLineStyle->GetSelectEntryPos();
+ sal_Int32 nOldSelect = m_pLbLineStyle->GetSelectedEntryPos();
// aLbLineStyle.FillStyles();
m_pLbLineStyle->Fill( m_pDashList );
m_pLbLineStyle->SelectEntryPos( nOldSelect );
// Line end style
OUString sNone( SvxResId( RID_SVXSTR_NONE ) );
- nOldSelect = m_pLbStartStyle->GetSelectEntryPos();
+ nOldSelect = m_pLbStartStyle->GetSelectedEntryPos();
m_pLbStartStyle->Clear();
m_pLbStartStyle->InsertEntry( sNone );
m_pLbStartStyle->Fill( m_pLineEndList );
m_pLbStartStyle->SelectEntryPos( nOldSelect );
- nOldSelect = m_pLbEndStyle->GetSelectEntryPos();
+ nOldSelect = m_pLbEndStyle->GetSelectedEntryPos();
m_pLbEndStyle->Clear();
m_pLbEndStyle->InsertEntry( sNone );
m_pLbEndStyle->Fill( m_pLineEndList, false );
@@ -559,7 +559,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
*m_pnDashListState = ChangeType::NONE;
// Style list
- nPos = m_pLbLineStyle->GetSelectEntryPos();
+ nPos = m_pLbLineStyle->GetSelectedEntryPos();
m_pLbLineStyle->Clear();
m_pLbLineStyle->InsertEntry( SvxResId( RID_SVXSTR_INVISIBLE ) );
@@ -588,7 +588,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
*m_pnLineEndListState = ChangeType::NONE;
- nPos = m_pLbLineStyle->GetSelectEntryPos();
+ nPos = m_pLbLineStyle->GetSelectedEntryPos();
OUString sNone( SvxResId( RID_SVXSTR_NONE ) );
m_pLbStartStyle->Clear();
m_pLbStartStyle->InsertEntry( sNone );
@@ -620,7 +620,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
aLineURL.Append( m_pLineEndList->GetName() );
DBG_ASSERT( aLineURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
// Evaluate if another TabPage set another fill type
- if( m_pLbLineStyle->GetSelectEntryPos() != 0 )
+ if( m_pLbLineStyle->GetSelectedEntryPos() != 0 )
{
if( m_nPageType == PageType::Hatch ) // 1
{
@@ -661,8 +661,8 @@ DeactivateRC SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
if( m_nDlgType == 0 ) // Line dialog
{
m_nPageType = PageType::Gradient; // possibly for extensions
- *m_pPosDashLb = m_pLbLineStyle->GetSelectEntryPos() - 2;// First entry SOLID!!!
- sal_Int32 nPos = m_pLbStartStyle->GetSelectEntryPos();
+ *m_pPosDashLb = m_pLbLineStyle->GetSelectedEntryPos() - 2;// First entry SOLID!!!
+ sal_Int32 nPos = m_pLbStartStyle->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
nPos--;
*m_pPosLineEndLb = nPos;
@@ -684,7 +684,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
// To prevent modifications to the list, we do not set other page's items.
if( m_nDlgType != 0 || m_nPageType != PageType::Hatch )
{
- nPos = m_pLbLineStyle->GetSelectEntryPos();
+ nPos = m_pLbLineStyle->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND &&
m_pLbLineStyle->IsValueChangedFromSaved() )
{
@@ -769,7 +769,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
if( m_nDlgType != 0 || m_nPageType != PageType::Bitmap )
{
// Line start
- nPos = m_pLbStartStyle->GetSelectEntryPos();
+ nPos = m_pLbStartStyle->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbStartStyle->IsValueChangedFromSaved() )
{
std::unique_ptr<XLineStartItem> pItem;
@@ -785,7 +785,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
}
}
// Line end
- nPos = m_pLbEndStyle->GetSelectEntryPos();
+ nPos = m_pLbEndStyle->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbEndStyle->IsValueChangedFromSaved() )
{
std::unique_ptr<XLineEndItem> pItem;
@@ -840,7 +840,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
}
}
- nPos = m_pLBEdgeStyle->GetSelectEntryPos();
+ nPos = m_pLBEdgeStyle->GetSelectedEntryPos();
if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBEdgeStyle->IsValueChangedFromSaved() )
{
std::unique_ptr<XLineJointItem> pNew;
@@ -882,7 +882,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
}
// LineCaps
- nPos = m_pLBCapStyle->GetSelectEntryPos();
+ nPos = m_pLBCapStyle->GetSelectedEntryPos();
if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBCapStyle->IsValueChangedFromSaved() )
{
std::unique_ptr<XLineCapItem> pNew;
@@ -963,7 +963,7 @@ void SvxLineTabPage::FillXLSet_Impl()
{
sal_Int32 nPos;
- if( m_pLbLineStyle->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
+ if( m_pLbLineStyle->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND )
{
m_rXLSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
}
@@ -975,7 +975,7 @@ void SvxLineTabPage::FillXLSet_Impl()
{
m_rXLSet.Put( XLineStyleItem( drawing::LineStyle_DASH ) );
- nPos = m_pLbLineStyle->GetSelectEntryPos();
+ nPos = m_pLbLineStyle->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
m_rXLSet.Put( XLineDashItem( m_pLbLineStyle->GetSelectedEntry(),
@@ -983,7 +983,7 @@ void SvxLineTabPage::FillXLSet_Impl()
}
}
- nPos = m_pLbStartStyle->GetSelectEntryPos();
+ nPos = m_pLbStartStyle->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
if( nPos == 0 )
@@ -992,7 +992,7 @@ void SvxLineTabPage::FillXLSet_Impl()
m_rXLSet.Put( XLineStartItem( m_pLbStartStyle->GetSelectedEntry(),
m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) );
}
- nPos = m_pLbEndStyle->GetSelectEntryPos();
+ nPos = m_pLbEndStyle->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
if( nPos == 0 )
@@ -1002,7 +1002,7 @@ void SvxLineTabPage::FillXLSet_Impl()
m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) );
}
- nPos = m_pLBEdgeStyle->GetSelectEntryPos();
+ nPos = m_pLBEdgeStyle->GetSelectedEntryPos();
if(LISTBOX_ENTRY_NOTFOUND != nPos)
{
switch(nPos)
@@ -1031,7 +1031,7 @@ void SvxLineTabPage::FillXLSet_Impl()
}
// LineCaps
- nPos = m_pLBCapStyle->GetSelectEntryPos();
+ nPos = m_pLBCapStyle->GetSelectedEntryPos();
if(LISTBOX_ENTRY_NOTFOUND != nPos)
{
switch(nPos)
@@ -1531,7 +1531,7 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(void const * pCntrl )
m_pCtlPreview->Invalidate();
// Make transparency accessible accordingly
- if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible
+ if( m_pLbLineStyle->GetSelectedEntryPos() == 0 ) // invisible
{
m_pBoxTransparency->Disable();
}
@@ -1540,12 +1540,12 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(void const * pCntrl )
m_pBoxTransparency->Enable();
}
- const bool bHasLineStyle = m_pLbLineStyle->GetSelectEntryPos() !=0;
- const bool bHasLineStart = m_pLbStartStyle->GetSelectEntryPos() != 0;
+ const bool bHasLineStyle = m_pLbLineStyle->GetSelectedEntryPos() !=0;
+ const bool bHasLineStart = m_pLbStartStyle->GetSelectedEntryPos() != 0;
m_pBoxStart->Enable(bHasLineStart && bHasLineStyle);
- const bool bHasLineEnd = m_pLbEndStyle->GetSelectEntryPos() != 0;
+ const bool bHasLineEnd = m_pLbEndStyle->GetSelectedEntryPos() != 0;
m_pBoxEnd->Enable(bHasLineEnd && bHasLineStyle);
}
@@ -1570,7 +1570,7 @@ void SvxLineTabPage::ChangeStartHdl_Impl( void const * p )
if( p == m_pMtrStartWidth )
m_pMtrEndWidth->SetValue( m_pMtrStartWidth->GetValue() );
if( p == m_pLbStartStyle )
- m_pLbEndStyle->SelectEntryPos( m_pLbStartStyle->GetSelectEntryPos() );
+ m_pLbEndStyle->SelectEntryPos( m_pLbStartStyle->GetSelectedEntryPos() );
if( p == m_pTsbCenterStart )
m_pTsbCenterEnd->SetState( m_pTsbCenterStart->GetState() );
}
@@ -1595,7 +1595,7 @@ IMPL_LINK_NOARG( SvxLineTabPage, ChangeCapStyleHdl_Impl, ListBox&, void )
IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void)
{
- if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible
+ if( m_pLbLineStyle->GetSelectedEntryPos() == 0 ) // invisible
{
if(!m_bSymbols)
m_pBoxColor->Disable();
@@ -1645,7 +1645,7 @@ void SvxLineTabPage::ChangeEndHdl_Impl( void const * p )
if( p == m_pMtrEndWidth )
m_pMtrStartWidth->SetValue( m_pMtrEndWidth->GetValue() );
if( p == m_pLbEndStyle )
- m_pLbStartStyle->SelectEntryPos( m_pLbEndStyle->GetSelectEntryPos() );
+ m_pLbStartStyle->SelectEntryPos( m_pLbEndStyle->GetSelectedEntryPos() );
if( p == m_pTsbCenterEnd )
m_pTsbCenterStart->SetState( m_pTsbCenterEnd->GetState() );
}
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index ccf38b72114b..27ed488d3c85 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -270,7 +270,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
}
- sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbLineStyles->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
*pPosDashLb = nPos;
@@ -355,7 +355,7 @@ void SvxLineDefTabPage::SelectLinestyleHdl_Impl(ListBox const * p)
{
if(pDashList->Count())
{
- int nTmp = m_pLbLineStyles->GetSelectEntryPos();
+ int nTmp = m_pLbLineStyles->GetSelectedEntryPos();
if(LISTBOX_ENTRY_NOTFOUND == nTmp)
{
@@ -499,7 +499,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p)
{
if ( p == m_pLbType1 || !p )
{
- if ( m_pLbType1->GetSelectEntryPos() == 0 )
+ if ( m_pLbType1->GetSelectedEntryPos() == 0 )
{
m_pMtrLength1->Disable();
m_pMtrLength1->SetText( "" );
@@ -513,7 +513,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p)
if ( p == m_pLbType2 || !p )
{
- if ( m_pLbType2->GetSelectEntryPos() == 0 )
+ if ( m_pLbType2->GetSelectedEntryPos() == 0 )
{
m_pMtrLength2->Disable();
m_pMtrLength2->SetText( "" );
@@ -611,7 +611,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void)
{
- sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbLineStyles->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -676,7 +676,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void)
{
- sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbLineStyles->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -851,9 +851,9 @@ void SvxLineDefTabPage::FillDash_Impl()
aDash.SetDashStyle( eXDS );
aDash.SetDots( (sal_uInt8) m_pNumFldNumber1->GetValue() );
- aDash.SetDotLen( m_pLbType1->GetSelectEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength1, ePoolUnit ) );
+ aDash.SetDotLen( m_pLbType1->GetSelectedEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength1, ePoolUnit ) );
aDash.SetDashes( (sal_uInt8) m_pNumFldNumber2->GetValue() );
- aDash.SetDashLen( m_pLbType2->GetSelectEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength2, ePoolUnit ) );
+ aDash.SetDashLen( m_pLbType2->GetSelectedEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength2, ePoolUnit ) );
aDash.SetDistance( GetCoreValue( *m_pMtrDistance, ePoolUnit ) );
rXLSet.Put( XLineDashItem( OUString(), aDash ) );
@@ -898,7 +898,7 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- sal_Int32 nOldSelect = m_pLbLineStyles->GetSelectEntryPos();
+ sal_Int32 nOldSelect = m_pLbLineStyles->GetSelectedEntryPos();
m_pLbLineStyles->Clear();
m_pLbLineStyles->Fill( pDashList );
m_pLbLineStyles->SelectEntryPos( nOldSelect );
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index db2ddeed56df..9329ea2d8008 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -193,7 +193,7 @@ DeactivateRC SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet )
void SvxLineEndDefTabPage::CheckChanges_Impl()
{
- sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbLineEnds->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -208,7 +208,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
ClickModifyHdl_Impl( nullptr );
}
}
- nPos = m_pLbLineEnds->GetSelectEntryPos();
+ nPos = m_pLbLineEnds->GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
*pPosLineEndLb = nPos;
@@ -223,7 +223,7 @@ bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet )
{
CheckChanges_Impl();
- long nPos = m_pLbLineEnds->GetSelectEntryPos();
+ long nPos = m_pLbLineEnds->GetSelectedEntryPos();
const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
rSet->Put( XLineStartItem( pEntry->GetName(), pEntry->GetLineEnd() ) );
@@ -241,7 +241,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* )
// Update lineend
if( pLineEndList->Count() > 0 )
{
- int nPos = m_pLbLineEnds->GetSelectEntryPos();
+ int nPos = m_pLbLineEnds->GetSelectedEntryPos();
const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
@@ -282,7 +282,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void)
{
if( pLineEndList->Count() > 0 )
{
- int nPos = m_pLbLineEnds->GetSelectEntryPos();
+ int nPos = m_pLbLineEnds->GetSelectedEntryPos();
const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
@@ -305,7 +305,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void)
IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void)
{
- sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbLineEnds->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -489,7 +489,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void)
{
- sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos();
+ sal_Int32 nPos = m_pLbLineEnds->GetSelectedEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -661,7 +661,7 @@ void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- sal_Int32 nOldSelect = m_pLbLineEnds->GetSelectEntryPos();
+ sal_Int32 nOldSelect = m_pLbLineEnds->GetSelectedEntryPos();
m_pLbLineEnds->Clear();
m_pLbLineEnds->Fill( pLineEndList );
m_pLbLineEnds->SelectEntryPos( nOldSelect );
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 941f4f1901ce..edd7a0f930a4 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -152,7 +152,7 @@ void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(void const * pControl)
{
if(pControl == m_pLbTrgrGradientType || pControl == this)
{
- css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos();
+ css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectedEntryPos();
SetControlState_Impl( eXGS );
}
@@ -162,7 +162,7 @@ void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(void const * pControl)
XGradient aTmpGradient(
Color(nStartCol, nStartCol, nStartCol),
Color(nEndCol, nEndCol, nEndCol),
- (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(),
+ (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectedEntryPos(),
(sal_uInt16)m_pMtrTrgrAngle->GetValue() * 10,
(sal_uInt16)m_pMtrTrgrCenterX->GetValue(),
(sal_uInt16)m_pMtrTrgrCenterY->GetValue(),
@@ -181,7 +181,7 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate)
if(bActivate)
{
- css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos();
+ css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectedEntryPos();
SetControlState_Impl( eXGS );
}
}
@@ -346,7 +346,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
XGradient aTmpGradient(
Color(nStartCol, nStartCol, nStartCol),
Color(nEndCol, nEndCol, nEndCol),
- (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(),
+ (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectedEntryPos(),
(sal_uInt16)m_pMtrTrgrAngle->GetValue() * 10,
(sal_uInt16)m_pMtrTrgrCenterX->GetValue(),
(sal_uInt16)m_pMtrTrgrCenterY->GetValue(),
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 06:23:29 +0000