[Libreoffice-commits] .: basegfx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 30 17:56:12 PDT 2012
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 54 +++++++++++++--------------
basegfx/source/tools/canvastools.cxx | 2 -
basegfx/source/tools/unopolypolygon.cxx | 18 ++++-----
3 files changed, 36 insertions(+), 38 deletions(-)
New commits:
commit 6bc62f4f43c7458399169ddb2cba30ae4188b1bd
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date: Sat Oct 27 15:43:55 2012 -0200
::rtl::OUString -> OUString in basegfx
Change-Id: I2e0189135d5f30b20e625b849cedbef2eb639ed9
Reviewed-on: https://gerrit.libreoffice.org/929
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 0c9e3bf..22bb1d3 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -41,9 +41,9 @@ namespace basegfx
{
namespace
{
- void lcl_skipSpaces(sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 nLen)
+ void lcl_skipSpaces(sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen)
{
while( io_rPos < nLen &&
sal_Unicode(' ') == rStr[io_rPos] )
@@ -52,9 +52,9 @@ namespace basegfx
}
}
- void lcl_skipSpacesAndCommas(sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 nLen)
+ void lcl_skipSpacesAndCommas(sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen)
{
while(io_rPos < nLen
&& (sal_Unicode(' ') == rStr[io_rPos] || sal_Unicode(',') == rStr[io_rPos]))
@@ -73,18 +73,18 @@ namespace basegfx
return bPredicate;
}
- inline bool lcl_isOnNumberChar(const ::rtl::OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true)
+ inline bool lcl_isOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true)
{
return lcl_isOnNumberChar(rStr[nPos],
bSignAllowed);
}
- bool lcl_getDoubleChar(double& o_fRetval,
- sal_Int32& io_rPos,
- const ::rtl::OUString& rStr)
+ bool lcl_getDoubleChar(double& o_fRetval,
+ sal_Int32& io_rPos,
+ const OUString& rStr)
{
sal_Unicode aChar( rStr[io_rPos] );
- ::rtl::OUStringBuffer sNumberString;
+ OUStringBuffer sNumberString;
bool separator_seen=false;
if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
@@ -133,10 +133,10 @@ namespace basegfx
return false;
}
- bool lcl_importDoubleAndSpaces( double& o_fRetval,
- sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 nLen )
+ bool lcl_importDoubleAndSpaces( double& o_fRetval,
+ sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen )
{
if( !lcl_getDoubleChar(o_fRetval, io_rPos, rStr) )
return false;
@@ -146,10 +146,10 @@ namespace basegfx
return true;
}
- bool lcl_importFlagAndSpaces(sal_Int32& o_nRetval,
- sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 nLen)
+ bool lcl_importFlagAndSpaces(sal_Int32& o_nRetval,
+ sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen)
{
sal_Unicode aChar( rStr[io_rPos] );
@@ -171,14 +171,14 @@ namespace basegfx
return true;
}
- void lcl_putNumberChar( ::rtl::OUStringBuffer& rStr,
- double fValue )
+ void lcl_putNumberChar( OUStringBuffer& rStr,
+ double fValue )
{
rStr.append( fValue );
}
- void lcl_putNumberCharWithSpace( ::rtl::OUStringBuffer& rStr,
- double fValue,
+ void lcl_putNumberCharWithSpace( OUStringBuffer& rStr,
+ double fValue,
double fOldValue,
bool bUseRelativeCoordinates )
{
@@ -206,7 +206,7 @@ namespace basegfx
}
}
- bool importFromSvgD(B2DPolyPolygon& o_rPolyPolygon, const ::rtl::OUString& rSvgDStatement, bool bWrongPositionAfterZ)
+ bool importFromSvgD(B2DPolyPolygon& o_rPolyPolygon, const OUString& rSvgDStatement, bool bWrongPositionAfterZ)
{
o_rPolyPolygon.clear();
const sal_Int32 nLen(rSvgDStatement.getLength());
@@ -789,7 +789,7 @@ namespace basegfx
}
bool importFromSvgPoints( B2DPolygon& o_rPoly,
- const ::rtl::OUString& rSvgPointsAttribute )
+ const OUString& rSvgPointsAttribute )
{
o_rPoly.clear();
const sal_Int32 nLen(rSvgPointsAttribute.getLength());
@@ -814,13 +814,13 @@ namespace basegfx
return true;
}
- ::rtl::OUString exportToSvgD(
+ OUString exportToSvgD(
const B2DPolyPolygon& rPolyPolygon,
bool bUseRelativeCoordinates,
bool bDetectQuadraticBeziers)
{
const sal_uInt32 nCount(rPolyPolygon.count());
- ::rtl::OUStringBuffer aResult;
+ OUStringBuffer aResult;
B2DPoint aCurrentSVGPosition(0.0, 0.0); // SVG assumes (0,0) as the initial current point
for(sal_uInt32 i(0); i < nCount; i++)
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index d5fed18..101d6a0 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -329,7 +329,7 @@ namespace basegfx
if( !xLinePoly.is() )
{
throw lang::IllegalArgumentException(
- ::rtl::OUString(
+ OUString(
"basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(): Invalid input"
"poly-polygon, cannot retrieve vertex data"),
uno::Reference< uno::XInterface >(),
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index d209be7..9682377 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -113,10 +113,8 @@ namespace unotools
// found - contract violation.
if( !xLinePoly.is() )
throw lang::IllegalArgumentException(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "UnoPolyPolygon::addPolyPolygon(): Invalid input "
- "poly-polygon, cannot retrieve vertex data")),
+ "UnoPolyPolygon::addPolyPolygon(): Invalid input "
+ "poly-polygon, cannot retrieve vertex data",
static_cast<cppu::OWeakObject*>(this), 1);
aSrcPoly = unotools::polyPolygonFromPoint2DSequenceSequence(
@@ -447,20 +445,20 @@ namespace unotools
#define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon"
#define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D"
- ::rtl::OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException )
+ OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException )
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+ sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
- uno::Sequence< ::rtl::OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames() throw( uno::RuntimeException )
+ uno::Sequence< OUString > SAL_CALL UnoPolyPolygon::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;
}
More information about the Libreoffice-commits
mailing list