diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/inc/unitconv.hxx | |
parent | Typo. (diff) | |
parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
download | core-12343c15568dcc2c9209d8ca41fda2263122448f.tar.gz core-12343c15568dcc2c9209d8ca41fda2263122448f.zip |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/unitconv.hxx')
-rw-r--r-- | sc/inc/unitconv.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index 5211439fd372..be51d3cf3de6 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -62,10 +62,10 @@ class ScUnitConverter : public ScStrCollection ScUnitConverter& operator=( const ScUnitConverter& ); public: - ScUnitConverter( USHORT nInit = 16, USHORT nDelta = 4 ); + ScUnitConverter( sal_uInt16 nInit = 16, sal_uInt16 nDelta = 4 ); virtual ~ScUnitConverter() {}; - BOOL GetValue( double& fValue, const String& rFromUnit, + sal_Bool GetValue( double& fValue, const String& rFromUnit, const String& rToUnit ) const; }; |