Skip to content

C
core
Kaydet (Commit) 7471f789 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert svx/source/tbxctrls/*.cxx from String to OUString 

Change-Id: I2f59ac54fda1e11353d81e8d5bd9fe5993c9ffdb
üst 2f2518e6
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 90 deletions
svx/source/tbxctrls/fillctrl.cxx
Dosyayı görüntüle @ 7471f789
...@@ -250,7 +250,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -250,7 +250,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{ {
if ( pColorItem ) if ( pColorItem )
{ {
String aString( pColorItem->GetName() ); OUString aString( pColorItem->GetName() );
::Color aColor = pColorItem->GetColorValue(); ::Color aColor = pColorItem->GetColorValue();
pFillAttrLB->SelectEntry( aString ); pFillAttrLB->SelectEntry( aString );
...@@ -265,20 +265,18 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -265,20 +265,18 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
pFillAttrLB->GetSelectEntryColor() != aColor ) pFillAttrLB->GetSelectEntryColor() != aColor )
{ {
sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
String aTmpStr; OUString aTmpStr;
if( nCount > 0 ) if( nCount > 0 )
{ {
// Last entry gets tested against temporary color // Last entry gets tested against temporary color
aTmpStr = pFillAttrLB->GetEntry( nCount - 1 ); aTmpStr = pFillAttrLB->GetEntry( nCount - 1 );
if( aTmpStr.GetChar(0) == TMP_STR_BEGIN && if( aTmpStr[0] == TMP_STR_BEGIN &&
aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END ) aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
{ {
pFillAttrLB->RemoveEntry( nCount - 1 ); pFillAttrLB->RemoveEntry( nCount - 1 );
} }
} }
aTmpStr = TMP_STR_BEGIN; aTmpStr = OUString(TMP_STR_BEGIN) + aString + OUString(TMP_STR_END);
aTmpStr += aString;
aTmpStr += TMP_STR_END;
//pFillAttrLB->SetUpdateMode( sal_False ); //pFillAttrLB->SetUpdateMode( sal_False );
sal_uInt16 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr ); sal_uInt16 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr );
...@@ -295,30 +293,27 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -295,30 +293,27 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{ {
if ( pGradientItem ) if ( pGradientItem )
{ {
String aString( pGradientItem->GetName() ); OUString aString( pGradientItem->GetName() );
pFillAttrLB->SelectEntry( aString ); pFillAttrLB->SelectEntry( aString );
// Check if the entry is not in the list // Check if the entry is not in the list
if( pFillAttrLB->GetSelectEntry() != aString ) if( pFillAttrLB->GetSelectEntry() != aString )
{ {
sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
String aTmpStr; OUString aTmpStr;
if( nCount > 0 ) if( nCount > 0 )
{ {
// Last entry gets tested against temporary entry // Last entry gets tested against temporary entry
aTmpStr = pFillAttrLB->GetEntry( nCount - 1 ); aTmpStr = pFillAttrLB->GetEntry( nCount - 1 );
if( aTmpStr.GetChar(0) == TMP_STR_BEGIN && if( aTmpStr[0] == TMP_STR_BEGIN &&
aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END ) aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
{ {
pFillAttrLB->RemoveEntry( nCount - 1 ); pFillAttrLB->RemoveEntry( nCount - 1 );
} }
} }
aTmpStr = TMP_STR_BEGIN; aTmpStr = OUString(TMP_STR_BEGIN) + aString + OUString(TMP_STR_END);
aTmpStr += aString;
aTmpStr += TMP_STR_END;
XGradientEntry* pEntry = new XGradientEntry( pGradientItem->GetGradientValue(), aTmpStr ); XGradientEntry* pEntry = new XGradientEntry( pGradientItem->GetGradientValue(), aTmpStr );
String aEmptyString = String(); XGradientList aGradientList( "" );
XGradientList aGradientList( aEmptyString );
aGradientList.Insert( pEntry ); aGradientList.Insert( pEntry );
aGradientList.SetDirty( sal_False ); aGradientList.SetDirty( sal_False );
const Bitmap aBmp = aGradientList.GetUiBitmap( 0 ); const Bitmap aBmp = aGradientList.GetUiBitmap( 0 );
...@@ -343,30 +338,27 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -343,30 +338,27 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{ {
if ( pHatchItem ) if ( pHatchItem )
{ {
String aString( pHatchItem->GetName() ); OUString aString( pHatchItem->GetName() );
pFillAttrLB->SelectEntry( aString ); pFillAttrLB->SelectEntry( aString );
// Check if the entry is not in the list // Check if the entry is not in the list
if( pFillAttrLB->GetSelectEntry() != aString ) if( pFillAttrLB->GetSelectEntry() != aString )
{ {
sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
String aTmpStr; OUString aTmpStr;
if( nCount > 0 ) if( nCount > 0 )
{ {
// Last entry gets tested against temporary entry // Last entry gets tested against temporary entry
aTmpStr = pFillAttrLB->GetEntry( nCount - 1 ); aTmpStr = pFillAttrLB->GetEntry( nCount - 1 );
if( aTmpStr.GetChar(0) == TMP_STR_BEGIN && if( aTmpStr[0] == TMP_STR_BEGIN &&
aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END ) aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
{ {
pFillAttrLB->RemoveEntry( nCount - 1 ); pFillAttrLB->RemoveEntry( nCount - 1 );
} }
} }
aTmpStr = TMP_STR_BEGIN; aTmpStr = OUString(TMP_STR_BEGIN) + aString + OUString(TMP_STR_END);
aTmpStr += aString;
aTmpStr += TMP_STR_END;
XHatchEntry* pEntry = new XHatchEntry( pHatchItem->GetHatchValue(), aTmpStr ); XHatchEntry* pEntry = new XHatchEntry( pHatchItem->GetHatchValue(), aTmpStr );
String aEmptyString = String(); XHatchList aHatchList( "" );
XHatchList aHatchList( aEmptyString );
aHatchList.Insert( pEntry ); aHatchList.Insert( pEntry );
aHatchList.SetDirty( sal_False ); aHatchList.SetDirty( sal_False );
const Bitmap aBmp = aHatchList.GetUiBitmap( 0 ); const Bitmap aBmp = aHatchList.GetUiBitmap( 0 );
...@@ -394,7 +386,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -394,7 +386,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
// SfxObjectShell::Current() && // SfxObjectShell::Current() &&
// SfxObjectShell::Current()->GetItem( SID_BITMAP_LIST ) ) // SfxObjectShell::Current()->GetItem( SID_BITMAP_LIST ) )
{ {
String aString( pBitmapItem->GetName() ); OUString aString( pBitmapItem->GetName() );
// Bitmap aBitmap( pBitmapItem->GetValue() ); // Bitmap aBitmap( pBitmapItem->GetValue() );
// SvxBitmapListItem aItem( *(const SvxBitmapListItem*)( // SvxBitmapListItem aItem( *(const SvxBitmapListItem*)(
...@@ -404,20 +396,18 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -404,20 +396,18 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
if( pFillAttrLB->GetSelectEntry() != aString ) if( pFillAttrLB->GetSelectEntry() != aString )
{ {
sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
String aTmpStr; OUString aTmpStr;
if( nCount > 0 ) if( nCount > 0 )
{ {
// Last entry gets tested against temporary entry // Last entry gets tested against temporary entry
aTmpStr = pFillAttrLB->GetEntry( nCount - 1 ); aTmpStr = pFillAttrLB->GetEntry( nCount - 1 );
if( aTmpStr.GetChar(0) == TMP_STR_BEGIN && if( aTmpStr[0] == TMP_STR_BEGIN &&
aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END ) aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
{ {
pFillAttrLB->RemoveEntry( nCount - 1 ); pFillAttrLB->RemoveEntry( nCount - 1 );
} }
} }
aTmpStr = TMP_STR_BEGIN; aTmpStr = OUString(TMP_STR_BEGIN) + aString + OUString(TMP_STR_END);
aTmpStr += aString;
aTmpStr += TMP_STR_END;
XBitmapEntry* pEntry = new XBitmapEntry(pBitmapItem->GetGraphicObject(), aTmpStr); XBitmapEntry* pEntry = new XBitmapEntry(pBitmapItem->GetGraphicObject(), aTmpStr);
XBitmapListRef xBitmapList = XBitmapListRef xBitmapList =
...@@ -458,7 +448,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -458,7 +448,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
if( pState->ISA( SvxGradientListItem ) && if( pState->ISA( SvxGradientListItem ) &&
eXFS == XFILL_GRADIENT ) eXFS == XFILL_GRADIENT )
{ {
String aString( pFillAttrLB->GetSelectEntry() ); OUString aString( pFillAttrLB->GetSelectEntry() );
pFillAttrLB->Clear(); pFillAttrLB->Clear();
pFillAttrLB->Fill( ( (SvxGradientListItem*)pState )->GetGradientList() ); pFillAttrLB->Fill( ( (SvxGradientListItem*)pState )->GetGradientList() );
pFillAttrLB->SelectEntry( aString ); pFillAttrLB->SelectEntry( aString );
...@@ -466,7 +456,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -466,7 +456,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
if( pState->ISA( SvxHatchListItem ) && if( pState->ISA( SvxHatchListItem ) &&
eXFS == XFILL_HATCH ) eXFS == XFILL_HATCH )
{ {
String aString( pFillAttrLB->GetSelectEntry() ); OUString aString( pFillAttrLB->GetSelectEntry() );
pFillAttrLB->Clear(); pFillAttrLB->Clear();
pFillAttrLB->Fill( ( (SvxHatchListItem*)pState )->GetHatchList() ); pFillAttrLB->Fill( ( (SvxHatchListItem*)pState )->GetHatchList() );
pFillAttrLB->SelectEntry( aString ); pFillAttrLB->SelectEntry( aString );
...@@ -474,7 +464,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -474,7 +464,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
if( pState->ISA( SvxBitmapListItem ) && if( pState->ISA( SvxBitmapListItem ) &&
eXFS == XFILL_BITMAP ) eXFS == XFILL_BITMAP )
{ {
String aString( pFillAttrLB->GetSelectEntry() ); OUString aString( pFillAttrLB->GetSelectEntry() );
pFillAttrLB->Clear(); pFillAttrLB->Clear();
pFillAttrLB->Fill( ( (SvxBitmapListItem*)pState )->GetBitmapList() ); pFillAttrLB->Fill( ( (SvxBitmapListItem*)pState )->GetBitmapList() );
pFillAttrLB->SelectEntry( aString ); pFillAttrLB->SelectEntry( aString );
...@@ -695,19 +685,18 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) ...@@ -695,19 +685,18 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
case XFILL_SOLID: case XFILL_SOLID:
{ {
// Entry gets tested against temporary color // Entry gets tested against temporary color
String aTmpStr = pLbFillAttr->GetSelectEntry(); OUString aTmpStr = pLbFillAttr->GetSelectEntry();
if( aTmpStr.GetChar(0) == TMP_STR_BEGIN && aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END ) if( aTmpStr[0] == TMP_STR_BEGIN && aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
{ {
aTmpStr.Erase( aTmpStr.Len()-1, 1 ); aTmpStr = aTmpStr.copy(1, aTmpStr.getLength()-2);
aTmpStr.Erase( 0, 1 );
} }
XFillColorItem aXFillColorItem( aTmpStr, pLbFillAttr->GetSelectEntryColor() ); XFillColorItem aXFillColorItem( aTmpStr, pLbFillAttr->GetSelectEntryColor() );
aArgs[0].Name = OUString( "FillColor" ); aArgs[0].Name = "FillColor";
aXFillColorItem.QueryValue( a ); aXFillColorItem.QueryValue( a );
aArgs[0].Value = a; aArgs[0].Value = a;
((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillColor" ), ((SvxFillToolBoxControl*)GetData())->Dispatch( ".uno:FillColor",
aArgs ); aArgs );
} }
break; break;
......
svx/source/tbxctrls/fontworkgallery.cxx
Dosyayı görüntüle @ 7471f789
...@@ -178,8 +178,8 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId) ...@@ -178,8 +178,8 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId)
sal_uInt32 nFavorite; sal_uInt32 nFavorite;
for( nFavorite = 1; nFavorite <= nFavCount; nFavorite++ ) for( nFavorite = 1; nFavorite <= nFavCount; nFavorite++ )
{ {
String aStr(SVX_RESSTR(RID_SVXFLOAT3D_FAVORITE)); OUString aStr(SVX_RESSTR(RID_SVXFLOAT3D_FAVORITE));
aStr += sal_Unicode(' '); aStr += " ";
aStr += OUString::number((sal_Int32)nFavorite); aStr += OUString::number((sal_Int32)nFavorite);
Image aThumbImage( maFavoritesHorizontal[nFavorite-1] ); Image aThumbImage( maFavoritesHorizontal[nFavorite-1] );
maCtlFavorites.InsertItem( (sal_uInt16)nFavorite, aThumbImage, aStr ); maCtlFavorites.InsertItem( (sal_uInt16)nFavorite, aThumbImage, aStr );
......
svx/source/tbxctrls/grafctrl.cxx
Dosyayı görüntüle @ 7471f789
...@@ -588,13 +588,13 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -588,13 +588,13 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
SfxItemPool& rPool = rView.GetModel()->GetItemPool(); SfxItemPool& rPool = rView.GetModel()->GetItemPool();
SfxItemSet aSet( rPool, SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST ); SfxItemSet aSet( rPool, SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST );
String aUndoStr; OUString aUndoStr;
const bool bUndo = rView.IsUndoEnabled(); const bool bUndo = rView.IsUndoEnabled();
if( bUndo ) if( bUndo )
{ {
aUndoStr = rView.GetDescriptionOfMarkedObjects(); aUndoStr = rView.GetDescriptionOfMarkedObjects();
aUndoStr.Append( sal_Unicode(' ') ); aUndoStr += " ";
} }
const SfxItemSet* pArgs = rReq.GetArgs(); const SfxItemSet* pArgs = rReq.GetArgs();
...@@ -612,7 +612,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -612,7 +612,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
aSet.Put( SdrGrafRedItem( ((SfxInt16Item*)pItem)->GetValue() )); aSet.Put( SdrGrafRedItem( ((SfxInt16Item*)pItem)->GetValue() ));
if( bUndo ) if( bUndo )
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFRED ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFRED );
} }
} }
break; break;
...@@ -623,7 +623,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -623,7 +623,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
aSet.Put( SdrGrafGreenItem( ((SfxInt16Item*)pItem)->GetValue() )); aSet.Put( SdrGrafGreenItem( ((SfxInt16Item*)pItem)->GetValue() ));
if( bUndo ) if( bUndo )
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGREEN ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGREEN );
} }
} }
break; break;
...@@ -634,7 +634,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -634,7 +634,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
aSet.Put( SdrGrafBlueItem( ((SfxInt16Item*)pItem)->GetValue() )); aSet.Put( SdrGrafBlueItem( ((SfxInt16Item*)pItem)->GetValue() ));
if( bUndo ) if( bUndo )
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFBLUE ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFBLUE );
} }
} }
break; break;
...@@ -645,7 +645,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -645,7 +645,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
aSet.Put( SdrGrafLuminanceItem( ((SfxInt16Item*)pItem)->GetValue() )); aSet.Put( SdrGrafLuminanceItem( ((SfxInt16Item*)pItem)->GetValue() ));
if( bUndo ) if( bUndo )
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFLUMINANCE ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFLUMINANCE );
} }
} }
break; break;
...@@ -656,7 +656,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -656,7 +656,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
aSet.Put( SdrGrafContrastItem( ((SfxInt16Item*)pItem)->GetValue() )); aSet.Put( SdrGrafContrastItem( ((SfxInt16Item*)pItem)->GetValue() ));
if( bUndo ) if( bUndo )
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCONTRAST ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCONTRAST );
} }
} }
break; break;
...@@ -667,7 +667,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -667,7 +667,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
aSet.Put( SdrGrafGamma100Item( ((SfxUInt32Item*)pItem)->GetValue() )); aSet.Put( SdrGrafGamma100Item( ((SfxUInt32Item*)pItem)->GetValue() ));
if( bUndo ) if( bUndo )
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGAMMA ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGAMMA );
} }
} }
break; break;
...@@ -678,7 +678,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -678,7 +678,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
aSet.Put( SdrGrafTransparenceItem( ((SfxUInt16Item*)pItem)->GetValue() )); aSet.Put( SdrGrafTransparenceItem( ((SfxUInt16Item*)pItem)->GetValue() ));
if( bUndo ) if( bUndo )
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFTRANSPARENCY ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFTRANSPARENCY );
} }
} }
break; break;
...@@ -689,7 +689,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -689,7 +689,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{ {
aSet.Put( SdrGrafModeItem( (GraphicDrawMode) ((SfxUInt16Item*)pItem)->GetValue() )); aSet.Put( SdrGrafModeItem( (GraphicDrawMode) ((SfxUInt16Item*)pItem)->GetValue() ));
if( bUndo ) if( bUndo )
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFMODE ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFMODE );
} }
} }
break; break;
...@@ -739,7 +739,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -739,7 +739,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
SfxNoLayoutSingleTabDialog aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL, SfxNoLayoutSingleTabDialog aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL,
aCropDlgAttr, 950 ); aCropDlgAttr, 950 );
const String aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP ); const OUString aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP );
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet error!"); DBG_ASSERT(pFact, "Dialogdiet error!");
...@@ -756,7 +756,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ...@@ -756,7 +756,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
if( pOutAttr ) if( pOutAttr )
{ {
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCROP ) ) ); aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCROP );
// set crop attributes // set crop attributes
if( SFX_ITEM_SET <= pOutAttr->GetItemState( SDRATTR_GRAFCROP ) ) if( SFX_ITEM_SET <= pOutAttr->GetItemState( SDRATTR_GRAFCROP ) )
......
svx/source/tbxctrls/itemwin.cxx
Dosyayı görüntüle @ 7471f789
...@@ -421,7 +421,7 @@ void SvxColorBox::ReleaseFocus_Impl() ...@@ -421,7 +421,7 @@ void SvxColorBox::ReleaseFocus_Impl()
SvxMetricField::SvxMetricField( SvxMetricField::SvxMetricField(
Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) :
MetricField( pParent, nBits ), MetricField( pParent, nBits ),
aCurTxt( String() ), aCurTxt(),
mxFrame( rFrame ) mxFrame( rFrame )
{ {
Size aSize = Size(GetTextWidth( OUString("99,99mm") ),GetTextHeight()); Size aSize = Size(GetTextWidth( OUString("99,99mm") ),GetTextHeight());
...@@ -457,7 +457,7 @@ void SvxMetricField::Update( const XLineWidthItem* pItem ) ...@@ -457,7 +457,7 @@ void SvxMetricField::Update( const XLineWidthItem* pItem )
SetMetricValue( *this, pItem->GetValue(), ePoolUnit ); SetMetricValue( *this, pItem->GetValue(), ePoolUnit );
} }
else else
SetText( String() ); SetText( "" );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
......
svx/source/tbxctrls/layctrl.cxx
Dosyayı görüntüle @ 7471f789
...@@ -74,9 +74,9 @@ private: ...@@ -74,9 +74,9 @@ private:
DECL_LINK( SelectHdl, void * ); DECL_LINK( SelectHdl, void * );
public: public:
TableWindow( sal_uInt16 nSlotId, TableWindow( sal_uInt16 nSlotId,
const OUString& rCmd, const OUString& rCmd,
const String& rText, const OUString& rText,
ToolBox& rParentTbx, ToolBox& rParentTbx,
const Reference< XFrame >& rFrame ); const Reference< XFrame >& rFrame );
~TableWindow(); ~TableWindow();
...@@ -104,7 +104,7 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl) ...@@ -104,7 +104,7 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl)
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ), SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ),
aTableButton( this ), aTableButton( this ),
nCol( 0 ), nCol( 0 ),
...@@ -132,7 +132,7 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const String ...@@ -132,7 +132,7 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const String
aTableButton.SetPosSizePixel( Point( TABLE_POS_X + TABLE_CELL_WIDTH, TABLE_HEIGHT + 5 ), aTableButton.SetPosSizePixel( Point( TABLE_POS_X + TABLE_CELL_WIDTH, TABLE_HEIGHT + 5 ),
Size( TABLE_WIDTH - TABLE_POS_X - 2*TABLE_CELL_WIDTH, 24 ) ); Size( TABLE_WIDTH - TABLE_POS_X - 2*TABLE_CELL_WIDTH, 24 ) );
aTableButton.SetText( String( SVX_RESSTR( RID_SVXSTR_MORE ) ) ); aTableButton.SetText( SVX_RESSTR( RID_SVXSTR_MORE ) );
aTableButton.SetClickHdl( LINK( this, TableWindow, SelectHdl ) ); aTableButton.SetClickHdl( LINK( this, TableWindow, SelectHdl ) );
aTableButton.Show(); aTableButton.Show();
...@@ -283,14 +283,14 @@ void TableWindow::Paint( const Rectangle& ) ...@@ -283,14 +283,14 @@ void TableWindow::Paint( const Rectangle& )
// the text near the mouse cursor telling the table dimensions // the text near the mouse cursor telling the table dimensions
if ( nCol && nLine ) if ( nCol && nLine )
{ {
String aText; OUString aText;
aText += OUString::number( nCol ); aText += OUString::number( nCol );
aText.AppendAscii( " x " ); aText += " x ";
aText += OUString::number( nLine ); aText += OUString::number( nLine );
if(GetId() == FN_SHOW_MULTIPLE_PAGES) if(GetId() == FN_SHOW_MULTIPLE_PAGES)
{ {
aText += ' '; aText += " ";
aText += String(SVX_RESSTR(RID_SVXSTR_PAGES)); aText += SVX_RESSTR(RID_SVXSTR_PAGES);
} }
Size aTextSize( GetTextWidth( aText ), GetTextHeight() ); Size aTextSize( GetTextWidth( aText ), GetTextHeight() );
...@@ -312,7 +312,7 @@ void TableWindow::Paint( const Rectangle& ) ...@@ -312,7 +312,7 @@ void TableWindow::Paint( const Rectangle& )
// #i95350# force RTL output // #i95350# force RTL output
if ( IsRTLEnabled() ) if ( IsRTLEnabled() )
aText.Insert( 0x202D, 0 ); aText = OUString(0x202D) + aText;
DrawText( Point( nTextX, nTextY ), aText ); DrawText( Point( nTextX, nTextY ), aText );
} }
...@@ -409,7 +409,7 @@ private: ...@@ -409,7 +409,7 @@ private:
void UpdateSize_Impl( long nNewCol ); void UpdateSize_Impl( long nNewCol );
public: public:
ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
void KeyInput( const KeyEvent& rKEvt ); void KeyInput( const KeyEvent& rKEvt );
virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseMove( const MouseEvent& rMEvt );
...@@ -424,7 +424,7 @@ public: ...@@ -424,7 +424,7 @@ public:
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), SfxPopupWindow( nId, rFrame, WB_STDPOPUP ),
bInitialKeyInput(true), bInitialKeyInput(true),
m_bMod1(false), m_bMod1(false),
...@@ -657,7 +657,7 @@ void ColumnsWindow::Paint( const Rectangle& ) ...@@ -657,7 +657,7 @@ void ColumnsWindow::Paint( const Rectangle& )
SetLineColor(); SetLineColor();
SetFillColor( aFaceColor ); SetFillColor( aFaceColor );
String aText; OUString aText;
if ( nCol ) if ( nCol )
aText = OUString::number(nCol); aText = OUString::number(nCol);
else else
......
svx/source/tbxctrls/lboxctrl.cxx
Dosyayı görüntüle @ 7471f789
...@@ -268,7 +268,7 @@ void SvxUndoRedoControl::StateChanged( ...@@ -268,7 +268,7 @@ void SvxUndoRedoControl::StateChanged(
{ {
SfxStringItem& rItem = *(SfxStringItem *)pState; SfxStringItem& rItem = *(SfxStringItem *)pState;
ToolBox& rBox = GetToolBox(); ToolBox& rBox = GetToolBox();
String aQuickHelpText = MnemonicGenerator::EraseAllMnemonicChars( rItem.GetValue() ); OUString aQuickHelpText = MnemonicGenerator::EraseAllMnemonicChars( rItem.GetValue() );
rBox.SetQuickHelpText( GetId(), aQuickHelpText ); rBox.SetQuickHelpText( GetId(), aQuickHelpText );
} }
SvxListBoxControl::StateChanged( nSID, eState, pState ); SvxListBoxControl::StateChanged( nSID, eState, pState );
...@@ -306,7 +306,7 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow() ...@@ -306,7 +306,7 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow()
rListBox.SetSelectHdl( LINK( this, SvxUndoRedoControl, SelectHdl ) ); rListBox.SetSelectHdl( LINK( this, SvxUndoRedoControl, SelectHdl ) );
for( sal_uInt32 n = 0; n < aUndoRedoList.size(); n++ ) for( sal_uInt32 n = 0; n < aUndoRedoList.size(); n++ )
rListBox.InsertEntry( String( aUndoRedoList[n] )); rListBox.InsertEntry( aUndoRedoList[n] );
rListBox.SelectEntryPos( 0 ); rListBox.SelectEntryPos( 0 );
aActionStr = SVX_RESSTR(SID_UNDO == GetSlotId() ? aActionStr = SVX_RESSTR(SID_UNDO == GetSlotId() ?
......
svx/source/tbxctrls/linectrl.cxx
Dosyayı görüntüle @ 7471f789
...@@ -179,7 +179,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) ...@@ -179,7 +179,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState )
SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() ); SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() );
DBG_ASSERT( pBox, "Window not found!" ); DBG_ASSERT( pBox, "Window not found!" );
String aString( pBox->GetSelectEntry() ); OUString aString( pBox->GetSelectEntry() );
pBox->Clear(); pBox->Clear();
pBox->InsertEntry( SVX_RESSTR(RID_SVXSTR_INVISIBLE) ); pBox->InsertEntry( SVX_RESSTR(RID_SVXSTR_INVISIBLE) );
pBox->InsertEntry( SVX_RESSTR(RID_SVXSTR_SOLID) ); pBox->InsertEntry( SVX_RESSTR(RID_SVXSTR_SOLID) );
...@@ -232,7 +232,7 @@ void SvxLineWidthToolBoxControl::StateChanged( ...@@ -232,7 +232,7 @@ void SvxLineWidthToolBoxControl::StateChanged(
if ( eState == SFX_ITEM_DISABLED ) if ( eState == SFX_ITEM_DISABLED )
{ {
pFld->Disable(); pFld->Disable();
pFld->SetText( String() ); pFld->SetText( "" );
} }
else else
{ {
......
svx/source/tbxctrls/tbcontrl.cxx
Dosyayı görüntüle @ 7471f789
...@@ -128,7 +128,7 @@ class SvxStyleBox_Impl : public ComboBox ...@@ -128,7 +128,7 @@ class SvxStyleBox_Impl : public ComboBox
using Window::IsVisible; using Window::IsVisible;
public: public:
SvxStyleBox_Impl( Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, SvxStyleBox_Impl( Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider,
const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, bool bInSpecialMode ); const Reference< XFrame >& _xFrame,const OUString& rClearFormatKey, const OUString& rMoreKey, bool bInSpecialMode );
~SvxStyleBox_Impl(); ~SvxStyleBox_Impl();
void SetFamily( SfxStyleFamily eNewFamily ); void SetFamily( SfxStyleFamily eNewFamily );
...@@ -160,9 +160,9 @@ private: ...@@ -160,9 +160,9 @@ private:
Reference< XDispatchProvider > m_xDispatchProvider; Reference< XDispatchProvider > m_xDispatchProvider;
Reference< XFrame > m_xFrame; Reference< XFrame > m_xFrame;
OUString m_aCommand; OUString m_aCommand;
String aClearFormatKey; OUString aClearFormatKey;
String aMoreKey; OUString aMoreKey;
String sDefaultStyle; OUString sDefaultStyle;
bool bInSpecialMode; bool bInSpecialMode;
void ReleaseFocus(); void ReleaseFocus();
...@@ -182,7 +182,7 @@ private: ...@@ -182,7 +182,7 @@ private:
SAL_WNODEPRECATED_DECLARATIONS_POP SAL_WNODEPRECATED_DECLARATIONS_POP
Font aCurFont; Font aCurFont;
Size aLogicalSize; Size aLogicalSize;
String aCurText; OUString aCurText;
sal_uInt16 nFtCount; sal_uInt16 nFtCount;
bool bRelease; bool bRelease;
Reference< XDispatchProvider > m_xDispatchProvider; Reference< XDispatchProvider > m_xDispatchProvider;
...@@ -329,12 +329,12 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener ...@@ -329,12 +329,12 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
SvxStyleBox_Impl::SvxStyleBox_Impl( SvxStyleBox_Impl::SvxStyleBox_Impl(
Window* pParent, Window* pParent,
const OUString& rCommand, const OUString& rCommand,
SfxStyleFamily eFamily, SfxStyleFamily eFamily,
const Reference< XDispatchProvider >& rDispatchProvider, const Reference< XDispatchProvider >& rDispatchProvider,
const Reference< XFrame >& _xFrame, const Reference< XFrame >& _xFrame,
const String& rClearFormatKey, const OUString& rClearFormatKey,
const String& rMoreKey, const OUString& rMoreKey,
bool bInSpec) : bool bInSpec) :
ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ), ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ),
...@@ -1717,11 +1717,11 @@ void SfxStyleControllerItem_Impl::StateChanged( ...@@ -1717,11 +1717,11 @@ void SfxStyleControllerItem_Impl::StateChanged(
struct SvxStyleToolBoxControl::Impl struct SvxStyleToolBoxControl::Impl
{ {
String aClearForm; OUString aClearForm;
String aMore; OUString aMore;
::std::vector< OUString > aDefaultStyles; ::std::vector< OUString > aDefaultStyles;
sal_Bool bSpecModeWriter; sal_Bool bSpecModeWriter;
sal_Bool bSpecModeCalc; sal_Bool bSpecModeCalc;
inline Impl( void ) inline Impl( void )
:aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) ) :aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) )
...@@ -2262,7 +2262,7 @@ void SvxFontNameToolBoxControl::StateChanged( ...@@ -2262,7 +2262,7 @@ void SvxFontNameToolBoxControl::StateChanged(
pBox->Update( pFontItem ); pBox->Update( pFontItem );
} }
else else
pBox->SetText( String() ); pBox->SetText( "" );
pBox->SaveValue(); pBox->SaveValue();
} }
......
svx/source/tbxctrls/tbunocontroller.cxx
Dosyayı görüntüle @ 7471f789
...@@ -61,7 +61,7 @@ protected: ...@@ -61,7 +61,7 @@ protected:
private: private:
FontHeightToolBoxControl* m_pCtrl; FontHeightToolBoxControl* m_pCtrl;
String m_aCurText; OUString m_aCurText;
Size m_aLogicalSize; Size m_aLogicalSize;
bool m_bRelease; bool m_bRelease;
uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
...@@ -91,7 +91,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( ...@@ -91,7 +91,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
{ {
SetSizePixel( LogicToPixel( m_aLogicalSize, MAP_APPFONT )); SetSizePixel( LogicToPixel( m_aLogicalSize, MAP_APPFONT ));
SetValue( 0 ); SetValue( 0 );
SetText( String() ); SetText( "" );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
...@@ -149,7 +149,7 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) ...@@ -149,7 +149,7 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase )
{ {
// Wert in der Anzeige l"oschen // Wert in der Anzeige l"oschen
SetValue( -1L ); SetValue( -1L );
SetText( String() ); SetText( "" );
} }
SaveValue(); SaveValue();
} }
......
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