lotuswordpro: use native OUString api rather than a wrapper

Change-Id: I28be9db72d1f3dc678106a9449944b8a6b0ce9a8

35 files changed, 111 insertions, 127 deletions

diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index 7da56e5e30bc..aa1c783b8700 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -120,8 +120,8 @@ OUString   XFBorder::GetLineWidth()
     if( m_bDouble )
     {
         str = FloatToOUString(m_fWidthInner);
-        str += "cm " + DoubleToOUString(m_fWidthSpace);
-        str += "cm " + DoubleToOUString(m_fWidthOuter) + "cm";
+        str += "cm " + OUString::number(m_fWidthSpace);
+        str += "cm " + OUString::number(m_fWidthOuter) + "cm";
     }
     return str;
 }
@@ -138,7 +138,7 @@ OUString   XFBorder::ToString()
             return str;
         }
 
-        str = DoubleToOUString(width) + "cm";
+        str = OUString::number(width) + "cm";
         str += " double " + m_aColor.ToString();
     }
     else
@@ -148,7 +148,7 @@ OUString   XFBorder::ToString()
         {
             return str;
         }
-        str = DoubleToOUString(width) + "cm";
+        str = OUString::number(width) + "cm";
         str += " solid " + m_aColor.ToString();
     }
     return str;
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index fbd29c7b1756..99c195b92cd6 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -162,7 +162,7 @@ void    XFCell::Add(IXFContent *pContent)
 
 void    XFCell::SetValue(double value)
 {
-    SetValue(DoubleToOUString(value,18));
+    SetValue(OUString::number(value));
 }
 
 void    XFCell::SetValue(OUString value)
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index 9e52a0cf2ff2..95c1664944f5 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -223,7 +223,7 @@ void XFCellStyle::ToXml(IXFStream *pStrm)
     //text indent:
     if( m_fTextIndent>FLOAT_MIN )
     {
-        pAttrList->AddAttribute("fo:text-indent", DoubleToOUString(m_fTextIndent) + "cm" );
+        pAttrList->AddAttribute("fo:text-indent", OUString::number(m_fTextIndent) + "cm" );
     }
     //padding:
     m_aPadding.ToXml(pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
index 481b28cea75f..9cddf25bbeff 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
@@ -84,7 +84,7 @@ void    XFColStyle::ToXml(IXFStream *pStrm)
     pStrm->StartElement( "style:style" );
 
     pAttrList->Clear();
-    pAttrList->AddAttribute( "style:column-width", DoubleToOUString(m_fWidth) + "cm" );
+    pAttrList->AddAttribute( "style:column-width", OUString::number(m_fWidth) + "cm" );
     pStrm->StartElement( "style:properties" );
     pStrm->EndElement( "style:properties" );
 
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
index cf17b41b9a1b..68e3aeccd047 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
@@ -76,8 +76,8 @@ void    XFColumn::ToXml(IXFStream *pStrm)
     pAttrList->Clear();
 
     pAttrList->AddAttribute( "style:rel-width", OUString::number(m_nRelWidth) + "*" );
-    pAttrList->AddAttribute( "fo:margin-left", DoubleToOUString(m_fMarginLeft) + "cm" );
-    pAttrList->AddAttribute( "fo:margin-right", DoubleToOUString(m_fMarginRight) + "cm" );
+    pAttrList->AddAttribute( "fo:margin-left", OUString::number(m_fMarginLeft) + "cm" );
+    pAttrList->AddAttribute( "fo:margin-right", OUString::number(m_fMarginRight) + "cm" );
 
     pStrm->StartElement( "style:column" );
     pStrm->EndElement( "style:column" );
@@ -106,7 +106,7 @@ void    XFColumnSep::ToXml(IXFStream *pStrm)
     IXFAttrList *pAttrList = pStrm->GetAttrList();
 
     pAttrList->Clear();
-    pAttrList->AddAttribute( "style:width", DoubleToOUString(m_fWidth) + "cm" );
+    pAttrList->AddAttribute( "style:width", OUString::number(m_fWidth) + "cm" );
     if( m_aColor.IsValid() )
         pAttrList->AddAttribute( "style:color", m_aColor.ToString() );
     pAttrList->AddAttribute( "style:height", OUString::number(m_nRelHeight) + "%" );
@@ -158,7 +158,7 @@ void    XFColumns::ToXml(IXFStream *pStrm)
     pAttrList->AddAttribute( "fo:column-count", OUString::number(m_nCount));
     if( m_nFlag&XFCOLUMNS_FLAG_GAP )
     {
-        pAttrList->AddAttribute( "fo:column-gap", DoubleToOUString(m_fGap)+"cm" );
+        pAttrList->AddAttribute( "fo:column-gap", OUString::number(m_fGap)+"cm" );
     }
 
     pStrm->StartElement( "style:columns" );
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx
index 0edb8c67cfd3..11e87fc6b180 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx
@@ -89,7 +89,7 @@ void    XFDrawAreaStyle::ToXml(IXFStream *pStrm)
 
     pAttrList->AddAttribute( "draw:color", m_aLineColor.ToString() );
     pAttrList->AddAttribute( "draw:rotation", OUString::number(m_nAngle*10) );
-    pAttrList->AddAttribute( "draw:distance", DoubleToOUString(m_fSpace)+"cm" );
+    pAttrList->AddAttribute( "draw:distance", OUString::number(m_fSpace)+"cm" );
 
     pStrm->StartElement( "draw:hatch" );
     pStrm->EndElement( "draw:hatch" );
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
index cb233911a32f..3ac859b58ec2 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
@@ -96,21 +96,21 @@ void XFDrawLine::ToXml(IXFStream *pStrm)
     }
     pAttrList->AddAttribute( "draw:z-index", OUString::number(m_nZIndex) );
 
