[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Apr 30 03:23:00 PDT 2012
binfilter/bf_basic/source/classes/sb.cxx | 2
binfilter/bf_sc/source/core/data/sc_document.cxx | 2
binfilter/bf_sc/source/core/data/sc_global.cxx | 2
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 2
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 4
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 24 +--
binfilter/bf_sch/source/core/sch_chartdoc.cxx | 20 +--
binfilter/bf_sch/source/core/sch_chtmode1.cxx | 10 -
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 4
binfilter/bf_sch/source/core/sch_chtmode4.cxx | 4
binfilter/bf_sch/source/core/sch_chtmodel.cxx | 4
binfilter/bf_sch/source/core/sch_memchrt.cxx | 4
binfilter/bf_sch/source/ui/app/sch_schopt.cxx | 2
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 18 +-
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 2
binfilter/bf_sd/source/core/sd_drawdoc2.cxx | 2
binfilter/bf_sd/source/core/sd_drawdoc4.cxx | 36 ++---
binfilter/bf_sd/source/core/sd_sdpage.cxx | 62 ++++-----
binfilter/bf_sd/source/core/sd_stlpool.cxx | 96 +++++++--------
binfilter/bf_sd/source/core/sd_stlsheet.cxx | 24 +--
binfilter/bf_sd/source/filter/sd_sdfilter.cxx | 2
binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx | 20 +--
binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx | 4
binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx | 2
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 4
binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx | 4
binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx | 8 -
binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx | 4
binfilter/bf_so3/source/inplace/applet2.cxx | 4
binfilter/bf_so3/source/inplace/plugin.cxx | 2
binfilter/bf_so3/source/solink/lnkbase2.cxx | 2
binfilter/bf_starmath/source/starmath_document.cxx | 16 +-
binfilter/bf_starmath/source/starmath_mathml.cxx | 2
binfilter/bf_starmath/source/starmath_parse.cxx | 4
binfilter/bf_svtools/source/misc/svt_ctrltool.cxx | 16 +-
binfilter/bf_svtools/source/misc/svt_ehdl.cxx | 2
binfilter/bf_svx/source/editeng/svx_editeng.cxx | 18 +-
binfilter/bf_svx/source/items/svx_textitem.cxx | 2
binfilter/bf_svx/source/outliner/svx_outleeng.cxx | 10 -
binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx | 4
binfilter/bf_svx/source/unodraw/svx_unoprov.cxx | 6
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx | 6
binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx | 2
binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx | 2
binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx | 2
binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx | 2
binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx | 2
binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx | 2
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 8 -
binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx | 8 -
binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx | 8 -
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unosett.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx | 2
binfilter/bf_sw/source/ui/app/sw_swmodule.cxx | 6
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 14 +-
binfilter/bf_sw/source/ui/utlui/sw_initui.cxx | 58 ++++-----
binfilter/inc/bf_sc/strload.hxx | 2
binfilter/inc/bf_svx/dialmgr.hxx | 3
binfilter/inc/bf_svx/itemtype.hxx | 3
binfilter/inc/bf_sw/swtypes.hxx | 2
63 files changed, 300 insertions(+), 302 deletions(-)
New commits:
commit 65042e25c2d6c0d1b06a975b916fa61eb77f20ff
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 29 23:37:14 2012 +0100
track change to make ResId::toString a non-static member
Change-Id: I2e2ba77aaad129a5f83b5fb6bef98dcb948ce5a0
diff --git a/binfilter/bf_basic/source/classes/sb.cxx b/binfilter/bf_basic/source/classes/sb.cxx
index 38c6a68..11ab493 100644
--- a/binfilter/bf_basic/source/classes/sb.cxx
+++ b/binfilter/bf_basic/source/classes/sb.cxx
@@ -942,7 +942,7 @@ struct BasicStringList_Impl : private Resource
: Resource( rErrIdP ),aResId(nId,*rErrIdP.GetResMgr()){}
~BasicStringList_Impl() { FreeResource(); }
- String GetString(){ return String( aResId ); }
+ String GetString(){ return aResId.toString(); }
BOOL IsErrorTextAvailable( void )
{ return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
};
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 26187a7..6483302 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -186,7 +186,7 @@ namespace binfilter {
/*N*/ {
/*?*/ // neu erzeugen
/*?*/
-/*?*/ const String aStrTable( ScResId(SCSTR_TABLE) );
+/*?*/ const String aStrTable( ScResId(SCSTR_TABLE).toString() );
/*?*/ BOOL bOk = FALSE;
/*?*/
/*?*/ // vorneweg testen, ob der Prefix als gueltig erkannt wird
diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx b/binfilter/bf_sc/source/core/data/sc_global.cxx
index c952081..49e2698 100644
--- a/binfilter/bf_sc/source/core/data/sc_global.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global.cxx
@@ -434,7 +434,7 @@ void global_InitAppOptions();
/*N*/
/*N*/ InitAddIns();
/*N*/
-/*N*/ pStrClipDocName = new String( ScResId( SCSTR_NONAME ) );
+/*N*/ pStrClipDocName = new String( ScResId( SCSTR_NONAME ).toString() );
/*N*/ *pStrClipDocName += '1';
/*N*/
/*N*/ // ScDocumentPool::InitVersionMaps() ist schon vorher gerufen worden
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index 1ebd8ec..b8f12bb 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -174,7 +174,7 @@ namespace binfilter {
/*N*/ aRes.SetRT(RSC_STRING);
/*N*/ if (IsAvailableRes(aRes))
/*N*/ {
-/*N*/ pSymbolTable[i] = String(aRes);
+/*N*/ pSymbolTable[i] = aRes.toString();
/*N*/ rHashMap.insert( ScOpCodeHashMap::value_type( pSymbolTable[i], (OpCode) i ) );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index fbb3546..876ce46 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -1075,7 +1075,7 @@ using namespace ::com::sun::star;
/*N*/ else if (!bApi)
/*N*/ {
/*N*/ // different password was set before
-/*N*/ InfoBox aBox( rDocShell.GetDialogParent(), String( ScResId( SCSTR_WRONGPASSWORD ) ) );
+/*N*/ InfoBox aBox( rDocShell.GetDialogParent(), ScResId( SCSTR_WRONGPASSWORD ).toString() );
/*N*/ aBox.Execute();
/*N*/ }
/*N*/
@@ -1103,7 +1103,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ else if (!bApi)
/*N*/ {
-/*N*/ InfoBox aBox( rDocShell.GetDialogParent(), String( ScResId( SCSTR_WRONGPASSWORD ) ) );
+/*N*/ InfoBox aBox( rDocShell.GetDialogParent(), ScResId( SCSTR_WRONGPASSWORD ).toString() );
/*N*/ aBox.Execute();
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 5ff9c49..f98a5f2 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -143,25 +143,25 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ {
/*N*/ *pClassName = SvGlobalName( BF_SO3_SC_CLASSID_30 );
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARCALC_30;
-/*N*/ *pAppName = String( ScResId( SCSTR_30_APPLICATION ) );
-/*N*/ *pFullTypeName = String( ScResId( SCSTR_30_LONG_DOCNAME ) );
-/*N*/ *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
+/*N*/ *pAppName = ScResId( SCSTR_30_APPLICATION ).toString();
+/*N*/ *pFullTypeName = ScResId( SCSTR_30_LONG_DOCNAME ).toString();
+/*N*/ *pShortTypeName = ScResId( SCSTR_SHORT_SCDOC_NAME ).toString();
/*N*/ }
/*N*/ else if ( nFileFormat == SOFFICE_FILEFORMAT_40 )
/*N*/ {
/*N*/ *pClassName = SvGlobalName( BF_SO3_SC_CLASSID_40 );
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARCALC_40;
-/*N*/ *pAppName = String( ScResId( SCSTR_40_APPLICATION ) );
-/*N*/ *pFullTypeName = String( ScResId( SCSTR_40_LONG_DOCNAME ) );
-/*N*/ *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
+/*N*/ *pAppName = ScResId( SCSTR_40_APPLICATION ).toString();
+/*N*/ *pFullTypeName = ScResId( SCSTR_40_LONG_DOCNAME ).toString();
+/*N*/ *pShortTypeName = ScResId( SCSTR_SHORT_SCDOC_NAME ).toString();
/*N*/ }
/*N*/ else if ( nFileFormat == SOFFICE_FILEFORMAT_50 )
/*N*/ {
/*N*/ *pClassName = SvGlobalName( BF_SO3_SC_CLASSID_50 );
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARCALC_50;
-/*N*/ *pAppName = String( ScResId( SCSTR_50_APPLICATION ) );
-/*N*/ *pFullTypeName = String( ScResId( SCSTR_50_LONG_DOCNAME ) );
-/*N*/ *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
+/*N*/ *pAppName = ScResId( SCSTR_50_APPLICATION ).toString();
+/*N*/ *pFullTypeName = ScResId( SCSTR_50_LONG_DOCNAME ).toString();
+/*N*/ *pShortTypeName = ScResId( SCSTR_SHORT_SCDOC_NAME ).toString();
/*N*/ }
/*N*/ else if ( nFileFormat == SOFFICE_FILEFORMAT_60 ||
nFileFormat == SOFFICE_FILEFORMAT_CURRENT ) // #i41083# also allow CURRENT
@@ -170,10 +170,10 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
// has always been an error (!)
/*N*/ *pClassName = SvGlobalName( BF_SO3_SC_CLASSID_60 );
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARCALC_60;
-/*N*/ *pAppName = String( ScResId( SCSTR_APPLICATION ) );
+/*N*/ *pAppName = ScResId( SCSTR_APPLICATION ).toString();
/*N*/
-/*N*/ *pFullTypeName = String( ScResId( SCSTR_LONG_SCDOC_NAME ) );
-/*N*/ *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
+/*N*/ *pFullTypeName = ScResId(SCSTR_LONG_SCDOC_NAME).toString();
+/*N*/ *pShortTypeName = ScResId(SCSTR_SHORT_SCDOC_NAME).toString();
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sch/source/core/sch_chartdoc.cxx b/binfilter/bf_sch/source/core/sch_chartdoc.cxx
index 2aa2afe..b334bc2 100644
--- a/binfilter/bf_sch/source/core/sch_chartdoc.cxx
+++ b/binfilter/bf_sch/source/core/sch_chartdoc.cxx
@@ -298,70 +298,70 @@ namespace binfilter {
/*N*/ aFont.GetCharSet(), EE_CHAR_FONTINFO );
/*N*/
/*N*/ SfxStyleSheetBase* pSheet =
-/*N*/ &pStyleSheetPool->Make(String(SchResId(STR_STLSHEET_TITLE_MAIN)),
+/*N*/ &pStyleSheetPool->Make(SchResId(STR_STLSHEET_TITLE_MAIN).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(493));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_TITLE_SUB)),
+/*N*/ Make(SchResId(STR_STLSHEET_TITLE_SUB).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(423));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_TITLE_X_AXIS)),
+/*N*/ Make(SchResId(STR_STLSHEET_TITLE_X_AXIS).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(352));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_TITLE_Y_AXIS)),
+/*N*/ Make(SchResId(STR_STLSHEET_TITLE_Y_AXIS).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(352));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_TITLE_Z_AXIS)),
+/*N*/ Make(SchResId(STR_STLSHEET_TITLE_Z_AXIS).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(352));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_DATAROWS)),
+/*N*/ Make(SchResId(STR_STLSHEET_DATAROWS).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(282));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_DATACOLS)),
+/*N*/ Make(SchResId(STR_STLSHEET_DATACOLS).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(282));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_DATAVALUES)),
+/*N*/ Make(SchResId(STR_STLSHEET_DATAVALUES).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(282));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_DATADESCR)),
+/*N*/ Make(SchResId(STR_STLSHEET_DATADESCR).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO ) ));
/*N*/ pSheet->GetItemSet().Put(SvxFontHeightItem(282));
/*N*/
/*N*/ pSheet = &pStyleSheetPool->
-/*N*/ Make(String(SchResId(STR_STLSHEET_LEGEND)),
+/*N*/ Make(SchResId(STR_STLSHEET_LEGEND).toString(),
/*N*/ SFX_STYLE_FAMILY_PARA);
/*N*/ pSheet->GetItemSet().Put(aFontItem);
/*N*/ pSheet->GetItemSet().Put(SvxColorItem( Color( COL_AUTO )));
diff --git a/binfilter/bf_sch/source/core/sch_chtmode1.cxx b/binfilter/bf_sch/source/core/sch_chtmode1.cxx
index 5ae44be..ae7d913 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode1.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode1.cxx
@@ -752,11 +752,11 @@ namespace binfilter {
/*N*/ {
/*N*/ SchMemChart* pMemChart = new SchMemChart(DEFAULT_COLCNT, DEFAULT_ROWCNT);
/*N*/
-/*N*/ pMemChart->SetMainTitle(String(SchResId(STR_TITLE_MAIN)));
-/*N*/ pMemChart->SetSubTitle(String(SchResId(STR_TITLE_SUB)));
-/*N*/ pMemChart->SetXAxisTitle(String(SchResId(STR_DIAGRAM_TITLE_X_AXIS)));
-/*N*/ pMemChart->SetYAxisTitle(String(SchResId(STR_DIAGRAM_TITLE_Y_AXIS)));
-/*N*/ pMemChart->SetZAxisTitle(String(SchResId(STR_DIAGRAM_TITLE_Z_AXIS)));
+/*N*/ pMemChart->SetMainTitle(SchResId(STR_TITLE_MAIN).toString());
+/*N*/ pMemChart->SetSubTitle(SchResId(STR_TITLE_SUB).toString());
+/*N*/ pMemChart->SetXAxisTitle(SchResId(STR_DIAGRAM_TITLE_X_AXIS).toString());
+/*N*/ pMemChart->SetYAxisTitle(SchResId(STR_DIAGRAM_TITLE_Y_AXIS).toString());
+/*N*/ pMemChart->SetZAxisTitle(SchResId(STR_DIAGRAM_TITLE_Z_AXIS).toString());
/*N*/
/*N*/ for( short nCol = 0; nCol < DEFAULT_COLCNT; nCol++ )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 2a7aef4..6dbbcc5 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -244,11 +244,11 @@ enum ChartStyleV0
/*N*/ if( nStringID )
/*N*/ {
/*?*/ SchResId aRegId = SchResId( nStringID );
-/*?*/ String aRegressStr( aRegId );
+/*?*/ String aRegressStr( aRegId.toString() );
/*?*/ String aSeriesName( bRowLegend
/*?*/ ? RowText( i )
/*?*/ : ColText( i ));
-/*?*/ String aLegendText( SchResId( STR_STATISTICS_IN_LEGEND ));
+/*?*/ String aLegendText( SchResId( STR_STATISTICS_IN_LEGEND ).toString() );
/*?*/
/*?*/ aLegendText.SearchAndReplaceAscii( "$(STATTYP)", aRegressStr );
/*?*/ aLegendText.SearchAndReplaceAscii( "$(ROWNAME)", aSeriesName );
diff --git a/binfilter/bf_sch/source/core/sch_chtmode4.cxx b/binfilter/bf_sch/source/core/sch_chtmode4.cxx
index 6729cbb..0cb69c4 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode4.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode4.cxx
@@ -1048,7 +1048,7 @@ namespace binfilter {
/*?*/ // FG: Falls ein Pointer auf ein Fenster uebergeben wird ist die Dialogbox nicht-modal
/*?*/ // Nutzt man dies fuer Veraenderungen am Chart aus, stuertzt das Programm ab.
/*?*/ // InfoBox aInfoBox(SFX_APP()->GetAppWindow(), String(SchResId(STR_ONLY_ABS_VALUES)));
-/*?*/ InfoBox aInfoBox(NULL, String(SchResId(STR_ONLY_ABS_VALUES)));
+/*?*/ InfoBox aInfoBox(NULL, SchResId(STR_ONLY_ABS_VALUES).toString());
/*?*/ aInfoBox.Execute();
/*?*/ eOldChartStyle = eChartStyle;
/*?*/ bOK=FALSE;
@@ -1058,7 +1058,7 @@ namespace binfilter {
/*N*/ // FG: Falls ein Pointer auf ein Fenster uebergeben wird ist die Dialogbox nicht-modal
/*N*/ // Nutzt man dies fuer Veraenderungen am Chart aus, stuertzt das Programm ab.
/*N*/ // InfoBox aInfoBox(SFX_APP()->GetAppWindow(), String(SchResId(STR_NO_MIN_VALUES)));
-/*?*/ InfoBox aInfoBox(NULL, String(SchResId(STR_NO_MIN_VALUES)));
+/*?*/ InfoBox aInfoBox(NULL, SchResId(STR_NO_MIN_VALUES).toString());
/*?*/ aInfoBox.Execute();
/*?*/ eOldChartStyle = eChartStyle;
/*?*/ bOK=FALSE;
diff --git a/binfilter/bf_sch/source/core/sch_chtmodel.cxx b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
index f964f8f..3447299 100644
--- a/binfilter/bf_sch/source/core/sch_chtmodel.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
@@ -480,8 +480,8 @@ using namespace ::com::sun::star;
/*N*/ // Layer anlegen
/*N*/
/*N*/ SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
-/*N*/ rLayerAdmin.NewLayer( String( SchResId( STR_LAYOUT )));
-/*N*/ rLayerAdmin.NewLayer( String( SchResId( STR_CONTROLS )));
+/*N*/ rLayerAdmin.NewLayer( SchResId( STR_LAYOUT ).toString() );
+/*N*/ rLayerAdmin.NewLayer( SchResId( STR_CONTROLS ).toString() );
/*N*/
/*N*/
/*N*/ //Wichtig! die Achsen muessen jetzt erstellt werden, dies darf erst nach dem
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index fa12f85..32af806 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -610,7 +610,7 @@ namespace binfilter {
/*N*/ // initialize resource string
/*N*/ mpColNameBuffer = new String[ 2 ];
/*N*/ DBG_ASSERT( mpColNameBuffer, "couldn't create two strings!" );
-/*N*/ String aResStr( SchResId( STR_COLUMN ));
+/*N*/ String aResStr( SchResId( STR_COLUMN ).toString() );
/*N*/ xub_StrLen nPos = aResStr.SearchAscii( "$(N)" );
/*N*/ if( nPos != STRING_NOTFOUND )
/*N*/ {
@@ -639,7 +639,7 @@ namespace binfilter {
/*N*/ // initialize resource string
/*N*/ mpRowNameBuffer = new String[ 2 ];
/*N*/ DBG_ASSERT( mpRowNameBuffer, "couldn't create two strings!" );
-/*N*/ String aResStr( SchResId( STR_ROW ));
+/*N*/ String aResStr( SchResId( STR_ROW ).toString() );
/*N*/ xub_StrLen nPos = aResStr.SearchAscii( "$(N)" );
/*N*/ if( nPos != STRING_NOTFOUND )
/*N*/ {
diff --git a/binfilter/bf_sch/source/ui/app/sch_schopt.cxx b/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
index d5a04b5..e1ddf98 100644
--- a/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
+++ b/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
@@ -131,7 +131,7 @@ using namespace ::com::sun::star;
/*N*/ Color aCol;
/*N*/
/*N*/ // create strings for entry names
-/*N*/ String aResName( SchResId( STR_DIAGRAM_ROW ));
+/*N*/ String aResName( SchResId( STR_DIAGRAM_ROW ).toString() );
/*N*/ String aPrefix, aPostfix, aName;
/*N*/ xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" );
/*N*/ if( nPos != STRING_NOTFOUND )
diff --git a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
index 99d84de..17eea9d 100644
--- a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
+++ b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
@@ -433,7 +433,7 @@ using namespace ::com::sun::star;
/*N*/ )
/*N*/ {
/*N*/ if( GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
-/*N*/ pProgress = new SfxProgress( this, String( SchResId( STR_OPEN_DOCUMENT )), 100 );
+/*N*/ pProgress = new SfxProgress( this, SchResId( STR_OPEN_DOCUMENT ).toString(), 100 );
/*N*/
/*N*/ if( pProgress )
/*N*/ pProgress->SetState( 0, 100 );
@@ -641,15 +641,15 @@ using namespace ::com::sun::star;
/*N*/ *pClassName = SvGlobalName(BF_SO3_SCH_CLASSID_30);
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARCHART;
/*N*/ (*pAppName).AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Schart 3.1" ));
-/*N*/ *pFullTypeName = String(SchResId(STR_CHART_DOCUMENT_FULLTYPE_31));
-/*N*/ *pShortTypeName = String(SchResId(STR_CHART_DOCUMENT));
+/*N*/ *pFullTypeName = SchResId(STR_CHART_DOCUMENT_FULLTYPE_31).toString();
+/*N*/ *pShortTypeName = SchResId(STR_CHART_DOCUMENT).toString();
/*N*/ }
/*N*/ else if (nFileFormat == SOFFICE_FILEFORMAT_40)
/*N*/ {
/*N*/ *pClassName = SvGlobalName(BF_SO3_SCH_CLASSID_40);
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARCHART_40;
-/*N*/ *pFullTypeName = String(SchResId(STR_CHART_DOCUMENT_FULLTYPE_40));
-/*N*/ *pShortTypeName = String(SchResId(STR_CHART_DOCUMENT));
+/*N*/ *pFullTypeName = SchResId(STR_CHART_DOCUMENT_FULLTYPE_40).toString();
+/*N*/ *pShortTypeName = SchResId(STR_CHART_DOCUMENT).toString();
/*N*/ }
/*N*/ else if (nFileFormat == SOFFICE_FILEFORMAT_50)
/*N*/ {
@@ -659,8 +659,8 @@ using namespace ::com::sun::star;
// has always been an error (!)
*pFormat = SOT_FORMATSTR_ID_STARCHART_50;
-/*N*/ *pFullTypeName = String(SchResId(STR_CHART_DOCUMENT_FULLTYPE_50));
-/*N*/ *pShortTypeName = String(SchResId(STR_CHART_DOCUMENT));
+/*N*/ *pFullTypeName = SchResId(STR_CHART_DOCUMENT_FULLTYPE_50).toString();
+/*N*/ *pShortTypeName = SchResId(STR_CHART_DOCUMENT).toString();
/*N*/ }
/*N*/ else if (nFileFormat == SOFFICE_FILEFORMAT_60)
/*N*/ {
@@ -670,8 +670,8 @@ using namespace ::com::sun::star;
// has always been an error (!)
*pFormat = SOT_FORMATSTR_ID_STARCHART_60;
-/*N*/ *pFullTypeName = String(SchResId(STR_CHART_DOCUMENT_FULLTYPE_60));
-/*N*/ *pShortTypeName = String(SchResId(STR_CHART_DOCUMENT));
+/*N*/ *pFullTypeName = SchResId(STR_CHART_DOCUMENT_FULLTYPE_60).toString();
+/*N*/ *pShortTypeName = SchResId(STR_CHART_DOCUMENT).toString();
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index f41f1bc..509432c 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -882,7 +882,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
}
// Standardvorlage an der Drawing Engine setzen
- String aName( SdResId(STR_STANDARD_STYLESHEET_NAME));
+ String aName( SdResId(STR_STANDARD_STYLESHEET_NAME).toString() );
SfxStyleSheet* pSheet = (SfxStyleSheet*)pStyleSheetPool->
Find(aName, SFX_STYLE_FAMILY_PARA);
SetDefaultStyleSheet(pSheet);
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
index 9004729..8a7aad0 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
@@ -254,7 +254,7 @@ void SdDrawDocument::CreateFirstPages()
pHandoutPage->SetBorder(2000, 2000, 2000, 2000);
pHandoutPage->SetPageKind(PK_HANDOUT);
- pHandoutPage->SetName( String (SdResId(STR_HANDOUT) ) );
+ pHandoutPage->SetName( SdResId(STR_HANDOUT).toString() );
InsertPage(pHandoutPage, 0);
SdPage* pHandoutMPage = (SdPage*) AllocPage((bMasterPage=TRUE));
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc4.cxx b/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
index c91ab14..bf5f47b 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
@@ -101,7 +101,7 @@ void SdDrawDocument::CreateLayoutTemplates()
SdStyleSheetPool* pLclStyleSheetPool = (SdStyleSheetPool*)GetStyleSheetPool();
SfxStyleSheetBase* pSheet = NULL;
String aHelpFile;
- String aStdName = String(SdResId(STR_STANDARD_STYLESHEET_NAME));
+ String aStdName = SdResId(STR_STANDARD_STYLESHEET_NAME).toString();
// ---- Standardvorlage -----------------------------------------------
@@ -223,7 +223,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Objekt mit Pfeilspitze ----------------------------------------
- aName = String(SdResId(STR_POOLSHEET_OBJWITHARROW));
+ aName = SdResId(STR_POOLSHEET_OBJWITHARROW).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHARROW );
@@ -238,7 +238,7 @@ void SdDrawDocument::CreateLayoutTemplates()
aArrow[1]=Point(0,30); // \ /
aArrow[2]=Point(20,30); // \ /
aArrow[3]=Point(10,0); // \/1,0
- pISet->Put(XLineStartItem(ResId::toString(SdResId(STR_POOLSHEET_ARROW)),aArrow));
+ pISet->Put(XLineStartItem(SdResId(STR_POOLSHEET_ARROW).toString(),aArrow));
pISet->Put(XLineStartWidthItem(700));
pISet->Put(XLineEndWidthItem(300));
@@ -246,7 +246,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Objekt mit Schatten -------------------------------------------
- aName = ResId::toString(SdResId(STR_POOLSHEET_OBJWITHSHADOW));
+ aName = SdResId(STR_POOLSHEET_OBJWITHSHADOW).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
@@ -259,7 +259,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Objekt ohne Fllung -------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
+ aName = SdResId(STR_POOLSHEET_OBJWITHOUTFILL).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL );
@@ -269,7 +269,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Text ----------------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TEXT));
+ aName = SdResId(STR_POOLSHEET_TEXT).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT );
@@ -280,7 +280,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textk”rper ----------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY));
+ aName = SdResId(STR_POOLSHEET_TEXTBODY).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY );
@@ -293,7 +293,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textk”rper mit Blocksatz --------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY));
+ aName = SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_JUSTIFY );
@@ -306,7 +306,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textkoerper mit Einzug -----------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY_INDENT));
+ aName = SdResId(STR_POOLSHEET_TEXTBODY_INDENT).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_INDENT );
@@ -326,7 +326,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel ---------------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TITLE));
+ aName = SdResId(STR_POOLSHEET_TITLE).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE );
@@ -339,7 +339,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel1 --------------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TITLE1));
+ aName = SdResId(STR_POOLSHEET_TITLE1).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE1 );
@@ -360,7 +360,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel2 --------------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TITLE2));
+ aName = SdResId(STR_POOLSHEET_TITLE2).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE2 );
@@ -393,7 +393,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift ---------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_HEADLINE));
+ aName = SdResId(STR_POOLSHEET_HEADLINE).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE );
@@ -409,7 +409,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift1 --------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_HEADLINE1));
+ aName = SdResId(STR_POOLSHEET_HEADLINE1).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE1 );
@@ -427,7 +427,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift2 --------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_HEADLINE2));
+ aName = SdResId(STR_POOLSHEET_HEADLINE2).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE2 );
@@ -446,7 +446,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Bemassung --------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_MEASURE));
+ aName = SdResId(STR_POOLSHEET_MEASURE).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
@@ -462,7 +462,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineStyleItem(XLINE_SOLID));
// Praesentationsvorlagen fuer das Standardlayout erzeugen
- String aPrefix = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ String aPrefix = SdResId(STR_LAYOUT_DEFAULT_NAME).toString();
pLclStyleSheetPool->CreateLayoutStyleSheets(aPrefix);
}
@@ -603,7 +603,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St
// sowie ihrer Masterpages setzen
String aPageLayoutName(rNewName);
aPageLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
- aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aPageLayoutName += SdResId(STR_LAYOUT_OUTLINE).toString();
// an allen Seiten, die das jetzt umbeannte Layout benutzen, die
// Textobjekte von der Aenderung unterrichten und Layoutnamen setzen
diff --git a/binfilter/bf_sd/source/core/sd_sdpage.cxx b/binfilter/bf_sd/source/core/sd_sdpage.cxx
index 33ced35..f1c757a 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage.cxx
@@ -83,9 +83,9 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pInBasic, BOOL bMasterPage) :
nPaperBin(PAPERBIN_PRINTER_SETTINGS),
mpItems(NULL)
{
- aLayoutName = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ aLayoutName = SdResId(STR_LAYOUT_DEFAULT_NAME).toString();
aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
- aLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aLayoutName += SdResId(STR_LAYOUT_OUTLINE).toString();
eCharSet = osl_getThreadTextEncoding();
@@ -366,20 +366,20 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind)
break;
case PRESOBJ_TITLE:
- aName += String(SdResId(STR_LAYOUT_TITLE));
+ aName += SdResId(STR_LAYOUT_TITLE).toString();
break;
case PRESOBJ_BACKGROUND:
- aName += String(SdResId(STR_LAYOUT_BACKGROUND));
+ aName += SdResId(STR_LAYOUT_BACKGROUND).toString();
break;
case PRESOBJ_NOTES:
- aName += String(SdResId(STR_LAYOUT_NOTES));
+ aName += SdResId(STR_LAYOUT_NOTES).toString();
break;
case PRESOBJ_TEXT:
{
- aName += String(SdResId(STR_LAYOUT_SUBTITLE));
+ aName += SdResId(STR_LAYOUT_SUBTITLE).toString();
}
break;
@@ -1891,28 +1891,28 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
{
pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) );
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER2 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER2 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER3 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER3 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER4 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER4 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER5 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER5 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER6 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER6 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER7 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER7 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER8 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER8 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER9 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER9 ).toString();
}
}
else if (eObjKind == PRESOBJ_TITLE)
@@ -1975,13 +1975,13 @@ const String& SdPage::GetName()
!bMaster)
{
USHORT nNum = (GetPageNum() + 1) / 2;
- aCreatedPageName = String(SdResId(STR_PAGE));
+ aCreatedPageName = SdResId(STR_PAGE).toString();
aCreatedPageName += sal_Unicode( ' ' );
aCreatedPageName += ((SdDrawDocument*) GetModel())->CreatePageNumValue(nNum);
}
else
{
- aCreatedPageName = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ aCreatedPageName = SdResId(STR_LAYOUT_DEFAULT_NAME).toString();
}
}
else
@@ -1992,12 +1992,12 @@ const String& SdPage::GetName()
if (ePageKind == PK_NOTES)
{
aCreatedPageName += sal_Unicode( ' ' );
- aCreatedPageName += String(SdResId(STR_NOTES));
+ aCreatedPageName += SdResId(STR_NOTES).toString();
}
else if (ePageKind == PK_HANDOUT && bMaster)
{
aCreatedPageName += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ));
- aCreatedPageName += String(SdResId(STR_HANDOUT));
+ aCreatedPageName += SdResId(STR_HANDOUT).toString();
aCreatedPageName += sal_Unicode( ')' );
}
@@ -2051,63 +2051,63 @@ String SdPage::GetPresObjText(PresObjKind eObjKind)
{
if (ePageKind != PK_NOTES)
{
- aString = String ( SdResId( STR_PRESOBJ_MPTITLE ) );
+ aString = SdResId( STR_PRESOBJ_MPTITLE ).toString();
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_MPNOTESTITLE ) );
+ aString = SdResId( STR_PRESOBJ_MPNOTESTITLE ).toString();
}
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_TITLE ) );
+ aString = SdResId( STR_PRESOBJ_TITLE ).toString();
}
}
else if (eObjKind == PRESOBJ_OUTLINE)
{
if (bMaster)
{
- aString = String ( SdResId( STR_PRESOBJ_MPOUTLINE ) );
+ aString = SdResId( STR_PRESOBJ_MPOUTLINE ).toString();
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_OUTLINE ) );
+ aString = SdResId( STR_PRESOBJ_OUTLINE ).toString();
}
}
else if (eObjKind == PRESOBJ_NOTES)
{
if (bMaster)
{
- aString = String ( SdResId( STR_PRESOBJ_MPNOTESTEXT ) );
+ aString = SdResId( STR_PRESOBJ_MPNOTESTEXT ).toString();
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_NOTESTEXT ) );
+ aString = SdResId( STR_PRESOBJ_NOTESTEXT ).toString();
}
}
else if (eObjKind == PRESOBJ_TEXT)
{
- aString = String ( SdResId( STR_PRESOBJ_TEXT ) );
+ aString = SdResId( STR_PRESOBJ_TEXT ).toString();
}
else if (eObjKind == PRESOBJ_GRAPHIC)
{
- aString = String ( SdResId( STR_PRESOBJ_GRAPHIC ) );
+ aString = SdResId( STR_PRESOBJ_GRAPHIC ).toString();
}
else if (eObjKind == PRESOBJ_OBJECT)
{
- aString = String ( SdResId( STR_PRESOBJ_OBJECT ) );
+ aString = SdResId( STR_PRESOBJ_OBJECT ).toString();
}
else if (eObjKind == PRESOBJ_CHART)
{
- aString = String ( SdResId( STR_PRESOBJ_CHART ) );
+ aString = SdResId( STR_PRESOBJ_CHART ).toString();
}
else if (eObjKind == PRESOBJ_ORGCHART)
{
- aString = String ( SdResId( STR_PRESOBJ_ORGCHART ) );
+ aString = SdResId( STR_PRESOBJ_ORGCHART ).toString();
}
else if (eObjKind == PRESOBJ_TABLE)
{
- aString = String ( SdResId( STR_PRESOBJ_TABLE ) );
+ aString = SdResId( STR_PRESOBJ_TABLE ).toString();
}
return(aString);
diff --git a/binfilter/bf_sd/source/core/sd_stlpool.cxx b/binfilter/bf_sd/source/core/sd_stlpool.cxx
index 66107cb..882ccfa 100644
--- a/binfilter/bf_sd/source/core/sd_stlpool.cxx
+++ b/binfilter/bf_sd/source/core/sd_stlpool.cxx
@@ -128,7 +128,7 @@ namespace binfilter {
/*N*/ {
/*N*/ String aName(rLayoutName);
/*N*/ aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aName += String(SdResId(STR_LAYOUT_TITLE));
+/*N*/ aName += SdResId(STR_LAYOUT_TITLE).toString();
/*N*/ SfxStyleSheetBase* pResult = Find(aName, SD_LT_FAMILY);
/*N*/ return pResult;
/*N*/ }
@@ -151,7 +151,7 @@ namespace binfilter {
/*N*/ {
/*N*/ String aName(rLayoutName);
/*N*/ aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aName += String(SdResId(STR_LAYOUT_OUTLINE));
+/*N*/ aName += SdResId(STR_LAYOUT_OUTLINE).toString();
/*N*/ List* pList = new List;
/*N*/ for (USHORT nSheet = 1; nSheet < 10; nSheet++)
/*N*/ {
@@ -199,7 +199,7 @@ namespace binfilter {
/**************************************************************************
* Gliederungsebenen
**************************************************************************/
-/*N*/ String aName(SdResId(STR_LAYOUT_OUTLINE));
+/*N*/ String aName(SdResId(STR_LAYOUT_OUTLINE).toString());
/*N*/ String aHelpFile;
/*N*/
/*N*/ SfxStyleSheetBase* pParent = NULL;
@@ -352,7 +352,7 @@ namespace binfilter {
/**************************************************************************
* Titel
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_TITLE));
+/*N*/ aName = SdResId(STR_LAYOUT_TITLE).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -395,7 +395,7 @@ namespace binfilter {
* Untertitel
* Aenderugen auch in AdjustLRSpaceItems() vornehmen!
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_SUBTITLE));
+/*N*/ aName = SdResId(STR_LAYOUT_SUBTITLE).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -440,7 +440,7 @@ namespace binfilter {
/**************************************************************************
* Notizen
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_NOTES));
+/*N*/ aName = SdResId(STR_LAYOUT_NOTES).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -487,7 +487,7 @@ namespace binfilter {
/**************************************************************************
* Hintergrundobjekte
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+/*N*/ aName = SdResId(STR_LAYOUT_BACKGROUNDOBJECTS).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -507,7 +507,7 @@ namespace binfilter {
/**************************************************************************
* Hintergrund
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_BACKGROUND));
+/*N*/ aName = SdResId(STR_LAYOUT_BACKGROUND).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -588,7 +588,7 @@ namespace binfilter {
/*N*/
/*N*/ USHORT nLclMask = SFXSTYLEBIT_USED;
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_TITLE).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -597,7 +597,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_SUBTITLE).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -606,7 +606,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -615,7 +615,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_BACKGROUND).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -624,7 +624,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_NOTES));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_NOTES).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -635,7 +635,7 @@ namespace binfilter {
/*N*/
/*N*/ pParent = NULL;
/*N*/ SetSearchMask(SFX_STYLE_FAMILY_PSEUDO);
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_OUTLINE));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_OUTLINE).toString();
/*N*/ for (USHORT nLevel = 1; nLevel < 10; nLevel++)
/*N*/ {
/*N*/ String aLevelName(aName);
@@ -726,7 +726,7 @@ namespace binfilter {
/*N*/ {
/*N*/ if( nNameId )
/*N*/ {
-/*N*/ aNewName = String( SdResId( nNameId ) );
+/*N*/ aNewName = SdResId( nNameId ).toString();
/*N*/ if( nNameId == STR_PSEUDOSHEET_OUTLINE )
/*N*/ {
/*N*/ aNewName.Append( sal_Unicode( ' ' ));
@@ -769,79 +769,79 @@ namespace binfilter {
/*N*/ USHORT nNewId = 0;
/*N*/ if( eFam == SFX_STYLE_FAMILY_PARA )
/*N*/ {
-/*N*/ if( aOldName == String( SdResId( STR_STANDARD_STYLESHEET_NAME ) ) ||
+/*N*/ if( aOldName == String( SdResId( STR_STANDARD_STYLESHEET_NAME ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Standard", 0, RTL_CONSTASCII_LENGTH( "Standard" )) )
/*N*/ nNewId = HID_STANDARD_STYLESHEET_NAME;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHARROW ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHARROW ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Objekt mit Pfeilspitze", 0, RTL_CONSTASCII_LENGTH( "Objekt mit Pfeilspitze" )) )
/*N*/ nNewId = HID_POOLSHEET_OBJWITHARROW;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHSHADOW ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHSHADOW ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Objekt mit Schatten", 0, RTL_CONSTASCII_LENGTH( "Objekt mit Schatten" )) )
/*N*/ nNewId = HID_POOLSHEET_OBJWITHSHADOW;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHOUTFILL ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_OBJWITHOUTFILL_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHOUTFILL ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_OBJWITHOUTFILL_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Objekt ohne Füllung", 0, RTL_CONSTASCII_LENGTH( "Objekt ohne Füllung" )) )
/*N*/ nNewId = HID_POOLSHEET_OBJWITHOUTFILL;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXT ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXT ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Text", 0, RTL_CONSTASCII_LENGTH( "Text" )) )
/*N*/ nNewId = HID_POOLSHEET_TEXT;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY ).toString() ) ||
+/*N*/ aOldName == String(SdResId( STR_POOLSHEET_TEXTBODY_NT ).toString()) )
/*N*/ //aOldName.EqualsAscii( "Textkörper", 0, RTL_CONSTASCII_LENGTH( "Textkörper" )) )
/*N*/ nNewId = HID_POOLSHEET_TEXTBODY;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_JUSTIFY ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_JUSTIFY_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_JUSTIFY ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_JUSTIFY_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Textkörper Blocksatz", 0, RTL_CONSTASCII_LENGTH( "Textkörper Blocksatz" )) )
/*N*/ nNewId = HID_POOLSHEET_TEXTBODY_JUSTIFY;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_INDENT ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_INDENT_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_INDENT ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_INDENT_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Textkörper Einzug", 0, RTL_CONSTASCII_LENGTH( "Textkörper Einzug" )) )
/*N*/ nNewId = HID_POOLSHEET_TEXTBODY_INDENT;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Titel", 0, RTL_CONSTASCII_LENGTH( "Titel" )) )
/*N*/ nNewId = HID_POOLSHEET_TITLE;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE1 ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE1 ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Titel1", 0, RTL_CONSTASCII_LENGTH( "Titel1" )) )
/*N*/ nNewId = HID_POOLSHEET_TITLE1;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE2 ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE2 ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Titel2", 0, RTL_CONSTASCII_LENGTH( "Titel2" )) )
/*N*/ nNewId = HID_POOLSHEET_TITLE2;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Überschrift", 0, RTL_CONSTASCII_LENGTH( "Überschrift" )) )
/*N*/ nNewId = HID_POOLSHEET_HEADLINE;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE1 ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE1_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE1 ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE1_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Überschrift1", 0, RTL_CONSTASCII_LENGTH( "Überschrift1" )) )
/*N*/ nNewId = HID_POOLSHEET_HEADLINE1;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE2 ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE2_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE2 ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE2_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Überschrift2", 0, RTL_CONSTASCII_LENGTH( "Überschrift2" )) )
/*N*/ nNewId = HID_POOLSHEET_HEADLINE2;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_MEASURE ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_MEASURE_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_MEASURE ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_MEASURE_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Maßlinie", 0, RTL_CONSTASCII_LENGTH( "Maßlinie" )) )
/*N*/ nNewId = HID_POOLSHEET_MEASURE;
/*N*/ }
/*N*/ else if( eFam == SFX_STYLE_FAMILY_PSEUDO )
/*N*/ {
-/*N*/ String aStr( SdResId( STR_PSEUDOSHEET_OUTLINE ) );
+/*N*/ String aStr( SdResId( STR_PSEUDOSHEET_OUTLINE ).toString() );
/*N*/ aStr.Append( sal_Unicode( ' ' ));
/*N*/ String aStr2( RTL_CONSTASCII_USTRINGPARAM( "Gliederung " ));
/*N*/
-/*N*/ if( aOldName == String( SdResId( STR_PSEUDOSHEET_TITLE ) ) ||
+/*N*/ if( aOldName == String( SdResId( STR_PSEUDOSHEET_TITLE ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Titel", 0, RTL_CONSTASCII_LENGTH( "Titel" )))
/*N*/ nNewId = HID_PSEUDOSHEET_TITLE;
-/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_SUBTITLE ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_SUBTITLE ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Untertitel", 0, RTL_CONSTASCII_LENGTH( "Untertitel" )) )
/*N*/ nNewId = HID_PSEUDOSHEET_SUBTITLE;
-/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Hintergrundobjekte", 0, RTL_CONSTASCII_LENGTH( "Hintergrundobjekte" )) )
/*N*/ nNewId = HID_PSEUDOSHEET_BACKGROUNDOBJECTS;
-/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_BACKGROUND ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_BACKGROUND ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Hintergrund", 0, RTL_CONSTASCII_LENGTH( "Hintergrund" )) )
/*N*/ nNewId = HID_PSEUDOSHEET_BACKGROUND;
-/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_NOTES ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_NOTES ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Notizen", 0, RTL_CONSTASCII_LENGTH( "Notizen" )) )
/*N*/ nNewId = HID_PSEUDOSHEET_NOTES;
/*N*/ else if( aOldName.Equals( String( String( aStr ).Append( String( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "1" ) ) ) ) ) ) ||
@@ -933,12 +933,12 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ String aOutlineName( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aOutlineName += String(SdResId(STR_PSEUDOSHEET_OUTLINE));
+/*N*/ aOutlineName += SdResId(STR_PSEUDOSHEET_OUTLINE).toString();
/*N*/ String aTitleName( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aTitleName += String(SdResId(STR_PSEUDOSHEET_TITLE));
+/*N*/ aTitleName += SdResId(STR_PSEUDOSHEET_TITLE).toString();
/*N*/ String aSubtitleName( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aSubtitleName += String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
-/*N*/ String aStandardName(SdResId(STR_STANDARD_STYLESHEET_NAME));
+/*N*/ aSubtitleName += SdResId(STR_PSEUDOSHEET_SUBTITLE).toString();
+/*N*/ String aStandardName(SdResId(STR_STANDARD_STYLESHEET_NAME).toString());
/*N*/ SfxStyleSheet* pSheetOutlineLevelOne = NULL;
/*N*/
/*N*/ for (size_t n = 0; n < nCount; n++)
diff --git a/binfilter/bf_sd/source/core/sd_stlsheet.cxx b/binfilter/bf_sd/source/core/sd_stlsheet.cxx
index 1f85b88..6a38a89 100644
--- a/binfilter/bf_sd/source/core/sd_stlsheet.cxx
+++ b/binfilter/bf_sd/source/core/sd_stlsheet.cxx
@@ -289,34 +289,34 @@ namespace binfilter {
/*N*/ // Namen (unabhaengig von der Landessprache) mappen
/*N*/ String aInternalName;
/*N*/
-/*N*/ if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE)))
+/*N*/ if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_TITLE).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_TITLE));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_TITLE).toString();
/*N*/ }
-/*N*/ else if (aName == String(SdResId(STR_PSEUDOSHEET_SUBTITLE)))
+/*N*/ else if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_SUBTITLE).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_SUBTITLE));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_SUBTITLE).toString();
/*N*/ }
-/*N*/ else if (aName == String(SdResId(STR_PSEUDOSHEET_BACKGROUND)))
+/*N*/ else if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_BACKGROUND).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_BACKGROUND));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_BACKGROUND).toString();
/*N*/ }
-/*N*/ else if (aName == String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)))
+/*N*/ else if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_BACKGROUNDOBJECTS).toString();
/*N*/ }
-/*N*/ else if (aName == String(SdResId(STR_PSEUDOSHEET_NOTES)))
+/*N*/ else if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_NOTES).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_NOTES));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_NOTES).toString();
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ String aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE));
+/*N*/ String aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE).toString());
/*N*/ USHORT nPos = aName.Search(aOutlineStr);
/*N*/ if (nPos != STRING_NOTFOUND)
/*N*/ {
/*N*/ String aNumStr(aName.Copy(aOutlineStr.Len()));
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_OUTLINE));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_OUTLINE).toString();
/*N*/ aInternalName += aNumStr;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
index 01a84a7..d9df011 100644
--- a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
+++ b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
@@ -79,7 +79,7 @@ SdFilter::~SdFilter()
void SdFilter::CreateProgress()
{
- mpProgress = new SfxProgress( &mrDocShell, String( SdResId( STR_LOAD_DOC ) ), 100 );
+ mpProgress = new SfxProgress( &mrDocShell, SdResId( STR_LOAD_DOC ).toString(), 100 );
mpProgress->SetState( 0, 100 );
}
diff --git a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
index e7dee5f..53e1c5e 100644
--- a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
+++ b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
@@ -381,15 +381,15 @@ void SdDrawDocShell::FillClass(SvGlobalName* pClassName,ULONG* pFormat, String*
*pClassName = SvGlobalName(BF_SO3_SIMPRESS_CLASSID_30);
*pFormat = SOT_FORMATSTR_ID_STARDRAW;
*pAppName = String(RTL_CONSTASCII_USTRINGPARAM("Sdraw 3.1"));
- *pFullTypeName = String(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_31));;
- *pShortTypeName = String(SdResId(STR_IMPRESS_DOCUMENT));
+ *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_31).toString();;
+ *pShortTypeName = SdResId(STR_IMPRESS_DOCUMENT).toString();
}
else if (nFileFormat == SOFFICE_FILEFORMAT_40)
{
*pClassName = SvGlobalName(BF_SO3_SIMPRESS_CLASSID_40);
*pFormat = SOT_FORMATSTR_ID_STARDRAW_40;
- *pFullTypeName = String(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_40));
- *pShortTypeName = String(SdResId(STR_IMPRESS_DOCUMENT));
+ *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_40).toString();
+ *pShortTypeName = SdResId(STR_IMPRESS_DOCUMENT).toString();
}
else
{
@@ -399,19 +399,19 @@ void SdDrawDocShell::FillClass(SvGlobalName* pClassName,ULONG* pFormat, String*
{
*pClassName = SvGlobalName(BF_SO3_SDRAW_CLASSID_50);
*pFormat = SOT_FORMATSTR_ID_STARDRAW_50;
- *pFullTypeName = String(SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_50));
+ *pFullTypeName = SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_50).toString();
}
else
{
*pClassName = SvGlobalName(BF_SO3_SIMPRESS_CLASSID_50);
*pFormat = SOT_FORMATSTR_ID_STARIMPRESS_50;
- *pFullTypeName = String(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_50));
+ *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_50).toString();
}
}
else if (nFileFormat == SOFFICE_FILEFORMAT_CURRENT)
{
- *pFullTypeName = String(SdResId( (eDocType == DOCUMENT_TYPE_DRAW) ?
- STR_GRAPHIC_DOCUMENT_FULLTYPE_60 : STR_IMPRESS_DOCUMENT_FULLTYPE_60 ));
+ *pFullTypeName = SdResId( (eDocType == DOCUMENT_TYPE_DRAW) ?
+ STR_GRAPHIC_DOCUMENT_FULLTYPE_60 : STR_IMPRESS_DOCUMENT_FULLTYPE_60 ).toString();
if(eDocType == DOCUMENT_TYPE_DRAW)
{
@@ -426,8 +426,8 @@ void SdDrawDocShell::FillClass(SvGlobalName* pClassName,ULONG* pFormat, String*
}
- *pShortTypeName = String(SdResId( (eDocType == DOCUMENT_TYPE_DRAW) ?
- STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT ));
+ *pShortTypeName = SdResId( (eDocType == DOCUMENT_TYPE_DRAW) ?
+ STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT ).toString();
}
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
index 4fe3256..d025857 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
@@ -99,7 +99,7 @@ String SdUnoGraphicStyleFamily::getInternalStyleName( const OUString& rName ) th
{
if( rName.compareToAscii( pMap->mpName ) == 0 )
{
- String aStr( SdResId(pMap->mnResId) );
+ String aStr( SdResId(pMap->mnResId).toString() );
return aStr;
}
@@ -132,7 +132,7 @@ OUString SdUnoGraphicStyleFamily::getExternalStyleName( const String& rName ) th
struct SdUnoGStyleNameMapper_s* pMap = SdUnoGStyleNameMapper;
while( pMap->mpName )
{
- String aCompare( SdResId(pMap->mnResId) );
+ String aCompare( SdResId(pMap->mnResId).toString() );
if( rName == aCompare )
return OUString::createFromAscii( pMap->mpName );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
index 05089bd..7001a53 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
@@ -436,7 +436,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
// Ueberpruefung auf schon vorhandene Namen
while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
{
- aLayerName = String(SdResId(STR_LAYER));
+ aLayerName = SdResId(STR_LAYER).toString();
aLayerName += String::CreateFromInt32( (sal_Int32)nLayer );
nLayer++;
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 0ca24d8..282be3e 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -1655,7 +1655,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
nInsertPos = nMPageCount;
// now generate a unique name for the new masterpage
- const String aStdPrefix( SdResId(STR_LAYOUT_DEFAULT_NAME) );
+ const String aStdPrefix( SdResId(STR_LAYOUT_DEFAULT_NAME).toString() );
String aPrefix( aStdPrefix );
sal_Bool bUnique = sal_True;
@@ -1685,7 +1685,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
String aLayoutName( aPrefix );
aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
- aLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aLayoutName += SdResId(STR_LAYOUT_OUTLINE).toString();
// create styles
((SdStyleSheetPool*)pDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
index c0f4343..857744c 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
@@ -1387,7 +1387,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
{
sal_Int32 nPageNumber = aStrBookmark.copy( aApiPageName.getLength() ).toInt32();
OUStringBuffer sBuffer;
- String aPageName( SdResId(STR_PAGE) );
+ String aPageName( SdResId(STR_PAGE).toString() );
sBuffer.append( aPageName );
sBuffer.append( sal_Unicode( ' ' ) );
sBuffer.append( nPageNumber );
@@ -1604,7 +1604,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
break;
case presentation::ClickAction_BOOKMARK:
{
- String aPageName( SdResId(STR_PAGE) );
+ String aPageName( SdResId(STR_PAGE).toString() );
aPageName += sal_Unicode( ' ' );
const OUString aStrBookmark( pInfo->aBookmark );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
index 86eb77b..7fafd61 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
@@ -1404,7 +1404,7 @@ OUString SdDrawPage::getPageApiNameFromUiName( const String& rUIName )
{
OUString aApiName;
- String aDefPageName(SdResId(STR_PAGE));
+ String aDefPageName(SdResId(STR_PAGE).toString());
aDefPageName += sal_Unicode( ' ' );
if( rUIName.Equals( aDefPageName, 0, aDefPageName.Len() ) )
@@ -1448,7 +1448,7 @@ String SdDrawPage::getUiNameFromPageApiName( const ::rtl::OUString& rApiName )
if( nPageNumber != -1)
{
OUStringBuffer sBuffer;
- sBuffer.append( String(SdResId(STR_PAGE)) );
+ sBuffer.append( SdResId(STR_PAGE).toString() );
sBuffer.append( sal_Unicode( ' ' ) );
sBuffer.append( aNumber );
return sBuffer.makeStringAndClear();
@@ -2042,7 +2042,7 @@ void SdMasterPage::setBackground( const uno::Any& rValue )
SfxStyleSheetBase* pStyleSheet = NULL;
if(pSSPool)
{
- String aStr(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+ String aStr(SdResId(STR_PSEUDOSHEET_BACKGROUND).toString());
pStyleSheet = pSSPool->Find( aStr, SFX_STYLE_FAMILY_PSEUDO);
if( pStyleSheet )
@@ -2098,7 +2098,7 @@ void SdMasterPage::getBackground( uno::Any& rValue ) throw()
SfxStyleSheetBase* pStyleSheet = NULL;
if(pSSPool)
{
- String aStr(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+ String aStr(SdResId(STR_PSEUDOSHEET_BACKGROUND).toString());
pStyleSheet = pSSPool->Find( aStr, SFX_STYLE_FAMILY_PSEUDO);
if( pStyleSheet )
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
index 00c814e..b023a7c 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
@@ -107,7 +107,7 @@ OUString SdUnoPseudoStyleFamily::getExternalStyleName( const String& rStyleName
for( nIndex = 0; nIndex < nPseudoStyleCount; nIndex++ )
{
SdResId aRID(StyleNameMapping[nIndex].mnRID);
- String aCompareString(aRID);
+ String aCompareString(aRID.toString());
if( StyleNameMapping[nIndex].mnRID == STR_LAYOUT_OUTLINE )
{
@@ -280,7 +280,7 @@ void SdUnoPseudoStyleFamily::createStyle( sal_uInt16 nIndex, uno::Any& rAny ) th
sal_uInt16 nRID = StyleNameMapping[nIndex].mnRID;
SdResId aRID(nRID);
- aLayoutName += String(aRID);
+ aLayoutName += aRID.toString();
if( STR_LAYOUT_OUTLINE == nRID )
{
diff --git a/binfilter/bf_so3/source/inplace/applet2.cxx b/binfilter/bf_so3/source/inplace/applet2.cxx
index 0abc2ac..ab3f421 100644
--- a/binfilter/bf_so3/source/inplace/applet2.cxx
+++ b/binfilter/bf_so3/source/inplace/applet2.cxx
@@ -275,9 +275,9 @@ SvAppletObject::SvAppletObject()
pSoApp->pAppletVerbList = new SvVerbList();
// Alle unterstuetzten Verben anlegen
pSoApp->pAppletVerbList->Append(
- SvVerb( 0, String( SoResId( STR_VERB_OPEN ) ) ) );
+ SvVerb( 0, SoResId( STR_VERB_OPEN ).toString() ) );
pSoApp->pAppletVerbList->Append(
- SvVerb( SVVERB_PROPS, String( SoResId( STR_VERB_PROPS ) ) ) );
+ SvVerb( SVVERB_PROPS, SoResId( STR_VERB_PROPS ).toString() ) );
pSoApp->nAppletDocFormat = SOT_FORMATSTR_ID_APPLETOBJECT;
}
// Verben der Superklasse bekanntgeben, um GetVerbs nicht
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index ac7643c..468a002 100644
--- a/binfilter/bf_so3/source/inplace/plugin.cxx
+++ b/binfilter/bf_so3/source/inplace/plugin.cxx
@@ -220,7 +220,7 @@ SvPlugInObject::SvPlugInObject()
pSoApp->pPlugInVerbList = new SvVerbList();
// Alle unterstuetzten Verben anlegen
pSoApp->pPlugInVerbList->Append(
- SvVerb( 0, String( SoResId( STR_VERB_OPEN ) ) ) );
+ SvVerb( 0, SoResId( STR_VERB_OPEN ).toString() ) );
pSoApp->nPlugInDocFormat =
SotExchange::RegisterFormatName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PlugIn Object" ) ) );
}
diff --git a/binfilter/bf_so3/source/solink/lnkbase2.cxx b/binfilter/bf_so3/source/solink/lnkbase2.cxx
index 7df83cb..19bbb38 100644
--- a/binfilter/bf_so3/source/solink/lnkbase2.cxx
+++ b/binfilter/bf_so3/source/solink/lnkbase2.cxx
@@ -332,7 +332,7 @@ BOOL SvBaseLink::Edit( Window* pParent )
pLinkMgr->GetDisplayNames( this, &sApp, &sTopic, &sItem );
if( nObjType == OBJECT_CLIENT_DDE )
{
- sError = String( ResId( STR_ERROR_DDE, *SOAPP->GetResMgr()));
+ sError = ResId(STR_ERROR_DDE, *SOAPP->GetResMgr()).toString();
USHORT nFndPos = sError.Search( '%' );
if( STRING_NOTFOUND != nFndPos )
{
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx
index c75e09f..ab9d7dc 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -716,27 +716,27 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
/*N*/ *pClassName = SvGlobalName(BF_SO3_SM_CLASSID_30);
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARMATH;
/*N*/ pAppName->AssignAscii( RTL_CONSTASCII_STRINGPARAM("Smath 3.1"));
-/*N*/ *pFullTypeName = ResId::toString(SmResId(STR_MATH_DOCUMENT_FULLTYPE_31));
-/*N*/ *pShortTypeName = ResId::toString(SmResId(RID_DOCUMENTSTR));
+/*N*/ *pFullTypeName = SmResId(STR_MATH_DOCUMENT_FULLTYPE_31).toString();
+/*N*/ *pShortTypeName = SmResId(RID_DOCUMENTSTR).toString();
/*N*/ }
/*N*/ else if (nFileFormat == SOFFICE_FILEFORMAT_40)
/*N*/ {
/*N*/ *pClassName = SvGlobalName(BF_SO3_SM_CLASSID_40);
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARMATH_40;
-/*N*/ *pFullTypeName = ResId::toString(SmResId(STR_MATH_DOCUMENT_FULLTYPE_40));
-/*N*/ *pShortTypeName = ResId::toString(SmResId(RID_DOCUMENTSTR));
+/*N*/ *pFullTypeName = SmResId(STR_MATH_DOCUMENT_FULLTYPE_40).toString();
+/*N*/ *pShortTypeName = SmResId(RID_DOCUMENTSTR).toString();
/*N*/ }
/*N*/ else if (nFileFormat == SOFFICE_FILEFORMAT_50)
/*N*/ {
/*N*/ *pClassName = SvGlobalName(BF_SO3_SM_CLASSID_50);
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARMATH_50;
-/*N*/ *pFullTypeName = ResId::toString(SmResId(STR_MATH_DOCUMENT_FULLTYPE_50));
-/*N*/ *pShortTypeName = ResId::toString(SmResId(RID_DOCUMENTSTR));
+/*N*/ *pFullTypeName = SmResId(STR_MATH_DOCUMENT_FULLTYPE_50).toString();
+/*N*/ *pShortTypeName = SmResId(RID_DOCUMENTSTR).toString();
/*N*/ }
/*N*/ else if (nFileFormat == SOFFICE_FILEFORMAT_60 )
/*N*/ {
-/*N*/ *pFullTypeName = ResId::toString(SmResId(STR_MATH_DOCUMENT_FULLTYPE_60));
-/*N*/ *pShortTypeName = ResId::toString(SmResId(RID_DOCUMENTSTR));
+/*N*/ *pFullTypeName = SmResId(STR_MATH_DOCUMENT_FULLTYPE_60).toString();
+/*N*/ *pShortTypeName = SmResId(RID_DOCUMENTSTR).toString();
// for binfilter, we need the FormatIDs to be set. Not setting them
// has always been an error (!)
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx
index 949f0a8..4d8734f 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -271,7 +271,7 @@ ULONG SmXMLWrapper::Import(SfxMedium &rMedium)
sal_Int32 nProgressRange(nSteps);
if (xStatusIndicator.is())
{
- xStatusIndicator->start(ResId::toString(SmResId(STR_STATSTR_READING)),
+ xStatusIndicator->start(SmResId(STR_STATSTR_READING).toString(),
nProgressRange);
}
diff --git a/binfilter/bf_starmath/source/starmath_parse.cxx b/binfilter/bf_starmath/source/starmath_parse.cxx
index 8cb5b88..30f763c 100644
--- a/binfilter/bf_starmath/source/starmath_parse.cxx
+++ b/binfilter/bf_starmath/source/starmath_parse.cxx
@@ -2303,7 +2303,7 @@ const sal_Int32 coNumContFlags =
/*N*/
/*N*/ pErrDesc->Type = Type;
/*N*/ pErrDesc->pNode = pNode;
-/*N*/ pErrDesc->Text = String(SmResId(RID_ERR_IDENT));
+/*N*/ pErrDesc->Text = SmResId(RID_ERR_IDENT).toString();
/*N*/
/*N*/ USHORT nRID;
/*N*/ switch (Type)
@@ -2325,7 +2325,7 @@ const sal_Int32 coNumContFlags =
/*N*/ default:
/*N*/ nRID = RID_ERR_UNKOWN;
/*N*/ }
-/*N*/ pErrDesc->Text += String(SmResId(nRID));
+/*N*/ pErrDesc->Text += SmResId(nRID).toString();
/*N*/
/*N*/ ErrDescList.push_back( pErrDesc );
/*N*/ }
diff --git a/binfilter/bf_svtools/source/misc/svt_ctrltool.cxx b/binfilter/bf_svtools/source/misc/svt_ctrltool.cxx
index c1ac718..2fc6e57 100644
--- a/binfilter/bf_svtools/source/misc/svt_ctrltool.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ctrltool.cxx
@@ -303,14 +303,14 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, BOOL bAll )
mpSizeAry = NULL;
// Stylenamen festlegen
- maLight = XubString( SvtResId( STR_SVT_STYLE_LIGHT ) );
- maLightItalic = XubString( SvtResId( STR_SVT_STYLE_LIGHT_ITALIC ) );
- maNormal = XubString( SvtResId( STR_SVT_STYLE_NORMAL ) );
- maNormalItalic = XubString( SvtResId( STR_SVT_STYLE_NORMAL_ITALIC ) );
- maBold = XubString( SvtResId( STR_SVT_STYLE_BOLD ) );
- maBoldItalic = XubString( SvtResId( STR_SVT_STYLE_BOLD_ITALIC ) );
- maBlack = XubString( SvtResId( STR_SVT_STYLE_BLACK ) );
- maBlackItalic = XubString( SvtResId( STR_SVT_STYLE_BLACK_ITALIC ) );
+ maLight = SvtResId( STR_SVT_STYLE_LIGHT ).toString();
+ maLightItalic = SvtResId( STR_SVT_STYLE_LIGHT_ITALIC ).toString();
+ maNormal = SvtResId( STR_SVT_STYLE_NORMAL ).toString();
+ maNormalItalic = SvtResId( STR_SVT_STYLE_NORMAL_ITALIC ).toString();
+ maBold = SvtResId( STR_SVT_STYLE_BOLD ).toString();
+ maBoldItalic = SvtResId( STR_SVT_STYLE_BOLD_ITALIC ).toString();
+ maBlack = SvtResId( STR_SVT_STYLE_BLACK ).toString();
+ maBlackItalic = SvtResId( STR_SVT_STYLE_BLACK_ITALIC ).toString();
ImplInsertFonts( pDevice, bAll, TRUE );
diff --git a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
index 819ebe2..6776065 100644
--- a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
@@ -272,7 +272,7 @@ class ResString: public String
//-------------------------------------------------------------------------
ResString::ResString(ResId & rId):
- String(rId.SetAutoRelease(FALSE)),
+ String(rId.SetAutoRelease(FALSE).toString()),
nFlags(0)
{
ResMgr * pResMgr = rId.GetResMgr();
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
index 851298b..5d1ecb4 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 d3ee941..3db659b 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 75c8220..a10d34d 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 c3bcb09..0982757 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 dd661c9..58b5937 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 e11abf1..fedc02d 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 ef7330a..51ec261 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 8cbd863..1edbbef 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 b1f9441..5dcf801 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 d2fa5bf..ff64bef 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 ac75a4b..034126c 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");
diff --git a/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx b/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
index ab34a3f..22066d7 100644
--- a/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
@@ -736,7 +736,7 @@ const struct SwTableEntry NumRuleProgNameTable [] =
/*N*/ while( nStt < nEnd )
/*N*/ {
/*N*/ const ResId rRId( nStt, *pSwResMgr );
-/*N*/ String* pStr = new String( rRId );
+/*N*/ String* pStr = new String( rRId.toString() );
/*N*/ pNameArray->Insert( pStr, pNameArray->Count() );
/*N*/ ++nStt;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 775d15b..3f9ac4d 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -714,7 +714,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ String lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
/*N*/ {
/*N*/ ResId aId( nDefStrId, *pSwResMgr );
-/*N*/ String aName( aId );
+/*N*/ String aName( aId.toString() );
/*N*/ xub_StrLen nNmLen = aName.Len();
/*N*/
/*N*/ const SwSpzFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
@@ -820,9 +820,9 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ ResId nFrmId( STR_FRAME_DEFNAME, *pSwResMgr ),
/*N*/ nGrfId( STR_GRAPHIC_DEFNAME, *pSwResMgr ),
/*N*/ nOLEId( STR_OBJECT_DEFNAME, *pSwResMgr );
-/*N*/ String sFlyNm( nFrmId );
-/*N*/ String sGrfNm( nGrfId );
-/*N*/ String sOLENm( nOLEId );
+/*N*/ String sFlyNm( nFrmId.toString() );
+/*N*/ String sGrfNm( nGrfId.toString() );
+/*N*/ String sOLENm( nOLEId.toString() );
/*N*/
/*N*/ if( 255 < ( n = GetSpzFrmFmts()->Count() ))
/*N*/ n = 255;
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index 5521505..f77ccf2 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -365,7 +365,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ eCoreMetric, ePresMetric );
/*N*/
/*N*/ ResId aResId( nResId + nId, *pSwResMgr );
-/*N*/ String aNm( aResId );
+/*N*/ String aNm( aResId.toString() );
/*N*/
/*N*/ // ein Set fuer alle zusetzenden Attribute
/*N*/ SwAttrSet aSet( GetAttrPool(), aTxtFmtCollSetRange );
@@ -1151,7 +1151,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*M*/ }
/*M*/
/*M*/ ResId aResId( nRCId + nId, *pSwResMgr );
-/*M*/ String aNm( aResId );
+/*M*/ String aNm( aResId.toString() );
/*M*/ SwAttrSet aSet( GetAttrPool(), pWhichRange );
/*M*/
/*M*/ if( pDesc )
@@ -1408,7 +1408,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ }
/*N*/
/*N*/ ResId aResId( sal_uInt32(RC_POOLPAGEDESC_BEGIN + nId - RES_POOLPAGE_BEGIN), *pSwResMgr );
-/*N*/ String aNm( aResId );
+/*N*/ String aNm( aResId.toString() );
/*N*/ if( pDesc )
/*N*/ {
/*?*/ pNewPgDsc = 0;
@@ -1570,7 +1570,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ }
/*N*/ ResId aResId( sal_uInt32(RC_POOLNUMRULE_BEGIN + nId - RES_POOLNUMRULE_BEGIN), *pSwResMgr );
-/*N*/ String aNm( aResId );
+/*N*/ String aNm( aResId.toString() );
/*N*/
/*N*/ SwCharFmt *pNumCFmt = 0, *pBullCFmt = 0;
/*N*/
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
index aeb96ab..7958a1e 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
@@ -810,7 +810,7 @@ namespace binfilter {
/*N*/ String SwDoc::GetUniqueSectionName( const String* pChkStr ) const
/*N*/ {
/*N*/ ResId aId( STR_REGION_DEFNAME, *pSwResMgr );
-/*N*/ String aName( aId );
+/*N*/ String aName( aId.toString() );
/*N*/ xub_StrLen nNmLen = aName.Len();
/*N*/
/*N*/ USHORT nNum(0), nTmp, nFlagSize = ( pSectionFmtTbl->Count() / 8 ) +2;
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 46aec2a..20992d2 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -613,7 +613,7 @@ USHORT aTableSplitBoxSetRange[] = {
/*N*/ String SwDoc::GetUniqueTblName() const
/*N*/ {
/*N*/ ResId aId( STR_TABLE_DEFNAME, *pSwResMgr );
-/*N*/ String aName( aId );
+/*N*/ String aName( aId.toString() );
/*N*/ xub_StrLen nNmLen = aName.Len();
/*N*/
/*N*/ USHORT nNum, nTmp, nFlagSize = ( pTblFrmFmtTbl->Count() / 8 ) +2;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
index ae972b9..9bd835d 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
@@ -587,10 +587,10 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
String sTypeName(uTmp);
SwFieldType* pLclType = m_pDoc->GetFldType(nResTypeId, sTypeName);
- String sTable(SW_RES(STR_POOLCOLL_LABEL_TABLE));
- String sDrawing(SW_RES(STR_POOLCOLL_LABEL_DRAWING));
- String sFrame(SW_RES(STR_POOLCOLL_LABEL_FRAME));
- String sIllustration(SW_RES(STR_POOLCOLL_LABEL_ABB));
+ String sTable(SW_RESSTR(STR_POOLCOLL_LABEL_TABLE));
+ String sDrawing(SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING));
+ String sFrame(SW_RESSTR(STR_POOLCOLL_LABEL_FRAME));
+ String sIllustration(SW_RESSTR(STR_POOLCOLL_LABEL_ABB));
if(pLclType ||
(RES_SETEXPFLD == nResTypeId &&
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index e101cb4..cb556e9 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -676,7 +676,7 @@ SwFmtColl* SwXTextCursor::GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional)
{
for(i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_ENDNOTE; ++i)
{
- const String aFmtName(SW_RES(i));
+ const String aFmtName(SW_RESSTR(i));
if(aFmtName == rName)
{
pRet = rDoc.GetPageDescFromPool( RES_POOLPAGE_BEGIN + i - RC_POOLPAGEDESC_BEGIN );
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
index 5486a15..61f6927 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
@@ -213,7 +213,7 @@ const SfxItemPropertyMap* GetLineNumberingMap()
SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue)
{
SwCharFmt* pRet = 0;
- String sStandard(SW_RES(STR_POOLCOLL_STANDARD));
+ String sStandard(SW_RESSTR(STR_POOLCOLL_STANDARD));
OUString uTmp;
aValue >>= uTmp;
String sCharFmt;
@@ -1454,7 +1454,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
else
{
//Vorlagenname
- String sValue(SW_RES(STR_POOLCOLL_HEADLINE1 + nIndex));
+ String sValue(SW_RESSTR(STR_POOLCOLL_HEADLINE1 + nIndex));
const SwTxtFmtColls* pColls = pDocShell->GetDoc()->GetTxtFmtColls();
const sal_uInt16 nCount = pColls->Count();
for(sal_uInt16 i = 0; i < nCount;++i)
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx b/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx
index 2bf4e59..09404cc 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx
@@ -1553,7 +1553,7 @@ const SwPageDesc& SwStyleBase_Impl::GetOldPageDesc()
{
for(i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_ENDNOTE; ++i)
{
- const String aFmtName(SW_RES(i));
+ const String aFmtName(SW_RESSTR(i));
if(aFmtName == rStyleName)
{
pOldPageDesc = rDoc.GetPageDescFromPool( RES_POOLPAGE_BEGIN + i - RC_POOLPAGEDESC_BEGIN );
diff --git a/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx b/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
index b7600b4..29fef25 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
@@ -130,9 +130,9 @@ using namespace ::rtl;
/*N*/ ERRCODE_AREA_SW_END,
/*N*/ pSwResMgr );
/*N*/
-/*N*/ SfxEventConfiguration::RegisterEvent(SW_EVENT_MAIL_MERGE, ResId::toString(SW_RES(STR_PRINT_MERGE_MACRO)), String::CreateFromAscii("OnMailMerge"));
-/*N*/ SfxEventConfiguration::RegisterEvent(SW_EVENT_MAIL_MERGE_END, ResId::toString(SW_RES(STR_PRINT_MERGE_MACRO)), String::CreateFromAscii("OnMailMergeFinished"));
-/*N*/ SfxEventConfiguration::RegisterEvent(SW_EVENT_PAGE_COUNT, ResId::toString(SW_RES(STR_PAGE_COUNT_MACRO)), String::CreateFromAscii("OnPageCountChange"));
+/*N*/ SfxEventConfiguration::RegisterEvent(SW_EVENT_MAIL_MERGE, SW_RESSTR(STR_PRINT_MERGE_MACRO), String::CreateFromAscii("OnMailMerge"));
+/*N*/ SfxEventConfiguration::RegisterEvent(SW_EVENT_MAIL_MERGE_END, SW_RESSTR(STR_PRINT_MERGE_MACRO), String::CreateFromAscii("OnMailMergeFinished"));
+/*N*/ SfxEventConfiguration::RegisterEvent(SW_EVENT_PAGE_COUNT, SW_RESSTR(STR_PAGE_COUNT_MACRO), String::CreateFromAscii("OnPageCountChange"));
/*N*/ pModuleConfig = new SwModuleOptions;
/*N*/
/*N*/ pStdFontConfig = new SwStdFontConfig;
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 6e7f30b..600a16e 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -1956,13 +1956,13 @@ void SAL_CALL SwXTextDocument::operator delete( void * p) throw()
SwXLinkTargetSupplier::SwXLinkTargetSupplier(SwXTextDocument& rxDoc) :
pxDoc(&rxDoc)
{
- sTables = String(SW_RES(STR_CONTENT_TYPE_TABLE));
- sFrames = String(SW_RES(STR_CONTENT_TYPE_FRAME));
- sGraphics = String(SW_RES(STR_CONTENT_TYPE_GRAPHIC));
- sOLEs = String(SW_RES(STR_CONTENT_TYPE_OLE));
- sSections = String(SW_RES(STR_CONTENT_TYPE_REGION));
- sOutlines = String(SW_RES(STR_CONTENT_TYPE_OUTLINE));
- sBookmarks = String(SW_RES(STR_CONTENT_TYPE_BOOKMARK));
+ sTables = SW_RESSTR(STR_CONTENT_TYPE_TABLE);
+ sFrames = SW_RESSTR(STR_CONTENT_TYPE_FRAME);
+ sGraphics = SW_RESSTR(STR_CONTENT_TYPE_GRAPHIC);
+ sOLEs = SW_RESSTR(STR_CONTENT_TYPE_OLE);
+ sSections = SW_RESSTR(STR_CONTENT_TYPE_REGION);
+ sOutlines = SW_RESSTR(STR_CONTENT_TYPE_OUTLINE);
+ sBookmarks = SW_RESSTR(STR_CONTENT_TYPE_BOOKMARK);
}
SwXLinkTargetSupplier::~SwXLinkTargetSupplier()
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx b/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx
index 7065e50..44fb8ed 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx
@@ -64,40 +64,40 @@ SvStringsDtor* pAuthFieldTypeList = 0;
/*N*/ ShellResource::ShellResource()
/*N*/ : Resource( SW_RES(RID_SW_SHELLRES) ),
-/*N*/ aPostItAuthor( SW_RES( STR_POSTIT_AUTHOR ) ),
-/*N*/ aPostItPage( SW_RES( STR_POSTIT_PAGE ) ),
-/*N*/ aPostItLine( SW_RES( STR_POSTIT_LINE ) ),
-/*N*/ aCalc_Syntax( SW_RES( STR_CALC_SYNTAX ) ),
-/*N*/ aCalc_ZeroDiv( SW_RES( STR_CALC_ZERODIV ) ),
-/*N*/ aCalc_Brack( SW_RES( STR_CALC_BRACK ) ),
-/*N*/ aCalc_Pow( SW_RES( STR_CALC_POW ) ),
-/*N*/ aCalc_VarNFnd( SW_RES( STR_CALC_VARNFND ) ),
-/*N*/ aCalc_Overflow( SW_RES( STR_CALC_OVERFLOW ) ),
-/*N*/ aCalc_WrongTime( SW_RES( STR_CALC_WRONGTIME ) ),
-/*N*/ aCalc_Default( SW_RES( STR_CALC_DEFAULT ) ),
-/*N*/ aCalc_Error( SW_RES( STR_CALC_ERROR ) ),
-/*N*/ aGetRefFld_Up( SW_RES( STR_GETREFFLD_UP ) ),
-/*N*/ aGetRefFld_Down( SW_RES( STR_GETREFFLD_DOWN ) ),
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list