summaryrefslogtreecommitdiffstats
path: root/binfilter/bf_svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'binfilter/bf_svx/source')
-rw-r--r--binfilter/bf_svx/source/editeng/svx_editeng.cxx18
-rw-r--r--binfilter/bf_svx/source/items/svx_textitem.cxx2
-rw-r--r--binfilter/bf_svx/source/outliner/svx_outleeng.cxx10
-rw-r--r--binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx4
-rw-r--r--binfilter/bf_svx/source/unodraw/svx_unoprov.cxx6
-rw-r--r--binfilter/bf_svx/source/xoutdev/svx_xattr.cxx6
-rw-r--r--binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx2
-rw-r--r--binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx2
-rw-r--r--binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx2
-rw-r--r--binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx2
-rw-r--r--binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx2
11 files changed, 28 insertions, 28 deletions
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
index 851298b07..5d1ecb4ad 100644
--- a/binfilter/bf_svx/source/editeng/svx_editeng.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
@@ -1008,12 +1008,12 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ case EDITUNDO_DELCONTENT:
/*N*/ case EDITUNDO_DELETE:
/*N*/ case EDITUNDO_CUT:
-/*?*/ aComment = XubString( EditResId( RID_EDITUNDO_DEL ) );
+/*?*/ aComment = EditResId( RID_EDITUNDO_DEL ).toString();
/*N*/ break;
/*N*/ case EDITUNDO_MOVEPARAGRAPHS:
/*N*/ case EDITUNDO_MOVEPARAS:
/*N*/ case EDITUNDO_DRAGANDDROP:
-/*?*/ aComment = XubString( EditResId( RID_EDITUNDO_MOVE ) );
+/*?*/ aComment = EditResId( RID_EDITUNDO_MOVE ).toString();
/*N*/ break;
/*N*/ case EDITUNDO_INSERTFEATURE:
/*N*/ case EDITUNDO_SPLITPARA:
@@ -1021,29 +1021,29 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ case EDITUNDO_PASTE:
/*N*/ case EDITUNDO_INSERT:
/*N*/ case EDITUNDO_READ:
-/*N*/ aComment = XubString( EditResId( RID_EDITUNDO_INSERT ) );
+/*N*/ aComment = EditResId( RID_EDITUNDO_INSERT ).toString();
/*N*/ break;
/*N*/ case EDITUNDO_SRCHANDREPL:
/*N*/ case EDITUNDO_REPLACEALL:
-/*?*/ aComment = XubString( EditResId( RID_EDITUNDO_REPLACE ) );
+/*?*/ aComment = EditResId( RID_EDITUNDO_REPLACE ).toString();
/*N*/ break;
/*N*/ case EDITUNDO_ATTRIBS:
/*N*/ case EDITUNDO_PARAATTRIBS:
/*N*/ case EDITUNDO_STRETCH:
-/*?*/ aComment = XubString( EditResId( RID_EDITUNDO_SETATTRIBS ) );
+/*?*/ aComment = EditResId( RID_EDITUNDO_SETATTRIBS ).toString();
/*N*/ break;
/*N*/ case EDITUNDO_RESETATTRIBS:
-/*?*/ aComment = XubString( EditResId( RID_EDITUNDO_RESETATTRIBS ) );
+/*?*/ aComment = EditResId( RID_EDITUNDO_RESETATTRIBS ).toString();
/*N*/ break;
/*N*/ case EDITUNDO_STYLESHEET:
-/*?*/ aComment = XubString( EditResId( RID_EDITUNDO_SETSTYLE ) );
+/*?*/ aComment = EditResId( RID_EDITUNDO_SETSTYLE ).toString();
/*N*/ break;
/*N*/ case EDITUNDO_TRANSLITERATE:
-/*?*/ aComment = XubString( EditResId( RID_EDITUNDO_TRANSLITERATE ) );
+/*?*/ aComment = EditResId( RID_EDITUNDO_TRANSLITERATE ).toString();
/*N*/ break;
/*N*/ case EDITUNDO_INDENTBLOCK:
/*N*/ case EDITUNDO_UNINDENTBLOCK:
-/*?*/ aComment = XubString( EditResId( RID_EDITUNDO_INDENT ) );
+/*?*/ aComment = EditResId( RID_EDITUNDO_INDENT ).toString();
/*N*/ break;
/*N*/ }
/*N*/ return aComment;
diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
index d3ee941a9..3db659b35 100644
--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
@@ -2011,7 +2011,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ {
/*N*/ DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
/*N*/ "enum overflow" );
-/*N*/ return String( SVX_RES( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
+/*N*/ return SVX_RESSTR(RID_SVXITEMS_RELIEF_BEGIN + nPos);
/*N*/ }
/*N*/ USHORT SvxCharReliefItem::GetValueCount() const
diff --git a/binfilter/bf_svx/source/outliner/svx_outleeng.cxx b/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
index 75c82207b..a10d34dbf 100644
--- a/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
@@ -92,19 +92,19 @@ namespace binfilter {
/*N*/ switch( nUndoId )
/*N*/ {
/*N*/ case OLUNDO_DEPTH:
-/*?*/ return XubString( EditResId( RID_OUTLUNDO_DEPTH ));
+/*?*/ return EditResId( RID_OUTLUNDO_DEPTH ).toString();
/*N*/
/*N*/ case OLUNDO_EXPAND:
-/*?*/ return XubString( EditResId( RID_OUTLUNDO_EXPAND ));
+/*?*/ return EditResId( RID_OUTLUNDO_EXPAND ).toString();
/*N*/
/*N*/ case OLUNDO_COLLAPSE:
-/*?*/ return XubString( EditResId( RID_OUTLUNDO_COLLAPSE ));
+/*?*/ return EditResId( RID_OUTLUNDO_COLLAPSE ).toString();
/*N*/
/*N*/ case OLUNDO_ATTR:
-/*N*/ return XubString( EditResId( RID_OUTLUNDO_ATTR ));
+/*N*/ return EditResId( RID_OUTLUNDO_ATTR ).toString();
/*N*/
/*N*/ case OLUNDO_INSERT:
-/*?*/ return XubString( EditResId( RID_OUTLUNDO_INSERT ));
+/*?*/ return EditResId( RID_OUTLUNDO_INSERT ).toString();
/*N*/
/*N*/ default:
/*N*/ return EditEngine::GetUndoComment( nUndoId );
diff --git a/binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx b/binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx
index c3bcb09f9..0982757a1 100644
--- a/binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx
+++ b/binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx
@@ -113,11 +113,11 @@ namespace binfilter {
/*N*/ *pFilter = sLNm.Copy( nPos );
/*N*/
/*N*/ if( pType )
-/*?*/ *pType = String( ResId(
+/*?*/ *pType = ResId(
/*?*/ OBJECT_CLIENT_FILE == pBaseLink->GetObjType()
/*?*/ ? RID_SVXSTR_FILELINK
/*?*/ : RID_SVXSTR_GRAFIKLINK
-/*?*/ , DIALOG_MGR() ));
+/*?*/ , DIALOG_MGR() ).toString();
/*N*/
/*N*/ bRet = TRUE;
/*N*/ }
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
index dd661c94a..58b593734 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
@@ -1030,19 +1030,19 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
{
USHORT nResId = (USHORT)(nSourceResIds + i);
const ResId aRes( SVX_RES(nResId));
- const String aCompare( aRes );
+ const String aCompare( aRes.toString() );
if( aShortString == aCompare )
{
USHORT nNewResId = (USHORT)(nDestResIds + i);
ResId aNewRes( SVX_RES( nNewResId ));
- rString.Replace( 0, aShortString.Len(), String( aNewRes ) );
+ rString.Replace( 0, aShortString.Len(), aNewRes.toString() );
return TRUE;
}
else if( rString == aCompare )
{
USHORT nNewResId = (USHORT)(nDestResIds + i);
ResId aNewRes( SVX_RES( nNewResId ));
- rString = String( aNewRes );
+ rString = aNewRes.toString();
return TRUE;
}
}
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index e11abf118..fedc02da3 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -181,7 +181,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ {
/*N*/ sal_Int32 nUserIndex = 1;
/*N*/ const ResId aRes(SVX_RES(nPrefixResId));
-/*N*/ String aUser( aRes );
+/*N*/ String aUser( aRes.toString() );
/*N*/ aUser += sal_Unicode( ' ' );
/*N*/
/*N*/ if( pDefaults )
@@ -1261,7 +1261,7 @@ const XPolygon& XLineStartItem::GetValue() const
/*N*/
/*N*/ sal_Int32 nUserIndex = 1;
/*N*/ const ResId aRes(SVX_RES(RID_SVXSTR_LINEEND));
-/*N*/ const String aUser( aRes );
+/*N*/ const String aUser( aRes.toString() );
/*N*/
/*N*/ if( pPool1 )
/*N*/ {
@@ -1603,7 +1603,7 @@ const XPolygon& XLineEndItem::GetValue() const
/*N*/
/*N*/ sal_Int32 nUserIndex = 1;
/*N*/ const ResId aRes(SVX_RES(RID_SVXSTR_LINEEND));
-/*N*/ const String aUser( aRes );
+/*N*/ const String aUser( aRes.toString() );
/*N*/
/*N*/ if( pPool1 )
/*N*/ {
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
index ef7330a33..51ec26128 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
@@ -171,7 +171,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ // 48 49 50 51 52 53 54 55
/*N*/ // 56 57 58 59 60 61 62 63
/*N*/
-/*N*/ String aStr( SVX_RES( RID_SVXSTR_BITMAP ) );
+/*N*/ String aStr( SVX_RES( RID_SVXSTR_BITMAP ).toString() );
/*N*/ Color aColWhite( RGB_Color( COL_WHITE ) );
/*N*/ xub_StrLen nLen;
/*N*/ USHORT aArray[64];
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
index 8cbd86331..1edbbefc3 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
@@ -221,7 +221,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ {
/*N*/ Insert( new XColorEntry(
Color( aColTab[n] ),
- String( ResId( aResId[ n ], rRes ) )
+ String( ResId( aResId[ n ], rRes ).toString() )
),
n
);
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
index b1f944179..5dcf80103 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
@@ -173,7 +173,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ BOOL XDashList::Create()
/*N*/ {
-/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) );
+/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ).toString() );
/*N*/ xub_StrLen nLen;
/*N*/
/*N*/ aStr.AppendAscii(" 1");
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
index d2fa5bfe2..ff64befc4 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
@@ -172,7 +172,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ BOOL XGradientList::Create()
/*N*/ {
-/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) );
+/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ).toString() );
/*N*/ xub_StrLen nLen;
/*N*/
/*N*/ aStr.AppendAscii(" 1");
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
index ac75a4b2e..034126c50 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
@@ -168,7 +168,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ BOOL XHatchList::Create()
/*N*/ {
-/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) );
+/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_HATCH ).toString() );
/*N*/ xub_StrLen nLen;
/*N*/
/*N*/ aStr.AppendAscii(" 1");
generated by cgit (git 2.34.1) at 2024-06-10 20:56:08 +0000