diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-11 20:56:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:50 +0100 |
| commit | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch) | |
| tree | fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /chart2/source | |
| parent | osl: Unix pipe converted from OSL_ASSERT to assert/SAL_WARNs (diff) | |
| download | core-00657aef09d854c74fb426a935a3e8b1fc390bb0.tar.gz core-00657aef09d854c74fb426a935a3e8b1fc390bb0.zip | |
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
results in inserting the english original so something can be found, now the
standard fallback of using the english original from the source key is used, so
partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
com::sun::star::resource::OfficeResourceLoader
com::sun::star::resource::XResourceBundleLoader
com::sun::star::resource::XResourceBundle
when translating strings via uno apis
com.sun.star.resource.StringResourceWithLocation
can continue to be used
Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'chart2/source')
54 files changed, 95 insertions, 1206 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 064384a87fe3..7e5657799227 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -24,7 +24,7 @@ #include "ObjectHierarchy.hxx" #include "ObjectIdentifier.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "AccessibleViewForwarder.hxx" #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 6bf6c25ef928..9fa2399a1695 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -20,7 +20,7 @@ #include "ChartTypeDialogController.hxx" #include "ResId.hxx" #include "HelpIds.hrc" -#include "Strings.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "macros.hxx" #include "ChartModelHelper.hxx" @@ -33,7 +33,7 @@ #include <com/sun/star/chart2/PieChartOffsetMode.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <svtools/valueset.hxx> #include <vcl/bitmap.hxx> #include <vcl/builder.hxx> diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 3c659927f8e0..c371944f2a3f 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -22,7 +22,7 @@ #include "DataBrowser.hxx" #include "DataBrowserModel.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "DataSeriesHelper.hxx" #include "DiagramHelper.hxx" #include "ChartModelHelper.hxx" diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index ffceca3ccc00..f361a432ee64 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -24,7 +24,7 @@ #include "DataSourceHelper.hxx" #include "DiagramHelper.hxx" #include "macros.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "ContainerHelper.hxx" #include "CommonFunctors.hxx" diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx index db613c24105f..a1f568ae083d 100644 --- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx +++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx @@ -8,10 +8,9 @@ */ #include "GL3DBarChartDialogController.hxx" -#include <Strings.hrc> +#include <strings.hrc> #include <bitmaps.hlst> #include <ResId.hxx> - #include <svtools/valueset.hxx> namespace chart { diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 6ea99ad1f155..d61da98eab4b 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -19,7 +19,7 @@ #include "ObjectNameProvider.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "macros.hxx" #include "AxisHelper.hxx" #include "ChartModelHelper.hxx" diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src deleted file mode 100644 index 4c9b40da141f..000000000000 --- a/chart2/source/controller/dialogs/Strings.src +++ /dev/null @@ -1,586 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "Strings.hrc" - -String STR_DLG_CHART_WIZARD -{ - Text [ en-US ] = "Chart Wizard" ; -}; - -String STR_DLG_SMOOTH_LINE_PROPERTIES -{ - Text [ en-US ] = "Smooth Lines" ; -}; - -String STR_DLG_STEPPED_LINE_PROPERTIES -{ - Text [ en-US ] = "Stepped Lines" ; -}; - -String STR_PAGE_CHARTTYPE -{ - Text [ en-US ] = "Chart Type" ; -}; - -String STR_PAGE_DATA_RANGE -{ - Text [ en-US ] = "Data Range"; -}; - -String STR_PAGE_CHART_ELEMENTS -{ - Text [ en-US ] = "Chart Elements"; -}; - -String STR_PAGE_LINE -{ - Text [ en-US ] = "Line" ; -}; - -String STR_PAGE_BORDER -{ - Text [ en-US ] = "Borders" ; -}; - -String STR_PAGE_AREA -{ - Text [ en-US ] = "Area" ; -}; - -String STR_PAGE_TRANSPARENCY -{ - Text [ en-US ] = "Transparency"; -}; - -String STR_PAGE_FONT -{ - Text [ en-US ] = "Font" ; -}; - -String STR_PAGE_FONT_EFFECTS -{ - Text [ en-US ] = "Font Effects" ; -}; - -String STR_PAGE_NUMBERS -{ - Text [ en-US ] = "Numbers" ; -}; - -String STR_PAGE_POSITION -{ - Text [ en-US ] = "Position" ; -}; - -String STR_PAGE_LAYOUT -{ - Text [ en-US ] = "Layout"; -}; - -String STR_PAGE_OPTIONS -{ - Text [ en-US ] = "Options"; -}; - -String STR_PAGE_SCALE -{ - Text [ en-US ] = "Scale" ; -}; - -String STR_PAGE_POSITIONING -{ - Text [ en-US ] = "Positioning" ; -}; - -String STR_PAGE_TRENDLINE_TYPE -{ - Text[ en-US ] = "Type"; -}; - -String STR_PAGE_XERROR_BARS -{ - Text[ en-US ] = "X Error Bars"; -}; - -String STR_PAGE_YERROR_BARS -{ - Text[ en-US ] = "Y Error Bars"; -}; - -String STR_PAGE_ALIGNMENT -{ - Text [ en-US ] = "Alignment" ; -}; - -String STR_PAGE_PERSPECTIVE -{ - Text [ en-US ] = "Perspective" ; -}; -String STR_PAGE_APPEARANCE -{ - Text [ en-US ] = "Appearance" ; -}; -String STR_PAGE_ILLUMINATION -{ - Text [ en-US ] = "Illumination" ; -}; - -String STR_PAGE_ASIAN -{ - Text [ en-US ] = "Asian Typography" ; -}; - -String STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS -{ - Text [ en-US ] = "Mean value line with value %AVERAGE_VALUE and standard deviation %STD_DEVIATION"; -}; - -String STR_OBJECT_AXIS -{ - Text [ en-US ] = "Axis" ; -}; -String STR_OBJECT_AXIS_X -{ - Text [ en-US ] = "X Axis" ; -}; -String STR_OBJECT_AXIS_Y -{ - Text [ en-US ] = "Y Axis" ; -}; -String STR_OBJECT_AXIS_Z -{ - Text [ en-US ] = "Z Axis" ; -}; -String STR_OBJECT_SECONDARY_X_AXIS -{ - Text [ en-US ] = "Secondary X Axis" ; -}; -String STR_OBJECT_SECONDARY_Y_AXIS -{ - Text [ en-US ] = "Secondary Y Axis" ; -}; - -String STR_OBJECT_AXES -{ - Text [ en-US ] = "Axes" ; -}; -String STR_OBJECT_GRIDS -{ - Text [ en-US ] = "Grids" ; -}; -String STR_OBJECT_GRID -{ - Text [ en-US ] = "Grid" ; -}; -String STR_OBJECT_GRID_MAJOR_X -{ - Text [ en-US ] = "X Axis Major Grid" ; -}; -String STR_OBJECT_GRID_MAJOR_Y -{ - Text [ en-US ] = "Y Axis Major Grid" ; -}; -String STR_OBJECT_GRID_MAJOR_Z -{ - Text [ en-US ] = "Z Axis Major Grid" ; -}; -String STR_OBJECT_GRID_MINOR_X -{ - Text [ en-US ] = "X Axis Minor Grid" ; -}; -String STR_OBJECT_GRID_MINOR_Y -{ - Text [ en-US ] = "Y Axis Minor Grid" ; -}; -String STR_OBJECT_GRID_MINOR_Z -{ - Text [ en-US ] = "Z Axis Minor Grid" ; -}; - -String STR_OBJECT_LEGEND -{ - Text [ en-US ] = "Legend" ; -}; - -String STR_OBJECT_TITLE -{ - Text [ en-US ] = "Title" ; -}; -String STR_OBJECT_TITLES -{ - Text [ en-US ] = "Titles" ; -}; -String STR_OBJECT_TITLE_MAIN -{ - Text [ en-US ] = "Main Title" ; -}; -String STR_OBJECT_TITLE_SUB -{ - Text [ en-US ] = "Subtitle" ; -}; -String STR_OBJECT_TITLE_X_AXIS -{ - Text [ en-US ] = "X Axis Title" ; -}; -String STR_OBJECT_TITLE_Y_AXIS -{ - Text [ en-US ] = "Y Axis Title" ; -}; -String STR_OBJECT_TITLE_Z_AXIS -{ - Text [ en-US ] = "Z Axis Title" ; -}; -String STR_OBJECT_TITLE_SECONDARY_X_AXIS -{ - Text [ en-US ] = "Secondary X Axis Title" ; -}; -String STR_OBJECT_TITLE_SECONDARY_Y_AXIS -{ - Text [ en-US ] = "Secondary Y Axis Title" ; -}; -String STR_OBJECT_LABEL -{ - Text [ en-US ] = "Label" ; -}; - -String STR_OBJECT_DATALABELS -{ - Text [ en-US ] = "Data Labels" ; -}; -String STR_OBJECT_DATAPOINT -{ - Text [ en-US ] = "Data Point" ; -}; -String STR_OBJECT_DATAPOINTS -{ - Text [ en-US ] = "Data Points" ; -}; -String STR_OBJECT_LEGEND_SYMBOL -{ - Text [ en-US ] = "Legend Key" ; -}; -String STR_OBJECT_DATASERIES -{ - Text [ en-US ] = "Data Series" ; -}; -String STR_OBJECT_DATASERIES_PLURAL -{ - Text [ en-US ] = "Data Series" ; -}; -String STR_OBJECT_CURVE -{ - Text [ en-US ] = "Trend Line"; -}; -String STR_OBJECT_CURVES -{ - Text [ en-US ] = "Trend Lines"; -}; -String STR_OBJECT_CURVE_WITH_PARAMETERS -{ - Text [ en-US ] = "Trend line %FORMULA with accuracy R² = %RSQUARED"; -}; -String STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS -{ - Text [ en-US ] = "Moving average trend line with period = %PERIOD"; -}; -String STR_OBJECT_AVERAGE_LINE -{ - Text [ en-US ] = "Mean Value Line"; -}; -String STR_OBJECT_CURVE_EQUATION -{ - Text[ en-US ] = "Equation"; -}; - -String STR_OBJECT_ERROR_BARS_X -{ - Text [ en-US ] = "X Error Bars"; -}; - -String STR_OBJECT_ERROR_BARS_Y -{ - Text [ en-US ] = "Y Error Bars"; -}; - -String STR_OBJECT_ERROR_BARS_Z -{ - Text [ en-US ] = "Z Error Bars"; -}; -String STR_OBJECT_STOCK_LOSS -{ - Text [ en-US ] = "Stock Loss"; -}; - -String STR_OBJECT_STOCK_GAIN -{ - Text [ en-US ] = "Stock Gain"; -}; - -String STR_OBJECT_PAGE -{ - Text [ en-US ] = "Chart Area" ; -}; -String STR_OBJECT_DIAGRAM -{ - Text [ en-US ] = "Chart" ; -}; -String STR_OBJECT_DIAGRAM_WALL -{ - Text [ en-US ] = "Chart Wall" ; -}; -String STR_OBJECT_DIAGRAM_FLOOR -{ - Text [ en-US ] = "Chart Floor" ; -}; - -String STR_OBJECT_SHAPE -{ - Text [ en-US ] = "Drawing Object" ; -}; - -String STR_TIP_DATASERIES -{ - Text [ en-US ] = "Data Series '%SERIESNAME'" ; -}; - -String STR_TIP_DATAPOINT_INDEX -{ - Text [ en-US ] = "Data Point %POINTNUMBER"; -}; - -String STR_TIP_DATAPOINT_VALUES -{ - Text [ en-US ] = "Values: %POINTVALUES"; -}; - -String STR_TIP_DATAPOINT -{ - Text [ en-US ] = "Data Point %POINTNUMBER, data series %SERIESNUMBER, values: %POINTVALUES"; -}; - -String STR_STATUS_DATAPOINT_MARKED -{ - Text [ en-US ] = "Data point %POINTNUMBER in data series %SERIESNUMBER selected, values: %POINTVALUES"; -}; - -String STR_STATUS_OBJECT_MARKED -{ - Text [ en-US ] = "%OBJECTNAME selected" ; -}; - -String STR_STATUS_PIE_SEGMENT_EXPLODED -{ - Text [ en-US ] = "Pie exploded by %PERCENTVALUE percent"; -}; - -String STR_OBJECT_FOR_SERIES -{ - Text [ en-US ] = "%OBJECTNAME for Data Series '%SERIESNAME'" ; -}; - -String STR_OBJECT_FOR_ALL_SERIES -{ - Text [ en-US ] = "%OBJECTNAME for all Data Series" ; -}; - -String STR_ACTION_EDIT_CHARTTYPE -{ - Text [ en-US ] = "Edit chart type" ; -}; -String STR_ACTION_EDIT_DATA_RANGES -{ - Text [ en-US ] = "Edit data ranges" ; -}; -String STR_ACTION_EDIT_3D_VIEW -{ - Text [ en-US ] = "Edit 3D view" ; -}; -String STR_ACTION_EDIT_CHART_DATA -{ - Text [ en-US ] = "Edit chart data"; -}; -String STR_ACTION_TOGGLE_LEGEND -{ - Text [ en-US ] = "Legend on/off" ; -}; -String STR_ACTION_TOGGLE_GRID_HORZ -{ - Text [ en-US ] = "Horizontal grid major/major&minor/off" ; -}; -String STR_ACTION_TOGGLE_GRID_VERTICAL -{ - Text [ en-US ] = "Vertical grid major/major&minor/off" ; -}; -String STR_ACTION_SCALE_TEXT -{ - Text [ en-US ] = "Scale Text" ; -}; -String STR_ACTION_REARRANGE_CHART -{ - Text [ en-US ] = "Automatic Layout" ; -}; -String STR_ACTION_NOTPOSSIBLE -{ - Text [ en-US ] = "This function cannot be completed with the selected objects." ; -}; -String STR_ACTION_EDIT_TEXT -{ - Text [ en-US ] = "Edit text"; -}; - -String STR_COLUMN_LABEL -{ - Text [ en-US ] = "Column %COLUMNNUMBER" ; -}; -String STR_ROW_LABEL -{ - Text [ en-US ] = "Row %ROWNUMBER" ; -}; - -//for range dialog -String STR_DATA_ROLE_LABEL -{ - Text [ en-US ] = "Name" ; -}; - -String STR_DATA_ROLE_X -{ - Text [ en-US ] = "X-Values" ; -}; - -String STR_DATA_ROLE_Y -{ - Text [ en-US ] = "Y-Values" ; -}; - -String STR_DATA_ROLE_SIZE -{ - Text [ en-US ] = "Bubble Sizes" ; -}; - -String STR_DATA_ROLE_X_ERROR -{ - Text [ en-US ] = "X-Error-Bars" ; -}; -String STR_DATA_ROLE_X_ERROR_POSITIVE -{ - Text [ en-US ] = "Positive X-Error-Bars" ; -}; -String STR_DATA_ROLE_X_ERROR_NEGATIVE -{ - Text [ en-US ] = "Negative X-Error-Bars" ; -}; - -String STR_DATA_ROLE_Y_ERROR -{ - Text [ en-US ] = "Y-Error-Bars" ; -}; -String STR_DATA_ROLE_Y_ERROR_POSITIVE -{ - Text [ en-US ] = "Positive Y-Error-Bars" ; -}; -String STR_DATA_ROLE_Y_ERROR_NEGATIVE -{ - Text [ en-US ] = "Negative Y-Error-Bars" ; -}; - -String STR_DATA_ROLE_FIRST -{ - Text [ en-US ] = "Open Values" ; -}; - -String STR_DATA_ROLE_LAST -{ - Text [ en-US ] = "Close Values" ; -}; - -String STR_DATA_ROLE_MIN -{ - Text [ en-US ] = "Low Values" ; -}; - -String STR_DATA_ROLE_MAX -{ - Text [ en-US ] = "High Values" ; -}; - -String STR_DATA_ROLE_CATEGORIES -{ - Text [ en-US ] = "Categories"; -}; - -String STR_DATA_UNNAMED_SERIES -{ - Text [ en-US ] = "Unnamed Series"; -}; - -String STR_DATA_UNNAMED_SERIES_WITH_INDEX -{ - Text [ en-US ] = "Unnamed Series %NUMBER" ; -}; - -String STR_DATA_SELECT_RANGE_FOR_SERIES -{ - Text [ en-US ] = "Select Range for %VALUETYPE of %SERIESNAME" ; -}; - -String STR_DATA_SELECT_RANGE_FOR_CATEGORIES -{ - Text [ en-US ] = "Select Range for Categories" ; -}; - -String STR_DATA_SELECT_RANGE_FOR_DATALABELS -{ - Text [ en-US ] = "Select Range for data labels" ; -}; - -String STR_DATA_EDITOR_INCORRECT_INPUT -{ - Text [ en-US ] = "Your last input is incorrect.\nIgnore this change and close the dialog?" ; -}; - -// frame direction ------------------------------------------------------------ - -String STR_TEXT_DIRECTION_LTR -{ - Text [ en-US ] = "Left-to-right"; -}; - -String STR_TEXT_DIRECTION_RTL -{ - Text [ en-US ] = "Right-to-left"; -}; - -String STR_TEXT_DIRECTION_SUPER -{ - Text [ en-US ] = "Use superordinate object settings"; -}; - -String STR_PROPERTY_ROLE_FILLCOLOR -{ - Text [ en-US ] = "Fill Color"; -}; - -String STR_PROPERTY_ROLE_BORDERCOLOR -{ - Text [ en-US ] = "Border Color"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_ChartTypes.src b/chart2/source/controller/dialogs/Strings_ChartTypes.src deleted file mode 100644 index 88717805f0d8..000000000000 --- a/chart2/source/controller/dialogs/Strings_ChartTypes.src +++ /dev/null @@ -1,155 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "Strings.hrc" - -String STR_TYPE_COLUMN -{ - Text [ en-US ] = "Column" ; -}; -String STR_TYPE_BAR -{ - Text [ en-US ] = "Bar" ; -}; -String STR_TYPE_AREA -{ - Text [ en-US ] = "Area" ; -}; -String STR_TYPE_PIE -{ - Text [ en-US ] = "Pie" ; -}; -String STR_PIE_EXPLODED -{ - Text [ en-US ] = "Exploded Pie Chart" ; -}; -String STR_DONUT_EXPLODED -{ - Text [ en-US ] = "Exploded Donut Chart" ; -}; -String STR_DONUT -{ - Text [ en-US ] = "Donut" ; -}; -String STR_TYPE_LINE -{ - Text [ en-US ] = "Line" ; -}; -String STR_TYPE_XY -{ - Text [ en-US ] = "XY (Scatter)" ; -}; -String STR_POINTS_AND_LINES -{ - Text [ en-US ] = "Points and Lines" ; -}; -String STR_POINTS_ONLY -{ - //@todo or symbols instead of points?? - Text [ en-US ] = "Points Only" ; -}; -String STR_LINES_ONLY -{ - Text [ en-US ] = "Lines Only" ; -}; -String STR_LINES_3D -{ - Text [ en-US ] = "3D Lines" ; -}; - -String STR_TYPE_COMBI_COLUMN_LINE -{ - Text [ en-US ] = "Column and Line" ; -}; -String STR_LINE_COLUMN -{ - Text [ en-US ] = "Columns and Lines" ; -}; -String STR_LINE_STACKEDCOLUMN -{ - Text [ en-US ] = "Stacked Columns and Lines" ; -}; - -String STR_TYPE_NET -{ - Text [ en-US ] = "Net" ; -}; - -String STR_TYPE_STOCK -{ - Text [ en-US ] = "Stock"; -}; -String STR_STOCK_1 -{ - Text [ en-US ] = "Stock Chart 1"; -}; -String STR_STOCK_2 -{ - Text [ en-US ] = "Stock Chart 2"; -}; -String STR_STOCK_3 -{ - Text [ en-US ] = "Stock Chart 3"; -}; -String STR_STOCK_4 -{ - Text [ en-US ] = "Stock Chart 4"; -}; - -String STR_NORMAL -{ - Text [ en-US ] = "Normal" ; -}; -String STR_STACKED -{ - Text [ en-US ] = "Stacked" ; -}; -String STR_PERCENT -{ - Text [ en-US ] = "Percent Stacked" ; -}; - -String STR_DEEP -{ - Text [ en-US ] = "Deep" ; -}; -String STR_FILLED -{ - Text [ en-US ] = "Filled" ; -}; - -String STR_TYPE_BUBBLE -{ - Text [ en-US ] = "Bubble" ; -}; -String STR_BUBBLE_1 -{ - Text [ en-US ] = "Bubble Chart" ; -}; - -String STR_TYPE_GL3D_BAR -{ - Text [ en-US ] = "GL3D Bar"; -}; - -String STR_GL3D_BAR -{ - Text [ en-US ] = "GL3D Bar Chart"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_Scale.src b/chart2/source/controller/dialogs/Strings_Scale.src deleted file mode 100644 index 80b1f4a8b669..000000000000 --- a/chart2/source/controller/dialogs/Strings_Scale.src +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "Strings.hrc" - -String STR_INVALID_NUMBER -{ - Text [ en-US ] = "Numbers are required. Check your input." ; -}; -String STR_STEP_GT_ZERO -{ - Text [ en-US ] = "The major interval requires a positive number. Check your input." ; -}; -String STR_BAD_LOGARITHM -{ - Text [ en-US ] = "The logarithmic scale requires positive numbers. Check your input." ; -}; -String STR_MIN_GREATER_MAX -{ - Text [ en-US ] = "The minimum must be lower than the maximum. Check your input." ; -}; -String STR_INVALID_INTERVALS -{ - Text [ en-US ] = "The major interval needs to be greater than the minor interval. Check your input." ; -}; -String STR_INVALID_TIME_UNIT -{ - Text [ en-US ] = "The major and minor interval need to be greater or equal to the resolution. Check your input." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src b/chart2/source/controller/dialogs/Strings_Statistic.src deleted file mode 100644 index e375cb179d81..000000000000 --- a/chart2/source/controller/dialogs/Strings_Statistic.src +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "Strings.hrc" - -// used for own data in error bar dialog -//TODO: ohallot: String inserted into tp_ErrorBars.ui -String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA -{ - Text [ en-US ] = "From Data Table" ; -}; - -String STR_REGRESSION_LINEAR -{ - Text [ en-US ] = "Linear" ; -}; -String STR_REGRESSION_LOG -{ - Text [ en-US ] = "Logarithmic" ; -}; -String STR_REGRESSION_EXP -{ - Text [ en-US ] = "Exponential" ; -}; -String STR_REGRESSION_POWER -{ - Text [ en-US ] = "Power" ; -}; -String STR_REGRESSION_POLYNOMIAL -{ - Text [ en-US ] = "Polynomial" ; -}; -String STR_REGRESSION_MOVING_AVERAGE -{ - Text [ en-US ] = "Moving average" ; -}; - -String STR_REGRESSION_MEAN -{ - Text [ en-US ] = "Mean" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index de52f69443c0..9a6e28bba418 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -19,7 +19,7 @@ #include "TextDirectionListBox.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include <svl/languageoptions.hxx> #include <vcl/window.hxx> #include <vcl/builderfactory.hxx> diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 96c10ebc9710..95875642303a 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -20,7 +20,7 @@ #include "dlg_ChartType.hxx" #include "ResId.hxx" #include "ResourceIds.hrc" -#include "Strings.hrc" +#include "strings.hrc" #include "tp_ChartType.hxx" #include "macros.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 151d2c8321d2..d2198e8653e9 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -20,7 +20,7 @@ #include "dlg_CreationWizard.hxx" #include "ResId.hxx" #include "macros.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "HelpIds.hrc" #include "tp_ChartType.hxx" @@ -169,25 +169,27 @@ void CreationWizard::setValidPage( TabPage * /* pTabPage */ ) OUString CreationWizard::getStateDisplayName( WizardState nState ) const { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch( nState ) { case STATE_CHARTTYPE: - nResId = STR_PAGE_CHARTTYPE; + pResId = STR_PAGE_CHARTTYPE; break; case STATE_SIMPLE_RANGE: - nResId = STR_PAGE_DATA_RANGE; + pResId = STR_PAGE_DATA_RANGE; break; case STATE_DATA_SERIES: - nResId = STR_OBJECT_DATASERIES_PLURAL; + pResId = STR_OBJECT_DATASERIES_PLURAL; break; case STATE_OBJECTS: - nResId = STR_PAGE_CHART_ELEMENTS; + pResId = STR_PAGE_CHART_ELEMENTS; break; default: break; } - return SchResId(nResId); + if (!pResId) + return OUString(); + return SchResId(pResId); } } //namespace chart diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 8b7f777f6411..441b62e774ef 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -18,7 +18,7 @@ */ #include "dlg_DataEditor.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "DataBrowser.hxx" #include "ResId.hxx" diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 8c1566310a9a..28c5383915ec 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -18,7 +18,7 @@ */ #include "dlg_DataSource.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "ChartTypeTemplateProvider.hxx" #include "DiagramHelper.hxx" diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index e1fbd2aac208..ff2ca208628a 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -20,7 +20,7 @@ #include <svl/zforlist.hxx> #include "dlg_ObjectProperties.hxx" #include "ResourceIds.hrc" -#include "Strings.hrc" +#include "strings.hrc" #include "tp_AxisLabel.hxx" #include "tp_DataLabel.hxx" #include "tp_LegendPosition.hxx" diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 196a6fb17f94..a1988be2c8da 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -18,7 +18,7 @@ */ #include "dlg_View3D.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResourceIds.hrc" #include "ResId.hxx" #include "tp_3D_SceneGeometry.hxx" diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 433d3ce1ce21..ea48698aadb1 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -32,7 +32,7 @@ #include <vcl/msgbox.hxx> #include <svx/svxids.hrc> #include <svl/zforlist.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> namespace chart { diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 0589039c5eb3..2d9f912f007c 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -23,7 +23,7 @@ #include "LegendHelper.hxx" #include "ChartModel.hxx" -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart/ChartLegendExpansion.hpp> diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 4998e849fdc6..dae07506e76e 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -20,7 +20,7 @@ #include "res_Titles.hxx" #include "ResId.hxx" #include "TitleDialogData.hxx" -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> namespace chart { diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index e09db092fece..d25e5518794d 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -19,7 +19,7 @@ #include "res_Trendline.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "chartview/ChartSfxItemIds.hxx" diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index c091fa701007..f691d7cc5f68 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -24,6 +24,7 @@ #include <svx/colorbox.hxx> #include "svx/dialogs.hrc" +#include "svx/strings.hrc" #include <svx/dialmgr.hxx> #include <rtl/math.hxx> #include <svtools/colrdlg.hxx> diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 76d86aeb7eec..2ec01fff1e0c 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -21,7 +21,7 @@ #include "ResId.hxx" #include "ResourceIds.hrc" -#include "Strings.hrc" +#include "strings.hrc" #include "chartview/ChartSfxItemIds.hxx" #include "AxisHelper.hxx" @@ -32,7 +32,7 @@ #include <svl/intitem.hxx> #include <vcl/msgbox.hxx> #include <svl/zformat.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart2/AxisType.hpp> diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index d2f979596417..7228effb0e49 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -18,7 +18,7 @@ */ #include "tp_ChartType.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "ChartModelHelper.hxx" #include "DiagramHelper.hxx" @@ -28,7 +28,7 @@ #include "GL3DBarChartDialogController.hxx" #include <unonames.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <svtools/miscopt.hxx> #include <vcl/layout.hxx> diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 102832e8300d..0d0e1cdef9d7 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -18,7 +18,7 @@ */ #include "tp_DataSource.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "chartview/ChartSfxItemIds.hxx" #include "macros.hxx" diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 69de86ab9798..0b86d2a021f2 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -23,7 +23,7 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> namespace chart { diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index b06a5fe3bdea..6879b87c34fb 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -18,7 +18,7 @@ */ #include "tp_RangeChooser.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "macros.hxx" #include "DataSourceHelper.hxx" diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index d16c5f3de50c..caaf1d7eb19b 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -20,7 +20,7 @@ #include "tp_Scale.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "chartview/ChartSfxItemIds.hxx" #include "AxisHelper.hxx" @@ -31,7 +31,7 @@ #include <svl/intitem.hxx> #include <vcl/msgbox.hxx> #include <svl/zformat.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <com/sun/star/chart2/AxisType.hpp> @@ -430,7 +430,7 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) nStepFmt = 0; Control* pControl = nullptr; - sal_uInt16 nErrStrId = 0; + const char* pErrStrId = nullptr; double fDummy; fMax = m_pFmtFldMax->GetValue(); @@ -452,7 +452,7 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) || ( !m_pCbxAutoMax->IsChecked() && fMax <= 0.0 ) ) ) { pControl = m_pFmtFldMin; - nErrStrId = STR_BAD_LOGARITHM; + pErrStrId = STR_BAD_LOGARITHM; } // check for entries that cannot be parsed for the current number format else if ( m_pFmtFldMin->IsModified() @@ -460,38 +460,38 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) && !pNumFormatter->IsNumberFormat( m_pFmtFldMin->GetText(), nMinMaxOriginFmt, fDummy)) { pControl = m_pFmtFldMin; - nErrStrId = STR_INVALID_NUMBER; + pErrStrId = STR_INVALID_NUMBER; } else if ( m_pFmtFldMax->IsModified() && !m_pCbxAutoMax->IsChecked() && !pNumFormatter->IsNumberFormat( m_pFmtFldMax->GetText(), nMinMaxOriginFmt, fDummy)) { pControl = m_pFmtFldMax; - nErrStrId = STR_INVALID_NUMBER; + pErrStrId = STR_INVALID_NUMBER; } else if ( !bDateAxis && m_pFmtFldStepMain->IsModified() && !m_pCbxAutoStepMain->IsChecked() && !pNumFormatter->IsNumberFormat( m_pFmtFldStepMain->GetText(), nStepFmt, fDummy)) { pControl = m_pFmtFldStepMain; - nErrStrId = STR_INVALID_NUMBER; + pErrStrId = STR_INVALID_NUMBER; } else if (m_pFmtFldOrigin->IsModified() && !m_pCbxAutoOrigin->IsChecked() && !pNumFormatter->IsNumberFormat( m_pFmtFldOrigin->GetText(), nMinMaxOriginFmt, fDummy)) { pControl = m_pFmtFldOrigin; - nErrStrId = STR_INVALID_NUMBER; + pErrStrId = STR_INVALID_NUMBER; } else if (!m_pCbxAutoStepMain->IsChecked() && fStepMain <= 0.0) { pControl = m_pFmtFldStepMain; - nErrStrId = STR_STEP_GT_ZERO; + pErrStrId = STR_STEP_GT_ZERO; } else if (!m_pCbxAutoMax->IsChecked() && !m_pCbxAutoMin->IsChecked() && fMin >= fMax) { pControl = m_pFmtFldMin; - nErrStrId = STR_MIN_GREATER_MAX; + pErrStrId = STR_MIN_GREATER_MAX; } else if( bDateAxis ) { @@ -500,15 +500,15 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) if( m_nHelpTimeUnit > m_nMainTimeUnit ) { pControl = m_pLB_MainTimeUnit; - nErrStrId = STR_INVALID_INTERVALS; + pErrStrId = STR_INVALID_INTERVALS; } else if( m_nHelpTimeUnit == m_nMainTimeUnit && nStepHelp > fStepMain ) { pControl = m_pLB_MainTimeUnit; - nErrStrId = STR_INVALID_INTERVALS; + pErrStrId = STR_INVALID_INTERVALS; } } - if( !nErrStrId && !m_pCbx_AutoTimeResolution->IsChecked() ) + if( !pErrStrId && !m_pCbx_AutoTimeResolution->IsChecked() ) { if( (!m_pCbxAutoStepMain->IsChecked() && m_nTimeResolution > m_nMainTimeUnit ) || @@ -516,12 +516,12 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) ) { pControl = m_pLB_TimeResolution; - nErrStrId = STR_INVALID_TIME_UNIT; + pErrStrId = STR_INVALID_TIME_UNIT; } } } - if( ShowWarning( nErrStrId, pControl ) ) + if( ShowWarning( pErrStrId, pControl ) ) return DeactivateRC::KeepPage; if( pItemSet ) @@ -609,12 +609,12 @@ void ScaleTabPage::ShowAxisOrigin( bool bShowOrigin ) m_bShowAxisOrigin = true; } -bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* = NULL */ ) +bool ScaleTabPage::ShowWarning(const char* pResIdMessage, Control* pControl /* = NULL */ ) { - if( nResIdMessage == 0 ) + if (pResIdMessage == nullptr) return false; - ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ), SchResId(nResIdMessage))->Execute(); + ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ), SchResId(pResIdMessage))->Execute(); if( pControl ) { pControl->GrabFocus(); diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 33a58582a508..75c869d23141 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -103,9 +103,9 @@ private: /** shows a warning window due to an invalid input. - @param nResIdMessage + @param pResIdMessage The resource identifier that represents the localized warning text. - If this is 0, no warning is shown and false is returned. + If this is nullptr, no warning is shown and false is returned. @param pControl If non-NULL, contains a pointer to the control in which the @@ -114,7 +114,7 @@ private: @return false, if nResIdMessage was 0, true otherwise */ - bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl ); + bool ShowWarning(const char* pResIdMessage, Control* pControl); void HideAllControls(); }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index bc7122cdb9d0..d022f12d6306 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -25,7 +25,7 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svl/ilstitem.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <com/sun/star/chart/MissingValueTreatment.hpp> diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index be85cacf6647..beeedc457cd0 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -18,7 +18,7 @@ */ #include "tp_Wizard_TitlesAndObjects.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "res_Titles.hxx" #include "res_LegendPosition.hxx" #include "ResId.hxx" diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 307a2a6d27ed..2e822ceea120 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -28,7 +28,7 @@ #include "dlg_DataSource.hxx" #include "ChartModelHelper.hxx" #include "ControllerCommandDispatch.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "chartview/ExplicitValueProvider.hxx" #include "ChartViewHelper.hxx" diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index ffab4b3a90d1..949700b82138 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -26,7 +26,7 @@ #include "ControllerLockGuard.hxx" #include "UndoGuard.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 27ff61e1772b..eceb5af49d6d 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -40,7 +40,7 @@ #include "ControllerLockGuard.hxx" #include "UndoGuard.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ReferenceSizeProvider.hxx" #include "ObjectIdentifier.hxx" #include "RegressionCurveHelper.hxx" diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 1e0762bdfc92..532a8cbd8c19 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -25,7 +25,7 @@ #include "PositionAndSizeHelper.hxx" #include "ChartModelHelper.hxx" #include "UndoGuard.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ObjectNameProvider.hxx" #include "DiagramHelper.hxx" #include "chartview/ExplicitValueProvider.hxx" diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 6da7736eea60..fcbfc3073f06 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -48,7 +48,7 @@ #include "UndoGuard.hxx" #include "ObjectNameProvider.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ReferenceSizeProvider.hxx" #include "RegressionCurveHelper.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 3fb555bace30..ab8189642b36 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -28,7 +28,7 @@ #include "macros.hxx" #include "ControllerLockGuard.hxx" #include "AccessibleTextHelper.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "chartview/DrawModelWrapper.hxx" #include <svx/svdotext.hxx> diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 240ab15f6952..38772a491eea 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -27,7 +27,7 @@ #include "ControllerLockGuard.hxx" #include "macros.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ObjectIdentifier.hxx" #include "ReferenceSizeProvider.hxx" #include "chartview/ExplicitValueProvider.hxx" @@ -62,6 +62,7 @@ #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include <editeng/outliner.hxx> #include <svx/svditer.hxx> #include <svx/svdpage.hxx> @@ -724,20 +725,20 @@ bool ChartController::executeDispatch_Delete() ObjectIdentifier::getObjectPropertySet( aCID, getModel() )); if( xErrorBarProp.is()) { - sal_Int16 nId; + const char* pId; if ( aObjectType == OBJECTTYPE_DATA_ERRORS_X ) - nId = STR_OBJECT_ERROR_BARS_X; + pId = STR_OBJECT_ERROR_BARS_X; else if ( aObjectType == OBJECTTYPE_DATA_ERRORS_Y ) - nId = STR_OBJECT_ERROR_BARS_Y; + pId = STR_OBJECT_ERROR_BARS_Y; else - nId = STR_OBJECT_ERROR_BARS_Z; + pId = STR_OBJECT_ERROR_BARS_Z; uno::Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SchResId( nId )), - m_xUndoManager ); + ActionDescriptionProvider::ActionType::Delete, SchResId(pId)), + m_xUndoManager); { ControllerLockGuardUNO aCtlLockGuard( xModel ); xErrorBarProp->setPropertyValue( diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 83e0bb7d76a8..e33db229fc59 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -29,7 +29,7 @@ #include "UndoGuard.hxx" #include "ControllerLockGuard.hxx" #include "ObjectNameProvider.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "macros.hxx" #include "DragMethod_PieSegment.hxx" #include "DragMethod_RotateDiagram.hxx" diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index d333197f695a..dc65a7d5862e 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -19,7 +19,7 @@ #include "DragMethod_Base.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "macros.hxx" #include "ObjectNameProvider.hxx" diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 331a506a1840..8271118a2e6f 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -19,7 +19,7 @@ #include "DragMethod_PieSegment.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "macros.hxx" #include "ObjectIdentifier.hxx" diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index d990e351bbd1..b68d2b7c0737 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -29,6 +29,7 @@ #include <svl/itempool.hxx> #include <editeng/adjustitem.hxx> #include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/fmmodel.hxx> #include <svx/gallery.hxx> @@ -74,13 +75,13 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL ) return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType ); } -::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel& rModel ) +::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel& rModel) { ::basegfx::B2DPolyPolygon aReturn; XLineEndListRef pLineEndList = rModel.GetLineEndList(); if ( pLineEndList.is() ) { - OUString aName( SvxResId( nResId ) ); + OUString aName(SvxResId(pResId)); 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 9a4436197a97..c4d1ef375c2b 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -25,7 +25,7 @@ #include <chartview/ExplicitValueProvider.hxx> #include "DrawViewWrapper.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ObjectIdentifier.hxx" #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 459ac3eb79b8..96fd0de5e90d 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -28,7 +28,7 @@ #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx index 0eefc83d5362..31d96d155b91 100644 --- a/chart2/source/inc/ResId.hxx +++ b/chart2/source/inc/ResId.hxx @@ -25,7 +25,7 @@ namespace chart { -OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(sal_uInt16 nId); +OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(const char *pId); } // namespace chart diff --git a/chart2/source/inc/ResourceManager.hxx b/chart2/source/inc/ResourceManager.hxx index d5c3272db684..afb1e76f9165 100644 --- a/chart2/source/inc/ResourceManager.hxx +++ b/chart2/source/inc/ResourceManager.hxx @@ -20,16 +20,14 @@ #define INCLUDED_CHART2_SOURCE_INC_RESOURCEMANAGER_HXX #include "charttoolsdllapi.hxx" - -// defined in <tools/resmgr.hxx> -class ResMgr; +#include <locale> namespace chart { namespace ResourceManager { - ::ResMgr & getResourceManager(); + const std::locale& getResourceLocale(); } } // namespace chart diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc deleted file mode 100644 index d3b45f0e4907..000000000000 --- a/chart2/source/inc/Strings.hrc +++ /dev/null @@ -1,265 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef CHART_STRINGS_HRC -#define CHART_STRINGS_HRC - -// this includes no link dependency -#include <svl/solar.hrc> - -//next free is 305 - -//chart types -//see Strings_ChartTypes.src - -#define STR_NORMAL (RID_APP_START + 10) -#define STR_STACKED (RID_APP_START + 11) -#define STR_PERCENT (RID_APP_START + 12) -#define STR_DEEP (RID_APP_START + 13) -#define STR_FILLED (RID_APP_START + 285) - -#define STR_DONUT (RID_APP_START + 8) -#define STR_TYPE_PIE (RID_APP_START + 187) -#define STR_PIE_EXPLODED (RID_APP_START + 188) -#define STR_DONUT_EXPLODED (RID_APP_START + 189) - -#define STR_TYPE_COLUMN (RID_APP_START + 190) -#define STR_TYPE_BAR (RID_APP_START + 191) -#define STR_TYPE_AREA (RID_APP_START + 192) - -#define STR_LINES_3D (RID_APP_START + 193) -#define STR_POINTS_ONLY (RID_APP_START + 194) -#define STR_LINES_ONLY (RID_APP_START + 116) -#define STR_POINTS_AND_LINES (RID_APP_START + 124) -#define STR_TYPE_LINE (RID_APP_START + 125) -#define STR_TYPE_XY (RID_APP_START + 240) - -#define STR_LINE_COLUMN (RID_APP_START + 22) -#define STR_LINE_STACKEDCOLUMN (RID_APP_START + 23) -#define STR_TYPE_COMBI_COLUMN_LINE (RID_APP_START + 24) - -#define STR_TYPE_NET (RID_APP_START + 52) - -#define STR_TYPE_STOCK (RID_APP_START + 126) -#define STR_STOCK_1 (RID_APP_START + 143) -#define STR_STOCK_2 (RID_APP_START + 144) -#define STR_STOCK_3 (RID_APP_START + 145) -#define STR_STOCK_4 (RID_APP_START + 146) - -#define STR_TYPE_BUBBLE (RID_APP_START + 282) -#define STR_BUBBLE_1 (RID_APP_START + 283) - -#define STR_TYPE_GL3D_BAR (RID_APP_START + 127) -#define STR_GL3D_BAR (RID_APP_START + 128) - -//SchStatisticTabPage and SchDataStatisticsDlg -//see Strings_Statistic.src - -#define STR_REGRESSION_LINEAR (RID_APP_START + 135) -#define STR_REGRESSION_LOG (RID_APP_START + 136) -#define STR_REGRESSION_EXP (RID_APP_START + 137) -#define STR_REGRESSION_POWER (RID_APP_START + 138) -#define STR_REGRESSION_MEAN (RID_APP_START + 180) -#define STR_REGRESSION_POLYNOMIAL (RID_APP_START + 300) -#define STR_REGRESSION_MOVING_AVERAGE (RID_APP_START + 301) - -//for scale tab page -//see Strings_Scale.src - -#define STR_INVALID_NUMBER (RID_APP_START + 100) -#define STR_STEP_GT_ZERO (RID_APP_START + 102) -#define STR_BAD_LOGARITHM (RID_APP_START + 111) -#define STR_MIN_GREATER_MAX (RID_APP_START + 101) -#define STR_INVALID_INTERVALS (RID_APP_START + 291) -#define STR_INVALID_TIME_UNIT (RID_APP_START + 292) - -//for range dialog -#define STR_DATA_ROLE_LABEL (RID_APP_START + 241) -#define STR_DATA_ROLE_X (RID_APP_START + 242) -#define STR_DATA_ROLE_Y (RID_APP_START + 243) -#define STR_DATA_ROLE_X_ERROR (RID_APP_START + 244) -#define STR_DATA_ROLE_X_ERROR_POSITIVE (RID_APP_START + 272) -#define STR_DATA_ROLE_X_ERROR_NEGATIVE (RID_APP_START + 273) -#define STR_DATA_ROLE_Y_ERROR (RID_APP_START + 245) -#define STR_DATA_ROLE_Y_ERROR_POSITIVE (RID_APP_START + 274) -#define STR_DATA_ROLE_Y_ERROR_NEGATIVE (RID_APP_START + 275) -#define STR_DATA_ROLE_FIRST (RID_APP_START + 246) -#define STR_DATA_ROLE_LAST (RID_APP_START + 247) -#define STR_DATA_ROLE_MIN (RID_APP_START + 248) -#define STR_DATA_ROLE_MAX (RID_APP_START + 249) -#define STR_DATA_ROLE_CATEGORIES (RID_APP_START + 260) -#define STR_DATA_ROLE_SIZE (RID_APP_START + 284) -#define STR_PROPERTY_ROLE_FILLCOLOR (RID_APP_START + 303) -#define STR_PROPERTY_ROLE_BORDERCOLOR (RID_APP_START + 304) - -#define STR_DATA_UNNAMED_SERIES (RID_APP_START + 250) -#define STR_DATA_UNNAMED_SERIES_WITH_INDEX (RID_APP_START + 251) - -#define STR_DATA_SELECT_RANGE_FOR_SERIES (RID_APP_START + 252) -#define STR_DATA_SELECT_RANGE_FOR_CATEGORIES (RID_APP_START + 253) -#define STR_DATA_SELECT_RANGE_FOR_DATALABELS (RID_APP_START + 195) - -//chart objects -//e.g. used as titles for insert dialogs and object properties dialog -//also used in tip help, in status descriptions e.g. '%object% marked' or in undo action e.g. 'moved %object%' - -#define STR_PAGE_CHARTTYPE (RID_APP_START + 197) -#define STR_PAGE_DATA_RANGE (RID_APP_START + 238) -#define STR_ACTION_EDIT_CHART_DATA (RID_APP_START + 198) - -#define STR_OBJECT_PAGE (RID_APP_START + 30) -#define STR_OBJECT_DIAGRAM (RID_APP_START + 31) -#define STR_OBJECT_DIAGRAM_WALL (RID_APP_START + 32) -#define STR_OBJECT_DIAGRAM_FLOOR (RID_APP_START + 33) -#define STR_OBJECT_LEGEND (RID_APP_START + 48) -#define STR_OBJECT_LEGEND_SYMBOL (RID_APP_START + 49) - -#define STR_OBJECT_DATALABELS (RID_APP_START + 45) -#define STR_OBJECT_LABEL (RID_APP_START + 199) - -#define STR_OBJECT_TITLE (RID_APP_START + 200) -#define STR_OBJECT_TITLES (RID_APP_START + 201) - -#define STR_OBJECT_TITLE_MAIN (RID_APP_START + 254) -#define STR_OBJECT_TITLE_SUB (RID_APP_START + 255) -#define STR_OBJECT_TITLE_X_AXIS (RID_APP_START + 256) -#define STR_OBJECT_TITLE_Y_AXIS (RID_APP_START + 257) -#define STR_OBJECT_TITLE_Z_AXIS (RID_APP_START + 258) -#define STR_OBJECT_TITLE_SECONDARY_X_AXIS (RID_APP_START + 87) -#define STR_OBJECT_TITLE_SECONDARY_Y_AXIS (RID_APP_START + 88) - -#define STR_OBJECT_DATAPOINT (RID_APP_START + 202) -#define STR_OBJECT_DATAPOINTS (RID_APP_START + 203) -#define STR_OBJECT_DATASERIES (RID_APP_START + 204) -#define STR_OBJECT_DATASERIES_PLURAL (RID_APP_START + 205) - -#define STR_OBJECT_FOR_SERIES (RID_APP_START + 288) -#define STR_OBJECT_FOR_ALL_SERIES (RID_APP_START + 289) - -#define STR_OBJECT_AVERAGE_LINE (RID_APP_START + 174) -#define STR_OBJECT_ERROR_BARS_X (RID_APP_START + 175) -#define STR_OBJECT_ERROR_BARS_Y (RID_APP_START + 295) -#define STR_OBJECT_ERROR_BARS_Z (RID_APP_START + 296) -#define STR_OBJECT_CURVE (RID_APP_START + 176) -#define STR_OBJECT_CURVES (RID_APP_START + 130) - -#define STR_OBJECT_STOCK_LOSS (RID_APP_START + 207) -#define STR_OBJECT_STOCK_GAIN (RID_APP_START + 208) - -#define STR_OBJECT_AXES (RID_APP_START + 209) -#define STR_OBJECT_AXIS (RID_APP_START + 210) -#define STR_OBJECT_AXIS_X (RID_APP_START + 211) -#define STR_OBJECT_AXIS_Y (RID_APP_START + 212) -#define STR_OBJECT_AXIS_Z (RID_APP_START + 213) - -#define STR_OBJECT_SECONDARY_X_AXIS (RID_APP_START + 286) -#define STR_OBJECT_SECONDARY_Y_AXIS (RID_APP_START + 287) - -#define STR_OBJECT_GRID (RID_APP_START + 214) -#define STR_OBJECT_GRIDS (RID_APP_START + 215) - -#define STR_OBJECT_GRID_MAJOR_X (RID_APP_START + 37) -#define STR_OBJECT_GRID_MAJOR_Y (RID_APP_START + 38) -#define STR_OBJECT_GRID_MAJOR_Z (RID_APP_START + 39) -#define STR_OBJECT_GRID_MINOR_X (RID_APP_START + 40) -#define STR_OBJECT_GRID_MINOR_Y (RID_APP_START + 41) -#define STR_OBJECT_GRID_MINOR_Z (RID_APP_START + 42) - -#define STR_OBJECT_CURVE_WITH_PARAMETERS (RID_APP_START + 264) -#define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS (RID_APP_START + 265) -#define STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS (RID_APP_START + 302) - -#define STR_OBJECT_CURVE_EQUATION (RID_APP_START + 268) -#define STR_OBJECT_SHAPE (RID_APP_START + 290) - -//Titles for tabpages and dialogs - -#define STR_PAGE_LINE (RID_APP_START + 216) -#define STR_PAGE_BORDER (RID_APP_START + 217) -#define STR_PAGE_AREA (RID_APP_START + 218) -#define STR_PAGE_TRANSPARENCY (RID_APP_START + 219) -#define STR_PAGE_FONT (RID_APP_START + 220) -#define STR_PAGE_FONT_EFFECTS (RID_APP_START + 221) -#define STR_PAGE_LAYOUT (RID_APP_START + 222) -#define STR_PAGE_OPTIONS (RID_APP_START + 223) -#define STR_PAGE_SCALE (RID_APP_START + 224) -#define STR_PAGE_NUMBERS (RID_APP_START + 225) -#define STR_PAGE_ALIGNMENT (RID_APP_START + 226) -#define STR_PAGE_POSITION (RID_APP_START + 227) - -#define STR_PAGE_PERSPECTIVE (RID_APP_START + 235) -#define STR_PAGE_APPEARANCE (RID_APP_START + 236) -#define STR_PAGE_ILLUMINATION (RID_APP_START + 237) - -#define STR_PAGE_TRENDLINE_TYPE (RID_APP_START + 89) -#define STR_PAGE_XERROR_BARS (RID_APP_START + 293) -#define STR_PAGE_YERROR_BARS (RID_APP_START + 206) -#define STR_CONTROLTEXT_ERROR_BARS_FROM_DATA (RID_APP_START + 276) - -#define STR_DLG_CHART_WIZARD (RID_APP_START + 228) -#define STR_PAGE_CHART_ELEMENTS (RID_APP_START + 229) - -#define STR_DLG_SMOOTH_LINE_PROPERTIES (RID_APP_START + 239) -#define STR_DLG_STEPPED_LINE_PROPERTIES (RID_APP_START + 270) - -#define STR_PAGE_POSITIONING (RID_APP_START + 277) -#define STR_PAGE_ASIAN (RID_APP_START + 281) - -//strings used as description for actions on toolbar icons, as tip help or for undo - -#define STR_ACTION_EDIT_CHARTTYPE (RID_APP_START + 78) -#define STR_ACTION_EDIT_DATA_RANGES (RID_APP_START + 64) -#define STR_ACTION_EDIT_3D_VIEW (RID_APP_START + 80) -#define STR_ACTION_TOGGLE_LEGEND (RID_APP_START + 83) -#define STR_ACTION_TOGGLE_GRID_HORZ (RID_APP_START + 86) -#define STR_ACTION_TOGGLE_GRID_VERTICAL (RID_APP_START + 139) -#define STR_ACTION_SCALE_TEXT (RID_APP_START + 93) -#define STR_ACTION_REARRANGE_CHART (RID_APP_START + 94) -#define STR_ACTION_EDIT_TEXT (RID_APP_START + 95) - -//statusbar strings and balloon help - -#define STR_STATUS_PIE_SEGMENT_EXPLODED (RID_APP_START + 179) -#define STR_STATUS_OBJECT_MARKED (RID_APP_START + 51) -#define STR_STATUS_DATAPOINT_MARKED (RID_APP_START + 44) -#define STR_TIP_DATASERIES (RID_APP_START + 43) -#define STR_TIP_DATAPOINT (RID_APP_START + 140) -#define STR_TIP_DATAPOINT_INDEX (RID_APP_START + 141) -#define STR_TIP_DATAPOINT_VALUES (RID_APP_START + 142) - -//warning and info boxes -#define STR_ACTION_NOTPOSSIBLE (RID_APP_START + 107) - -#define STR_COLUMN_LABEL (RID_APP_START + 262) -#define STR_ROW_LABEL (RID_APP_START + 263) - -#define STR_DATA_EDITOR_INCORRECT_INPUT (RID_APP_START + 269) - -// frame direction ------------------------------------------------------------ - -#define STR_TEXT_DIRECTION_LTR (RID_APP_START + 278) -#define STR_TEXT_DIRECTION_RTL (RID_APP_START + 279) -#define STR_TEXT_DIRECTION_SUPER (RID_APP_START + 280) - -// There is a gap here due to removed strings -// RID_APP_START + 500 and RID_APP_START + 501 are removed - -// CHART_STRINGS_HRC -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 59d5cb1b6dee..54d4f5c61567 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -19,7 +19,7 @@ #include "InternalData.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include <osl/diagnose.h> #include <rtl/math.hxx> diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index 60ee6b10c0fa..3624e9d1a749 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -20,7 +20,7 @@ #include "MovingAverageRegressionCurveCalculator.hxx" #include "RegressionCalculationHelper.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "macros.hxx" #include <rtl/math.hxx> diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index da43fee9b0c6..4a3558d6a38e 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -32,7 +32,7 @@ #include "macros.hxx" #include "PropertyHelper.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "DiagramHelper.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index 6bff5b7efc0e..68ea0df902f7 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -19,13 +19,13 @@ #include "ResId.hxx" #include "ResourceManager.hxx" -#include <tools/resid.hxx> +#include <tools/resmgr.hxx> namespace chart { - OUString SchResId(sal_uInt16 nId) + OUString SchResId(const char *pId) { - return ResId(nId, ResourceManager::getResourceManager()); + return Translate::get(pId, ResourceManager::getResourceLocale()); } } // namespace chart diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx index 3f3fb615697a..3cd51d70c7a7 100644 --- a/chart2/source/tools/ResourceManager.cxx +++ b/chart2/source/tools/ResourceManager.cxx @@ -18,20 +18,17 @@ */ #include "ResourceManager.hxx" - #include <tools/resmgr.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> namespace chart { -ResMgr & ResourceManager::getResourceManager() +const std::locale& ResourceManager::getResourceLocale() { - // not threadsafe - static ResMgr * pResourceManager = nullptr; - if( ! pResourceManager ) - pResourceManager = ResMgr::CreateResMgr("chartcontroller"); - OSL_ASSERT( pResourceManager ); - return *pResourceManager; + static std::locale loc = Translate::Create("chart", Application::GetSettings().GetUILanguageTag()); + return loc; } } // namespace chart diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 0cd1aa8d8896..3697f9456601 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -39,7 +39,7 @@ #include "VLegendSymbolFactory.hxx" #include "FormattedStringHelper.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "RelativePositionHelper.hxx" #include "DateHelper.hxx" #include "DiagramHelper.hxx" diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index be0ceb56dbc3..ca735afaec73 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -34,7 +34,7 @@ class OpenGLWindow; namespace chart { // Be careful here not to clash with the SYMBOL_FOO #defines in -// <rsc/rsc-vcl-shared-types.hxx> +// <vcl/vclenum.hxx> enum SymbolEnum { Symbol_Square=0 , Symbol_Diamond , Symbol_DownArrow |