summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uiview
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/uibase/uiview/srcview.cxx12
-rw-r--r--sw/source/uibase/uiview/uivwimp.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx24
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx2
-rw-r--r--sw/source/uibase/uiview/viewling.cxx6
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx4
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx4
8 files changed, 28 insertions, 28 deletions
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 0610d9b104f6..4327342947f9 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1180,7 +1180,7 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
SfxViewShell( pViewFrame, SWVIEWFLAGS ),
m_pViewWin( VclPtr<SwPagePreviewWin>::Create(&(GetViewFrame())->GetWindow(), *this ) ),
m_nNewPage(USHRT_MAX),
- m_sPageStr(SW_RES(STR_PAGE)),
+ m_sPageStr(SwResId(STR_PAGE)),
m_pHScrollbar(nullptr),
m_pVScrollbar(nullptr),
m_pScrollFill(VclPtr<ScrollBarBox>::Create( &pViewFrame->GetWindow(), WB_SIZEABLE )),
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 6c1629bb9205..d1c10735e3b7 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -160,7 +160,7 @@ static void lcl_PrintHeader( vcl::RenderContext &rOutDev, sal_Int32 nPages, sal_
aFont.SetWeight( WEIGHT_NORMAL );
rOutDev.SetFont( aFont );
OUString aPageStr( " [" );
- aPageStr += SW_RES( STR_PAGE );
+ aPageStr += SwResId( STR_PAGE );
aPageStr += " ";
aPageStr += OUString::number( nCurPage );
aPageStr += "]";
@@ -426,10 +426,10 @@ void SwSrcView::GetState(SfxItemSet& rSet)
switch(nWhich)
{
case SID_SAVEASDOC:
- rSet.Put(SfxStringItem(nWhich, OUString(SW_RES(STR_SAVEAS_SRC))));
+ rSet.Put(SfxStringItem(nWhich, SwResId(STR_SAVEAS_SRC)));
break;
case SID_SAVEACOPY:
- rSet.Put(SfxStringItem(nWhich, OUString(SW_RES(STR_SAVEACOPY_SRC))));
+ rSet.Put(SfxStringItem(nWhich, SwResId(STR_SAVEACOPY_SRC)));
break;
case SID_SAVEDOC:
{
@@ -443,11 +443,11 @@ void SwSrcView::GetState(SfxItemSet& rSet)
break;
case SID_TABLE_CELL:
{
- OUString aPos( SW_RES(STR_SRCVIEW_ROW) );
+ OUString aPos( SwResId(STR_SRCVIEW_ROW) );
TextSelection aSel = pTextView->GetSelection();
aPos += OUString::number( aSel.GetEnd().GetPara()+1 );
aPos += " : ";
- aPos += SW_RES(STR_SRCVIEW_COL);
+ aPos += SwResId(STR_SRCVIEW_COL);
aPos += OUString::number( aSel.GetEnd().GetIndex()+1 );
SfxStringItem aItem( nWhich, aPos );
rSet.Put( aItem );
@@ -807,7 +807,7 @@ void SwSrcView::Load(SwDocShell* pDocShell)
else
{
vcl::Window *pTmpWindow = &GetViewFrame()->GetWindow();
- ScopedVclPtrInstance<MessageDialog>(pTmpWindow, SW_RES(STR_ERR_SRCSTREAM), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pTmpWindow, SwResId(STR_ERR_SRCSTREAM), VclMessageType::Info)->Execute();
}
}
else
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 0584ffffd7c1..8b6818ccd7ca 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -174,7 +174,7 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq )
if( !bDone )
{
- ScopedVclPtrInstance<MessageDialog>(nullptr, SW_RES(STR_SCAN_NOSOURCE), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(STR_SCAN_NOSOURCE), VclMessageType::Info)->Execute();
rReq.Ignore();
}
else
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 447b6b134c22..5b767c76297c 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -205,7 +205,7 @@ OUString SwView::GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUStr
else if (nPhyNum != nVirtNum)
extra = OUString::number(nVirtNum);
- OUString aStr(extra.isEmpty() ? SW_RES(STR_PAGE_COUNT) : SW_RES(STR_PAGE_COUNT_CUSTOM));
+ OUString aStr(extra.isEmpty() ? SwResId(STR_PAGE_COUNT) : SwResId(STR_PAGE_COUNT_CUSTOM));
aStr = aStr.replaceFirst("%1", OUString::number(nPhyNum));
aStr = aStr.replaceFirst("%2", OUString::number(GetWrtShell().GetPageCnt()));
aStr = aStr.replaceFirst("%3", extra);
@@ -293,7 +293,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
std::unique_ptr<FileDialogHelper> pFileDlg(new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE,
FileDialogFlags::Graphic ));
- pFileDlg->SetTitle(SW_RESSTR(STR_INSERT_GRAPHIC ));
+ pFileDlg->SetTitle(SwResId(STR_INSERT_GRAPHIC ));
pFileDlg->SetContext( FileDialogHelper::SW_INSERT_GRAPHIC );
uno::Reference < XFilePicker2 > xFP = pFileDlg->GetFilePicker();
uno::Reference < XFilePickerControlAccess > xCtrlAcc(xFP, UNO_QUERY);
@@ -329,7 +329,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
Sequence<OUString> aListBoxEntries(aFormats.size());
OUString* pEntries = aListBoxEntries.getArray();
sal_Int16 nSelect = 0;
- OUString sGraphicFormat = SW_RESSTR(STR_POOLFRM_GRAPHIC);
+ OUString sGraphicFormat = SwResId(STR_POOLFRM_GRAPHIC);
for( size_t i = 0; i < aFormats.size(); ++i )
{
pEntries[i] = aFormats[i];
@@ -442,7 +442,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
rSh.StartAction();
SwRewriter aRewriter;
- aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_GRAPHIC_DEFNAME));
+ aRewriter.AddRule(UndoArg1, SwResId(STR_GRAPHIC_DEFNAME));
// #i123922# determine if we really want to insert or replace the graphic at a selected object
const bool bReplaceMode(rSh.HasSelection() && SelectionType::Frame == rSh.GetSelectionType());
@@ -496,7 +496,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
{
if( bShowError )
{
- ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SW_RESSTR( nResId ), VclMessageType::Info);
+ ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SwResId( nResId ), VclMessageType::Info);
aInfoBox->Execute();
}
rReq.Ignore();
@@ -1337,7 +1337,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
sal_uLong nWord = selectionStats.nWord ? selectionStats.nWord : documentStats.nWord;
sal_uLong nChar = selectionStats.nChar ? selectionStats.nChar : documentStats.nChar;
- OUString aWordCount( SW_RES( selectionStats.nWord ? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION ) );
+ OUString aWordCount( SwResId( selectionStats.nWord ? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION ) );
const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper();
aWordCount = aWordCount.replaceFirst( "%1", rLocaleData.getNum( nWord, 0 ) );
aWordCount = aWordCount.replaceFirst( "%2", rLocaleData.getNum( nChar, 0 ) );
@@ -1547,7 +1547,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
}
if (!sStr.isEmpty())
sStr += sStatusDelim;
- sStr += SW_RESSTR(STR_NUM_LEVEL);
+ sStr += SwResId(STR_NUM_LEVEL);
sStr += OUString::number( nNumLevel + 1 );
}
@@ -1559,12 +1559,12 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
sStr += " , ";
if( bOutlineNum )
{
- sStr += SW_RESSTR(STR_OUTLINE_NUMBERING);
+ sStr += SwResId(STR_OUTLINE_NUMBERING);
sStr += sStatusDelim;
- sStr += SW_RESSTR(STR_NUM_LEVEL);
+ sStr += SwResId(STR_NUM_LEVEL);
}
else
- sStr += SW_RESSTR(STR_NUM_OUTLINE);
+ sStr += SwResId(STR_NUM_OUTLINE);
sStr += OUString::number( nOutlineLevel);
}
@@ -1572,7 +1572,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
{
if (!sStr.isEmpty())
sStr = sStatusDelim + sStr;
- sStr = SW_RESSTR(SW_STR_READONLY) + sStr;
+ sStr = SwResId(SW_STR_READONLY) + sStr;
}
if (!sStr.isEmpty())
rSet.Put( SfxStringItem( SID_TABLE_CELL, sStr ));
@@ -2258,7 +2258,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
if (!bCompare && !nFound)
{
vcl::Window* pWin = &GetEditWin();
- ScopedVclPtrInstance<MessageDialog>(pWin, SW_RES(STR_NO_MERGE_ENTRY), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pWin, SwResId(STR_NO_MERGE_ENTRY), VclMessageType::Info)->Execute();
}
if( nRet==2 && xDocSh.is() )
xDocSh->DoClose();
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index a01e2d864ace..1c632ad6793a 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -71,7 +71,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
assert(pDlg && "Dialog creation failed!");
pDlg->SetHelpId(GetStaticInterface()->GetSlot(FN_EDIT_FOOTNOTE)->GetCommand());
- pDlg->SetText( SW_RESSTR(STR_EDIT_FOOTNOTE) );
+ pDlg->SetText( SwResId(STR_EDIT_FOOTNOTE) );
pDlg->Execute();
break;
}
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 69a4c5e6252f..650a42416892 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -420,8 +420,8 @@ void SwView::HyphenateDocument()
// do not hyphenate if interactive hyphenation is active elsewhere
if (SwEditShell::HasHyphIter())
{
- ScopedVclPtrInstance<MessBox>( nullptr, WB_OK, OUString( SW_RES( STR_HYPH_TITLE ) ),
- OUString( SW_RES( STR_MULT_INTERACT_HYPH_WARN ) ) )->Execute();
+ ScopedVclPtrInstance<MessBox>( nullptr, WB_OK, OUString( SwResId( STR_HYPH_TITLE ) ),
+ OUString( SwResId( STR_MULT_INTERACT_HYPH_WARN ) ) )->Execute();
return;
}
@@ -460,7 +460,7 @@ void SwView::HyphenateDocument()
// turned on no special area
{
// I want also in special areas hyphenation
- ScopedVclPtrInstance< MessageDialog > aBox(&GetEditWin(), SW_RES(STR_QUERY_SPECIAL_FORCED), VclMessageType::Question, VclButtonsType::YesNo);
+ ScopedVclPtrInstance< MessageDialog > aBox(&GetEditWin(), SwResId(STR_QUERY_SPECIAL_FORCED), VclMessageType::Question, VclButtonsType::YesNo);
if( aBox->Execute() == RET_YES )
{
bOther = true;
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 429a1eaa6b27..448f192377bd 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -176,9 +176,9 @@ void SwView::ExecutePrint(SfxRequest& rReq)
}
else
{
- ScopedVclPtrInstance< MessageDialog > aInfoBox(&GetEditWin(), SW_RES(STR_ERR_NO_FAX), VclMessageType::Info);
+ ScopedVclPtrInstance< MessageDialog > aInfoBox(&GetEditWin(), SwResId(STR_ERR_NO_FAX), VclMessageType::Info);
sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS;
- aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", OUString(SW_RES(nResNo))));
+ aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", SwResId(nResNo)));
aInfoBox->Execute();
SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE);
GetViewFrame()->GetDispatcher()->ExecuteList(SID_SW_EDITOPTIONS,
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index f2f0277d77be..3b3ff0ba371e 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -402,7 +402,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
if( !bQuiet && ULONG_MAX != nFound)
{
- OUString sText( SW_RES( STR_NB_REPLACED ) );
+ OUString sText( SwResId( STR_NB_REPLACED ) );
sText = sText.replaceFirst("XX", OUString::number( nFound ));
SvxSearchDialogWrapper::SetSearchLabel(sText);
}
@@ -684,7 +684,7 @@ void SwView::Replace()
{
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1, m_pSrchItem->GetSearchString());
- aRewriter.AddRule(UndoArg2, SW_RESSTR(STR_YIELDS));
+ aRewriter.AddRule(UndoArg2, SwResId(STR_YIELDS));
aRewriter.AddRule(UndoArg3, m_pSrchItem->GetReplaceString());
m_pWrtShell->StartUndo(SwUndoId::UI_REPLACE_STYLE, &aRewriter);
generated by cgit (git 2.34.1) at 2024-07-24 12:47:09 +0000