Kaydet (Commit) bbfc9999 authored tarafından Marcos Paulo's avatar Marcos Paulo Kaydeden (comit) Luboš Luňák

fdo#38838 Replacement of the String with OUString

Change-Id: Ib6fda987be15525d939cfe5c3e65f881aff83131
Reviewed-on: https://gerrit.libreoffice.org/3968Reviewed-by: 's avatarRicardo Montania <ricardo@linuxafundo.com.br>
Reviewed-by: 's avatarLuboš Luňák <l.lunak@suse.cz>
Tested-by: 's avatarLuboš Luňák <l.lunak@suse.cz>
üst 7281b2b6
...@@ -127,8 +127,8 @@ SvxLineTabPage::SvxLineTabPage ...@@ -127,8 +127,8 @@ SvxLineTabPage::SvxLineTabPage
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXLStyle ( XLINE_DASH ), aXLStyle ( XLINE_DASH ),
aXWidth ( 1 ), aXWidth ( 1 ),
aXDash ( String(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ), aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
aXColor ( String(), COL_LIGHTRED ), aXColor ( OUString(), COL_LIGHTRED ),
aXLineAttr ( pXPool ), aXLineAttr ( pXPool ),
rXLSet ( aXLineAttr.GetItemSet() ), rXLSet ( aXLineAttr.GetItemSet() ),
pnLineEndListState( 0 ), pnLineEndListState( 0 ),
...@@ -136,17 +136,17 @@ SvxLineTabPage::SvxLineTabPage ...@@ -136,17 +136,17 @@ SvxLineTabPage::SvxLineTabPage
pnColorListState( 0 ), pnColorListState( 0 ),
nPageType ( 0 ) nPageType ( 0 )
{ {
aLbEndStyle.SetAccessibleName(String(CUI_RES(STR_STYLE))); aLbEndStyle.SetAccessibleName(OUString(CUI_RES(STR_STYLE)));
aLbStartStyle.SetAccessibleName(String(CUI_RES( STR_LB_START_STYLE ) ) ); aLbStartStyle.SetAccessibleName(OUString(CUI_RES( STR_LB_START_STYLE ) ) );
aMtrStartWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_START_WIDTH ) ) ); aMtrStartWidth.SetAccessibleName(OUString(CUI_RES( STR_MTR_FLD_START_WIDTH ) ) );
aLbEndStyle.SetAccessibleName(String(CUI_RES( STR_LB_END_STYLE ) ) ); aLbEndStyle.SetAccessibleName(OUString(CUI_RES( STR_LB_END_STYLE ) ) );
aMtrEndWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_END_WIDTH ) ) ); aMtrEndWidth.SetAccessibleName(OUString(CUI_RES( STR_MTR_FLD_END_WIDTH ) ) );
aTsbCenterStart.SetAccessibleName(String(CUI_RES( STR_CENTER_START ) ) ); aTsbCenterStart.SetAccessibleName(OUString(CUI_RES( STR_CENTER_START ) ) );
aTsbCenterEnd.SetAccessibleName(String(CUI_RES( STR_CENTER_END ) ) ); aTsbCenterEnd.SetAccessibleName(OUString(CUI_RES( STR_CENTER_END ) ) );
FreeResource(); FreeResource();
aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE))); aCtlPreview.SetAccessibleName(OUString(CUI_RES(STR_EXAMPLE)));
// This Page requires ExchangeSupport // This Page requires ExchangeSupport
SetExchangeSupport(); SetExchangeSupport();
...@@ -518,7 +518,7 @@ void SvxLineTabPage::FillListboxes() ...@@ -518,7 +518,7 @@ void SvxLineTabPage::FillListboxes()
aLbLineStyle.SelectEntryPos( nOldSelect ); aLbLineStyle.SelectEntryPos( nOldSelect );
// Line end style // Line end style
String sNone( SVX_RES( RID_SVXSTR_NONE ) ); OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
nOldSelect = aLbStartStyle.GetSelectEntryPos(); nOldSelect = aLbStartStyle.GetSelectEntryPos();
aLbStartStyle.Clear(); aLbStartStyle.Clear();
aLbStartStyle.InsertEntry( sNone ); aLbStartStyle.InsertEntry( sNone );
...@@ -586,7 +586,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) ...@@ -586,7 +586,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
*pnLineEndListState = CT_NONE; *pnLineEndListState = CT_NONE;
nPos = aLbLineStyle.GetSelectEntryPos(); nPos = aLbLineStyle.GetSelectEntryPos();
String sNone( SVX_RES( RID_SVXSTR_NONE ) ); OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
aLbStartStyle.Clear(); aLbStartStyle.Clear();
aLbStartStyle.InsertEntry( sNone ); aLbStartStyle.InsertEntry( sNone );
...@@ -1293,7 +1293,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1293,7 +1293,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
Get( XATTR_LINEWIDTH ) ).GetValue(), ePoolUnit ); Get( XATTR_LINEWIDTH ) ).GetValue(), ePoolUnit );
} }
else else
aMtrLineWidth.SetText( String() ); aMtrLineWidth.SetText( OUString() );
// Line color // Line color
aLbColor.SetNoSelection(); aLbColor.SetNoSelection();
...@@ -1304,7 +1304,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1304,7 +1304,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
aLbColor.SelectEntry( aCol ); aLbColor.SelectEntry( aCol );
if( aLbColor.GetSelectEntryCount() == 0 ) if( aLbColor.GetSelectEntryCount() == 0 )
{ {
aLbColor.InsertEntry( aCol, String() ); aLbColor.InsertEntry( aCol, OUString() );
aLbColor.SelectEntry( aCol ); aLbColor.SelectEntry( aCol );
} }
} }
...@@ -1387,7 +1387,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1387,7 +1387,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
Get( XATTR_LINESTARTWIDTH ) ).GetValue(), ePoolUnit ); Get( XATTR_LINESTARTWIDTH ) ).GetValue(), ePoolUnit );
} }
else else
aMtrStartWidth.SetText( String() ); aMtrStartWidth.SetText( OUString() );
// Line end strength // Line end strength
if( bObjSelected && if( bObjSelected &&
...@@ -1401,7 +1401,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1401,7 +1401,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
Get( XATTR_LINEENDWIDTH ) ).GetValue(), ePoolUnit ); Get( XATTR_LINEENDWIDTH ) ).GetValue(), ePoolUnit );
} }
else else
aMtrEndWidth.SetText( String() ); aMtrEndWidth.SetText( OUString() );
// Centered line end (start) // Centered line end (start)
if( bObjSelected && if( bObjSelected &&
...@@ -1452,7 +1452,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1452,7 +1452,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
ChangeTransparentHdl_Impl( NULL ); ChangeTransparentHdl_Impl( NULL );
} }
else else
aMtrTransparent.SetText( String() ); aMtrTransparent.SetText( OUString() );
if( !aLbStartStyle.IsEnabled() && if( !aLbStartStyle.IsEnabled() &&
!aLbEndStyle.IsEnabled() && !aLbEndStyle.IsEnabled() &&
...@@ -1469,8 +1469,8 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1469,8 +1469,8 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
// Synchronize // Synchronize
// We get the value from the INI file now // We get the value from the INI file now
String aStr = GetUserData(); OUString aStr = GetUserData();
aCbxSynchronize.Check( (sal_Bool)aStr.ToInt32() ); aCbxSynchronize.Check( (sal_Bool)aStr.toInt32() );
// #116827# // #116827#
if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINEJOINT)) if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINEJOINT))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment