diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-29 23:36:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-30 11:22:09 +0100 |
| commit | 8a0685d49f679d6f98de2f357f1ec74590573852 (patch) | |
| tree | 97eb05105a45186049c1c3dad20233c29747ed9c | |
| parent | b18cfdc7cd3755c147970f86d23973f337be01a7 (diff) | |
make ResId::toString a non-static member
Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb
139 files changed, 539 insertions, 554 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 3e1827859727..500f377f7fa3 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -127,7 +127,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, { ::rtl::OUStringBuffer aPageStr; aPageStr.appendAscii( RTL_CONSTASCII_STRINGPARAM( " [" ) ); - aPageStr.append(ResId::toString( IDEResId( RID_STR_PAGE ) )); + aPageStr.append(IDE_RESSTR(RID_STR_PAGE)); aPageStr.append(' '); aPageStr.append( nCurPage ); aPageStr.append(']'); @@ -303,7 +303,7 @@ sal_Bool ModulWindow::BasicExecute() { if ( !aDocument.allowMacros() ) { - WarningBox( this, WB_OK, ResId::toString( IDEResId( RID_STR_CANNOTRUNMACRO ) ) ).Execute(); + WarningBox( this, WB_OK, IDE_RESSTR(RID_STR_CANNOTRUNMACRO)).Execute(); return sal_False; } } @@ -440,7 +440,7 @@ sal_Bool ModulWindow::LoadBasic() Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); xFltMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) ); - xFltMgr->appendFilter( ResId::toString(IDEResId( RID_STR_FILTER_ALLFILES ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); xFltMgr->setCurrentFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ) ); if( xFP->execute() == RET_OK ) @@ -468,7 +468,7 @@ sal_Bool ModulWindow::LoadBasic() bDone = sal_True; } else - ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_COULDNTREAD ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_COULDNTREAD) ).Execute(); } return bDone; } @@ -500,7 +500,7 @@ sal_Bool ModulWindow::SaveBasicSource() Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); xFltMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) ); - xFltMgr->appendFilter( ResId::toString(IDEResId( RID_STR_FILTER_ALLFILES ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); xFltMgr->setCurrentFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ) ); if( xFP->execute() == RET_OK ) @@ -677,10 +677,10 @@ long ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) ::rtl::OUStringBuffer aErrorTextPrefixBuf; if( pBasic->IsCompilerError() ) - aErrorTextPrefixBuf.append(ResId::toString(IDEResId(RID_STR_COMPILEERROR))); + aErrorTextPrefixBuf.append(IDE_RESSTR(RID_STR_COMPILEERROR)); else { - aErrorTextPrefixBuf.append(ResId::toString(IDEResId(RID_STR_RUNTIMEERROR))); + aErrorTextPrefixBuf.append(IDE_RESSTR(RID_STR_RUNTIMEERROR)); aErrorTextPrefixBuf.append(StarBASIC::GetVBErrorCode(pBasic->GetErrorCode())); aErrorTextPrefixBuf.append(' '); pLayout->GetStackWindow().UpdateCalls(); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index a7acc1e72002..a1a0bf144700 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -731,10 +731,10 @@ sal_Bool DialogWindow::SaveDialog() xFP->setDefaultName( ::rtl::OUString( GetName() ) ); - ::rtl::OUString aDialogStr(ResId::toString(IDEResId(RID_STR_STDDIALOGNAME))); + ::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) ); - xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); xFltMgr->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) @@ -876,7 +876,7 @@ sal_Bool DialogWindow::SaveDialog() } } else - ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_COULDNTWRITE) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_COULDNTWRITE)).Execute(); } return bDone; @@ -936,9 +936,9 @@ NameClashQueryBox::NameClashQueryBox( Window* pParent, maMessText = rMessage; - AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_RENAME ) ), RET_YES, + AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_RENAME), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); - AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_REPLACE ) ), RET_NO, 0 ); + AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_REPLACE), RET_NO, 0 ); AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); SetImage( QueryBox::GetStandardImage() ); @@ -960,9 +960,9 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, SetText( rTitle ); maMessText = rMessage; - AddButton( String( IDEResId( RID_STR_DLGIMP_MISMATCH_ADD ) ), RET_YES, + AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_ADD), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); - AddButton( String( IDEResId( RID_STR_DLGIMP_MISMATCH_OMIT ) ), RET_NO, 0 ); + AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_OMIT), RET_NO, 0 ); AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); AddButton( BUTTON_HELP, BUTTONID_HELP, BUTTONDIALOG_HELPBUTTON, 4 ); @@ -993,10 +993,10 @@ sal_Bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const if ( !aCurPath.isEmpty() ) xFP->setDisplayDirectory ( aCurPath ); - ::rtl::OUString aDialogStr(ResId::toString(IDEResId(RID_STR_STDDIALOGNAME))); + ::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) ); - xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); xFltMgr->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) @@ -1060,8 +1060,8 @@ sal_Bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const NameClashMode eNameClashMode = NO_CLASH; if( bDialogAlreadyExists ) { - ::rtl::OUString aQueryBoxTitle(ResId::toString(IDEResId(RID_STR_DLGIMP_CLASH_TITLE))); - ::rtl::OUString aQueryBoxText(ResId::toString(IDEResId(RID_STR_DLGIMP_CLASH_TEXT))); + ::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE)); + ::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT)); aQueryBoxText = aQueryBoxText.replaceAll("$(ARG1)", aXmlDlgName); NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); @@ -1124,8 +1124,8 @@ sal_Bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const bool bAddDialogLanguagesToLib = false; if( nOnlyInImportLanguageCount > 0 ) { - ::rtl::OUString aQueryBoxTitle(ResId::toString(IDEResId(RID_STR_DLGIMP_MISMATCH_TITLE))); - ::rtl::OUString aQueryBoxText(ResId::toString(IDEResId(RID_STR_DLGIMP_MISMATCH_TEXT))); + ::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE)); + ::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT)); LanguageMismatchQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); sal_uInt16 nRet = aQueryBox.Execute(); if( RET_YES == nRet ) diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 6702f9374d28..cb18b10968b1 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -175,7 +175,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq ) else nFound = ((ModulWindow*)pCurWin)->StartSearchAndReplace( (const SvxSearchItem&)rItem ); - ::rtl::OUString aReplStr(ResId::toString(IDEResId(RID_STR_SEARCHREPLACES))); + ::rtl::OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES)); aReplStr = aReplStr.replaceAll("XX", rtl::OUString::valueOf(nFound)); InfoBox( pCurWin, aReplStr ).Execute(); } @@ -203,7 +203,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq ) SfxViewFrame* pViewFrame = GetViewFrame(); SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow( SID_SEARCH_DLG ) : NULL; Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL; - QueryBox aQuery(pParent, WB_YES_NO|WB_DEF_YES, ResId::toString(IDEResId(RID_STR_SEARCHFROMSTART))); + QueryBox aQuery(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART)); if ( aQuery.Execute() == RET_YES ) { it = aIDEWindowTable.begin(); diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 0e83a8ecdf4c..d256b2864411 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -136,13 +136,13 @@ void BasicIDEShell::SetMDITitle() aTitleBuf.append(m_aCurLibName); } else - aTitleBuf.append(ResId::toString(IDEResId(RID_STR_ALL))); + aTitleBuf.append(IDE_RESSTR(RID_STR_ALL)); ::basctl::DocumentSignature aCurSignature( m_aCurDocument ); if ( aCurSignature.getScriptingSignatureState() == SIGNATURESTATE_SIGNATURES_OK ) { aTitleBuf.append(' '); - aTitleBuf.append(ResId::toString(IDEResId(RID_STR_SIGNED))); + aTitleBuf.append(IDE_RESSTR(RID_STR_SIGNED)); aTitleBuf.append(' '); } ::rtl::OUString aTitle(aTitleBuf.makeStringAndClear()); diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index a2f9a18c5903..3c00def9ab84 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -406,7 +406,7 @@ sal_uInt16 BasicIDEShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing ) if( bUI ) { Window *pParent = &GetViewFrame()->GetWindow(); - InfoBox( pParent, ResId::toString(IDEResId(RID_STR_CANNOTCLOSE))).Execute(); + InfoBox( pParent, IDE_RESSTR(RID_STR_CANNOTCLOSE)).Execute(); } return sal_False; } diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index cd9986ccff87..1461a3e51c97 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -179,7 +179,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const if ( rDocument.hasModule( rLibName, rNewName ) ) { - ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) ); + ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2) ); aError.Execute(); return false; } @@ -187,7 +187,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const // #i74440 if ( rNewName.isEmpty() ) { - ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) ); + ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ); aError.Execute(); return false; } diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 338e5e01882a..8fa882ae5850 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -183,7 +183,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const if ( rDocument.hasDialog( rLibName, rNewName ) ) { - ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) ); + ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2) ); aError.Execute(); return false; } @@ -191,7 +191,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const // #i74440 if ( rNewName.isEmpty() ) { - ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) ); + ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ); aError.Execute(); return false; } diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 34a1aaf1a839..9e78d750f2c5 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -408,10 +408,10 @@ void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEnt { ::std::vector< std::pair< BasicEntryType, ::rtl::OUString > > aEntries; - aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ); - aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, ResId::toString( IDEResId( RID_STR_USERFORMS ) ) ) ); - aEntries.push_back( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, ResId::toString( IDEResId( RID_STR_NORMAL_MODULES ) ) ) ); - aEntries.push_back( ::std::make_pair( OBJ_TYPE_CLASS_MODULES, ResId::toString( IDEResId( RID_STR_CLASS_MODULES ) ) ) ); + aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) ); + aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, IDE_RESSTR(RID_STR_USERFORMS) ) ); + aEntries.push_back( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, IDE_RESSTR(RID_STR_NORMAL_MODULES) ) ); + aEntries.push_back( ::std::make_pair( OBJ_TYPE_CLASS_MODULES, IDE_RESSTR(RID_STR_CLASS_MODULES) ) ); ::std::vector< std::pair< BasicEntryType, ::rtl::OUString > >::iterator iter; for( iter = aEntries.begin(); iter != aEntries.end(); ++iter ) diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index eb079eb8b72d..813d5bff8a54 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -756,7 +756,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey& rKey ) bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent ) { - ::rtl::OUString aQuery( ResId::toString(rId) ); + ::rtl::OUString aQuery(rId.toString()); ::rtl::OUStringBuffer aNameBuf( rName ); aNameBuf.append('\''); aNameBuf.insert(sal_Int32(0), sal_Unicode('\'')); @@ -804,7 +804,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, // set new title if ( bNewTitle ) { - ::rtl::OUString aTitle(ResId::toString(IDEResId(RID_STR_ENTERPASSWORD))); + ::rtl::OUString aTitle(IDE_RESSTR(RID_STR_ENTERPASSWORD)); aTitle = aTitle.replaceAll("XX", rLibName); pDlg->SetText( aTitle ); } @@ -826,7 +826,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, if ( !bOK ) { - ErrorBox aErrorBox( Application::GetDefDialogParent(), WB_OK, ResId::toString( IDEResId( RID_STR_WRONGPASSWORD ) ) ); + ErrorBox aErrorBox( Application::GetDefDialogParent(), WB_OK, IDE_RESSTR(RID_STR_WRONGPASSWORD) ); aErrorBox.Execute(); } } diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 05e27d37f4b1..99abdbcdf233 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -381,7 +381,7 @@ SbMethod* MacroChooser::CreateMacro() if ( aModName.Len() ) { // extract the module name from the string like "Sheet1 (Example1)" - if( aDesc.GetLibSubName() == ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) + if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) { sal_uInt16 nIndex = 0; aModName = aModName.GetToken( 0, ' ', nIndex ); @@ -704,7 +704,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) String aLib( aDesc.GetLibName() ); String aMod( aDesc.GetName() ); // extract the module name from the string like "Sheet1 (Example1)" - if( aDesc.GetLibSubName() == ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) + if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) { sal_uInt16 nIndex = 0; aMod = aMod.GetToken( 0, ' ', nIndex ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index d0fe4085c401..f63a26882963 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -289,7 +289,7 @@ sal_Bool BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) ::rtl::OUString aLibName = GetEntryText( pEntry, 0 ); if ( aLibName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) ) { - ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_CANNOTCHANGENAMESTDLIB ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute(); return sal_False; } @@ -299,7 +299,7 @@ sal_Bool BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) || ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) ) { - ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_LIBISREADONLY ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBISREADONLY) ).Execute(); return sal_False; } @@ -352,7 +352,7 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& r } catch (const container::ElementExistException& ) { - ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED) ).Execute(); return sal_False; } catch (const container::NoSuchElementException& ) @@ -365,9 +365,9 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& r if ( !bValid ) { if ( rNewName.getLength() > 30 ) - ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_LIBNAMETOLONG ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBNAMETOLONG) ).Execute(); else - ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ).Execute(); } return bValid; @@ -384,7 +384,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler) else { ErrorBox(this, WB_OK | WB_DEF_OK, - ResId::toString(IDEResId(RID_STR_BADSBXNAME))).Execute(); + IDE_RESSTR(RID_STR_BADSBXNAME)).Execute(); aEdit.GrabFocus(); } return 0; @@ -404,16 +404,16 @@ NewObjectDialog::NewObjectDialog(Window * pParent, NewObjectMode nMode, switch (nMode) { case NEWOBJECTMODE_LIB: - SetText( ResId::toString( IDEResId( RID_STR_NEWLIB ) ) ); + SetText( IDE_RESSTR(RID_STR_NEWLIB) ); break; case NEWOBJECTMODE_MOD: - SetText( ResId::toString( IDEResId( RID_STR_NEWMOD ) ) ); + SetText( IDE_RESSTR(RID_STR_NEWMOD) ); break; case NEWOBJECTMODE_METH: - SetText( ResId::toString( IDEResId( RID_STR_NEWMETH ) ) ); + SetText( IDE_RESSTR(RID_STR_NEWMETH) ); break; default: - SetText( ResId::toString( IDEResId( RID_STR_NEWDLG ) ) ); + SetText( IDE_RESSTR(RID_STR_NEWDLG) ); break; } @@ -442,7 +442,7 @@ GotoLineDialog::GotoLineDialog(Window * pParent ) FreeResource(); aEdit.GrabFocus(); - SetText( ResId::toString( IDEResId( RID_STR_GETLINE ) ) ); + SetText( IDE_RESSTR(RID_STR_GETLINE) ); aOKButton.SetClickHdl(LINK(this, GotoLineDialog, OkButtonHandler)); } @@ -828,7 +828,7 @@ void LibPage::InsertLib() if ( !aLastFilter.isEmpty() ) xFltMgr->setCurrentFilter( aLastFilter ); else - xFltMgr->setCurrentFilter( ResId::toString( IDEResId( RID_STR_BASIC ) ) ); + xFltMgr->setCurrentFilter( IDE_RESSTR(RID_STR_BASIC) ); if ( xFP->execute() == RET_OK ) { @@ -913,7 +913,7 @@ void LibPage::InsertLib() } if ( !pLibDlg ) - InfoBox( this, ResId::toString( IDEResId( RID_STR_NOLIBINSTORAGE ) ) ).Execute(); + InfoBox( this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE) ).Execute(); else { sal_Bool bChanges = sal_False; @@ -950,7 +950,7 @@ void LibPage::InsertLib() // check, if the library is the Standard library if ( aLibName == "Standard" ) { - ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_REPLACESTDLIB ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_REPLACESTDLIB) ).Execute(); continue; } @@ -958,10 +958,10 @@ void LibPage::InsertLib() if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) || ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) ) { - ::rtl::OUString aErrStr( ResId::toString( IDEResId( RID_STR_REPLACELIB ) ) ); + ::rtl::OUString aErrStr( IDE_RESSTR(RID_STR_REPLACELIB) ); aErrStr = aErrStr.replaceAll("XX", aLibName); aErrStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); - aErrStr += ResId::toString( IDEResId( RID_STR_LIBISREADONLY ) ); + aErrStr += IDE_RESSTR(RID_STR_LIBISREADONLY); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute(); continue; } @@ -973,12 +973,12 @@ void LibPage::InsertLib() { ::rtl::OUString aErrStr; if ( bReference ) - aErrStr = ResId::toString( IDEResId( RID_STR_REFNOTPOSSIBLE ) ); + aErrStr = IDE_RESSTR(RID_STR_REFNOTPOSSIBLE); else - aErrStr = ResId::toString( IDEResId( RID_STR_IMPORTNOTPOSSIBLE ) ); + aErrStr = IDE_RESSTR(RID_STR_IMPORTNOTPOSSIBLE); aErrStr = aErrStr.replaceAll("XX", aLibName); aErrStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); - aErrStr += ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED ) ); + aErrStr += IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute(); continue; } @@ -996,7 +996,7 @@ void LibPage::InsertLib() if ( !bOK ) { - ::rtl::OUString aErrStr( ResId::toString( IDEResId( RID_STR_NOIMPORT ) ) ); + ::rtl::OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) ); aErrStr = aErrStr.replaceAll("XX", aLibName); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute(); continue; diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index c86089ef8ff1..779d74c88e85 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -94,7 +94,7 @@ sal_Bool ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUStr sal_Bool bValid = BasicIDE::IsValidSbxName( rNewText ); if ( !bValid ) { - ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ).Execute(); return sal_False; } @@ -651,7 +651,7 @@ void ObjectPage::CheckButtons() // enable/disable delete button if ( nDepth >= 2 && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE ) { - if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( ( nDepth == 2 ) || aLibSubName == ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ) + if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( ( nDepth == 2 ) || aLibSubName == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) ) aDelButton.Disable(); else aDelButton.Enable(); @@ -689,7 +689,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) { ::rtl::OUString aModName( aDesc.GetName() ); // extract the module name from the string like "Sheet1 (Example1)" - if( aDesc.GetLibSubName() == ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) + if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) { sal_Int32 nIndex = 0; aModName = aModName.getToken( 0, ' ', nIndex ); @@ -816,7 +816,7 @@ void ObjectPage::NewDialog() if ( aDocument.hasDialog( aLibName, aDlgName ) ) { ErrorBox( this, WB_OK | WB_DEF_OK, - ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) ).Execute(); + IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2) ).Execute(); } else { @@ -933,7 +933,7 @@ LibDialog::LibDialog( Window* pParent ) aReferenceBox( this, IDEResId( RID_CB_REF ) ), aReplaceBox( this, IDEResId( RID_CB_REPL ) ) { - SetText( ResId::toString( IDEResId( RID_STR_APPENDLIBS ) ) ); + SetText( IDE_RESSTR(RID_STR_APPENDLIBS) ); FreeResource(); } @@ -944,7 +944,7 @@ LibDialog::~LibDialog() void LibDialog::SetStorageName( const ::rtl::OUString& rName ) { - ::rtl::OUString aName( ResId::toString( IDEResId( RID_STR_FILENAME ) ) ); + ::rtl::OUString aName( IDE_RESSTR(RID_STR_FILENAME) ); aName += rName; aStorageName.SetText( aName ); } @@ -1011,7 +1011,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, if( pBasic && rDocument.isInVBAMode() ) { // add the new module in the "Modules" entry - SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, ResId::toString( IDEResId( RID_STR_NORMAL_MODULES ) ) , OBJ_TYPE_NORMAL_MODULES ); + SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES ); if( pLibSubEntry ) { if( !rBasicBox.IsExpanded( pLibSubEntry ) ) @@ -1040,7 +1040,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, catch (const container::ElementExistException& ) { ErrorBox( pWin, WB_OK | WB_DEF_OK, - ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) ).Execute(); + IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2) ).Execute(); } catch (const container::NoSuchElementException& ) { diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index a3bde8850d83..228b49b78522 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -1522,9 +1522,9 @@ namespace basctl { switch ( _eType ) { - case LIBRARY_TYPE_MODULE: aTitle = ResId::toString( IDEResId( RID_STR_USERMACROS ) ); break; - case LIBRARY_TYPE_DIALOG: aTitle = ResId::toString( IDEResId( RID_STR_USERDIALOGS ) ); break; - case LIBRARY_TYPE_ALL: aTitle = ResId::toString( IDEResId( RID_STR_USERMACROSDIALOGS ) ); break; + case LIBRARY_TYPE_MODULE: aTitle = IDE_RESSTR(RID_STR_USERMACROS); break; + case LIBRARY_TYPE_DIALOG: aTitle = IDE_RESSTR(RID_STR_USERDIALOGS); break; + case LIBRARY_TYPE_ALL: aTitle = IDE_RESSTR(RID_STR_USERMACROSDIALOGS); break; default: break; } @@ -1533,9 +1533,9 @@ namespace basctl { switch ( _eType ) { - case LIBRARY_TYPE_MODULE: aTitle = ResId::toString( IDEResId( RID_STR_SHAREMACROS ) ); break; - case LIBRARY_TYPE_DIALOG: aTitle = ResId::toString( IDEResId( RID_STR_SHAREDIALOGS ) ); break; - case LIBRARY_TYPE_ALL: aTitle = ResId::toString( IDEResId( RID_STR_SHAREMACROSDIALOGS ) ); break; + case LIBRARY_TYPE_MODULE: aTitle = IDE_RESSTR(RID_STR_SHAREMACROS); break; + case LIBRARY_TYPE_DIALOG: aTitle = IDE_RESSTR(RID_STR_SHAREDIALOGS); break; + case LIBRARY_TYPE_ALL: aTitle = IDE_RESSTR(RID_STR_SHAREMACROSDIALOGS); break; default: break; } diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 1941df09d8db..a66c95b8e4e5 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -797,7 +797,7 @@ sal_Bool DlgEdObj::supportsService( const sal_Char* _pServiceName ) const if (nResId) { - aDefaultName = ResId::toString(IDEResId(nResId)); + aDefaultName = IDE_RESSTR(nResId); } return aDefaultName; diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 856d523154d3..ccdb32ff26c5 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -98,9 +98,9 @@ ManageLanguageDialog::ManageLanguageDialog( Window* pParent, boost::shared_ptr<L m_aHelpBtn ( this, IDEResId( PB_HELP ) ), m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ), m_pLocalizationMgr ( _pLMgr ), - m_sDefLangStr (ResId::toString(IDEResId(STR_DEF_LANG))), - m_sDeleteStr (ResId::toString(IDEResId(STR_DELETE))), - m_sCreateLangStr (ResId::toString(IDEResId(STR_CREATE_LANG))) + m_sDefLangStr (IDE_RESSTR(STR_DEF_LANG)), + m_sDeleteStr (IDE_RESSTR(STR_DELETE)), + m_sCreateLangStr (IDE_RESSTR(STR_CREATE_LANG)) { FreeResource(); @@ -306,9 +306,9 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, boost::shar // change to "Add Interface Language" mode SetHelpId( HID_BASICIDE_ADDNEW_LANGUAGE ); m_pCheckLangLB = new SvxCheckListBox( this, IDEResId( LB_ADD_LANGUAGE ) ); - SetText( ResId::toString( IDEResId( STR_ADDLANG_TITLE ) ) ); - m_aLanguageFT.SetText( ResId::toString( IDEResId( STR_ADDLANG_LABEL ) ) ); - m_aInfoFT.SetText( ResId::toString( IDEResId( STR_ADDLANG_INFO ) ) ); + SetText( IDE_RESSTR(STR_ADDLANG_TITLE) ); + m_aLanguageFT.SetText( IDE_RESSTR(STR_ADDLANG_LABEL) ); + m_aInfoFT.SetText( IDE_RESSTR(STR_ADDLANG_INFO) ); } FreeResource(); diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 3dddfbc4fa7e..0ffda09dcea8 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -324,8 +324,8 @@ void PropBrw::implSetNewObjectSequence { xObjectInspector->inspect( _rObjectSeq ); - ::rtl::OUString aText = ResId::toString(IDEResId(RID_STR_BRWTITLE_PROPERTIES)); - aText += ResId::toString(IDEResId(RID_STR_BRWTITLE_MULTISELECT)); + ::rtl::OUString aText = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES); + aText += IDE_RESSTR(RID_STR_BRWTITLE_MULTISELECT); SetText( aText ); } } @@ -354,7 +354,7 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject ) if (xServiceInfo.is()) // single selection { sal_uInt16 nResId = 0; - aName = ResId::toString(IDEResId(RID_STR_BRWTITLE_PROPERTIES)); + aName = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES); if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ) ) { @@ -447,12 +447,12 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject ) if (nResId) { - aName += ResId::toString(IDEResId(nResId)); + aName += IDE_RESSTR(nResId); } } else if (!_rxObject.is()) // no properties { - aName = ResId::toString(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES)); + aName = IDE_RESSTR(RID_STR_BRWTITLE_NO_PROPERTIES); } return aName; diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx index c9a72affaa00..4487c6aeaa83 100644 --- a/basctl/source/inc/iderid.hxx +++ b/basctl/source/inc/iderid.hxx @@ -37,6 +37,7 @@ public: IDEResId( sal_uInt16 nId ); }; +#define IDE_RESSTR(x) IDEResId(x).toString() #endif //_IDERID_HXX diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index cff38eeb610b..0c38dc020f05 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -591,7 +591,7 @@ void DataBrowser::RenewTable() InsertHandleColumn( static_cast< sal_uInt16 >( GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() )); - OUString aDefaultSeriesName( ::chart::SchResId::getResString( STR_COLUMN_LABEL )); + OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL)); replaceParamterInString( aDefaultSeriesName, C2U("%COLUMNNUMBER"), OUString::valueOf( sal_Int32(24) ) ); sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName ) + GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X(); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 7bce2ca29d2a..b4f5906ac4b0 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -381,81 +381,81 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, switch (eObjectType) { case OBJECTTYPE_TITLE: - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER))); - AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); - AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); - AddTabPage(TP_ALIGNMENT, ResId::toString(SchResId(STR_PAGE_ALIGNMENT)), SchAlignmentTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER)); + AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA)); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY)); + AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT)); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS)); + AddTabPage(TP_ALIGNMENT, SCH_RESSTR(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::Create, NULL); if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN))); + AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN)); break; case OBJECTTYPE_LEGEND: - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER))); - AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); - AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); - AddTabPage(TP_LEGEND_POS, ResId::toString(SchResId(STR_PAGE_POSITION)), SchLegendPosTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER)); + AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA)); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY)); + AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT)); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS)); + AddTabPage(TP_LEGEND_POS, SCH_RESSTR(STR_PAGE_POSITION), SchLegendPosTabPage::Create, NULL); if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN))); + AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN)); break; case OBJECTTYPE_DATA_SERIES: case OBJECTTYPE_DATA_POINT: if( m_pParameter->ProvidesSecondaryYAxis() || m_pParameter->ProvidesOverlapAndGapWidth() || m_pParameter->ProvidesMissingValueTreatments() ) - AddTabPage(TP_OPTIONS, ResId::toString(SchResId(STR_PAGE_OPTIONS)),SchOptionTabPage::Create, NULL); + AddTabPage(TP_OPTIONS, SCH_RESSTR(STR_PAGE_OPTIONS),SchOptionTabPage::Create, NULL); if( m_pParameter->ProvidesStartingAngle()) - AddTabPage(TP_POLAROPTIONS, ResId::toString(SchResId(STR_PAGE_OPTIONS)),PolarOptionsTabPage::Create, NULL); + AddTabPage(TP_POLAROPTIONS, SCH_RESSTR(STR_PAGE_OPTIONS),PolarOptionsTabPage::Create, NULL); if( m_pParameter->HasGeometryProperties() ) - AddTabPage(TP_LAYOUT, ResId::toString(SchResId(STR_PAGE_LAYOUT)),SchLayoutTabPage::Create, NULL); + AddTabPage(TP_LAYOUT, SCH_RESSTR(STR_PAGE_LAYOUT),SchLayoutTabPage::Create, NULL); if(m_pParameter->HasAreaProperties()) { - AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); + AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA)); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY)); } - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE ))); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE )); break; case OBJECTTYPE_DATA_LABEL: case OBJECTTYPE_DATA_LABELS: - AddTabPage(TP_DATA_DESCR, ResId::toString(SchResId(STR_OBJECT_DATALABELS)), DataLabelsTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); + AddTabPage(TP_DATA_DESCR, SCH_RESSTR(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT)); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS)); if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN))); + AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN)); break; case OBJECTTYPE_AXIS: { if( m_pParameter->HasScaleProperties() ) - AddTabPage(TP_SCALE, ResId::toString(SchResId(STR_PAGE_SCALE)), ScaleTabPage::Create, NULL); + AddTabPage(TP_SCALE, SCH_RESSTR(STR_PAGE_SCALE), ScaleTabPage::Create, NULL); if( m_pParameter->HasScaleProperties() )//no positioning page for z axes so far as the tickmarks are not shown so far - AddTabPage(TP_AXIS_POSITIONS, ResId::toString(SchResId(STR_PAGE_POSITIONING)), AxisPositionsTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); - AddTabPage(TP_AXIS_LABEL, ResId::toString(SchResId(STR_OBJECT_LABEL)), SchAxisLabelTabPage::Create, NULL); + AddTabPage(TP_AXIS_POSITIONS, SCH_RESSTR(STR_PAGE_POSITIONING), AxisPositionsTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE)); + AddTabPage(TP_AXIS_LABEL, SCH_RESSTR(STR_OBJECT_LABEL), SchAxisLabelTabPage::Create, NULL); if( m_pParameter->HasNumberProperties() ) - AddTabPage(RID_SVXPAGE_NUMBERFORMAT, ResId::toString(SchResId(STR_PAGE_NUMBERS))); - AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); + AddTabPage(RID_SVXPAGE_NUMBERFORMAT, SCH_RESSTR(STR_PAGE_NUMBERS)); + AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT)); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS)); if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN))); + AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN)); break; } case OBJECTTYPE_DATA_ERRORS_X: - AddTabPage(TP_XERRORBAR, ResId::toString(SchResId(STR_PAGE_XERROR_BARS)), ErrorBarsTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); + AddTabPage(TP_XERRORBAR, SCH_RESSTR(STR_PAGE_XERROR_BARS), ErrorBarsTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE)); break; case OBJECTTYPE_DATA_ERRORS_Y: - AddTabPage(TP_YERRORBAR, ResId::toString(SchResId(STR_PAGE_YERROR_BARS)), ErrorBarsTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); + AddTabPage(TP_YERRORBAR, SCH_RESSTR(STR_PAGE_YERROR_BARS), ErrorBarsTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE)); break; case OBJECTTYPE_DATA_ERRORS_Z: @@ -465,12 +465,12 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, case OBJECTTYPE_SUBGRID: case OBJECTTYPE_DATA_AVERAGE_LINE: case OBJECTTYPE_DATA_STOCK_RANGE: - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE)); break; case OBJECTTYPE_DATA_CURVE: - AddTabPage(TP_TRENDLINE, ResId::toString(SchResId(STR_PAGE_TRENDLINE_TYPE)), TrendlineTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); + AddTabPage(TP_TRENDLINE, SCH_RESSTR(STR_PAGE_TRENDLINE_TYPE), TrendlineTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE)); break; case OBJECTTYPE_DATA_STOCK_LOSS: @@ -479,9 +479,9 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, case OBJECTTYPE_DIAGRAM_FLOOR: case OBJECTTYPE_DIAGRAM_WALL: case OBJECTTYPE_DIAGRAM: - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER))); - AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER)); + AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA)); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY)); break; case OBJECTTYPE_LEGEND_ENTRY: @@ -490,17 +490,17 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, // nothing break; case OBJECTTYPE_DATA_CURVE_EQUATION: - AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER))); - AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); - AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); - AddTabPage(RID_SVXPAGE_NUMBERFORMAT, ResId::toString(SchResId(STR_PAGE_NUMBERS))); + AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER)); + AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA)); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY)); + AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT)); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS)); + AddTabPage(RID_SVXPAGE_NUMBERFORMAT, SCH_RESSTR(STR_PAGE_NUMBERS)); if( SvtLanguageOptions().IsCTLFontEnabled() ) /* When rotation is supported for equation text boxes, use SchAlignmentTabPage::Create here. The special SchAlignmentTabPage::CreateWithoutRotation can be deleted. */ - AddTabPage(TP_ALIGNMENT, ResId::toString(SchResId(STR_PAGE_ALIGNMENT)), SchAlignmentTabPage::CreateWithoutRotation, NULL); + AddTabPage(TP_ALIGNMENT, SCH_RESSTR(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::CreateWithoutRotation, NULL); break; default: break; diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index c9395eb0751b..029bc92e5933 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -83,7 +83,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment() } void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const { - rStr = ResId::toString(SchResId(STR_STATUS_PIE_SEGMENT_EXPLODED)); + rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED); rStr.SearchAndReplaceAscii( "%PERCENTVALUE", rtl::OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); } bool DragMethod_PieSegment::BeginSdrDrag() diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx index 2e11182cff85..79ef5a180340 100644 --- a/chart2/source/inc/ResId.hxx +++ b/chart2/source/inc/ResId.hxx @@ -39,10 +39,10 @@ class OOO_DLLPUBLIC_CHARTTOOLS SchResId : public ResId { public: SchResId( sal_Int16 nId ); - - static ::rtl::OUString getResString( sal_Int16 nId ); }; +#define SCH_RESSTR(x) SchResId(x).toString() + } // namespace chart // CHART2_RESID_HXX diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 7ed4efbc32ed..01f605d3bfae 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -105,8 +105,8 @@ void InternalData::createDefaultData() m_nColumnCount = nColumnCount; const sal_Int32 nSize = nColumnCount * nRowCount; // @todo: localize this! - const OUString aRowName( ::chart::SchResId::getResString( STR_ROW_LABEL )); - const OUString aColName( ::chart::SchResId::getResString( STR_COLUMN_LABEL )); + const OUString aRowName(SCH_RESSTR(STR_ROW_LABEL)); + const OUString aColName(SCH_RESSTR(STR_COLUMN_LABEL)); m_aData.resize( nSize ); for( sal_Int32 i=0; i<nSize; ++i ) diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 3988da4fac95..d445c7fb2a9e 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -585,23 +585,23 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR OUString aServiceName( xServiceName->getServiceName()); if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" ) { - aResult = ::chart::SchResId::getResString( STR_REGRESSION_MEAN ); + aResult = SCH_RESSTR(STR_REGRESSION_MEAN); } else if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) { - aResult = ::chart::SchResId::getResString( STR_REGRESSION_LINEAR ); + aResult = SCH_RESSTR(STR_REGRESSION_LINEAR); } else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" ) { - aResult = ::chart::SchResId::getResString( STR_REGRESSION_LOG ); + aResult = SCH_RESSTR(STR_REGRESSION_LOG); } else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" ) { - aResult = ::chart::SchResId::getResString( STR_REGRESSION_EXP ); + aResult = SCH_RESSTR(STR_REGRESSION_EXP); } else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" ) { - aResult = ::chart::SchResId::getResString( STR_REGRESSION_POWER ); + aResult = SCH_RESSTR(STR_REGRESSION_POWER); } return aResult; diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index 25fa256f56ac..665e87c99b76 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -34,14 +34,10 @@ namespace chart { -SchResId::SchResId( sal_Int16 nId ) + SchResId::SchResId( sal_Int16 nId ) : ResId( nId, RessourceManager::getRessourceManager() ) -{} - -::rtl::OUString SchResId::getResString( sal_Int16 nId ) -{ - return String( SchResId( nId )); -} + { + } } // namespace chart diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 21473b70a972..1667ea11e4d7 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -78,7 +78,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ), aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ), aCancelButton ( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ), - aVersionTextStr(ResId::toString(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())).trim()), + m_aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr()).toString().trim()), m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())), m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())), m_aBasedTextStr(ResId(ABOUT_STR_BASED, *rId.GetResMgr())), @@ -86,7 +86,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : m_aWebsiteLinkStr(ResId( ABOUT_STR_LINK_WEBSITE, *rId.GetResMgr())), m_aCreditsLinkStr(ResId( ABOUT_STR_LINK_CREDITS, *rId.GetResMgr())), m_aLicenseLinkStr(ResId( ABOUT_STR_LINK_LICENSE, *rId.GetResMgr())), - m_sBuildStr(ResId::toString(ResId(ABOUT_STR_BUILD, *rId.GetResMgr()))), + m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr())), m_aDescriptionTextStr(ResId(ABOUT_STR_DESCRIPTION, *rId.GetResMgr())) { // Populate text items @@ -368,7 +368,7 @@ rtl::OUString AboutDialog::GetBuildId() rtl::OUString AboutDialog::GetVersionString() { - rtl::OUString sVersion = aVersionTextStr; + rtl::OUString sVersion = m_aVersionTextStr; rtl::OUString sBuildId = GetBuildId(); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 279dba93d665..643f6d6432dd 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -50,8 +50,8 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ), aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ), aPosFL( this, CUI_RES( FL_POS ) ), - aRow(ResId::toString(CUI_RES(STR_ROW))), - aCol(ResId::toString(CUI_RES(STR_COL))), + aRow(CUI_RESSTR(STR_ROW)), + aCol(CUI_RESSTR(STR_COL)), aOKBtn( this, CUI_RES( BT_OK ) ), aCancelBtn( this, CUI_RES( BT_CANCEL ) ), aHelpBtn( this, CUI_RES( BT_HELP ) ), diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index a666c1a3991b..fb876a5efd56 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -57,7 +57,7 @@ private: CancelButton aCancelButton; String aVersionData; - rtl::OUString aVersionTextStr; + rtl::OUString m_aVersionTextStr; String m_aVendorTextStr; String m_aCopyrightTextStr; String m_aBasedTextStr; diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx index 9737fbb6419a..a2e33d4c46f5 100644 --- a/cui/source/inc/dialmgr.hxx +++ b/cui/source/inc/dialmgr.hxx @@ -36,7 +36,7 @@ #define CUI_MGR() (*CuiResMgr::GetResMgr()) #define CUI_RES(i) ResId(i,CUI_MGR()) -#define CUI_RESSTR(i) ResId::toString(ResId(i,CUI_MGR())) +#define CUI_RESSTR(i) CUI_RES(i).toString() class ResMgr; struct CuiResMgr diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index b2201255d04b..417ab1f98191 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -55,8 +55,8 @@ CertPathDialog::CertPathDialog( Window* pParent ) : , m_aOKBtn ( this, CUI_RES( PB_OK ) ) , m_aCancelBtn ( this, CUI_RES( PB_CANCEL ) ) , m_aHelpBtn ( this, CUI_RES( PB_HELP ) ) - , m_sAddDialogText(ResId::toString(CUI_RES(STR_ADDDLGTEXT))) - , m_sManual(ResId::toString(CUI_RES(STR_MANUAL))) + , m_sAddDialogText(CUI_RESSTR(STR_ADDDLGTEXT)) + , m_sManual(CUI_RESSTR(STR_MANUAL)) { static long aStaticTabs[]= { @@ -65,8 +65,8 @@ CertPathDialog::CertPathDialog( Window* pParent ) : m_aCertPathList.SvxSimpleTable::SetTabs( aStaticTabs ); - rtl::OUString sProfile(ResId::toString(CUI_RES(STR_PROFILE))); - rtl::OUString sDirectory(ResId::toString(CUI_RES(STR_DIRECTORY))); + rtl::OUString sProfile(CUI_RESSTR(STR_PROFILE)); + rtl::OUString sDirectory(CUI_RESSTR(STR_DIRECTORY)); rtl::OUStringBuffer sHeader; sHeader.append('\t').append(sProfile).append('\t').append(sDirectory); diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 1013551b167f..16126b154e4a 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -254,9 +254,8 @@ namespace dbmm ::rtl::OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument ) { ::rtl::OUString sObjectName( - ResId::toString( MacroMigrationResId( - _rDocument.eType == eForm ? STR_FORM : STR_REPORT)). + _rDocument.eType == eForm ? STR_FORM : STR_REPORT).toString(). replaceFirst("$name$", _rDocument.sHierarchicalName)); return sObjectName; } @@ -1028,7 +1027,7 @@ namespace dbmm // initialize global progress sal_Int32 nOverallRange( m_aSubDocs.size() ); rtl::OUString sProgressSkeleton( - ResId::toString(MacroMigrationResId( STR_OVERALL_PROGRESS)). + MacroMigrationResId( STR_OVERALL_PROGRESS).toString(). replaceFirst("$overall$", rtl::OUString::valueOf(nOverallRange))); m_rProgress.start( nOverallRange ); @@ -1157,7 +1156,7 @@ namespace dbmm // ----------------- // migrate the libraries - ProgressDelegator aDelegator(m_rProgress, sObjectName, ResId::toString(MacroMigrationResId(STR_MIGRATING_LIBS))); + ProgressDelegator aDelegator(m_rProgress, sObjectName, MacroMigrationResId(STR_MIGRATING_LIBS).toString()); ProgressMixer aProgressMixer( aDelegator ); aProgressMixer.registerPhase( PHASE_JAVASCRIPT, 1 ); aProgressMixer.registerPhase( PHASE_BEANSHELL, 1 ); @@ -1930,7 +1929,7 @@ namespace dbmm { // a human-readable description of the affected library ::rtl::OUString sLibraryDescription( - ResId::toString(MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME)). + MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME).toString(). replaceFirst("$type$", getScriptTypeDisplayName(_eScriptType)). replaceFirst("$library$", _rLibraryName)); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index bd30c2b78ba3..58c01e42577f 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2179,7 +2179,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->setOrder(::rtl::OUString()); xParser->appendOrderByColumn(xField, bSortUp), bParserSuccess, - ResId::toString(ModuleRes(SBA_BROWSER_SETTING_ORDER)), + ModuleRes(SBA_BROWSER_SETTING_ORDER).toString(), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) @@ -2251,7 +2251,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendHavingClauseByColumn(xField,sal_True,nOp), bParserSuccess, - ResId::toString(ModuleRes(SBA_BROWSER_SETTING_FILTER)), + ModuleRes(SBA_BROWSER_SETTING_FILTER).toString(), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } @@ -2260,7 +2260,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendFilterByColumn(xField,sal_True,nOp), bParserSuccess, - ResId::toString(ModuleRes(SBA_BROWSER_SETTING_FILTER)), + ModuleRes(SBA_BROWSER_SETTING_FILTER).toString(), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx index bc2e08e57039..b8faa7fa7d54 100644 --- a/desktop/source/deployment/gui/dp_gui_shared.hxx +++ b/desktop/source/deployment/gui/dp_gui_shared.hxx @@ -50,6 +50,8 @@ public: DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {} }; +#define DPGUI_RESSTR(i) DpGuiResId(i).toString() + } // namespace dp_gui #endif diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index f7dbbfb0e401..f7dbd0405560 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -530,18 +530,18 @@ UpdateDialog::UpdateDialog( m_help(this, DpGuiResId(RID_DLG_UPDATE_HELP)), m_ok(this, DpGuiResId(RID_DLG_UPDATE_OK)), m_close(this, DpGuiResId(RID_DLG_UPDATE_CLOSE)), - m_error(ResId::toString(DpGuiResId(RID_DLG_UPDATE_ERROR))), - m_none(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NONE))), - m_noInstallable(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))), - m_failure(ResId::toString(DpGuiResId(RID_DLG_UPDATE_FAILURE))), - m_unknownError(ResId::toString(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR))), - m_noDescription(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION))), - m_noInstall(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NOINSTALL))), - m_noDependency(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY))), - m_noDependencyCurVer(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))), - m_browserbased(ResId::toString(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))), - m_version(ResId::toString(DpGuiResId(RID_DLG_UPDATE_VERSION))), - m_ignoredUpdate(ResId::toString(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))), + m_error(DPGUI_RESSTR(RID_DLG_UPDATE_ERROR)), + m_none(DPGUI_RESSTR(RID_DLG_UPDATE_NONE)), + m_noInstallable(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALLABLE)), + m_failure(DPGUI_RESSTR(RID_DLG_UPDATE_FAILURE)), + m_unknownError(DPGUI_RESSTR(RID_DLG_UPDATE_UNKNOWNERROR)), + m_noDescription(DPGUI_RESSTR(RID_DLG_UPDATE_NODESCRIPTION)), + m_noInstall(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALL)), + m_noDependency(DPGUI_RESSTR(RID_DLG_UPDATE_NODEPENDENCY)), + m_noDependencyCurVer(DPGUI_RESSTR(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)), + m_browserbased(DPGUI_RESSTR(RID_DLG_UPDATE_BROWSERBASED)), + m_version(DPGUI_RESSTR(RID_DLG_UPDATE_VERSION)), + m_ignoredUpdate(DPGUI_RESSTR(RID_DLG_UPDATE_IGNORED_UPDATE)), m_updateData(*updateData), m_thread( new UpdateDialog::Thread( @@ -619,9 +619,9 @@ short UpdateDialog::Execute() { UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource, Image const & normalStaticImage ): SvxCheckListBox( &dialog, resource, normalStaticImage ), - m_ignoreUpdate( ResId::toString( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ), - m_ignoreAllUpdates( ResId::toString( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ), - m_enableUpdate( ResId::toString( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ), + m_ignoreUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE ) ), + m_ignoreAllUpdates( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE_ALL ) ), + m_enableUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_ENABLE ) ), m_dialog(dialog) {} diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index e7de531dd995..2f2823742aa4 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -95,8 +95,7 @@ rtl::OUString produceErrorText( { return reason.replaceFirst("%VERSION", (version.isEmpty() - ? ResId::toString( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN)) + ? dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN).toString() : version)); } @@ -167,22 +166,19 @@ rtl::OUString getErrorText( if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg ) { return produceErrorText( - ResId::toString( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN)), + dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN).toString(), dependency->getAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))); } else if (dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == maximalVersionOpenOfficeOrg ) { return produceErrorText( - ResId::toString( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX)), + dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX).toString(), dependency->getAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))); } else if (dependency->getNamespaceURI() == namespaceLibreOffice && dependency->getTagName() == minimalVersionLibreOffice ) { return produceErrorText( - ResId::toString( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN)), + dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN).toString(), dependency->getAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))); } else if (dependency->hasAttributeNS( @@ -193,16 +189,14 @@ rtl::OUString getErrorText( minimalVersionOpenOfficeOrg)))) { return produceErrorText( - ResId::toString( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN)), + dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN).toString(), dependency->getAttributeNS( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(namespaceOpenOfficeOrg)), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(minimalVersionOpenOfficeOrg)))); } else { - return ResId::toString( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN)); + return dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN).toString(); } } diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx index de50d7b923f9..d4a0eb659e6d 100644 --- a/editeng/inc/editeng/eerdll.hxx +++ b/editeng/inc/editeng/eerdll.hxx @@ -57,7 +57,7 @@ public: #define EE_DLL() EditDLL::Get() -#define EE_RESSTR(x) ResId::toString(EditResId(x)) +#define EE_RESSTR(x) EditResId(x).toString() #endif //_EERDLL_HXX diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx index a54be72cde4f..a5e3c66dde0c 100644 --- a/editeng/inc/editeng/itemtype.hxx +++ b/editeng/inc/editeng/itemtype.hxx @@ -57,7 +57,7 @@ EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit ); inline String GetBoolString( sal_Bool bVal ) { - return String( EditResId( bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE ) ); + return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE); } // ----------------------------------------------------------------------- diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index d6ae16f342d6..08072a628d9a 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -169,7 +169,7 @@ namespace accessibility SolarMutexGuard aGuard; // Get the string from the resource for the specified id. - return ::rtl::OUString( String( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) ) ); + return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION); } ::rtl::OUString SAL_CALL AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException) @@ -179,7 +179,7 @@ namespace accessibility SolarMutexGuard aGuard; // Get the string from the resource for the specified id. - return ::rtl::OUString( String ( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) ) ); + return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_NAME); } uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException) diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 6772ec9d6224..05bc89956f21 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2677,12 +2677,12 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const case EDITUNDO_DELCONTENT: case EDITUNDO_DELETE: case EDITUNDO_CUT: - aComment = XubString( EditResId( RID_EDITUNDO_DEL ) ); + aComment = EE_RESSTR(RID_EDITUNDO_DEL); break; case EDITUNDO_MOVEPARAGRAPHS: case EDITUNDO_MOVEPARAS: case EDITUNDO_DRAGANDDROP: - aComment = XubString( EditResId( RID_EDITUNDO_MOVE ) ); + aComment = EE_RESSTR(RID_EDITUNDO_MOVE); break; case EDITUNDO_INSERTFEATURE: case EDITUNDO_SPLITPARA: @@ -2690,29 +2690,29 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const case EDITUNDO_PASTE: case EDITUNDO_INSERT: case EDITUNDO_READ: - aComment = XubString( EditResId( RID_EDITUNDO_INSERT ) ); + aComment = EE_RESSTR(RID_EDITUNDO_INSERT); break; case EDITUNDO_SRCHANDREPL: case EDITUNDO_REPLACEALL: - aComment = XubString( EditResId( RID_EDITUNDO_REPLACE ) ); + aComment = EE_RESSTR(RID_EDITUNDO_REPLACE); break; case EDITUNDO_ATTRIBS: case EDITUNDO_PARAATTRIBS: case EDITUNDO_STRETCH: - aComment = XubString( EditResId( RID_EDITUNDO_SETATTRIBS ) ); + aComment = EE_RESSTR(RID_EDITUNDO_SETATTRIBS); break; case EDITUNDO_RESETATTRIBS: - aComment = XubString( EditResId( RID_EDITUNDO_RESETATTRIBS ) ); + aComment = EE_RESSTR(RID_EDITUNDO_RESETATTRIBS); break; case EDITUNDO_STYLESHEET: - aComment = XubString( EditResId( RID_EDITUNDO_SETSTYLE ) ); + aComment = EE_RESSTR(RID_EDITUNDO_SETSTYLE); break; case EDITUNDO_TRANSLITERATE: - aComment = XubString( EditResId( RID_EDITUNDO_TRANSLITERATE ) ); + aComment = EE_RESSTR(RID_EDITUNDO_TRANSLITERATE); break; case EDITUNDO_INDENTBLOCK: case EDITUNDO_UNINDENTBLOCK: - aComment = XubString( EditResId( RID_EDITUNDO_INDENT ) ); + aComment = EE_RESSTR(RID_EDITUNDO_INDENT); break; } return aComment; diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index ffe228523bc6..9e0fd274ec14 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -966,9 +966,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) aPopupMenu.InsertSeparator(); String aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) ); String aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) ); - String aWordStr( EditResId( RID_STR_WORD ) ); + String aWordStr( EE_RESSTR( RID_STR_WORD ) ); aWordStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpWord ); - String aParaStr( EditResId( RID_STR_PARAGRAPH ) ); + String aParaStr( EE_RESSTR( RID_STR_PARAGRAPH ) ); aParaStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpPara ); aPopupMenu.InsertItem( MN_WORDLANGUAGE, aWordStr ); aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE ); diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index fcfe3c8a8b07..4ea6a97a1583 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -165,10 +165,10 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: { rText += String::CreateFromInt32( nMinLead ); - rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINLEAD ) ); + rText += EE_RESSTR( RID_SVXITEMS_HYPHEN_MINLEAD ); rText += ','; rText += String::CreateFromInt32( nMinTrail ); - rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINTRAIL ) ); + rText += EE_RESSTR( RID_SVXITEMS_HYPHEN_MINTRAIL ); return ePres; } default: diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index cb8db177bb3f..a552ec990977 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -93,7 +93,7 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: - rText = String( EditResId( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() ) ); + rText = EE_RESSTR(RID_SVXITEMS_FRMDIR_BEGIN + GetValue()); break; default: diff --git a/fpicker/source/office/fpsofficeResMgr.hxx b/fpicker/source/office/fpsofficeResMgr.hxx index 1318a29b3831..f3ef1edb4d79 100644 --- a/fpicker/source/office/fpsofficeResMgr.hxx +++ b/fpicker/source/office/fpsofficeResMgr.hxx @@ -55,6 +55,8 @@ namespace }; } +#define SVT_RESSTR(i) SvtResId(i).toString() + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index ce350e0658c0..64797c5c69b9 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -3015,7 +3015,7 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE ); } - _pImp->_pPlaces = new PlacesListBox( this, ResId::toString( SvtResId( STR_PLACES_TITLE ) ), SvtResId( LB_EXPLORERFILE_PLACES_LISTBOX ) ); + _pImp->_pPlaces = new PlacesListBox( this, SVT_RESSTR(STR_PLACES_TITLE), SvtResId(LB_EXPLORERFILE_PLACES_LISTBOX) ); initDefaultPlaces(); } @@ -3343,7 +3343,7 @@ void SvtFileDialog::appendDefaultExtension(String& _rFileName, void SvtFileDialog::initDefaultPlaces( ) { - PlacePtr pRootPlace( new Place( ResId::toString( SvtResId( STR_DEFAULT_DIRECTORY ) ), GetStandardDir() ) ); + PlacePtr pRootPlace( new Place( SVT_RESSTR(STR_DEFAULT_DIRECTORY), GetStandardDir() ) ); _pImp->_pPlaces->AppendPlace( pRootPlace ); // Load from user settings diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index c726ed213a23..31c61779fb39 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -43,6 +43,8 @@ class FWE_DLLPUBLIC FwkResId : public ResId static ResMgr* GetResManager(); }; +#define FWK_RESSTR(x) FwkResId(x).toString() + } #endif // __FRAMEWORK_CLASSES_FWKRESID diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index fecbf6a5202c..610eef195427 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3483,8 +3483,8 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) //----------------------------------------------- void AutoRecovery::impl_showFullDiscError() { - rtl::OUString sBtn(ResId::toString(FwkResId(STR_FULL_DISC_RETRY_BUTTON))); - rtl::OUString sMsg(ResId::toString(FwkResId(STR_FULL_DISC_MSG))); + rtl::OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON)); + rtl::OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG)); rtl::OUString sBackupURL(SvtPathOptions().GetBackupPath()); INetURLObject aConverter(sBackupURL); diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx index 7cb8136f2081..ecd059e5a156 100644 --- a/sc/inc/scresid.hxx +++ b/sc/inc/scresid.hxx @@ -40,7 +40,7 @@ class SC_DLLPUBLIC ScResId : public ResId ScResId( sal_uInt16 nId ); // in scdll.cxx }; - +#define SC_RESSTR(x) ScResId(x).toString() #endif // SC_SCRESMGR_HXX diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index a3ae9abdaa06..b6abe7d512ab 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1081,7 +1081,7 @@ void ScDPObject::FillPageList( std::vector<rtl::OUString>& rStrings, long nField } // add "-all-" entry to the top (unsorted) - rStrings.insert(rStrings.begin(), ScResId::toString(ScResId(SCSTR_ALL))); + rStrings.insert(rStrings.begin(), SC_RESSTR(SCSTR_ALL)); } void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHeaderData& rData) diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 875371f94c9b..544fb9ddef56 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -1005,7 +1005,7 @@ void ScDPOutput::Output() if ( pPageFields[nField].aResult.getLength() == 1 ) aPageValue = pPageFields[nField].aResult[0].Caption; else - aPageValue = ScResId::toString(ScResId(SCSTR_ALL)); //! separate string? + aPageValue = SC_RESSTR(SCSTR_ALL); //! separate string? pDoc->SetString( nFldCol, nHdrRow, nTab, aPageValue ); diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 4175effc7d25..8a0217200be8 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -787,7 +787,7 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula:: SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) ); SAL_WNODEPRECATED_DECLARATIONS_POP - return ResId::toString(ScResId(static_cast<sal_uInt16>(_nCategoryNumber))); + return SC_RESSTR(static_cast<sal_uInt16>(_nCategoryNumber)); } sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToken _eToken) const @@ -866,7 +866,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) } pDesc->pFuncName = new ::rtl::OUString( ScCompiler::GetNativeSymbol( static_cast<OpCode>( aRes.GetId()))); - pDesc->pFuncDesc = new ::rtl::OUString( ResId::toString(ScResId(1))); + pDesc->pFuncDesc = new ::rtl::OUString( SC_RESSTR(1) ); if (nArgs) { @@ -874,8 +874,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) pDesc->ppDefArgDescs = new ::rtl::OUString*[nArgs]; for (sal_uInt16 i = 0; i < nArgs; ++i) { - pDesc->ppDefArgNames[i] = new ::rtl::OUString(ResId::toString(ScResId(2*(i+1) ))); - pDesc->ppDefArgDescs[i] = new ::rtl::OUString(ResId::toString(ScResId(2*(i+1)+1))); + pDesc->ppDefArgNames[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1) )); + pDesc->ppDefArgDescs[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1)+1)); } } diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 94776cee444d..cb236c6059c4 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -113,12 +113,12 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), aFtDbArea ( this, ScResId( FT_DBAREA ) ), - aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ), - aStrNone ( ResId::toString(ScResId(SCSTR_NONE)) ), - aStrEmpty ( ResId::toString(ScResId(SCSTR_EMPTY)) ), - aStrNotEmpty ( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ), - aStrRow ( ResId::toString(ScResId(SCSTR_ROW)) ), - aStrColumn ( ResId::toString(ScResId(SCSTR_COLUMN)) ), + aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), + aStrNone ( SC_RESSTR(SCSTR_NONE) ), + aStrEmpty ( SC_RESSTR(SCSTR_EMPTY) ), + aStrNotEmpty ( SC_RESSTR(SCSTR_NOTEMPTY) ), + aStrRow ( SC_RESSTR(SCSTR_ROW) ), + aStrColumn ( SC_RESSTR(SCSTR_COLUMN) ), // pOptionsMgr ( NULL ), nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), @@ -143,7 +143,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, OUStringBuffer aBuf; - OUString sAccName = ResId::toString(ScResId(RID_FILTER_OPERATOR)); + OUString sAccName = SC_RESSTR(RID_FILTER_OPERATOR); aBuf.append(sAccName); aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1")); aLbConnect1.SetAccessibleName(aBuf.makeStringAndClear()); @@ -151,7 +151,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2")); aLbConnect2.SetAccessibleName(aBuf.makeStringAndClear()); - sAccName = ResId::toString(ScResId(RID_FILTER_FIELDNAME)); + sAccName = SC_RESSTR(RID_FILTER_FIELDNAME); aBuf.append(sAccName); aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1")); aLbField1.SetAccessibleName(aBuf.makeStringAndClear()); @@ -162,7 +162,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3")); aLbField3.SetAccessibleName(aBuf.makeStringAndClear()); - sAccName = ResId::toString(ScResId(RID_FILTER_CONDITION)); + sAccName = SC_RESSTR(RID_FILTER_CONDITION); aBuf.append(sAccName); aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1")); aLbCond1.SetAccessibleName(aBuf.makeStringAndClear()); @@ -173,7 +173,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3")); aLbCond3.SetAccessibleName(aBuf.makeStringAndClear()); - sAccName = ResId::toString(ScResId(RID_FILTER_VALUE)); + sAccName = SC_RESSTR(RID_FILTER_VALUE); aBuf.append(sAccName); aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1")); aEdVal1.SetAccessibleName(aBuf.makeStringAndClear()); diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 4b2198e77198..ef4157f1f803 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -88,12 +88,12 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ), - aStrNone ( ResId::toString(ScResId(SCSTR_NONE)) ), - aStrEmpty ( ResId::toString(ScResId(SCSTR_EMPTY)) ), - aStrNotEmpty ( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ), - aStrRow ( ResId::toString(ScResId(SCSTR_ROW)) ), - aStrColumn ( ResId::toString(ScResId(SCSTR_COLUMN)) ), + aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), + aStrNone ( SC_RESSTR(SCSTR_NONE) ), + aStrEmpty ( SC_RESSTR(SCSTR_EMPTY) ), + aStrNotEmpty ( SC_RESSTR(SCSTR_NOTEMPTY) ), + aStrRow ( SC_RESSTR(SCSTR_ROW) ), + aStrColumn ( SC_RESSTR(SCSTR_COLUMN) ), // nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), theQueryData ( ((const ScQueryItem&) diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index d4217659da86..3ff9b9ccef02 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -129,8 +129,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar aBtnOptions ( this, ScResId( BTN_OPTIONS ) ), aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined (ScResId::toString(ScResId(SCSTR_UNDEFINED))), - aStrNewTable (ScResId::toString(ScResId(SCSTR_NEWTABLE))), + aStrUndefined (SC_RESSTR(SCSTR_UNDEFINED)), + aStrNewTable (SC_RESSTR(SCSTR_NEWTABLE)), bIsDrag ( false ), @@ -177,7 +177,7 @@ void ScDPLayoutDlg::Init(bool bNewOutput) aFuncNameArr.reserve( PIVOT_MAXFUNC ); for ( sal_uInt16 i = 0; i < PIVOT_MAXFUNC; ++i ) - aFuncNameArr.push_back(ScResId::toString(ScResId(i+1))); + aFuncNameArr.push_back(SC_RESSTR(i+1)); aBtnMore.AddWindow( &aFlAreas ); aBtnMore.AddWindow( &aFtInArea ); diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index ce4808b7313a..8d4e9aa36bf1 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -86,7 +86,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), aFtDbArea ( this, ScResId( FT_DBAREA ) ), - aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ), + aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 488d1a20bb34..99645044b23c 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -110,22 +110,22 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP pViewData ( ptrViewData ), pDoc ( ptrViewData->GetDocument() ), aLocalRangeName ( *(pDoc->GetRangeName()) ), - aStrInsertCols (ResId::toString(ScResId(STR_INSERT_COLS))), - aStrInsertRows (ResId::toString(ScResId(STR_INSERT_ROWS))), - aStrInsertTabs (ResId::toString(ScResId(STR_INSERT_TABS))), - aStrDeleteCols (ResId::toString(ScResId(STR_DELETE_COLS))), - aStrDeleteRows (ResId::toString(ScResId(STR_DELETE_ROWS))), - aStrDeleteTabs (ResId::toString(ScResId(STR_DELETE_TABS))), - aStrMove (ResId::toString(ScResId(STR_MOVE))), - aStrContent (ResId::toString(ScResId(STR_CONTENT))), - aStrReject (ResId::toString(ScResId(STR_REJECT))), - aStrAllAccepted (ResId::toString(ScResId(STR_ACCEPTED))), - aStrAllRejected (ResId::toString(ScResId(STR_REJECTED))), - aStrNoEntry (ResId::toString(ScResId(STR_NO_ENTRY))), - aStrContentWithChild (ResId::toString(ScResId(STR_CONTENT_WITH_CHILD))), - aStrChildContent (ResId::toString(ScResId(STR_CHILD_CONTENT))), - aStrChildOrgContent (ResId::toString(ScResId(STR_CHILD_ORGCONTENT))), - aStrEmpty (ResId::toString(ScResId(STR_EMPTY))), + aStrInsertCols (SC_RESSTR(STR_INSERT_COLS)), + aStrInsertRows (SC_RESSTR(STR_INSERT_ROWS)), + aStrInsertTabs (SC_RESSTR(STR_INSERT_TABS)), + aStrDeleteCols (SC_RESSTR(STR_DELETE_COLS)), + aStrDeleteRows (SC_RESSTR(STR_DELETE_ROWS)), + aStrDeleteTabs (SC_RESSTR(STR_DELETE_TABS)), + aStrMove (SC_RESSTR(STR_MOVE)), + aStrContent (SC_RESSTR(STR_CONTENT)), + aStrReject (SC_RESSTR(STR_REJECT)), + aStrAllAccepted (SC_RESSTR(STR_ACCEPTED)), + aStrAllRejected (SC_RESSTR(STR_REJECTED)), + aStrNoEntry (SC_RESSTR(STR_NO_ENTRY)), + aStrContentWithChild (SC_RESSTR(STR_CONTENT_WITH_CHILD)), + aStrChildContent (SC_RESSTR(STR_CHILD_CONTENT)), + aStrChildOrgContent (SC_RESSTR(STR_CHILD_ORGCONTENT)), + aStrEmpty (SC_RESSTR(STR_EMPTY)), aUnknown(RTL_CONSTASCII_USTRINGPARAM("Unknown")), bAcceptEnableFlag(true), bRejectEnableFlag(true), diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index c045587dcce5..4106f6952fc0 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -95,7 +95,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), - aErrMsgInvalidVal( ResId::toString(ScResId(STR_VALERR)) ), + aErrMsgInvalidVal( SC_RESSTR(STR_VALERR) ), rDoc ( rDocument ), theFillDir ( eFillDir ), theFillCmd ( eFillCmd ), diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index b3f30c43fe65..7c91282acfe9 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -65,9 +65,9 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault) aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), - maStrTabNameUsed( ResId::toString(ScResId(STR_TABNAME_WARN_USED)) ), - maStrTabNameEmpty( ResId::toString(ScResId(STR_TABNAME_WARN_EMPTY)) ), - maStrTabNameInvalid( ResId::toString(ScResId(STR_TABNAME_WARN_INVALID)) ), + maStrTabNameUsed( SC_RESSTR(STR_TABNAME_WARN_USED) ), + maStrTabNameEmpty( SC_RESSTR(STR_TABNAME_WARN_EMPTY) ), + maStrTabNameInvalid( SC_RESSTR(STR_TABNAME_WARN_INVALID) ), // maDefaultName( rDefault ), mnCurrentDocPos( 0 ), diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index fe383d7cba2a..3500d02898a7 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -76,7 +76,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ), maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)), maErrNameInUse ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)), - maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))), + maStrInfoDefault ( SC_RESSTR(STR_DEFAULT_INFO)), maRangeMap( aRangeMap ) { // Initialize scope list. diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 40cf4fd9fe5d..b00f54600222 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -97,8 +97,8 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ), maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)), maErrNameInUse ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)), - maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))), - maStrMultiSelect ( ResId::toString(ScResId(STR_MULTI_SELECT))), + maStrInfoDefault ( SC_RESSTR(STR_DEFAULT_INFO)), + maStrMultiSelect ( SC_RESSTR(STR_MULTI_SELECT)), // mpViewData ( ptrViewData ), mpDoc ( ptrViewData->GetDocument() ), diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 847483fb36f3..8b243dfc1319 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -705,13 +705,13 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) // Populate the menu. mpAutoFilterPopup->addMenuItem( - ScResId::toString(ScResId(SCSTR_TOP10FILTER)), true, new AutoFilterAction(this, Top10)); + SC_RESSTR(SCSTR_TOP10FILTER), true, new AutoFilterAction(this, Top10)); mpAutoFilterPopup->addMenuItem( - ScResId::toString(ScResId(SCSTR_STDFILTER)), true, new AutoFilterAction(this, Custom)); + SC_RESSTR(SCSTR_STDFILTER), true, new AutoFilterAction(this, Custom)); mpAutoFilterPopup->addMenuItem( - ScResId::toString(ScResId(SCSTR_EMPTY)), true, new AutoFilterAction(this, Empty)); + SC_RESSTR(SCSTR_EMPTY), true, new AutoFilterAction(this, Empty)); mpAutoFilterPopup->addMenuItem( - ScResId::toString(ScResId(SCSTR_NOTEMPTY)), true, new AutoFilterAction(this, NonEmpty)); + SC_RESSTR(SCSTR_NOTEMPTY), true, new AutoFilterAction(this, NonEmpty)); ScCheckListMenuWindow::Config aConfig; aConfig.mbAllowEmptySet = false; diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx index b764fc289c71..a4cc1a7eb875 100644 --- a/sd/inc/sdresid.hxx +++ b/sd/inc/sdresid.hxx @@ -38,6 +38,8 @@ public: SdResId(sal_uInt16 nId); }; +#define SD_RESSTR(x) SdResId(x).toString() + #endif /* _SD_SDRESID_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 9db2394be043..5870e83255dd 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -337,7 +337,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_ if (aURL.Len() && (aURL.GetChar(0) == 35)) { XubString aHashSlide('#'); - aHashSlide += SdResId(STR_PAGE); + aHashSlide += SD_RESSTR(STR_PAGE); if (aURL.CompareTo(aHashSlide, aHashSlide.Len()) == COMPARE_EQUAL) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index aa1a8b6c2cd6..8511f002fc1f 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2391,22 +2391,22 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO { pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) ); aString += "\n\t\t"; - aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER2 ) ); + aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER2); aString += "\n\t\t\t"; - aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER3 ) ); + aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER3); aString += "\n\t\t\t\t"; - aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER4 ) ); + aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER4); aString += "\n\t\t\t\t\t"; - aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER5 ) ); + aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER5); aString += "\n\t\t\t\t\t\t"; - aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER6 ) ); + aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER6); aString += "\n\t\t\t\t\t\t\t"; - aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER7 ) ); + aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER7); } } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 8def7218c550..b5e9f5d261e9 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -393,26 +393,26 @@ void SAL_CALL { SolarMutexGuard aGuard; - sName = ResId::toString(SdResId(SID_SD_A11Y_I_DRAWVIEW_N) ); + sName = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_N); } else { SolarMutexGuard aGuard; - sName = ResId::toString( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) ); + sName = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_N); } } else if ( sFirstService == "com.sun.star.presentation.NotesView" ) { SolarMutexGuard aGuard; - sName = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) ); + sName = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_N); } else if ( sFirstService == "com.sun.star.presentation.HandoutView" ) { SolarMutexGuard aGuard; - sName = ResId::toString( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) ); + sName = SD_RESSTR(SID_SD_A11Y_I_HANDOUTVIEW_N); } else { @@ -449,26 +449,26 @@ void SAL_CALL { SolarMutexGuard aGuard; - sDescription = ResId::toString( SdResId(SID_SD_A11Y_I_DRAWVIEW_D) ); + sDescription = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_D); } else { SolarMutexGuard aGuard; - sDescription = ResId::toString( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) ); + sDescription = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_D); } } else if ( sFirstService == "com.sun.star.presentation.NotesView" ) { SolarMutexGuard aGuard; - sDescription = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) ); + sDescription = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_D); } else if ( sFirstService == "com.sun.star.presentation.HandoutView" ) { SolarMutexGuard aGuard; - sDescription = ResId::toString( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) ); + sDescription = SD_RESSTR(SID_SD_A11Y_I_HANDOUTVIEW_D); } else { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 49623690f928..0aea780a367d 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -289,7 +289,7 @@ String SdPageObjsTLB::GetObjectName( && aRet.Len() == 0 && pObject!=NULL) { - aRet = SdResId(STR_NAVIGATOR_SHAPE_BASE_NAME); + aRet = SD_RESSTR(STR_NAVIGATOR_SHAPE_BASE_NAME); aRet.SearchAndReplaceAscii("%1", String::CreateFromInt32(pObject->GetOrdNum() + 1)); } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 9d37e453e1d2..f2d4f0e8f24d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -832,7 +832,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) String aLayoutStr; if (nSelectedPages > 0) - aPageStr = rtl::OUString(ResId::toString(SdResId(STR_SD_PAGE))); + aPageStr = SD_RESSTR(STR_SD_PAGE); if (nSelectedPages == 1) { diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 672043a7cd0a..0d1b5acf6e1d 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -751,7 +751,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) ) { // Allways show the slide/page number. - OUString aOUString = ResId::toString(SdResId( STR_SD_PAGE )); + OUString aOUString = SD_RESSTR(STR_SD_PAGE); aOUString += " "; aOUString += OUString::valueOf( maTabControl.GetCurPageId() ); aOUString += " / " ; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 2e153409b91d..b29867047b97 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -929,8 +929,8 @@ bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList, { if( mrDoc.GetObj( aNewName ) ) { - rtl::OUString aTitle( ResId::toString(SdResId( STR_TITLE_NAMEGROUP ) ) ) ; - rtl::OUString aDesc( ResId::toString(SdResId( STR_DESC_NAMEGROUP ) ) ); + rtl::OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP)); + rtl::OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP)); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); AbstractSvxNameDialog* pDlg = 0; diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index c4d38f288345..bf03889b7e8e 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -82,7 +82,7 @@ public: const char* GetClassName() const { return pName; } bool HasName() const { return 0 != aNameResId.GetId(); } rtl::OUString GetName() const - { return HasName() ? ResId::toString(aNameResId) : rtl::OUString(); } + { return HasName() ? aNameResId.toString() : rtl::OUString(); } ResMgr* GetResMgr() const { return aNameResId.GetResMgr(); } diff --git a/sfx2/inc/sfx2/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx index 42a5593606c2..fc860e8e1d02 100644 --- a/sfx2/inc/sfx2/sfxresid.hxx +++ b/sfx2/inc/sfx2/sfxresid.hxx @@ -39,6 +39,8 @@ public: static void DeleteResMgr(); }; +#define SFX2_RESSTR(x) SfxResId(x).toString() + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index cf1a651a3160..842a83ec0fa8 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -494,7 +494,7 @@ bool SvBaseLink::ExecuteEdit( const String& _rNewName ) pImpl->m_pLinkMgr->GetDisplayNames( this, &sApp, &sTopic, &sItem ); if( nObjType == OBJECT_CLIENT_DDE ) { - sError = SfxResId( STR_DDE_ERROR ); + sError = SFX2_RESSTR(STR_DDE_ERROR); sal_uInt16 nFndPos = sError.Search( '%' ); if( STRING_NOTFOUND != nFndPos ) diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index be58cbca81c0..2fec49473611 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -390,8 +390,7 @@ OUString ShutdownIcon::GetResString( int id ) if( !m_pResMgr || !m_pResMgr->IsAvailable( aResId ) ) return OUString(); - ResId aRes( id, *m_pResMgr ); - return ResId::toString( aRes ); + return ResId(id, *m_pResMgr).toString(); } // --------------------------------------------------------------------------- @@ -831,8 +830,7 @@ rtl::OUString ShutdownIcon::getShortcutName() if( pMgr ) { ::SolarMutexGuard aGuard; - SfxResId aRes( STR_QUICKSTART_LNKNAME ); - aShortcutName = ResId::toString( aRes ); + aShortcutName = SFX2_RESSTR(STR_QUICKSTART_LNKNAME); } #ifdef WNT aShortcutName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".lnk" ) ); diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 37edcd03a2e4..3b48b431b294 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -599,8 +599,8 @@ OUString SfxDocumentTemplates::ConvertResourceString ( { for( int i = 0; i < nCount; ++i ) { - if( rString == ResId::toString( SfxResId( nSourceResIds + i) ) ) - return ResId::toString( SfxResId( nDestResIds + i ) ); + if( rString == SFX2_RESSTR(nSourceResIds + i)) + return SFX2_RESSTR(nDestResIds + i); } return rString; } diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 6ab4cb41919e..5ed00278bebf 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -1766,7 +1766,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu ) { if(0 == pFocusBox->GetModel()->GetDepth(pEntry)) { - const rtl::OUString aNoName(ResId::toString(SfxResId(STR_NONAME))); + const rtl::OUString aNoName(SFX2_RESSTR(STR_NONAME)); SvLBoxEntry* pParent = pFocusBox->GetParent(pEntry); rtl::OUString aName(aNoName); sal_Int32 n = 1; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index b7c8c51eb360..2d6398b3da69 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -869,7 +869,7 @@ String SfxObjectShell::GetTitle return X(pImp->aTitle); // must it be numbered? - rtl::OUString aNoName(ResId::toString(SfxResId(STR_NONAME))); + rtl::OUString aNoName(SFX2_RESSTR(STR_NONAME)); if (pImp->bIsNamedVisible) { // Append number diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index a75aee02c0a5..43b45392a9d1 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -69,6 +69,8 @@ public: SmResId(sal_uInt16 nId); }; +#define SM_RESSTR(x) SmResId(x).toString() + class SmNamesArray : public Resource { ResStringArray aNamesAry; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 0871fec14a51..ec92a045e7f3 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -699,7 +699,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) : { if (IsAvailableRes(ResId(1,*rResId.GetResMgr()).SetRT(RSC_STRING))) { - Name = ResId::toString(ResId(1,*rResId.GetResMgr())); + Name = ResId(1,*rResId.GetResMgr()).toString(); int i; for (i = 0; i < 4; i++) @@ -708,7 +708,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) : if (IsAvailableRes(ResId(nI2,*rResId.GetResMgr()).SetRT(RSC_STRING))) { - Strings [i] = new rtl::OUString(ResId::toString(ResId(nI2,*rResId.GetResMgr()))); + Strings [i] = new rtl::OUString(ResId(nI2,*rResId.GetResMgr()).toString()); Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr())); } else diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index b386cf36fbab..9ecd5ae1a370 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2518,7 +2518,7 @@ size_t SmParser::AddError(SmParseError Type, SmNode *pNode) default: nRID = RID_ERR_UNKOWN; } - pErrDesc->Text += SmResId(nRID); + pErrDesc->Text += SM_RESSTR(nRID); m_aErrDescList.push_back( pErrDesc ); diff --git a/svtools/inc/svtools/svtresid.hxx b/svtools/inc/svtools/svtresid.hxx index f30ed5605e98..3b83a785dfc1 100644 --- a/svtools/inc/svtools/svtresid.hxx +++ b/svtools/inc/svtools/svtresid.hxx @@ -40,6 +40,8 @@ public: static void DeleteResMgr(); }; +#define SVT_RESSTR(i) SvtResId(i).toString() + #endif // _SVTOOLS_SVTRESID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index a78adb3ff4fa..11f80bf73bc0 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -674,25 +674,25 @@ OUString CreateExactSizeText( sal_Int64 nSize ) if ( nSize < 10000 ) { - aUnitStr += String( SvtResId( STR_SVT_BYTES ) ); + aUnitStr += SVT_RESSTR(STR_SVT_BYTES ); nDec = 0; } else if ( nSize < nMega ) { fSize /= 1024; - aUnitStr += String( SvtResId( STR_SVT_KB ) ); + aUnitStr += SVT_RESSTR(STR_SVT_KB); nDec = 1; } else if ( nSize < nGiga ) { fSize /= nMega; - aUnitStr += String( SvtResId( STR_SVT_MB ) ); + aUnitStr += SVT_RESSTR(STR_SVT_MB); nDec = 2; } else { fSize /= nGiga; - aUnitStr += String( SvtResId( STR_SVT_GB ) ); + aUnitStr += SVT_RESSTR(STR_SVT_GB); nDec = 3; } @@ -716,9 +716,9 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, mpHeaderBar ( NULL ), mpParent ( pParent ), - msAccessibleDescText( SvtResId( STR_SVT_ACC_DESC_FILEVIEW ) ), - msFolder ( SvtResId( STR_SVT_ACC_DESC_FOLDER ) ), - msFile ( SvtResId( STR_SVT_ACC_DESC_FILE ) ), + msAccessibleDescText( SVT_RESSTR(STR_SVT_ACC_DESC_FILEVIEW) ), + msFolder ( SVT_RESSTR(STR_SVT_ACC_DESC_FOLDER) ), + msFile ( SVT_RESSTR(STR_SVT_ACC_DESC_FILE) ), mnSearchIndex ( 0 ), mbResizeDisabled ( sal_False ), mbAutoResize ( sal_False ), @@ -736,7 +736,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, long pTabs[] = { 2, 20, 600 }; SetTabs(&pTabs[0], MAP_PIXEL); - mpHeaderBar->InsertItem(COLUMN_TITLE, String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 600, nBits | HIB_UPARROW); + mpHeaderBar->InsertItem(COLUMN_TITLE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TITLE), 600, nBits | HIB_UPARROW); } else { @@ -744,10 +744,10 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, SetTabs(&pTabs[0], MAP_PIXEL); SetTabJustify(2, AdjustRight); // column "Size" - mpHeaderBar->InsertItem(COLUMN_TITLE, String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 180, nBits | HIB_UPARROW); - mpHeaderBar->InsertItem(COLUMN_TYPE, String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TYPE)), 140, nBits); - mpHeaderBar->InsertItem(COLUMN_SIZE, String(SvtResId(STR_SVT_FILEVIEW_COLUMN_SIZE)), 80, nBits); - mpHeaderBar->InsertItem(COLUMN_DATE, String(SvtResId(STR_SVT_FILEVIEW_COLUMN_DATE)), 500, nBits); + mpHeaderBar->InsertItem(COLUMN_TITLE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TITLE), 180, nBits | HIB_UPARROW); + mpHeaderBar->InsertItem(COLUMN_TYPE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TYPE), 140, nBits); + mpHeaderBar->InsertItem(COLUMN_SIZE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_SIZE), 80, nBits); + mpHeaderBar->InsertItem(COLUMN_DATE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_DATE), 500, nBits); } Size aHeadSize = mpHeaderBar->GetSizePixel(); diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 02597f48cfa7..497bd20cdb79 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -468,7 +468,7 @@ String SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const { String sRet = static_cast<SvLBoxString*>( pStr )->GetText(); if ( sRet.Len() == 0 ) - sRet = String( SvtResId( STR_SVT_ACC_EMPTY_FIELD ) ); + sRet = SVT_RESSTR( STR_SVT_ACC_EMPTY_FIELD ); return sRet; } --nCol; @@ -1121,7 +1121,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin sal_Int32 nRow = _nPos / nColumnCount; sal_uInt16 nColumn = static_cast< sal_uInt16 >( _nPos % nColumnCount ); - String aText( SvtResId( STR_SVT_ACC_DESC_TABLISTBOX ) ); + String aText( SVT_RESSTR(STR_SVT_ACC_DESC_TABLISTBOX) ); aText.SearchAndReplace( sVar1, String::CreateFromInt32( nRow ) ); String sColHeader = m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( nColumn ) ); if ( sColHeader.Len() == 0 ) diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index a49770e9f38a..b1b85c2677ab 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -192,11 +192,11 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : // "New Document" Image aImage( SvtResId( IMG_SVT_NEWDOC ) ); nMaxTextLength = aImage.GetSizePixel().Width(); - String aEntryStr = String( SvtResId( STR_SVT_NEWDOC ) ); + String aEntryStr = SVT_RESSTR(STR_SVT_NEWDOC); SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.InsertEntry( aEntryStr, aImage, ICON_POS_NEWDOC ); pEntry->SetUserData( new String( aNewDocumentRootURL ) ); - pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_NEWDOC_HELP ) ) ); + pEntry->SetQuickHelpText( SVT_RESSTR(STR_SVT_NEWDOC_HELP) ); DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" ); long nTemp = pEntry->GetBoundRect().GetSize().Width(); if (nTemp > nMaxTextLength) @@ -205,11 +205,11 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : // "Templates" if( aTemplateRootURL.Len() > 0 ) { - aEntryStr = String( SvtResId( STR_SVT_TEMPLATES ) ); + aEntryStr = SVT_RESSTR(STR_SVT_TEMPLATES); pEntry = aIconCtrl.InsertEntry( aEntryStr, Image( SvtResId( IMG_SVT_TEMPLATES ) ), ICON_POS_TEMPLATES ); pEntry->SetUserData( new String( aTemplateRootURL ) ); - pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_TEMPLATES_HELP ) ) ); + pEntry->SetQuickHelpText(SVT_RESSTR(STR_SVT_TEMPLATES_HELP)); DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" ); nTemp = pEntry->GetBoundRect().GetSize().Width(); if (nTemp > nMaxTextLength) @@ -217,22 +217,22 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : } // "My Documents" - aEntryStr = String( SvtResId( STR_SVT_MYDOCS ) ); + aEntryStr = SVT_RESSTR(STR_SVT_MYDOCS); pEntry = aIconCtrl.InsertEntry( aEntryStr, Image( SvtResId( IMG_SVT_MYDOCS ) ), ICON_POS_MYDOCS ); pEntry->SetUserData( new String( aMyDocumentsRootURL ) ); - pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_MYDOCS_HELP ) ) ); + pEntry->SetQuickHelpText( SVT_RESSTR(STR_SVT_MYDOCS_HELP) ); DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" ); nTemp = pEntry->GetBoundRect().GetSize().Width(); if( nTemp > nMaxTextLength ) nMaxTextLength = nTemp; // "Samples" - aEntryStr = String( SvtResId( STR_SVT_SAMPLES ) ); + aEntryStr = SVT_RESSTR(STR_SVT_SAMPLES); pEntry = aIconCtrl.InsertEntry( aEntryStr, Image( SvtResId( IMG_SVT_SAMPLES ) ), ICON_POS_SAMPLES ); pEntry->SetUserData( new String( aSamplesFolderRootURL ) ); - pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_SAMPLES_HELP ) ) ); + pEntry->SetQuickHelpText( SVT_RESSTR(STR_SVT_SAMPLES_HELP)); DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" ); nTemp = pEntry->GetBoundRect().GetSize().Width(); if (nTemp > nMaxTextLength) diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index de24a6bf42fa..6da63862e6b4 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -228,8 +228,8 @@ void Calendar::ImplInit( WinBits nWinStyle ) ImplCalendarSelectDate( mpSelectTable, maCurDate, sal_True ); // Sonstige Strings erzeugen - maDayText = XubString( SvtResId( STR_SVT_CALENDAR_DAY ) ); - maWeekText = XubString( SvtResId( STR_SVT_CALENDAR_WEEK ) ); + maDayText = SVT_RESSTR(STR_SVT_CALENDAR_DAY); + maWeekText = SVT_RESSTR(STR_SVT_CALENDAR_WEEK); // Tagestexte anlegen for (sal_Int32 i = 0; i < 31; ++i) @@ -2276,7 +2276,7 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( sal_Bool bEnable ) if ( !mpTodayBtn ) { mpTodayBtn = new PushButton( this, WB_NOPOINTERFOCUS ); - XubString aTodayText( SvtResId( STR_SVT_CALENDAR_TODAY ) ); + XubString aTodayText(SVT_RESSTR(STR_SVT_CALENDAR_TODAY)); mpTodayBtn->SetText( aTodayText ); Size aSize; aSize.Width() = mpTodayBtn->GetCtrlTextWidth( mpTodayBtn->GetText() ); @@ -2308,7 +2308,7 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( sal_Bool bEnable ) if ( !mpNoneBtn ) { mpNoneBtn = new PushButton( this, WB_NOPOINTERFOCUS ); - XubString aNoneText( SvtResId( STR_SVT_CALENDAR_NONE ) ); + XubString aNoneText(SVT_RESSTR(STR_SVT_CALENDAR_NONE)); mpNoneBtn->SetText( aNoneText ); Size aSize; aSize.Width() = mpNoneBtn->GetCtrlTextWidth( mpNoneBtn->GetText() ); diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index 79388a7b9c9c..7c669c6c59cd 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -76,8 +76,7 @@ CollatorRessource::CollatorRessource() mp_Data = new CollatorRessourceData[COLLATOR_RESSOURCE_COUNT]; #define ASCSTR(str) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(str)) - #define RESSTR(rid) ResId::toString(SvtResId(rid)) - + #define RESSTR(rid) SvtResId(rid).toString() mp_Data[0] = CollatorRessourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_COLLATE_ALPHANUMERIC)); mp_Data[1] = CollatorRessourceData (ASCSTR("charset"), RESSTR(STR_SVT_COLLATE_CHARSET)); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index d58c534c9ade..9c5ddb9a9310 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -185,7 +185,7 @@ sal_uInt16 ColorListBox::InsertEntry( const Color& rColor, const XubString& rStr void ColorListBox::InsertAutomaticEntryColor(const Color &rColor) { // insert the "Automatic"-entry always on the first position - InsertEntry( rColor, SvtResId( STR_SVT_AUTOMATIC_COLOR ), 0 ); + InsertEntry( rColor, SVT_RESSTR(STR_SVT_AUTOMATIC_COLOR), 0 ); } // ----------------------------------------------------------------------- diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index b43a8a7b7e70..01459ad1f20a 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -355,14 +355,14 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, sal_Bool bAll mpSizeAry = NULL; // Stylenamen festlegen - maLight = XubString( SvtResId( STR_SVT_STYLE_LIGHT ) ); - maLightItalic = XubString( SvtResId( STR_SVT_STYLE_LIGHT_ITALIC ) ); - maNormal = XubString( SvtResId( STR_SVT_STYLE_NORMAL ) ); - maNormalItalic = XubString( SvtResId( STR_SVT_STYLE_NORMAL_ITALIC ) ); - maBold = XubString( SvtResId( STR_SVT_STYLE_BOLD ) ); - maBoldItalic = XubString( SvtResId( STR_SVT_STYLE_BOLD_ITALIC ) ); - maBlack = XubString( SvtResId( STR_SVT_STYLE_BLACK ) ); - maBlackItalic = XubString( SvtResId( STR_SVT_STYLE_BLACK_ITALIC ) ); + maLight = SVT_RESSTR(STR_SVT_STYLE_LIGHT); + maLightItalic = SVT_RESSTR(STR_SVT_STYLE_LIGHT_ITALIC); + maNormal = SVT_RESSTR(STR_SVT_STYLE_NORMAL); + maNormalItalic = SVT_RESSTR(STR_SVT_STYLE_NORMAL_ITALIC); + maBold = SVT_RESSTR(STR_SVT_STYLE_BOLD); + maBoldItalic = SVT_RESSTR(STR_SVT_STYLE_BOLD_ITALIC); + maBlack = SVT_RESSTR(STR_SVT_STYLE_BLACK); + maBlackItalic = SVT_RESSTR(STR_SVT_STYLE_BLACK_ITALIC); ImplInsertFonts( pDevice, bAll, sal_True ); @@ -521,7 +521,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const if ( !pData ) { if ( !maMapNotAvailable.Len() ) - ((FontList*)this)->maMapNotAvailable = XubString( SvtResId( STR_SVT_FONTMAP_NOTAVAILABLE ) ); + ((FontList*)this)->maMapNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_NOTAVAILABLE); return maMapNotAvailable; } @@ -555,28 +555,16 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const else if ( !bNotSynthetic ) { if ( !maMapStyleNotAvailable.Len() ) - ((FontList*)this)->maMapStyleNotAvailable = XubString( SvtResId( STR_SVT_FONTMAP_STYLENOTAVAILABLE ) ); + ((FontList*)this)->maMapStyleNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_STYLENOTAVAILABLE); return maMapStyleNotAvailable; } } - /* Size not available not implemented yet - if ( !(nType & FONTLIST_FONTNAMETYPE_SCALABLE) ) - { - ... - { - if ( !maMapSizeNotAvailable.Len() ) - ((FontList*)this)->maMapSizeNotAvailable = XubString( SvtResId( STR_SVT_FONTMAP_SIZENOTAVAILABLE ) ); - return maMapSizeNotAvailable; - } - } - */ - // Only Printer-Font? if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_PRINTER ) { if ( !maMapPrinterOnly.Len() ) - ((FontList*)this)->maMapPrinterOnly = XubString( SvtResId( STR_SVT_FONTMAP_PRINTERONLY ) ); + ((FontList*)this)->maMapPrinterOnly = SVT_RESSTR(STR_SVT_FONTMAP_PRINTERONLY); return maMapPrinterOnly; } // Only Screen-Font? @@ -584,13 +572,13 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const && rInfo.GetType() == TYPE_RASTER ) { if ( !maMapScreenOnly.Len() ) - ((FontList*)this)->maMapScreenOnly = XubString( SvtResId( STR_SVT_FONTMAP_SCREENONLY ) ); + ((FontList*)this)->maMapScreenOnly = SVT_RESSTR(STR_SVT_FONTMAP_SCREENONLY); return maMapScreenOnly; } else { if ( !maMapBoth.Len() ) - ((FontList*)this)->maMapBoth = XubString( SvtResId( STR_SVT_FONTMAP_BOTH ) ); + ((FontList*)this)->maMapBoth = SVT_RESSTR(STR_SVT_FONTMAP_BOTH); return maMapBoth; } } diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 235074441850..ddf8fdd54d7d 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -38,7 +38,7 @@ FileControl::FileControl( Window* pParent, WinBits nStyle, FileControlMode nFlag Window( pParent, nStyle|WB_DIALOGCONTROL ), maEdit( this, (nStyle&(~WB_BORDER))|WB_NOTABSTOP ), maButton( this, (nStyle&(~WB_BORDER))|WB_NOLIGHTBORDER|WB_NOPOINTERFOCUS|WB_NOTABSTOP ), - maButtonText( SvtResId( STR_FILECTRL_BUTTONTEXT ) ), + maButtonText( SVT_RESSTR(STR_FILECTRL_BUTTONTEXT) ), mnFlags( nFlags ), mnInternalFlags( FILECTRL_ORIGINALBUTTONTEXT ) { diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index 5a741122a9cd..3b0007ce304b 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -76,7 +76,7 @@ IndexEntryRessource::IndexEntryRessource() mp_Data = new IndexEntryRessourceData[INDEXENTRY_RESSOURCE_COUNT]; #define ASCSTR(str) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(str)) - #define RESSTR(rid) ResId::toString(SvtResId(rid)) + #define RESSTR(rid) SvtResId(rid).toString() mp_Data[STR_SVT_INDEXENTRY_ALPHANUMERIC - STR_SVT_INDEXENTRY_START] = IndexEntryRessourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_INDEXENTRY_ALPHANUMERIC)); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 0881063e9c3f..fb25b442eb1e 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -414,13 +414,13 @@ void TabBar::ImplInit( WinBits nWinStyle ) ImplInitControls(); if(mpFirstBtn) - mpFirstBtn->SetAccessibleName(String(SvtResId(STR_TABBAR_PUSHBUTTON_MOVET0HOME))); + mpFirstBtn->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVET0HOME)); if(mpPrevBtn) - mpPrevBtn->SetAccessibleName( String(SvtResId(STR_TABBAR_PUSHBUTTON_MOVELEFT))); + mpPrevBtn->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVELEFT)); if(mpNextBtn) - mpNextBtn->SetAccessibleName(String(SvtResId(STR_TABBAR_PUSHBUTTON_MOVERIGHT))); + mpNextBtn->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVERIGHT)); if(mpLastBtn) - mpLastBtn->SetAccessibleName( String(SvtResId(STR_TABBAR_PUSHBUTTON_MOVETOEND))); + mpLastBtn->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVETOEND)); SetSizePixel( Size( 100, CalcWindowSizePixel().Height() ) ); ImplInitSettings( sal_True, sal_True ); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 09d43f90838f..e423b6a1c382 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -181,7 +181,7 @@ public: // first collect all known programmatic names StringBag aKnownNames; - rtl::OUString sLogicalFieldNames(ResId::toString(SvtResId(STR_LOGICAL_FIELD_NAMES))); + rtl::OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); sal_Int32 nIndex = 0; do { @@ -565,7 +565,7 @@ void AssignmentPersistentData::Commit() ,m_aOK (this, SvtResId(PB_OK))\ ,m_aCancel (this, SvtResId(PB_CANCEL))\ ,m_aHelp (this, SvtResId(PB_HELP))\ - ,m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION))\ + ,m_sNoFieldSelection(SVT_RESSTR(STR_NO_FIELD_SELECTION))\ ,m_xORB(_rxORB) // ------------------------------------------------------------------- @@ -622,37 +622,37 @@ void AssignmentPersistentData::Commit() // should be adjustable with a rather small effort.) // initialize the strings for the field labels - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_FIRSTNAME )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_LASTNAME )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_COMPANY)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_DEPARTMENT )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_STREET )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_ZIPCODE )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_CITY )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_STATE)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_COUNTRY )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_HOMETEL )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_WORKTEL )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_OFFICETEL)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_MOBILE)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_TELOTHER)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_PAGER)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_FAX )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_EMAIL )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_URL )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_TITLE )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_POSITION )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_INITIALS )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_ADDRFORM )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_SALUTATION )) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_ID)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_CALENDAR)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_INVITE)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_NOTE)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_USER1)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_USER2)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_USER3)) ); - m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_USER4)) ); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_FIRSTNAME )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_LASTNAME )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_COMPANY)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_DEPARTMENT )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_STREET )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ZIPCODE )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_CITY )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_STATE)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_COUNTRY )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_HOMETEL )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_WORKTEL )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_OFFICETEL)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_MOBILE)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_TELOTHER)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_PAGER)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_FAX )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_EMAIL )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_URL )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_TITLE )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_POSITION )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_INITIALS )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ADDRFORM )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_SALUTATION )); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ID)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_CALENDAR)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_INVITE)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_NOTE)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER1)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER2)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER3)); + m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER4)); // force a even number of known fields m_pImpl->bOddFieldNumber = (m_pImpl->aFieldLabels.size() % 2) != 0; @@ -691,7 +691,7 @@ void AssignmentPersistentData::Commit() implScrollFields(0, sal_False, sal_False); // the logical names - rtl::OUString sLogicalFieldNames(ResId::toString(SvtResId(STR_LOGICAL_FIELD_NAMES))); + rtl::OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); sal_Int32 nAdjustedTokenCount = comphelper::string::getTokenCount(sLogicalFieldNames, ';') + (m_pImpl->bOddFieldNumber ? 1 : 0); DBG_ASSERT(nAdjustedTokenCount == (sal_Int32)m_pImpl->aFieldLabels.size(), "AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!"); diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 1d84fa441d6c..d16f65aebfc9 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -150,7 +150,7 @@ ImpPathDialog::~ImpPathDialog() void ImpPathDialog::InitControls() { PathDialog* pDlg = GetPathDialog(); - pDlg->SetText( UniString( SvtResId( STR_FILEDLG_SELECT ) ) ); + pDlg->SetText( SVT_RESSTR(STR_FILEDLG_SELECT) ); Size a3Siz = pDlg->LogicToPixel( Size( 3, 3 ), MAP_APPFONT ); Size a6Siz = pDlg->LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); @@ -163,7 +163,7 @@ void ImpPathDialog::InitControls() UniString aEmptyStr; INITCONTROL( pDirTitel, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); + aPnt, aFTSiz, SVT_RESSTR( STR_FILEDLG_DIR ), HID_FILEDLG_DIR ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), HID_FILEDLG_EDIT ); @@ -175,7 +175,7 @@ void ImpPathDialog::InitControls() aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, HID_FILEDLG_DIRS ); aPnt.Y() += nLbH1 + a6Siz.Height(); INITCONTROL( pDriveTitle, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); + aPnt, aFTSiz, SVT_RESSTR( STR_FILEDLG_DRIVES ), HID_FILEDLG_DRIVE ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, HID_FILEDLG_DRIVES ); @@ -201,12 +201,12 @@ void ImpPathDialog::InitControls() if( nTextWidth > aBtnSiz.Width() ) aBtnSiz.Width() = nTextWidth; - String aNewDirStr( SvtResId( STR_FILEDLG_NEWDIR ) ); + String aNewDirStr( SVT_RESSTR( STR_FILEDLG_NEWDIR ) ); nTextWidth = pDlg->GetTextWidth( aNewDirStr )+nExtraWidth; if( nTextWidth > aBtnSiz.Width() ) aBtnSiz.Width() = nTextWidth; #if defined(UNX) - String aHomeDirStr( SvtResId( STR_FILEDLG_HOME ) ); + String aHomeDirStr( SVT_RESSTR( STR_FILEDLG_HOME ) ); nTextWidth = pDlg->GetTextWidth( aHomeDirStr )+nExtraWidth; if( nTextWidth > aBtnSiz.Width() ) aBtnSiz.Width() = nTextWidth; @@ -405,7 +405,7 @@ IMPL_LINK( ImpPathDialog, DblClickHdl, ListBox*, pBox ) { ErrorBox aBox( GetPathDialog(), WB_OK_CANCEL | WB_DEF_OK, - UniString( SvtResId( STR_FILEDLG_CANTCHDIR ) ) ); + SVT_RESSTR( STR_FILEDLG_CANTCHDIR ) ); if( aBox.Execute() == RET_CANCEL ) GetPathDialog()->EndDialog( sal_False ); } @@ -508,7 +508,7 @@ sal_Bool ImpPathDialog::IsFileOk( const DirEntry& rDirEntry ) // Datei vorhanden ? if( ! rDirEntry.Exists() ) { - UniString aQueryTxt( SvtResId( STR_FILEDLG_ASKNEWDIR ) ); + UniString aQueryTxt( SVT_RESSTR( STR_FILEDLG_ASKNEWDIR ) ); aQueryTxt.SearchAndReplaceAscii( "%s", rDirEntry.GetFull() ); QueryBox aQuery( GetPathDialog(), WB_YES_NO | WB_DEF_YES, @@ -520,7 +520,7 @@ sal_Bool ImpPathDialog::IsFileOk( const DirEntry& rDirEntry ) } if( !FileStat( rDirEntry ).IsKind( FSYS_KIND_DIR ) ) { - UniString aBoxText( SvtResId( STR_FILEDLG_CANTOPENDIR ) ); + UniString aBoxText( SVT_RESSTR( STR_FILEDLG_CANTOPENDIR ) ); aBoxText.AppendAscii( "\n[" ); aBoxText += rDirEntry.GetFull(); aBoxText.AppendAscii( "]" ); diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index a7de833ff9a6..9f3f70b020ae 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -204,7 +204,7 @@ void SvObjectServerList::FillInsertObjects() #ifdef WNT SvGlobalName aOleFact( SO3_OUT_CLASSID ); - String aOleObj( SvtResId( STR_FURTHER_OBJECT ) ); + String aOleObj( SVT_RESSTR( STR_FURTHER_OBJECT ) ); aObjectServerList.push_back( SvObjectServer( aOleFact, aOleObj ) ); #endif @@ -306,7 +306,7 @@ String SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId ) } if( nResId ) - aUIName = String( SvtResId( nResId ) ); + aUIName = SVT_RESSTR( nResId ); else aUIName = SotExchange::GetFormatName( nId ); @@ -363,8 +363,7 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat _rSource.Append( pSrcOfCopy ); } else - _rSource = - String( SvtResId( STR_UNKNOWN_SOURCE ) ); + _rSource = SVT_RESSTR(STR_UNKNOWN_SOURCE); } bRet = sal_True; } diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 3eb70f1705f4..add15bc37444 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -144,9 +144,7 @@ static void ImplPrnDlgAddString( XubString& rStr, const XubString& rAddStr ) static void ImplPrnDlgAddResString( XubString& rStr, sal_uInt16 nResId ) { - SvtResId aResId( nResId ); - XubString aAddStr( aResId ); - ImplPrnDlgAddString( rStr, aAddStr ); + ImplPrnDlgAddString( rStr, SVT_RESSTR(nResId) ); } // ----------------------------------------------------------------------- @@ -217,7 +215,7 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) sal_uLong nJobs = rInfo.GetJobs(); if ( nJobs && (nJobs != QUEUE_JOBS_DONTKNOW) ) { - XubString aJobStr( SvtResId( STR_SVT_PRNDLG_JOBCOUNT ) ); + XubString aJobStr( SVT_RESSTR( STR_SVT_PRNDLG_JOBCOUNT ) ); XubString aJobs( XubString::CreateFromInt32( nJobs ) ); aJobStr.SearchAndReplaceAscii( "%d", aJobs ); ImplPrnDlgAddString( aStr, aJobStr ); diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index a6d591941b7d..6a7490e26038 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -200,7 +200,7 @@ namespace svt SetEmptyViewMargin(); m_pImpl->pRoadmap = new ORoadmap( this, WB_TABSTOP ); - m_pImpl->pRoadmap->SetText( SvtResId( STR_WIZDLG_ROADMAP_TITLE ) ); + m_pImpl->pRoadmap->SetText( SVT_RESSTR( STR_WIZDLG_ROADMAP_TITLE ) ); m_pImpl->pRoadmap->SetPosPixel( Point( 0, 0 ) ); m_pImpl->pRoadmap->SetItemSelectHdl( LINK( this, RoadmapWizard, OnRoadmapItemSelected ) ); diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 56d66a1c0fc5..b024364c4861 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -170,7 +170,7 @@ namespace svt m_pPrevPage = new PushButton(this, WB_TABSTOP); m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS ); m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); - m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS))); + m_pPrevPage->SetText(SVT_RESSTR(STR_WIZDLG_PREVIOUS)); m_pPrevPage->Show(); if (_nButtonFlags & WZB_NEXT) @@ -187,7 +187,7 @@ namespace svt m_pNextPage = new PushButton(this, WB_TABSTOP); m_pNextPage->SetHelpId( HID_WIZARD_NEXT ); m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); - m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT))); + m_pNextPage->SetText(String(SVT_RESSTR(STR_WIZDLG_NEXT))); m_pNextPage->Show(); AddButton( m_pNextPage, WIZARDDIALOG_BUTTON_STDOFFSET_X ); @@ -200,7 +200,7 @@ namespace svt { m_pFinish = new OKButton(this, WB_TABSTOP); m_pFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); - m_pFinish->SetText(String(SvtResId(STR_WIZDLG_FINISH))); + m_pFinish->SetText(SVT_RESSTR(STR_WIZDLG_FINISH)); m_pFinish->Show(); AddButton( m_pFinish, WIZARDDIALOG_BUTTON_STDOFFSET_X ); diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx index 41c4028c0637..d2f15abc65ff 100644 --- a/svx/inc/svx/dialmgr.hxx +++ b/svx/inc/svx/dialmgr.hxx @@ -43,7 +43,7 @@ struct SVX_DLLPUBLIC DialogsResMgr #define DIALOG_MGR() (*DialogsResMgr::GetResMgr()) #define SVX_RES(i) ResId(i,DIALOG_MGR()) -#define SVX_RESSTR(i) ResId::toString(ResId(i,DIALOG_MGR())) +#define SVX_RESSTR(i) SVX_RES(i).toString() #endif diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index 7f4563e89f7e..2f1edebfd0a4 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -84,7 +84,8 @@ enum SgaObjKind #define USERDATA_HDL() (LINK(this,SgaUserDataFactory,MakeUserData)) -#define GAL_RESID( nId ) ResId( nId, *GetGalleryResMgr() ) +#define GAL_RES(nId) ResId(nId, *GetGalleryResMgr()) +#define GAL_RESSTR(nId) GAL_RES(nId).toString() #define STREAMBUF_SIZE 16384L #define SGA_IMPORT_NONE 0x0000 diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 9c14c0066735..0ec2329c4303 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -68,7 +68,7 @@ String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg } if ( LANGUAGE_NONE == nLang ) - aTmp += String( ResId( RID_SVXSTR_LANGUAGE_ALL, DIALOG_MGR() ) ); + aTmp += SVX_RESSTR(RID_SVXSTR_LANGUAGE_ALL); else { aTmp += sal_Unicode( '[' ); diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index f1c50decc842..1c7a03174cc7 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -74,18 +74,18 @@ OSystemParseContext::~OSystemParseContext() SolarMutexGuard aGuard; switch (_eCode) { - case ERROR_GENERAL: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_ERROR); break; - case ERROR_VALUE_NO_LIKE: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE); break; - case ERROR_FIELD_NO_LIKE: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE); break; - case ERROR_INVALID_COMPARE: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE); break; - case ERROR_INVALID_INT_COMPARE: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break; - case ERROR_INVALID_DATE_COMPARE: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break; - case ERROR_INVALID_REAL_COMPARE: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break; - case ERROR_INVALID_TABLE: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_TABLE); break; - case ERROR_INVALID_TABLE_OR_QUERY: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break; - case ERROR_INVALID_COLUMN: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_COLUMN); break; - case ERROR_INVALID_TABLE_EXIST: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break; - case ERROR_INVALID_QUERY_EXIST: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS); break; + case ERROR_GENERAL: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ERROR); break; + case ERROR_VALUE_NO_LIKE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE); break; + case ERROR_FIELD_NO_LIKE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE); break; + case ERROR_INVALID_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE); break; + case ERROR_INVALID_INT_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break; + case ERROR_INVALID_DATE_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break; + case ERROR_INVALID_REAL_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break; + case ERROR_INVALID_TABLE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break; + case ERROR_INVALID_TABLE_OR_QUERY: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break; + case ERROR_INVALID_COLUMN: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_COLUMN); break; + case ERROR_INVALID_TABLE_EXIST: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break; + case ERROR_INVALID_QUERY_EXIST: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS); break; case ERROR_NONE: break; } return aMsg; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 8a54bd4149ed..94ac4fd09133 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -679,7 +679,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar } // title for the next conditions - aTitle = SVX_RES( RID_STR_FILTER_FILTER_OR ); + aTitle = SVX_RESSTR( RID_STR_FILTER_FILTER_OR ); } // now add dependent controllers diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index b51d91b4c481..67f89bc51c6c 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -1008,7 +1008,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC if (rNewMod.GetObjectShell()) rNewMod.GetObjectShell()->SetModified(sal_True); if(static_STR_UNDO_PROPERTY.Len() == 0) - static_STR_UNDO_PROPERTY = SVX_RES(RID_STR_UNDO_PROPERTY); + static_STR_UNDO_PROPERTY = SVX_RESSTR(RID_STR_UNDO_PROPERTY); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 5c1522eadba4..7d0f8d7c5c5a 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -4058,11 +4058,11 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th sal_Int32 nLength = aEvent.Rows; if ( nLength > 1 ) { - sTitle = SVX_RES( RID_STR_DELETECONFIRM_RECORDS ); + sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS ); sTitle.SearchAndReplace( '#', String::CreateFromInt32( nLength ) ); } else - sTitle = SVX_RES( RID_STR_DELETECONFIRM_RECORD ); + sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD ); try { diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index bae1e49357ad..eee6078b5eb0 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1819,16 +1819,16 @@ namespace svxform String aUndoStr; if ( m_arrCurrentSelection.size() == 1 ) { - aUndoStr = SVX_RES(RID_STR_UNDO_CONTAINER_REMOVE); + aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE); if (m_nFormsSelected) - aUndoStr.SearchAndReplaceAscii( "#", SVX_RES( RID_STR_FORM ) ); + aUndoStr.SearchAndReplaceAscii( "#", SVX_RESSTR( RID_STR_FORM ) ); else // it must be a control (else the root would be selected, but it cannot be deleted) - aUndoStr.SearchAndReplaceAscii( "#", SVX_RES( RID_STR_CONTROL ) ); + aUndoStr.SearchAndReplaceAscii( "#", SVX_RESSTR( RID_STR_CONTROL ) ); } else { - aUndoStr = SVX_RES(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE); + aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE); aUndoStr.SearchAndReplaceAscii( "#", String::CreateFromInt32( m_arrCurrentSelection.size() ) ); } pFormModel->BegUndo(aUndoStr); diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index e5f3c8501b08..35404a022bbb 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -301,9 +301,9 @@ namespace svxform { XubString aStr; if (pEntry->ISA(FmFormData)) - aStr = SVX_RES(RID_STR_FORM); + aStr = SVX_RESSTR(RID_STR_FORM); else - aStr = SVX_RES(RID_STR_CONTROL); + aStr = SVX_RESSTR(RID_STR_CONTROL); Reference< XIndexContainer > xContainer; if (pFolder) @@ -408,13 +408,13 @@ namespace svxform { XubString aStr; if (pEntry->ISA(FmFormData)) - aStr = SVX_RES(RID_STR_FORM); + aStr = SVX_RESSTR(RID_STR_FORM); else - aStr = SVX_RES(RID_STR_CONTROL); + aStr = SVX_RESSTR(RID_STR_CONTROL); if( bUndo ) { - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_REMOVE)); + XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE)); aUndoStr.SearchAndReplace('#', aStr); m_pFormModel->BegUndo(aUndoStr); } diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 4c80b8af3d28..ef88a608b75c 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -83,7 +83,7 @@ void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt ) GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { - pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RESID( RID_SVXDLG_GALLERYBROWSER ) ); + pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RES( RID_SVXDLG_GALLERYBROWSER ) ); eChildAlignment = SFX_ALIGN_TOP; ( (GalleryBrowser*) pWindow )->Initialize( pInfo ); }; @@ -107,9 +107,9 @@ GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW, SfxDockingWindow( _pBindings, pCW, pParent, rResId ) { mpGallery = Gallery::GetGalleryInstance(); - mpBrowser1 = new GalleryBrowser1( this, GAL_RESID( GALLERY_BROWSER1 ), mpGallery ); - mpSplitter = new GallerySplitter( this, GAL_RESID( GALLERY_SPLITTER ) ); - mpBrowser2 = new GalleryBrowser2( this, GAL_RESID( GALLERY_BROWSER2 ), mpGallery ); + mpBrowser1 = new GalleryBrowser1( this, GAL_RES( GALLERY_BROWSER1 ), mpGallery ); + mpSplitter = new GallerySplitter( this, GAL_RES( GALLERY_SPLITTER ) ); + mpBrowser2 = new GalleryBrowser2( this, GAL_RES( GALLERY_BROWSER2 ), mpGallery ); FreeResource(); SetMinOutputSizePixel( maLastSize = GetOutputSizePixel() ); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index d581973fe00f..143dde6d8d9c 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -153,7 +153,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, StartListening( *mpGallery ); maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME ); - maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) ); + maNewTheme.SetText( GAL_RESSTR(RID_SVXSTR_GALLERY_CREATETHEME)); maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) ); // disable creation of new themes if a writable directory is not available @@ -162,7 +162,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, mpThemes->SetHelpId( HID_GALLERY_THEMELIST ); mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) ); - mpThemes->SetAccessibleName(String(SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ) ); + mpThemes->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERYPROPS_GALTHEME)); for( sal_uIntPtr i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) ); @@ -422,7 +422,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) case( MN_DELETE ): { - if( QueryBox( NULL, WB_YES_NO, String( GAL_RESID( RID_SVXSTR_GALLERY_DELETETHEME ) ) ).Execute() == RET_YES ) + if( QueryBox( NULL, WB_YES_NO, GAL_RESSTR(RID_SVXSTR_GALLERY_DELETETHEME)).Execute() == RET_YES ) mpGallery->RemoveTheme( mpThemes->GetSelectEntry() ); } break; @@ -652,7 +652,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl) if( !aExecVector.empty() ) { - PopupMenu aMenu( GAL_RESID( RID_SVXMN_GALLERY1 ) ); + PopupMenu aMenu( GAL_RES( RID_SVXMN_GALLERY1 ) ); aMenu.EnableItem( MN_ACTUALIZE, ::std::find( aExecVector.begin(), aExecVector.end(), MN_ACTUALIZE ) != aExecVector.end() ); aMenu.EnableItem( MN_RENAME, ::std::find( aExecVector.begin(), aExecVector.end(), MN_RENAME ) != aExecVector.end() ); @@ -694,7 +694,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl) IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl) { - String aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) ); + String aNewTheme( GAL_RESSTR(RID_SVXSTR_GALLERY_NEWTHEME) ); String aName( aNewTheme ); sal_uIntPtr nCount = 0; diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 3da4fe96709a..70cd6578be37 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -171,7 +171,7 @@ public: // ------------------------------------------------------------------------ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ) : - PopupMenu ( GAL_RESID( RID_SVXMN_GALLERY2 ) ), + PopupMenu ( GAL_RES( RID_SVXMN_GALLERY2 ) ), SfxControllerItem ( SID_GALLERY_ENABLE_ADDCOPY, SfxViewFrame::Current()->GetBindings() ), maBackgroundPopup ( pTheme, nObjectPos ), mpTheme ( pTheme ), @@ -324,20 +324,20 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, maViewBox.InsertItem( TBX_ID_ICON, aDummyImage ); maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK ); maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW ); - maViewBox.SetQuickHelpText( TBX_ID_ICON, String( GAL_RESID( RID_SVXSTR_GALLERY_ICONVIEW ) ) ); + maViewBox.SetQuickHelpText( TBX_ID_ICON, GAL_RESSTR(RID_SVXSTR_GALLERY_ICONVIEW) ); maViewBox.InsertItem( TBX_ID_LIST, aDummyImage ); maViewBox.SetItemBits( TBX_ID_LIST, TIB_RADIOCHECK | TIB_AUTOCHECK ); maViewBox.SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW ); - maViewBox.SetQuickHelpText( TBX_ID_LIST, String( GAL_RESID( RID_SVXSTR_GALLERY_LISTVIEW ) ) ); + maViewBox.SetQuickHelpText( TBX_ID_LIST, GAL_RESSTR(RID_SVXSTR_GALLERY_LISTVIEW) ); maViewBox.SetBorder( 0, 1 ); MiscHdl( NULL ); maViewBox.SetSelectHdl( LINK( this, GalleryBrowser2, SelectTbxHdl ) ); maViewBox.Show(); - mpIconView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) )); - mpListView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) )); + mpIconView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); + mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); maInfoBar.Show(); maSeparator.Show(); @@ -648,9 +648,9 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName ) mpListView = new GalleryListView( this, mpCurTheme ); mpPreview = new GalleryPreview( this, mpCurTheme ); - mpIconView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) )); - mpListView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) )); - mpPreview->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_PREVIEW ) )); + mpIconView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); + mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); + mpPreview->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_PREVIEW)); const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); @@ -1013,7 +1013,7 @@ void GalleryBrowser2::ImplExecute( sal_uInt16 nId ) case( MN_DELETE ): { if( !mpCurTheme->IsReadOnly() && - QueryBox( NULL, WB_YES_NO, String( GAL_RESID( RID_SVXSTR_GALLERY_DELETEOBJ ) ) ).Execute() == RET_YES ) + QueryBox(NULL, WB_YES_NO, GAL_RESSTR(RID_SVXSTR_GALLERY_DELETEOBJ)).Execute() == RET_YES ) { mpCurTheme->RemoveObject( mnCurActionPos ); } @@ -1235,8 +1235,8 @@ IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl) { maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() ); - BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() ); - BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() ); + BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RES( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() ); + BitmapEx aListBmpEx = BitmapEx( Image( GAL_RES( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() ); if( maMiscOptions.AreCurrentSymbolsLarge() ) { diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 3565f54afe52..2a00e5cdd2b7 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -89,7 +89,7 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL ) Graphic aGraphic; if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ) { - aGraphic = BitmapEx( GAL_RESID( RID_SVXBMP_GALLERY_MEDIA ) ); + aGraphic = BitmapEx( GAL_RES( RID_SVXBMP_GALLERY_MEDIA ) ); } else { @@ -480,8 +480,8 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme SetMode( BROWSER_AUTO_VSCROLL | BROWSER_AUTOSIZE_LASTCOL ); SetDataRowHeight( 28 ); - InsertDataColumn( GALLERY_BRWBOX_TITLE, String( GAL_RESID( RID_SVXSTR_GALLERY_TITLE ) ), 256 ); - InsertDataColumn( GALLERY_BRWBOX_PATH, String( GAL_RESID( RID_SVXSTR_GALLERY_PATH ) ), 256 ); + InsertDataColumn( GALLERY_BRWBOX_TITLE, GAL_RESSTR(RID_SVXSTR_GALLERY_TITLE), 256 ); + InsertDataColumn( GALLERY_BRWBOX_PATH, GAL_RESSTR(RID_SVXSTR_GALLERY_PATH), 256 ); } // ------------------------------------------------------------------------ @@ -593,7 +593,7 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa GraphicObject aGrfObj; if( pObj->GetObjKind() == SGA_OBJ_SOUND ) - aGrfObj = Graphic( BitmapEx( GAL_RESID( RID_SVXBMP_GALLERY_MEDIA ) ) ); + aGrfObj = Graphic( BitmapEx( GAL_RES( RID_SVXBMP_GALLERY_MEDIA ) ) ); else if( pObj->IsThumbBitmap() ) aGrfObj = Graphic( pObj->GetThumbBmp() ); else diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4ce012c8577e..670919b73cc8 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -77,7 +77,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin SetModified( _bNewFile ); if( nId && bThemeNameFromResource ) - aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) ); + aName = GAL_RESSTR( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ); if( aName.isEmpty() ) aName = rName; diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index a618e1dafa51..f6fe5620b529 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -88,7 +88,7 @@ ResMgr* GetGalleryResMgr() BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ) { - BitmapEx aBmpEx( GAL_RESID( nId ) ); + BitmapEx aBmpEx( GAL_RES( nId ) ); if( !aBmpEx.IsTransparent() ) aBmpEx = BitmapEx( aBmpEx.GetBitmap(), COL_LIGHTMAGENTA ); @@ -420,7 +420,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : if( mpFilter ) { - aProgressText = String( GAL_RESID( RID_SVXSTR_GALLERY_FILTER ) ); + aProgressText = GAL_RESSTR(RID_SVXSTR_GALLERY_FILTER); // mpFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) ); // sj: progress wasn't working up from SO7 at all // // so I am removing this. The gallery progress should // // be changed to use the XStatusIndicator instead of XProgressMonitor diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index f0db928d3824..b2ca47641e6f 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -214,7 +214,7 @@ const String SgaObject::GetTitle() const aResId.SetRT( RSC_STRING ); if ( pResMgr->IsAvailable( aResId ) ) { - aReturnValue = String( aResId ); + aReturnValue = aResId.toString(); } delete pResMgr; } @@ -363,7 +363,7 @@ Bitmap SgaObjectSound::GetThumbBmp() const break; } - const BitmapEx aBmpEx( GAL_RESID( nId ) ); + const BitmapEx aBmpEx( GAL_RES( nId ) ); const Color aTransColor( COL_WHITE ); return aBmpEx.GetBitmap( &aTransColor ); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index de4de7350e8f..d0e2ac8091dd 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1596,7 +1596,7 @@ const rtl::OUString& GalleryTheme::GetName() const { return IsImported() ? aImpo void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ ) - rListBox.InsertEntry( String( GAL_RESID( i ) ) ); + rListBox.InsertEntry(GAL_RESSTR(i)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 7e466b40a8e6..827ee6e63161 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -171,7 +171,7 @@ enum RndStdIds extern ResMgr* pSwResMgr; // Is in swapp0.cxx. #define SW_RES(i) ResId(i,*pSwResMgr) -#define SW_RESSTR(i) ResId::toString(SW_RES(i)) +#define SW_RESSTR(i) SW_RES(i).toString() ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > GetSpellChecker(); diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 2949c1e63046..4e46af13859f 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -1415,7 +1415,7 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId, { SolarMutexGuard aGuard; - sStr = SW_RES( nResId ); + sStr = SW_RESSTR( nResId ); } if( pArg1 ) diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index ce25435c7ba6..6e29527fa172 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -3202,7 +3202,7 @@ String SwDrawFrmFmt::GetDescription() const aResult = sSdrObjCachedComment; } else - aResult = SW_RES(STR_GRAPHIC); + aResult = SW_RESSTR(STR_GRAPHIC); return aResult; } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 16b5221b8cc5..b317fba3f895 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3568,7 +3568,7 @@ void SwColumnFrm::PaintBreak( ) const aSeq.realloc( aSeq.getLength( ) + 1 ); // Add the text above - rtl::OUString aBreakText = ResId::toString( SW_RES( STR_COLUMN_BREAK ) ); + rtl::OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK); basegfx::B2DVector aFontSize; OutputDevice* pOut = pGlobalShell->GetOut(); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 580e0452bf89..89d53d089ade 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -886,11 +886,11 @@ String SwOLEObj::GetDescription() { SvGlobalName aClassID( xEmbObj->getClassID() ); if ( SotExchange::IsMath( aClassID ) ) - aResult = SW_RES(STR_MATH_FORMULA); + aResult = SW_RESSTR(STR_MATH_FORMULA); else if ( SotExchange::IsChart( aClassID ) ) - aResult = SW_RES(STR_CHART); + aResult = SW_RESSTR(STR_CHART); else - aResult = SW_RES(STR_OLE); + aResult = SW_RESSTR(STR_OLE); } return aResult; diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 8e00a53e0311..38e02bb99a6c 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -130,13 +130,13 @@ String SwHistorySetFmt::GetDescription() const case SVX_BREAK_PAGE_BEFORE: case SVX_BREAK_PAGE_AFTER: case SVX_BREAK_PAGE_BOTH: - aResult = SW_RES(STR_UNDO_PAGEBREAKS); + aResult = SW_RESSTR(STR_UNDO_PAGEBREAKS); break; case SVX_BREAK_COLUMN_BEFORE: case SVX_BREAK_COLUMN_AFTER: case SVX_BREAK_COLUMN_BOTH: - aResult = SW_RES(STR_UNDO_COLBRKS); + aResult = SW_RESSTR(STR_UNDO_COLBRKS); break; default: diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 4f88c79ba007..028a9bf90e1b 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -684,7 +684,7 @@ SwRewriter SwUndoDelete::GetRewriter() const if (pSttStr != NULL && pEndStr != NULL && pSttStr->Len() == 0 && pEndStr->Len() == 0) { - aStr = SW_RES(STR_PARAGRAPH_UNDO); + aStr = SW_RESSTR(STR_PARAGRAPH_UNDO); } else { diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index df9e8e0689f7..9475c4fa7b0e 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -201,9 +201,9 @@ const SwPageFrm* SwHeaderFooterWin::GetPageFrame( ) void SwHeaderFooterWin::SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ) { // Compute the text to show - m_sLabel = ResId::toString( SW_RES( STR_HEADER_TITLE ) ); + m_sLabel = SW_RESSTR( STR_HEADER_TITLE ); if ( !m_bIsHeader ) - m_sLabel = ResId::toString( SW_RES( STR_FOOTER_TITLE ) ); + m_sLabel = SW_RESSTR( STR_FOOTER_TITLE ); sal_Int32 nPos = m_sLabel.lastIndexOf( rtl::OUString::createFromAscii( "%1" ) ); m_sLabel = m_sLabel.replaceAt( nPos, 2, GetPageFrame()->GetPageDesc()->GetName() ); diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index bea7a5c92aeb..1ad497c2edd1 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -279,7 +279,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) case SwContentAtPos::SW_REFMARK: if(aCntntAtPos.aFnd.pAttr) { - sTxt = SW_RES(STR_CONTENT_TYPE_SINGLE_REFERENCE); + sTxt = SW_RESSTR(STR_CONTENT_TYPE_SINGLE_REFERENCE); sTxt.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": ")); sTxt += ((const SwFmtRefMark*)aCntntAtPos.aFnd.pAttr)->GetRefName(); } diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 0809ed26bfa6..efd9930b78f0 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -1781,7 +1781,7 @@ String SwWrtShell::GetSelDescr() const switch (nSelType) { case nsSelectionType::SEL_GRF: - aResult = SW_RES(STR_GRAPHIC); + aResult = SW_RESSTR(STR_GRAPHIC); break; case nsSelectionType::SEL_FRM: @@ -1794,7 +1794,7 @@ String SwWrtShell::GetSelDescr() const break; case nsSelectionType::SEL_DRW: { - aResult = SW_RES(STR_DRAWING_OBJECTS); + aResult = SW_RESSTR(STR_DRAWING_OBJECTS); } break; default: diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx index 59b813a83344..a40111838235 100644 --- a/tools/inc/tools/config.hxx +++ b/tools/inc/tools/config.hxx @@ -41,14 +41,14 @@ struct ImplGroupData; class TOOLS_DLLPUBLIC Config { private: - XubString maFileName; - rtl::OString maGroupName; + rtl::OUString maFileName; + rtl::OString maGroupName; ImplConfigData* mpData; ImplGroupData* mpActGroup; - sal_uIntPtr mnDataUpdateId; - sal_uInt16 mnLockCount; - sal_Bool mbPersistence; - sal_Bool mbDummy1; + sal_uIntPtr mnDataUpdateId; + sal_uInt16 mnLockCount; + sal_Bool mbPersistence; + sal_Bool mbDummy1; #ifdef _CONFIG_CXX TOOLS_DLLPRIVATE sal_Bool ImplUpdateConfig() const; @@ -59,7 +59,7 @@ public: Config( const XubString& rFileName ); ~Config(); - const XubString& GetPathName() const { return maFileName; } + const rtl::OUString& GetPathName() const { return maFileName; } void SetGroup(const rtl::OString& rGroup); const rtl::OString& GetGroup() const { return maGroupName; } diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx index 2230556354ae..a96c1e21f5ef 100644 --- a/tools/inc/tools/resid.hxx +++ b/tools/inc/tools/resid.hxx @@ -29,8 +29,9 @@ #ifndef _TOOLS_RESID_HXX #define _TOOLS_RESID_HXX -#include <tools/solar.h> #include <osl/diagnose.h> +#include <rtl/ustring.hxx> +#include <tools/solar.h> #include "tools/toolsdllapi.h" struct RSHEADER_TYPE; @@ -44,10 +45,6 @@ class ResMgr; //- ResId - //--------- -namespace rtl { - class OUString; -} - class ResId { /* @@ -164,7 +161,8 @@ class ResId sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; } RSHEADER_TYPE* GetpResource() const { return m_pResource; } - static TOOLS_DLLPUBLIC rtl::OUString toString(const ResId& rId); + TOOLS_DLLPUBLIC rtl::OUString toString() const; + TOOLS_DLLPUBLIC operator rtl::OUString() const { return toString(); } }; #endif // _RESID_HXX diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 5a70c10e95f1..2c315f189596 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -737,7 +737,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId ) rTypeId.SetRT( RSC_STRING ); if ( rTypeId.GetResMgr()->IsAvailable( rTypeId ) ) { - aTypStr = ResId::toString(rTypeId); + aTypStr = rTypeId.toString(); // Versions Resource Klassenzeiger ans Ende setzen rTypeId.GetResMgr()->Increment( sizeof( RSHEADER_TYPE ) ); } diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx index 94884db24c27..f8d2dbd0d6b3 100644 --- a/tools/source/string/strucvt.cxx +++ b/tools/source/string/strucvt.cxx @@ -124,7 +124,7 @@ UniString& UniString::Assign( const rtl::OUString& rStr ) UniString::UniString( const ResId& rResId ) : mpData(NULL) { - rtl::OUString sStr(ResId::toString(rResId)); + rtl::OUString sStr(rResId.toString()); DBG_CTOR( UniString, DbgCheckUniString ); @@ -144,19 +144,19 @@ UniString::UniString( const ResId& rResId ) } -rtl::OUString ResId::toString(const ResId& rResId) +rtl::OUString ResId::toString() const { - rResId.SetRT( RSC_STRING ); - ResMgr* pResMgr = rResId.GetResMgr(); + SetRT( RSC_STRING ); + ResMgr* pResMgr = GetResMgr(); - if ( !pResMgr || !pResMgr->GetResource( rResId ) ) + if ( !pResMgr || !pResMgr->GetResource( *this ) ) { rtl::OUString sRet; #if OSL_DEBUG_LEVEL > 0 sRet = rtl::OUStringBuffer(). appendAscii(RTL_CONSTASCII_STRINGPARAM("<resource id ")). - append(static_cast<sal_Int32>(rResId.GetId())). + append(static_cast<sal_Int32>(GetId())). appendAscii(RTL_CONSTASCII_STRINGPARAM(" not found>")). makeStringAndClear(); #endif diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index 8a15dfe7a8ba..89b86de79058 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -282,7 +282,7 @@ LoginDialog::LoginDialog UniString aRequest; if ((nFlags & LF_NO_ACCOUNT) != 0 && !rRealm.isEmpty()) { - aRequest = ResId::toString(ResId(STR_LOGIN_REALM, *pResMgr)); + aRequest = ResId(STR_LOGIN_REALM, *pResMgr).toString(); aRequest.SearchAndReplaceAscii("%2", rRealm); } else diff --git a/vcl/inc/vcl/stdtext.hxx b/vcl/inc/vcl/stdtext.hxx index 693a2692b010..cd9b87f9c535 100644 --- a/vcl/inc/vcl/stdtext.hxx +++ b/vcl/inc/vcl/stdtext.hxx @@ -43,7 +43,7 @@ class Window; #define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) #define STANDARD_TEXT_LAST STANDARD_TEXT_SERVICE_NOT_AVAILABLE -XubString VCL_DLLPUBLIC GetStandardText( sal_uInt16 nStdText ); +rtl::OUString VCL_DLLPUBLIC GetStandardText( sal_uInt16 nStdText ); // ------------------------------------- // - Hilfsmethoden fuer Standard-Texte - diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index a0c4fcf6ee0a..d7d5e85ed120 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -36,13 +36,12 @@ // ======================================================================= -XubString GetStandardText( sal_uInt16 nStdText ) +rtl::OUString GetStandardText( sal_uInt16 nStdText ) { ResMgr* pResMgr = ImplGetResMgr(); - XubString aText; if( pResMgr ) - aText = XubString( ResId( nStdText-STANDARD_TEXT_FIRST+SV_STDTEXT_FIRST, *pResMgr ) ); - return aText; + return ResId(nStdText-STANDARD_TEXT_FIRST+SV_STDTEXT_FIRST, *pResMgr); + return rtl::OUString(); } // ======================================================================= diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index e2809d995d80..d2eb8bf68d19 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -400,11 +400,11 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - String aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr)); - String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)); + String aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr).toString()); + String aMessage((ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)).toString()); aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US); - aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr)); + aMessage += ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString(); int ret = ImplGetSalSystem()->ShowNativeMessageBox( aTitle, @@ -424,11 +424,11 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - String aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr)); - String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)); + String aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr).toString()); + String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US); - aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr)); + aMessage += ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString(); int ret = ImplGetSalSystem()->ShowNativeMessageBox( aTitle, @@ -448,11 +448,11 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - String aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr)); - String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)); + String aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr).toString()); + String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US); - aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr)); + aMessage += ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString(); int ret = ImplGetSalSystem()->ShowNativeMessageBox( aTitle, @@ -472,11 +472,11 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - String aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr)); - String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)); + String aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr).toString()); + String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US); - aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr)); + aMessage += ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString(); int ret = ImplGetSalSystem()->ShowNativeMessageBox( aTitle, @@ -497,15 +497,15 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled) if( bErrorMessage && pResMgr ) { String aTitle; - String aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr)); + String aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr).toString()); if( 0 == e.Message.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassNotFound")), 13) ) { - aTitle = String(ResId(SV_ACCESSERROR_MISSING_BRIDGE, *pResMgr)); + aTitle = ResId(SV_ACCESSERROR_MISSING_BRIDGE, *pResMgr).toString(); } else if( 0 == e.Message.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NoSuchMethod")), 12) ) { - aTitle = String(ResId(SV_ACCESSERROR_WRONG_VERSION, *pResMgr)); + aTitle = ResId(SV_ACCESSERROR_WRONG_VERSION, *pResMgr).toString(); } if( aTitle.Len() != 0 ) @@ -516,7 +516,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled) // startup. Since the office will be probably unusable for a disabled user, we offer // to terminate directly. aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US); - aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr)); + aMessage += ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString(); int ret = ImplGetSalSystem()->ShowNativeMessageBox( aTitle, diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index fd8d002bdccc..3e09946ed16f 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -150,8 +150,7 @@ XubString Button::GetStandardText( StandardButtonType eButton ) if( pResMgr ) { sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId; - ResId aResId( nResId, *pResMgr ); - aText = String( aResId ); + aText = ResId(nResId, *pResMgr).toString(); // Windows (apparently) has some magic auto-accelerator evil around // ok / cancel so add this only for Unix diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index ad45bd1244b7..012562f5a465 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2931,7 +2931,7 @@ void OutputDevice::ImplInitFontList() const ResMgr* pMgr = ImplGetResMgr(); if( pMgr ) { - String aResStr( ResId( SV_ACCESSERROR_NO_FONTS, *pMgr ) ); + String aResStr(ResId(SV_ACCESSERROR_NO_FONTS, *pMgr).toString()); if( aResStr.Len() ) aError = aResStr; } diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 1a4b9405c390..0df6e9d4a8d8 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -260,7 +260,7 @@ static rtl::OUString queryFile( Printer* pPrinter ) xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.PRN" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) ); #endif // add arbitrary files - xFilterMgr->appendFilter( String( VclResId( SV_STDTEXT_ALLFILETYPES ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) ); + xFilterMgr->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*"); } catch (const lang::IllegalArgumentException&) { diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 712c3b398578..22dff3573389 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -998,7 +998,7 @@ String ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData, } if( nHelpId && ImplGetResMgr() ) - aHelpStr = String( ResId( nHelpId, *ImplGetResMgr() ) ); + aHelpStr = ResId(nHelpId, *ImplGetResMgr()).toString(); return aHelpStr; } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index eaca00dc0c9c..39536d7dfd15 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -3675,7 +3675,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) { - String aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) ); + rtl::OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) ); MenuItemData* pData = pItemList->Insert( 0xFFFF, MENUITEM_STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF ); pData->bIsTemporary = sal_True; @@ -5163,15 +5163,15 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) : aCloser.InsertItem( IID_DOCUMENTCLOSE, aCloser.maImage, 0 ); aCloser.SetSelectHdl( LINK( this, MenuBarWindow, CloserHdl ) ); aCloser.AddEventListener( LINK( this, MenuBarWindow, ToolboxEventHdl ) ); - aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, XubString( ResId( SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr ) ) ); + aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, ResId(SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr).toString() ); aFloatBtn.SetClickHdl( LINK( this, MenuBarWindow, FloatHdl ) ); aFloatBtn.SetSymbol( SYMBOL_FLOAT ); - aFloatBtn.SetQuickHelpText( XubString( ResId( SV_HELPTEXT_RESTORE, *pResMgr ) ) ); + aFloatBtn.SetQuickHelpText( ResId(SV_HELPTEXT_RESTORE, *pResMgr).toString() ); aHideBtn.SetClickHdl( LINK( this, MenuBarWindow, HideHdl ) ); aHideBtn.SetSymbol( SYMBOL_HIDE ); - aHideBtn.SetQuickHelpText( XubString( ResId( SV_HELPTEXT_MINIMIZE, *pResMgr ) ) ); + aHideBtn.SetQuickHelpText( ResId(SV_HELPTEXT_MINIMIZE, *pResMgr).toString() ); } ImplInitStyleSettings(); diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 4e5e796657f9..6863d2e81507 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -520,7 +520,7 @@ void WarningBox::SetDefaultCheckBoxText() { ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) - maCheckBoxText = XubString( ResId( SV_STDTEXT_DONTWARNAGAIN, *pResMgr ) ); + maCheckBoxText = ResId(SV_STDTEXT_DONTWARNAGAIN, *pResMgr).toString(); } // ----------------------------------------------------------------------- @@ -611,7 +611,7 @@ void QueryBox::SetDefaultCheckBoxText() { ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) - maCheckBoxText = XubString( ResId( SV_STDTEXT_DONTASKAGAIN, *pResMgr ) ); + maCheckBoxText = ResId(SV_STDTEXT_DONTASKAGAIN, *pResMgr).toString(); } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index ddbbc76d3a3b..f3386100d5ef 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -65,7 +65,7 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const Re : Window( i_pParent, i_rId ) , maOrigSize( 10, 10 ) , maPageVDev( *this ) - , maToolTipString( String( VclResId( SV_PRINT_PRINTPREVIEW_TXT ) ) ) + , maToolTipString(VclResId( SV_PRINT_PRINTPREVIEW_TXT).toString()) , mbGreyscale( false ) , maHorzDim( this, WB_HORZ | WB_CENTER ) , maVertDim( this, WB_VERT | WB_VCENTER ) @@ -732,11 +732,11 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont , maCancelButton( this, VclResId( SV_PRINT_CANCEL ) ) , maHelpButton( this, VclResId( SV_PRINT_HELP ) ) , maPController( i_rController ) - , maNoPageStr( String( VclResId( SV_PRINT_NOPAGES ) ) ) + , maNoPageStr( VclResId( SV_PRINT_NOPAGES ).toString() ) , mnCurPage( 0 ) , mnCachedPages( 0 ) - , maPrintToFileText( String( VclResId( SV_PRINT_TOFILE_TXT ) ) ) - , maDefPrtText( String( VclResId( SV_PRINT_DEFPRT_TXT ) ) ) + , maPrintToFileText( VclResId( SV_PRINT_TOFILE_TXT ).toString() ) + , maDefPrtText( VclResId( SV_PRINT_DEFPRT_TXT ).toString() ) , mbShowLayoutPage( sal_True ) { FreeResource(); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 64bec907b4f3..2d5d88113a09 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2708,7 +2708,7 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt ) XubString aStr; ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) - aStr = XubString( ResId( nHelpResId, *pResMgr ) ); + aStr = ResId( nHelpResId, *pResMgr ).toString(); if ( rHEvt.GetMode() & HELPMODE_BALLOON ) Help::ShowBalloon( this, aHelpRect.Center(), aHelpRect, aStr ); else diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index b12d4e1f99da..19796be9d326 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -85,9 +85,11 @@ rtl::OUString SalGtkPicker::getResString( sal_Int32 aId ) // translate the control id to a resource id sal_Int16 aResId = CtrlIdToResId( aId ); if ( aResId > -1 ) - aResString = String( ResId( aResId, *ImplGetResMgr() ) ); + aResString = ResId(aResId, *ImplGetResMgr()).toString(); + } + catch(...) + { } - catch(...) { } return aResString.replace('~', '_'); } diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 709bb30a29db..e596aae2b615 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -73,7 +73,7 @@ int RTFTokenizer::resolveParse() if (m_xStatusIndicator.is()) { static ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILocale()); - OUString sDocLoad(ResId::toString(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr))); + OUString sDocLoad(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr).toString()); sal_uInt32 nCurrentPos = Strm().Tell(); Strm().Seek(STREAM_SEEK_TO_END); |