Skip to content

Commit ea2c80b

Browse files
author
Noel Grandin
committed
convert CUI module from String to OUString
Change-Id: I79bdab414d448a0d619b80857d7b31633c116f81
1 parent 183f260 commit ea2c80b

File tree

123 files changed

+1357
-1359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+1357
-1359
lines changed

‎cui/source/customize/acccfg.cxx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString
618618
public:
619619
SfxAccCfgLBoxString_Impl( SvTreeListEntry* pEntry,
620620
sal_uInt16 nFlags,
621-
const String& sText );
621+
const OUString& sText );
622622

623623
virtual ~SfxAccCfgLBoxString_Impl();
624624

@@ -629,7 +629,7 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString
629629
//-----------------------------------------------
630630
SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl( SvTreeListEntry* pEntry,
631631
sal_uInt16 nFlags,
632-
const String& sText )
632+
const OUString& sText )
633633
: SvLBoxString(pEntry, nFlags, sText)
634634
{
635635
}
@@ -745,7 +745,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
745745
{
746746
FreeResource();
747747

748-
aFilterAllStr = String( SfxResId( STR_SFX_FILTERNAME_ALL ) );
748+
aFilterAllStr = SfxResId( STR_SFX_FILTERNAME_ALL );
749749

750750
// install handler functions
751751
aChangeButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, ChangeHdl ));
@@ -870,8 +870,8 @@ void SfxAcceleratorConfigPage::InitAccCfg()
870870
original SvTabListBox!
871871
*/
872872
void SfxAcceleratorConfigPage::CreateCustomItems( SvTreeListEntry* pEntry,
873-
const String& sCol1 ,
874-
const String& sCol2 )
873+
const OUString& sCol1 ,
874+
const OUString& sCol2 )
875875
{
876876
SfxAccCfgLBoxString_Impl* pStringItem = new SfxAccCfgLBoxString_Impl(pEntry, 0, sCol1);
877877
pEntry->ReplaceItem(pStringItem, 1);
@@ -910,8 +910,8 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
910910
for (i1=0; i1<c1; ++i1)
911911
{
912912
KeyCode aKey = KEYCODE_ARRAY[i1];
913-
String sKey = aKey.GetName();
914-
if (!sKey.Len())
913+
OUString sKey = aKey.GetName();
914+
if (sKey.isEmpty())
915915
continue;
916916
TAccInfo* pEntry = new TAccInfo(i1, nListPos, aKey);
917917
SvTreeListEntry* pLBEntry = aEntriesBox.InsertEntryToColumn(sKey, 0L, LIST_APPEND, 0xFFFF);
@@ -928,7 +928,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
928928
{
929929
const css::awt::KeyEvent& aAWTKey = lKeys[i2];
930930
OUString sCommand = xAccMgr->getCommandByKeyEvent(aAWTKey);
931-
String sLabel = GetLabel4Command(sCommand);
931+
OUString sLabel = GetLabel4Command(sCommand);
932932
KeyCode aKeyCode = ::svt::AcceleratorExecute::st_AWTKey2VCLKey(aAWTKey);
933933
sal_uInt16 nPos = MapKeyCodeToPos(aKeyCode);
934934

@@ -961,7 +961,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
961961
TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData();
962962

963963
pEntry->m_bIsConfigurable = sal_False;
964-
CreateCustomItems(pLBEntry, aEntriesBox.GetEntryText(pLBEntry, 0), String());
964+
CreateCustomItems(pLBEntry, aEntriesBox.GetEntryText(pLBEntry, 0), OUString());
965965
}
966966
}
967967

@@ -1046,9 +1046,9 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
10461046
{
10471047
sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
10481048
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
1049-
String sNewCommand = pFunctionBox->GetCurCommand();
1050-
String sLabel = pFunctionBox->GetCurLabel();
1051-
if (!sLabel.Len())
1049+
OUString sNewCommand = pFunctionBox->GetCurCommand();
1050+
OUString sLabel = pFunctionBox->GetCurLabel();
1051+
if (sLabel.isEmpty())
10521052
sLabel = GetLabel4Command(sNewCommand);
10531053

10541054
pEntry->m_sCommand = sNewCommand;
@@ -1068,7 +1068,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
10681068

10691069
// remove function name from selected entry
10701070
sal_uInt16 nCol = aEntriesBox.TabCount() - 1;
1071-
aEntriesBox.SetEntryText( String(), nPos, nCol );
1071+
aEntriesBox.SetEntryText( OUString(), nPos, nCol );
10721072
pEntry->m_sCommand = OUString();
10731073

10741074
((Link &) pFunctionBox->GetSelectHdl()).Call( pFunctionBox );
@@ -1079,7 +1079,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
10791079
IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
10801080
{
10811081
// disable help
1082-
Help::ShowBalloon( this, Point(), String() );
1082+
Help::ShowBalloon( this, Point(), OUString() );
10831083
if ( pListBox == &aEntriesBox )
10841084
{
10851085
sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
@@ -1384,7 +1384,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
13841384
}
13851385

13861386
//-----------------------------------------------
1387-
void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTitle )
1387+
void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& rTitle )
13881388
{
13891389
bool bSave = ( ( nBits & WB_SAVEAS ) == WB_SAVEAS );
13901390
short nDialogType = bSave ? css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION
@@ -1429,8 +1429,8 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
14291429

14301430
// change te description of the radio button, which switch to the module
14311431
// dependend accelerator configuration
1432-
String sButtonText = aModuleButton.GetText();
1433-
sButtonText.SearchAndReplace(OUString("$(MODULE)"), m_sModuleUIName);
1432+
OUString sButtonText = aModuleButton.GetText();
1433+
sButtonText = sButtonText.replaceFirst("$(MODULE)", m_sModuleUIName);
14341434
aModuleButton.SetText(sButtonText);
14351435

14361436
if (m_xModule.is())
@@ -1495,8 +1495,8 @@ OUString SfxAcceleratorConfigPage::GetLabel4Command(const OUString& sCommand)
14951495
if (xModuleConf.is())
14961496
{
14971497
::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand));
1498-
String sLabel = String(lProps.getUnpackedValueOrDefault(CMDPROP_UINAME, OUString()));
1499-
if (sLabel.Len())
1498+
OUString sLabel = lProps.getUnpackedValueOrDefault(CMDPROP_UINAME, OUString());
1499+
if (!sLabel.isEmpty())
15001500
return sLabel;
15011501
}
15021502
}
@@ -1515,7 +1515,7 @@ OUString SfxAcceleratorConfigPage::GetLabel4Command(const OUString& sCommand)
15151515
}
15161516
else
15171517
{
1518-
String aRet(OUString("Symbols: "));
1518+
OUString aRet("Symbols: ");
15191519
sal_Int32 nPos = sCommand.indexOf(".uno:InsertSymbol?Symbols:string=");
15201520
if ( nPos == 0 )
15211521
{
@@ -1533,7 +1533,7 @@ SfxTabPage* SfxAcceleratorConfigPage::Create( Window* pParent, const SfxItemSet&
15331533
}
15341534

15351535
//-----------------------------------------------
1536-
css::uno::Reference< css::frame::XModel > SfxAcceleratorConfigPage::SearchForAlreadyLoadedDoc(const String& /*sName*/)
1536+
css::uno::Reference< css::frame::XModel > SfxAcceleratorConfigPage::SearchForAlreadyLoadedDoc(const OUString& /*sName*/)
15371537
{
15381538
return css::uno::Reference< css::frame::XModel >();
15391539
}

‎cui/source/customize/cfg.cxx

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,12 +1067,12 @@ MenuSaveInData::GetEntries()
10671067

10681068
if ( m_xMenuSettings.is() )
10691069
{
1070-
LoadSubMenus( m_xMenuSettings, String(), pRootEntry );
1070+
LoadSubMenus( m_xMenuSettings, OUString(), pRootEntry );
10711071
}
10721072
else if ( GetDefaultData() != NULL )
10731073
{
10741074
// If the doc has no config settings use module config settings
1075-
LoadSubMenus( GetDefaultData()->m_xMenuSettings, String(), pRootEntry );
1075+
LoadSubMenus( GetDefaultData()->m_xMenuSettings, OUString(), pRootEntry );
10761076
}
10771077
}
10781078

@@ -1349,7 +1349,7 @@ MenuSaveInData::Reset()
13491349
class PopupPainter : public SvLBoxString
13501350
{
13511351
public:
1352-
PopupPainter( SvTreeListEntry* pEntry, const String& rStr )
1352+
PopupPainter( SvTreeListEntry* pEntry, const OUString& rStr )
13531353
: SvLBoxString( pEntry, 0, rStr )
13541354
{ }
13551355

@@ -1560,11 +1560,11 @@ SvxDescriptionEdit::SvxDescriptionEdit( Window* pParent, const ResId& _rId ) :
15601560

15611561
// -----------------------------------------------------------------------
15621562

1563-
void SvxDescriptionEdit::SetNewText( const String& _rText )
1563+
void SvxDescriptionEdit::SetNewText( const OUString& _rText )
15641564
{
1565-
String sTemp( _rText );
1565+
OUString sTemp( _rText );
15661566
sal_Bool bShow = sal_False;
1567-
if ( sTemp.Len() > 0 )
1567+
if ( !sTemp.isEmpty() )
15681568
{
15691569
// detect if a scrollbar is necessary
15701570
Rectangle aRect = GetTextRect( m_aRealRect, sTemp, TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE );
@@ -1575,7 +1575,7 @@ void SvxDescriptionEdit::SetNewText( const String& _rText )
15751575
GetVScrollBar()->Show( bShow );
15761576

15771577
if ( bShow )
1578-
sTemp += '\n';
1578+
sTemp += "\n";
15791579

15801580
SetText( sTemp );
15811581
}
@@ -1615,8 +1615,8 @@ SvxConfigPage::SvxConfigPage(
16151615
aDescriptionField.SetAutoScroll( sal_True );
16161616
aDescriptionField.EnableCursor( sal_False );
16171617

1618-
aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
1619-
aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
1618+
aMoveUpButton.SetAccessibleName(CUI_RES(BUTTON_STR_UP));
1619+
aMoveDownButton.SetAccessibleName(CUI_RES(BUTTON_STR_DOWN));
16201620
aMoveUpButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
16211621
aMoveDownButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
16221622
aNewTopLevelButton.SetAccessibleRelationMemberOf(&aTopLevelSeparator);
@@ -2000,7 +2000,7 @@ void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
20002000
}
20012001

20022002
void SvxConfigPage::AddSubMenusToUI(
2003-
const String& rBaseTitle, SvxConfigEntry* pParentData )
2003+
const OUString& rBaseTitle, SvxConfigEntry* pParentData )
20042004
{
20052005
SvxEntries::const_iterator iter = pParentData->GetEntries()->begin();
20062006
SvxEntries::const_iterator end = pParentData->GetEntries()->end();
@@ -2054,10 +2054,10 @@ SvxEntries* SvxConfigPage::FindParentForChild(
20542054
SvTreeListEntry* SvxConfigPage::AddFunction(
20552055
SvTreeListEntry* pTarget, bool bFront, bool bAllowDuplicates )
20562056
{
2057-
String aDisplayName = pSelectorDlg->GetSelectedDisplayName();
2058-
String aURL = pSelectorDlg->GetScriptURL();
2057+
OUString aDisplayName = pSelectorDlg->GetSelectedDisplayName();
2058+
OUString aURL = pSelectorDlg->GetScriptURL();
20592059

2060-
if ( !aURL.Len() )
2060+
if ( aURL.isEmpty() )
20612061
{
20622062
return NULL;
20632063
}
@@ -2192,7 +2192,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
21922192
return pNewEntry;
21932193
}
21942194

2195-
IMPL_LINK( SvxConfigPage, AsyncInfoMsg, String*, pMsg )
2195+
IMPL_LINK( SvxConfigPage, AsyncInfoMsg, OUString*, pMsg )
21962196
{
21972197
(void)pMsg;
21982198

@@ -2479,10 +2479,9 @@ bool SvxMenuConfigPage::DeleteSelectedContent()
24792479

24802480
short SvxMenuConfigPage::QueryReset()
24812481
{
2482-
String msg =
2483-
String( CUI_RES( RID_SVXSTR_CONFIRM_MENU_RESET ) );
2482+
OUString msg = CUI_RES( RID_SVXSTR_CONFIRM_MENU_RESET );
24842483

2485-
String saveInName = aSaveInListBox.GetEntry(
2484+
OUString saveInName = aSaveInListBox.GetEntry(
24862485
aSaveInListBox.GetSelectEntryPos() );
24872486

24882487
OUString label = replaceSaveInName( msg, saveInName );
@@ -2536,7 +2535,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
25362535
SvxConfigEntry* pMenuData = GetTopLevelSelection();
25372536

25382537
OUString aNewName( stripHotKey( pMenuData->GetName() ) );
2539-
String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
2538+
OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
25402539

25412540
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
25422541
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU );
@@ -2594,7 +2593,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
25942593
case ID_ADD_SUBMENU:
25952594
{
25962595
OUString aNewName;
2597-
String aDesc = CUI_RESSTR( RID_SVXSTR_SUBMENU_NAME );
2596+
OUString aDesc = CUI_RESSTR( RID_SVXSTR_SUBMENU_NAME );
25982597

25992598
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
26002599
pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU );
@@ -2640,7 +2639,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
26402639
(SvxConfigEntry*) pActEntry->GetUserData();
26412640

26422641
OUString aNewName( stripHotKey( pEntry->GetName() ) );
2643-
String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
2642+
OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
26442643

26452644
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
26462645
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM );
@@ -2719,8 +2718,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton )
27192718
pSelectorDlg->SetAddHdl(
27202719
LINK( this, SvxMenuConfigPage, AddFunctionHdl ) );
27212720

2722-
pSelectorDlg->SetDialogDescription( String(
2723-
CUI_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ) );
2721+
pSelectorDlg->SetDialogDescription( CUI_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) );
27242722
}
27252723

27262724
// Position the Script Selector over the Add button so it is
@@ -2790,8 +2788,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
27902788
if ( bCreateMenu )
27912789
{
27922790
// Generate custom name for new menu
2793-
String prefix =
2794-
String( CUI_RES( RID_SVXSTR_NEW_MENU ) );
2791+
OUString prefix = CUI_RES( RID_SVXSTR_NEW_MENU );
27952792

27962793
OUString newname = generateCustomName( prefix, entries );
27972794
OUString newurl = generateCustomMenuURL( pEntries );
@@ -2857,8 +2854,8 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
28572854
aMoveDownButton.SetClickHdl (
28582855
LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
28592856

2860-
aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
2861-
aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
2857+
aMoveUpButton.SetAccessibleName(CUI_RES(BUTTON_STR_UP));
2858+
aMoveDownButton.SetAccessibleName(CUI_RES(BUTTON_STR_DOWN));
28622859
}
28632860

28642861
IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
@@ -3273,7 +3270,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
32733270
case ID_RENAME:
32743271
{
32753272
OUString aNewName( stripHotKey( pToolbar->GetName() ) );
3276-
String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
3273+
OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
32773274

32783275
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
32793276
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR );
@@ -3364,7 +3361,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
33643361
(SvxConfigEntry*) pActEntry->GetUserData();
33653362

33663363
OUString aNewName( stripHotKey( pEntry->GetName() ) );
3367-
String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
3364+
OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
33683365

33693366
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
33703367
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM );
@@ -4539,10 +4536,9 @@ void SvxToolbarConfigPage::UpdateButtonStates()
45394536

45404537
short SvxToolbarConfigPage::QueryReset()
45414538
{
4542-
String msg =
4543-
String( CUI_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ) );
4539+
OUString msg = CUI_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET );
45444540

4545-
String saveInName = aSaveInListBox.GetEntry(
4541+
OUString saveInName = aSaveInListBox.GetEntry(
45464542
aSaveInListBox.GetSelectEntryPos() );
45474543

45484544
OUString label = replaceSaveInName( msg, saveInName );
@@ -4630,8 +4626,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
46304626
{
46314627
(void)pButton;
46324628

4633-
String prefix =
4634-
String( CUI_RES( RID_SVXSTR_NEW_TOOLBAR ) );
4629+
OUString prefix = CUI_RES( RID_SVXSTR_NEW_TOOLBAR );
46354630

46364631
OUString aNewName =
46374632
generateCustomName( prefix, GetSaveInData()->GetEntries() );
@@ -5261,7 +5256,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton )
52615256
{
52625257
(void)pButton;
52635258

5264-
OUString message = String( CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ) );
5259+
OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM );
52655260
bool ret = WarningBox( this, WinBits(WB_OK_CANCEL), message ).Execute();
52665261

52675262
if ( ret == RET_OK )
@@ -5560,22 +5555,22 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
55605555
SvxIconReplacementDialog :: SvxIconReplacementDialog(
55615556
Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ )
55625557
:
5563-
MessBox( pWindow, WB_DEF_YES, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
5558+
MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) )
55645559

