Kaydet (Commit) 3d5a7e6b authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

INTEGRATION: CWS warningfixes03_SRC680 (1.6.158); FILE MERGED

2006/08/18 14:16:25 mhu 1.6.158.1: #i68745# Fixed GCC 4.0.x warning(s).
üst 36a4ed03
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: undlihdl.cxx,v $ * $RCSfile: undlihdl.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: rt $ $Date: 2005-09-09 14:49:45 $ * last change: $Author: ihi $ $Date: 2006-08-29 11:02:29 $
* *
* 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.
...@@ -159,7 +159,7 @@ sal_Bool XMLUnderlineTypePropHdl::importXML( const OUString& rStrImpValue, uno:: ...@@ -159,7 +159,7 @@ sal_Bool XMLUnderlineTypePropHdl::importXML( const OUString& rStrImpValue, uno::
{ {
// multi property: style and width might be set already. // multi property: style and width might be set already.
// If the old value is NONE, the new is used unchanged. // If the old value is NONE, the new is used unchanged.
sal_Int16 eUnderline; sal_Int16 eUnderline = sal_Int16();
if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline ) if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline )
{ {
switch( eNewUnderline ) switch( eNewUnderline )
...@@ -207,7 +207,7 @@ sal_Bool XMLUnderlineTypePropHdl::importXML( const OUString& rStrImpValue, uno:: ...@@ -207,7 +207,7 @@ sal_Bool XMLUnderlineTypePropHdl::importXML( const OUString& rStrImpValue, uno::
sal_Bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
sal_Int16 nValue; sal_Int16 nValue = sal_Int16();
OUStringBuffer aOut; OUStringBuffer aOut;
if( (rValue >>= nValue) && if( (rValue >>= nValue) &&
...@@ -242,7 +242,7 @@ sal_Bool XMLUnderlineStylePropHdl::importXML( const OUString& rStrImpValue, uno: ...@@ -242,7 +242,7 @@ sal_Bool XMLUnderlineStylePropHdl::importXML( const OUString& rStrImpValue, uno:
{ {
// multi property: style and width might be set already. // multi property: style and width might be set already.
// If the old value is NONE, the new is used unchanged. // If the old value is NONE, the new is used unchanged.
sal_Int16 eUnderline; sal_Int16 eUnderline = sal_Int16();
if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline ) if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline )
{ {
switch( eNewUnderline ) switch( eNewUnderline )
...@@ -297,7 +297,7 @@ sal_Bool XMLUnderlineStylePropHdl::importXML( const OUString& rStrImpValue, uno: ...@@ -297,7 +297,7 @@ sal_Bool XMLUnderlineStylePropHdl::importXML( const OUString& rStrImpValue, uno:
sal_Bool XMLUnderlineStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLUnderlineStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
sal_Int16 nValue; sal_Int16 nValue = sal_Int16();
OUStringBuffer aOut; OUStringBuffer aOut;
if( rValue >>= nValue ) if( rValue >>= nValue )
...@@ -330,7 +330,7 @@ sal_Bool XMLUnderlineWidthPropHdl::importXML( const OUString& rStrImpValue, uno: ...@@ -330,7 +330,7 @@ sal_Bool XMLUnderlineWidthPropHdl::importXML( const OUString& rStrImpValue, uno:
{ {
// multi property: style and width might be set already. // multi property: style and width might be set already.
// If the old value is NONE, the new is used unchanged. // If the old value is NONE, the new is used unchanged.
sal_Int16 eUnderline; sal_Int16 eUnderline = sal_Int16();
if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline ) if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline )
{ {
switch( eNewUnderline ) switch( eNewUnderline )
...@@ -389,7 +389,7 @@ sal_Bool XMLUnderlineWidthPropHdl::importXML( const OUString& rStrImpValue, uno: ...@@ -389,7 +389,7 @@ sal_Bool XMLUnderlineWidthPropHdl::importXML( const OUString& rStrImpValue, uno:
sal_Bool XMLUnderlineWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLUnderlineWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
sal_Int16 nValue; sal_Int16 nValue = sal_Int16();
OUStringBuffer aOut; OUStringBuffer aOut;
if( (rValue >>= nValue) && (FontUnderline::NONE != nValue) ) if( (rValue >>= nValue) && (FontUnderline::NONE != nValue) )
......
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