diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-12 20:13:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-13 09:22:29 +0100 |
| commit | 6b2cc1eb6c7404d6934aad2d2c78555a45c9b4a8 (patch) | |
| tree | f27113c8129692c06dc03602411a8f880b94bddb /svx/source/sidebar/text | |
| parent | 89253a0c258c1107f598e5a37470ecb09055a895 (diff) | |
XubString->OUString
Change-Id: I1db6254b23c5203c20c168989656d320f86a3bb9
Diffstat (limited to 'svx/source/sidebar/text')
| -rw-r--r-- | svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 1f8b7222371f..bf5dd418ec67 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -111,7 +111,7 @@ void TextCharacterSpacingControl::initial() mpImgSel[3] = Image(SVX_RES(IMG_LOOSE_S)); mpImgSel[4] = Image(SVX_RES(IMG_VERY_LOOSE_S)); - mpStr = new XubString[5]; + mpStr = new OUString[5]; mpStr[0] = SVX_RESSTR(STR_VERY_TIGHT); mpStr[1] = SVX_RESSTR(STR_TIGHT); mpStr[2] = SVX_RESSTR(STR_NORMAL); @@ -119,7 +119,7 @@ void TextCharacterSpacingControl::initial() mpStr[4] = SVX_RESSTR(STR_VERY_LOOSE); - mpStrTip = new XubString[5]; + mpStrTip = new OUString[5]; mpStrTip[0] = SVX_RESSTR(STR_VERY_TIGHT_TIP); mpStrTip[1] = SVX_RESSTR(STR_TIGHT_TIP); mpStrTip[2] = SVX_RESSTR(STR_NORMAL_TIP); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index f876f794562c..b47af09d9c9f 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -61,7 +61,6 @@ private: ValueSetWithTextControl maVSSpacing; FixedText maLastCus; -// Control maBorder; FixedText maFTSpacing; ListBox maLBKerning; @@ -70,16 +69,16 @@ private: Image* mpImg; Image* mpImgSel; - XubString* mpStr; - XubString* mpStrTip; + OUString* mpStr; + OUString* mpStrTip; Image maImgCus; Image maImgCusGrey; - XubString maStrCus; - XubString maStrCusE; //add - XubString maStrCusC; //add - XubString maStrCusN; //add - XubString maStrUnit; //add + OUString maStrCus; + OUString maStrCusE; + OUString maStrCusC; + OUString maStrCusN; + OUString maStrUnit; long mnCustomKern; short mnLastCus; |