[Libreoffice-commits] .: cppcanvas/source

[Michael Meeks]

 cppcanvas/source/mtfrenderer/emfplus.cxx      |   10 +++++-----
 cppcanvas/source/mtfrenderer/implrenderer.cxx |   18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 3858ba3585ad3fca5d05d21356705b9fce3c538f
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue May 22 18:20:24 2012 +0100

    targetted string re-work
    
    Change-Id: I9ed4df2a25c8a2a868f83de48472715a6cabe2be

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f0c272c..82df051 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1032,7 +1032,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(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
+           aGradientService = "LinearGradient";
            basegfx::tools::createLinearODFGradientInfo( aGradInfo,
                                     aBoundsRectangle,
                                     aStops.getLength(),
@@ -1040,7 +1040,7 @@ namespace cppcanvas
                                     0 );
 
                     } else {
-            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
+            aGradientService = "EllipticalGradient";
             basegfx::tools::createEllipticalODFGradientInfo( aGradInfo,
                                      aBoundsRectangle,
                                      ::basegfx::B2DVector( 0, 0 ),
@@ -1055,13 +1055,13 @@ namespace cppcanvas
             if( xFactory.is() ) {
             uno::Sequence<uno::Any> args( 3 );
             beans::PropertyValue aProp;
-            aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Colors"));
+            aProp.Name = "Colors";
             aProp.Value <<= aColors;
             args[0] <<= aProp;
-            aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Stops"));
+            aProp.Name = "Stops";
             aProp.Value <<= aStops;
             args[1] <<= aProp;
-            aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AspectRatio"));
+            aProp.Name = "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 c23ae85..1b0f8cd 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -680,7 +680,7 @@ namespace cppcanvas
                             // map odf to svg gradient orientation - x
                             // instead of y direction
                             aGradInfo.maTextureTransform = aGradInfo.maTextureTransform * aRot90;
-                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
+                            aGradientService = "LinearGradient";
                             break;
 
                         case GRADIENT_AXIAL:
@@ -713,7 +713,7 @@ namespace cppcanvas
                             aShift.translate(-0.5,0);
                             aGradInfo.maTextureTransform = aGradInfo.maTextureTransform * aShift;
 
-                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
+                            aGradientService = "LinearGradient";
                             break;
                         }
 
@@ -723,7 +723,7 @@ namespace cppcanvas
                                                                         aOffset,
                                                                         nSteps,
                                                                         fBorder);
-                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
+                            aGradientService = "EllipticalGradient";
                             break;
 
                         case GRADIENT_ELLIPTICAL:
@@ -733,7 +733,7 @@ namespace cppcanvas
                                                                             nSteps,
                                                                             fBorder,
                                                                             fRotation);
-                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
+                            aGradientService = "EllipticalGradient";
                             break;
 
                         case GRADIENT_SQUARE:
@@ -743,7 +743,7 @@ namespace cppcanvas
                                                                         nSteps,
                                                                         fBorder,
                                                                         fRotation);
-                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RectangularGradient"));
+                            aGradientService = "RectangularGradient";
                             break;
 
                         case GRADIENT_RECT:
@@ -753,7 +753,7 @@ namespace cppcanvas
                                                                              nSteps,
                                                                              fBorder,
                                                                              fRotation);
-                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RectangularGradient"));
+                            aGradientService = "RectangularGradient";
                             break;
 
                         default:
@@ -776,13 +776,13 @@ namespace cppcanvas
 
                     uno::Sequence<uno::Any> args(3);
                     beans::PropertyValue aProp;
-                    aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Colors"));
+                    aProp.Name = "Colors";
                     aProp.Value <<= aColors;
                     args[0] <<= aProp;
-                    aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Stops"));
+                    aProp.Name = "Stops";
                     aProp.Value <<= aStops;
                     args[1] <<= aProp;
-                    aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AspectRatio"));
+                    aProp.Name = "AspectRatio";
                     aProp.Value <<= aGradInfo.mfAspectRatio;
                     args[2] <<= aProp;