diff options
Diffstat (limited to 'sw/source/uibase/misc')
| -rw-r--r-- | sw/source/uibase/misc/glshell.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/misc/numberingtypelistbox.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 18 | ||||
| -rw-r--r-- | sw/source/uibase/misc/swruler.cxx | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index 8dbf06f4d057..e3e6273a9fb5 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -95,7 +95,7 @@ static void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) if( !rSh.GetDoc()->getIDocumentState().IsModified() ) rSet.DisableItem( SID_SAVEDOC ); else - rSet.Put( SfxStringItem( SID_SAVEDOC, SW_RESSTR(STR_SAVE_GLOSSARY))); + rSet.Put( SfxStringItem( SID_SAVEDOC, SwResId(STR_SAVE_GLOSSARY))); } } @@ -228,7 +228,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString // set document title SfxViewFrame* pFrame = bShow ? SfxViewFrame::LoadDocument( *xDocSh, nViewId ) : SfxViewFrame::LoadHiddenDocument( *xDocSh, nViewId ); - const OUString aDocTitle(SW_RESSTR( STR_GLOSSARY ) + " " + sLongName); + const OUString aDocTitle(SwResId( STR_GLOSSARY ) + " " + sLongName); bool const bDoesUndo = xDocSh->GetDoc()->GetIDocumentUndoRedo().DoesUndo(); diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index bfd69cd51aa9..6f87678ab0a9 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -90,7 +90,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) pTypes = aTypes.getConstArray(); } } - ResStringArray aNames( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE )); + ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, *pSwResMgr)); for(size_t i = 0; i < aNames.Count(); i++) { sal_IntPtr nValue = aNames.GetValue(i); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index d2474432d08c..71306a2d9432 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -151,12 +151,12 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer : m_pParentDlg(pParent) , m_aTabPagesCTRL(VclPtr<SvxAcceptChgCtr>::Create(pContentArea, pBuilder)) , m_xPopup(pBuilder->get_menu("writermenu")) - , m_sInserted(SW_RES(STR_REDLINE_INSERTED)) - , m_sDeleted(SW_RES(STR_REDLINE_DELETED)) - , m_sFormated(SW_RES(STR_REDLINE_FORMATED)) - , m_sTableChgd(SW_RES(STR_REDLINE_TABLECHG)) - , m_sFormatCollSet(SW_RES(STR_REDLINE_FMTCOLLSET)) - , m_sAutoFormat(SW_RES(STR_REDLINE_AUTOFMT)) + , m_sInserted(SwResId(STR_REDLINE_INSERTED)) + , m_sDeleted(SwResId(STR_REDLINE_DELETED)) + , m_sFormated(SwResId(STR_REDLINE_FORMATED)) + , m_sTableChgd(SwResId(STR_REDLINE_TABLECHG)) + , m_sFormatCollSet(SwResId(STR_REDLINE_FMTCOLLSET)) + , m_sAutoFormat(SwResId(STR_REDLINE_AUTOFMT)) , m_bOnlyFormatedRedlines(false) , m_bRedlnAutoFormat(bAutoFormat) , m_bInhibitActivate(false) @@ -819,7 +819,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, OUString::number(aRedlines.size())); - aTmpStr = aRewriter.Apply(OUString(SW_RES(STR_N_REDLINES))); + aTmpStr = aRewriter.Apply(SwResId(STR_N_REDLINES)); } SwRewriter aRewriter; @@ -1111,9 +1111,9 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void) break; default:;//prevent warning } - OUString sTitle(SW_RES(STR_REDLINE_COMMENT)); + OUString sTitle(SwResId(STR_REDLINE_COMMENT)); if( nResId ) - sTitle += SW_RESSTR( nResId ); + sTitle += SwResId( nResId ); pDlg->SetText(sTitle); SwViewShell::SetCareWin(pDlg->GetWindow()); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 1a1c1ef5dee9..c2be3f05de94 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -128,7 +128,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext) maVirDev->DrawRect( tools::Rectangle( Point(), aControlRect.GetSize() ) ); // Label and arrow tip - OUString aLabel( SW_RESSTR ( STR_COMMENTS_LABEL ) ); + OUString aLabel( SwResId ( STR_COMMENTS_LABEL ) ); // Get label and arrow coordinates Point aLabelPos; Point aArrowPos; @@ -261,7 +261,7 @@ void SwCommentRuler::UpdateCommentHelpText() nTooltipResId = STR_HIDE_COMMENTS; else nTooltipResId = STR_SHOW_COMMENTS; - SetQuickHelpText( OUString( SW_RESSTR( nTooltipResId ) ) ); + SetQuickHelpText( OUString( SwResId( nTooltipResId ) ) ); } // TODO Make Ruler return its central rectangle instead of margins. |