summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-22 16:56:04 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-22 16:56:04 +0100
commit433b107ea2bcc5242ab515cb82a9e6954e0c899b (patch)
treeee29422bfc6e66bc46c27de580c24a2297f1369c
parentcd95a24643055cd6428ef7f3384901bec1fc1a9a (diff)
RTL_CONSTASCII_USTRINGPARAM in libs-gui 01
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx10
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx18
2 files changed, 14 insertions, 14 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index b35a3a723edc..a1f7d985e3ce 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1022,7 +1022,7 @@ namespace cppcanvas
EMFP_DEBUG (printf ("EMF+\t\tset gradient\n"));
basegfx::B2DRange aBoundsRectangle (0, 0, 1, 1);
if (brush->type == 4) {
- aGradientService = rtl::OUString::createFromAscii("LinearGradient");
+ aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
basegfx::tools::createLinearODFGradientInfo( aGradInfo,
aBoundsRectangle,
aStops.getLength(),
@@ -1030,7 +1030,7 @@ namespace cppcanvas
0 );
} else {
- aGradientService = rtl::OUString::createFromAscii("EllipticalGradient");
+ aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
basegfx::tools::createEllipticalODFGradientInfo( aGradInfo,
aBoundsRectangle,
::basegfx::B2DVector( 0, 0 ),
@@ -1045,13 +1045,13 @@ namespace cppcanvas
if( xFactory.is() ) {
uno::Sequence<uno::Any> args( 3 );
beans::PropertyValue aProp;
- aProp.Name = rtl::OUString::createFromAscii( "Colors" );
+ aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Colors"));
aProp.Value <<= aColors;
args[0] <<= aProp;
- aProp.Name = rtl::OUString::createFromAscii( "Stops" );
+ aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Stops"));
aProp.Value <<= aStops;
args[1] <<= aProp;
- aProp.Name = rtl::OUString::createFromAscii( "AspectRatio" );
+ aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AspectRatio"));
aProp.Value <<= static_cast<sal_Int32>(1);
args[2] <<= aProp;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index cef7e1eed16c..faa213845f1c 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -681,7 +681,7 @@ namespace cppcanvas
// map odf to svg gradient orientation - x
// instead of y direction
aGradInfo.maTextureTransform = aGradInfo.maTextureTransform * aRot90;
- aGradientService = rtl::OUString::createFromAscii("LinearGradient");
+ aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
break;
case GRADIENT_AXIAL:
@@ -701,7 +701,7 @@ namespace cppcanvas
aShift.translate(-0.5,0);
aGradInfo.maTextureTransform = aGradInfo.maTextureTransform * aShift;
- aGradientService = rtl::OUString::createFromAscii("LinearGradient");
+ aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
break;
}
@@ -711,7 +711,7 @@ namespace cppcanvas
aOffset,
nSteps,
fBorder);
- aGradientService = rtl::OUString::createFromAscii("EllipticalGradient");
+ aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
break;
case GRADIENT_ELLIPTICAL:
@@ -721,7 +721,7 @@ namespace cppcanvas
nSteps,
fBorder,
fRotation);
- aGradientService = rtl::OUString::createFromAscii("EllipticalGradient");
+ aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
break;
case GRADIENT_SQUARE:
@@ -731,7 +731,7 @@ namespace cppcanvas
nSteps,
fBorder,
fRotation);
- aGradientService = rtl::OUString::createFromAscii("RectangularGradient");
+ aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RectangularGradient"));
break;
case GRADIENT_RECT:
@@ -741,7 +741,7 @@ namespace cppcanvas
nSteps,
fBorder,
fRotation);
- aGradientService = rtl::OUString::createFromAscii("RectangularGradient");
+ aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RectangularGradient"));
break;
default:
@@ -764,13 +764,13 @@ namespace cppcanvas
uno::Sequence<uno::Any> args(3);
beans::PropertyValue aProp;
- aProp.Name = rtl::OUString::createFromAscii("Colors");
+ aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Colors"));
aProp.Value <<= aColors;
args[0] <<= aProp;
- aProp.Name = rtl::OUString::createFromAscii("Stops");
+ aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Stops"));
aProp.Value <<= aStops;
args[1] <<= aProp;
- aProp.Name = rtl::OUString::createFromAscii("AspectRatio");
+ aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AspectRatio"));
aProp.Value <<= aGradInfo.mfAspectRatio;
args[2] <<= aProp;