-    pAttrList->AddAttribute( "svg:x1", DoubleToOUString(m_aPoint1.GetX()) + "cm" );
-    pAttrList->AddAttribute( "svg:y1", DoubleToOUString(m_aPoint1.GetY()) + "cm" );
-    pAttrList->AddAttribute( "svg:x2", DoubleToOUString(m_aPoint2.GetX()) + "cm" );
-    pAttrList->AddAttribute( "svg:y2", DoubleToOUString(m_aPoint2.GetY()) + "cm" );
+    pAttrList->AddAttribute( "svg:x1", OUString::number(m_aPoint1.GetX()) + "cm" );
+    pAttrList->AddAttribute( "svg:y1", OUString::number(m_aPoint1.GetY()) + "cm" );
+    pAttrList->AddAttribute( "svg:x2", OUString::number(m_aPoint2.GetX()) + "cm" );
+    pAttrList->AddAttribute( "svg:y2", OUString::number(m_aPoint2.GetY()) + "cm" );
 
     //transform
     OUString   strTransform;
     if( m_nFlag&XFDRAWOBJECT_FLAG_ROTATE )
-        strTransform = "rotate (" + DoubleToOUString(m_fRotate) + ") ";
+        strTransform = "rotate (" + OUString::number(m_fRotate) + ") ";
     if( m_nFlag&XFDRAWOBJECT_FLAG_TRANLATE )
-        strTransform += "translate (" + DoubleToOUString(m_aRotatePoint.GetX()) + "cm " + DoubleToOUString(m_aRotatePoint.GetY()) + "cm) ";
+        strTransform += "translate (" + OUString::number(m_aRotatePoint.GetX()) + "cm " + OUString::number(m_aRotatePoint.GetY()) + "cm) ";
     if( m_nFlag&XFDRAWOBJECT_FLAG_SKEWX )
-        strTransform += "skewX (" + DoubleToOUString(m_fSkewX) + " ";
+        strTransform += "skewX (" + OUString::number(m_fSkewX) + " ";
     if( m_nFlag&XFDRAWOBJECT_FLAG_SKEWY )
-        strTransform += "skewY (" + DoubleToOUString(m_fSkewY) + " ";
+        strTransform += "skewY (" + OUString::number(m_fSkewY) + " ";
     strTransform = strTransform.trim();
 
     if( !strTransform.isEmpty() )
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
index 466b95869fd8..b8c9158669c9 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
@@ -93,27 +93,27 @@ void    XFDrawLineStyle::ToXml(IXFStream *pStrm)
     else if( m_eLineStyle == enumXFLineDash )
     {
         pAttrList->AddAttribute( "draw:dots1", OUString::number(m_nNumber1));
-        pAttrList->AddAttribute( " draw:dots1-length", DoubleToOUString(m_fLength1) + "cm");
+        pAttrList->AddAttribute( " draw:dots1-length", OUString::number(m_fLength1) + "cm");
 
         pAttrList->AddAttribute( "draw:dots2", OUString::number(m_nNumber2));
-        pAttrList->AddAttribute( " draw:dots2-length", DoubleToOUString(m_fLength2) + "cm");
+        pAttrList->AddAttribute( " draw:dots2-length", OUString::number(m_fLength2) + "cm");
     }
     else if( m_eLineStyle == enumXFLineDotDash )
     {
         pAttrList->AddAttribute( "draw:dots1", OUString::number(m_nNumber1));
 
         pAttrList->AddAttribute( "draw:dots2", OUString::number(m_nNumber2));
-        pAttrList->AddAttribute( " draw:dots2-length", DoubleToOUString(m_fLength2) + "cm");
+        pAttrList->AddAttribute( " draw:dots2-length", OUString::number(m_fLength2) + "cm");
     }
     else if( m_eLineStyle == enumXFLineDashDot )
     {
         pAttrList->AddAttribute( "draw:dots1", OUString::number(m_nNumber1));
-        pAttrList->AddAttribute( " draw:dots1-length", DoubleToOUString(m_fLength1) + "cm");
+        pAttrList->AddAttribute( " draw:dots1-length", OUString::number(m_fLength1) + "cm");
 
         pAttrList->AddAttribute( "draw:dots2", OUString::number(m_nNumber2));
     }
 
-    pAttrList->AddAttribute( "draw:distance", DoubleToOUString(m_fSpace) + "cm" );
+    pAttrList->AddAttribute( "draw:distance", OUString::number(m_fSpace) + "cm" );
 
     pStrm->StartElement( "draw:stroke-dash" );
     pStrm->EndElement( "draw:stroke-dash" );
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
index 5ec311e72d1b..f769e2eb1ec3 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
@@ -108,23 +108,23 @@ void XFDrawObject::ToXml(IXFStream *pStrm)
     }
     pAttrList->AddAttribute( "draw:z-index", OUString::number(m_nZIndex) );
 
-    pAttrList->AddAttribute( "svg:x", DoubleToOUString(m_aRect.GetX()) + "cm" );
-    pAttrList->AddAttribute( "svg:y", DoubleToOUString(m_aRect.GetY()) + "cm" );
-    pAttrList->AddAttribute( "svg:width", DoubleToOUString(m_aRect.GetWidth()) + "cm" );
-    pAttrList->AddAttribute( "svg:height", DoubleToOUString(m_aRect.GetHeight()) + "cm" );
+    pAttrList->AddAttribute( "svg:x", OUString::number(m_aRect.GetX()) + "cm" );
+    pAttrList->AddAttribute( "svg:y", OUString::number(m_aRect.GetY()) + "cm" );
+    pAttrList->AddAttribute( "svg:width", OUString::number(m_aRect.GetWidth()) + "cm" );
+    pAttrList->AddAttribute( "svg:height", OUString::number(m_aRect.GetHeight()) + "cm" );
 
     //transform
     OUString   strTransform;
     if( m_nFlag&XFDRAWOBJECT_FLAG_ROTATE )
