reportdesign/source/core/api/FixedLine.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit dabd8121433bf7c363ba9cb99357e5b84e69db91 Author: Lionel Elie Mamane <[email protected]> Date: Fri Nov 30 05:28:06 2012 +0100 clang still thinks this is ambiguous Change-Id: I112d26a55e956a24991ed43621a034f5bc4aa246 diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 12c29f8..3979112 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -517,9 +517,9 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper const char hundredthmmC[] = "0\xe2\x80\x89\xC2\xB5""m"; // in UTF-8: 0, thin space, µ (micro), m (meter) const rtl::OUString hundredthmm(hundredthmmC, sizeof(hundredthmmC)-1, RTL_TEXTENCODING_UTF8); if ( aSize.Width < MIN_WIDTH && m_nOrientation == 1 ) - throw beans::PropertyVetoException("Too small width for FixedLine; minimum is " + rtl::OUString::valueOf(MIN_WIDTH, 10) + hundredthmm, *this); + throw beans::PropertyVetoException("Too small width for FixedLine; minimum is " + rtl::OUString::valueOf(static_cast<sal_Int32>(MIN_WIDTH)) + hundredthmm, *this); else if ( aSize.Height < MIN_HEIGHT && m_nOrientation == 0 ) - throw beans::PropertyVetoException("Too small height for FixedLine; minimum is " + rtl::OUString::valueOf(MIN_HEIGHT, 10) + hundredthmm, *this); + throw beans::PropertyVetoException("Too small height for FixedLine; minimum is " + rtl::OUString::valueOf(static_cast<sal_Int32>(MIN_HEIGHT)) + hundredthmm, *this); OShapeHelper::setSize(aSize,this); } // -----------------------------------------------------------------------------
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
