Kaydet (Commit) 93df743b authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS pj65 (1.10.50); FILE MERGED

2006/11/06 11:14:25 pjanik 1.10.50.1: #i71027#: Prevent warnings on Mac OS X.
üst db7dc246
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: algitem.cxx,v $ * $RCSfile: algitem.cxx,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: obo $ $Date: 2006-10-12 12:52:11 $ * last change: $Author: vg $ $Date: 2006-11-21 17:09:26 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -196,7 +196,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) ...@@ -196,7 +196,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
table::CellHoriJustify eUno; table::CellHoriJustify eUno;
if(!(rVal >>= eUno)) if(!(rVal >>= eUno))
{ {
sal_Int32 nValue; sal_Int32 nValue = 0;
if(!(rVal >>= nValue)) if(!(rVal >>= nValue))
return sal_False; return sal_False;
eUno = (table::CellHoriJustify)nValue; eUno = (table::CellHoriJustify)nValue;
...@@ -322,7 +322,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) ...@@ -322,7 +322,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
table::CellVertJustify eUno; table::CellVertJustify eUno;
if(!(rVal >>= eUno)) if(!(rVal >>= eUno))
{ {
sal_Int32 nValue; sal_Int32 nValue = 0;
if(!(rVal >>= nValue)) if(!(rVal >>= nValue))
return sal_False; return sal_False;
eUno = (table::CellVertJustify)nValue; eUno = (table::CellVertJustify)nValue;
...@@ -431,7 +431,7 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ...@@ -431,7 +431,7 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/
table::CellOrientation eOrient; table::CellOrientation eOrient;
if(!(rVal >>= eOrient)) if(!(rVal >>= eOrient))
{ {
sal_Int32 nValue; sal_Int32 nValue = 0;
if(!(rVal >>= nValue)) if(!(rVal >>= nValue))
return sal_False; return sal_False;
eOrient = (table::CellOrientation)nValue; eOrient = (table::CellOrientation)nValue;
...@@ -687,7 +687,7 @@ sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) ...@@ -687,7 +687,7 @@ sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{ {
sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16 long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
sal_Int32 nVal; sal_Int32 nVal = 0;
if(!(rVal >>= nVal) || (nVal > nMaxVal)) if(!(rVal >>= nVal) || (nVal > nMaxVal))
return sal_False; return sal_False;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment