mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XubString->OUString

Browse Source 
Change-Id: I9a542f58522bfb3db9cb990098e1bda004d25223
This commit is contained in:
Caolán McNamara
2013-08-21 08:38:28 +01:00
parent 30a96caa93
commit 03a2bb6cd8
3 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
svx/source/xoutdev/xpool.cxx
View File

@@ -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

30
svx/source/xoutdev/xtabgrdt.cxx
View File

@@ -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;
}

17
svx/source/xoutdev/xtabhtch.cxx
View File

@@ -66,16 +66,15 @@ uno::Reference< container::XNameContainer > XHatchList::createInstance()
bool XHatchList::Create()
{
XubString aStr( SVX_RESSTR( RID_SVXSTR_HATCH ) );
xub_StrLen nLen;
OUStringBuffer aStr(SVX_RESSTR(RID_SVXSTR_HATCH));
aStr.append(" 1");
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));
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;
}