some more hrc cleanup

Change-Id: Ic1a99ef971168093835207dd084e50a4f02b5e5f
Reviewed-on: https://gerrit.libreoffice.org/9141Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

chart2/AllLangResTarget_chartcontroller.mk

@@ -42,9 +42,4 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
     chart2/source/controller/menus/ShapeEditContextMenu.src \
 ))
 
-$(eval $(call gb_SrsTarget_add_templates,chart2/res,\
-    chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc \
-    chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc \
-))
-
 # vim: set noet sw=4 ts=4:

chart2/source/controller/dialogs/ResourceIds.hrc

@@ -26,11 +26,6 @@
 
 //Dialog Ids:
 #define DLG_CHART_WIZARD    902
-#define DLG_DATA_SOURCE     901
-#define DLG_DATA_DESCR      836
-#define DLG_LEGEND          835
-#define DLG_SPLINE_PROPERTIES 904
-
 
 //TabPage Ids:
 #define TP_LEGEND_POS   900
@@ -42,7 +37,6 @@
 #define TP_AXIS_LABEL   920
 #define TP_SCALE        903
 #define TP_AXIS_POSITIONS   904
-#define TP_CHARTTYPE    910
 
 #define TP_3D_SCENEGEOMETRY     915
 #define TP_3D_SCENEAPPEARANCE   916

chart2/source/controller/dialogs/TabPages.hrc

@@ -23,76 +23,6 @@
 
 #include "ResourceIds.hrc"
 
-//see attrib.hrc in old chart
-
-
-//Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES
-// ID's for title rotation tabpage
-#define CTR_DIAL                6030
-#define BTN_TXTSTACKED          6031
-#define FT_DEGREES              6032
-#define NF_ORIENT               6033
-#define FL_ALIGN                6037
-#define FT_TEXTDIR              6038
-#define LB_TEXTDIR              6039
-
-
-//from old chart tplabel.hrc
-
-#define CB_AXIS_LABEL_SCHOW_DESCR       1
-#define FL_AXIS_LABEL_ORIENTATION       3
-#define CT_AXIS_LABEL_DIAL              4
-#define PB_AXIS_LABEL_TEXTSTACKED       5
-#define FT_AXIS_LABEL_DEGREES           6
-#define NF_AXIS_LABEL_ORIENT            7
-#define FT_UNUSED                       8
-#define CT_UNUSED                       9
-
-#define FL_AXIS_LABEL_TEXTFLOW          10
-#define CB_AXIS_LABEL_TEXTOVERLAP       11
-#define CB_AXIS_LABEL_TEXTBREAK         12
-
-#define FL_AXIS_LABEL_ORDER             13
-#define RB_AXIS_LABEL_SIDEBYSIDE        14
-#define RB_AXIS_LABEL_UPDOWN            15
-#define RB_AXIS_LABEL_DOWNUP            16
-#define RB_AXIS_LABEL_AUTOORDER         17
-
-#define FL_SEPARATOR                    18
-#define FT_AXIS_TEXTDIR                 19
-#define LB_AXIS_TEXTDIR                 20
-
-#define FL_AXIS_LINE        1
-#define FL_LABELS           2
-#define FL_TICKS            3
-#define FL_VERTICAL         4
-#define FL_GRIDS            5
-
-#define FT_CROSSES_OTHER_AXIS_AT        1
-#define FT_AXIS_LABEL_DISTANCE          2
-#define FT_PLACE_LABELS                 3
-#define FT_MAJOR                        4
-#define FT_MINOR                        5
-#define FT_PLACE_TICKS                  6
-
-#define LB_CROSSES_OTHER_AXIS_AT    1
-#define LB_PLACE_LABELS             2
-#define EDT_CROSSES_OTHER_AXIS_AT           3
-#define EDT_CROSSES_OTHER_AXIS_AT_CATEGORY  4
-#define EDT_AXIS_LABEL_DISTANCE             5
-#define LB_PLACE_TICKS              6
-
-#define CB_AXIS_BETWEEN_CATEGORIES 1
-#define CB_TICKS_INNER  2
-#define CB_TICKS_OUTER  3
-#define CB_MINOR_INNER  4
-#define CB_MINOR_OUTER  5
-#define CB_MAJOR_GRID   6
-#define CB_MINOR_GRID   7
-
-#define PB_MAJOR_GRID   1
-#define PB_MINOR_GRID   2
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc

-/* -*- 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 _CHART2_RESOURCE_LEGEND_HXX
-#define _CHART2_RESOURCE_LEGEND_HXX
-
-#include "HelpIds.hrc"
-#include "res_LegendPosition_IDs.hrc"
-
-#define RESOURCE_LEGENDDISPLAY( xpos , ypos ) \
-CheckBox CBX_SHOWLEGEND \
-{ \
-    HelpID = HID_SCH_LEGEND_SHOW ; \
-    Pos = MAP_APPFONT ( xpos , ypos  ) ; \
-    Size = MAP_APPFONT ( 95 , 12 ) ; \
-    Text [ en-US ] = "~Display legend" ; \
-    TabStop = TRUE ; \
-};
-
-#define RESOURCE_LEGENDPOSITION( xpos , ypos ) \
-RadioButton RBT_LEFT \
-{ \
-    HelpID = HID_SCH_LEGEND_POS_LEFT ; \
-    Pos = MAP_APPFONT ( xpos , ypos  ) ; \
-    Size = MAP_APPFONT ( 75 , 10 ) ; \
-    Text [ en-US ] = "~Left" ; \
-    TabStop = TRUE ; \
-}; \
-RadioButton RBT_RIGHT \
-{ \
-    HelpID = HID_SCH_LEGEND_POS_RIGHT ; \
-    Pos = MAP_APPFONT ( xpos , ypos+14  ) ; \
-    Size = MAP_APPFONT ( 75 , 10 ) ; \
-    Text [ en-US ] = "~Right" ; \
-    TabStop = TRUE ; \
-}; \
-RadioButton RBT_TOP \
-{ \
-    HelpID = HID_SCH_LEGEND_POS_TOP ; \
-    Pos = MAP_APPFONT ( xpos , ypos+28  ) ; \
-    Size = MAP_APPFONT ( 75 , 10 ) ; \
-    Text [ en-US ] = "~Top" ; \
-    TabStop = TRUE ; \
-}; \
-RadioButton RBT_BOTTOM \
-{ \
-    HelpID = HID_SCH_LEGEND_POS_BOTTOM ; \
-    Pos = MAP_APPFONT ( xpos , ypos+42  ) ; \
-    Size = MAP_APPFONT ( 75 , 10 ) ; \
-    Text [ en-US ] = "~Bottom" ; \
-    TabStop = TRUE ; \
-};
-
-// height of RESOURCE_LEGENDPOSITION - don't forget to update when this is changed
-#define RESOURCE_LEGENDPOSITION_HEIGHT 52
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc

-/* -*- 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 _CHART2_SECONDARYAXISCHECKBOXES_HXX
-#define _CHART2_SECONDARYAXISCHECKBOXES_HXX
-
-#define SECONDARYAXISCHECKBOXES_WIDTH 42
-#define SECONDARYAXISCHECKBOXES_HEIGHT 10
-
-#define SECONDARYAXISCHECKBOXES( xpos, ypos, xOffset, yOffset ) \
-CheckBox CB_X_SECONDARY \
-{ \
-    HelpID = HID_SCH_CB_SECONDARY_XAXIS; \
-    Pos = MAP_APPFONT ( xpos , ypos  ); \
-    Size = MAP_APPFONT ( SECONDARYAXISCHECKBOXES_WIDTH , SECONDARYAXISCHECKBOXES_HEIGHT ); \
-    TabStop = TRUE; \
-    Text [ en-US ] = "X ~axis"; \
-}; \
-CheckBox CB_Y_SECONDARY \
-{ \
-    HelpID = HID_SCH_CB_SECONDARY_YAXIS; \
-    Pos = MAP_APPFONT ( xpos+xOffset , ypos+yOffset  ); \
-    Size = MAP_APPFONT ( SECONDARYAXISCHECKBOXES_WIDTH , SECONDARYAXISCHECKBOXES_HEIGHT ); \
-    TabStop = TRUE; \
-    Text [ en-US ] = "Y ax~is"; \
-}; \
-CheckBox CB_Z_SECONDARY \
-{ \
-    HelpID = HID_SCH_CB_SECONDARY_ZAXIS; \
-    Pos = MAP_APPFONT ( xpos+2*xOffset , ypos+2*yOffset  ); \
-    Size = MAP_APPFONT ( SECONDARYAXISCHECKBOXES_WIDTH , SECONDARYAXISCHECKBOXES_HEIGHT ); \
-    TabStop = TRUE; \
-    Text [ en-US ] = "Z axi~s"; \
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "tp_Wizard_TitlesAndObjects.hxx"
-#include "tp_Wizard_TitlesAndObjects.hrc"
 #include "Strings.hrc"
 #include "res_Titles.hxx"
 #include "res_LegendPosition.hxx"

chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc

-/* -*- 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 "ResourceIds.hrc"
-
-#define FT_TITLEDESCRIPTION 30
-
-#define FL_VERTICAL 3
-#define FL_GRIDS 4
-
-#define CB_X_SECONDARY 4
-#define CB_Y_SECONDARY 5
-#define CB_Z_SECONDARY 6
-
-#define CB_TIME_BASED         3
-#define FT_TIME_BASED         4
-#define ED_TIME_START         5
-#define ED_TIME_END           6
-
-#define BTN_ADDMAPPING    160
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

l10ntools/source/localize.cxx

@@ -90,11 +90,6 @@ bool passesPositiveList(const OUString& rUrl) {
             "/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc") },
         { RTL_CONSTASCII_STRINGPARAM(
             "/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc") },
-        { RTL_CONSTASCII_STRINGPARAM(
-            "/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc") },
-        { RTL_CONSTASCII_STRINGPARAM(
-            "/chart2/source/controller/dialogs/"
-            "res_SecondaryAxisCheckBoxes_tmpl.hrc") },
         { RTL_CONSTASCII_STRINGPARAM(
             "/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc") },
         { RTL_CONSTASCII_STRINGPARAM(