diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:16:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:16:47 +0000 |
| commit | 45f6ce34e3b428df8fa70327b6136fc033ffa983 (patch) | |
| tree | 2c2d378f957a3239ef69b3e098df380cf66b1e4b /svx/source/dialog/impgrf.cxx | |
| parent | INTEGRATION: CWS sb59 (1.16.60); FILE MERGED (diff) | |
| download | core-45f6ce34e3b428df8fa70327b6136fc033ffa983.tar.gz core-45f6ce34e3b428df8fa70327b6136fc033ffa983.zip | |
INTEGRATION: CWS sb59 (1.22.62); FILE MERGED
2006/08/18 12:02:48 sb 1.22.62.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'svx/source/dialog/impgrf.cxx')
| -rw-r--r-- | svx/source/dialog/impgrf.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx index 97e6cc42f316..5b65db33eac8 100644 --- a/svx/source/dialog/impgrf.cxx +++ b/svx/source/dialog/impgrf.cxx @@ -4,9 +4,9 @@ * * $RCSfile: impgrf.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: obo $ $Date: 2006-09-17 04:25:38 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:16:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,7 +112,7 @@ int LoadGraphic( const String &rPath, const String &rFilterName, if ( !pFilter ) pFilter = ::GetGrfFilter(); - const int nFilter = rFilterName.Len() && pFilter->GetImportFormatCount() + const USHORT nFilter = rFilterName.Len() && pFilter->GetImportFormatCount() ? pFilter->GetImportFormatNumber( rFilterName ) : GRFILTER_FORMAT_DONTKNOW; |