diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-20 09:49:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:36 +0200 |
commit | 9dc41e228dd60c60a4364d26270c9769d2939ded (patch) | |
tree | 960bad38180b7cc8d185e392fc67df8975eecf00 /svx/source/sidebar | |
parent | fd8f8bdaadc6bac6cf57c335422482a6793211a2 (diff) |
convert remnants of String in SVX to String
Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767
Diffstat (limited to 'svx/source/sidebar')
-rw-r--r-- | svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 14 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 14 | ||||
-rw-r--r-- | svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 8 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index b3b725dcbc4f..e56ae685ea3a 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -283,7 +283,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( else { mpMtrBrightness->Enable(); - mpMtrBrightness->SetText(String()); + mpMtrBrightness->SetText(OUString()); } break; } @@ -307,7 +307,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( else { mpMtrContrast->Enable(); - mpMtrContrast->SetText(String()); + mpMtrContrast->SetText(OUString()); } break; } @@ -331,7 +331,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( else { mpMtrTrans->Enable(); - mpMtrTrans->SetText(String()); + mpMtrTrans->SetText(OUString()); } break; } @@ -379,7 +379,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( else { mpMtrRed->Enable(); - mpMtrRed->SetText(String()); + mpMtrRed->SetText(OUString()); } break; } @@ -403,7 +403,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( else { mpMtrGreen->Enable(); - mpMtrGreen->SetText(String()); + mpMtrGreen->SetText(OUString()); } break; } @@ -427,7 +427,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( else { mpMtrBlue->Enable(); - mpMtrBlue->SetText(String()); + mpMtrBlue->SetText(OUString()); } break; } @@ -451,7 +451,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( else { mpMtrGamma->Enable(); - mpMtrGamma->SetText(String()); + mpMtrGamma->SetText(OUString()); } break; } diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index d4e632e213c2..e89fab88c349 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -447,7 +447,7 @@ void LinePropertyPanel::NotifyItemUpdate( } mpMFTransparent->SetValue(0);//add - mpMFTransparent->SetText(String()); + mpMFTransparent->SetText(OUString()); break; } case SID_ATTR_LINE_WIDTH: diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 055edd3ead5e..e49c76dcc8b1 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -174,7 +174,7 @@ OUString NBOTypeMgrBase::GetBulCharFmtName() { return aNumCharFmtName; } -void NBOTypeMgrBase::ImplLoad(String filename) +void NBOTypeMgrBase::ImplLoad(OUString filename) { bIsLoading = true; SfxMapUnit eOldCoreUnit=eCoreUnit; @@ -214,7 +214,7 @@ void NBOTypeMgrBase::ImplLoad(String filename) eCoreUnit = eOldCoreUnit; bIsLoading = false; } -void NBOTypeMgrBase::ImplStore(String filename) +void NBOTypeMgrBase::ImplStore(OUString filename) { if (bIsLoading) return; SfxMapUnit eOldCoreUnit=eCoreUnit; @@ -594,7 +594,7 @@ GraphyicBulletsTypeMgr& GraphyicBulletsTypeMgr::GetInstance() void GraphyicBulletsTypeMgr::Init() { - std::vector<String> aGrfNames; + std::vector<OUString> aGrfNames; GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); for(sal_uInt16 i = 0; i < aGrfNames.size(); i++) { @@ -1370,13 +1370,13 @@ void NumberingTypeMgr::Init() { aLevel.realloc(aLevel.getLength() + 1); PropertyValue& rValue = aLevel.getArray()[aLevel.getLength() - 1]; - rValue.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); + rValue.Name = OUString("Value"); rValue.Value <<= (sal_Int32)(j + 1); if (j!=0) - sText += OUString(" "); + sText += " "; - sText+=String(xFormatter->makeNumberingString( aLevel, aLocale )); + sText += xFormatter->makeNumberingString( aLevel, aLocale ); } catch (const Exception&) { @@ -1824,7 +1824,7 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn else { //if it cannot be found then create a new one - Font aCreateFont( pLevelSettings->sBulletFont,String(), Size( 0, 14 ) ); + Font aCreateFont( pLevelSettings->sBulletFont, OUString(), Size( 0, 14 ) ); aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW ); aCreateFont.SetFamily( FAMILY_DONTKNOW ); aCreateFont.SetPitch( PITCH_DONTKNOW ); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 83736ada9436..9b1aa3cbe7c2 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -1015,25 +1015,25 @@ void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* bPosXBlank = true; SetFieldUnit( *mpMtrPosX, meDlgUnit, true ); if(bPosXBlank) - mpMtrPosX->SetText(String()); + mpMtrPosX->SetText(OUString()); if (mpMtrPosY->GetText().isEmpty()) bPosYBlank = true; SetFieldUnit( *mpMtrPosY, meDlgUnit, true ); if(bPosYBlank) - mpMtrPosY->SetText(String()); + mpMtrPosY->SetText(OUString()); if (mpMtrWidth->GetText().isEmpty()) bWidthBlank = true; SetFieldUnit( *mpMtrWidth, meDlgUnit, true ); if(bWidthBlank) - mpMtrWidth->SetText(String()); + mpMtrWidth->SetText(OUString()); if (mpMtrHeight->GetText().isEmpty()) bHeightBlank = true; SetFieldUnit( *mpMtrHeight, meDlgUnit, true ); if(bHeightBlank) - mpMtrHeight->SetText(String()); + mpMtrHeight->SetText(OUString()); } diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index fa1307b4e55d..33733fe22085 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -269,7 +269,7 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l maLBKerning.Enable(); maFTSpacing.Enable(); maLBKerning.SetNoSelection(); - maEditKerning.SetText(String()); + maEditKerning.SetText(OUString()); maEditKerning.Disable(); maFTBy.Disable(); } @@ -278,7 +278,7 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l maVSSpacing.SetNoSelection(); maVSSpacing.SelectItem(0); mbVS = false; - maEditKerning.SetText(String()); + maEditKerning.SetText(OUString()); maLBKerning.SetNoSelection(); maLBKerning.Disable(); maFTSpacing.Disable(); |