chart2/inc/strings.hrc | 3 +--
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 2 +-
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 2 +-
chart2/source/controller/main/ChartController_Insert.cxx | 6 +++---
4 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 4b4eec2245d8c7dd0052abc80def0fbbc780d59d
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Aug 16 16:44:55 2022 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Aug 25 13:06:03 2022 +0200
chart2: use only one "Data Table" string to simplify translation
Change-Id: Idff337523a66195277b364be474baffcebca26aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138369
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 66faff4d3c9756e4a83933a07e2f9329ede9e043)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138792
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc
index 9a9943df1f3c..a60da15e0004 100644
--- a/chart2/inc/strings.hrc
+++ b/chart2/inc/strings.hrc
@@ -48,7 +48,6 @@
#define STR_PAGE_APPEARANCE NC_("STR_PAGE_APPEARANCE",
"Appearance")
#define STR_PAGE_ILLUMINATION
NC_("STR_PAGE_ILLUMINATION", "Illumination")
#define STR_PAGE_ASIAN NC_("STR_PAGE_ASIAN",
"Asian Typography")
-#define STR_PAGE_DATA_TABLE NC_("STR_PAGE_DATA_TABLE",
"Data Table")
#define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS
NC_("STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS", "Mean value line with value
%AVERAGE_VALUE and standard deviation %STD_DEVIATION")
#define STR_OBJECT_AXIS NC_("STR_OBJECT_AXIS",
"Axis")
#define STR_OBJECT_AXIS_X NC_("STR_OBJECT_AXIS_X",
"X Axis")
@@ -98,7 +97,6 @@
#define STR_OBJECT_DIAGRAM_WALL
NC_("STR_OBJECT_DIAGRAM_WALL", "Chart Wall")
#define STR_OBJECT_DIAGRAM_FLOOR
NC_("STR_OBJECT_DIAGRAM_FLOOR", "Chart Floor")
#define STR_OBJECT_SHAPE NC_("STR_OBJECT_SHAPE",
"Drawing Object")
-#define STR_OBJECT_DATA_TABLE
NC_("STR_OBJECT_DATA_TABLE", "Data Table")
#define STR_TIP_DATASERIES NC_("STR_TIP_DATASERIES",
"Data Series '%SERIESNAME'")
#define STR_TIP_DATAPOINT_INDEX
NC_("STR_TIP_DATAPOINT_INDEX", "Data Point %POINTNUMBER")
#define STR_TIP_DATAPOINT_VALUES
NC_("STR_TIP_DATAPOINT_VALUES", "Values: %POINTVALUES")
@@ -147,6 +145,7 @@
#define STR_TEXT_DIRECTION_SUPER
NC_("STR_TEXT_DIRECTION_SUPER", "Use superordinate object settings")
#define STR_PROPERTY_ROLE_FILLCOLOR
NC_("STR_PROPERTY_ROLE_FILLCOLOR", "Fill Color")
#define STR_PROPERTY_ROLE_BORDERCOLOR
NC_("STR_PROPERTY_ROLE_BORDERCOLOR", "Border Color")
+#define STR_DATA_TABLE NC_("STR_DATA_TABLE",
"Data Table")
#define STR_CONTROLTEXT_ERROR_BARS_FROM_DATA
NC_("STR_CONTROLTEXT_ERROR_BARS_FROM_DATA", "From Data Table")
#define STR_REGRESSION_LINEAR
NC_("STR_REGRESSION_LINEAR", "Linear")
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 20bdfa518a15..70e4a69d2e50 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -311,7 +311,7 @@ OUString ObjectNameProvider::getName( ObjectType
eObjectType, bool bPlural )
aRet=SchResId(STR_OBJECT_CURVE_EQUATION);
break;
case OBJECTTYPE_DATA_TABLE:
- aRet=SchResId(STR_OBJECT_DATA_TABLE);
+ aRet=SchResId(STR_DATA_TABLE);
break;
default: //OBJECTTYPE_UNKNOWN
;
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index ce31b540b437..e86f7ac90596 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -455,7 +455,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
// nothing
break;
case OBJECTTYPE_DATA_TABLE:
- AddTabPage("datatable", SchResId(STR_PAGE_DATA_TABLE),
DataTableTabPage::Create);
+ AddTabPage("datatable", SchResId(STR_DATA_TABLE),
DataTableTabPage::Create);
AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE);
AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA);
AddTabPage("fontname", SchResId(STR_PAGE_FONT),
RID_SVXPAGE_CHAR_NAME);
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx
b/chart2/source/controller/main/ChartController_Insert.cxx
index 02c0e681579a..7612e5394010 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -162,7 +162,7 @@ void ChartController::executeDispatch_InsertGrid()
void ChartController::executeDispatch_OpenInsertDataTableDialog()
{
SolarMutexGuard aGuard;
- auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Insert,
SchResId(STR_OBJECT_DATA_TABLE));
+ auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Insert,
SchResId(STR_DATA_TABLE));
UndoGuard aUndoGuard(aUndoDescription, m_xUndoManager);
uno::Reference<chart2::XDiagram> xDiagram =
ChartModelHelper::findDiagram(getModel());
@@ -238,7 +238,7 @@ void
ChartController::executeDispatch_OpenInsertDataTableDialog()
void ChartController::executeDispatch_InsertDataTable()
{
SolarMutexGuard aGuard;
- auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Insert,
SchResId(STR_OBJECT_DATA_TABLE));
+ auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Insert,
SchResId(STR_DATA_TABLE));
UndoGuard aUndoGuard(aUndoDescription, m_xUndoManager);
uno::Reference<chart2::XDiagram> xDiagram =
ChartModelHelper::findDiagram(getModel());
@@ -257,7 +257,7 @@ void ChartController::executeDispatch_InsertDataTable()
void ChartController::executeDispatch_DeleteDataTable()
{
SolarMutexGuard aGuard;
- auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Delete,
SchResId(STR_OBJECT_DATA_TABLE));
+ auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Delete,
SchResId(STR_DATA_TABLE));
UndoGuard aUndoGuard(aUndoDescription, m_xUndoManager);
uno::Reference<chart2::XDiagram> xDiagram =
ChartModelHelper::findDiagram(getModel());
auto xDataTable = xDiagram->getDataTable();