55655560
{
55665561
SetImage( WarningBox::GetStandardImage() );
55675562
SetMessText( ReplaceIconName( aMessage ) );
55685563
RemoveButton( 1 );
55695564
AddButton( BUTTON_YES, 2, 0 );
5570-
AddButton( String( CUI_RES( RID_SVXSTR_YESTOALL ) ), 5, 0 );
5565+
AddButton( CUI_RES( RID_SVXSTR_YESTOALL ), 5, 0 );
55715566
AddButton( BUTTON_NO, 3, 0 );
55725567
AddButton( BUTTON_CANCEL, 4, 0 );
55735568
}
55745569

55755570
SvxIconReplacementDialog :: SvxIconReplacementDialog(
55765571
Window *pWindow, const OUString& aMessage )
55775572
:
5578-
MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
5573+
MessBox( pWindow, WB_YES_NO_CANCEL, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) )
55795574
{
55805575
SetImage( WarningBox::GetStandardImage() );
55815576
SetMessText( ReplaceIconName( aMessage ));
@@ -5584,7 +5579,7 @@ MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CON
55845579
OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage )
55855580
{
55865581
OUString name;
5587-
OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
5582+
OUString message = CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING );
55885583
OUString placeholder("%ICONNAME" );
55895584
sal_Int32 pos = message.indexOf( placeholder );
55905585
if ( pos != -1 )

0 commit comments

Comments
 (0)