diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:28:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:28:10 +0000 |
| commit | a8efaf142c8ce802d810b051c80e9f063e083faf (patch) | |
| tree | f592c8ebc45d05fdba6ba4d9c2acb810a0643d15 | |
| parent | df011befa2472869338856d8d7da7d4fc13655af (diff) | |
INTEGRATION: CWS sb59 (1.26.62); FILE MERGED
2006/08/28 12:58:10 sb 1.26.62.2: #i67487# Made code warning-free (wntmsci10).
2006/08/03 13:52:03 cl 1.26.62.1: removed compiler warnings
| -rw-r--r-- | svx/source/unoedit/unofield.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/svx/source/unoedit/unofield.cxx b/svx/source/unoedit/unofield.cxx index b3b215cc4f66..2da630c4f595 100644 --- a/svx/source/unoedit/unofield.cxx +++ b/svx/source/unoedit/unofield.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unofield.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:17:21 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:28:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -186,7 +186,7 @@ SfxItemPropertyMap* ImplGetFieldItemPropertyMap( sal_Int32 mnId ) } } -static sal_Char* aFieldItemNameMap_Impl[] = +static sal_Char const* aFieldItemNameMap_Impl[] = { "Date", "URL", @@ -383,7 +383,8 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, co mpImpl->msString1 = ((SvxURLField*)pData)->GetRepresentation(); mpImpl->msString2 = ((SvxURLField*)pData)->GetTargetFrame(); mpImpl->msString3 = ((SvxURLField*)pData)->GetURL(); - mpImpl->mnInt16 = ((SvxURLField*)pData)->GetFormat(); + mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >( + ((SvxURLField*)pData)->GetFormat()); break; case ID_EXT_FILEFIELD: @@ -395,13 +396,14 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, co case ID_AUTHORFIELD: mpImpl->msString1 = ((SvxAuthorField*)pData)->GetFormatted(); mpImpl->msString2 = ((SvxAuthorField*)pData)->GetFormatted(); - mpImpl->mnInt16 = ((SvxAuthorField*)pData)->GetFormat(); + mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >( + ((SvxAuthorField*)pData)->GetFormat()); mpImpl->mbBoolean1 = ((SvxAuthorField*)pData)->GetType() == SVXAUTHORTYPE_FIX; mpImpl->mbBoolean2 = ((SvxAuthorField*)pData)->GetFormat() != SVXAUTHORFORMAT_SHORTNAME; break; case ID_MEASUREFIELD: - mpImpl->mnInt16 = ((SdrMeasureField*)pData)->GetMeasureFieldKind(); + mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >(((SdrMeasureField*)pData)->GetMeasureFieldKind()); break; } } @@ -481,7 +483,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() // #92009# pass fixed attribute to constructor pData = new SvxExtFileField( mpImpl->msString1, mpImpl->mbBoolean1 ? SVXFILETYPE_FIX : SVXFILETYPE_VAR, - setFileNameDisplayFormat((SvxFileFormat)mpImpl->mnInt16 ) ); + setFileNameDisplayFormat(mpImpl->mnInt16 ) ); break; } |