summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/filter/html/pubdlg.cxx6
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx7
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx6
-rw-r--r--sd/source/ui/dlg/dlgass.cxx4
-rw-r--r--sd/source/ui/dlg/dlgctrls.cxx4
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx2
6 files changed, 13 insertions, 16 deletions
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 22e011986f11..e7bbc92c5e0b 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -961,7 +961,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void )
if(pPage1_Designs->GetSelectEntryCount() == 0)
pPage1_Designs->SelectEntryPos(0);
- sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
+ const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
m_pDesign = &m_aDesignList[nPos];
DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)");
@@ -973,7 +973,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void )
// Clickhandler for the choice of one design
IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl)
{
- sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
+ const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
m_pDesign = &m_aDesignList[nPos];
DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)");
@@ -988,7 +988,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl)
// Clickhandler for the delete of one design
IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void)
{
- sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
+ const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
boost::ptr_vector<SdPublishingDesign>::iterator iter = m_aDesignList.begin()+nPos;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 9e60afde537e..a4a6bbb6efee 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1897,8 +1897,7 @@ void CustomAnimationPane::onChangeStart()
if( mpLBStart->GetSelectEntryCount() == 1 )
{
sal_Int16 nNodeType;
- sal_uInt16 nPos= mpLBStart->GetSelectEntryPos();
- switch( nPos )
+ switch( mpLBStart->GetSelectEntryPos() )
{
case 0: nNodeType = EffectNodeType::ON_CLICK; break;
case 1: nNodeType = EffectNodeType::WITH_PREVIOUS; break;
@@ -1983,9 +1982,7 @@ void CustomAnimationPane::onChangeSpeed()
double fDuration;
- sal_uInt16 nPos= mpCBSpeed->GetSelectEntryPos();
-
- switch( nPos )
+ switch( mpCBSpeed->GetSelectEntryPos() )
{
case 0: fDuration = 5.0; break;
case 1: fDuration = 3.0; break;
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 0c9838a5cfdf..b77e49f675a8 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -117,7 +117,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void)
Reference< graphic::XGraphicProvider> xProvider(graphic::GraphicProvider::create(xContext));
// get the option
- sal_uInt16 nOpt = pInsTypeCombo->GetSelectEntryPos();
+ const sal_Int32 nOpt = pInsTypeCombo->GetSelectEntryPos();
if ( nOpt == ONE_IMAGE )
{
OUString sUrl;
@@ -514,7 +514,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void)
if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND
&& pImagesLst->GetSelectEntryPos() != 0)
{
- sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos();
+ const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos();
OUString sActEntry( pImagesLst->GetEntry(nActPos) );
// actual data
OUString* pActData = static_cast<OUString*>(pImagesLst->GetEntryData(nActPos));
@@ -542,7 +542,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void)
IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, DownHdl, Button*, void)
{
- sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos();
+ const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos();
if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
{
OUString sActEntry( pImagesLst->GetSelectEntry() );
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 5c848a1858fd..0ac1b70c77eb 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -965,7 +965,7 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument()
if( mpPage5PageListCT->IsPageChecked(nPgAbsNum) )
{
mpPage3EffectLB->applySelected(pPage);
- const sal_uInt16 nPos = mpPage3SpeedLB->GetSelectEntryPos();
+ const sal_Int32 nPos = mpPage3SpeedLB->GetSelectEntryPos();
pPage->setTransitionDuration( (nPos == 0) ? 3.0 : (nPos == 1) ? 2.0 : 1.0 );
if(bKiosk)
{
@@ -1755,7 +1755,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl2)
INetURLObject aURL;
aURL.SetSmartURL(aFileToOpen);
mpImpl->maOpenFilesList.push_back (aURL.GetMainURL(INetURLObject::NO_DECODE));
- sal_uInt16 nNewPos = mpImpl->mpPage1OpenLB->InsertEntry(aURL.getName());
+ const sal_Int32 nNewPos = mpImpl->mpPage1OpenLB->InsertEntry(aURL.getName());
mpImpl->mpPage1OpenLB->SelectEntryPos(nNewPos);
}
}
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index ed3c009ebc5c..9137f37d3388 100644
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -86,9 +86,9 @@ VCL_BUILDER_DECL_FACTORY(FadeEffectLB)
void FadeEffectLB::applySelected( SdPage* pSlide ) const
{
- const sal_uInt16 nPos = GetSelectEntryPos();
+ const sal_Int32 nPos = GetSelectEntryPos();
- if( pSlide && (nPos < mpImpl->maPresets.size() ) )
+ if( pSlide && (static_cast<size_t>(nPos) < mpImpl->maPresets.size() ) )
{
TransitionPresetPtr pPreset( mpImpl->maPresets[nPos] );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 9a9c382e4412..8b22fd2d6bd4 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -499,7 +499,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat )
OUString aStr( SvxDateTimeField::GetFormatted(
aDate, aTime, nDateTimeFormats[nFormat],
*(SD_MOD()->GetNumberFormatter()), eLanguage ) );
- sal_uInt16 nEntry = mpCBDateTimeFormat->InsertEntry( aStr );
+ const sal_Int32 nEntry = mpCBDateTimeFormat->InsertEntry( aStr );
mpCBDateTimeFormat->SetEntryData( nEntry, reinterpret_cast<void*>((sal_IntPtr)nDateTimeFormats[nFormat] ));
if( nDateTimeFormats[nFormat] == eFormat )
{
generated by cgit (git 2.34.1) at 2024-07-09 19:26:28 +0000