diff options
author | Niklas Nebel <nn@openoffice.org> | 2010-04-29 13:35:08 +0200 |
---|---|---|
committer | Niklas Nebel <nn@openoffice.org> | 2010-04-29 13:35:08 +0200 |
commit | 29ce98cbc3951b64ad079074f84e05b6d87621a0 (patch) | |
tree | 8589e6b75d75f4a851a127ccc6be5117e9595364 /formula | |
parent | 956a360265d19e985ce405c8600832888299f713 (diff) | |
parent | 515792c312abc929b4616c757b8eaced67718d10 (diff) |
calc53: merge with DEV300_m77
Diffstat (limited to 'formula')
-rw-r--r-- | formula/inc/formula/errorcodes.hxx | 8 | ||||
-rw-r--r-- | formula/util/for.map | 8 | ||||
-rw-r--r-- | formula/util/forui.map | 8 | ||||
-rw-r--r-- | formula/util/makefile.mk | 1 |
4 files changed, 6 insertions, 19 deletions
diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx index 2d8d9d18b71b..f9b04e012fab 100644 --- a/formula/inc/formula/errorcodes.hxx +++ b/formula/inc/formula/errorcodes.hxx @@ -83,9 +83,13 @@ const USHORT NOTAVAILABLE = 0x7fff; represent an interpreter error code. */ inline double CreateDoubleError( USHORT nErr ) { - double fVal; + union + { + double fVal; + sal_math_Double smVal; + }; ::rtl::math::setNan( &fVal ); - reinterpret_cast< sal_math_Double * >(&fVal)->nan_parts.fraction_lo = nErr; + smVal.nan_parts.fraction_lo = nErr; return fVal; } diff --git a/formula/util/for.map b/formula/util/for.map deleted file mode 100644 index b34eff63c44f..000000000000 --- a/formula/util/for.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - local: - *; -}; diff --git a/formula/util/forui.map b/formula/util/forui.map deleted file mode 100644 index b34eff63c44f..000000000000 --- a/formula/util/forui.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - local: - *; -}; diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk index 3e8f2301b283..7ae30b007d00 100644 --- a/formula/util/makefile.mk +++ b/formula/util/makefile.mk @@ -120,7 +120,6 @@ DEFLIB2NAME=$(TARGET2) .ENDIF SHL2USE_EXPORTS=name -# SHL2VERSIONMAP=$(TARGET2).map # --- .res file ---------------------------------------------------------- |