summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/optctl.cxx2
-rw-r--r--cui/source/options/optgdlg.cxx14
-rw-r--r--cui/source/options/optgdlg.hxx4
-rw-r--r--cui/source/options/optsave.cxx8
4 files changed, 14 insertions, 14 deletions
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 5b8911db6fa3..4ef91cbfafb8 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -115,7 +115,7 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
if ( m_pNumeralsLB->IsValueChangedFromSaved() )
{
- sal_uInt16 nPos = m_pNumeralsLB->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pNumeralsLB->GetSelectEntryPos();
aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos );
bModified = true;
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e869664e532f..7f84f2c0bb3f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -737,7 +737,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
bool bRepaintWindows(false);
SvtMiscOptions aMiscOptions;
- sal_uInt16 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectEntryPos();
+ const sal_Int32 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectEntryPos();
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
@@ -753,7 +753,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
aMiscOptions.SetSymbolsSize( eSet );
}
- sal_uInt16 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectEntryPos();
+ const sal_Int32 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectEntryPos();
if( nStyleLB_InitialSelection != nStyleLB_NewSelection )
{
// 0 means choose style automatically
@@ -761,7 +761,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
aMiscOptions.SetIconTheme("auto");
else
{
- sal_uInt16 pos = m_pIconStyleLB->GetSelectEntryPos();
+ const sal_Int32 pos = m_pIconStyleLB->GetSelectEntryPos();
const vcl::IconThemeInfo& iconThemeId = mInstalledIconThemes.at(pos-1);
aMiscOptions.SetIconTheme(iconThemeId.GetThemeId());
}
@@ -1069,7 +1069,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
{
//sal_uInt16 p = m_pUserInterfaceLB->InsertLanguage(aLang);
OUString aLangStr( SvtLanguageTable::GetLanguageString( aLang, true ) );
- sal_uInt16 p = m_pUserInterfaceLB->InsertEntry(aLangStr);
+ const sal_Int32 p = m_pUserInterfaceLB->InsertEntry(aLangStr);
m_pUserInterfaceLB->SetEntryData(p, reinterpret_cast<void*>(i+1));
}
}
@@ -1129,7 +1129,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
aStr_ = ApplyLreOrRleEmbedding( aStr_ ) +
aTwoSpace +
ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( pCurr->GetLanguage() ) );
- sal_uInt16 nPos = m_pCurrencyLB->InsertEntry( aStr_ );
+ const sal_Int32 nPos = m_pCurrencyLB->InsertEntry( aStr_ );
m_pCurrencyLB->SetEntryData( nPos, const_cast<NfCurrencyEntry *>(pCurr) );
}
@@ -1485,7 +1485,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang );
}
// if pCurr==NULL the SYSTEM entry is selected
- sal_uInt16 nPos = m_pCurrencyLB->GetEntryPos( static_cast<void const *>(pCurr) );
+ const sal_Int32 nPos = m_pCurrencyLB->GetEntryPos( static_cast<void const *>(pCurr) );
m_pCurrencyLB->SelectEntryPos( nPos );
bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_CURRENCY);
m_pCurrencyLB->Enable(!bReadonly);
@@ -1673,7 +1673,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox )
const NfCurrencyEntry* pCurr = &SvNumberFormatter::GetCurrencyEntry(
((eLang == LANGUAGE_USER_SYSTEM_CONFIG) ? MsLangId::getSystemLanguage() : eLang));
- sal_uInt16 nPos = m_pCurrencyLB->GetEntryPos( nullptr );
+ sal_Int32 nPos = m_pCurrencyLB->GetEntryPos( nullptr );
if (pCurr)
{
// Update the "Default ..." currency.
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index b031e7918bbb..b66a628793a7 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -104,8 +104,8 @@ private:
VclPtr<ListBox> m_pMousePosLB;
VclPtr<ListBox> m_pMouseMiddleLB;
- sal_uInt16 nSizeLB_InitialSelection;
- sal_uInt16 nStyleLB_InitialSelection;
+ sal_Int32 nSizeLB_InitialSelection;
+ sal_Int32 nStyleLB_InitialSelection;
SvtTabAppearanceCfg* pAppearanceCfg;
CanvasSettings* pCanvasSettings;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 1ec65657ccd0..eee1ad2ff536 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)
IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
{
- sal_uInt16 nCurPos = aDocTypeLB->GetSelectEntryPos();
+ const sal_Int32 nCurPos = aDocTypeLB->GetSelectEntryPos();
sal_IntPtr nData = -1;
if(nCurPos < APP_COUNT)
@@ -588,7 +588,7 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
OUString sSelect;
for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++)
{
- sal_uInt16 nEntryPos = aSaveAsLB->InsertEntry(pUIFilters[i]);
+ const sal_Int32 nEntryPos = aSaveAsLB->InsertEntry(pUIFilters[i]);
if ( pImpl->aODFArr[nData][i] )
aSaveAsLB->SetEntryData( nEntryPos, static_cast<void*>(pImpl) );
if(pFilters[i] == pImpl->aDefaultArr[nData])
@@ -629,8 +629,8 @@ IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl)
if ( bShown )
{
bool bHasODFFormat = false;
- sal_uInt16 i = 0, nCount = aSaveAsLB->GetEntryCount();
- for ( ; i < nCount; ++ i )
+ const sal_Int32 nCount = aSaveAsLB->GetEntryCount();
+ for ( sal_Int32 i = 0; i < nCount; ++i )
{
if ( aSaveAsLB->GetEntryData(i) != NULL )
{
generated by cgit (git 2.34.1) at 2024-07-09 20:58:38 +0000