-        strTransform = "rotate (" + DoubleToOUString(m_fRotate) + ") ";
+        strTransform = "rotate (" + OUString::number(m_fRotate) + ") ";
     if( m_nFlag&XFDRAWOBJECT_FLAG_TRANLATE )
-        strTransform += "translate (" + DoubleToOUString(m_aRotatePoint.GetX()) + "cm " + DoubleToOUString(m_aRotatePoint.GetY()) + "cm) ";
+        strTransform += "translate (" + OUString::number(m_aRotatePoint.GetX()) + "cm " + OUString::number(m_aRotatePoint.GetY()) + "cm) ";
     if( m_nFlag&XFDRAWOBJECT_FLAG_SCALE )
-        strTransform += "scale (" + DoubleToOUString(m_fScaleX) + "cm " + DoubleToOUString(m_fScaleY) + "cm) ";
+        strTransform += "scale (" + OUString::number(m_fScaleX) + "cm " + OUString::number(m_fScaleY) + "cm) ";
     if( m_nFlag&XFDRAWOBJECT_FLAG_SKEWX )
-        strTransform += "skewX (" + DoubleToOUString(m_fSkewX) + " ";
+        strTransform += "skewX (" + OUString::number(m_fSkewX) + " ";
     if( m_nFlag&XFDRAWOBJECT_FLAG_SKEWY )
-        strTransform += "skewY (" + DoubleToOUString(m_fSkewY) + " ";
+        strTransform += "skewY (" + OUString::number(m_fSkewY) + " ";
     strTransform = strTransform.trim();
 
     if( !strTransform.isEmpty() )
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index 7fa8b0586123..ca2763b80d10 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -72,7 +72,7 @@ OUString XFSvgPathEntry::ToString()
     for( it = m_aPoints.begin(); it != m_aPoints.end(); ++it )
     {
         XFPoint aPt= *it;
-        str += DoubleToOUString(aPt.GetX()*1000) + " " + DoubleToOUString(aPt.GetY()*1000) + " ";
+        str += OUString::number(aPt.GetX()*1000) + " " + OUString::number(aPt.GetY()*1000) + " ";
     }
     return str.trim();
 }
@@ -141,8 +141,8 @@ void    XFDrawPath::ToXml(IXFStream *pStrm)
     XFRect  rect = m_aRect;
 
     OUString strViewBox = "0 0 ";
-    strViewBox += DoubleToOUString(rect.GetWidth()*1000) + " ";
-    strViewBox += DoubleToOUString(rect.GetHeight()*1000);
+    strViewBox += OUString::number(rect.GetWidth()*1000) + " ";
+    strViewBox += OUString::number(rect.GetHeight()*1000);
     pAttrList->AddAttribute( "svg:viewBox", strViewBox);
 
     //points
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
index 84bb240a2b6a..3c67675a480e 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
@@ -72,8 +72,8 @@ void XFDrawPolygon::ToXml(IXFStream *pStrm)
     //view-box:
     XFRect  rect = CalcViewBox();
     OUString strViewBox = "0 0 ";
-    strViewBox += DoubleToOUString(rect.GetWidth()*1000) + " ";
-    strViewBox += DoubleToOUString(rect.GetHeight()*1000);
+    strViewBox += OUString::number(rect.GetWidth()*1000) + " ";
+    strViewBox += OUString::number(rect.GetHeight()*1000);
     pAttrList->AddAttribute( "svg:viewBox", strViewBox);
 
     //points
@@ -83,7 +83,7 @@ void XFDrawPolygon::ToXml(IXFStream *pStrm)
         XFPoint pt = *it;
         double  x = (pt.GetX()-rect.GetX())*1000;
         double  y = (pt.GetY()-rect.GetY())*1000;
-        strPoints += DoubleToOUString(x) + " " + DoubleToOUString(y) + " ";
+        strPoints += OUString::number(x) + " " + OUString::number(y) + " ";
     }
     strPoints = strPoints.trim();
     pAttrList->AddAttribute( "draw:points", strPoints);
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
index bd3e94b7b20e..5c8e05e8426b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
@@ -72,8 +72,8 @@ void XFDrawPolyline::ToXml(IXFStream *pStrm)
     //view-box:
     XFRect  rect = CalcViewBox();
     OUString strViewBox = "0 0 ";
-    strViewBox += DoubleToOUString(rect.GetWidth()*1000) + " ";
-    strViewBox += DoubleToOUString(rect.GetHeight()*1000);
+    strViewBox += OUString::number(rect.GetWidth()*1000) + " ";
+    strViewBox += OUString::number(rect.GetHeight()*1000);
     pAttrList->AddAttribute( "svg:viewBox", strViewBox);
 
     //points
@@ -83,7 +83,7 @@ void XFDrawPolyline::ToXml(IXFStream *pStrm)
         XFPoint pt = *it;
         double  x = (pt.GetX()-rect.GetX())*1000;
         double  y = (pt.GetY()-rect.GetY())*1000;
