diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 11:01:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 11:01:26 +0000 |
| commit | 5aff37cd51879a41365f2ceb0e927bdf57ffddb3 (patch) | |
| tree | 00eecb86eca3db9a8473e55ceecbfa72cdc21d35 /starmath/source/node.cxx | |
| parent | ce25a84957e0b59afdf93f42580c31b5df692497 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'starmath/source/node.cxx')
| -rw-r--r-- | starmath/source/node.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 517ceb61d7e1..dc07013e49e3 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2,9 +2,9 @@ * * $RCSfile: node.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: tl $ $Date: 2002-12-12 15:40:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:58:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ #ifndef _FRACT_HXX //autogen #include <tools/fract.hxx> #endif -#ifndef _TOOLS_SOLMATH_H -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _SV_COLOR_HXX //autogen #include <vcl/color.hxx> @@ -176,7 +176,7 @@ Color SmTmpDevice::Impl_GetColor( const Color& rColor ) if (OUTDEV_WINDOW == rOutDev.GetOutDevType()) aBgCol = ((Window &) rOutDev).GetDisplayBackground().GetColor(); - nNewCol = SM_MOD1()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor; + nNewCol = SM_MOD1()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor; Color aTmpColor( nNewCol ); if (aBgCol.IsDark() && aTmpColor.IsDark()) @@ -319,7 +319,7 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType) { Fraction aVal (SmPtsTo100th_mm(rSize.GetNumerator()), rSize.GetDenominator()); - //long nHeight = SolarMath::Round(aVal); + //long nHeight = ::rtl::math::round(aVal); long nHeight = (long)aVal; aSize = GetFont().GetSize(); @@ -2056,10 +2056,10 @@ void SmFontNode::CreateTextFromNode(String &rText) default: break; } - String sResult; - SolarMath::DoubleToString(sResult, - static_cast<double>(aFontSize),'A',INT_MAX,'.',sal_True); - rText.Append(sResult); + rText += String( ::rtl::math::doubleToUString( + static_cast<double>(aFontSize), + rtl_math_StringFormat_Automatic, + rtl_math_DecimalPlaces_Max, '.', sal_True)); rText.Append(' '); } break; |