summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/swtypes.hxx2
-rw-r--r--sw/source/core/access/acccontext.cxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx2
-rw-r--r--sw/source/core/ole/ndole.cxx6
-rw-r--r--sw/source/core/undo/rolbck.cxx4
-rw-r--r--sw/source/core/undo/undel.cxx2
-rw-r--r--sw/source/ui/docvw/HeaderFooterWin.cxx4
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx4
10 files changed, 15 insertions, 15 deletions
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:
generated by cgit (git 2.34.1) at 2024-07-12 00:24:47 +0000