-        strPoints += DoubleToOUString(x) + "," + DoubleToOUString(y) + " ";
+        strPoints += OUString::number(x) + "," + OUString::number(y) + " ";
     }
     strPoints = strPoints.trim();
     pAttrList->AddAttribute( "draw:points", strPoints);
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
index 5efb0a4a54d3..21e073756845 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
@@ -71,7 +71,7 @@ void XFDrawRect::ToXml(IXFStream *pStrm)
     pAttrList->Clear();
 
     if( 0 != m_fCornerRadius )
-        pAttrList->AddAttribute( "draw:corner-radius", DoubleToOUString(m_fCornerRadius) + "cm" );
+        pAttrList->AddAttribute( "draw:corner-radius", OUString::number(m_fCornerRadius) + "cm" );
     XFDrawObject::ToXml(pStrm);
 
     pStrm->StartElement( "draw:rect" );
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index 983e0f0c7b5d..db49645dda35 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -214,7 +214,7 @@ void    XFDrawStyle::ToXml(IXFStream *pStrm)
         }
 
         if( m_pLineStyle->GetWidth() > 0 )
-            pAttrList->AddAttribute( "svg:stroke-width", DoubleToOUString(m_pLineStyle->GetWidth()) + "cm" );
+            pAttrList->AddAttribute( "svg:stroke-width", OUString::number(m_pLineStyle->GetWidth()) + "cm" );
 
         XFColor color = m_pLineStyle->GetColor();
         if( color.IsValid() )
@@ -253,14 +253,14 @@ void    XFDrawStyle::ToXml(IXFStream *pStrm)
     if( !m_strArrowStart.isEmpty() )
     {
         pAttrList->AddAttribute( "draw:marker-start", m_strArrowStart );
-        pAttrList->AddAttribute( "draw:marker-start-width", DoubleToOUString(m_fArrowStartSize)+"cm" );
+        pAttrList->AddAttribute( "draw:marker-start-width", OUString::number(m_fArrowStartSize)+"cm" );
         if( m_bArrowStartCenter )
             pAttrList->AddAttribute( "draw:draw:marker-start-center", "true"  );
     }
     if( !m_strArrowEnd.isEmpty() )
     {
         pAttrList->AddAttribute( "draw:marker-end", m_strArrowEnd );
-        pAttrList->AddAttribute( "draw:marker-end-width", DoubleToOUString(m_fArrowEndSize)+"cm" );
+        pAttrList->AddAttribute( "draw:marker-end-width", OUString::number(m_fArrowEndSize)+"cm" );
         if( m_bArrowEndCenter )
             pAttrList->AddAttribute( "draw:draw:marker-end-center", "true"  );
     }
@@ -335,7 +335,7 @@ void    XFDrawStyle::ToXml(IXFStream *pStrm)
 
         // distance
         //pAttrList->AddAttribute("draw:fontwork-distance",
-        //  DoubleToOUString(m_pFontWorkStyle->GetFWDistance())+"cm");
+        //  OUString::number(m_pFontWorkStyle->GetFWDistance())+"cm");
     }
 
     pStrm->StartElement( "style:properties" );
diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
index c1830fd070d4..5d00700f9329 100644
--- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
@@ -124,7 +124,7 @@ inline void XFDropcap::ToXml(IXFStream *pStrm)
         return;
     pAttrList->AddAttribute("style:length", OUString::number(m_nCharCount) );
     pAttrList->AddAttribute("style:lines", OUString::number(m_nLines) );
-    pAttrList->AddAttribute("style:distance", DoubleToOUString(m_fDistance) + "cm" );
+    pAttrList->AddAttribute("style:distance", OUString::number(m_fDistance) + "cm" );
     if( !m_strStyleName.isEmpty() )
         pAttrList->AddAttribute("style:style-name", m_strStyleName );
     pStrm->StartElement( "style:drop-cap" );
diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx
index ff15aff2e9e5..31ae98c59a2c 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.cxx
@@ -383,12 +383,12 @@ void XFFont::ToXml(IXFStream *pStrm)
     //char space:
     if( (m_nFlag & XFFONT_FLAG_CHARSPACE) && m_fCharSpace != 0 )
     {
-        pAttrList->AddAttribute("fo:letter-spacing", DoubleToOUString(m_fCharSpace)+"cm" );
+        pAttrList->AddAttribute("fo:letter-spacing", OUString::number(m_fCharSpace)+"cm" );
     }
 
     if( (m_nFlag&XFFONT_FLAG_WIDTHSCALE) && m_nWidthScale != 100 )
     {
-        pAttrList->AddAttribute("style:text-scale", DoubleToOUString(m_nWidthScale)+"%" );
+        pAttrList->AddAttribute("style:text-scale", OUString::number(m_nWidthScale)+"%" );
     }
 
     //Color:
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx
index 7568b11baaaa..3398533641fb 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx
@@ -165,17 +165,17 @@ void    XFFrame::StartFrame(IXFStream *pStrm)
     default:
         break;
     }
-    pAttrList->AddAttribute( "svg:x", DoubleToOUString(m_aRect.GetX()) + "cm" );
-    pAttrList->AddAttribute( "svg:y", DoubleToOUString(m_aRect.GetY()) + "cm" );
-    pAttrList->AddAttribute( "svg:width", DoubleToOUString(m_aRect.GetWidth()) + "cm" );
+    pAttrList->AddAttribute( "svg:x", OUString::number(m_aRect.GetX()) + "cm" );
+    pAttrList->AddAttribute( "svg:y", OUString::number(m_aRect.GetY()) + "cm" );
+    pAttrList->AddAttribute( "svg:width", OUString::number(m_aRect.GetWidth()) + "cm" );
     if( m_nFlag& XFFRAME_FLAG_MINHEIGHT )
     {
-        pAttrList->AddAttribute( "fo:min-height", DoubleToOUString(m_fMinHeight) + "cm" );
+        pAttrList->AddAttribute( "fo:min-height", OUString::number(m_fMinHeight) + "cm" );
         if( m_nFlag&XFFRAME_FLAG_MAXHEIGHT )
-            pAttrList->AddAttribute( "fo:max-height", DoubleToOUString(m_fMaxHeight) + "cm" );
+            pAttrList->AddAttribute( "fo:max-height", OUString::number(m_fMaxHeight) + "cm" );
     }
     else
