[Libreoffice-commits] .: canvas/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 9 12:19:02 PST 2013
canvas/source/factory/cf_service.cxx | 39 +-
canvas/source/null/null_canvasbitmap.cxx | 12
canvas/source/null/null_canvascustomsprite.cxx | 12
canvas/source/null/null_canvasfont.cxx | 12
canvas/source/null/null_spritecanvas.cxx | 4
canvas/source/null/null_textlayout.cxx | 12
canvas/source/simplecanvas/simplecanvasimpl.cxx | 2
canvas/source/tools/cachedprimitivebase.cxx | 10
canvas/source/tools/canvastools.cxx | 3
canvas/source/tools/parametricpolypolygon.cxx | 20 -
canvas/source/tools/propertysethelper.cxx | 14 -
canvas/source/tools/verifyinput.cxx | 330 ++++++++++--------------
12 files changed, 210 insertions(+), 260 deletions(-)
New commits:
commit 0968c304371a9e49d79f89e99c4ca4bf66f7b649
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Tue Jan 8 22:21:18 2013 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in canvas
::rtl:: prefix removed from OUString as well
Change-Id: I4de29a9c487ff2b87fdb5efa8e75aaf5b88402b0
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index b725c95..54459ec 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -39,23 +39,22 @@
#include <o3tl/compat_functional.hxx>
#include <algorithm>
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
+
namespace
{
OUString SAL_CALL getImplName()
{
- return OUSTR("com.sun.star.comp.rendering.CanvasFactory");
+ return OUString("com.sun.star.comp.rendering.CanvasFactory");
}
Sequence<OUString> SAL_CALL getSuppServices()
{
- OUString name = OUSTR("com.sun.star.rendering.CanvasFactory");
+ OUString name("com.sun.star.rendering.CanvasFactory");
return Sequence<OUString>(&name, 1);
}
@@ -145,25 +144,25 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
Any propValue(
makeAny( beans::PropertyValue(
- OUSTR("nodepath"), -1,
- makeAny( OUSTR("/org.openoffice.Office.Canvas") ),
+ OUString("nodepath"), -1,
+ makeAny( OUString("/org.openoffice.Office.Canvas") ),
beans::PropertyState_DIRECT_VALUE ) ) );
m_xCanvasConfigNameAccess.set(
xConfigProvider->createInstanceWithArguments(
- OUSTR("com.sun.star.configuration.ConfigurationAccess"),
+ OUString("com.sun.star.configuration.ConfigurationAccess"),
Sequence<Any>( &propValue, 1 ) ),
UNO_QUERY_THROW );
propValue = makeAny(
beans::PropertyValue(
- OUSTR("nodepath"), -1,
- makeAny( OUSTR("/org.openoffice.Office.Canvas/CanvasServiceList") ),
+ OUString("nodepath"), -1,
+ makeAny( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ),
beans::PropertyState_DIRECT_VALUE ) );
Reference<container::XNameAccess> xNameAccess(
xConfigProvider->createInstanceWithArguments(
- OUSTR("com.sun.star.configuration.ConfigurationAccess"),
+ OUString("com.sun.star.configuration.ConfigurationAccess"),
Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW );
Reference<container::XHierarchicalNameAccess> xHierarchicalNameAccess(
xNameAccess, UNO_QUERY_THROW);
@@ -180,11 +179,11 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
if( xEntryNameAccess.is() )
{
Sequence<OUString> implementationList;
- if( (xEntryNameAccess->getByName( OUSTR("PreferredImplementations") ) >>= implementationList) )
+ if( (xEntryNameAccess->getByName( OUString("PreferredImplementations") ) >>= implementationList) )
m_aAvailableImplementations.push_back( std::make_pair(*pCurr,implementationList) );
- if( (xEntryNameAccess->getByName( OUSTR("AcceleratedImplementations") ) >>= implementationList) )
+ if( (xEntryNameAccess->getByName( OUString("AcceleratedImplementations") ) >>= implementationList) )
m_aAcceleratedImplementations.push_back( std::make_pair(*pCurr,implementationList) );
- if( (xEntryNameAccess->getByName( OUSTR("AntialiasingImplementations") ) >>= implementationList) )
+ if( (xEntryNameAccess->getByName( OUString("AntialiasingImplementations") ) >>= implementationList) )
m_aAAImplementations.push_back( std::make_pair(*pCurr,implementationList) );
}
@@ -204,12 +203,12 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
// Ugh. Looks like configuration is borked. Fake minimal
// setup.
Sequence<OUString> aServices(1);
- aServices[0] = OUSTR("com.sun.star.comp.rendering.Canvas.VCL");
- m_aAvailableImplementations.push_back( std::make_pair(OUSTR("com.sun.star.rendering.Canvas"),
+ aServices[0] = OUString("com.sun.star.comp.rendering.Canvas.VCL");
+ m_aAvailableImplementations.push_back( std::make_pair(OUString("com.sun.star.rendering.Canvas"),
aServices) );
- aServices[0] = OUSTR("com.sun.star.comp.rendering.SpriteCanvas.VCL");
- m_aAvailableImplementations.push_back( std::make_pair(OUSTR("com.sun.star.rendering.SpriteCanvas"),
+ aServices[0] = OUString("com.sun.star.comp.rendering.SpriteCanvas.VCL");
+ m_aAvailableImplementations.push_back( std::make_pair(OUString("com.sun.star.rendering.SpriteCanvas"),
aServices) );
}
}
@@ -318,19 +317,19 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
bool bForceLastEntry(false);
checkConfigFlag( bForceLastEntry,
m_bCacheHasForcedLastImpl,
- OUSTR("ForceSafeServiceImpl") );
+ OUString("ForceSafeServiceImpl") );
// use anti-aliasing canvas, if config flag set (or not existing)
bool bUseAAEntry(true);
checkConfigFlag( bUseAAEntry,
m_bCacheHasUseAAEntry,
- OUSTR("UseAntialiasingCanvas") );
+ OUString("UseAntialiasingCanvas") );
// use accelerated canvas, if config flag set (or not existing)
bool bUseAcceleratedEntry(true);
checkConfigFlag( bUseAcceleratedEntry,
m_bCacheHasUseAcceleratedEntry,
- OUSTR("UseAcceleratedCanvas") );
+ OUString("UseAcceleratedCanvas") );
// try to reuse last working implementation for given service name
const CacheVector::iterator aEnd(m_aCachedImplementations.end());
diff --git a/canvas/source/null/null_canvasbitmap.cxx b/canvas/source/null/null_canvasbitmap.cxx
index 5574110..296a637 100644
--- a/canvas/source/null/null_canvasbitmap.cxx
+++ b/canvas/source/null/null_canvasbitmap.cxx
@@ -53,20 +53,20 @@ namespace nullcanvas
#define IMPLEMENTATION_NAME "NullCanvas.CanvasBitmap"
#define SERVICE_NAME "com.sun.star.rendering.CanvasBitmap"
- ::rtl::OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException)
+ OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasBitmap::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
+ sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
- uno::Sequence< ::rtl::OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException)
+ uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = SERVICE_NAME;
return aRet;
}
diff --git a/canvas/source/null/null_canvascustomsprite.cxx b/canvas/source/null/null_canvascustomsprite.cxx
index fa8caeb..ae30548 100644
--- a/canvas/source/null/null_canvascustomsprite.cxx
+++ b/canvas/source/null/null_canvascustomsprite.cxx
@@ -75,20 +75,20 @@ namespace nullcanvas
#define IMPLEMENTATION_NAME "NullCanvas.CanvasCustomSprite"
#define SERVICE_NAME "com.sun.star.rendering.CanvasCustomSprite"
- ::rtl::OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException )
+ OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException )
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+ sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
- uno::Sequence< ::rtl::OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException )
+ uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = SERVICE_NAME;
return aRet;
}
diff --git a/canvas/source/null/null_canvasfont.cxx b/canvas/source/null/null_canvasfont.cxx
index 3db3dfe..985d4b9 100644
--- a/canvas/source/null/null_canvasfont.cxx
+++ b/canvas/source/null/null_canvasfont.cxx
@@ -85,20 +85,20 @@ namespace nullcanvas
#define SERVICE_NAME "com.sun.star.rendering.CanvasFont"
#define IMPLEMENTATION_NAME "NullCanvas::CanvasFont"
- ::rtl::OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException )
+ OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException )
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasFont::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+ sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
- uno::Sequence< ::rtl::OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException )
+ uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = SERVICE_NAME;
return aRet;
}
diff --git a/canvas/source/null/null_spritecanvas.cxx b/canvas/source/null/null_spritecanvas.cxx
index 28f92e4..d545d76 100644
--- a/canvas/source/null/null_spritecanvas.cxx
+++ b/canvas/source/null/null_spritecanvas.cxx
@@ -132,9 +132,9 @@ namespace nullcanvas
mbSurfaceDirty );
}
- ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException)
+ OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+ return OUString( SERVICE_NAME );
}
static uno::Reference<uno::XInterface> initCanvas( SpriteCanvas* pCanvas )
diff --git a/canvas/source/null/null_textlayout.cxx b/canvas/source/null/null_textlayout.cxx
index f594c66..f0c789b 100644
--- a/canvas/source/null/null_textlayout.cxx
+++ b/canvas/source/null/null_textlayout.cxx
@@ -231,20 +231,20 @@ namespace nullcanvas
#define SERVICE_NAME "com.sun.star.rendering.TextLayout"
#define IMPLEMENTATION_NAME "NullCanvas::TextLayout"
- ::rtl::OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException )
+ OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException )
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL TextLayout::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+ sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
- uno::Sequence< ::rtl::OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException )
+ uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = SERVICE_NAME;
return aRet;
}
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index 1a18d87..eaadad5 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -178,7 +178,7 @@ namespace
// Ifc XServiceName
virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+ return OUString( SERVICE_NAME );
}
// Ifc XSimpleCanvas
diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx
index 6dc9bda..69e92f1 100644
--- a/canvas/source/tools/cachedprimitivebase.cxx
+++ b/canvas/source/tools/cachedprimitivebase.cxx
@@ -82,9 +82,9 @@ namespace canvas
bSameViewTransforms );
}
- ::rtl::OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) throw (uno::RuntimeException)
+ OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
@@ -92,10 +92,10 @@ namespace canvas
return ServiceName == SERVICE_NAME;
}
- uno::Sequence< ::rtl::OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException)
+ uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = SERVICE_NAME;
return aRet;
}
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 751848c..26775be 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1166,8 +1166,7 @@ namespace canvas
o_rxParams.realloc( 2 );
o_rxParams[ 0 ] = uno::makeAny( xServiceInfo->getImplementationName() );
- o_rxParams[ 1 ] = uno::makeAny( xPropSet->getPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DeviceHandle") ) ) );
+ o_rxParams[ 1 ] = uno::makeAny( xPropSet->getPropertyValue( "DeviceHandle" ) );
}
catch( const uno::Exception& )
{
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index 123ae5f..afce14a 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -40,12 +40,12 @@ using namespace ::com::sun::star;
namespace canvas
{
- uno::Sequence<rtl::OUString> ParametricPolyPolygon::getAvailableServiceNames()
+ uno::Sequence<OUString> ParametricPolyPolygon::getAvailableServiceNames()
{
- uno::Sequence<rtl::OUString> aRet(3);
- aRet[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LinearGradient" ));
- aRet[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EllipticalGradient" ));
- aRet[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RectangularGradient" ));
+ uno::Sequence<OUString> aRet(3);
+ aRet[0] = "LinearGradient";
+ aRet[1] = "EllipticalGradient";
+ aRet[2] = "RectangularGradient";
return aRet;
}
@@ -203,9 +203,9 @@ namespace canvas
#define IMPLEMENTATION_NAME "Canvas::ParametricPolyPolygon"
#define SERVICE_NAME "com.sun.star.rendering.ParametricPolyPolygon"
- ::rtl::OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) throw (uno::RuntimeException)
+ OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
@@ -213,10 +213,10 @@ namespace canvas
return ServiceName == SERVICE_NAME;
}
- uno::Sequence< ::rtl::OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException)
+ uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = SERVICE_NAME;
return aRet;
}
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index 03c8707..eabbe89 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -26,22 +26,20 @@ namespace canvas
{
namespace
{
- void throwUnknown( const ::rtl::OUString& aPropertyName )
+ void throwUnknown( const OUString& aPropertyName )
{
throw beans::UnknownPropertyException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PropertySetHelper: property " )) +
- aPropertyName +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not found." )),
+ "PropertySetHelper: property " +
+ aPropertyName + " not found.",
uno::Reference< uno::XInterface >()
);
}
- void throwVeto( const ::rtl::OUString& aPropertyName )
+ void throwVeto( const OUString& aPropertyName )
{
throw beans::PropertyVetoException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PropertySetHelper: property " )) +
- aPropertyName +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " access was vetoed." )),
+ "PropertySetHelper: property " +
+ aPropertyName + " access was vetoed.",
uno::Reference< uno::XInterface >() );
}
diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index 6bdf578..b682caf 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.cxx
@@ -69,19 +69,15 @@ namespace canvas
if( !::rtl::math::isFinite( rPoint.X ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): point X value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii( pStr ) + ": verifyInput(): point X value contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rPoint.Y ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): point X value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii( pStr ) + ": verifyInput(): point X value contains infinite or NAN",
+ xIf, nArgPos );
}
#else
if( !::rtl::math::isFinite( rPoint.X ) ||
@@ -103,55 +99,49 @@ namespace canvas
if( !::rtl::math::isFinite( rSegment.Px ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's Px value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii( pStr ) +
+ ": verifyInput(): bezier segment's Px value contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rSegment.Py ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's Py value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii( pStr ) +
+ ": verifyInput(): bezier segment's Py value contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rSegment.C1x ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's C1x value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii( pStr ) +
+ ": verifyInput(): bezier segment's C1x value contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rSegment.C1y ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's C1y value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii( pStr ) +
+ ": verifyInput(): bezier segment's C1y value contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rSegment.C2x ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's C2x value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii( pStr ) +
+ ": verifyInput(): bezier segment's C2x value contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rSegment.C2y ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's C2y value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii( pStr ) +
+ ": verifyInput(): bezier segment's C2y value contains infinite or NAN",
+ xIf, nArgPos );
}
#else
if( !::rtl::math::isFinite( rSegment.Px ) ||
@@ -177,37 +167,33 @@ namespace canvas
if( !::rtl::math::isFinite( rRect.X1 ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): rectangle point X1 contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): rectangle point X1 contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rRect.Y1 ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): rectangle point Y1 contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): rectangle point Y1 contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rRect.X2 ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): rectangle point X2 contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): rectangle point X2 contains infinite or NAN",
+ xIf, nArgPos );
}
if( !::rtl::math::isFinite( rRect.Y2 ) )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): rectangle point Y2 contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): rectangle point Y2 contains infinite or NAN",
+ xIf, nArgPos );
}
#else
if( !::rtl::math::isFinite( rRect.X1 ) ||
@@ -239,11 +225,10 @@ namespace canvas
if( nBinaryState )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): AffineMatrix2D contains infinite or NAN value(s) at the following positions (m00-m12): " )) +
- ::rtl::OUString::valueOf(nBinaryState),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): AffineMatrix2D contains infinite or NAN value(s) at the following positions (m00-m12): " +
+ OUString::valueOf(nBinaryState),
+ xIf, nArgPos );
}
#else
if( !::rtl::math::isFinite( matrix.m00 ) ||
@@ -275,11 +260,10 @@ namespace canvas
if( nBinaryState )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): Matrix2D contains infinite or NAN value(s) at the following positions (m00-m11): " )) +
- ::rtl::OUString::valueOf(nBinaryState),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): Matrix2D contains infinite or NAN value(s) at the following positions (m00-m11): " +
+ OUString::valueOf(nBinaryState),
+ xIf, nArgPos );
}
#else
if( !::rtl::math::isFinite( matrix.m00 ) ||
@@ -314,14 +298,13 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): render state's device color has too few components (" )) +
- ::rtl::OUString::valueOf(nMinColorComponents) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " expected, " )) +
- ::rtl::OUString::valueOf(renderState.DeviceColor.getLength()) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " provided)" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): render state's device color has too few components (" +
+ OUString::valueOf(nMinColorComponents) +
+ " expected, " +
+ OUString::valueOf(renderState.DeviceColor.getLength()) +
+ " provided)",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -332,12 +315,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): render state's CompositeOperation value out of range (" )) +
- ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): render state's CompositeOperation value out of range (" +
+ OUString::valueOf(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) +
+ " not known)",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -358,12 +340,10 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): textures' alpha value out of range (is " )) +
- ::rtl::OUString::valueOf(texture.Alpha) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): textures' alpha value out of range (is " +
+ OUString::valueOf(texture.Alpha) + ")",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -373,10 +353,9 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): textures' NumberOfHatchPolygons is negative" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): textures' NumberOfHatchPolygons is negative",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -387,12 +366,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): textures' RepeatModeX value is out of range (" )) +
- ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): textures' RepeatModeX value is out of range (" +
+ OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) +
+ " not known)",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -403,12 +381,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): textures' RepeatModeY value is out of range (" )) +
- ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): textures' RepeatModeY value is out of range (" +
+ OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) +
+ " not known)",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -434,12 +411,10 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(mpStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): one of stroke attributes' DashArray value out of range (is " )) +
- ::rtl::OUString::valueOf(rVal) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
- mrIf,
- mnArgPos );
+ OUString::createFromAscii(mpStr) +
+ ": verifyInput(): one of stroke attributes' DashArray value out of range (is " +
+ OUString::valueOf(rVal) + ")",
+ mrIf, mnArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -462,12 +437,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' StrokeWidth value out of range (is " )) +
- ::rtl::OUString::valueOf(strokeAttributes.StrokeWidth) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): stroke attributes' StrokeWidth value out of range (is " +
+ OUString::valueOf(strokeAttributes.StrokeWidth) +
+ ")",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -478,12 +452,10 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' MiterLimit value out of range (is " )) +
- ::rtl::OUString::valueOf(strokeAttributes.MiterLimit) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): stroke attributes' MiterLimit value out of range (is " +
+ OUString::valueOf(strokeAttributes.MiterLimit) + ")",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -502,12 +474,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' StartCapType value is out of range (" )) +
- ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): stroke attributes' StartCapType value is out of range (" +
+ OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) +
+ " not known)",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -518,12 +489,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' StartCapType value is out of range (" )) +
- ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): stroke attributes' StartCapType value is out of range (" +
+ OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) +
+ " not known)",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -534,12 +504,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' JoinType value is out of range (" )) +
- ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): stroke attributes' JoinType value is out of range (" +
+ OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) +
+ " not known)",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -557,10 +526,9 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ScanLines is negative" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): bitmap layout's ScanLines is negative",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -570,10 +538,9 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ScanLineBytes is negative" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): bitmap layout's ScanLineBytes is negative",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -583,10 +550,9 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ColorSpace is invalid" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): bitmap layout's ColorSpace is invalid",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -597,10 +563,9 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ColorSpace getBitsPerPixel() is negative" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): bitmap layout's ColorSpace getBitsPerPixel() is negative",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -611,12 +576,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ColorSpace getEndianness() value is out of range (" )) +
- ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): bitmap layout's ColorSpace getEndianness() value is out of range (" +
+ OUString::valueOf(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) +
+ " not known)",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -645,10 +609,9 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): font request's CellSize value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): font request's CellSize value contains infinite or NAN",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -658,10 +621,9 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): font request's ReferenceAdvancement value contains infinite or NAN" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): font request's ReferenceAdvancement value contains infinite or NAN",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -672,10 +634,9 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): font request's CellSize and ReferenceAdvancement are mutually exclusive, one of them must be 0.0" )),
- xIf,
- nArgPos );
+ OUString::createFromAscii(pStr) +
+ ": verifyInput(): font request's CellSize and ReferenceAdvancement are mutually exclusive, one of them must be 0.0",
+ xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
#endif
@@ -720,12 +681,10 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyBitmapSize(): size has 0 or negative width (value: " )) +
- ::rtl::OUString::valueOf(size.Width) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
- xIf,
- 0 );
+ OUString::createFromAscii(pStr) +
+ ": verifyBitmapSize(): size has 0 or negative width (value: " +
+ OUString::valueOf(size.Width) + ")",
+ xIf, 0 );
#else
throw lang::IllegalArgumentException();
#endif
@@ -735,12 +694,11 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyBitmapSize(): size has 0 or negative height (value: " )) +
- ::rtl::OUString::valueOf(size.Height) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
- xIf,
- 0 );
+ OUString::createFromAscii(pStr) +
+ ": verifyBitmapSize(): size has 0 or negative height (value: " +
+ OUString::valueOf(size.Height) +
+ ")",
+ xIf, 0 );
#else
throw lang::IllegalArgumentException();
#endif
@@ -757,12 +715,10 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifySpriteSize(): size has 0 or negative width (value: " )) +
- ::rtl::OUString::valueOf(size.Width) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
- xIf,
- 0 );
+ OUString::createFromAscii(pStr) +
+ ": verifySpriteSize(): size has 0 or negative width (value: " +
+ OUString::valueOf(size.Width) + ")",
+ xIf, 0 );
#else
throw lang::IllegalArgumentException();
#endif
@@ -772,12 +728,10 @@ namespace canvas
{
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(pStr) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifySpriteSize(): size has 0 or negative height (value: " )) +
- ::rtl::OUString::valueOf(size.Height) +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
- xIf,
- 0 );
+ OUString::createFromAscii(pStr) +
+ ": verifySpriteSize(): size has 0 or negative height (value: " +
+ OUString::valueOf(size.Height) + ")",
+ xIf, 0 );
#else
throw lang::IllegalArgumentException();
#endif
More information about the Libreoffice-commits
mailing list