[Libreoffice-commits] core.git: 2 commits - chart2/source helpcontent2
Caolán McNamara
caolanm at redhat.com
Mon Dec 9 08:48:37 PST 2013
chart2/source/controller/dialogs/res_Titles.hrc | 41 -----
chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc | 143 ------------------
chart2/source/controller/inc/HelpIds.hrc | 15 -
helpcontent2 | 2
4 files changed, 1 insertion(+), 200 deletions(-)
New commits:
commit ad0a87f71e1b1b59febfccd956fde5c365c28813
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 9 16:46:30 2013 +0000
drop unused helpds ids and macros
Change-Id: I3f957fe2fbe731c5d8847cfdd518e0593a615339
diff --git a/chart2/source/controller/dialogs/res_Titles.hrc b/chart2/source/controller/dialogs/res_Titles.hrc
deleted file mode 100644
index 5ba5916..0000000
--- a/chart2/source/controller/dialogs/res_Titles.hrc
+++ /dev/null
@@ -1,41 +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 _CHART2_RES_TITLES_HRC
-#define _CHART2_RES_TITLES_HRC
-
-#define ED_MAINTITLE 1
-#define ED_SUBTITLE 2
-#define ED_X_AXIS 3
-#define ED_Y_AXIS 4
-#define ED_Z_AXIS 5
-#define ED_SECONDARY_X_AXIS 6
-#define ED_SECONDARY_Y_AXIS 7
-#define FT_MAINTITLE 1
-#define FT_SUBTITLE 2
-#define FT_TITLE_X_AXIS 3
-#define FT_TITLE_Y_AXIS 4
-#define FT_TITLE_Z_AXIS 5
-#define FT_TITLE_SECONDARY_X_AXIS 6
-#define FT_TITLE_SECONDARY_Y_AXIS 7
-#define FL_AXES 1
-#define FL_SECONDARY_AXES 2
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc b/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc
deleted file mode 100644
index b3451ca..0000000
--- a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc
+++ /dev/null
@@ -1,143 +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 _CHART2_RES_TITLES_SRC
-#define _CHART2_RES_TITLES_SRC
-
-#include "res_Titles.hrc"
-#include "HelpIds.hrc"
-
-#define TITLES_HEIGHT 12
-#define indentLabel 3
-#define fixedLinesHeight RSC_CD_FIXEDLINE_HEIGHT
-
-#define TITLES( xpos, ypos, availableWidth, indentLabel, fixedLinesHeight ) \
-Edit ED_MAINTITLE \
-{ \
- HelpID = HID_SCH_TITLE_MAIN; \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 , ypos ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- TabStop = TRUE ; \
-}; \
-Edit ED_SUBTITLE \
-{ \
- HelpID = HID_SCH_TITLE_SUB; \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 , ypos+TITLES_HEIGHT+4 ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- TabStop = TRUE ; \
-}; \
-Edit ED_X_AXIS \
-{ \
- HelpID = HID_SCH_TITLE_X; \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 , ypos+2*(TITLES_HEIGHT+4)+4+(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- TabStop = TRUE ; \
-}; \
-Edit ED_Y_AXIS \
-{ \
- HelpID = HID_SCH_TITLE_Y; \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 , ypos+3*(TITLES_HEIGHT+4)+4+(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- TabStop = TRUE ; \
-}; \
-Edit ED_Z_AXIS \
-{ \
- HelpID = HID_SCH_TITLE_Z; \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 , ypos+4*(TITLES_HEIGHT+4)+4+(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- TabStop = TRUE ; \
-}; \
-Edit ED_SECONDARY_X_AXIS \
-{ \
- HelpID = HID_SCH_TITLE_SECONDARY_X; \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 , ypos+5*(TITLES_HEIGHT+4)+8+2*(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- TabStop = TRUE ; \
-}; \
-Edit ED_SECONDARY_Y_AXIS \
-{ \
- HelpID = HID_SCH_TITLE_SECONDARY_Y; \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 , ypos+6*(TITLES_HEIGHT+4)+8+2*(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- TabStop = TRUE ; \
-}; \
-FixedText FT_MAINTITLE \
-{ \
- Pos = MAP_APPFONT ( xpos+indentLabel , ypos+2 ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- Text [ en-US ] = "~Title" ; \
-}; \
-FixedText FT_SUBTITLE \
-{ \
- Pos = MAP_APPFONT ( xpos+indentLabel , ypos+2+TITLES_HEIGHT+4 ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- Text [ en-US ] = "~Subtitle" ; \
-}; \
-FixedLine FL_AXES \
-{ \
- Pos = MAP_APPFONT( xpos ,ypos+2+2*(TITLES_HEIGHT+4)+0 ); \
- Size = MAP_APPFONT( availableWidth ,fixedLinesHeight ); \
- Text[ en-US ] = "Axes"; \
-}; \
-FixedText FT_TITLE_X_AXIS \
-{ \
- Pos = MAP_APPFONT ( xpos+indentLabel , ypos+2+2*(TITLES_HEIGHT+4)+4+(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- Text [ en-US ] = "~X axis" ; \
-}; \
-FixedText FT_TITLE_Y_AXIS \
-{ \
- Pos = MAP_APPFONT ( xpos+indentLabel , ypos+2+3*(TITLES_HEIGHT+4)+4+(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- Text [ en-US ] = "~Y axis" ; \
-}; \
-FixedText FT_TITLE_Z_AXIS \
-{ \
- Pos = MAP_APPFONT ( xpos+indentLabel , ypos+2+4*(TITLES_HEIGHT+4)+4+(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- Text [ en-US ] = "~Z axis" ; \
-}; \
-FixedLine FL_SECONDARY_AXES \
-{ \
- Pos = MAP_APPFONT( xpos ,ypos+2+5*(TITLES_HEIGHT+4)+3+(fixedLinesHeight+3) ); \
- Size = MAP_APPFONT( availableWidth ,fixedLinesHeight ); \
- Text[ en-US ] = "Secondary Axes"; \
-}; \
-FixedText FT_TITLE_SECONDARY_X_AXIS \
-{ \
- Pos = MAP_APPFONT ( xpos+indentLabel , ypos+2+5*(TITLES_HEIGHT+4)+8+2*(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- Text [ en-US ] = "X ~axis" ; \
-}; \
-FixedText FT_TITLE_SECONDARY_Y_AXIS \
-{ \
- Pos = MAP_APPFONT ( xpos+indentLabel , ypos+2+6*(TITLES_HEIGHT+4)+8+2*(fixedLinesHeight+3) ) ; \
- Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) ; \
- Text [ en-US ] = "Y ax~is" ; \
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index 75f3a124..2d0a4f3 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -51,13 +51,6 @@
#define HID_SCH_CB_SECONDARY_YAXIS "CHART2_HID_SCH_CB_SECONDARY_YAXIS"
#define HID_SCH_CB_SECONDARY_ZAXIS "CHART2_HID_SCH_CB_SECONDARY_ZAXIS"
-#define HID_SCH_CB_XGRID "CHART2_HID_SCH_CB_XGRID"
-#define HID_SCH_CB_YGRID "CHART2_HID_SCH_CB_YGRID"
-#define HID_SCH_CB_ZGRID "CHART2_HID_SCH_CB_ZGRID"
-#define HID_SCH_CB_SECONDARY_XGRID "CHART2_HID_SCH_CB_SECONDARY_XGRID"
-#define HID_SCH_CB_SECONDARY_YGRID "CHART2_HID_SCH_CB_SECONDARY_YGRID"
-#define HID_SCH_CB_SECONDARY_ZGRID "CHART2_HID_SCH_CB_SECONDARY_ZGRID"
-
#define HID_SCH_LEGEND_POS_LEFT "CHART2_HID_SCH_LEGEND_POS_LEFT"
#define HID_SCH_LEGEND_POS_TOP "CHART2_HID_SCH_LEGEND_POS_TOP"
#define HID_SCH_LEGEND_POS_RIGHT "CHART2_HID_SCH_LEGEND_POS_RIGHT"
@@ -88,14 +81,6 @@
#define HID_SCH_DATALABEL_ROTATION_KNOB "CHART2_HID_SCH_DATALABEL_ROTATION_KNOB"
#define HID_SCH_DATALABEL_ROTATION_EDIT "CHART2_HID_SCH_DATALABEL_ROTATION_EDIT"
-#define HID_SCH_TITLE_MAIN "CHART2_HID_SCH_TITLE_MAIN"
-#define HID_SCH_TITLE_SUB "CHART2_HID_SCH_TITLE_SUB"
-#define HID_SCH_TITLE_X "CHART2_HID_SCH_TITLE_X"
-#define HID_SCH_TITLE_Y "CHART2_HID_SCH_TITLE_Y"
-#define HID_SCH_TITLE_Z "CHART2_HID_SCH_TITLE_Z"
-#define HID_SCH_TITLE_SECONDARY_X "CHART2_HID_SCH_TITLE_SECONDARY_X"
-#define HID_SCH_TITLE_SECONDARY_Y "CHART2_HID_SCH_TITLE_SECONDARY_Y"
-
#define HID_SCH_WIZARD_ROADMAP "CHART2_HID_SCH_WIZARD_ROADMAP"
#define HID_SCH_LEGEND_SHOW "CHART2_HID_SCH_LEGEND_SHOW"
#define HID_SCH_DATA_SERIES_LABEL "CHART2_HID_SCH_DATA_SERIES_LABEL"
commit c3aa5d3dd7d2e73ffad9b7f3f7140f2129298461
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 9 16:45:03 2013 +0000
Updated core
Project: help 709409b5a4b5f77127fdd6f9669f39530b382b63
diff --git a/helpcontent2 b/helpcontent2
index 5d5a01b..709409b 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5d5a01b22caf3c26d6a0f9e14b531246444c2e35
+Subproject commit 709409b5a4b5f77127fdd6f9669f39530b382b63
More information about the Libreoffice-commits
mailing list