diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-05-17 21:08:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-17 21:08:15 +0100 |
commit | 5ba99a8055faa6c2c4e5e69c5874d4d01abc5e8a (patch) | |
tree | 2e2652fb25c9b80fd877eee3705ca58b35c8237b /basctl | |
parent | e049dd5f11dab0b29b85d8977a78cacef1ee22f9 (diff) |
drop IDE_RESSTR
Change-Id: Iee1479d472d224bdf19890bbac29d9eeb4e3d00d
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/basicbox.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/basicrenderable.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/baside2.cxx | 14 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 20 | ||||
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 26 | ||||
-rw-r--r-- | basctl/source/basicide/basides1.cxx | 8 | ||||
-rw-r--r-- | basctl/source/basicide/basides2.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/basidesh.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/basobj2.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/basobj3.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/bastype2.cxx | 8 | ||||
-rw-r--r-- | basctl/source/basicide/bastypes.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/macrodlg.cxx | 12 | ||||
-rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 52 | ||||
-rw-r--r-- | basctl/source/basicide/moduldlg.cxx | 14 | ||||
-rw-r--r-- | basctl/source/basicide/objdlg.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/scriptdocument.cxx | 12 | ||||
-rw-r--r-- | basctl/source/dlged/managelang.cxx | 4 | ||||
-rw-r--r-- | basctl/source/dlged/propbrw.cxx | 8 | ||||
-rw-r--r-- | basctl/source/inc/iderid.hxx | 5 |
20 files changed, 106 insertions, 111 deletions
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 53ff103998df..7d97fe6d5bd2 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -165,7 +165,7 @@ void LibBox::Update( const SfxStringItem* pItem ) { aCurText = pItem->GetValue(); if ( aCurText.isEmpty() ) - aCurText = OUString( IDEResId( RID_STR_ALL ) ); + aCurText = IDEResId(RID_STR_ALL); } if ( GetSelectEntry() != aCurText ) @@ -198,7 +198,7 @@ void LibBox::FillBox() ClearBox(); // create list box entries - sal_Int32 nPos = InsertEntry( OUString( IDEResId( RID_STR_ALL ) ) ); + sal_Int32 nPos = InsertEntry(IDEResId(RID_STR_ALL)); SetEntryData( nPos, new LibEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_UNKNOWN, OUString() ) ); InsertEntries( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_USER ); InsertEntries( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_SHARE ); diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index 495176265bcb..f6f2b5a9649e 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -44,12 +44,12 @@ Renderable::Renderable (BaseWindow* pWin) aPrintRangeOpt.maGroupHint = "PrintRange" ; aPrintRangeOpt.mbInternalOnly = true; m_aUIProperties[0].Value = setSubgroupControlOpt("printrange", - IDE_RESSTR( RID_STR_PRINTDLG_RANGE ), OUString(), aPrintRangeOpt); + IDEResId( RID_STR_PRINTDLG_RANGE ), OUString(), aPrintRangeOpt); // create a choice for the range to print OUString aPrintContentName( "PrintContent" ); - const Sequence<OUString> aChoices{IDE_RESSTR(RID_STR_PRINTDLG_ALLPAGES), - IDE_RESSTR(RID_STR_PRINTDLG_PAGES)}; + const Sequence<OUString> aChoices{IDEResId(RID_STR_PRINTDLG_ALLPAGES), + IDEResId(RID_STR_PRINTDLG_PAGES)}; const Sequence<OUString> aHelpIds{".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0", ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1"}; const Sequence<OUString> aWidgetIds{"printallpages", diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index d24597ed819a..fb9f3d11939f 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -133,7 +133,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, if( bOutput ) { - OUString aPageStr = " [" + IDE_RESSTR(RID_STR_PAGE) + " " + OUString::number( nCurPage ) + "]"; + OUString aPageStr = " [" + OUString(IDEResId(RID_STR_PAGE)) + " " + OUString::number( nCurPage ) + "]"; pPrinter->DrawText( aPos, aPageStr ); } } @@ -304,7 +304,7 @@ void ModulWindow::BasicExecute() { if ( !aDocument.allowMacros() ) { - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_CANNOTRUNMACRO), VclMessageType::Warning)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_CANNOTRUNMACRO), VclMessageType::Warning)->Execute(); return; } } @@ -408,7 +408,7 @@ void ModulWindow::LoadBasic() xFP->setDisplayDirectory ( m_sCurPath ); xFP->appendFilter( "BASIC" , "*.bas" ); - xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All ); + xFP->appendFilter( IDEResId(RID_STR_FILTER_ALLFILES), FilterMask_All ); xFP->setCurrentFilter( "BASIC" ); if( xFP->execute() == RET_OK ) @@ -422,7 +422,7 @@ void ModulWindow::LoadBasic() AssertValidEditEngine(); sal_uLong nLines = CalcLineCount( *pStream ); // nLines*4: ReadText/Formatting/Highlighting/Formatting - GetEditorWindow().CreateProgress( IDEResId(RID_STR_GENERATESOURCE).toString(), nLines*4 ); + GetEditorWindow().CreateProgress( IDEResId(RID_STR_GENERATESOURCE), nLines*4 ); GetEditEngine()->SetUpdateMode( false ); GetEditView()->Read( *pStream ); GetEditEngine()->SetUpdateMode( true ); @@ -434,7 +434,7 @@ void ModulWindow::LoadBasic() ErrorHandler::HandleError( nError ); } else - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_COULDNTREAD))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_COULDNTREAD))->Execute(); } } @@ -454,7 +454,7 @@ void ModulWindow::SaveBasicSource() xFP->setDisplayDirectory ( m_sCurPath ); xFP->appendFilter( "BASIC", "*.bas" ); - xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All ); + xFP->appendFilter( IDEResId(RID_STR_FILTER_ALLFILES), FilterMask_All ); xFP->setCurrentFilter( "BASIC" ); if( xFP->execute() == RET_OK ) @@ -1434,7 +1434,7 @@ void ModulWindowLayout::UpdateDebug (bool bBasicStopped) void ModulWindowLayout::Paint (vcl::RenderContext& rRenderContext, tools::Rectangle const&) { - rRenderContext.DrawText(Point(), IDEResId(RID_STR_NOMODULE).toString()); + rRenderContext.DrawText(Point(), IDEResId(RID_STR_NOMODULE)); } void ModulWindowLayout::Activating (BaseWindow& rChild) diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 8b9137db9262..3a9d1d4bc405 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -478,7 +478,7 @@ bool EditorWindow::ImpCanModify() { // If in Trace-mode, abort the trace or refuse input // Remove markers in the modules in Notify at Basic::Stopped - if (ScopedVclPtrInstance<QueryBox>(nullptr, WB_OK_CANCEL, IDEResId(RID_STR_WILLSTOPPRG).toString())->Execute() == RET_OK) + if (ScopedVclPtrInstance<QueryBox>(nullptr, WB_OK_CANCEL, IDEResId(RID_STR_WILLSTOPPRG))->Execute() == RET_OK) { rModulWindow.GetBasicStatus().bIsRunning = false; StopBasic(); @@ -980,7 +980,7 @@ void EditorWindow::CreateEditEngine() // it could be cut down on one formatting but you would wait even longer // for the text then if the source code is long... pProgress.reset(new ProgressInfo(GetShell()->GetViewFrame()->GetObjectShell(), - IDEResId(RID_STR_GENERATESOURCE).toString(), + IDEResId(RID_STR_GENERATESOURCE), nLines * 4)); setTextEngineText(*pEditEngine, aOUSource); @@ -1552,10 +1552,10 @@ WatchWindow::WatchWindow (Layout* pParent) WB_HASLINESATROOT | WB_HASBUTTONSATROOT)) , aHeaderBar(VclPtr<HeaderBar>::Create(this, WB_BUTTONSTYLE | WB_BORDER)) { - aXEdit->SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString()); + aXEdit->SetAccessibleName(IDEResId(RID_STR_WATCHNAME)); aXEdit->SetHelpId(HID_BASICIDE_WATCHWINDOW_EDIT); aXEdit->SetSizePixel(aXEdit->LogicToPixel(Size(80, 12), MapUnit::MapAppFont)); - aTreeListBox->SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString()); + aTreeListBox->SetAccessibleName(IDEResId(RID_STR_WATCHNAME)); long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3; aXEdit->SetPosPixel( Point( nTextLen, 3 ) ); @@ -1597,9 +1597,9 @@ WatchWindow::WatchWindow (Layout* pParent) long nVarTabWidth = 220; long nValueTabWidth = 100; long nTypeTabWidth = 1250; - aHeaderBar->InsertItem( ITEM_ID_VARIABLE, IDEResId(RID_STR_WATCHVARIABLE).toString(), nVarTabWidth ); - aHeaderBar->InsertItem( ITEM_ID_VALUE, IDEResId(RID_STR_WATCHVALUE).toString(), nValueTabWidth ); - aHeaderBar->InsertItem( ITEM_ID_TYPE, IDEResId(RID_STR_WATCHTYPE).toString(), nTypeTabWidth ); + aHeaderBar->InsertItem( ITEM_ID_VARIABLE, IDEResId(RID_STR_WATCHVARIABLE), nVarTabWidth ); + aHeaderBar->InsertItem( ITEM_ID_VALUE, IDEResId(RID_STR_WATCHVALUE), nValueTabWidth ); + aHeaderBar->InsertItem( ITEM_ID_TYPE, IDEResId(RID_STR_WATCHTYPE), nTypeTabWidth ); long tabs[ 4 ]; tabs[ 0 ] = 3; // two tabs @@ -1615,7 +1615,7 @@ WatchWindow::WatchWindow (Layout* pParent) aTreeListBox->Show(); - SetText(IDEResId(RID_STR_WATCHNAME).toString()); + SetText(IDEResId(RID_STR_WATCHNAME)); SetHelpId( HID_BASICIDE_WATCHWINDOW ); @@ -1832,14 +1832,14 @@ StackWindow::StackWindow (Layout* pParent) : aStackStr( IDEResId( RID_STR_STACK ) ) { aTreeListBox->SetHelpId(HID_BASICIDE_STACKWINDOW_LIST); - aTreeListBox->SetAccessibleName(IDEResId(RID_STR_STACKNAME).toString()); + aTreeListBox->SetAccessibleName(IDEResId(RID_STR_STACKNAME)); aTreeListBox->SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) ); aTreeListBox->SetHighlightRange(); aTreeListBox->SetSelectionMode( SelectionMode::NONE ); aTreeListBox->InsertEntry( OUString() ); aTreeListBox->Show(); - SetText(IDEResId(RID_STR_STACKNAME).toString()); + SetText(IDEResId(RID_STR_STACKNAME)); SetHelpId( HID_BASICIDE_STACKWINDOW ); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index fa499ae2dcc9..affd163b25ce 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -605,9 +605,9 @@ void DialogWindow::SaveDialog() xFP->setDefaultName( GetName() ); - OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); + OUString aDialogStr(IDEResId(RID_STR_STDDIALOGNAME)); xFP->appendFilter( aDialogStr, "*.xdl" ); - xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All ); + xFP->appendFilter( IDEResId(RID_STR_FILTER_ALLFILES), FilterMask_All ); xFP->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) @@ -739,7 +739,7 @@ void DialogWindow::SaveDialog() } } else - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_COULDNTWRITE))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_COULDNTWRITE))->Execute(); } } @@ -794,9 +794,9 @@ NameClashQueryBox::NameClashQueryBox( vcl::Window* pParent, maMessText = rMessage; - AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_RENAME), RET_YES, + AddButton( IDEResId(RID_STR_DLGIMP_CLASH_RENAME), RET_YES, ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus ); - AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_REPLACE), RET_NO ); + AddButton( IDEResId(RID_STR_DLGIMP_CLASH_REPLACE), RET_NO ); AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel ); SetImage( QueryBox::GetStandardImage() ); @@ -818,9 +818,9 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( vcl::Window* pParent, SetText( rTitle ); maMessText = rMessage; - AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_ADD), RET_YES, + AddButton( IDEResId(RID_STR_DLGIMP_MISMATCH_ADD), RET_YES, ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus ); - AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_OMIT), RET_NO ); + AddButton( IDEResId(RID_STR_DLGIMP_MISMATCH_OMIT), RET_NO ); AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel ); AddButton( StandardButtonType::Help, RET_HELP, ButtonDialogFlags::Help, 4 ); @@ -845,9 +845,9 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script if ( !aCurPath.isEmpty() ) xFP->setDisplayDirectory ( aCurPath ); - OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); + OUString aDialogStr(IDEResId(RID_STR_STDDIALOGNAME)); xFP->appendFilter( aDialogStr, "*.xdl" ); - xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All ); + xFP->appendFilter( IDEResId(RID_STR_FILTER_ALLFILES), FilterMask_All ); xFP->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) @@ -907,8 +907,8 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script NameClashMode eNameClashMode = NO_CLASH; if( bDialogAlreadyExists ) { - OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE)); - OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT)); + OUString aQueryBoxTitle(IDEResId(RID_STR_DLGIMP_CLASH_TITLE)); + OUString aQueryBoxText(IDEResId(RID_STR_DLGIMP_CLASH_TEXT)); aQueryBoxText = aQueryBoxText.replaceAll("$(ARG1)", aXmlDlgName); ScopedVclPtrInstance< NameClashQueryBox > aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); @@ -971,8 +971,8 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script bool bAddDialogLanguagesToLib = false; if( nOnlyInImportLanguageCount > 0 ) { - OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE)); - OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT)); + OUString aQueryBoxTitle(IDEResId(RID_STR_DLGIMP_MISMATCH_TITLE)); + OUString aQueryBoxText(IDEResId(RID_STR_DLGIMP_MISMATCH_TEXT)); ScopedVclPtrInstance< LanguageMismatchQueryBox > aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); sal_uInt16 nRet = aQueryBox->Execute(); if( nRet == RET_YES ) diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index a6f59641b13e..61be4c544eed 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -99,7 +99,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) nActModWindows++; } - if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && ScopedVclPtrInstance<QueryBox>(pCurWin, WB_YES_NO|WB_DEF_YES, IDEResId(RID_STR_SEARCHALLMODULES).toString())->Execute() == RET_YES ) ) + if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && ScopedVclPtrInstance<QueryBox>(pCurWin, WB_YES_NO|WB_DEF_YES, IDEResId(RID_STR_SEARCHALLMODULES))->Execute() == RET_YES ) ) { for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it) { @@ -110,7 +110,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) else nFound = pCurWin->StartSearchAndReplace(rSearchItem); - OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES)); + OUString aReplStr(IDEResId(RID_STR_SEARCHREPLACES)); aReplStr = aReplStr.replaceAll("XX", OUString::number(nFound)); ScopedVclPtrInstance<InfoBox>(pCurWin, aReplStr)->Execute(); } @@ -138,7 +138,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) SfxViewFrame* pViewFrame = GetViewFrame(); SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow( SID_SEARCH_DLG ) : nullptr; vcl::Window* pParent = pChildWin ? pChildWin->GetWindow() : nullptr; - ScopedVclPtrInstance< QueryBox > aQuery(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART)); + ScopedVclPtrInstance< QueryBox > aQuery(pParent, WB_YES_NO|WB_DEF_YES, IDEResId(RID_STR_SEARCHFROMSTART)); if ( aQuery->Execute() == RET_YES ) { it = aWindowTable.begin(); @@ -179,7 +179,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) SetCurWindow( pWin, true ); } if ( !nFound && !bCanceled ) - ScopedVclPtrInstance<InfoBox>(pCurWin, IDEResId(RID_STR_SEARCHNOTFOUND).toString())->Execute(); + ScopedVclPtrInstance<InfoBox>(pCurWin, IDEResId(RID_STR_SEARCHNOTFOUND))->Execute(); } rReq.Done(); diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index eb5c9b01f410..82c4e1a261c1 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -103,12 +103,12 @@ void Shell::SetMDITitle() aTitle = m_aCurDocument.getTitle(eLocation) + "." + m_aCurLibName ; } else - aTitle = IDE_RESSTR(RID_STR_ALL) ; + aTitle = IDEResId(RID_STR_ALL) ; DocumentSignature aCurSignature( m_aCurDocument ); if ( aCurSignature.getScriptingSignatureState() == SignatureState::OK ) { - aTitle += " " + IDE_RESSTR(RID_STR_SIGNED) + " "; + aTitle += " " + OUString(IDEResId(RID_STR_SIGNED)) + " "; } SfxViewFrame* pViewFrame = GetViewFrame(); diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 804e0e3ecdc1..1dc25a3aa38b 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -386,7 +386,7 @@ bool Shell::PrepareClose( bool bUI ) if( bUI ) { vcl::Window *pParent = &GetViewFrame()->GetWindow(); - ScopedVclPtrInstance<InfoBox>(pParent, IDE_RESSTR(RID_STR_CANNOTCLOSE))->Execute(); + ScopedVclPtrInstance<InfoBox>(pParent, IDEResId(RID_STR_CANNOTCLOSE))->Execute(); } return false; } diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index d974ac2266be..59267871fc17 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -153,7 +153,7 @@ bool RenameModule ( if ( rDocument.hasModule( rLibName, rNewName ) ) { - ScopedVclPtrInstance< MessageDialog > aError(pErrorParent, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2)); + ScopedVclPtrInstance< MessageDialog > aError(pErrorParent, IDEResId(RID_STR_SBXNAMEALLREADYUSED2)); aError->Execute(); return false; } @@ -161,7 +161,7 @@ bool RenameModule ( // #i74440 if ( rNewName.isEmpty() ) { - ScopedVclPtrInstance< MessageDialog > aError(pErrorParent, IDE_RESSTR(RID_STR_BADSBXNAME)); + ScopedVclPtrInstance< MessageDialog > aError(pErrorParent, IDEResId(RID_STR_BADSBXNAME)); aError->Execute(); return false; } diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index d1bd544b5bc7..48edafe675e4 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -143,7 +143,7 @@ bool RenameDialog ( if ( rDocument.hasDialog( rLibName, rNewName ) ) { - ScopedVclPtrInstance< MessageDialog > aError(pErrorParent, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2)); + ScopedVclPtrInstance< MessageDialog > aError(pErrorParent, IDEResId(RID_STR_SBXNAMEALLREADYUSED2)); aError->Execute(); return false; } @@ -151,7 +151,7 @@ bool RenameDialog ( // #i74440 if ( rNewName.isEmpty() ) { - ScopedVclPtrInstance< MessageDialog > aError(pErrorParent, IDE_RESSTR(RID_STR_BADSBXNAME)); + ScopedVclPtrInstance< MessageDialog > aError(pErrorParent, IDEResId(RID_STR_BADSBXNAME)); aError->Execute(); return false; } diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index ca63f9ca569e..86a5f2c26aba 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -383,10 +383,10 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) { auto const aEntries = { - std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ), - std::make_pair( OBJ_TYPE_USERFORMS, IDE_RESSTR(RID_STR_USERFORMS) ), - std::make_pair( OBJ_TYPE_NORMAL_MODULES, IDE_RESSTR(RID_STR_NORMAL_MODULES) ), - std::make_pair( OBJ_TYPE_CLASS_MODULES, IDE_RESSTR(RID_STR_CLASS_MODULES) ) }; + std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, IDEResId(RID_STR_DOCUMENT_OBJECTS) ), + std::make_pair( OBJ_TYPE_USERFORMS, IDEResId(RID_STR_USERFORMS) ), + std::make_pair( OBJ_TYPE_NORMAL_MODULES, IDEResId(RID_STR_NORMAL_MODULES) ), + std::make_pair( OBJ_TYPE_CLASS_MODULES, IDEResId(RID_STR_CLASS_MODULES) ) }; for( auto const & iter: aEntries ) { EntryType eType = iter.first; diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index c46320ccb07f..6dee3ba0f564 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -759,7 +759,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, // set new title if ( bNewTitle ) { - OUString aTitle(IDE_RESSTR(RID_STR_ENTERPASSWORD)); + OUString aTitle(IDEResId(RID_STR_ENTERPASSWORD)); aTitle = aTitle.replaceAll("XX", rLibName); aDlg->SetText( aTitle ); } @@ -781,7 +781,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, if ( !bOK ) { - ScopedVclPtrInstance< MessageDialog > aErrorBox(Application::GetDefDialogParent(), IDE_RESSTR(RID_STR_WRONGPASSWORD)); + ScopedVclPtrInstance< MessageDialog > aErrorBox(Application::GetDefDialogParent(), IDEResId(RID_STR_WRONGPASSWORD)); aErrorBox->Execute(); } } diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index b77778efe407..fd0fadce4541 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -354,7 +354,7 @@ SbMethod* MacroChooser::CreateMacro() if ( !aModName.isEmpty() ) { // extract the module name from the string like "Sheet1 (Example1)" - if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) + if( aDesc.GetLibSubName() == IDEResId(RID_STR_DOCUMENT_OBJECTS) ) { sal_Int32 nIndex = 0; aModName = aModName.getToken( 0, ' ', nIndex ); @@ -444,7 +444,7 @@ void MacroChooser::CheckButtons() bNewDelIsDel = pMethod != nullptr; if (bPrev != bNewDelIsDel && nMode == All) { - OUString aBtnText( bNewDelIsDel ? IDEResId(RID_STR_BTNDEL).toString() : IDEResId(RID_STR_BTNNEW).toString() ); + OUString aBtnText( bNewDelIsDel ? IDEResId(RID_STR_BTNDEL) : IDEResId(RID_STR_BTNNEW) ); m_pDelButton->SetText( aBtnText ); } @@ -652,7 +652,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton, void ) OUString aLib( aDesc.GetLibName() ); OUString aMod( aDesc.GetName() ); // extract the module name from the string like "Sheet1 (Example1)" - if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) + if( aDesc.GetLibSubName() == IDEResId(RID_STR_DOCUMENT_OBJECTS) ) { sal_Int32 nIndex = 0; aMod = aMod.getToken( 0, ' ', nIndex ); @@ -805,7 +805,7 @@ void MacroChooser::SetMode (Mode nM) { case All: { - m_pRunButton->SetText(IDEResId(RID_STR_RUN).toString()); + m_pRunButton->SetText(IDEResId(RID_STR_RUN)); EnableButton(*m_pDelButton, true); EnableButton(*m_pOrganizeButton, true); break; @@ -813,7 +813,7 @@ void MacroChooser::SetMode (Mode nM) case ChooseOnly: { - m_pRunButton->SetText(IDEResId(RID_STR_CHOOSE).toString()); + m_pRunButton->SetText(IDEResId(RID_STR_CHOOSE)); EnableButton(*m_pDelButton, false); EnableButton(*m_pOrganizeButton, false); break; @@ -821,7 +821,7 @@ void MacroChooser::SetMode (Mode nM) case Recording: { - m_pRunButton->SetText(IDEResId(RID_STR_RECORD).toString()); + m_pRunButton->SetText(IDEResId(RID_STR_RECORD)); EnableButton(*m_pDelButton, false); EnableButton(*m_pOrganizeButton, false); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 5a2f06d497fa..897771d895ea 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -264,7 +264,7 @@ bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) OUString aLibName = GetEntryText( pEntry, 0 ); if ( aLibName.equalsIgnoreAsciiCase( "Standard" ) ) { - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_CANNOTCHANGENAMESTDLIB))->Execute(); return false; } @@ -274,7 +274,7 @@ bool CheckBox::EditingEntry( SvTreeListEntry* 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 ) ) ) { - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_LIBISREADONLY))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_LIBISREADONLY))->Execute(); return false; } @@ -324,7 +324,7 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName ) } catch (const container::ElementExistException& ) { - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_SBXNAMEALLREADYUSED))->Execute(); return false; } catch (const container::NoSuchElementException& ) @@ -337,9 +337,9 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName ) if ( !bValid ) { if ( rNewName.getLength() > 30 ) - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_LIBNAMETOLONG))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_LIBNAMETOLONG))->Execute(); else - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_BADSBXNAME))->Execute(); } return bValid; @@ -352,7 +352,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler, Button*, void) EndDialog(1); else { - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_BADSBXNAME))->Execute(); m_pEdit->GrabFocus(); } } @@ -369,13 +369,13 @@ NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode eMode, switch (eMode) { case ObjectMode::Library: - SetText( IDE_RESSTR(RID_STR_NEWLIB) ); + SetText( IDEResId(RID_STR_NEWLIB) ); break; case ObjectMode::Module: - SetText( IDE_RESSTR(RID_STR_NEWMOD) ); + SetText( IDEResId(RID_STR_NEWMOD) ); break; case ObjectMode::Dialog: - SetText( IDE_RESSTR(RID_STR_NEWDLG) ); + SetText( IDEResId(RID_STR_NEWDLG) ); break; default: assert(false); @@ -732,10 +732,10 @@ void LibPage::InsertLib() Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); // file open dialog Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILEOPEN_SIMPLE); - xFP->setTitle(IDEResId(RID_STR_APPENDLIBS).toString()); + xFP->setTitle(IDEResId(RID_STR_APPENDLIBS)); // filter - OUString aTitle(IDEResId(RID_STR_BASIC).toString()); + OUString aTitle(IDEResId(RID_STR_BASIC)); OUString aFilter; aFilter = "*.sbl;*.xlc;*.xlb" // library files ";*.sdw;*.sxw;*.odt" // text @@ -765,7 +765,7 @@ void LibPage::InsertLib() if ( !aLastFilter.isEmpty() ) xFP->setCurrentFilter( aLastFilter ); else - xFP->setCurrentFilter( IDE_RESSTR(RID_STR_BASIC) ); + xFP->setCurrentFilter( IDEResId(RID_STR_BASIC) ); if ( xFP->execute() == RET_OK ) { @@ -837,7 +837,7 @@ void LibPage::InsertLib() } if ( !pLibDlg ) - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_NOLIBINSTORAGE), VclMessageType::Info)->Execute(); else { bool bChanges = false; @@ -874,7 +874,7 @@ void LibPage::InsertLib() // check, if the library is the Standard library if ( aLibName == "Standard" ) { - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_REPLACESTDLIB))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_REPLACESTDLIB))->Execute(); continue; } @@ -882,8 +882,8 @@ 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 ) ) ) { - OUString aErrStr( IDE_RESSTR(RID_STR_REPLACELIB) ); - aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + IDE_RESSTR(RID_STR_LIBISREADONLY); + OUString aErrStr( IDEResId(RID_STR_REPLACELIB) ); + aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + OUString(IDEResId(RID_STR_LIBISREADONLY)); ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute(); continue; } @@ -895,10 +895,10 @@ void LibPage::InsertLib() { OUString aErrStr; if ( bReference ) - aErrStr = IDE_RESSTR(RID_STR_REFNOTPOSSIBLE); + aErrStr = IDEResId(RID_STR_REFNOTPOSSIBLE); else - aErrStr = IDE_RESSTR(RID_STR_IMPORTNOTPOSSIBLE); - aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" +IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED); + aErrStr = IDEResId(RID_STR_IMPORTNOTPOSSIBLE); + aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + OUString(IDEResId(RID_STR_SBXNAMEALLREADYUSED)); ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute(); continue; } @@ -916,7 +916,7 @@ void LibPage::InsertLib() if ( !bOK ) { - OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) ); + OUString aErrStr( IDEResId(RID_STR_NOIMPORT) ); aErrStr = aErrStr.replaceAll("XX", aLibName); ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute(); continue; @@ -1176,10 +1176,10 @@ void LibPage::ExportAsPackage( const OUString& aLibName ) Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILESAVE_SIMPLE); - xFP->setTitle(IDEResId(RID_STR_EXPORTPACKAGE).toString()); + xFP->setTitle(IDEResId(RID_STR_EXPORTPACKAGE)); // filter - OUString aTitle(IDEResId(RID_STR_PACKAGE_BUNDLE).toString()); + OUString aTitle(IDEResId(RID_STR_PACKAGE_BUNDLE)); OUString aFilter; aFilter = "*.oxt" ; // library files xFP->appendFilter( aTitle, aFilter ); @@ -1294,7 +1294,7 @@ void LibPage::ExportAsBasic( const OUString& aLibName ) Reference< XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, nullptr) ); - xFolderPicker->setTitle(IDEResId(RID_STR_EXPORTBASIC).toString()); + xFolderPicker->setTitle(IDEResId(RID_STR_EXPORTBASIC)); // set display directory and filter OUString aPath =GetExtraData()->GetAddLibPath(); @@ -1480,15 +1480,15 @@ void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument, if ( aLibName.getLength() > 30 ) { - ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_LIBNAMETOLONG).toString())->Execute(); + ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_LIBNAMETOLONG))->Execute(); } else if ( !IsValidSbxName( aLibName ) ) { - ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_BADSBXNAME).toString())->Execute(); + ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_BADSBXNAME))->Execute(); } else if ( rDocument.hasLibrary( E_SCRIPTS, aLibName ) || rDocument.hasLibrary( E_DIALOGS, aLibName ) ) { - ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString())->Execute(); + ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_SBXNAMEALLREADYUSED2))->Execute(); } else { diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 3029bfe92467..a9f64dcc2212 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -86,7 +86,7 @@ bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewT { if ( !IsValidSbxName(rNewText) ) { - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_BADSBXNAME))->Execute(); return false; } @@ -661,7 +661,7 @@ void ObjectPage::CheckButtons() // enable/disable delete button if ( nDepth >= 2 && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE ) { - if( bVBAEnabled && ( nMode & BrowseMode::Modules ) && ( ( nDepth == 2 ) || aLibSubName == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) ) + if( bVBAEnabled && ( nMode & BrowseMode::Modules ) && ( ( nDepth == 2 ) || aLibSubName == IDEResId(RID_STR_DOCUMENT_OBJECTS) ) ) m_pDelButton->Disable(); else m_pDelButton->Enable(); @@ -696,7 +696,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton, void ) { OUString aModName( aDesc.GetName() ); // extract the module name from the string like "Sheet1 (Example1)" - if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) + if( aDesc.GetLibSubName() == IDEResId(RID_STR_DOCUMENT_OBJECTS) ) { sal_Int32 nIndex = 0; aModName = aModName.getToken( 0, ' ', nIndex ); @@ -819,7 +819,7 @@ void ObjectPage::NewDialog() if ( aDocument.hasDialog( aLibName, aDlgName ) ) { - ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_SBXNAMEALLREADYUSED2))->Execute(); } else { @@ -944,7 +944,7 @@ void LibDialog::dispose() void LibDialog::SetStorageName( const OUString& rName ) { - OUString aName = IDE_RESSTR(RID_STR_FILENAME) + rName; + OUString aName = OUString(IDEResId(RID_STR_FILENAME)) + rName; m_pStorageFrame->set_label(aName); } @@ -1007,7 +1007,7 @@ SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument, if( pBasic && rDocument.isInVBAMode() ) { // add the new module in the "Modules" entry - SvTreeListEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES ); + SvTreeListEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDEResId(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES ); if( pLibSubEntry ) { if( !rBasicBox.IsExpanded( pLibSubEntry ) ) @@ -1033,7 +1033,7 @@ SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument, } catch (const container::ElementExistException& ) { - ScopedVclPtrInstance<MessageDialog>(pWin, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2))->Execute(); + ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_SBXNAMEALLREADYUSED2))->Execute(); } catch (const container::NoSuchElementException& ) { diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index eb9a4713e54e..31fe7a1c9208 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.cxx @@ -34,10 +34,10 @@ ObjectCatalog::ObjectCatalog (vcl::Window* pParent) , aTree(VclPtr<TreeListBox>::Create(this, WB_TABSTOP)) { SetHelpId("basctl:FloatingWindow:RID_BASICIDE_OBJCAT"); - SetText(IDEResId(RID_BASICIDE_OBJCAT).toString()); + SetText(IDEResId(RID_BASICIDE_OBJCAT)); // title - aTitle->SetText(IDEResId(RID_BASICIDE_OBJCAT).toString()); + aTitle->SetText(IDEResId(RID_BASICIDE_OBJCAT)); aTitle->SetStyle(WB_CENTER); // tree list @@ -47,7 +47,7 @@ ObjectCatalog::ObjectCatalog (vcl::Window* pParent) WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT ); - aTree->SetAccessibleName(IDEResId(RID_STR_TLB_MACROS).toString()); + aTree->SetAccessibleName(IDEResId(RID_STR_TLB_MACROS)); aTree->SetHelpId(HID_BASICIDE_OBJECTCAT); aTree->ScanAllEntries(); aTree->GrabFocus(); diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 1853334145cc..f85c8ad4a800 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -1485,9 +1485,9 @@ namespace basctl { switch ( _eType ) { - case LibraryType::Module: aTitle = IDE_RESSTR(RID_STR_USERMACROS); break; - case LibraryType::Dialog: aTitle = IDE_RESSTR(RID_STR_USERDIALOGS); break; - case LibraryType::All: aTitle = IDE_RESSTR(RID_STR_USERMACROSDIALOGS); break; + case LibraryType::Module: aTitle = IDEResId(RID_STR_USERMACROS); break; + case LibraryType::Dialog: aTitle = IDEResId(RID_STR_USERDIALOGS); break; + case LibraryType::All: aTitle = IDEResId(RID_STR_USERMACROSDIALOGS); break; default: break; } @@ -1496,9 +1496,9 @@ namespace basctl { switch ( _eType ) { - case LibraryType::Module: aTitle = IDE_RESSTR(RID_STR_SHAREMACROS); break; - case LibraryType::Dialog: aTitle = IDE_RESSTR(RID_STR_SHAREDIALOGS); break; - case LibraryType::All: aTitle = IDE_RESSTR(RID_STR_SHAREMACROSDIALOGS); break; + case LibraryType::Module: aTitle = IDEResId(RID_STR_SHAREMACROS); break; + case LibraryType::Dialog: aTitle = IDEResId(RID_STR_SHAREDIALOGS); break; + case LibraryType::All: aTitle = IDEResId(RID_STR_SHAREMACROSDIALOGS); break; default: break; } diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index a396f0fe0842..6ec85ace2663 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -58,8 +58,8 @@ bool localesAreEqual( const Locale& rLocaleLeft, const Locale& rLocaleRight ) ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, std::shared_ptr<LocalizationMgr> const & xLMgr) : ModalDialog(pParent, "ManageLanguagesDialog", "modules/BasicIDE/ui/managelanguages.ui") , m_xLocalizationMgr(xLMgr) - , m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG)) - , m_sCreateLangStr(IDE_RESSTR(RID_STR_CREATE_LANG)) + , m_sDefLangStr(IDEResId(RID_STR_DEF_LANG)) + , m_sCreateLangStr(IDEResId(RID_STR_CREATE_LANG)) { get(m_pLanguageLB, "treeview"); m_pLanguageLB->set_height_request(m_pLanguageLB->GetTextHeight() * 10); diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index ab46f11eda50..0d89250911d2 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -285,8 +285,8 @@ void PropBrw::implSetNewObjectSequence { xObjectInspector->inspect( _rObjectSeq ); - OUString aText = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES) - + IDE_RESSTR(RID_STR_BRWTITLE_MULTISELECT); + OUString aText = OUString(IDEResId(RID_STR_BRWTITLE_PROPERTIES)) + + OUString(IDEResId(RID_STR_BRWTITLE_MULTISELECT)); SetText( aText ); } } @@ -314,7 +314,7 @@ OUString PropBrw::GetHeadlineName( const Reference< XPropertySet >& _rxObject ) if (xServiceInfo.is()) // single selection { OUString sResId; - aName = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES); + aName = IDEResId(RID_STR_BRWTITLE_PROPERTIES); if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlDialogModel" ) ) { @@ -412,7 +412,7 @@ OUString PropBrw::GetHeadlineName( const Reference< XPropertySet >& _rxObject ) } else if (!_rxObject.is()) // no properties { - aName = IDE_RESSTR(RID_STR_BRWTITLE_NO_PROPERTIES); + aName = IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES); } return aName; diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx index 4fd8c54c1fc3..2658a2585333 100644 --- a/basctl/source/inc/iderid.hxx +++ b/basctl/source/inc/iderid.hxx @@ -31,11 +31,6 @@ public: IDEResId( sal_uInt16 nId ); }; -inline OUString IDE_RESSTR (sal_uInt16 nId) -{ - return IDEResId(nId).toString(); -} - } // namespace basctl #endif // INCLUDED_BASCTL_SOURCE_INC_IDERID_HXX |