[Libreoffice-commits] core.git: chart2/source
Caolán McNamara
caolanm at redhat.com
Thu May 18 08:16:15 UTC 2017
chart2/source/controller/accessibility/AccessibleChartView.cxx | 2
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 88 +++----
chart2/source/controller/dialogs/DataBrowser.cxx | 8
chart2/source/controller/dialogs/DialogModel.cxx | 38 +--
chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx | 4
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 124 +++++-----
chart2/source/controller/dialogs/TextDirectionListBox.cxx | 6
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 4
chart2/source/controller/dialogs/dlg_DataSource.cxx | 4
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 100 ++++----
chart2/source/controller/dialogs/dlg_View3D.cxx | 6
chart2/source/controller/dialogs/tp_ChartType.cxx | 10
chart2/source/controller/dialogs/tp_DataSource.cxx | 10
chart2/source/controller/dialogs/tp_Scale.cxx | 2
chart2/source/controller/main/ChartController.cxx | 6
chart2/source/controller/main/ChartController_EditData.cxx | 2
chart2/source/controller/main/ChartController_Insert.cxx | 62 ++---
chart2/source/controller/main/ChartController_Properties.cxx | 2
chart2/source/controller/main/ChartController_TextEdit.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 26 +-
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/controller/main/DragMethod_PieSegment.cxx | 2
chart2/source/controller/main/ElementSelector.cxx | 2
chart2/source/inc/ResId.hxx | 2
chart2/source/tools/InternalData.cxx | 4
chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx | 2
chart2/source/tools/RegressionCurveHelper.cxx | 14 -
27 files changed, 266 insertions(+), 268 deletions(-)
New commits:
commit 3d54ea1fffb5fa6b1606867cb3b7cfc93c5ef157
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 18 09:11:03 2017 +0100
can drop SCH_RESSTR now
Change-Id: Ic9e82098101cb184faec6b3f7fe4c821f5df3278
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index ec0b11217991..064384a87fe3 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -99,7 +99,7 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const
// ________ XAccessibleContext ________
OUString SAL_CALL AccessibleChartView::getAccessibleName()
{
- return SCH_RESSTR(STR_OBJECT_DIAGRAM);
+ return SchResId(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 fef91252fe4b..a61299c1e46b 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -435,7 +435,7 @@ ColumnChartDialogController::~ColumnChartDialogController()
}
OUString ColumnChartDialogController::getName()
{
- return SCH_RESSTR( STR_TYPE_COLUMN );
+ return SchResId( STR_TYPE_COLUMN );
}
Image ColumnChartDialogController::getImage()
@@ -496,10 +496,10 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_COLUMNS_2D_3)));
}
- 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 ) );
+ rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
}
BarChartDialogController::BarChartDialogController()
@@ -512,7 +512,7 @@ BarChartDialogController::~BarChartDialogController()
OUString BarChartDialogController::getName()
{
- return SCH_RESSTR( STR_TYPE_BAR );
+ return SchResId( STR_TYPE_BAR );
}
Image BarChartDialogController::getImage()
@@ -572,10 +572,10 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch
rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_BARS_2D_2)));
rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_BARS_2D_3)));
}
- 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 ) );
+ rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
}
PieChartDialogController::PieChartDialogController()
@@ -586,7 +586,7 @@ PieChartDialogController::~PieChartDialogController()
}
OUString PieChartDialogController::getName()
{
- return SCH_RESSTR( STR_TYPE_PIE );
+ return SchResId( STR_TYPE_PIE );
}
Image PieChartDialogController::getImage()
{
@@ -623,10 +623,10 @@ void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch
rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_DONUT_2D)));
rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_DONUT_2D_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 ) );
+ rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_PIE_EXPLODED ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_DONUT ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_DONUT_EXPLODED ) );
}
bool PieChartDialogController::shouldShow_3DLookControl() const
@@ -646,7 +646,7 @@ LineChartDialogController::~LineChartDialogController()
}
OUString LineChartDialogController::getName()
{
- return SCH_RESSTR( STR_TYPE_LINE );
+ return SchResId( STR_TYPE_LINE );
}
Image LineChartDialogController::getImage()
@@ -731,10 +731,10 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C
}
}
- 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 ) );
+ rSubTypeList.SetItemText( 1, SchResId( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_LINES_3D ) );
}
bool LineChartDialogController::shouldShow_StackingControl() const
{
@@ -797,7 +797,7 @@ XYChartDialogController::~XYChartDialogController()
OUString XYChartDialogController::getName()
{
- return SCH_RESSTR( STR_TYPE_XY );
+ return SchResId( STR_TYPE_XY );
}
Image XYChartDialogController::getImage()
@@ -848,10 +848,10 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Cha
rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XVALUES)));
}
- 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 ) );
+ rSubTypeList.SetItemText( 1, SchResId( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_LINES_3D ) );
}
bool XYChartDialogController::shouldShow_SplineControl() const
{
@@ -900,7 +900,7 @@ AreaChartDialogController::~AreaChartDialogController()
OUString AreaChartDialogController::getName()
{
- return SCH_RESSTR(STR_TYPE_AREA);
+ return SchResId(STR_TYPE_AREA);
}
Image AreaChartDialogController::getImage()
@@ -942,9 +942,9 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C
rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_AREAS_2D_3)));
}
- 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 ) );
+ rSubTypeList.SetItemText( 1, SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
}
void AreaChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
{
@@ -987,7 +987,7 @@ NetChartDialogController::~NetChartDialogController()
OUString NetChartDialogController::getName()
{
- return SCH_RESSTR(STR_TYPE_NET);
+ return SchResId(STR_TYPE_NET);
}
Image NetChartDialogController::getImage()
@@ -1040,10 +1040,10 @@ void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch
rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_NET_FILL_STACK)));
}
- 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 ) );
+ rSubTypeList.SetItemText( 1, SchResId( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_FILLED ) );
}
void NetChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
{
@@ -1082,7 +1082,7 @@ StockChartDialogController::~StockChartDialogController()
OUString StockChartDialogController::getName()
{
- return SCH_RESSTR(STR_TYPE_STOCK);
+ return SchResId(STR_TYPE_STOCK);
}
Image StockChartDialogController::getImage()
@@ -1108,10 +1108,10 @@ void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_STOCK_3)));
rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_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) );
+ rSubTypeList.SetItemText( 1, SchResId(STR_STOCK_1) );
+ rSubTypeList.SetItemText( 2, SchResId(STR_STOCK_2) );
+ rSubTypeList.SetItemText( 3, SchResId(STR_STOCK_3) );
+ rSubTypeList.SetItemText( 4, SchResId(STR_STOCK_4) );
}
void StockChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
@@ -1129,7 +1129,7 @@ CombiColumnLineChartDialogController::CombiColumnLineChartDialogController()
OUString CombiColumnLineChartDialogController::getName()
{
- return SCH_RESSTR(STR_TYPE_COMBI_COLUMN_LINE);
+ return SchResId(STR_TYPE_COMBI_COLUMN_LINE);
}
Image CombiColumnLineChartDialogController::getImage( )
@@ -1151,8 +1151,8 @@ void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeLi
rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_COLUMN_LINE)));
rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_COLUMN_LINE_STACKED)));
- rSubTypeList.SetItemText(1, SCH_RESSTR(STR_LINE_COLUMN));
- rSubTypeList.SetItemText(2, SCH_RESSTR(STR_LINE_STACKEDCOLUMN));
+ rSubTypeList.SetItemText(1, SchResId(STR_LINE_COLUMN));
+ rSubTypeList.SetItemText(2, SchResId(STR_LINE_STACKEDCOLUMN));
}
void CombiColumnLineChartDialogController::showExtraControls( VclBuilderContainer* pParent )
@@ -1263,7 +1263,7 @@ BubbleChartDialogController::~BubbleChartDialogController()
OUString BubbleChartDialogController::getName()
{
- return SCH_RESSTR(STR_TYPE_BUBBLE);
+ return SchResId(STR_TYPE_BUBBLE);
}
Image BubbleChartDialogController::getImage()
@@ -1282,7 +1282,7 @@ void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
rSubTypeList.Clear();
rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_BUBBLE_1)));
- rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_BUBBLE_1) );
+ rSubTypeList.SetItemText( 1, SchResId(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 4548d3b6f4df..25e9c04246e8 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -132,7 +132,7 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt )
if( m_bShowWarningBox )
ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ),
- SCH_RESSTR(STR_INVALID_NUMBER))->Execute();
+ SchResId(STR_INVALID_NUMBER))->Execute();
}
class SeriesHeader
@@ -577,7 +577,7 @@ void DataBrowser::RenewTable()
InsertHandleColumn( static_cast< sal_uInt16 >(
GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() ));
- OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL));
+ OUString aDefaultSeriesName(SchResId(STR_COLUMN_LABEL));
replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::number( 24 ) );
sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
+ GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MapUnit::MapAppFont ).X();
@@ -767,12 +767,12 @@ void DataBrowser::MouseButtonDown( const BrowserMouseEvent& rEvt )
void DataBrowser::ShowWarningBox()
{
ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ),
- SCH_RESSTR(STR_INVALID_NUMBER))->Execute();
+ SchResId(STR_INVALID_NUMBER))->Execute();
}
bool DataBrowser::ShowQueryBox()
{
- ScopedVclPtrInstance<QueryBox> pQueryBox(this, WB_YES_NO, SCH_RESSTR(STR_DATA_EDITOR_INCORRECT_INPUT));
+ ScopedVclPtrInstance<QueryBox> pQueryBox(this, WB_YES_NO, SchResId(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 e4e74416667a..8bfc3113ecc8 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -78,23 +78,23 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
if( aTranslationMap.empty() )
{
- 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();
- aTranslationMap[ "FillColor" ] = ::chart::SchResId( STR_PROPERTY_ROLE_FILLCOLOR ).toString();
- aTranslationMap[ "BorderColor" ] = ::chart::SchResId( STR_PROPERTY_ROLE_BORDERCOLOR ).toString();
+ aTranslationMap[ "categories" ] = ::chart::SchResId( STR_DATA_ROLE_CATEGORIES );
+ aTranslationMap[ "error-bars-x" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR );
+ aTranslationMap[ "error-bars-x-positive" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE );
+ aTranslationMap[ "error-bars-x-negative" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE );
+ aTranslationMap[ "error-bars-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR );
+ aTranslationMap[ "error-bars-y-positive" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE );
+ aTranslationMap[ "error-bars-y-negative" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE );
+ aTranslationMap[ "label" ] = ::chart::SchResId( STR_DATA_ROLE_LABEL );
+ aTranslationMap[ "values-first" ] = ::chart::SchResId( STR_DATA_ROLE_FIRST );
+ aTranslationMap[ "values-last" ] = ::chart::SchResId( STR_DATA_ROLE_LAST );
+ aTranslationMap[ "values-max" ] = ::chart::SchResId( STR_DATA_ROLE_MAX );
+ aTranslationMap[ "values-min" ] = ::chart::SchResId( STR_DATA_ROLE_MIN );
+ aTranslationMap[ "values-x" ] = ::chart::SchResId( STR_DATA_ROLE_X );
+ aTranslationMap[ "values-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y );
+ aTranslationMap[ "values-size" ] = ::chart::SchResId( STR_DATA_ROLE_SIZE );
+ aTranslationMap[ "FillColor" ] = ::chart::SchResId( STR_PROPERTY_ROLE_FILLCOLOR );
+ aTranslationMap[ "BorderColor" ] = ::chart::SchResId( STR_PROPERTY_ROLE_BORDERCOLOR );
}
if( bFromInternalToUI )
@@ -312,7 +312,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
{
std::vector< Reference< data::XLabeledDataSequence > > aNewSequences;
const OUString aRoleOfSeqForSeriesLabel = xChartType->getRoleOfSequenceForSeriesLabel();
- const OUString aLabel(::chart::SchResId(STR_DATA_UNNAMED_SERIES).toString());
+ const OUString aLabel(::chart::SchResId(STR_DATA_UNNAMED_SERIES));
const Sequence< OUString > aRoles( xChartType->getSupportedMandatoryRoles());
const Sequence< OUString > aOptRoles( xChartType->getSupportedOptionalRoles());
sal_Int32 nI = 0;
@@ -761,7 +761,7 @@ OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString
OUString DialogModel::GetRoleDataLabel()
{
- return ::chart::SchResId(STR_OBJECT_DATALABELS).toString();
+ return ::chart::SchResId(STR_OBJECT_DATALABELS);
}
sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleString )
diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
index 56d788d1afc9..db613c24105f 100644
--- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
+++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
@@ -27,7 +27,7 @@ bool GL3DBarChartDialogController::shouldShow_GL3DResourceGroup() const
OUString GL3DBarChartDialogController::getName()
{
- return SchResId(STR_TYPE_GL3D_BAR).toString();
+ return SchResId(STR_TYPE_GL3D_BAR);
}
Image GL3DBarChartDialogController::getImage()
@@ -50,7 +50,7 @@ void GL3DBarChartDialogController::fillSubTypeList(
rSubTypeList.Clear();
rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_GL3D_BAR_ROUNDRECT)));
- rSubTypeList.SetItemText(1, SchResId(STR_GL3D_BAR).toString());
+ rSubTypeList.SetItemText(1, SchResId(STR_GL3D_BAR));
}
}
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 66a7fa3637bf..7ceef646bceb 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -71,7 +71,7 @@ OUString lcl_getDataSeriesName( const OUString& rObjectCID, const Reference< fra
OUString lcl_getFullSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel )
{
- OUString aRet(SCH_RESSTR(STR_TIP_DATASERIES));
+ OUString aRet(SchResId(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=SCH_RESSTR(STR_OBJECT_PAGE);
+ aRet=SchResId(STR_OBJECT_PAGE);
break;
case OBJECTTYPE_TITLE:
{
if(bPlural)
- aRet=SCH_RESSTR(STR_OBJECT_TITLES);
+ aRet=SchResId(STR_OBJECT_TITLES);
else
- aRet=SCH_RESSTR(STR_OBJECT_TITLE);
+ aRet=SchResId(STR_OBJECT_TITLE);
}
break;
case OBJECTTYPE_LEGEND:
- aRet=SCH_RESSTR(STR_OBJECT_LEGEND);
+ aRet=SchResId(STR_OBJECT_LEGEND);
break;
case OBJECTTYPE_LEGEND_ENTRY:
- aRet=SCH_RESSTR(STR_OBJECT_LEGEND_SYMBOL);//@todo change string if we do differenciate symbol and legend entry in future
+ aRet=SchResId(STR_OBJECT_LEGEND_SYMBOL);//@todo change string if we do differenciate symbol and legend entry in future
break;
case OBJECTTYPE_DIAGRAM:
- aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM);
+ aRet=SchResId(STR_OBJECT_DIAGRAM);
break;
case OBJECTTYPE_DIAGRAM_WALL:
- aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM_WALL);
+ aRet=SchResId(STR_OBJECT_DIAGRAM_WALL);
break;
case OBJECTTYPE_DIAGRAM_FLOOR:
- aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM_FLOOR);
+ aRet=SchResId(STR_OBJECT_DIAGRAM_FLOOR);
break;
case OBJECTTYPE_AXIS:
{
if(bPlural)
- aRet=SCH_RESSTR(STR_OBJECT_AXES);
+ aRet=SchResId(STR_OBJECT_AXES);
else
- aRet=SCH_RESSTR(STR_OBJECT_AXIS);
+ aRet=SchResId(STR_OBJECT_AXIS);
}
break;
case OBJECTTYPE_AXIS_UNITLABEL:
- aRet=SCH_RESSTR(STR_OBJECT_LABEL);//@todo maybe a more concrete name
+ aRet=SchResId(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=SCH_RESSTR(STR_OBJECT_GRIDS);
+ aRet=SchResId(STR_OBJECT_GRIDS);
else
- aRet=SCH_RESSTR(STR_OBJECT_GRID);
+ aRet=SchResId(STR_OBJECT_GRID);
}
break;
case OBJECTTYPE_DATA_SERIES:
{
if(bPlural)
- aRet=SCH_RESSTR(STR_OBJECT_DATASERIES_PLURAL);
+ aRet=SchResId(STR_OBJECT_DATASERIES_PLURAL);
else
- aRet=SCH_RESSTR(STR_OBJECT_DATASERIES);
+ aRet=SchResId(STR_OBJECT_DATASERIES);
}
break;
case OBJECTTYPE_DATA_POINT:
{
if(bPlural)
- aRet=SCH_RESSTR(STR_OBJECT_DATAPOINTS);
+ aRet=SchResId(STR_OBJECT_DATAPOINTS);
else
- aRet=SCH_RESSTR(STR_OBJECT_DATAPOINT);
+ aRet=SchResId(STR_OBJECT_DATAPOINT);
}
break;
case OBJECTTYPE_DATA_LABELS:
- aRet=SCH_RESSTR(STR_OBJECT_DATALABELS);
+ aRet=SchResId(STR_OBJECT_DATALABELS);
break;
case OBJECTTYPE_DATA_LABEL:
- aRet=SCH_RESSTR(STR_OBJECT_LABEL);
+ aRet=SchResId(STR_OBJECT_LABEL);
break;
case OBJECTTYPE_DATA_ERRORS_X:
- aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_X);
+ aRet=SchResId(STR_OBJECT_ERROR_BARS_X);
break;
case OBJECTTYPE_DATA_ERRORS_Y:
- aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_Y);
+ aRet=SchResId(STR_OBJECT_ERROR_BARS_Y);
break;
case OBJECTTYPE_DATA_ERRORS_Z:
- aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_Z);
+ aRet=SchResId(STR_OBJECT_ERROR_BARS_Z);
break;
case OBJECTTYPE_DATA_AVERAGE_LINE:
- aRet=SCH_RESSTR(STR_OBJECT_AVERAGE_LINE);
+ aRet=SchResId(STR_OBJECT_AVERAGE_LINE);
break;
case OBJECTTYPE_DATA_CURVE:
{
if(bPlural)
- aRet=SCH_RESSTR(STR_OBJECT_CURVES);
+ aRet=SchResId(STR_OBJECT_CURVES);
else
- aRet=SCH_RESSTR(STR_OBJECT_CURVE);
+ aRet=SchResId(STR_OBJECT_CURVE);
}
break;
case OBJECTTYPE_DATA_STOCK_RANGE:
break;
case OBJECTTYPE_DATA_STOCK_LOSS:
- aRet=SCH_RESSTR(STR_OBJECT_STOCK_LOSS);
+ aRet=SchResId(STR_OBJECT_STOCK_LOSS);
break;
case OBJECTTYPE_DATA_STOCK_GAIN:
- aRet=SCH_RESSTR(STR_OBJECT_STOCK_GAIN);
+ aRet=SchResId(STR_OBJECT_STOCK_GAIN);
break;
case OBJECTTYPE_DATA_CURVE_EQUATION:
- aRet=SCH_RESSTR(STR_OBJECT_CURVE_EQUATION);
+ aRet=SchResId(STR_OBJECT_CURVE_EQUATION);
break;
default: //OBJECTTYPE_UNKNOWN
;
@@ -327,21 +327,21 @@ OUString ObjectNameProvider::getAxisName( const OUString& rObjectCID
{
case 0://x-axis
if( nAxisIndex == 0 )
- aRet=SCH_RESSTR(STR_OBJECT_AXIS_X);
+ aRet=SchResId(STR_OBJECT_AXIS_X);
else
- aRet=SCH_RESSTR(STR_OBJECT_SECONDARY_X_AXIS);
+ aRet=SchResId(STR_OBJECT_SECONDARY_X_AXIS);
break;
case 1://y-axis
if( nAxisIndex == 0 )
- aRet=SCH_RESSTR(STR_OBJECT_AXIS_Y);
+ aRet=SchResId(STR_OBJECT_AXIS_Y);
else
- aRet=SCH_RESSTR(STR_OBJECT_SECONDARY_Y_AXIS);
+ aRet=SchResId(STR_OBJECT_SECONDARY_Y_AXIS);
break;
case 2://z-axis
- aRet=SCH_RESSTR(STR_OBJECT_AXIS_Z);
+ aRet=SchResId(STR_OBJECT_AXIS_Z);
break;
default://axis
- aRet=SCH_RESSTR(STR_OBJECT_AXIS);
+ aRet=SchResId(STR_OBJECT_AXIS);
break;
}
@@ -355,25 +355,25 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
switch(eType)
{
case TitleHelper::MAIN_TITLE:
- aRet=SCH_RESSTR(STR_OBJECT_TITLE_MAIN);
+ aRet=SchResId(STR_OBJECT_TITLE_MAIN);
break;
case TitleHelper::SUB_TITLE:
- aRet=SCH_RESSTR(STR_OBJECT_TITLE_SUB);
+ aRet=SchResId(STR_OBJECT_TITLE_SUB);
break;
case TitleHelper::X_AXIS_TITLE:
- aRet=SCH_RESSTR(STR_OBJECT_TITLE_X_AXIS);
+ aRet=SchResId(STR_OBJECT_TITLE_X_AXIS);
break;
case TitleHelper::Y_AXIS_TITLE:
- aRet=SCH_RESSTR(STR_OBJECT_TITLE_Y_AXIS);
+ aRet=SchResId(STR_OBJECT_TITLE_Y_AXIS);
break;
case TitleHelper::Z_AXIS_TITLE:
- aRet=SCH_RESSTR(STR_OBJECT_TITLE_Z_AXIS);
+ aRet=SchResId(STR_OBJECT_TITLE_Z_AXIS);
break;
case TitleHelper::SECONDARY_X_AXIS_TITLE:
- aRet=SCH_RESSTR(STR_OBJECT_TITLE_SECONDARY_X_AXIS);
+ aRet=SchResId(STR_OBJECT_TITLE_SECONDARY_X_AXIS);
break;
case TitleHelper::SECONDARY_Y_AXIS_TITLE:
- aRet=SCH_RESSTR(STR_OBJECT_TITLE_SECONDARY_Y_AXIS);
+ aRet=SchResId(STR_OBJECT_TITLE_SECONDARY_Y_AXIS);
break;
default:
OSL_FAIL("unknown title type");
@@ -381,7 +381,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
}
if( aRet.isEmpty() )
- aRet=SCH_RESSTR(STR_OBJECT_TITLE);
+ aRet=SchResId(STR_OBJECT_TITLE);
return aRet;
}
@@ -400,7 +400,7 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
aRet = ObjectNameProvider::getTitleNameByType( eType );
}
if( aRet.isEmpty() )
- aRet=SCH_RESSTR(STR_OBJECT_TITLE);
+ aRet=SchResId(STR_OBJECT_TITLE);
return aRet;
}
@@ -424,16 +424,16 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID
switch(nDimensionIndex)
{
case 0://x-axis
- aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_X);
+ aRet=SchResId(STR_OBJECT_GRID_MAJOR_X);
break;
case 1://y-axis
- aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_Y);
+ aRet=SchResId(STR_OBJECT_GRID_MAJOR_Y);
break;
case 2://z-axis
- aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_Z);
+ aRet=SchResId(STR_OBJECT_GRID_MAJOR_Z);
break;
default://axis
- aRet=SCH_RESSTR(STR_OBJECT_GRID);
+ aRet=SchResId(STR_OBJECT_GRID);
break;
}
}
@@ -442,16 +442,16 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID
switch(nDimensionIndex)
{
case 0://x-axis
- aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_X);
+ aRet=SchResId(STR_OBJECT_GRID_MINOR_X);
break;
case 1://y-axis
- aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_Y);
+ aRet=SchResId(STR_OBJECT_GRID_MINOR_Y);
break;
case 2://z-axis
- aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_Z);
+ aRet=SchResId(STR_OBJECT_GRID_MINOR_Z);
break;
default://axis
- aRet=SCH_RESSTR(STR_OBJECT_GRID);
+ aRet=SchResId(STR_OBJECT_GRID);
break;
}
}
@@ -488,12 +488,12 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
if( bVerbose )
{
- aRet= SCH_RESSTR(STR_TIP_DATAPOINT_INDEX) + "\n"
- + SCH_RESSTR(STR_TIP_DATASERIES) + "\n"
- + SCH_RESSTR(STR_TIP_DATAPOINT_VALUES);
+ aRet= OUString(SchResId(STR_TIP_DATAPOINT_INDEX)) + "\n"
+ + OUString(SchResId(STR_TIP_DATASERIES)) + "\n"
+ + OUString(SchResId(STR_TIP_DATAPOINT_VALUES));
}
else
- aRet=SCH_RESSTR(STR_TIP_DATAPOINT);
+ aRet=SchResId(STR_TIP_DATAPOINT);
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY );
@@ -547,7 +547,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
if( bVerbose )
{
- aRet = SCH_RESSTR( STR_OBJECT_CURVE_WITH_PARAMETERS );
+ aRet = SchResId( STR_OBJECT_CURVE_WITH_PARAMETERS );
Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ));
Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY );
@@ -653,7 +653,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
if( bVerbose )
{
- aRet = SCH_RESSTR(STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS);
+ aRet = SchResId(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())
@@ -723,7 +723,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
if( OBJECTTYPE_DATA_POINT == eObjectType )
{
- aRet = SCH_RESSTR( STR_STATUS_DATAPOINT_MARKED );
+ aRet = SchResId( STR_STATUS_DATAPOINT_MARKED );
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY );
@@ -759,7 +759,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
const OUString aHelpText( getHelpText( rObjectCID, xChartModel, bVerbose ));
if( !aHelpText.isEmpty())
{
- aRet = SCH_RESSTR( STR_STATUS_OBJECT_MARKED );
+ aRet = SchResId( STR_STATUS_OBJECT_MARKED );
replaceParamterInString( aRet, "%OBJECTNAME", aHelpText );
}
}
@@ -845,7 +845,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries(
Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rSeriesCID , xChartModel ), uno::UNO_QUERY );
if( xSeries.is() )
{
- OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_SERIES);
+ OUString aRet = SchResId(STR_OBJECT_FOR_SERIES);
replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType ) );
replaceParamterInString( aRet, "%SERIESNAME", lcl_getDataSeriesName( rSeriesCID, xChartModel ) );
return aRet;
@@ -856,7 +856,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries(
OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType )
{
- OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_ALL_SERIES);
+ OUString aRet = SchResId(STR_OBJECT_FOR_ALL_SERIES);
replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, true /*bPlural*/ ) );
return aRet;
}
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 0de05f95bb3f..de52f69443c0 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -30,9 +30,9 @@ namespace chart
TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent ) :
svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN)
{
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), SvxFrameDirection::Horizontal_LR_TB );
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), SvxFrameDirection::Horizontal_RL_TB );
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), SvxFrameDirection::Environment );
+ InsertEntryValue( SchResId( STR_TEXT_DIRECTION_LTR ), SvxFrameDirection::Horizontal_LR_TB );
+ InsertEntryValue( SchResId( STR_TEXT_DIRECTION_RTL ), SvxFrameDirection::Horizontal_RL_TB );
+ InsertEntryValue( SchResId( STR_TEXT_DIRECTION_SUPER ), SvxFrameDirection::Environment );
if( !SvtLanguageOptions().IsCTLFontEnabled() )
{
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index b4beb73575a4..151d2c8321d2 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -58,7 +58,7 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame:
m_pDialogModel.reset(new DialogModel(m_xChartModel, m_xComponentContext));
defaultButton(WizardButtonFlags::FINISH);
- this->setTitleBase(SCH_RESSTR(STR_DLG_CHART_WIZARD));
+ this->setTitleBase(SchResId(STR_DLG_CHART_WIZARD));
WizardPath aPath = {
STATE_CHARTTYPE,
@@ -187,7 +187,7 @@ OUString CreationWizard::getStateDisplayName( WizardState nState ) const
default:
break;
}
- return SCH_RESSTR(nResId);
+ return SchResId(nResId);
}
} //namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 71867a64cbdc..8c1566310a9a 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -141,8 +141,8 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
m_pDataSourceTabPage = VclPtr<DataSourceTabPage>::Create( m_pTabControl, *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), this, true /* bHideDescription */ );
- 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->InsertPage( TP_RANGECHOOSER, SchResId(STR_PAGE_DATA_RANGE) );
+ m_pTabControl->InsertPage( TP_DATA_SOURCE, SchResId(STR_OBJECT_DATASERIES_PLURAL) );
m_pTabControl->SetTabPage( TP_DATA_SOURCE, m_pDataSourceTabPage );
m_pTabControl->SetTabPage( TP_RANGECHOOSER, m_pRangeChooserTabPage );
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 6f8cc675d86f..6d7f1b729f88 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -345,82 +345,82 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
switch (eObjectType)
{
case OBJECTTYPE_TITLE:
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
- AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
- AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
- AddTabPage(TP_ALIGNMENT, SCH_RESSTR(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::Create, nullptr);
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
+ AddTabPage(RID_SVXPAGE_AREA, SchResId(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SchResId(STR_PAGE_TRANSPARENCY));
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SchResId(STR_PAGE_FONT_EFFECTS));
+ AddTabPage(TP_ALIGNMENT, SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::Create, nullptr);
if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN));
+ AddTabPage(RID_SVXPAGE_PARA_ASIAN, SchResId(STR_PAGE_ASIAN));
break;
case OBJECTTYPE_LEGEND:
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
- AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
- AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
- AddTabPage(TP_LEGEND_POS, SCH_RESSTR(STR_PAGE_POSITION), SchLegendPosTabPage::Create, nullptr);
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
+ AddTabPage(RID_SVXPAGE_AREA, SchResId(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SchResId(STR_PAGE_TRANSPARENCY));
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SchResId(STR_PAGE_FONT_EFFECTS));
+ AddTabPage(TP_LEGEND_POS, SchResId(STR_PAGE_POSITION), SchLegendPosTabPage::Create, nullptr);
if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN));
+ AddTabPage(RID_SVXPAGE_PARA_ASIAN, SchResId(STR_PAGE_ASIAN));
break;
case OBJECTTYPE_DATA_SERIES:
case OBJECTTYPE_DATA_POINT:
if( m_pParameter->ProvidesSecondaryYAxis() || m_pParameter->ProvidesOverlapAndGapWidth() || m_pParameter->ProvidesMissingValueTreatments() )
- AddTabPage(TP_OPTIONS, SCH_RESSTR(STR_PAGE_OPTIONS),SchOptionTabPage::Create, nullptr);
+ AddTabPage(TP_OPTIONS, SchResId(STR_PAGE_OPTIONS),SchOptionTabPage::Create, nullptr);
if( m_pParameter->ProvidesStartingAngle())
- AddTabPage(TP_POLAROPTIONS, SCH_RESSTR(STR_PAGE_OPTIONS),PolarOptionsTabPage::Create, nullptr);
+ AddTabPage(TP_POLAROPTIONS, SchResId(STR_PAGE_OPTIONS),PolarOptionsTabPage::Create, nullptr);
if( m_pParameter->HasGeometryProperties() )
- AddTabPage(TP_LAYOUT, SCH_RESSTR(STR_PAGE_LAYOUT),SchLayoutTabPage::Create, nullptr);
+ AddTabPage(TP_LAYOUT, SchResId(STR_PAGE_LAYOUT),SchLayoutTabPage::Create, nullptr);
if(m_pParameter->HasAreaProperties())
{
- AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
+ AddTabPage(RID_SVXPAGE_AREA, SchResId(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SchResId(STR_PAGE_TRANSPARENCY));
}
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE ));
+ AddTabPage(RID_SVXPAGE_LINE, SchResId( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE ));
break;
case OBJECTTYPE_DATA_LABEL:
case OBJECTTYPE_DATA_LABELS:
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
- AddTabPage(TP_DATA_DESCR, SCH_RESSTR(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create, nullptr);
- AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
+ AddTabPage(TP_DATA_DESCR, SchResId(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create, nullptr);
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SchResId(STR_PAGE_FONT_EFFECTS));
if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN));
+ AddTabPage(RID_SVXPAGE_PARA_ASIAN, SchResId(STR_PAGE_ASIAN));
break;
case OBJECTTYPE_AXIS:
{
if( m_pParameter->HasScaleProperties() )
- AddTabPage(TP_SCALE, SCH_RESSTR(STR_PAGE_SCALE), ScaleTabPage::Create, nullptr);
+ AddTabPage(TP_SCALE, SchResId(STR_PAGE_SCALE), ScaleTabPage::Create, nullptr);
if( m_pParameter->HasScaleProperties() )//no positioning page for z axes so far as the tickmarks are not shown so far
- AddTabPage(TP_AXIS_POSITIONS, SCH_RESSTR(STR_PAGE_POSITIONING), AxisPositionsTabPage::Create, nullptr);
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
- AddTabPage(TP_AXIS_LABEL, SCH_RESSTR(STR_OBJECT_LABEL), SchAxisLabelTabPage::Create, nullptr);
+ AddTabPage(TP_AXIS_POSITIONS, SchResId(STR_PAGE_POSITIONING), AxisPositionsTabPage::Create, nullptr);
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_LINE));
+ AddTabPage(TP_AXIS_LABEL, SchResId(STR_OBJECT_LABEL), SchAxisLabelTabPage::Create, nullptr);
if( m_pParameter->HasNumberProperties() )
- AddTabPage(RID_SVXPAGE_NUMBERFORMAT, SCH_RESSTR(STR_PAGE_NUMBERS));
- AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
+ AddTabPage(RID_SVXPAGE_NUMBERFORMAT, SchResId(STR_PAGE_NUMBERS));
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SchResId(STR_PAGE_FONT_EFFECTS));
if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN));
+ AddTabPage(RID_SVXPAGE_PARA_ASIAN, SchResId(STR_PAGE_ASIAN));
break;
}
case OBJECTTYPE_DATA_ERRORS_X:
- AddTabPage(TP_XERRORBAR, SCH_RESSTR(STR_PAGE_XERROR_BARS), ErrorBarsTabPage::Create, nullptr);
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
+ AddTabPage(TP_XERRORBAR, SchResId(STR_PAGE_XERROR_BARS), ErrorBarsTabPage::Create, nullptr);
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_LINE));
break;
case OBJECTTYPE_DATA_ERRORS_Y:
- AddTabPage(TP_YERRORBAR, SCH_RESSTR(STR_PAGE_YERROR_BARS), ErrorBarsTabPage::Create, nullptr);
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
+ AddTabPage(TP_YERRORBAR, SchResId(STR_PAGE_YERROR_BARS), ErrorBarsTabPage::Create, nullptr);
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_LINE));
break;
case OBJECTTYPE_DATA_ERRORS_Z:
@@ -430,12 +430,12 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
case OBJECTTYPE_SUBGRID:
case OBJECTTYPE_DATA_AVERAGE_LINE:
case OBJECTTYPE_DATA_STOCK_RANGE:
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_LINE));
break;
case OBJECTTYPE_DATA_CURVE:
- AddTabPage(TP_TRENDLINE, SCH_RESSTR(STR_PAGE_TRENDLINE_TYPE), TrendlineTabPage::Create, nullptr);
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
+ AddTabPage(TP_TRENDLINE, SchResId(STR_PAGE_TRENDLINE_TYPE), TrendlineTabPage::Create, nullptr);
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_LINE));
break;
case OBJECTTYPE_DATA_STOCK_LOSS:
@@ -444,9 +444,9 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
case OBJECTTYPE_DIAGRAM_FLOOR:
case OBJECTTYPE_DIAGRAM_WALL:
case OBJECTTYPE_DIAGRAM:
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
- AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
+ AddTabPage(RID_SVXPAGE_AREA, SchResId(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SchResId(STR_PAGE_TRANSPARENCY));
break;
case OBJECTTYPE_LEGEND_ENTRY:
@@ -455,17 +455,17 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
// nothing
break;
case OBJECTTYPE_DATA_CURVE_EQUATION:
- AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
- AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
- AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
- AddTabPage(RID_SVXPAGE_NUMBERFORMAT, SCH_RESSTR(STR_PAGE_NUMBERS));
+ AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
+ AddTabPage(RID_SVXPAGE_AREA, SchResId(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SchResId(STR_PAGE_TRANSPARENCY));
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SchResId(STR_PAGE_FONT_EFFECTS));
+ AddTabPage(RID_SVXPAGE_NUMBERFORMAT, SchResId(STR_PAGE_NUMBERS));
if( SvtLanguageOptions().IsCTLFontEnabled() )
/* When rotation is supported for equation text boxes, use
SchAlignmentTabPage::Create here. The special
SchAlignmentTabPage::CreateWithoutRotation can be deleted. */
- AddTabPage(TP_ALIGNMENT, SCH_RESSTR(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::CreateWithoutRotation, nullptr);
+ AddTabPage(TP_ALIGNMENT, SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::CreateWithoutRotation, nullptr);
break;
default:
break;
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 7cfd50f41fd1..196a6fb17f94 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -53,9 +53,9 @@ View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference< frame::XM
m_pAppearance = VclPtr<ThreeD_SceneAppearance_TabPage>::Create(m_pTabControl,xChartModel,m_aControllerLocker);
m_pIllumination = VclPtr<ThreeD_SceneIllumination_TabPage>::Create(m_pTabControl,xSceneProperties,xChartModel);
- m_pTabControl->InsertPage( TP_3D_SCENEGEOMETRY, SCH_RESSTR(STR_PAGE_PERSPECTIVE) );
- m_pTabControl->InsertPage( TP_3D_SCENEAPPEARANCE, SCH_RESSTR(STR_PAGE_APPEARANCE) );
- m_pTabControl->InsertPage( TP_3D_SCENEILLUMINATION, SCH_RESSTR(STR_PAGE_ILLUMINATION) );
+ m_pTabControl->InsertPage( TP_3D_SCENEGEOMETRY, SchResId(STR_PAGE_PERSPECTIVE) );
+ m_pTabControl->InsertPage( TP_3D_SCENEAPPEARANCE, SchResId(STR_PAGE_APPEARANCE) );
+ m_pTabControl->InsertPage( TP_3D_SCENEILLUMINATION, SchResId(STR_PAGE_ILLUMINATION) );
m_pTabControl->SetTabPage( TP_3D_SCENEGEOMETRY, m_pGeometry );
m_pTabControl->SetTabPage( TP_3D_SCENEAPPEARANCE, m_pAppearance );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 3e561045fc7d..3e33b264ae97 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -338,7 +338,7 @@ SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent )
get(m_pFT_SplineOrder, "PolynomialsLabel");
get(m_pMF_SplineOrder, "PolynomialsSpinButton");
- this->SetText( SCH_RESSTR( STR_DLG_SMOOTH_LINE_PROPERTIES ) );
+ this->SetText( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) );
m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) );
}
@@ -416,7 +416,7 @@ SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent )
get(m_pRB_CenterX, "step_center_x_rb");
get(m_pRB_CenterY, "step_center_y_rb");
- SetText(SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES));
+ SetText(SchResId(STR_DLG_STEPPED_LINE_PROPERTIES));
}
void SteppedPropertiesDialog::dispose()
@@ -535,7 +535,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter )
m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH);
m_pPB_DetailsDialog->Enable();
m_pPB_DetailsDialog->SetClickHdl( LINK( this, SplineResourceGroup, SplineDetailsDialogHdl ) );
- m_pPB_DetailsDialog->SetQuickHelpText( SCH_RESSTR(STR_DLG_SMOOTH_LINE_PROPERTIES) );
+ m_pPB_DetailsDialog->SetQuickHelpText( SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES) );
getSplinePropertiesDialog().fillControls( rParameter );
break;
case CurveStyle_STEP_START:
@@ -545,7 +545,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter )
m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED);
m_pPB_DetailsDialog->Enable();
m_pPB_DetailsDialog->SetClickHdl( LINK( this, SplineResourceGroup, SteppedDetailsDialogHdl ) );
- m_pPB_DetailsDialog->SetQuickHelpText( SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES) );
+ m_pPB_DetailsDialog->SetQuickHelpText( SchResId(STR_DLG_STEPPED_LINE_PROPERTIES) );
getSteppedPropertiesDialog().fillControls( rParameter );
break;
default:
@@ -696,7 +696,7 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
m_pFT_ChooseType->SetStyle(m_pFT_ChooseType->GetStyle() | WB_NOLABEL);
}
- this->SetText( SCH_RESSTR(STR_PAGE_CHARTTYPE) );
+ this->SetText( SchResId(STR_PAGE_CHARTTYPE) );
m_pMainTypeList->SetStyle(m_pMainTypeList->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_FLATVALUESET | WB_3DLOOK );
m_pMainTypeList->SetSelectHdl( LINK( this, ChartTypeTabPage, SelectMainTypeHdl ) );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 0f4ed3da7901..d69b1156bb23 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -219,7 +219,7 @@ DataSourceTabPage::DataSourceTabPage(
m_pFT_CAPTION->Show(!bHideDescription);
m_aFixedTextRange = m_pFT_RANGE->GetText();
- this->SetText( SCH_RESSTR( STR_OBJECT_DATASERIES_PLURAL ) );
+ this->SetText( SchResId( STR_OBJECT_DATASERIES_PLURAL ) );
// set handlers
m_pLB_SERIES->SetSelectHdl( LINK( this, DataSourceTabPage, SeriesSelectionChangedHdl ));
@@ -415,7 +415,7 @@ void DataSourceTabPage::fillSeriesListBox()
{
if( nUnnamedSeriesIndex > 1 )
{
- OUString aResString(::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ).toString());
+ OUString aResString(::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ));
// replace index of unnamed series
const OUString aReplacementStr( "%NUMBER" );
@@ -426,7 +426,7 @@ void DataSourceTabPage::fillSeriesListBox()
OUString::number(nUnnamedSeriesIndex));
}
if( aLabel.isEmpty() )
- aLabel = ::chart::SchResId( STR_DATA_UNNAMED_SERIES ).toString();
+ aLabel = ::chart::SchResId( STR_DATA_UNNAMED_SERIES );
++nUnnamedSeriesIndex;
}
@@ -579,7 +579,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void)
if( bHasSelectedEntry && (m_pLB_ROLE->FirstSelected() != nullptr))
{
- OUString aUIStr(SCH_RESSTR(STR_DATA_SELECT_RANGE_FOR_SERIES));
+ OUString aUIStr(SchResId(STR_DATA_SELECT_RANGE_FOR_SERIES));
// replace role
OUString aReplacement( "%VALUETYPE" );
@@ -613,7 +613,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, voi
! updateModelFromControl( m_pCurrentRangeChoosingField ))
return;
- OUString aStr( SCH_RESSTR( m_pFT_CATEGORIES->IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS ));
+ OUString aStr( SchResId( m_pFT_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(), aStr, *this );
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index a0b8070f0cff..dcf330395374 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -614,7 +614,7 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* =
if( nResIdMessage == 0 )
return false;
- ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ), SCH_RESSTR(nResIdMessage))->Execute();
+ ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ), SchResId(nResIdMessage))->Execute();
if( pControl )
{
pControl->GrabFocus();
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 119146a67de0..63e3b2336b21 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1304,7 +1304,7 @@ void SAL_CALL ChartController::releaseContextMenuInterceptor(
void ChartController::executeDispatch_ChartType()
{
UndoLiveUpdateGuard aUndoGuard(
- SCH_RESSTR( STR_ACTION_EDIT_CHARTTYPE ), m_xUndoManager );
+ SchResId( STR_ACTION_EDIT_CHARTTYPE ), m_xUndoManager );
SolarMutexGuard aSolarGuard;
//prepare and open dialog
@@ -1325,7 +1325,7 @@ void ChartController::executeDispatch_SourceData()
return;
UndoLiveUpdateGuard aUndoGuard(
- SCH_RESSTR(STR_ACTION_EDIT_DATA_RANGES), m_xUndoManager );
+ SchResId(STR_ACTION_EDIT_DATA_RANGES), m_xUndoManager );
if( xChartDoc.is())
{
SolarMutexGuard aSolarGuard;
@@ -1350,7 +1350,7 @@ void ChartController::executeDispatch_MoveSeries( bool bForward )
UndoGuardWithSelection aUndoGuard(
ActionDescriptionProvider::createDescription(
(bForward ? ActionDescriptionProvider::ActionType::MoveToTop : ActionDescriptionProvider::ActionType::MoveToBottom),
- SCH_RESSTR(STR_OBJECT_DATASERIES)),
+ SchResId(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 fdff4e769147..143b5995f597 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -47,7 +47,7 @@ void ChartController::executeDispatch_EditData()
{
SolarMutexGuard aSolarGuard;
UndoLiveUpdateGuardWithData aUndoGuard(
- SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ),
+ SchResId( STR_ACTION_EDIT_CHART_DATA ),
m_xUndoManager );
ScopedVclPtrInstance<DataEditor> aDataEditorDialog( nullptr, xChartDoc, m_xCC );
if (aDataEditorDialog->Execute() == RET_OK)
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index c6a04bbc1b04..5156efe72111 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -89,7 +89,7 @@ void ChartController::executeDispatch_InsertAxes()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AXES )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AXES )),
m_xUndoManager );
try
@@ -127,7 +127,7 @@ void ChartController::executeDispatch_InsertGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_GRIDS )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_GRIDS )),
m_xUndoManager );
try
@@ -161,7 +161,7 @@ void ChartController::executeDispatch_InsertTitles()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_TITLES )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_TITLES )),
m_xUndoManager );
try
@@ -192,7 +192,7 @@ void ChartController::executeDispatch_DeleteLegend()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_LEGEND )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_LEGEND )),
m_xUndoManager );
ChartModel& rModel = dynamic_cast<ChartModel&>(*getModel().get());
@@ -204,7 +204,7 @@ void ChartController::executeDispatch_InsertLegend()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_LEGEND )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_LEGEND )),
m_xUndoManager );
ChartModel& rModel = dynamic_cast<ChartModel&>(*getModel().get());
@@ -216,7 +216,7 @@ void ChartController::executeDispatch_OpenLegendDialog()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_LEGEND )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_LEGEND )),
m_xUndoManager );
try
@@ -244,7 +244,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_DATALABELS )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_DATALABELS )),
m_xUndoManager );
//if a series is selected insert labels for that series only:
@@ -306,7 +306,7 @@ void ChartController::executeDispatch_InsertMeanValue()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
lcl_InsertMeanValueLine( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(),
getModel() ) );
@@ -317,7 +317,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries(
@@ -361,7 +361,7 @@ void ChartController::executeDispatch_InsertTrendline()
UndoLiveUpdateGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE )),
m_xUndoManager );
uno::Reference< chart2::XRegressionCurve > xCurve =
@@ -423,7 +423,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
UndoLiveUpdateGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::ActionType::Insert,
- SCH_RESSTR( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X )),
+ SchResId( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X )),
m_xUndoManager );
// add error bars with standard deviation
@@ -532,7 +532,7 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 )
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowEquation", uno::Any( true ));
xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") ));
@@ -551,7 +551,7 @@ void ChartController::executeDispatch_InsertR2Value()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( true ));
aUndoGuard.commit();
@@ -566,7 +566,7 @@ void ChartController::executeDispatch_DeleteR2Value()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false ));
aUndoGuard.commit();
@@ -581,7 +581,7 @@ void ChartController::executeDispatch_DeleteMeanValue()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
aUndoGuard.commit();
@@ -596,7 +596,7 @@ void ChartController::executeDispatch_DeleteTrendline()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE )),
m_xUndoManager );
RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt );
aUndoGuard.commit();
@@ -611,7 +611,7 @@ void ChartController::executeDispatch_DeleteTrendlineEquation()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
RegressionCurveHelper::removeEquations( xRegCurveCnt );
aUndoGuard.commit();
@@ -626,7 +626,7 @@ void ChartController::executeDispatch_DeleteErrorBars( bool bYError )
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE )),
m_xUndoManager );
StatisticsHelper::removeErrorBars( xDataSeries, bYError );
aUndoGuard.commit();
@@ -640,7 +640,7 @@ void ChartController::executeDispatch_InsertDataLabels()
if( xSeries.is() )
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert,
- SCH_RESSTR( STR_OBJECT_DATALABELS )),
+ SchResId( STR_OBJECT_DATALABELS )),
m_xUndoManager );
DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries );
aUndoGuard.commit();
@@ -650,7 +650,7 @@ void ChartController::executeDispatch_InsertDataLabels()
void ChartController::executeDispatch_InsertDataLabel()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert,
- SCH_RESSTR( STR_OBJECT_LABEL )),
+ SchResId( STR_OBJECT_LABEL )),
m_xUndoManager );
DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) );
aUndoGuard.commit();
@@ -663,7 +663,7 @@ void ChartController::executeDispatch_DeleteDataLabels()
if( xSeries.is() )
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Delete,
- SCH_RESSTR( STR_OBJECT_DATALABELS )),
+ SchResId( STR_OBJECT_DATALABELS )),
m_xUndoManager );
DataSeriesHelper::deleteDataLabelsFromSeriesAndAllPoints( xSeries );
aUndoGuard.commit();
@@ -673,7 +673,7 @@ void ChartController::executeDispatch_DeleteDataLabels()
void ChartController::executeDispatch_DeleteDataLabel()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Delete,
- SCH_RESSTR( STR_OBJECT_LABEL )),
+ SchResId( STR_OBJECT_LABEL )),
m_xUndoManager );
DataSeriesHelper::deleteDataLabelsFromPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) );
aUndoGuard.commit();
@@ -682,7 +682,7 @@ void ChartController::executeDispatch_DeleteDataLabel()
void ChartController::executeDispatch_ResetAllDataPoints()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Format,
- SCH_RESSTR( STR_OBJECT_DATAPOINTS )),
+ SchResId( STR_OBJECT_DATAPOINTS )),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
if( xSeries.is() )
@@ -692,7 +692,7 @@ void ChartController::executeDispatch_ResetAllDataPoints()
void ChartController::executeDispatch_ResetDataPoint()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Format,
- SCH_RESSTR( STR_OBJECT_DATAPOINT )),
+ SchResId( STR_OBJECT_DATAPOINT )),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
if( xSeries.is() )
@@ -711,7 +711,7 @@ void ChartController::executeDispatch_InsertAxisTitle()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_TITLE )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_TITLE )),
m_xUndoManager );
Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( m_aSelection.getSelectedCID(), getModel() );
@@ -743,7 +743,7 @@ void ChartController::executeDispatch_InsertAxis()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AXIS )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AXIS )),
m_xUndoManager );
try
@@ -765,7 +765,7 @@ void ChartController::executeDispatch_DeleteAxis()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_AXIS )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_AXIS )),
m_xUndoManager );
try
@@ -787,7 +787,7 @@ void ChartController::executeDispatch_InsertMajorGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_GRID )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_GRID )),
m_xUndoManager );
try
@@ -809,7 +809,7 @@ void ChartController::executeDispatch_DeleteMajorGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_GRID )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_GRID )),
m_xUndoManager );
try
@@ -831,7 +831,7 @@ void ChartController::executeDispatch_InsertMinorGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_GRID )),
+ ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_GRID )),
m_xUndoManager );
try
@@ -855,7 +855,7 @@ void ChartController::executeDispatch_DeleteMinorGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR(STR_OBJECT_GRID)),
+ ActionDescriptionProvider::ActionType::Delete, SchResId(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 795b3b38b08c..1136031073a1 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -817,7 +817,7 @@ void ChartController::executeDispatch_View3D()
try
{
UndoLiveUpdateGuard aUndoGuard(
- SCH_RESSTR( STR_ACTION_EDIT_3D_VIEW ),
+ SchResId( 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 a250d784985e..11fb754eec6e 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -63,7 +63,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
OSL_PRECOND( !m_pTextActionUndoGuard.get(), "ChartController::StartTextEdit: already have a TextUndoGuard!?" );
m_pTextActionUndoGuard.reset( new UndoGuard(
- SCH_RESSTR( STR_ACTION_EDIT_TEXT ), m_xUndoManager ) );
+ SchResId( 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 50f0a12b474a..489dbf02bbb9 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -99,7 +99,7 @@ bool lcl_deleteDataSeries(
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_DATASERIES )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_DATASERIES )),
xUndoManager );
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) );
@@ -138,7 +138,7 @@ bool lcl_deleteDataCurve(
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE )),
xUndoManager );
xRegressionCurveContainer->removeRegressionCurve( xRegressionCurve );
@@ -179,7 +179,7 @@ void ChartController::executeDispatch_NewArrangement()
if( xDiagram.is())
{
UndoGuard aUndoGuard(
- SCH_RESSTR( STR_ACTION_REARRANGE_CHART ),
+ SchResId( STR_ACTION_REARRANGE_CHART ),
m_xUndoManager );
ControllerLockGuardUNO aCtlLockGuard( xModel );
@@ -234,7 +234,7 @@ void ChartController::executeDispatch_ScaleText()
{
SolarMutexGuard aSolarGuard;
UndoGuard aUndoGuard(
- SCH_RESSTR( STR_ACTION_SCALE_TEXT ),
+ SchResId( STR_ACTION_SCALE_TEXT ),
m_xUndoManager );
ControllerLockGuardUNO aCtlLockGuard( getModel() );
@@ -613,7 +613,7 @@ bool ChartController::executeDispatch_Delete()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_TITLE )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_TITLE )),
m_xUndoManager );
TitleHelper::removeTitle(
ObjectIdentifier::getTitleTypeForCID( aCID ), getModel() );
@@ -631,7 +631,7 @@ bool ChartController::executeDispatch_Delete()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_LEGEND )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_LEGEND )),
m_xUndoManager );
xLegendProp->setPropertyValue( "Show", uno::Any( false ));
bReturn = true;
@@ -677,7 +677,7 @@ bool ChartController::executeDispatch_Delete()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
bReturn = true;
@@ -702,7 +702,7 @@ bool ChartController::executeDispatch_Delete()
uno::Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
{
ControllerLockGuardUNO aCtlLockGuard( xModel );
@@ -737,7 +737,7 @@ bool ChartController::executeDispatch_Delete()
uno::Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( nId )),
+ ActionDescriptionProvider::ActionType::Delete, SchResId( nId )),
m_xUndoManager );
{
ControllerLockGuardUNO aCtlLockGuard( xModel );
@@ -761,7 +761,7 @@ bool ChartController::executeDispatch_Delete()
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::ActionType::Delete,
- SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )),
+ SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )),
m_xUndoManager );
chart2::DataPointLabel aLabel;
xObjectProperties->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel;
@@ -826,7 +826,7 @@ void ChartController::executeDispatch_ToggleLegend()
{
Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard(
- SCH_RESSTR( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager );
+ SchResId( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager );
ChartModel& rModel = dynamic_cast<ChartModel&>(*xModel.get());
Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend(rModel), uno::UNO_QUERY );
bool bChanged = false;
@@ -860,7 +860,7 @@ void ChartController::executeDispatch_ToggleLegend()
void ChartController::executeDispatch_ToggleGridHorizontal()
{
UndoGuard aUndoGuard(
- SCH_RESSTR( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager );
+ SchResId( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager );
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() ));
if( xDiagram.is())
{
@@ -893,7 +893,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal()
void ChartController::executeDispatch_ToggleGridVertical()
{
UndoGuard aUndoGuard(
- SCH_RESSTR( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager );
+ SchResId( 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 9b3d0e3ba69d..a38bb94571f0 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1535,7 +1535,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
bReturn = executeDispatch_Delete();
if( ! bReturn )
{
- ScopedVclPtrInstance<InfoBox>(pChartWindow, SCH_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pChartWindow, SchResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
}
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 845bb7c65591..331a506a1840 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -71,7 +71,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment()
}
void DragMethod_PieSegment::TakeSdrDragComment(OUString& rStr) const
{
- rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED);
+ rStr = SchResId(STR_STATUS_PIE_SEGMENT_EXPLODED);
rStr = rStr.replaceFirst( "%PERCENTVALUE", OUString::number( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
}
bool DragMethod_PieSegment::BeginSdrDrag()
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index d2499c243c31..0aa6610ba958 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -140,7 +140,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
ListBoxEntryData aEntry;
SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() );
OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString();
- aEntry.UIName = ( aName.isEmpty() ? SCH_RESSTR( STR_OBJECT_SHAPE ) : aName );
+ aEntry.UIName = ( aName.isEmpty() ? SchResId( STR_OBJECT_SHAPE ) : aName );
aEntry.OID = aSelectedOID;
m_aEntries.push_back( aEntry );
}
diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx
index ac24173f4c77..802eea9c7277 100644
--- a/chart2/source/inc/ResId.hxx
+++ b/chart2/source/inc/ResId.hxx
@@ -32,8 +32,6 @@ public:
SchResId( sal_Int16 nId );
};
-#define SCH_RESSTR(x) SchResId(x).toString()
-
} // namespace chart
// INCLUDED_CHART2_SOURCE_INC_RESID_HXX
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index e24695621824..84e53f2c514e 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -100,8 +100,8 @@ void InternalData::createDefaultData()
m_nColumnCount = nColumnCount;
const sal_Int32 nSize = nColumnCount * nRowCount;
// @todo: localize this!
- const OUString aRowName(SCH_RESSTR(STR_ROW_LABEL));
- const OUString aColName(SCH_RESSTR(STR_COLUMN_LABEL));
+ const OUString aRowName(SchResId(STR_ROW_LABEL));
+ const OUString aColName(SchResId(STR_COLUMN_LABEL));
m_aData.resize( nSize );
for( sal_Int32 i=0; i<nSize; ++i )
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 85406c9d62d4..60ee6b10c0fa 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -98,7 +98,7 @@ OUString MovingAverageRegressionCurveCalculator::ImplGetRepresentation(
const uno::Reference< util::XNumberFormatter >& /*xNumFormatter*/,
sal_Int32 /*nNumberFormatKey*/, sal_Int32* /*pFormulaLength = nullptr */ ) const
{
- return SCH_RESSTR( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+ return SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
}
} // namespace chart
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 802f86296bb2..da43fee9b0c6 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -631,31 +631,31 @@ OUString RegressionCurveHelper::getRegressionCurveGenericName(const Reference< X
if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" )
{
- aResult = SCH_RESSTR(STR_REGRESSION_MEAN);
+ aResult = SchResId(STR_REGRESSION_MEAN);
}
else if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
{
- aResult = SCH_RESSTR(STR_REGRESSION_LINEAR);
+ aResult = SchResId(STR_REGRESSION_LINEAR);
}
else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
{
- aResult = SCH_RESSTR(STR_REGRESSION_LOG);
+ aResult = SchResId(STR_REGRESSION_LOG);
}
else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
{
- aResult = SCH_RESSTR(STR_REGRESSION_EXP);
+ aResult = SchResId(STR_REGRESSION_EXP);
}
else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
{
- aResult = SCH_RESSTR(STR_REGRESSION_POWER);
+ aResult = SchResId(STR_REGRESSION_POWER);
}
else if( aServiceName == "com.sun.star.chart2.PolynomialRegressionCurve" )
{
- aResult = SCH_RESSTR(STR_REGRESSION_POLYNOMIAL);
+ aResult = SchResId(STR_REGRESSION_POLYNOMIAL);
}
else if( aServiceName == "com.sun.star.chart2.MovingAverageRegressionCurve" )
{
- aResult = SCH_RESSTR(STR_REGRESSION_MOVING_AVERAGE);
+ aResult = SchResId(STR_REGRESSION_MOVING_AVERAGE);
}
return aResult;
}
More information about the Libreoffice-commits
mailing list