diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-27 17:01:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-28 16:45:48 +0100 |
| commit | 5efc15f0006866ac4c422c1b2bde173ded47893f (patch) | |
| tree | 119b46339aae67b9a5b1a76ea2a955a548e5016e /fpicker | |
| parent | e39a959429234aef5348a8b5800b27c29de02a6f (diff) | |
reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 10 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index f4c8d3a9ba87..21a789110574 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -789,7 +789,7 @@ IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG ) SmartContent aContent( pThis->_pFileView->GetViewURL( ) ); OUString aTitle; aContent.getTitle( aTitle ); - svtools::QueryFolderNameDialog aDlg( pThis, aTitle, String( SvtResId( STR_SVT_NEW_FOLDER ) ) ); + svtools::QueryFolderNameDialog aDlg( pThis, aTitle, SVT_RESSTR(STR_SVT_NEW_FOLDER) ); sal_Bool bHandled = sal_False; while ( !bHandled ) @@ -1176,7 +1176,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) { if ( ::utl::UCBContentHelper::Exists( aFileObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) { - String aMsg = SvtResId( STR_SVT_ALREADYEXISTOVERWRITE ); + String aMsg = SVT_RESSTR( STR_SVT_ALREADYEXISTOVERWRITE ); aMsg.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$filename$" ) ), aFileObj.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET) @@ -1216,7 +1216,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) if ( !bExists ) { - String sError( SvtResId( RID_FILEOPEN_NOTEXISTENTFILE ) ); + String sError( SVT_RESSTR( RID_FILEOPEN_NOTEXISTENTFILE ) ); String sInvalidFile( aFileObj.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); if ( INET_PROT_FILE == aFileObj.GetProtocol() ) @@ -2064,7 +2064,7 @@ short SvtFileDialog::PrepareExecute() if ( bEmpty ) { - ErrorBox aBox( this, WB_OK, SvtResId( STR_SVT_NOREMOVABLEDEVICE ) ); + ErrorBox aBox( this, WB_OK, SVT_RESSTR( STR_SVT_NOREMOVABLEDEVICE ) ); aBox.Execute(); return 0; } @@ -2908,7 +2908,7 @@ void SvtFileDialog::AddControls_Impl( ) _pPrevBmp = new FixedBitmap( this, WinBits( WB_BORDER ) ); _pPrevBmp->SetBackground( Wallpaper( Color( COL_WHITE ) ) ); _pPrevBmp->Show(); - _pPrevBmp->SetAccessibleName(SvtResId(STR_PREVIEW)); + _pPrevBmp->SetAccessibleName(SVT_RESSTR(STR_PREVIEW)); } if ( _nExtraBits & SFX_EXTRA_AUTOEXTENSION ) diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index f2c4da7d8053..2d8a195434a8 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -196,7 +196,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu ) if ( nCount == 1 ) { // adjust the title of the top level entry (the workspace) - _pMenu->SetItemText( --nItemId, SvtSimpleResId( STR_SVT_MIMETYPE_CNT_FSYSBOX ) ); + _pMenu->SetItemText( --nItemId, SvtSimpleResId(STR_SVT_MIMETYPE_CNT_FSYSBOX).toString() ); } --nCount; } |