diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:32:12 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:32:12 +0000 |
| commit | 6c6c9b71a0c9137352c21f490a59d0588443f042 (patch) | |
| tree | cffd8ae70192291890509721407aaf9cc0ab33e3 /toolkit/source/controls/formattedcontrol.cxx | |
| parent | 47efae36aaa17093bb46805321b3630d04f1174f (diff) | |
INTEGRATION: CWS sb59 (1.7.116); FILE MERGED
2006/07/21 07:59:26 sb 1.7.116.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'toolkit/source/controls/formattedcontrol.cxx')
| -rw-r--r-- | toolkit/source/controls/formattedcontrol.cxx | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 3ef587670b9c..1d91b0eac16b 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formattedcontrol.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:17:21 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:32:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,16 +116,30 @@ namespace toolkit { if ( BASEPROPERTY_EFFECTIVE_DEFAULT == nPropId ) { - sal_Bool bStreamed; double dVal = 0; sal_Int32 nVal = 0; ::rtl::OUString sVal; - if ( (bStreamed = (rValue >>= dVal)) ) + sal_Bool bStreamed = (rValue >>= dVal); + if ( bStreamed ) + { rConvertedValue <<= dVal; - else if ( (bStreamed = (rValue >>= nVal)) ) - rConvertedValue <<= static_cast<double>(nVal); - else if ( (bStreamed = (rValue >>= sVal)) ) - rConvertedValue <<= sVal; + } + else + { + bStreamed = (rValue >>= nVal); + if ( bStreamed ) + { + rConvertedValue <<= static_cast<double>(nVal); + } + else + { + bStreamed = (rValue >>= sVal); + if ( bStreamed ) + { + rConvertedValue <<= sVal; + } + } + } if ( bStreamed ) { |