[Libreoffice-commits] .: Branch 'libreoffice-3-6' - unotools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 9 14:19:36 PST 2013
unotools/source/misc/fontcvt.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 35ddd4eecf3db609368428470dff74188e59b037
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Dec 17 20:19:47 2012 +0000
32bit compile fix for OString::valueOf usage.
Conflicts:
unotools/source/misc/fontcvt.cxx
Change-Id: Ie486961f157a419ab41b29acf539f0e0e057380f
Signed-off-by: LuboÅ¡ LuÅák <l.lunak at suse.cz>
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 47ee96e..dde43df 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1445,8 +1445,8 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
{
cRetVal = 0xE12C;
SAL_WARN( "unotools", "Forcing a bullet substition from 0x" <<
- rtl::OUString::valueOf(cChar, 16) << " to 0x" <<
- rtl::OUString::valueOf(cRetVal, 16));
+ rtl::OString::valueOf((sal_Int32)cChar, 16).getStr() << " to 0x" <<
+ rtl::OString::valueOf((sal_Int32)cRetVal, 16).getStr());
}
}
}
More information about the Libreoffice-commits
mailing list