mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Hopefully) fix the ambiguity error that the tinderboxes kept complaining.

Browse Source
This commit is contained in:
Kohei Yoshida
2011-06-13 20:38:48 -04:00
parent 5324c50280
commit 38c0147475
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbaccess/source/ui/misc/TokenWriter.cxx
View File

@@ -427,7 +427,7 @@ sal_Bool ORTFImportExport::Write()
for(xub_StrLen j=0;j<nTokenCount;++j)
{
(*m_pStream) << "\\f";
m_pStream->WriteNumber(j);
m_pStream->WriteNumber(static_cast<sal_Int32>(j));
(*m_pStream) << aFormat;
(*m_pStream) << aFonts.GetToken(j).GetBuffer();
(*m_pStream) << ';';
@@ -436,11 +436,11 @@ sal_Bool ORTFImportExport::Write()
(*m_pStream) << ODatabaseImportExport::sNewLine;
// write the rtf color table
(*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL << OOO_STRING_SVTOOLS_RTF_RED;
m_pStream->WriteNumber(aColor.GetRed());
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetRed()));
(*m_pStream) << OOO_STRING_SVTOOLS_RTF_GREEN;
m_pStream->WriteNumber(aColor.GetGreen());
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetGreen()));
(*m_pStream) << OOO_STRING_SVTOOLS_RTF_BLUE;
m_pStream->WriteNumber(aColor.GetBlue());
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetBlue()));
(*m_pStream) << ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}"
<< ODatabaseImportExport::sNewLine;
@@ -450,7 +450,7 @@ sal_Bool ORTFImportExport::Write()
::rtl::OString aCell1("\\clbrdrl\\brdrs\\brdrcf0\\clbrdrt\\brdrs\\brdrcf0\\clbrdrb\\brdrs\\brdrcf0\\clbrdrr\\brdrs\\brdrcf0\\clshdng10000\\clcfpat2\\cellx");
(*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH;
m_pStream->WriteNumber(40);
m_pStream->WriteNumber(static_cast<sal_Int32>(40));
(*m_pStream) << ODatabaseImportExport::sNewLine;
if(m_xObject.is())
@@ -580,7 +580,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
{
++kk;
(*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH;
m_pStream->WriteNumber(40);
m_pStream->WriteNumber(static_cast<sal_Int32>(40));
(*m_pStream) << ODatabaseImportExport::sNewLine;
static const ::rtl::OString aCell2("\\clbrdrl\\brdrs\\brdrcf2\\clbrdrt\\brdrs\\brdrcf2\\clbrdrb\\brdrs\\brdrcf2\\clbrdrr\\brdrs\\brdrcf2\\clshdng10000\\clcfpat1\\cellx");
@@ -774,7 +774,7 @@ void OHTMLImportExport::WriteBody()
(*m_pStream) << OOO_STRING_SVTOOLS_HTML_body << " { " << sFontFamily << '\"' << ::rtl::OString(m_aFont.Name,m_aFont.Name.getLength(), gsl_getSystemTextEncoding()) << '\"';
// TODO : think about the encoding of the font name
(*m_pStream) << "; " << sFontSize;
m_pStream->WriteNumber(m_aFont.Height);
m_pStream->WriteNumber(static_cast<sal_Int32>(m_aFont.Height));
(*m_pStream) << '}';
OUT_LF();