-        pAttrList->AddAttribute( "svg:height", DoubleToOUString(m_aRect.GetHeight()) + "cm" );
+        pAttrList->AddAttribute( "svg:height", OUString::number(m_aRect.GetHeight()) + "cm" );
 
     pAttrList->AddAttribute( "draw:z-index", OUString::number(m_nZIndex) );
 
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
index 61d521f5250b..d91159324297 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
@@ -143,9 +143,9 @@ void    XFHeaderStyle::ToXml(IXFStream *pStrm)
 
     //height
     if( m_fMinHeight>0 )
-        pAttrList->AddAttribute( "fo:min-height", DoubleToOUString(m_fMinHeight) + "cm" );
+        pAttrList->AddAttribute( "fo:min-height", OUString::number(m_fMinHeight) + "cm" );
     else if( m_fHeight>0 )
-        pAttrList->AddAttribute( "svg:height", DoubleToOUString(m_fHeight) + "cm" );
+        pAttrList->AddAttribute( "svg:height", OUString::number(m_fHeight) + "cm" );
 
     m_aMargin.ToXml(pStrm);
     if(m_pShadow)
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx
index 306a0094edba..3c3fd5ebc185 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx
@@ -118,10 +118,10 @@ void    XFImage::ToXml(IXFStream *pStrm)
     default:
         break;
     }
-    pAttrList->AddAttribute( "svg:x", DoubleToOUString(m_aRect.GetX()) + "cm" );
-    pAttrList->AddAttribute( "svg:y", DoubleToOUString(m_aRect.GetY()) + "cm" );
-    pAttrList->AddAttribute( "svg:width", DoubleToOUString(m_aRect.GetWidth()) + "cm" );
-    pAttrList->AddAttribute( "svg:height", DoubleToOUString(m_aRect.GetHeight()) + "cm" );
+    pAttrList->AddAttribute( "svg:x", OUString::number(m_aRect.GetX()) + "cm" );
+    pAttrList->AddAttribute( "svg:y", OUString::number(m_aRect.GetY()) + "cm" );
+    pAttrList->AddAttribute( "svg:width", OUString::number(m_aRect.GetWidth()) + "cm" );
+    pAttrList->AddAttribute( "svg:height", OUString::number(m_aRect.GetHeight()) + "cm" );
     pAttrList->AddAttribute( "draw:z-index", OUString::number(m_nZIndex) );
 
     if( m_bUseLink )
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
index 16c5f4ba4ba5..93a64563743f 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
@@ -190,12 +190,10 @@ void XFImageStyle::ToXml(IXFStream *pStrm)
     //clip:
     if( FABS(m_fClipLeft)>FLOAT_MIN || FABS(m_fClipRight)>FLOAT_MIN || FABS(m_fClipTop)>FLOAT_MIN || FABS(m_fClipBottom)>FLOAT_MIN )
     {
-        OUString clip = "rect(";
-        clip += DoubleToOUString(m_fClipTop) + "cm ";
-        clip += DoubleToOUString(m_fClipRight) + "cm ";
-        clip += DoubleToOUString(m_fClipBottom) + "cm ";
-        clip += DoubleToOUString(m_fClipLeft) + "cm";
-        clip += ")";
+        OUString clip = "rect(" + OUString::number(m_fClipTop) + "cm " +
+            OUString::number(m_fClipRight) + "cm " +
+            OUString::number(m_fClipBottom) + "cm " +
+            OUString::number(m_fClipLeft) + "cm" + ")";
         pAttrList->AddAttribute("fo:clip",clip);
     }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index 693ab14d242f..d8cd1070701d 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -287,7 +287,7 @@ void XFIndexTemplate::ToXml(IXFStream *pStrm)
             break;
         case enumXFIndexTemplateTab:
             if( m_eTabType != enumXFTabRight )
-                pAttrList->AddAttribute( "style:position", DoubleToOUString(m_fTabLength) + "cm" );
+                pAttrList->AddAttribute( "style:position", OUString::number(m_fTabLength) + "cm" );
 
             if(!m_aEntries[i].second.isEmpty())
                 pAttrList->AddAttribute( "text:style-name", m_aEntries[i].second );
diff --git a/lotuswordpro/source/filter/xfilter/xflineheight.hxx b/lotuswordpro/source/filter/xfilter/xflineheight.hxx
index 94e1ead38f56..be9f3082df53 100644
--- a/lotuswordpro/source/filter/xfilter/xflineheight.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflineheight.hxx
@@ -136,16 +136,16 @@ inline void XFLineHeight::ToXml(IXFStream *pStrm)
     case enumLHNone:
         return;
     case enumLHHeight:
-        pAttrList->AddAttribute( "fo:line-height",DoubleToOUString(m_Value.m_fValue) + "cm" );
+        pAttrList->AddAttribute( "fo:line-height",OUString::number(m_Value.m_fValue) + "cm" );
         break;
     case enumLHLeast:
