Kaydet (Commit) 2f6cbe13 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara

Small String -> OUString cleanup

Change-Id: I0804068b408d35ae5174d2a6855ec01bc4f616f0
Reviewed-on: https://gerrit.libreoffice.org/5085Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst a614a119
...@@ -790,8 +790,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) ...@@ -790,8 +790,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
if( *pnBitmapListState ) if( *pnBitmapListState )
{ {
if( *pnBitmapListState & CT_CHANGED ) if( *pnBitmapListState & CT_CHANGED )
pBitmapList = ( (SvxAreaTabDialog*) GetParentDialog() )-> pBitmapList = ( (SvxAreaTabDialog*) GetParentDialog() )->GetNewBitmapList();
GetNewBitmapList();
_nPos = m_pLbBitmap->GetSelectEntryPos(); _nPos = m_pLbBitmap->GetSelectEntryPos();
...@@ -810,8 +809,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) ...@@ -810,8 +809,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
if( *pnHatchingListState ) if( *pnHatchingListState )
{ {
if( *pnHatchingListState & CT_CHANGED ) if( *pnHatchingListState & CT_CHANGED )
pHatchingList = ( (SvxAreaTabDialog*) GetParentDialog() )-> pHatchingList = ( (SvxAreaTabDialog*) GetParentDialog() )->GetNewHatchingList();
GetNewHatchingList();
_nPos = m_pLbHatching->GetSelectEntryPos(); _nPos = m_pLbHatching->GetSelectEntryPos();
...@@ -832,8 +830,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) ...@@ -832,8 +830,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
if( *pnGradientListState ) if( *pnGradientListState )
{ {
if( *pnGradientListState & CT_CHANGED ) if( *pnGradientListState & CT_CHANGED )
pGradientList = ( (SvxAreaTabDialog*) GetParentDialog() )-> pGradientList = ( (SvxAreaTabDialog*) GetParentDialog() )->GetNewGradientList();
GetNewGradientList();
_nPos = m_pLbGradient->GetSelectEntryPos(); _nPos = m_pLbGradient->GetSelectEntryPos();
...@@ -852,8 +849,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) ...@@ -852,8 +849,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
if( *pnColorListState ) if( *pnColorListState )
{ {
if( *pnColorListState & CT_CHANGED ) if( *pnColorListState & CT_CHANGED )
pColorList = ( (SvxAreaTabDialog*) GetParentDialog() )-> pColorList = ( (SvxAreaTabDialog*) GetParentDialog() )->GetNewColorList();
GetNewColorList();
// aLbColor // aLbColor
_nPos = m_pLbColor->GetSelectEntryPos(); _nPos = m_pLbColor->GetSelectEntryPos();
m_pLbColor->Clear(); m_pLbColor->Clear();
...@@ -1513,7 +1509,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1513,7 +1509,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
if( nValue == 0 ) if( nValue == 0 )
{ {
m_pTsbStepCount->SetState( STATE_CHECK ); m_pTsbStepCount->SetState( STATE_CHECK );
m_pNumFldStepCount->SetText( String() ); m_pNumFldStepCount->SetText( "" );
} }
else else
{ {
...@@ -1525,7 +1521,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1525,7 +1521,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
else else
{ {
m_pTsbStepCount->SetState( STATE_DONTKNOW ); m_pTsbStepCount->SetState( STATE_DONTKNOW );
m_pNumFldStepCount->SetText( String() ); m_pNumFldStepCount->SetText( "" );
} }
// attributes for the bitmap filling // attributes for the bitmap filling
...@@ -1598,7 +1594,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1598,7 +1594,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
} }
else else
{ {
m_pMtrFldXSize->SetText( String() ); m_pMtrFldXSize->SetText( "" );
m_pMtrFldXSize->SaveValue(); m_pMtrFldXSize->SaveValue();
} }
...@@ -1623,7 +1619,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1623,7 +1619,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
} }
else else
{ {
m_pMtrFldYSize->SetText( String() ); m_pMtrFldYSize->SetText( "" );
m_pMtrFldYSize->SaveValue(); m_pMtrFldYSize->SaveValue();
eOriginal = STATE_NOCHECK; eOriginal = STATE_NOCHECK;
} }
...@@ -1658,7 +1654,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1658,7 +1654,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
m_pMtrFldOffset->SetValue( 0 ); m_pMtrFldOffset->SetValue( 0 );
} }
else else
m_pMtrFldOffset->SetText( String() ); m_pMtrFldOffset->SetText( "" );
//aCtlPosition //aCtlPosition
...@@ -1677,7 +1673,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1677,7 +1673,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
m_pMtrFldXOffset->SetValue( nValue ); m_pMtrFldXOffset->SetValue( nValue );
} }
else else
m_pMtrFldXOffset->SetText( String() ); m_pMtrFldXOffset->SetText( "" );
//aMtrFldYOffset //aMtrFldYOffset
if( rAttrs.GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SFX_ITEM_DONTCARE ) if( rAttrs.GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SFX_ITEM_DONTCARE )
...@@ -1686,7 +1682,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) ...@@ -1686,7 +1682,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
m_pMtrFldYOffset->SetValue( nValue ); m_pMtrFldYOffset->SetValue( nValue );
} }
else else
m_pMtrFldYOffset->SetText( String() ); m_pMtrFldYOffset->SetText( "" );
// not earlier so that tile and stretch are considered // not earlier so that tile and stretch are considered
if( m_pTypeLB->GetSelectEntryPos() == XFILL_BITMAP ) if( m_pTypeLB->GetSelectEntryPos() == XFILL_BITMAP )
...@@ -1811,8 +1807,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl) ...@@ -1811,8 +1807,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl)
if( _nPos != LISTBOX_ENTRY_NOTFOUND ) if( _nPos != LISTBOX_ENTRY_NOTFOUND )
{ {
rXFSet.Put( XFillStyleItem( XFILL_SOLID ) ); rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
rXFSet.Put( XFillColorItem( String(), rXFSet.Put( XFillColorItem( String(), m_pLbColor->GetSelectEntryColor() ) );
m_pLbColor->GetSelectEntryColor() ) );
} }
// NEW // NEW
else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) ) else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) )
...@@ -1885,8 +1880,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl) ...@@ -1885,8 +1880,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl)
XGradientEntry* pEntry = pGradientList->GetGradient( _nPos ); XGradientEntry* pEntry = pGradientList->GetGradient( _nPos );
rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) ); rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
rXFSet.Put( XFillGradientItem( String(), rXFSet.Put( XFillGradientItem( String(), pEntry->GetGradient() ) );
pEntry->GetGradient() ) );
} }
else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True, &pPoolItem ) ) else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True, &pPoolItem ) )
{ {
...@@ -2106,7 +2100,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) ...@@ -2106,7 +2100,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
if( m_pTsbStepCount->GetState() == STATE_NOCHECK ) if( m_pTsbStepCount->GetState() == STATE_NOCHECK )
{ {
if( m_pNumFldStepCount->GetText().isEmpty() ) if( m_pNumFldStepCount->GetText().isEmpty() )
m_pNumFldStepCount->SetText(OUString("64")); m_pNumFldStepCount->SetText("64");
m_pNumFldStepCount->Enable(); m_pNumFldStepCount->Enable();
} }
...@@ -2174,8 +2168,8 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) ...@@ -2174,8 +2168,8 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
if( m_pTsbOriginal->GetState() == STATE_CHECK ) if( m_pTsbOriginal->GetState() == STATE_CHECK )
{ {
m_pMtrFldXSize->SetText( String() ); m_pMtrFldXSize->SetText( "" );
m_pMtrFldYSize->SetText( String() ); m_pMtrFldYSize->SetText( "" );
m_pGridX_Y->Disable(); m_pGridX_Y->Disable();
m_pTsbScale->Disable(); m_pTsbScale->Disable();
} }
......
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