summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/cfg.cxx19
-rw-r--r--cui/source/customize/eventdlg.cxx5
-rw-r--r--cui/source/dialogs/cuicharmap.cxx10
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx12
-rw-r--r--cui/source/dialogs/hldocntp.cxx2
-rw-r--r--cui/source/dialogs/multipat.cxx11
-rw-r--r--cui/source/dialogs/thesdlg.cxx2
-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
-rw-r--r--cui/source/tabpages/align.cxx2
-rw-r--r--cui/source/tabpages/autocdlg.cxx8
-rw-r--r--cui/source/tabpages/numfmt.cxx2
-rw-r--r--cui/source/tabpages/page.cxx2
15 files changed, 51 insertions, 52 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d6654a8e0356..a69e8a1eeb17 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1590,7 +1590,7 @@ void SvxConfigPage::Reset( const SfxItemSet* )
// all other open documents of the same module type
if ( !bInitialised )
{
- sal_uInt16 nPos = 0;
+ sal_Int32 nPos = 0;
uno::Reference < css::ui::XUIConfigurationManager > xCfgMgr;
uno::Reference < css::ui::XUIConfigurationManager > xDocCfgMgr;
@@ -1884,7 +1884,7 @@ IMPL_LINK( SvxConfigPage, SelectSaveInLocation, ListBox *, pBox )
void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
{
- sal_uInt16 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+ sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
m_pTopLevelListBox->Clear();
if ( GetSaveInData() && GetSaveInData()->GetEntries() )
@@ -1895,7 +1895,7 @@ void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
for ( ; iter != end; ++iter )
{
SvxConfigEntry* pEntryData = *iter;
- sal_uInt16 nPos = m_pTopLevelListBox->InsertEntry( stripHotKey( pEntryData->GetName() ) );
+ const sal_Int32 nPos = m_pTopLevelListBox->InsertEntry( stripHotKey( pEntryData->GetName() ) );
m_pTopLevelListBox->SetEntryData( nPos, pEntryData );
if ( pEntryData == pToSelect )
@@ -1936,7 +1936,7 @@ void SvxConfigPage::AddSubMenusToUI(
subMenuTitle += aMenuSeparatorStr;
subMenuTitle += stripHotKey( pEntryData->GetName() );
- sal_uInt16 nPos = m_pTopLevelListBox->InsertEntry( subMenuTitle );
+ const sal_Int32 nPos = m_pTopLevelListBox->InsertEntry( subMenuTitle );
m_pTopLevelListBox->SetEntryData( nPos, pEntryData );
AddSubMenusToUI( subMenuTitle, pEntryData );
@@ -2958,7 +2958,7 @@ void SvxToolbarConfigPage::dispose()
void SvxToolbarConfigPage::DeleteSelectedTopLevel()
{
- sal_uInt16 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+ const sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
ToolbarSaveInData* pSaveInData = static_cast<ToolbarSaveInData*>( GetSaveInData() );
pSaveInData->RemoveToolbar( GetTopLevelSelection() );
@@ -3053,7 +3053,7 @@ void SvxToolbarConfigPage::MoveEntry( bool bMoveUp )
IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void )
{
- sal_uInt16 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+ sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
SvxConfigEntry* pToolbar =
static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos ));
@@ -3424,7 +3424,7 @@ void SvxToolbarConfigPage::Init()
ReloadTopLevelListBox();
- sal_uInt16 nPos = 0;
+ sal_Int32 nPos = 0;
if ( !m_aURLToSelect.isEmpty() )
{
for ( sal_Int32 i = 0 ; i < m_pTopLevelListBox->GetEntryCount(); ++i )
@@ -4411,13 +4411,12 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
VclPtrInstance< SvxNewToolbarDialog > pNameDialog( nullptr, aNewName );
- sal_uInt16 nInsertPos;
for ( sal_Int32 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
{
SaveInData* pData =
static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( i ));
- nInsertPos = pNameDialog->m_pSaveInListBox->InsertEntry(
+ const sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->InsertEntry(
m_pSaveInListBox->GetEntry( i ) );
pNameDialog->m_pSaveInListBox->SetEntryData( nInsertPos, pData );
@@ -4430,7 +4429,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
{
aNewName = pNameDialog->GetName();
- nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos();
+ sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos();
ToolbarSaveInData* pData = static_cast<ToolbarSaveInData*>(
pNameDialog->m_pSaveInListBox->GetEntryData( nInsertPos ));
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 4b7d8f8c65db..347d1ab8e600 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -83,9 +83,8 @@ SvxEventConfigPage::SvxEventConfigPage(vcl::Window *pParent, const SfxItemSet& r
xSupplier =
frame::theGlobalEventBroadcaster::get(::comphelper::getProcessComponentContext());
- sal_uInt16 nPos(0);
m_xAppEvents = xSupplier->getEvents();
- nPos = m_pSaveInListBox->InsertEntry(
+ const sal_Int32 nPos = m_pSaveInListBox->InsertEntry(
utl::ConfigManager::getProductName() );
m_pSaveInListBox->SetEntryData( nPos, new bool(true) );
m_pSaveInListBox->SelectEntryPos( nPos );
@@ -154,7 +153,7 @@ void SvxEventConfigPage::ImplInitDocument()
m_xDocumentModifiable.set(xModel, css::uno::UNO_QUERY);
OUString aTitle = ::comphelper::DocumentInfo::getDocumentTitle( xModel );
- sal_uInt16 nPos = m_pSaveInListBox->InsertEntry( aTitle );
+ const sal_Int32 nPos = m_pSaveInListBox->InsertEntry( aTitle );
m_pSaveInListBox->SetEntryData( nPos, new bool(false) );
m_pSaveInListBox->SelectEntryPos( nPos );
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 07183e85ba59..fd605cddbdde 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -331,7 +331,7 @@ void SvxCharacterMap::init()
if ( aFontName != aLastName )
{
aLastName = aFontName;
- sal_uInt16 nPos = m_pFontLB->InsertEntry( aFontName );
+ const sal_Int32 nPos = m_pFontLB->InsertEntry( aFontName );
m_pFontLB->SetEntryData( nPos, reinterpret_cast<void*>(i) );
}
}
@@ -426,8 +426,8 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox)
IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
{
- sal_uInt16 nPos = m_pFontLB->GetSelectEntryPos(),
- nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos ));
+ const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos();
+ const sal_uInt16 nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos ));
aFont = GetDevFont( nFont );
aFont.SetWeight( WEIGHT_DONTKNOW );
aFont.SetItalic( ITALIC_NONE );
@@ -460,7 +460,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
const Subset* s;
while( NULL != (s = pSubsetMap->GetNextSubset( bFirst )) )
{
- sal_uInt16 nPos_ = m_pSubsetLB->InsertEntry( s->GetName() );
+ const sal_Int32 nPos_ = m_pSubsetLB->InsertEntry( s->GetName() );
m_pSubsetLB->SetEntryData( nPos_, const_cast<Subset *>(s) );
// NOTE: subset must live at least as long as the selected font
if( bFirst )
@@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl)
{
- sal_uInt16 nPos = m_pSubsetLB->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos();
const Subset* pSubset = static_cast<const Subset*> (m_pSubsetLB->GetEntryData(nPos));
if( pSubset )
{
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 5774baa34bdd..0f42f1ac5afc 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -92,8 +92,8 @@ void SearchThread::execute()
if( !aFileType.isEmpty() )
{
- const sal_uInt16 nFileNumber = mpBrowser->m_pCbbFileType->GetEntryPos( aFileType );
- sal_uInt16 nBeginFormat, nEndFormat;
+ const sal_Int32 nFileNumber = mpBrowser->m_pCbbFileType->GetEntryPos( aFileType );
+ sal_Int32 nBeginFormat, nEndFormat;
::std::vector< OUString > aFormats;
if( !nFileNumber || ( nFileNumber >= mpBrowser->m_pCbbFileType->GetEntryCount() ) )
@@ -104,7 +104,7 @@ void SearchThread::execute()
else
nBeginFormat = nEndFormat = nFileNumber;
- for( sal_uInt16 i = nBeginFormat; i <= nEndFormat; ++i )
+ for( sal_Int32 i = nBeginFormat; i <= nEndFormat; ++i )
aFormats.push_back( mpBrowser->aFilterEntryList[ i ]->aFilterName.toAsciiLowerCase() );
ImplSearch( maStartURL, aFormats, mpBrowser->bSearchRecursive );
@@ -303,9 +303,9 @@ TakeThread::~TakeThread()
void TakeThread::execute()
{
INetURLObject aURL;
- sal_uInt16 nEntries;
+ sal_Int32 nEntries;
GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme;
- sal_uInt16 nPos;
+ sal_Int32 nPos;
GalleryProgress* pStatusProgress;
{
@@ -315,7 +315,7 @@ void TakeThread::execute()
pThm->LockBroadcaster();
}
- for( sal_uInt16 i = 0; i < nEntries && schedule(); i++ )
+ for( sal_Int32 i = 0; i < nEntries && schedule(); ++i )
{
if( mpBrowser->bTakeAll )
aURL = INetURLObject( mpBrowser->aFoundList[ nPos = i ] );
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 12d98d121290..e4d4b0a664db 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -448,7 +448,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void)
m_pLbDocTypes->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
{
// get private-url
- sal_uInt16 nPos = m_pLbDocTypes->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos();
aNewURL.setExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt );
}
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 2a66dae2a47d..4d454c78daf7 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -122,7 +122,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void)
}
else
{
- sal_uInt16 nPos = m_pPathLB->InsertEntry( sInsPath );
+ const sal_Int32 nPos = m_pPathLB->InsertEntry( sInsPath );
m_pPathLB->SetEntryData( nPos, new OUString( aURL ) );
}
@@ -158,9 +158,9 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void)
IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, DelHdl_Impl, Button*, void)
{
- sal_uInt16 nPos = m_pPathLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pPathLB->GetSelectEntryPos();
m_pPathLB->RemoveEntry( nPos );
- sal_uInt16 nCnt = m_pPathLB->GetEntryCount();
+ sal_Int32 nCnt = m_pPathLB->GetEntryCount();
if ( nCnt )
{
@@ -252,7 +252,7 @@ void SvxPathSelectDialog::dispose()
{
if (m_pPathLB)
{
- sal_uInt16 nPos = m_pPathLB->GetEntryCount();
+ sal_Int32 nPos = m_pPathLB->GetEntryCount();
while ( nPos-- )
delete static_cast<OUString*>(m_pPathLB->GetEntryData(nPos));
}
@@ -337,7 +337,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath )
void SvxPathSelectDialog::SetPath(const OUString& rPath)
{
sal_Unicode cDelim = SVT_SEARCHPATH_DELIMITER;
- sal_uInt16 nPos, nCount = comphelper::string::getTokenCount(rPath, cDelim);
+ sal_uInt16 nCount = comphelper::string::getTokenCount(rPath, cDelim);
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
@@ -346,6 +346,7 @@ void SvxPathSelectDialog::SetPath(const OUString& rPath)
bool bIsSystemPath =
osl::FileBase::getSystemPathFromFileURL(sPath, sSystemPath) == osl::FileBase::E_None;
+ sal_Int32 nPos = 0;
if ( bIsSystemPath )
nPos = m_pPathLB->InsertEntry( sSystemPath );
else
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4604ca5cf714..4842aff3137e 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -386,7 +386,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox )
{
if (pBox && !m_pWordCB->IsTravelSelect()) // act only upon return key and not when traveling with cursor keys
{
- sal_uInt16 nPos = pBox->GetSelectEntryPos();
+ const sal_Int32 nPos = pBox->GetSelectEntryPos();
OUString aStr( pBox->GetEntry( nPos ) );
aStr = linguistic::GetThesaurusReplaceText( aStr );
m_pWordCB->SetText( aStr );
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 )
{
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 343f42dacc1b..d3fcb3428db7 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -381,7 +381,7 @@ void AlignmentTabPage::InitVsRefEgde()
void AlignmentTabPage::UpdateEnableControls()
{
- sal_uInt16 nHorAlign = m_pLbHorAlign->GetSelectEntryPos();
+ const sal_Int32 nHorAlign = m_pLbHorAlign->GetSelectEntryPos();
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 f223f9debccd..d51c47b1482b 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2289,13 +2289,13 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
bModified |= nVal != pOpt->nAutoCmpltListLen;
pOpt->nAutoCmpltListLen = nVal;
- nVal = m_pDCBExpandKey->GetSelectEntryPos();
- if( nVal < m_pDCBExpandKey->GetEntryCount() )
+ const sal_Int32 nPos = m_pDCBExpandKey->GetSelectEntryPos();
+ if( nPos < m_pDCBExpandKey->GetEntryCount() )
{
- sal_uLong nKey = reinterpret_cast<sal_uLong>(m_pDCBExpandKey->GetEntryData( nVal ));
+ sal_uLong nKey = reinterpret_cast<sal_uLong>(m_pDCBExpandKey->GetEntryData( nPos ));
bModified |= nKey != pOpt->nAutoCmpltExpandKey;
pOpt->nAutoCmpltExpandKey = (sal_uInt16)nKey;
- }
+ }
if (m_pAutoCompleteList && m_nAutoCmpltListCnt != m_pLBEntries->GetEntryCount())
{
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 1e66ff0bc7b3..2c2a725db5d9 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1794,7 +1794,7 @@ void SvxNumberFormatTabPage::SetCategory(sal_uInt16 nPos)
void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect)
{
m_pLbLanguage->RemoveLanguage(LANGUAGE_SYSTEM);
- sal_uInt16 nPos = m_pLbLanguage->InsertEntry(sAutomaticEntry);
+ const sal_Int32 nPos = m_pLbLanguage->InsertEntry(sAutomaticEntry);
m_pLbLanguage->SetEntryData(nPos, reinterpret_cast<void*>((sal_uLong)eAutoLang));
if(bSelect)
m_pLbLanguage->SelectEntryPos(nPos);
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index d1f1e4a95476..1a7d7b0b2761 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -525,7 +525,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
else
aBinName = mpDefPrinter->GetPaperBinName( (sal_uInt16)nPaperBin );
- sal_uInt16 nEntryPos = m_pPaperTrayBox->InsertEntry( aBinName );
+ const sal_Int32 nEntryPos = m_pPaperTrayBox->InsertEntry( aBinName );
m_pPaperTrayBox->SetEntryData( nEntryPos, reinterpret_cast<void*>((sal_uLong)nPaperBin) );
m_pPaperTrayBox->SelectEntry( aBinName );
generated by cgit (git 2.34.1) at 2024-07-09 20:11:12 +0000