summaryrefslogtreecommitdiff
path: root/sw/source/uibase/app
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/app')
-rw-r--r--sw/source/uibase/app/appenv.cxx2
-rw-r--r--sw/source/uibase/app/applab.cxx2
-rw-r--r--sw/source/uibase/app/docsh.cxx4
-rw-r--r--sw/source/uibase/app/docsh2.cxx20
-rw-r--r--sw/source/uibase/app/docstyle.cxx8
-rw-r--r--sw/source/uibase/app/mainwn.cxx4
-rw-r--r--sw/source/uibase/app/swmodul1.cxx2
-rw-r--r--sw/source/uibase/app/swmodule.cxx24
8 files changed, 33 insertions, 33 deletions
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index ec4bfc0a4187..9d24de198036 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -165,7 +165,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
pNewView->AttrChangedNotify( &pNewView->GetWrtShell() ); // so that SelectShell is being called
pSh = pNewView->GetWrtShellPtr();
- OUString aTmp( SW_RES(STR_ENV_TITLE) );
+ OUString aTmp( SwResId(STR_ENV_TITLE) );
aTmp += OUString::number( ++nTitleNo );
xDocSh->SetTitle( aTmp );
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 8fe5e3493e4c..a55e3962592d 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -209,7 +209,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
OUString aTmp;
if(bLabel)
{
- aTmp = SW_RES( STR_LAB_TITLE);
+ aTmp = SwResId( STR_LAB_TITLE);
aTmp += OUString::number(++nLabelTitleNo );
}
else
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 4d1b3d9c1d31..2f1815ab6598 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -176,7 +176,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
{
if(!bAPICall)
{
- ScopedVclPtrInstance<InfoBox>(nullptr, SW_RESSTR(STR_CANTOPEN))->Execute();
+ ScopedVclPtrInstance<InfoBox>(nullptr, SwResId(STR_CANTOPEN))->Execute();
}
return nullptr;
}
@@ -536,7 +536,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter );
if( !xWriter.is() )
{ // Filter not available
- ScopedVclPtrInstance<InfoBox>(nullptr, SW_RESSTR(STR_DLLNOTFOUND))->Execute();
+ ScopedVclPtrInstance<InfoBox>(nullptr, SwResId(STR_DLLNOTFOUND))->Execute();
return false;
}
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 5348175ffc58..767ddcff9929 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -151,7 +151,7 @@ VclPtr<SfxDocumentInfoDialog> SwDocShell::CreateDocumentInfoDialog(const SfxItem
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
pDlg->AddFontTabPage();
- pDlg->AddTabPage(TP_DOC_STAT, SW_RESSTR(STR_DOC_STAT),pFact->GetTabPageCreatorFunc( TP_DOC_STAT ),nullptr);
+ pDlg->AddTabPage(TP_DOC_STAT, SwResId(STR_DOC_STAT),pFact->GetTabPageCreatorFunc( TP_DOC_STAT ),nullptr);
}
}
return pDlg;
@@ -751,7 +751,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
SwView *pCurrView = static_cast<SwView*>( pFrame->GetViewShell());
// Set document's title
- OUString aTmp( SW_RES(STR_ABSTRACT_TITLE) );
+ OUString aTmp( SwResId(STR_ABSTRACT_TITLE) );
aTmp += GetTitle();
xDocSh->SetTitle( aTmp );
pCurrView->GetWrtShell().SetNewDoc();
@@ -972,14 +972,14 @@ void SwDocShell::Execute(SfxRequest& rReq)
OUString* pEntries = aListBoxEntries.getArray();
sal_Int32 nIdx = 0 ;
- OUString sOutline( SW_RESSTR(STR_FDLG_OUTLINE_LEVEL) );
+ OUString sOutline( SwResId(STR_FDLG_OUTLINE_LEVEL) );
for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
{
if( bOutline[i] )
pEntries[nIdx++] = sOutline + OUString::number( i+1 );
}
- OUString sStyle( SW_RESSTR(STR_FDLG_STYLE) );
+ OUString sStyle( SwResId(STR_FDLG_STYLE) );
for(sal_uInt16 i = 0; i < nStyleCount; ++i)
{
SwTextFormatColl &rTextColl = *(*m_pDoc->GetTextFormatColls())[ i ];
@@ -1002,14 +1002,14 @@ void SwDocShell::Execute(SfxRequest& rReq)
xCtrlAcc->setValue( ExtendedFilePickerElementIds::LISTBOX_TEMPLATE,
ListboxControlActions::SET_SELECT_ITEM, aSelectPos );
xCtrlAcc->setLabel( ExtendedFilePickerElementIds::LISTBOX_TEMPLATE,
- SW_RES( STR_FDLG_TEMPLATE_NAME ));
+ SwResId( STR_FDLG_TEMPLATE_NAME ));
}
catch (const Exception&)
{
OSL_FAIL("control access failed");
}
- xFP->setTitle( SW_RESSTR( nStrId ));
+ xFP->setTitle( SwResId( nStrId ));
SvtPathOptions aPathOpt;
xFP->setDisplayDirectory( aPathOpt.GetWorkPath() );
if( ERRCODE_NONE == aDlgHelper.Execute())
@@ -1088,7 +1088,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
}
if( !bDone && !rReq.IsAPI() )
{
- ScopedVclPtrInstance<InfoBox>(nullptr, SW_RESSTR( STR_CANTCREATE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(nullptr, SwResId( STR_CANTCREATE))->Execute();
}
}
}
@@ -1237,13 +1237,13 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
{
*pClassName = SvGlobalName( SO3_SW_CLASSID_60 );
*pClipFormat = SotClipboardFormatId::STARWRITER_60;
- *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
+ *pLongUserName = SwResId(STR_WRITER_DOCUMENT_FULLTYPE);
}
else if (nVersion == SOFFICE_FILEFORMAT_8)
{
*pClassName = SvGlobalName( SO3_SW_CLASSID_60 );
*pClipFormat = bTemplate ? SotClipboardFormatId::STARWRITER_8_TEMPLATE : SotClipboardFormatId::STARWRITER_8;
- *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
+ *pLongUserName = SwResId(STR_WRITER_DOCUMENT_FULLTYPE);
}
// #FIXME check with new Event handling
#if 0
@@ -1252,7 +1252,7 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
lcl_processCompatibleSfxHint( xVbaEventsHelper, rHint );
#endif
- *pUserName = SW_RESSTR(STR_HUMAN_SWDOC_NAME);
+ *pUserName = SwResId(STR_HUMAN_SWDOC_NAME);
}
void SwDocShell::SetModified( bool bSet )
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 18fe13698f7d..b694ca7f0a51 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -978,7 +978,7 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit)
bIsDefault = true;
if(!bHasCJKFontPrefix)
{
- aItemPresentation = SW_RESSTR(STR_CJK_FONT) + aItemPresentation;
+ aItemPresentation = SwResId(STR_CJK_FONT) + aItemPresentation;
bHasCJKFontPrefix = true;
}
break;
@@ -989,7 +989,7 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit)
case RES_CHRATR_WEIGHT:
if(!bHasWesternFontPrefix)
{
- aItemPresentation = SW_RESSTR(STR_WESTERN_FONT) + aItemPresentation;
+ aItemPresentation = SwResId(STR_WESTERN_FONT) + aItemPresentation;
bHasWesternFontPrefix = true;
}
SAL_FALLTHROUGH;
@@ -1012,10 +1012,10 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit)
{
if (!aDesc.isEmpty())
aDesc += sPlus;
- aDesc += SW_RESSTR(STR_PAGEBREAK) + sPlus + sModel;
+ aDesc += SwResId(STR_PAGEBREAK) + sPlus + sModel;
if (sPageNum != "0")
{
- aDesc += sPlus + SW_RESSTR(STR_PAGEOFFSET) + sPageNum;
+ aDesc += sPlus + SwResId(STR_PAGEOFFSET) + sPageNum;
}
}
else if (!sBreak.isEmpty()) // Break can be valid only when NO Model
diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
index e37faf434c24..44e4b9b1c036 100644
--- a/sw/source/uibase/app/mainwn.cxx
+++ b/sw/source/uibase/app/mainwn.cxx
@@ -64,7 +64,7 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue,
{
pProgress = new SwProgress;
pProgress->pProgress = new SfxProgress( pDocShell,
- SW_RESSTR(nMessResId),
+ SwResId(nMessResId),
nEndValue - nStartValue );
pProgress->nStartCount = 1;
pProgress->pDocShell = pDocShell;
@@ -123,7 +123,7 @@ void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell )
{
SwProgress *pProgress = lcl_SwFindProgress( pDocShell );
if ( pProgress )
- pProgress->pProgress->SetStateText( 0, SW_RESSTR(nId) );
+ pProgress->pProgress->SetStateText( 0, SwResId(nId) );
}
}
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 28437f6e7d5e..4d03053de05e 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -403,7 +403,7 @@ std::size_t SwModule::GetRedlineAuthor()
{
m_sActAuthor = rOpt.GetID();
if (m_sActAuthor.isEmpty())
- m_sActAuthor = SW_RESSTR( STR_REDLINE_UNKNOWN_AUTHOR );
+ m_sActAuthor = SwResId( STR_REDLINE_UNKNOWN_AUTHOR );
}
m_bAuthorInitialised = true;
}
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 0b7734ac5f7a..9296b29096df 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -403,34 +403,34 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies()
SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies;
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
- SW_RESSTR(STR_PARAGRAPHSTYLEFAMILY),
+ SwResId(STR_PARAGRAPHSTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_PARA)),
- SW_RES(RID_PARAGRAPHSTYLEFAMILY)));
+ ResId(RID_PARAGRAPHSTYLEFAMILY, *pSwResMgr)));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char,
- SW_RESSTR(STR_CHARACTERSTYLEFAMILY),
+ SwResId(STR_CHARACTERSTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_CHAR)),
- SW_RES(RID_CHARACTERSTYLEFAMILY)));
+ ResId(RID_CHARACTERSTYLEFAMILY, *pSwResMgr)));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame,
- SW_RESSTR(STR_FRAMESTYLEFAMILY),
+ SwResId(STR_FRAMESTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_FRAME)),
- SW_RES(RID_FRAMESTYLEFAMILY)));
+ ResId(RID_FRAMESTYLEFAMILY, *pSwResMgr)));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page,
- SW_RESSTR(STR_PAGESTYLEFAMILY),
+ SwResId(STR_PAGESTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)),
- SW_RES(RID_PAGESTYLEFAMILY)));
+ ResId(RID_PAGESTYLEFAMILY, *pSwResMgr)));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo,
- SW_RESSTR(STR_LISTSTYLEFAMILY),
+ SwResId(STR_LISTSTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_LIST)),
- SW_RES(RID_LISTSTYLEFAMILY)));
+ ResId(RID_LISTSTYLEFAMILY, *pSwResMgr)));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table,
- SW_RESSTR(STR_TABLESTYLEFAMILY),
+ SwResId(STR_TABLESTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_TABLE)),
- SW_RES(RID_TABLESTYLEFAMILY)));
+ ResId(RID_TABLESTYLEFAMILY, *pSwResMgr)));
return pStyleFamilies;
}
generated by cgit (git 2.34.1) at 2024-06-30 08:03:01 +0000