diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-27 17:01:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-28 16:45:48 +0100 |
| commit | 5efc15f0006866ac4c422c1b2bde173ded47893f (patch) | |
| tree | 119b46339aae67b9a5b1a76ea2a955a548e5016e /chart2 | |
| parent | e39a959429234aef5348a8b5800b27c29de02a6f (diff) | |
reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
Diffstat (limited to 'chart2')
32 files changed, 235 insertions, 236 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 3b1be85ad49b..ecf9290287ab 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -110,7 +110,7 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const OUString SAL_CALL AccessibleChartView::getAccessibleName() throw (uno::RuntimeException) { - return OUString( String( SchResId( STR_OBJECT_DIAGRAM ))); + return SCH_RESSTR(STR_OBJECT_DIAGRAM); } OUString SAL_CALL AccessibleChartView::getAccessibleDescription() diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 12a01eb4cc18..78e3e14c1e0a 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -430,7 +430,7 @@ ColumnChartDialogController::~ColumnChartDialogController() } String ColumnChartDialogController::getName() { - return String( SchResId( STR_TYPE_COLUMN )); + return SCH_RESSTR( STR_TYPE_COLUMN ); } Image ColumnChartDialogController::getImage() { @@ -491,10 +491,10 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_2D_3 ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DEEP )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DEEP ) ); } //-------------------------------------------------------------------------- @@ -507,7 +507,7 @@ BarChartDialogController::~BarChartDialogController() } String BarChartDialogController::getName() { - return String( SchResId( STR_TYPE_BAR )); + return SCH_RESSTR( STR_TYPE_BAR ); } Image BarChartDialogController::getImage() { @@ -567,10 +567,10 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_2D_2 ))); rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_2D_3 ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DEEP )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DEEP ) ); } //-------------------------------------------------------------------------- @@ -583,7 +583,7 @@ PieChartDialogController::~PieChartDialogController() } String PieChartDialogController::getName() { - return String( SchResId( STR_TYPE_PIE )); + return SCH_RESSTR( STR_TYPE_PIE ); } Image PieChartDialogController::getImage() { @@ -622,10 +622,10 @@ void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_2D ))); rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_2D_EXPLODED ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL ) ) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED ) ) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT ) ) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED ) ) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_PIE_EXPLODED ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_DONUT ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DONUT_EXPLODED ) ); } bool PieChartDialogController::shouldShow_3DLookControl() const @@ -646,7 +646,7 @@ LineChartDialogController::~LineChartDialogController() } String LineChartDialogController::getName() { - return String( SchResId( STR_TYPE_LINE )); + return SCH_RESSTR( STR_TYPE_LINE ); } Image LineChartDialogController::getImage() { @@ -734,10 +734,10 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C } } - rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_LINES_3D )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_LINES_3D ) ); } bool LineChartDialogController::shouldShow_StackingControl() const { @@ -798,7 +798,7 @@ XYChartDialogController::~XYChartDialogController() } String XYChartDialogController::getName() { - return String( SchResId( STR_TYPE_XY )); + return SCH_RESSTR( STR_TYPE_XY ); } Image XYChartDialogController::getImage() { @@ -849,10 +849,10 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Cha rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_LINES_3D )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_LINES_3D ) ); } bool XYChartDialogController::shouldShow_SplineControl() const { @@ -898,7 +898,7 @@ AreaChartDialogController::~AreaChartDialogController() } String AreaChartDialogController::getName() { - return String( SchResId( STR_TYPE_AREA )); + return SCH_RESSTR(STR_TYPE_AREA); } Image AreaChartDialogController::getImage() { @@ -938,9 +938,9 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_2D_3 ))); } - rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( rParameter.b3DLook ? STR_DEEP : STR_NORMAL ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) ); } void AreaChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { @@ -981,7 +981,7 @@ NetChartDialogController::~NetChartDialogController() } String NetChartDialogController::getName() { - return String( SchResId( STR_TYPE_NET )); + return SCH_RESSTR(STR_TYPE_NET); } Image NetChartDialogController::getImage() { @@ -1033,10 +1033,10 @@ void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL_STACK ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_FILLED )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_FILLED ) ); } void NetChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { @@ -1076,7 +1076,7 @@ StockChartDialogController::~StockChartDialogController() String StockChartDialogController::getName() { - return String( SchResId( STR_TYPE_STOCK )); + return SCH_RESSTR(STR_TYPE_STOCK); } Image StockChartDialogController::getImage() { @@ -1102,10 +1102,10 @@ void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_STOCK_3 ))); rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_STOCK_4 ))); - rSubTypeList.SetItemText( 1, String( SchResId( STR_STOCK_1 )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_STOCK_2 )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_STOCK_3 )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_STOCK_4 )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_STOCK_1) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR(STR_STOCK_2) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR(STR_STOCK_3) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR(STR_STOCK_4) ); } void StockChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { @@ -1130,7 +1130,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() String CombiColumnLineChartDialogController::getName() { - return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); + return SCH_RESSTR(STR_TYPE_COMBI_COLUMN_LINE); } Image CombiColumnLineChartDialogController::getImage( ) @@ -1153,15 +1153,15 @@ void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeLi rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMN_LINE ))); rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMN_LINE_STACKED ))); - rSubTypeList.SetItemText( 1, String( SchResId( STR_LINE_COLUMN )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_LINE_STACKEDCOLUMN )) ); + rSubTypeList.SetItemText(1, SCH_RESSTR(STR_LINE_COLUMN)); + rSubTypeList.SetItemText(2, SCH_RESSTR(STR_LINE_STACKEDCOLUMN)); } void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize ) { if(!m_pFT_NumberOfLines) { m_pFT_NumberOfLines = new FixedText(pParent,pParent->GetStyle()); - m_pFT_NumberOfLines->SetText( String( SchResId( STR_NUMBER_OF_LINES )) ); + m_pFT_NumberOfLines->SetText(SCH_RESSTR(STR_NUMBER_OF_LINES)); } if(!m_pMF_NumberOfLines) { @@ -1276,7 +1276,7 @@ BubbleChartDialogController::~BubbleChartDialogController() } String BubbleChartDialogController::getName() { - return String( SchResId( STR_TYPE_BUBBLE )); + return SCH_RESSTR(STR_TYPE_BUBBLE); } Image BubbleChartDialogController::getImage() { @@ -1294,7 +1294,7 @@ void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const rSubTypeList.Clear(); rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BUBBLE_1 ))); - rSubTypeList.SetItemText( 1, String( SchResId( STR_BUBBLE_1 )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_BUBBLE_1) ); } void BubbleChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 6f9ced43d519..9f107573fa9a 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -146,8 +146,8 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt ) Edit::MouseButtonDown( rMEvt ); if( m_bShowWarningBox ) - WarningBox( this, WinBits( WB_OK ), - String( SchResId( STR_INVALID_NUMBER ))).Execute(); + WarningBox(this, WinBits( WB_OK ), + SCH_RESSTR(STR_INVALID_NUMBER)).Execute(); } class SeriesHeader @@ -779,13 +779,13 @@ void DataBrowser::MouseButtonDown( const BrowserMouseEvent& rEvt ) void DataBrowser::ShowWarningBox() { - WarningBox( this, WinBits( WB_OK ), - String( SchResId( STR_INVALID_NUMBER ))).Execute(); + WarningBox(this, WinBits( WB_OK ), + SCH_RESSTR(STR_INVALID_NUMBER)).Execute(); } bool DataBrowser::ShowQueryBox() { - QueryBox* pQueryBox = new QueryBox( this, WB_YES_NO, String( SchResId( STR_DATA_EDITOR_INCORRECT_INPUT ))); + QueryBox* pQueryBox = new QueryBox(this, WB_YES_NO, SCH_RESSTR(STR_DATA_EDITOR_INCORRECT_INPUT)); return ( pQueryBox->Execute() == RET_YES ); } diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 161e3440b0ce..57b6f42c7c89 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -82,21 +82,21 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) if( aTranslationMap.empty() ) { - aTranslationMap[ "categories" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ))); - aTranslationMap[ "error-bars-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR ))); - aTranslationMap[ "error-bars-x-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ))); - aTranslationMap[ "error-bars-x-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ))); - aTranslationMap[ "error-bars-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ))); - aTranslationMap[ "error-bars-y-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ))); - aTranslationMap[ "error-bars-y-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ))); - aTranslationMap[ "label" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL ))); - aTranslationMap[ "values-first" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST ))); - aTranslationMap[ "values-last" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST ))); - aTranslationMap[ "values-max" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX ))); - aTranslationMap[ "values-min" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN ))); - aTranslationMap[ "values-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X ))); - aTranslationMap[ "values-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y ))); - aTranslationMap[ "values-size" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE ))); + aTranslationMap[ "categories" ] = ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ).toString(); + aTranslationMap[ "error-bars-x" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR ).toString(); + aTranslationMap[ "error-bars-x-positive" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ).toString(); + aTranslationMap[ "error-bars-x-negative" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ).toString(); + aTranslationMap[ "error-bars-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ).toString(); + aTranslationMap[ "error-bars-y-positive" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ).toString(); + aTranslationMap[ "error-bars-y-negative" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ).toString(); + aTranslationMap[ "label" ] = ::chart::SchResId( STR_DATA_ROLE_LABEL ).toString(); + aTranslationMap[ "values-first" ] = ::chart::SchResId( STR_DATA_ROLE_FIRST ).toString(); + aTranslationMap[ "values-last" ] = ::chart::SchResId( STR_DATA_ROLE_LAST ).toString(); + aTranslationMap[ "values-max" ] = ::chart::SchResId( STR_DATA_ROLE_MAX ).toString(); + aTranslationMap[ "values-min" ] = ::chart::SchResId( STR_DATA_ROLE_MIN ).toString(); + aTranslationMap[ "values-x" ] = ::chart::SchResId( STR_DATA_ROLE_X ).toString(); + aTranslationMap[ "values-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y ).toString(); + aTranslationMap[ "values-size" ] = ::chart::SchResId( STR_DATA_ROLE_SIZE ).toString(); } if( bFromInternalToUI ) @@ -308,7 +308,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( { ::std::vector< Reference< data::XLabeledDataSequence > > aNewSequences; const OUString aRoleOfSeqForSeriesLabel = xChartType->getRoleOfSequenceForSeriesLabel(); - const OUString aLabel( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES ))); + const OUString aLabel(::chart::SchResId(STR_DATA_UNNAMED_SERIES).toString()); const Sequence< OUString > aRoles( xChartType->getSupportedMandatoryRoles()); const Sequence< OUString > aOptRoles( xChartType->getSupportedOptionalRoles()); sal_Int32 nI = 0; @@ -721,7 +721,7 @@ OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString OUString DialogModel::GetRoleDataLabel() { - return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS ))); + return ::chart::SchResId(STR_OBJECT_DATALABELS).toString(); } sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleString ) diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 29a3f38be4be..b630f3a055e4 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -72,7 +72,7 @@ OUString lcl_getDataSeriesName( const OUString& rObjectCID, const Reference< fra OUString lcl_getFullSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) { - OUString aRet = String(SchResId(STR_TIP_DATASERIES)); + OUString aRet(SCH_RESSTR(STR_TIP_DATASERIES)); OUString aWildcard( "%SERIESNAME" ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) @@ -206,103 +206,103 @@ OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural ) switch( eObjectType ) { case OBJECTTYPE_PAGE: - aRet=String(SchResId(STR_OBJECT_PAGE)); + aRet=SCH_RESSTR(STR_OBJECT_PAGE); break; case OBJECTTYPE_TITLE: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_TITLES)); + aRet=SCH_RESSTR(STR_OBJECT_TITLES); else - aRet=String(SchResId(STR_OBJECT_TITLE)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE); } break; case OBJECTTYPE_LEGEND: - aRet=String(SchResId(STR_OBJECT_LEGEND)); + aRet=SCH_RESSTR(STR_OBJECT_LEGEND); break; case OBJECTTYPE_LEGEND_ENTRY: - aRet=String(SchResId(STR_OBJECT_LEGEND_SYMBOL));//@todo change string if we do differenciate symbol and legend entry in future + aRet=SCH_RESSTR(STR_OBJECT_LEGEND_SYMBOL);//@todo change string if we do differenciate symbol and legend entry in future break; case OBJECTTYPE_DIAGRAM: - aRet=String(SchResId(STR_OBJECT_DIAGRAM)); + aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM); break; case OBJECTTYPE_DIAGRAM_WALL: - aRet=String(SchResId(STR_OBJECT_DIAGRAM_WALL)); + aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM_WALL); break; case OBJECTTYPE_DIAGRAM_FLOOR: - aRet=String(SchResId(STR_OBJECT_DIAGRAM_FLOOR)); + aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM_FLOOR); break; case OBJECTTYPE_AXIS: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_AXES)); + aRet=SCH_RESSTR(STR_OBJECT_AXES); else - aRet=String(SchResId(STR_OBJECT_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS); } break; case OBJECTTYPE_AXIS_UNITLABEL: - aRet=String(SchResId(STR_OBJECT_LABEL));//@todo maybe a more concrete name + aRet=SCH_RESSTR(STR_OBJECT_LABEL);//@todo maybe a more concrete name break; case OBJECTTYPE_GRID: case OBJECTTYPE_SUBGRID: //maybe todo: different names for subgrids { if(bPlural) - aRet=String(SchResId(STR_OBJECT_GRIDS)); + aRet=SCH_RESSTR(STR_OBJECT_GRIDS); else - aRet=String(SchResId(STR_OBJECT_GRID)); + aRet=SCH_RESSTR(STR_OBJECT_GRID); } break; case OBJECTTYPE_DATA_SERIES: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_DATASERIES_PLURAL)); + aRet=SCH_RESSTR(STR_OBJECT_DATASERIES_PLURAL); else - aRet=String(SchResId(STR_OBJECT_DATASERIES)); + aRet=SCH_RESSTR(STR_OBJECT_DATASERIES); } break; case OBJECTTYPE_DATA_POINT: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_DATAPOINTS)); + aRet=SCH_RESSTR(STR_OBJECT_DATAPOINTS); else - aRet=String(SchResId(STR_OBJECT_DATAPOINT)); + aRet=SCH_RESSTR(STR_OBJECT_DATAPOINT); } break; case OBJECTTYPE_DATA_LABELS: - aRet=String(SchResId(STR_OBJECT_DATALABELS)); + aRet=SCH_RESSTR(STR_OBJECT_DATALABELS); break; case OBJECTTYPE_DATA_LABEL: - aRet=String(SchResId(STR_OBJECT_LABEL)); + aRet=SCH_RESSTR(STR_OBJECT_LABEL); break; case OBJECTTYPE_DATA_ERRORS_X: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS_X)); + aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_X); break; case OBJECTTYPE_DATA_ERRORS_Y: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Y)); + aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_Y); break; case OBJECTTYPE_DATA_ERRORS_Z: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Z)); + aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_Z); break; case OBJECTTYPE_DATA_AVERAGE_LINE: - aRet=String(SchResId(STR_OBJECT_AVERAGE_LINE)); + aRet=SCH_RESSTR(STR_OBJECT_AVERAGE_LINE); break; case OBJECTTYPE_DATA_CURVE: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_CURVES)); + aRet=SCH_RESSTR(STR_OBJECT_CURVES); else - aRet=String(SchResId(STR_OBJECT_CURVE)); + aRet=SCH_RESSTR(STR_OBJECT_CURVE); } break; case OBJECTTYPE_DATA_STOCK_RANGE: break; case OBJECTTYPE_DATA_STOCK_LOSS: - aRet=String(SchResId(STR_OBJECT_STOCK_LOSS)); + aRet=SCH_RESSTR(STR_OBJECT_STOCK_LOSS); break; case OBJECTTYPE_DATA_STOCK_GAIN: - aRet=String(SchResId(STR_OBJECT_STOCK_GAIN)); + aRet=SCH_RESSTR(STR_OBJECT_STOCK_GAIN); break; case OBJECTTYPE_DATA_CURVE_EQUATION: - aRet=String(SchResId(STR_OBJECT_CURVE_EQUATION)); + aRet=SCH_RESSTR(STR_OBJECT_CURVE_EQUATION); break; default: //OBJECTTYPE_UNKNOWN ; @@ -329,21 +329,21 @@ OUString ObjectNameProvider::getAxisName( const OUString& rObjectCID { case 0://x-axis if( nAxisIndex == 0 ) - aRet=String(SchResId(STR_OBJECT_AXIS_X)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS_X); else - aRet=String(SchResId(STR_OBJECT_SECONDARY_X_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_SECONDARY_X_AXIS); break; case 1://y-axis if( nAxisIndex == 0 ) - aRet=String(SchResId(STR_OBJECT_AXIS_Y)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS_Y); else - aRet=String(SchResId(STR_OBJECT_SECONDARY_Y_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_SECONDARY_Y_AXIS); break; case 2://z-axis - aRet=String(SchResId(STR_OBJECT_AXIS_Z)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS_Z); break; default://axis - aRet=String(SchResId(STR_OBJECT_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS); break; } @@ -357,25 +357,25 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType ) switch(eType) { case TitleHelper::MAIN_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_MAIN)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_MAIN); break; case TitleHelper::SUB_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_SUB)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_SUB); break; case TitleHelper::X_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_X_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_X_AXIS); break; case TitleHelper::Y_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_Y_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_Y_AXIS); break; case TitleHelper::Z_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_Z_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_Z_AXIS); break; case TitleHelper::SECONDARY_X_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_SECONDARY_X_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_SECONDARY_X_AXIS); break; case TitleHelper::SECONDARY_Y_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_SECONDARY_Y_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_SECONDARY_Y_AXIS); break; default: OSL_FAIL("unknown title type"); @@ -383,7 +383,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType ) } if( aRet.isEmpty() ) - aRet=String(SchResId(STR_OBJECT_TITLE)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE); return aRet; } @@ -402,7 +402,7 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID aRet = ObjectNameProvider::getTitleNameByType( eType ); } if( aRet.isEmpty() ) - aRet=String(SchResId(STR_OBJECT_TITLE)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE); return aRet; } @@ -427,16 +427,16 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID switch(nDimensionIndex) { case 0://x-axis - aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_X)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_X); break; case 1://y-axis - aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_Y)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_Y); break; case 2://z-axis - aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_Z)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_Z); break; default://axis - aRet=String(SchResId(STR_OBJECT_GRID)); + aRet=SCH_RESSTR(STR_OBJECT_GRID); break; } } @@ -445,16 +445,16 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID switch(nDimensionIndex) { case 0://x-axis - aRet=String(SchResId(STR_OBJECT_GRID_MINOR_X)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_X); break; case 1://y-axis - aRet=String(SchResId(STR_OBJECT_GRID_MINOR_Y)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_Y); break; case 2://z-axis - aRet=String(SchResId(STR_OBJECT_GRID_MINOR_Z)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_Z); break; default://axis - aRet=String(SchResId(STR_OBJECT_GRID)); + aRet=SCH_RESSTR(STR_OBJECT_GRID); break; } } @@ -493,14 +493,14 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe { OUString aNewLine( "\n" ); - aRet=String(SchResId(STR_TIP_DATAPOINT_INDEX)); + aRet=SCH_RESSTR(STR_TIP_DATAPOINT_INDEX); aRet+=aNewLine; - aRet+=String(SchResId(STR_TIP_DATASERIES)); + aRet+=SCH_RESSTR(STR_TIP_DATASERIES); aRet+=aNewLine; - aRet+=String(SchResId(STR_TIP_DATAPOINT_VALUES)); + aRet+=SCH_RESSTR(STR_TIP_DATAPOINT_VALUES); } else - aRet=String(SchResId(STR_TIP_DATAPOINT)); + aRet=SCH_RESSTR(STR_TIP_DATAPOINT); Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY ); @@ -554,7 +554,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe { if( bVerbose ) { - aRet = String( SchResId( STR_OBJECT_CURVE_WITH_PARAMETERS )); + aRet = SCH_RESSTR( STR_OBJECT_CURVE_WITH_PARAMETERS ); Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel )); Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); if( xCurveCnt.is()) @@ -603,7 +603,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe { if( bVerbose ) { - aRet = String( SchResId( STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS )); + aRet = SCH_RESSTR(STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS); Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel )); Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); if( xCurveCnt.is()) @@ -670,7 +670,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, if( OBJECTTYPE_DATA_POINT == eObjectType ) { - aRet = String( SchResId( STR_STATUS_DATAPOINT_MARKED )); + aRet = SCH_RESSTR( STR_STATUS_DATAPOINT_MARKED ); Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY ); @@ -706,7 +706,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, const OUString aHelpText( getHelpText( rObjectCID, xChartModel, bVerbose )); if( !aHelpText.isEmpty()) { - aRet = String( SchResId( STR_STATUS_OBJECT_MARKED )); + aRet = SCH_RESSTR( STR_STATUS_OBJECT_MARKED ); replaceParamterInString( aRet, "%OBJECTNAME", aHelpText ); } } @@ -778,7 +778,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries( Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rSeriesCID , xChartModel ), uno::UNO_QUERY ); if( xSeries.is() ) { - OUString aRet = String(SchResId(STR_OBJECT_FOR_SERIES)); + OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_SERIES); replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, false /*bPlural*/ ) ); replaceParamterInString( aRet, "%SERIESNAME", lcl_getDataSeriesName( rSeriesCID, xChartModel ) ); return aRet; @@ -789,7 +789,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries( OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType ) { - OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES)); + OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_ALL_SERIES); replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, true /*bPlural*/ ) ); return aRet; } diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index 2105aef78e56..04a970c8a1cd 100644 --- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx @@ -32,7 +32,7 @@ RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ImageButton( pParent, rResId ) { SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) ); - this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE)); + this->SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE)); } RangeSelectionButton::~RangeSelectionButton() diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index 99667e40f39c..91863c84f723 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -30,9 +30,9 @@ namespace chart TextDirectionListBox::TextDirectionListBox( Window* pParent, const ResId& rResId, Window* pWindow1, Window* pWindow2 ) : svx::FrameDirectionListBox( pParent, rResId ) { - InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_LTR ) ), FRMDIR_HORI_LEFT_TOP ); - InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_RTL ) ), FRMDIR_HORI_RIGHT_TOP ); - InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_SUPER ) ), FRMDIR_ENVIRONMENT ); + InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP ); + InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), FRMDIR_HORI_RIGHT_TOP ); + InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), FRMDIR_ENVIRONMENT ); if( !SvtLanguageOptions().IsCTLFontEnabled() ) { diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 9d046590640e..b40d3db3281f 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -50,7 +50,7 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent { FreeResource(); - this->SetText(String(SchResId(STR_PAGE_CHARTTYPE))); + this->SetText(SCH_RESSTR(STR_PAGE_CHARTTYPE)); //don't create the tabpages before FreeResource, otherwise the help ids are not matched correctly m_pChartTypeTabPage = new ChartTypeTabPage(this,uno::Reference< XChartDocument >::query(m_xChartModel),m_xCC,true/*live update*/,true/*hide title description*/); diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index fd7feb196fdd..a89d323dd627 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -78,10 +78,10 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount ) { m_nOnePageOnlyIndex = -1; - this->setTitleBase(String(SchResId(STR_DLG_CHART_WIZARD))); + this->setTitleBase(SCH_RESSTR(STR_DLG_CHART_WIZARD)); } else - this->setTitleBase(String()); + this->setTitleBase(OUString()); declarePath( PATH_FULL , STATE_CHARTTYPE @@ -219,7 +219,7 @@ String CreationWizard::getStateDisplayName( WizardState nState ) const default: break; } - return String(SchResId(nResId)); + return SCH_RESSTR(nResId); } //............................................................................. diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 80bc72355acf..e601d84f5152 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -167,8 +167,8 @@ DataSourceDialog::DataSourceDialog( m_pDataSourceTabPage = new DataSourceTabPage( m_pTabControl, *(m_apDialogModel.get()), m_apDocTemplateProvider.get(), this, true /* bHideDescription */ ); - m_pTabControl->InsertPage( TP_RANGECHOOSER, String( SchResId( STR_PAGE_DATA_RANGE ))); - m_pTabControl->InsertPage( TP_DATA_SOURCE, String( SchResId( STR_OBJECT_DATASERIES_PLURAL ))); + m_pTabControl->InsertPage( TP_RANGECHOOSER, SCH_RESSTR(STR_PAGE_DATA_RANGE) ); + m_pTabControl->InsertPage( TP_DATA_SOURCE, SCH_RESSTR(STR_OBJECT_DATASERIES_PLURAL) ); m_pTabControl->SetTabPage( TP_RANGECHOOSER, m_pRangeChooserTabePage ); m_pTabControl->SetTabPage( TP_DATA_SOURCE, m_pDataSourceTabPage ); diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 081b39fcb0fc..eb5bfaf50c6a 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -67,9 +67,9 @@ View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel m_pAppearance = new ThreeD_SceneAppearance_TabPage(&m_aTabControl,xChartModel,m_aControllerLocker); m_pIllumination = new ThreeD_SceneIllumination_TabPage(&m_aTabControl,xSceneProperties,xChartModel,pColorTable); - m_aTabControl.InsertPage( TP_3D_SCENEGEOMETRY, String(SchResId(STR_PAGE_PERSPECTIVE)) ); - m_aTabControl.InsertPage( TP_3D_SCENEAPPEARANCE, String(SchResId(STR_PAGE_APPEARANCE)) ); - m_aTabControl.InsertPage( TP_3D_SCENEILLUMINATION, String(SchResId(STR_PAGE_ILLUMINATION)) ); + m_aTabControl.InsertPage( TP_3D_SCENEGEOMETRY, SCH_RESSTR(STR_PAGE_PERSPECTIVE) ); + m_aTabControl.InsertPage( TP_3D_SCENEAPPEARANCE, SCH_RESSTR(STR_PAGE_APPEARANCE) ); + m_aTabControl.InsertPage( TP_3D_SCENEILLUMINATION, SCH_RESSTR(STR_PAGE_ILLUMINATION) ); m_aTabControl.SetTabPage( TP_3D_SCENEGEOMETRY, m_pGeometry ); m_aTabControl.SetTabPage( TP_3D_SCENEAPPEARANCE, m_pAppearance ); diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index 791b9c889242..9550871a3432 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -34,7 +34,7 @@ BarGeometryResources::BarGeometryResources( Window* pWindow ) : m_aFT_Geometry( pWindow, pWindow->GetStyle() ) , m_aLB_Geometry( pWindow, SchResId( LB_BAR_GEOMETRY ) ) { - m_aFT_Geometry.SetText( String( SchResId( STR_BAR_GEOMETRY )) ); + m_aFT_Geometry.SetText( SCH_RESSTR( STR_BAR_GEOMETRY ) ); m_aFT_Geometry.SetSizePixel( m_aFT_Geometry.CalcMinimumSize() ); m_aLB_Geometry.SetAccessibleName(m_aFT_Geometry.GetText()); m_aLB_Geometry.SetAccessibleRelationLabeledBy(&m_aFT_Geometry); diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 3bd3a13afc82..3b247553b5c9 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -250,7 +250,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton ) NumberFormatDialog aDlg(m_pWindow, aNumberSet); if( bPercent ) - aDlg.SetText( String( SchResId( STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE ) ) ); + aDlg.SetText( SCH_RESSTR( STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE ) ); if( RET_OK == aDlg.Execute() ) { const SfxItemSet* pResult = aDlg.GetOutputItemSet(); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 1a8c2feddc67..713fed233640 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -153,8 +153,8 @@ ErrorBarResources::ErrorBarResources( Window* pParent, Dialog * pParentDialog, m_aIbRangePositive.SetClickHdl( LINK( this, ErrorBarResources, ChooseRange )); m_aIbRangeNegative.SetClickHdl( LINK( this, ErrorBarResources, ChooseRange )); - m_aIbRangePositive.SetQuickHelpText( String( SchResId( STR_TIP_SELECT_RANGE ))); - m_aIbRangeNegative.SetQuickHelpText( String( SchResId( STR_TIP_SELECT_RANGE ))); + m_aIbRangePositive.SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE)); + m_aIbRangeNegative.SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE)); FillValueSets(); Reset( rInAttrs ); @@ -198,7 +198,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing( OSL_ASSERT( m_apRangeSelectionHelper.get()); if( m_bHasInternalDataProvider ) { - m_aRbRange.SetText( String( SchResId( STR_CONTROLTEXT_ERROR_BARS_FROM_DATA ))); + m_aRbRange.SetText(SCH_RESSTR(STR_CONTROLTEXT_ERROR_BARS_FROM_DATA)); } if( m_aRbRange.IsChecked()) @@ -451,12 +451,12 @@ IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton ) if( pButton == &m_aIbRangePositive ) { m_pCurrentRangeChoosingField = &m_aEdRangePositive; - aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS )); + aUIString = SCH_RESSTR( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS ); } else { m_pCurrentRangeChoosingField = &m_aEdRangeNegative; - aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS )); + aUIString = SCH_RESSTR( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS ); } assert( m_pParentDialog ); diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx index 9b7fc8ce3a65..61804776560a 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.cxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx @@ -37,7 +37,7 @@ TextSeparatorResources::TextSeparatorResources( Window* pWindow ) , m_aEntryMap() , m_nDefaultPos(0) { - m_aFT_Separator.SetText( String( SchResId( STR_TEXT_SEPARATOR )) ); + m_aFT_Separator.SetText( SCH_RESSTR( STR_TEXT_SEPARATOR ) ); m_aFT_Separator.SetSizePixel( m_aFT_Separator.CalcMinimumSize() ); m_aLB_Separator.SetDropDownLineCount(m_aLB_Separator.GetEntryCount()); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 8f7b0cdb8146..7c16bd2e153d 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -108,8 +108,8 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( , m_rControllerLockHelper( rControllerLockHelper ) { FreeResource(); - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_SIMPLE)),POS_3DSCHEME_SIMPLE); - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_REALISTIC)),POS_3DSCHEME_REALISTIC); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_SIMPLE),POS_3DSCHEME_SIMPLE); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_REALISTIC),POS_3DSCHEME_REALISTIC); m_aLB_Scheme.SetDropDownLineCount(2); m_aLB_Scheme.SetSelectHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectSchemeHdl ) ); @@ -281,7 +281,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme() break; case ThreeDLookScheme_Unknown: { - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_CUSTOM)),POS_3DSCHEME_CUSTOM); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_CUSTOM),POS_3DSCHEME_CUSTOM); m_aLB_Scheme.SelectEntryPos( POS_3DSCHEME_CUSTOM ); m_aLB_Scheme.SetDropDownLineCount(3); } diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index f838433b0dab..ec691e58c013 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -54,7 +54,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight { SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) ); - String aTipHelpStr( SchResId(STR_TIP_LIGHTSOURCE_X) ); + String aTipHelpStr( SCH_RESSTR(STR_TIP_LIGHTSOURCE_X) ); OUString aTipHelp( aTipHelpStr ); const OUString aReplacementStr( "%LIGHTNUMBER" ); sal_Int32 nIndex = aTipHelp.indexOf( aReplacementStr ); @@ -96,7 +96,7 @@ ColorButton::ColorButton( Window* pParent, const ResId& rResId ) : ImageButton( pParent, rResId ) { SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ) ); - this->SetQuickHelpText( String( SchResId(STR_TIP_CHOOSECOLOR) ) ); + this->SetQuickHelpText( SCH_RESSTR(STR_TIP_CHOOSECOLOR) ); } ColorButton::~ColorButton() @@ -345,7 +345,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin m_aBtn_Light6.SetAccessibleRelationLabeledBy(&m_aFT_LightSource); m_aBtn_Light7.SetAccessibleRelationLabeledBy(&m_aFT_LightSource); m_aBtn_Light8.SetAccessibleRelationLabeledBy(&m_aFT_LightSource); - m_aCtl_Preview.SetAccessibleName(String(SchResId( STR_LIGHT_PREVIEW ))); + m_aCtl_Preview.SetAccessibleName(SCH_RESSTR( STR_LIGHT_PREVIEW )); } ThreeD_SceneIllumination_TabPage::~ThreeD_SceneIllumination_TabPage() diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 34446a98cdb7..3e4ff3c9a950 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -162,8 +162,8 @@ Dim3DLookResourceGroup::Dim3DLookResourceGroup( Window* pWindow ) { m_aCB_3DLook.SetToggleHdl( LINK( this, Dim3DLookResourceGroup, Dim3DLookCheckHdl ) ); - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_SIMPLE))); - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_REALISTIC))); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_SIMPLE)); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_REALISTIC)); m_aLB_Scheme.SetDropDownLineCount(2); m_aLB_Scheme.SetSelectHdl( LINK( this, Dim3DLookResourceGroup, SelectSchemeHdl ) ); @@ -459,7 +459,7 @@ SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent ) get(m_pFT_SplineOrder, "PolynomialsLabel"); get(m_pMF_SplineOrder, "PolynomialsSpinButton"); - this->SetText( String( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) ) ); + this->SetText( SCH_RESSTR( STR_DLG_SMOOTH_LINE_PROPERTIES ) ); m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) ); } @@ -627,9 +627,9 @@ SplineResourceGroup::SplineResourceGroup( Window* pWindow ) , m_aPB_DetailsDialog( pWindow, SchResId( PB_SPLINE_DIALOG ) ) , m_pSplinePropertiesDialog() { - m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_STRAIGHT))); - m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_SMOOTH))); - m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_STEPPED))); + m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_STRAIGHT)); + m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_SMOOTH)); + m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_STEPPED)); m_aLB_LineType.SetDropDownLineCount(3); m_aLB_LineType.SetSelectHdl( LINK( this, SplineResourceGroup, LineTypeChangeHdl ) ); m_aLB_LineType.SetAccessibleName(m_aFT_LineType.GetText()); @@ -716,7 +716,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter ) m_aLB_LineType.SelectEntryPos(POS_LINETYPE_SMOOTH); m_aPB_DetailsDialog.Enable(true); m_aPB_DetailsDialog.SetClickHdl( LINK( this, SplineResourceGroup, SplineDetailsDialogHdl ) ); - m_aPB_DetailsDialog.SetQuickHelpText( String( SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES) ) ); + m_aPB_DetailsDialog.SetQuickHelpText( SCH_RESSTR(STR_DLG_SMOOTH_LINE_PROPERTIES) ); getSplinePropertiesDialog().fillControls( rParameter ); break; case CurveStyle_STEP_START: @@ -726,7 +726,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter ) m_aLB_LineType.SelectEntryPos(POS_LINETYPE_STEPPED); m_aPB_DetailsDialog.Enable(true); m_aPB_DetailsDialog.SetClickHdl( LINK( this, SplineResourceGroup, SteppedDetailsDialogHdl ) ); - m_aPB_DetailsDialog.SetQuickHelpText( String( SchResId(STR_DLG_STEPPED_LINE_PROPERTIES) ) ); + m_aPB_DetailsDialog.SetQuickHelpText( SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES) ); getSteppedPropertiesDialog().fillControls( rParameter ); break; default: @@ -915,7 +915,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent m_aFT_ChooseType.SetStyle( m_aFT_ChooseType.GetStyle() | WB_NOLABEL ); } - this->SetText( String(SchResId(STR_PAGE_CHARTTYPE)) ); + this->SetText( SCH_RESSTR(STR_PAGE_CHARTTYPE) ); m_aMainTypeList.SetStyle(m_aMainTypeList.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_FLATVALUESET | WB_3DLOOK ); m_aMainTypeList.SetSelectHdl( LINK( this, ChartTypeTabPage, SelectMainTypeHdl ) ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 13a2fe4517e9..43d7d1956da7 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -294,7 +294,7 @@ DataSourceTabPage::DataSourceTabPage( } m_aFixedTextRange = OUString( m_aFT_RANGE.GetText() ); - this->SetText( String( SchResId( STR_OBJECT_DATASERIES_PLURAL ) ) ); + this->SetText( SCH_RESSTR( STR_OBJECT_DATASERIES_PLURAL ) ); // set handlers m_apLB_SERIES->SetSelectHdl( LINK( this, DataSourceTabPage, SeriesSelectionChangedHdl )); @@ -347,8 +347,8 @@ DataSourceTabPage::DataSourceTabPage( if( m_apLB_SERIES->First()) m_apLB_SERIES->Select( m_apLB_SERIES->First()); m_apLB_SERIES->GrabFocus(); - m_aBTN_UP.SetAccessibleName(String(SchResId(STR_BUTTON_UP))); - m_aBTN_DOWN.SetAccessibleName(String(SchResId(STR_BUTTON_DOWN))); + m_aBTN_UP.SetAccessibleName(SCH_RESSTR(STR_BUTTON_UP)); + m_aBTN_DOWN.SetAccessibleName(SCH_RESSTR(STR_BUTTON_DOWN)); } DataSourceTabPage::~DataSourceTabPage() @@ -472,7 +472,7 @@ void DataSourceTabPage::fillSeriesListBox() { if( nUnnamedSeriesIndex > 1 ) { - OUString aResString( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ))); + OUString aResString(::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ).toString()); // replace index of unnamed series const OUString aReplacementStr( "%NUMBER" ); @@ -483,7 +483,7 @@ void DataSourceTabPage::fillSeriesListBox() OUString::valueOf(nUnnamedSeriesIndex))); } if( aLabel.isEmpty() ) - aLabel = String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES )); + aLabel = ::chart::SchResId( STR_DATA_UNNAMED_SERIES ).toString(); ++nUnnamedSeriesIndex; } @@ -637,8 +637,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) if( bHasSelectedEntry && (m_aLB_ROLE.FirstSelected() != 0)) { - String aStr( SchResId( STR_DATA_SELECT_RANGE_FOR_SERIES )); - OUString aUIStr( aStr ); + OUString aUIStr(SCH_RESSTR(STR_DATA_SELECT_RANGE_FOR_SERIES)); // replace role OUString aReplacement( "%VALUETYPE" ); @@ -674,10 +673,10 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl) ! updateModelFromControl( m_pCurrentRangeChoosingField )) return 0; - String aStr( SchResId( m_aFT_CATEGORIES.IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS )); + OUString aStr( SCH_RESSTR( m_aFT_CATEGORIES.IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS )); lcl_enableRangeChoosing( true, m_pParentDialog ); m_rDialogModel.getRangeSelectionHelper()->chooseRange( - m_rDialogModel.getCategoriesRange(), OUString( aStr ), *this ); + m_rDialogModel.getCategoriesRange(), aStr, *this ); return 0; } diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 1ce4107c2e64..c3cfe0325640 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -133,8 +133,8 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent m_aFT_Caption.SetStyle( m_aFT_Caption.GetStyle() | WB_NOLABEL ); } - this->SetText( String(SchResId(STR_PAGE_DATA_RANGE)) ); - m_aIB_Range.SetQuickHelpText( String(SchResId(STR_TIP_SELECT_RANGE)) ); + this->SetText( SCH_RESSTR(STR_PAGE_DATA_RANGE) ); + m_aIB_Range.SetQuickHelpText( SCH_RESSTR(STR_TIP_SELECT_RANGE) ); // set defaults as long as DetectArguments does not work m_aRB_Columns.Check(); @@ -354,7 +354,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) { OUString aRange = m_aED_Range.GetText(); // using assignment for broken gcc 3.3 - OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) ); + OUString aTitle = SCH_RESSTR( STR_PAGE_DATA_RANGE ); lcl_enableRangeChoosing( true, m_pParentDialog ); m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this ); diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 0acab303de87..e1e062a8339b 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -752,7 +752,7 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* = if( nResIdMessage == 0 ) return false; - WarningBox( this, WinBits( WB_OK ), String( SchResId( nResIdMessage ))).Execute(); + WarningBox( this, WinBits( WB_OK ), SCH_RESSTR( nResIdMessage ) ).Execute(); if( pControl ) { pControl->GrabFocus(); diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index fced71d07551..72c0b6a56a59 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -59,7 +59,7 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent { FreeResource(); - this->SetText( String( SchResId( STR_PAGE_CHART_ELEMENTS ) ) ); + this->SetText( SCH_RESSTR( STR_PAGE_CHART_ELEMENTS ) ); Font aFont( m_aFT_TitleDescription.GetControlFont() ); aFont.SetWeight( WEIGHT_BOLD ); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index e10133ca676e..4f7a4a1978c4 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1289,7 +1289,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType() { // using assignment for broken gcc 3.3 UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard( - String( SchResId( STR_ACTION_EDIT_CHARTTYPE )), m_xUndoManager ); + SCH_RESSTR( STR_ACTION_EDIT_CHARTTYPE ), m_xUndoManager ); SolarMutexGuard aSolarGuard; //prepare and open dialog @@ -1310,7 +1310,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData() return; UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard( - String( SchResId( STR_ACTION_EDIT_DATA_RANGES )), m_xUndoManager ); + SCH_RESSTR(STR_ACTION_EDIT_DATA_RANGES), m_xUndoManager ); if( xChartDoc.is()) { SolarMutexGuard aSolarGuard; @@ -1335,7 +1335,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward ) UndoGuardWithSelection aUndoGuard( ActionDescriptionProvider::createDescription( (bForward ? ActionDescriptionProvider::MOVE_TOTOP : ActionDescriptionProvider::MOVE_TOBOTTOM), - String( SchResId( STR_OBJECT_DATASERIES ))), + SCH_RESSTR(STR_OBJECT_DATASERIES)), m_xUndoManager ); bool bChanged = DiagramHelper::moveSeries( ChartModelHelper::findDiagram( getModel() ), xGivenDataSeries, bForward ); diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 8d9dd5d63179..ec72c7c912f1 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -55,7 +55,7 @@ void ChartController::executeDispatch_EditData() SolarMutexGuard aSolarGuard; // using assignment for broken gcc 3.3 UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData( - String( SchResId( STR_ACTION_EDIT_CHART_DATA )), + SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ), m_xUndoManager ); DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC ); // the dialog has no OK/Cancel diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 08c46107c5e6..d7bc61d64ae4 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -109,7 +109,7 @@ void ChartController::executeDispatch_InsertAxes() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXES ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AXES )), m_xUndoManager ); try @@ -147,7 +147,7 @@ void ChartController::executeDispatch_InsertGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRIDS ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRIDS )), m_xUndoManager ); try @@ -184,7 +184,7 @@ void ChartController::executeDispatch_InsertTitles() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLES ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_TITLES )), m_xUndoManager ); try @@ -215,7 +215,7 @@ void ChartController::executeDispatch_DeleteLegend() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); LegendHelper::hideLegend( getModel() ); @@ -226,7 +226,7 @@ void ChartController::executeDispatch_InsertLegend() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); Reference< chart2::XLegend > xLegend = LegendHelper::showLegend( getModel(), m_xCC ); @@ -237,7 +237,7 @@ void ChartController::executeDispatch_OpenLegendDialog() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); try @@ -268,7 +268,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_DATALABELS ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_DATALABELS )), m_xUndoManager ); //if a series is selected insert labels for that series only: @@ -330,7 +330,7 @@ void ChartController::executeDispatch_InsertMeanValue() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); lcl_InsertMeanValueLine( m_xCC ).operator()( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() )); @@ -341,7 +341,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( @@ -383,7 +383,7 @@ void ChartController::executeDispatch_InsertTrendline() UndoLiveUpdateGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE )), m_xUndoManager ); uno::Reference< chart2::XRegressionCurve > xCurve = @@ -442,7 +442,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) UndoLiveUpdateGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, - String( SchResId( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X ))), + SCH_RESSTR( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X )), m_xUndoManager ); // add error bars with standard deviation @@ -549,7 +549,7 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 ) // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( true )); xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bInsertR2 )); @@ -566,7 +566,7 @@ void ChartController::executeDispatch_InsertR2Value() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( true )); aUndoGuard.commit(); @@ -581,7 +581,7 @@ void ChartController::executeDispatch_DeleteR2Value() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false )); aUndoGuard.commit(); @@ -596,7 +596,7 @@ void ChartController::executeDispatch_DeleteMeanValue() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt ); aUndoGuard.commit(); @@ -611,7 +611,7 @@ void ChartController::executeDispatch_DeleteTrendline() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )), m_xUndoManager ); RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt ); aUndoGuard.commit(); @@ -626,7 +626,7 @@ void ChartController::executeDispatch_DeleteTrendlineEquation() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); RegressionCurveHelper::removeEquations( xRegCurveCnt ); aUndoGuard.commit(); @@ -641,7 +641,7 @@ void ChartController::executeDispatch_DeleteErrorBars( bool bYError ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )), m_xUndoManager ); StatisticsHelper::removeErrorBars( xDataSeries, bYError ); aUndoGuard.commit(); @@ -655,7 +655,7 @@ void ChartController::executeDispatch_InsertDataLabels() if( xSeries.is() ) { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, - String( SchResId( STR_OBJECT_DATALABELS ))), + SCH_RESSTR( STR_OBJECT_DATALABELS )), m_xUndoManager ); DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries ); aUndoGuard.commit(); @@ -665,7 +665,7 @@ void ChartController::executeDispatch_InsertDataLabels() void ChartController::executeDispatch_InsertDataLabel() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, - String( SchResId( STR_OBJECT_LABEL ))), + SCH_RESSTR( STR_OBJECT_LABEL )), m_xUndoManager ); DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); aUndoGuard.commit(); @@ -678,7 +678,7 @@ void ChartController::executeDispatch_DeleteDataLabels() if( xSeries.is() ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, - String( SchResId( STR_OBJECT_DATALABELS ))), + SCH_RESSTR( STR_OBJECT_DATALABELS )), m_xUndoManager ); DataSeriesHelper::deleteDataLabelsFromSeriesAndAllPoints( xSeries ); aUndoGuard.commit(); @@ -688,7 +688,7 @@ void ChartController::executeDispatch_DeleteDataLabels() void ChartController::executeDispatch_DeleteDataLabel() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, - String( SchResId( STR_OBJECT_LABEL ))), + SCH_RESSTR( STR_OBJECT_LABEL )), m_xUndoManager ); DataSeriesHelper::deleteDataLabelsFromPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); aUndoGuard.commit(); @@ -697,7 +697,7 @@ void ChartController::executeDispatch_DeleteDataLabel() void ChartController::executeDispatch_ResetAllDataPoints() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT, - String( SchResId( STR_OBJECT_DATAPOINTS ))), + SCH_RESSTR( STR_OBJECT_DATAPOINTS )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xSeries.is() ) @@ -707,7 +707,7 @@ void ChartController::executeDispatch_ResetAllDataPoints() void ChartController::executeDispatch_ResetDataPoint() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT, - String( SchResId( STR_OBJECT_DATAPOINT ))), + SCH_RESSTR( STR_OBJECT_DATAPOINT )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xSeries.is() ) @@ -726,7 +726,7 @@ void ChartController::executeDispatch_InsertAxisTitle() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLE ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_TITLE )), m_xUndoManager ); Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( m_aSelection.getSelectedCID(), getModel() ); @@ -758,7 +758,7 @@ void ChartController::executeDispatch_InsertAxis() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXIS ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AXIS )), m_xUndoManager ); try @@ -780,7 +780,7 @@ void ChartController::executeDispatch_DeleteAxis() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AXIS ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AXIS )), m_xUndoManager ); try @@ -802,7 +802,7 @@ void ChartController::executeDispatch_InsertMajorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -824,7 +824,7 @@ void ChartController::executeDispatch_DeleteMajorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -846,7 +846,7 @@ void ChartController::executeDispatch_InsertMinorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -870,7 +870,7 @@ void ChartController::executeDispatch_DeleteMinorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR(STR_OBJECT_GRID)), m_xUndoManager ); try diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index f06c271b5c89..09c24ea36475 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -825,7 +825,7 @@ void SAL_CALL ChartController::executeDispatch_View3D() { // using assignment for broken gcc 3.3 UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard( - String( SchResId( STR_ACTION_EDIT_3D_VIEW )), + SCH_RESSTR( STR_ACTION_EDIT_3D_VIEW ), m_xUndoManager ); //open dialog diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 8fd50b0a64d7..1db54ebadefd 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -73,7 +73,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel ) OSL_PRECOND( !m_pTextActionUndoGuard.get(), "ChartController::StartTextEdit: already have a TextUndoGuard!?" ); m_pTextActionUndoGuard.reset( new UndoGuard( - String( SchResId( STR_ACTION_EDIT_TEXT ) ), m_xUndoManager ) ); + SCH_RESSTR( STR_ACTION_EDIT_TEXT ), m_xUndoManager ) ); SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner(); //#i77362 change notification for changes on additional shapes are missing diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 18359d334b41..cd25717fcaf5 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -107,7 +107,7 @@ bool lcl_deleteDataSeries( { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_DATASERIES ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_DATASERIES )), xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); @@ -146,7 +146,7 @@ bool lcl_deleteDataCurve( { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )), xUndoManager ); xRegressionCurveContainer->removeRegressionCurve( xRegressionCurve ); @@ -194,7 +194,7 @@ void ChartController::executeDispatch_NewArrangement() { // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_REARRANGE_CHART )), + SCH_RESSTR( STR_ACTION_REARRANGE_CHART ), m_xUndoManager ); ControllerLockGuard aCtlLockGuard( xModel ); @@ -248,7 +248,7 @@ void ChartController::executeDispatch_ScaleText() SolarMutexGuard aSolarGuard; // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_SCALE_TEXT )), + SCH_RESSTR( STR_ACTION_SCALE_TEXT ), m_xUndoManager ); ControllerLockGuard aCtlLockGuard( getModel() ); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -630,7 +630,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_TITLE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_TITLE )), m_xUndoManager ); TitleHelper::removeTitle( ObjectIdentifier::getTitleTypeForCID( aCID ), getModel() ); @@ -649,7 +649,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); xLegendProp->setPropertyValue( "Show", uno::makeAny( false )); bReturn = true; @@ -696,7 +696,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt ); bReturn = true; @@ -722,7 +722,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); { ControllerLockGuard aCtlLockGuard( xModel ); @@ -756,7 +756,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( nId ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( nId )), m_xUndoManager ); { ControllerLockGuard aCtlLockGuard( xModel ); @@ -779,8 +779,8 @@ bool ChartController::executeDispatch_Delete() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, OUString( String( - SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))), + ActionDescriptionProvider::DELETE, + SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )), m_xUndoManager ); chart2::DataPointLabel aLabel; xObjectProperties->getPropertyValue( "Label" ) >>= aLabel; @@ -845,7 +845,7 @@ void ChartController::executeDispatch_ToggleLegend() { Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_TOGGLE_LEGEND )), m_xUndoManager ); + SCH_RESSTR( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager ); Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend( xModel ), uno::UNO_QUERY ); bool bChanged = false; if( xLegendProp.is()) @@ -879,7 +879,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal() { Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_TOGGLE_GRID_HORZ )), m_xUndoManager ); + SCH_RESSTR( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) { @@ -913,7 +913,7 @@ void ChartController::executeDispatch_ToggleGridVertical() { Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_TOGGLE_GRID_VERTICAL )), m_xUndoManager ); + SCH_RESSTR( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) { diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 208bf0aeed0d..0dd17f619f0d 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1556,7 +1556,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) if( ! bReturn ) { SolarMutexGuard aGuard; - InfoBox( m_pChartWindow, String(SchResId( STR_ACTION_NOTPOSSIBLE ))).Execute(); + InfoBox( m_pChartWindow, SCH_RESSTR( STR_ACTION_NOTPOSSIBLE )).Execute(); } } diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index ffe3ccb95cb8..c03404fa2d45 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -111,7 +111,7 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL ) XLineEndListRef pLineEndList = rModel.GetLineEndList(); if ( pLineEndList.is() ) { - String aName( SVX_RES( nResId ) ); + String aName( SVX_RESSTR( nResId ) ); long nCount = pLineEndList->Count(); for ( long nIndex = 0; nIndex < nCount; ++nIndex ) { diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 2711702d8e7f..601cf82d9e6b 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -145,7 +145,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() ListBoxEntryData aEntry; SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() ); OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString(); - aEntry.UIName = ( aName.isEmpty() ? OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); + aEntry.UIName = ( aName.isEmpty() ? SCH_RESSTR( STR_OBJECT_SHAPE ) : aName ); aEntry.OID = aSelectedOID; m_aEntries.push_back( aEntry ); } diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 5d059915da4d..cf9b537f5478 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -72,13 +72,13 @@ void UndoCommandDispatch::fireStatusEvent( if( m_xUndoManager->isUndoPossible()) { // using assignment for broken gcc 3.3 - OUString aUndo = OUString( String( SvtResId( STR_UNDO ))); + OUString aUndo = SvtResId( STR_UNDO ).toString(); aUndoState <<= ( aUndo + m_xUndoManager->getCurrentUndoActionTitle()); } if( m_xUndoManager->isRedoPossible()) { // using assignment for broken gcc 3.3 - OUString aRedo = OUString( String( SvtResId( STR_REDO ))); + OUString aRedo = SvtResId( STR_REDO ).toString(); aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoActionTitle()); } |