Kaydet (Commit) b49b1e4c authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

lotuswordpro: use native OUString api rather than a wrapper

Change-Id: Id670e3cb4982a67d096f548b6d105b97582e1958
üst 025498dd
...@@ -219,7 +219,7 @@ void LwpTocSuperLayout::XFConvert(XFContentContainer* pCont) ...@@ -219,7 +219,7 @@ void LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
pTemplate->AddEntry(enumXFIndexTemplatePage, "TOC Page Number Text Style"); pTemplate->AddEntry(enumXFIndexTemplatePage, "TOC Page Number Text Style");
} }
pToc->AddTemplate(Int16ToOUString(i), m_pFoundry->FindActuralStyleName(pLevel->GetSearchStyle()), pTemplate); pToc->AddTemplate(OUString::number((sal_Int32)i), m_pFoundry->FindActuralStyleName(pLevel->GetSearchStyle()), pTemplate);
bInserted = sal_True; bInserted = sal_True;
} }
......
...@@ -176,7 +176,7 @@ void XFFrameStyle::ToXml(IXFStream *pStrm) ...@@ -176,7 +176,7 @@ void XFFrameStyle::ToXml(IXFStream *pStrm)
if( m_aBackColor.IsValid() ) if( m_aBackColor.IsValid() )
{ {
pAttrList->AddAttribute( "fo:background-color", m_aBackColor.ToString() ); pAttrList->AddAttribute( "fo:background-color", m_aBackColor.ToString() );
pAttrList->AddAttribute( "style:background-transparency", Int16ToOUString(m_nTransparency) + "%"); pAttrList->AddAttribute( "style:background-transparency", OUString::number((sal_Int32)m_nTransparency) + "%");
} }
//pad //pad
......
...@@ -79,11 +79,11 @@ void XFListlevelNumber::ToXml(IXFStream *pStrm) ...@@ -79,11 +79,11 @@ void XFListlevelNumber::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList(); IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear(); pAttrList->Clear();
pAttrList->AddAttribute( "text:level", Int16ToOUString(m_nLevel) ); pAttrList->AddAttribute( "text:level", OUString::number((sal_Int32)m_nLevel) );
//text:style-name,ignore now. //text:style-name,ignore now.
m_aNumFmt.ToXml(pStrm); m_aNumFmt.ToXml(pStrm);
if( m_nDisplayLevel ) if( m_nDisplayLevel )
pAttrList->AddAttribute( "text:display-levels", Int16ToOUString(m_nDisplayLevel) ); pAttrList->AddAttribute( "text:display-levels", OUString::number((sal_Int32)m_nDisplayLevel) );
pStrm->StartElement( "text:list-level-style-number" ); pStrm->StartElement( "text:list-level-style-number" );
...@@ -114,7 +114,7 @@ void XFListLevelBullet::ToXml(IXFStream *pStrm) ...@@ -114,7 +114,7 @@ void XFListLevelBullet::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList(); IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear(); pAttrList->Clear();
pAttrList->AddAttribute( "text:level", Int16ToOUString(m_nLevel) ); pAttrList->AddAttribute( "text:level", OUString::number((sal_Int32)m_nLevel) );
//text:style-name,ignore now. //text:style-name,ignore now.
m_aNumFmt.ToXml(pStrm); m_aNumFmt.ToXml(pStrm);
//bullet-char //bullet-char
......
...@@ -137,7 +137,7 @@ public: ...@@ -137,7 +137,7 @@ public:
pAttrList->AddAttribute( "style:num-suffix", m_strSuffix ); pAttrList->AddAttribute( "style:num-suffix", m_strSuffix );
pAttrList->AddAttribute( "style:num-format", m_strFormat ); pAttrList->AddAttribute( "style:num-format", m_strFormat );
if( m_nStartValue != 0 ) if( m_nStartValue != 0 )
pAttrList->AddAttribute( "text:start-value", Int16ToOUString(m_nStartValue) ); pAttrList->AddAttribute( "text:start-value", OUString::number((sal_Int32)m_nStartValue) );
} }
private: private:
OUString m_strPrefix; OUString m_strPrefix;
......
...@@ -64,17 +64,6 @@ ...@@ -64,17 +64,6 @@
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <sstream> #include <sstream>
OUString Int16ToOUString(sal_Int16 num)
{
/*std::stringstream sstrm;
sstrm<<(int)num;
return OUString::createFromAscii(sstrm.str().c_str());
*/
sal_Int32 nNum = static_cast<sal_Int32>(num);
return OUString::number(nNum);
}
OUString FloatToOUString(float num, sal_Int32 /*precision*/) OUString FloatToOUString(float num, sal_Int32 /*precision*/)
{ {
/*std::stringstream sstrm; /*std::stringstream sstrm;
......
...@@ -65,8 +65,6 @@ ...@@ -65,8 +65,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <string> #include <string>
OUString Int16ToOUString(sal_Int16 num);
OUString FloatToOUString(float num, sal_Int32 precision=6); OUString FloatToOUString(float num, sal_Int32 precision=6);
OUString DateTimeToOUString(XFDateTime& dt); OUString DateTimeToOUString(XFDateTime& dt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment