[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source l10ntools/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Mar 16 10:15:02 UTC 2017
chart2/AllLangResTarget_chartcontroller.mk | 1
chart2/source/controller/dialogs/Bitmaps.hrc | 5 -
chart2/source/controller/dialogs/Bitmaps.src | 24 ---------
chart2/source/controller/dialogs/Strings.src | 10 ---
chart2/source/controller/dialogs/Strings_AdditionalControls.src | 26 ----------
chart2/source/controller/dialogs/Strings_Statistic.src | 14 -----
chart2/source/inc/Strings.hrc | 9 ---
l10ntools/source/gRun.sh | 2
8 files changed, 1 insertion(+), 90 deletions(-)
New commits:
commit e29dafb35017120e207e3251b05da23cd415bd21
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Mar 16 11:15:23 2017 +0200
remove unused defines from HRC files in chart2
Change-Id: I8ce5b900353034c4ad1424375bed0ea0c9db36b1
Reviewed-on: https://gerrit.libreoffice.org/35255
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index 61d2f62..61aab69 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
))
$(eval $(call gb_SrsTarget_add_files,chart2/res,\
- chart2/source/controller/dialogs/Strings_AdditionalControls.src \
chart2/source/controller/dialogs/Strings_ChartTypes.src \
chart2/source/controller/dialogs/Strings_Scale.src \
chart2/source/controller/dialogs/Strings.src \
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc
index 78550d5..40cc8e8 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -170,7 +170,6 @@
//further Images:
//SchStatisticTabPage and SchDataStatisticsDlg part 2
-#define BMP_REGRESSION_NONE (RID_APP_START + 92)
#define BMP_REGRESSION_LINEAR (RID_APP_START + 93)
#define BMP_REGRESSION_LOG (RID_APP_START + 94)
#define BMP_REGRESSION_EXP (RID_APP_START + 95)
@@ -192,10 +191,6 @@
#define BMP_TYPE_STOCK (RID_APP_START + 120)
#define BMP_TYPE_COLUMN_LINE (RID_APP_START + 131)
#define BMP_TYPE_GL3D_BAR (RID_APP_START + 132)
-#define BMP_STEP_START (RID_APP_START + 133)
-#define BMP_STEP_END (RID_APP_START + 134)
-#define BMP_STEP_CENTER_X (RID_APP_START + 135)
-#define BMP_STEP_CENTER_Y (RID_APP_START + 136)
//SchStatisticTabPage and SchDataStatisticsDlg part 1
#define BMP_INDICATE_BOTH_VERTI (RID_APP_START + 137)
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src
index 0f13735..710afc9 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -73,26 +73,6 @@ Bitmap BMP_TYPE_GL3D_BAR
File = "typegl3dbar_16.png";
};
-Bitmap BMP_STEP_START
-{
- File = "step_start_30.png";
-};
-
-Bitmap BMP_STEP_END
-{
- File = "step_end_30.png";
-};
-
-Bitmap BMP_STEP_CENTER_X
-{
- File = "step_center_x_30.png";
-};
-
-Bitmap BMP_STEP_CENTER_Y
-{
- File = "step_center_y_30.png";
-};
-
Bitmap BMP_BUBBLE_1
{
File = "bubble_52x60.png" ;
@@ -538,10 +518,6 @@ Bitmap BMP_INDICATE_LEFT
};
//regression curves
-Bitmap BMP_REGRESSION_NONE
-{
- File = "regno.png" ;
-};
Bitmap BMP_REGRESSION_LINEAR
{
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index 6345574..4c9b40d 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -49,11 +49,6 @@ String STR_PAGE_CHART_ELEMENTS
Text [ en-US ] = "Chart Elements";
};
-String STR_PAGE_CHART_LOCATION
-{
- Text [ en-US ] = "Chart Location";
-};
-
String STR_PAGE_LINE
{
Text [ en-US ] = "Line" ;
@@ -129,11 +124,6 @@ String STR_PAGE_YERROR_BARS
Text[ en-US ] = "Y Error Bars";
};
-String STR_PAGE_ZERROR_BARS
-{
- Text[ en-US ] = "Z Error Bars";
-};
-
String STR_PAGE_ALIGNMENT
{
Text [ en-US ] = "Alignment" ;
diff --git a/chart2/source/controller/dialogs/Strings_AdditionalControls.src b/chart2/source/controller/dialogs/Strings_AdditionalControls.src
deleted file mode 100644
index 43c3d0f..0000000
--- a/chart2/source/controller/dialogs/Strings_AdditionalControls.src
+++ /dev/null
@@ -1,26 +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_TEXT_SEPARATOR
-{
- Text [ en-US ] = "Separator";
-};
-
-/* 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
index 8f93aa8..e375cb1 100644
--- a/chart2/source/controller/dialogs/Strings_Statistic.src
+++ b/chart2/source/controller/dialogs/Strings_Statistic.src
@@ -18,20 +18,6 @@
*/
#include "Strings.hrc"
-//SchStatisticTabPage and SchDataStatisticsDlg
-String STR_INDICATE_BOTH
-{
- Text [ en-US ] = "Negative and Positive" ;
-};
-String STR_INDICATE_DOWN
-{
- Text [ en-US ] = "Negative" ;
-};
-String STR_INDICATE_UP
-{
- Text [ en-US ] = "Positive" ;
-};
-
// used for own data in error bar dialog
//TODO: ohallot: String inserted into tp_ErrorBars.ui
String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index 9ffe163..d3b45f0 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -67,16 +67,9 @@
#define STR_TYPE_GL3D_BAR (RID_APP_START + 127)
#define STR_GL3D_BAR (RID_APP_START + 128)
-//additional strings
-#define STR_TEXT_SEPARATOR (RID_APP_START + 20)
-
//SchStatisticTabPage and SchDataStatisticsDlg
//see Strings_Statistic.src
-#define STR_INDICATE_BOTH (RID_APP_START + 131)
-#define STR_INDICATE_UP (RID_APP_START + 132)
-#define STR_INDICATE_DOWN (RID_APP_START + 133)
-
#define STR_REGRESSION_LINEAR (RID_APP_START + 135)
#define STR_REGRESSION_LOG (RID_APP_START + 136)
#define STR_REGRESSION_EXP (RID_APP_START + 137)
@@ -216,12 +209,10 @@
#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_PAGE_ZERROR_BARS (RID_APP_START + 294)
#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_PAGE_CHART_LOCATION (RID_APP_START + 230)
#define STR_DLG_SMOOTH_LINE_PROPERTIES (RID_APP_START + 239)
#define STR_DLG_STEPPED_LINE_PROPERTIES (RID_APP_START + 270)
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index 5b2487b..ed07596 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -218,7 +218,7 @@ ${MYCMD} --files basic/source/classes/sb.src
${MYCMD} --files basic/source/sbx/format.src
-${MYCMD} --base chart2/source/controller/dialogs --files Bitmaps.src Strings.src Strings_AdditionalControls.src Strings_ChartTypes.src Strings_Scale.src Strings_Statistic.src
+${MYCMD} --base chart2/source/controller/dialogs --files Bitmaps.src Strings.src Strings_ChartTypes.src Strings_Scale.src Strings_Statistic.src
${MYCMD} --base connectivity/source/resource --files conn_error_message.src conn_log_res.src conn_shared_res.src
More information about the Libreoffice-commits
mailing list