diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:49:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:49:52 +0000 |
| commit | 67c18c1ae6caea160912c1d5b09f4a762ea64c3c (patch) | |
| tree | 9b8c9b78b56386a9b398a2b8bd48f4807081fbef /svx/source/gengal | |
| parent | b5ffcce8bd897d60e801c0f4c5289541881224d6 (diff) | |
INTEGRATION: CWS sb59 (1.5.80); FILE MERGED
2006/08/30 12:20:09 sb 1.5.80.2: #i67535# Made code warning-free (GCC 4.1.1).
2006/08/28 12:57:55 sb 1.5.80.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'svx/source/gengal')
| -rw-r--r-- | svx/source/gengal/gengal.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index f2dcb923f67a..5d87273ad4af 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gengal.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 05:17:27 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:49:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -125,10 +125,10 @@ static void createTheme( rtl::OUString aThemeName, fprintf( stderr, "Work on gallery '%s'\n", (const sal_Char *) rtl::OUStringToOString( aGalleryURL, RTL_TEXTENCODING_UTF8 ) ); - fprintf( stderr, "Existing themes: %d\n", - pGallery->GetThemeCount() ); + fprintf( stderr, "Existing themes: %lu\n", + sal::static_int_cast< unsigned long >( + pGallery->GetThemeCount() ) ); - GalleryTheme *pGalTheme; if( !pGallery->HasTheme( aThemeName) ) { if( !pGallery->CreateTheme( aThemeName, nNumFrom ) ) { fprintf( stderr, "Failed to create theme\n" ); @@ -136,12 +136,14 @@ static void createTheme( rtl::OUString aThemeName, } } - fprintf( stderr, "Existing themes: %d\n", - pGallery->GetThemeCount() ); + fprintf( stderr, "Existing themes: %lu\n", + sal::static_int_cast< unsigned long >( + pGallery->GetThemeCount() ) ); SfxListener aListener; - if ( !( pGalTheme = pGallery->AcquireTheme( aThemeName, aListener ) ) ) { + GalleryTheme *pGalTheme = pGallery->AcquireTheme( aThemeName, aListener ); + if ( pGalTheme == NULL ) { fprintf( stderr, "Failed to acquire theme\n" ); exit( 1 ); } @@ -166,9 +168,10 @@ static void createTheme( rtl::OUString aThemeName, fprintf( stderr, "Failed to import '%s'\n", (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ) ); else - fprintf( stderr, "Imported file '%s' (%d)\n", + fprintf( stderr, "Imported file '%s' (%lu)\n", (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ), - pGalTheme->GetObjectCount() ); + sal::static_int_cast< unsigned long >( + pGalTheme->GetObjectCount() ) ); #else // only loads BMPs SvStream *pStream = ::utl::UcbStreamHelper::CreateStream( *aIter, STREAM_READ ); |