-        pAttrList->AddAttribute( "style:line-height-at-least",DoubleToOUString(m_Value.m_fValue) + "cm" );
+        pAttrList->AddAttribute( "style:line-height-at-least",OUString::number(m_Value.m_fValue) + "cm" );
         break;
     case enumLHPercent:
-        pAttrList->AddAttribute( "fo:line-height", DoubleToOUString(m_Value.m_nValue) + "%" );
+        pAttrList->AddAttribute( "fo:line-height", OUString::number(m_Value.m_nValue) + "%" );
         break;
     case enumLHSpace:
-        pAttrList->AddAttribute( "style:line-spacing", DoubleToOUString(m_Value.m_fValue) + "cm" );
+        pAttrList->AddAttribute( "style:line-spacing", OUString::number(m_Value.m_fValue) + "cm" );
         break;
     }
 }
diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
index 71e4d5cbb3d7..9cee394ecaf6 100644
--- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
@@ -164,7 +164,7 @@ inline void XFLineNumberConfig::ToXml(IXFStream *pStrm)
 
     if( !m_strTextStyle.isEmpty() )
         pAttrList->AddAttribute( "text:style-name", m_strTextStyle );
-    pAttrList->AddAttribute( "text:offset", DoubleToOUString(m_fOffset) + "cm" );
+    pAttrList->AddAttribute( "text:offset", OUString::number(m_fOffset) + "cm" );
     pAttrList->AddAttribute( "style:num-format", m_strNumFmt );
     //position:
     if( m_ePosition == enumXFLineNumberLeft )
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
index 306c75b4ef64..ff06a234c03d 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
@@ -91,15 +91,15 @@ void XFListlevelNumber::ToXml(IXFStream *pStrm)
     pAttrList->Clear();
     if( m_fIndent > FLOAT_MIN )
     {
-        pAttrList->AddAttribute( "text:space-before", DoubleToOUString(m_fIndent) + "cm" );
+        pAttrList->AddAttribute( "text:space-before", OUString::number(m_fIndent) + "cm" );
     }
     if( m_fMinLabelWidth > FLOAT_MIN )
     {
-        pAttrList->AddAttribute( "text:min-label-width", DoubleToOUString(m_fMinLabelWidth) + "cm" );
+        pAttrList->AddAttribute( "text:min-label-width", OUString::number(m_fMinLabelWidth) + "cm" );
     }
     if( m_fMinLabelDistance > FLOAT_MIN )
     {
-        pAttrList->AddAttribute( "text:min-label-distance", DoubleToOUString(m_fMinLabelDistance) + "cm" );
+        pAttrList->AddAttribute( "text:min-label-distance", OUString::number(m_fMinLabelDistance) + "cm" );
     }
     pAttrList->AddAttribute( "fo:text-align", GetAlignName(m_eAlign) );
 
@@ -127,15 +127,15 @@ void    XFListLevelBullet::ToXml(IXFStream *pStrm)
     pAttrList->Clear();
     if( m_fIndent != 0 )
     {
-        pAttrList->AddAttribute( "text:space-before", DoubleToOUString(m_fIndent) + "cm" );
+        pAttrList->AddAttribute( "text:space-before", OUString::number(m_fIndent) + "cm" );
     }
     if( m_fMinLabelWidth != 0 )
     {
-        pAttrList->AddAttribute( "text:min-label-width", DoubleToOUString(m_fMinLabelWidth) + "cm" );
+        pAttrList->AddAttribute( "text:min-label-width", OUString::number(m_fMinLabelWidth) + "cm" );
     }
     if( m_fMinLabelDistance != 0 )
     {
-        pAttrList->AddAttribute( "text:min-label-distance", DoubleToOUString(m_fMinLabelDistance) + "cm" );
+        pAttrList->AddAttribute( "text:min-label-distance", OUString::number(m_fMinLabelDistance) + "cm" );
     }
 
     pAttrList->AddAttribute( "fo:text-align", GetAlignName(m_eAlign) );
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.cxx b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
index 2d24be94db82..ca3fd5b4e184 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
@@ -80,22 +80,22 @@ void    XFMargins::ToXml(IXFStream *pStrm)
     //margin left:
     if( m_nFlag&XFMARGINS_FLAG_LEFT )
     {
-        pAttrList->AddAttribute( "fo:margin-left", DoubleToOUString(m_fLeft) + "cm" );
+        pAttrList->AddAttribute( "fo:margin-left", OUString::number(m_fLeft) + "cm" );
     }
     //margin right:
     if( m_nFlag&XFMARGINS_FLAG_RIGHT )
     {
-        pAttrList->AddAttribute("fo:margin-right", DoubleToOUString(m_fRight) + "cm" );
+        pAttrList->AddAttribute("fo:margin-right", OUString::number(m_fRight) + "cm" );
     }
     //margin top:
     if( m_nFlag&XFMARGINS_FLAG_TOP )
     {
-        pAttrList->AddAttribute("fo:margin-top", DoubleToOUString(m_fTop) + "cm" );
+        pAttrList->AddAttribute("fo:margin-top", OUString::number(m_fTop) + "cm" );
     }
     //margin bottom:
     if( m_nFlag&XFMARGINS_FLAG_BOTTOM )
     {
-        pAttrList->AddAttribute("fo:margin-bottom", DoubleToOUString(m_fBottom) + "cm" );
+        pAttrList->AddAttribute("fo:margin-bottom", OUString::number(m_fBottom) + "cm" );
     }
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfpadding.hxx b/lotuswordpro/source/filter/xfilter/xfpadding.hxx
index 9bbfa7daebfd..712c2ca75d0e 100644
--- a/lotuswordpro/source/filter/xfilter/xfpadding.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpadding.hxx
@@ -162,28 +162,28 @@ inline void XFPadding::ToXml(IXFStream *pStrm)
 
     if( (m_fLeft == m_fRight) && (m_fLeft == m_fTop) && (m_fLeft== m_fBottom ) && m_nFlag == 0x00000015 )
     {
-        pAttrList->AddAttribute( "fo:padding", DoubleToOUString(m_fLeft) + "cm" );
+        pAttrList->AddAttribute( "fo:padding", OUString::number(m_fLeft) + "cm" );
         return;
     }
     //margin left:
     if( m_nFlag&XFPADDING_FLAG_LEFT )
     {
-        pAttrList->AddAttribute( "fo:padding-left", DoubleToOUString(m_fLeft) + "cm" );
+        pAttrList->AddAttribute( "fo:padding-left", OUString::number(m_fLeft) + "cm" );
     }
     //margin right:
     if( m_nFlag&XFPADDING_FLAG_RIGHT )
     {
-        pAttrList->AddAttribute("fo:padding-right", DoubleToOUString(m_fRight) + "cm" );
+        pAttrList->AddAttribute("fo:padding-right", OUString::number(m_fRight) + "cm" );
     }
     //margin top:
     if( m_nFlag&XFPADDING_FLAG_TOP )
     {
-        pAttrList->AddAttribute("fo:padding-top", DoubleToOUString(m_fTop) + "cm" );
+        pAttrList->AddAttribute("fo:padding-top", OUString::number(m_fTop) + "cm" );
     }
     //margin bottom:
     if( m_nFlag&XFPADDING_FLAG_BOTTOM )
     {
-        pAttrList->AddAttribute("fo:padding-bottom", DoubleToOUString(m_fBottom) + "cm" );
+        pAttrList->AddAttribute("fo:padding-bottom", OUString::number(m_fBottom) + "cm" );
     }
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
index e047f5dcad2f..f37050278ff3 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
@@ -220,9 +220,9 @@ void    XFPageMaster::ToXml(IXFStream *pStream)
     //style:properties
     pAttrList->Clear();
     if( m_fPageWidth != 0 )
