diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 06b2375ba827..956a6416dc6f 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2939,7 +2939,7 @@ static const char * ASP_Scripts[] = { "common.inc", "webcast.asp", "show.asp", " /** creates and saves the ASP scripts for WebShow */ bool HtmlExport::CreateASPScripts() { - for( sal_uInt16 n = 0; n < (sizeof( ASP_Scripts ) / sizeof(char *)); n++ ) + for( sal_uInt16 n = 0; n < SAL_N_ELEMENTS(ASP_Scripts); n++ ) { OUString aScript = OUString::createFromAscii(ASP_Scripts[n]); @@ -2958,7 +2958,7 @@ static const char *PERL_Scripts[] = { "webcast.pl", "common.pl", "editpic.pl", " // creates and saves the PERL scripts for WebShow bool HtmlExport::CreatePERLScripts() { - for( sal_uInt16 n = 0; n < (sizeof( PERL_Scripts ) / sizeof(char *)); n++ ) + for( sal_uInt16 n = 0; n < SAL_N_ELEMENTS(PERL_Scripts); n++ ) { OUString aScript = OUString::createFromAscii(PERL_Scripts[n]); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 954bdd32dd78..482d9cd9d66b 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2418,7 +2418,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) typedef sal_uInt16 (*FncGetChildWindowId)(); -FncGetChildWindowId aShowChildren[] = +static const FncGetChildWindowId aShowChildren[] = { &AnimationChildWindow::GetChildWindowId, &Svx3DChildWindow::GetChildWindowId, @@ -2441,7 +2441,7 @@ void SlideshowImpl::hideChildWindows() if( pViewFrame ) { - for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId ); i < nCount; i++ ) + for( sal_uLong i = 0; i < SAL_N_ELEMENTS( aShowChildren ); i++ ) { const sal_uInt16 nId = ( *aShowChildren[ i ] )(); @@ -2462,7 +2462,7 @@ void SlideshowImpl::showChildWindows() SfxViewFrame* pViewFrame = getViewFrame(); if( pViewFrame ) { - for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId ); i < nCount; i++ ) + for( sal_uLong i = 0; i < SAL_N_ELEMENTS(aShowChildren); i++ ) { if( mnChildMask & ( 1 << i ) ) pViewFrame->SetChildWindow( ( *aShowChildren[ i ] )(), true ); |