cppuhelper/source/implbase.cxx | 1 +
svx/source/xoutdev/xpool.cxx | 2 +-
svx/source/xoutdev/xtabgrdt.cxx | 30 ++++++++++++++----------------
svx/source/xoutdev/xtabhtch.cxx | 19 +++++++++----------
4 files changed, 25 insertions(+), 27 deletions(-)
New commits:
commit 03a2bb6cd8ec6b492705cd31e5ee41f683d793c2
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Aug 21 08:38:28 2013 +0100
XubString->OUString
Change-Id: I9a542f58522bfb3db9cb990098e1bda004d25223
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 5f1124e..84a4194 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -38,7 +38,7 @@ XOutdevItemPool::XOutdevItemPool(
: SfxItemPool(String("XOutdevItemPool", osl_getThreadTextEncoding()),
nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
{
// prepare some defaults
- const XubString aNullStr;
+ const OUString aNullStr;
const Graphic aNullGraphic;
const basegfx::B2DPolyPolygon aNullPol;
const Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use
defined default color
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 9853a0e..dd3d1ab 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -67,22 +67,20 @@ uno::Reference< container::XNameContainer >
XGradientList::createInstance()
bool XGradientList::Create()
{
- XubString aStr( SVX_RESSTR( RID_SVXSTR_GRADIENT ) );
- xub_StrLen nLen;
-
- aStr.AppendAscii(" 1");
- nLen = aStr.Len() - 1;
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLACK
),RGB_Color(COL_WHITE ),XGRAD_LINEAR , 0,10,10, 0,100,100),aStr));
- aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLUE
),RGB_Color(COL_RED ),XGRAD_AXIAL , 300,20,20,10,100,100),aStr));
- aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_RED
),RGB_Color(COL_YELLOW ),XGRAD_RADIAL , 600,30,30,20,100,100),aStr));
- aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_YELLOW
),RGB_Color(COL_GREEN ),XGRAD_ELLIPTICAL, 900,40,40,30,100,100),aStr));
- aStr.SetChar(nLen, sal_Unicode('5'));
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_GREEN
),RGB_Color(COL_MAGENTA),XGRAD_SQUARE , 1200,50,50,40,100,100),aStr));
- aStr.SetChar(nLen, sal_Unicode('6'));
- Insert(new
XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW
),XGRAD_RECT , 1900,60,60,50,100,100),aStr));
+ rtl::OUStringBuffer aStr(SVX_RESSTR(RID_SVXSTR_GRADIENT));
+ aStr.append(" 1");
+ sal_Int32 nLen = aStr.getLength() - 1;
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLACK
),RGB_Color(COL_WHITE ),XGRAD_LINEAR , 0,10,10,
0,100,100),aStr.toString()));
+ aStr[nLen] = '2';
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLUE
),RGB_Color(COL_RED ),XGRAD_AXIAL ,
300,20,20,10,100,100),aStr.toString()));
+ aStr[nLen] = '3';
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_RED
),RGB_Color(COL_YELLOW ),XGRAD_RADIAL ,
600,30,30,20,100,100),aStr.toString()));
+ aStr[nLen] = '4';
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_YELLOW
),RGB_Color(COL_GREEN ),XGRAD_ELLIPTICAL,
900,40,40,30,100,100),aStr.toString()));
+ aStr[nLen] = '5';
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_GREEN
),RGB_Color(COL_MAGENTA),XGRAD_SQUARE ,
1200,50,50,40,100,100),aStr.toString()));
+ aStr[nLen] = '6';
+ Insert(new
XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW
),XGRAD_RECT , 1900,60,60,50,100,100),aStr.toString()));
return true;
}
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 1119072..c58901b 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -66,16 +66,15 @@ uno::Reference< container::XNameContainer >
XHatchList::createInstance()
bool XHatchList::Create()
{
- XubString aStr( SVX_RESSTR( RID_SVXSTR_HATCH ) );
- xub_StrLen nLen;
-
- aStr.AppendAscii(" 1");
- nLen = aStr.Len() - 1;
- Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLACK),XHATCH_SINGLE,100,
0),aStr));
- aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(new XHatchEntry(XHatch(RGB_Color(COL_RED ),XHATCH_DOUBLE,
80,450),aStr));
- aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120,
0),aStr));
+ OUStringBuffer aStr(SVX_RESSTR(RID_SVXSTR_HATCH));
+ aStr.append(" 1");
+
+ sal_Int32 nLen = aStr.getLength() - 1;
+ Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLACK),XHATCH_SINGLE,100,
0),aStr.toString()));
+ aStr[nLen] = '2';
+ Insert(new XHatchEntry(XHatch(RGB_Color(COL_RED ),XHATCH_DOUBLE,
80,450),aStr.toString()));
+ aStr[nLen] = '3';
+ Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120,
0),aStr.toString()));
return true;
}
commit 30a96caa935904d685388a1c44851ef82d041953
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Aug 21 08:30:04 2013 +0100
OStringâ was not declared in this scope
Change-Id: I753d725963c6f617e4c2d2bd775152a7369fd977
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 24a3b27..0d49d5f 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -21,6 +21,7 @@
#include <cppuhelper/compbase.hxx>
#include <osl/diagnose.h>
#include <rtl/instance.hxx>
+#include <rtl/string.hxx>
#include <rtl/uuid.h>
#include <com/sun/star/lang/XComponent.hpp>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