-        pAttrList->AddAttribute( "fo:page-width", DoubleToOUString(m_fPageWidth) + "cm" );
+        pAttrList->AddAttribute( "fo:page-width", OUString::number(m_fPageWidth) + "cm" );
     if( m_fPageHeight != 0 )
-        pAttrList->AddAttribute( "fo:page-height", DoubleToOUString(m_fPageHeight) + "cm" );
+        pAttrList->AddAttribute( "fo:page-height", OUString::number(m_fPageHeight) + "cm" );
 
     m_aMargin.ToXml(pStream);
 
@@ -253,9 +253,9 @@ void    XFPageMaster::ToXml(IXFStream *pStream)
     if( m_eSepAlign || m_nSepLengthPercent>0 || m_fSepSpaceAbove>0 || m_fSepSpaceBelow>0 )
     {
         pAttrList->Clear();
-        pAttrList->AddAttribute( "style:width", DoubleToOUString(m_fSepWidth) + "cm" );
-        pAttrList->AddAttribute( "style:distance-before-sep", DoubleToOUString(m_fSepSpaceAbove) + "cm" );
-        pAttrList->AddAttribute( "style:distance-after-sep", DoubleToOUString(m_fSepSpaceBelow) + "cm" );
+        pAttrList->AddAttribute( "style:width", OUString::number(m_fSepWidth) + "cm" );
+        pAttrList->AddAttribute( "style:distance-before-sep", OUString::number(m_fSepSpaceAbove) + "cm" );
+        pAttrList->AddAttribute( "style:distance-after-sep", OUString::number(m_fSepSpaceBelow) + "cm" );
         pAttrList->AddAttribute( "style:color", m_aSepColor.ToString() );
         if( m_eSepAlign == enumXFAlignStart )
             pAttrList->AddAttribute( "style:adjustment", "left" );
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index b49ee1a72b94..6b943376e39b 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -422,7 +422,7 @@ void    XFParaStyle::ToXml(IXFStream *pStrm)
     //text indent:
     if( m_fTextIndent )
     {
-        pAttrList->AddAttribute("fo:text-indent", DoubleToOUString(m_fTextIndent) + "cm" );
+        pAttrList->AddAttribute("fo:text-indent", OUString::number(m_fTextIndent) + "cm" );
     }
     //padding:
     m_aPadding.ToXml(pStrm);
@@ -523,7 +523,7 @@ void XFDefaultParaStyle::ToXml(IXFStream * pStrm)
     //Paragraph properties:
     pAttrList->Clear();
 
-    pAttrList->AddAttribute("style:tab-stop-distance", DoubleToOUString(m_fTabDistance) + "cm" );
+    pAttrList->AddAttribute("style:tab-stop-distance", OUString::number(m_fTabDistance) + "cm" );
 
     pStrm->StartElement("style:properties");
     pStrm->EndElement("style:properties");
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
index 2732e48f91af..ffeaa0603440 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
@@ -86,9 +86,9 @@ void    XFRowStyle::ToXml(IXFStream *pStrm)
 
     pAttrList->Clear();
     if( m_fMinHeight )
-        pAttrList->AddAttribute( "style:min-row-height", DoubleToOUString(m_fMinHeight) + "cm" );
+        pAttrList->AddAttribute( "style:min-row-height", OUString::number(m_fMinHeight) + "cm" );
     else if( m_fHeight )
-        pAttrList->AddAttribute( "style:row-height", DoubleToOUString(m_fHeight) + "cm" );
+        pAttrList->AddAttribute( "style:row-height", OUString::number(m_fHeight) + "cm" );
 
     if( m_aBackColor.IsValid() && !m_pBGImage )
         pAttrList->AddAttribute( "fo:background-color", m_aBackColor.ToString() );
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
index 5207daa3471e..2790e5bf2bcf 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
@@ -111,11 +111,11 @@ void XFSectionStyle::ToXml(IXFStream *pStrm)
     pAttrList->Clear();
     if( m_fMarginLeft != 0 )
     {
-        pAttrList->AddAttribute( OUString("fo:margin-left"), DoubleToOUString(m_fMarginLeft) + OUString("cm") );
+        pAttrList->AddAttribute( OUString("fo:margin-left"), OUString::number(m_fMarginLeft) + OUString("cm") );
     }
     if( m_fMarginRight != 0 )
     {
-        pAttrList->AddAttribute( OUString("fo:margin-right"), DoubleToOUString(m_fMarginRight) + OUString("cm") );
+        pAttrList->AddAttribute( OUString("fo:margin-right"), OUString::number(m_fMarginRight) + OUString("cm") );
     }
     if( m_aBackColor.IsValid() && !m_pBackImage )
     {
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index 4412a61f1945..a7e69de467e6 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -72,7 +72,7 @@ XFShadow::~XFShadow()
 OUString XFShadow::ToString()
 {
     OUString   buf;
-    OUString   strOff = DoubleToOUString(m_fOffset);
+    OUString   strOff = OUString::number(m_fOffset);
 
     buf = m_aColor.ToString();
     switch(m_ePosition)
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
index 60bca7f9c6c2..cd78d7149e29 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
@@ -98,7 +98,7 @@ void    XFTableStyle::ToXml(IXFStream *pStrm)
     pStrm->StartElement( OUString("style:style") );
 
     pAttrList->Clear();
-    pAttrList->AddAttribute( OUString("style:width"), DoubleToOUString(m_fWidth) + OUString("cm") );
+    pAttrList->AddAttribute( OUString("style:width"), OUString::number(m_fWidth) + OUString("cm") );
     //text align:
     if( m_eAlign == enumXFAlignStart )
     {
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
index acb33b0a0f7d..2c825f20ec86 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
@@ -65,37 +65,37 @@ XFTabStyle::XFTabStyle()
     m_fLength = 0;
 }
 
-void    XFTabStyle::ToXml(IXFStream *pStrm)
+void XFTabStyle::ToXml(IXFStream *pStrm)
 {
     IXFAttrList *pAttrList = pStrm->GetAttrList();
     pAttrList->Clear();
 
-    pAttrList->AddAttribute( OUString("style:position"), DoubleToOUString(m_fLength) + OUString("cm") );
+    pAttrList->AddAttribute( "style:position", OUString::number(m_fLength) + OUString("cm") );
     switch(m_eType)
     {
     case enumXFTabLeft:
-        pAttrList->AddAttribute( OUString("style:type"), OUString("left") );
+        pAttrList->AddAttribute( "style:type", "left" );
         break;
     case enumXFTabCenter:
-        pAttrList->AddAttribute( OUString("style:type"), OUString("center") );
+        pAttrList->AddAttribute( "style:type", "center" );
         break;
     case enumXFTabRight:
-        pAttrList->AddAttribute( OUString("style:type"), OUString("right") );
+        pAttrList->AddAttribute( "style:type", "right" );
         break;
     case enumXFTabChar:
-        pAttrList->AddAttribute( OUString("style:type"), OUString("char") );
+        pAttrList->AddAttribute( "style:type", "char" );
         break;
     default:
         break;
     }
     //delimiter:
     if( m_eType == enumXFTabChar )
-        pAttrList->AddAttribute( OUString("style:char"), m_strDelimiter );
+        pAttrList->AddAttribute( "style:char", m_strDelimiter );
     //leader char:
     if( !m_strLeader.isEmpty() )
-        pAttrList->AddAttribute( OUString("style:leader-char"), m_strLeader );
+        pAttrList->AddAttribute( "style:leader-char", m_strLeader );
 
-    pStrm->StartElement( OUString("style:tab-stop") );
-    pStrm->EndElement( OUString("style:tab-stop") );
+    pStrm->StartElement( "style:tab-stop" );
+    pStrm->EndElement( "style:tab-stop" );
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index 899422973574..9ea00908bb10 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -87,18 +87,6 @@ OUString   FloatToOUString(float num, sal_Int32 /*precision*/)
     return OUString::number(num);
 }
 
-OUString   DoubleToOUString(double num, sal_Int32 /*precision*/)
-{
-    /*std::stringstream sstrm;
-    std::string         strRet;
-
-    sstrm.precision(precision);
-    sstrm<<num;
-    return OUString::createFromAscii(sstrm.str().c_str());
-    */
-    return OUString::number(num);
-}
-
 OUString   DateTimeToOUString(XFDateTime& dt)
 {
     OUString aResult = OUString::number(dt.nYear) + "-" + OUString::number(dt.nMonth) + "-" + OUString::number(dt.nDay) +
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx
index a765bb5eed92..7ebd187ba9b6 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx
@@ -69,8 +69,6 @@ OUString   Int16ToOUString(sal_Int16 num);
 
 OUString   FloatToOUString(float num, sal_Int32 precision=6);
 
-OUString   DoubleToOUString(double num, sal_Int32 precision=6);
-
 OUString   DateTimeToOUString(XFDateTime& dt);
 
 OUString   GetTableColName(sal_Int32 col);