From d8088c2262884e6a39f67879cbb808d588fde1fd Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 16 Jan 2012 16:15:12 +0400 Subject: sd: remove some unused defines --- sd/source/ui/app/tbxww.cxx | 1 - sd/source/ui/dlg/celltempl.src | 1 - sd/source/ui/dlg/prltempl.cxx | 1 - sd/source/ui/dlg/prltempl.src | 1 - sd/source/ui/inc/celltempl.hrc | 1 - sd/source/ui/inc/enumdlg.hrc | 42 ----------------- sd/source/ui/inc/prltempl.hrc | 1 - sd/source/ui/inc/res_bmp.hrc | 105 ----------------------------------------- sd/source/ui/inc/tabtempl.hrc | 1 - sd/source/ui/inc/tbx_ww.hrc | 29 ------------ 10 files changed, 183 deletions(-) delete mode 100644 sd/source/ui/inc/enumdlg.hrc delete mode 100644 sd/source/ui/inc/tbx_ww.hrc (limited to 'sd') diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 5c2b6971dc2c..f562f4b5fc0b 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -47,7 +47,6 @@ #include "res_bmp.hrc" #include "sdresid.hxx" #include "tbx_ww.hxx" -#include "tbx_ww.hrc" SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem ) diff --git a/sd/source/ui/dlg/celltempl.src b/sd/source/ui/dlg/celltempl.src index 9ee4b9c38f51..80a4de76636e 100644 --- a/sd/source/ui/dlg/celltempl.src +++ b/sd/source/ui/dlg/celltempl.src @@ -25,7 +25,6 @@ * ************************************************************************/ -#include "enumdlg.hrc" #include "celltempl.hrc" #include diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index f0d92c8cc993..8f8e042cb0a6 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -52,7 +52,6 @@ #include "sdresid.hxx" #include "prltempl.hxx" #include "prltempl.hrc" -#include "enumdlg.hrc" #include "bulmaper.hxx" #include #include diff --git a/sd/source/ui/dlg/prltempl.src b/sd/source/ui/dlg/prltempl.src index d7251c084c3d..e6d3410a4c40 100644 --- a/sd/source/ui/dlg/prltempl.src +++ b/sd/source/ui/dlg/prltempl.src @@ -25,7 +25,6 @@ * ************************************************************************/ -#include "enumdlg.hrc" #include "prltempl.hrc" #include TabDialog TAB_PRES_LAYOUT_TEMPLATE diff --git a/sd/source/ui/inc/celltempl.hrc b/sd/source/ui/inc/celltempl.hrc index ee3c596a494d..3a22772a9d2d 100644 --- a/sd/source/ui/inc/celltempl.hrc +++ b/sd/source/ui/inc/celltempl.hrc @@ -26,4 +26,3 @@ ************************************************************************/ #include #define TAB_CELL_TEMPLATE 910 -#define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/enumdlg.hrc b/sd/source/ui/inc/enumdlg.hrc deleted file mode 100644 index 5b3b4e127b06..000000000000 --- a/sd/source/ui/inc/enumdlg.hrc +++ /dev/null @@ -1,42 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#define TP_ENUM_BULLET 943 -#define LB_STYLE 1 -#define GRP_STYLE 1 -#define FT_ENUM 1 -#define NUM_FLD_ENUM 1 -#define FT_PREVIEW_ENUM 2 -#define GRP_ENUM 3 -#define BTN_GET_BULLET 1 -#define CTL_BULLET_PREVIEW 1 -#define GRP_BULLET 2 -#define MTR_FLD_SIZE 1 -#define LB_BULLET_COLOR 2 -#define FT_BULLET_SIZE 3 -#define FT_BULLET_COLOR 4 -#define FT_SAMPLE 5 -#define TSB_USE_BULLET 1 diff --git a/sd/source/ui/inc/prltempl.hrc b/sd/source/ui/inc/prltempl.hrc index 97529b7d9068..1643ef2af2a3 100644 --- a/sd/source/ui/inc/prltempl.hrc +++ b/sd/source/ui/inc/prltempl.hrc @@ -28,4 +28,3 @@ /* #define TAB_PRES_LAYOUT_TEMPLATE RID_APP_START+??? */ #define TAB_PRES_LAYOUT_TEMPLATE 844 #define TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND 846 -#define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 14b3b112f27f..59b3aa439adc 100755 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -32,40 +32,6 @@ // ----------- #define IMAGE_MASK_STDCOLOR Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; } -#define IMAGE_MASK_STDCOLOR_HC IMAGE_MASK_STDCOLOR -#define IMAGE_STDBTN_COLOR_HC COL_LIGHTMAGENTA - -#define RID_ALIGNMENT RID_APP_START+1 -#define RID_ZOOM RID_APP_START+2 -#define RID_CONTROLS RID_APP_START+3 -#define RID_IMPRESS_DOCWINDOWICON RID_APP_START+4 - -#define RID_ALIGNMENT_TBX RID_APP_START+5 -#define RID_ZOOM_TBX RID_APP_START+6 -#define RID_CHOOSE_MODE RID_APP_START+7 -#define RID_CHOOSE_MODE_TBX RID_APP_START+8 - -#define RID_TEXT RID_APP_START+10 -#define RID_TEXT_TBX RID_APP_START+11 -#define RID_RECTANGLES RID_APP_START+12 -#define RID_RECTANGLES_TBX RID_APP_START+13 -#define RID_ELLIPSES RID_APP_START+14 -#define RID_ELLIPSES_TBX RID_APP_START+15 -#define RID_LINES RID_APP_START+16 -#define RID_LINES_TBX RID_APP_START+17 -#define RID_3D_OBJECTS RID_APP_START+18 -#define RID_3D_OBJECTS_TBX RID_APP_START+19 -#define RID_INSERT RID_APP_START+20 -#define RID_INSERT_TBX RID_APP_START+21 -#define RID_POSITION RID_APP_START+22 -#define RID_POSITION_TBX RID_APP_START+23 -#define RID_CONNECTORS RID_APP_START+24 -#define RID_CONNECTORS_TBX RID_APP_START+25 -#define RID_ARROWS RID_APP_START+26 -#define RID_ARROWS_TBX RID_APP_START+27 -#define RID_DRAW_DOCWINDOWICON RID_APP_START+28 -#define RID_GRAFFILTERS RID_APP_START+29 -#define RID_GRAFFILTERS_TBX RID_APP_START+30 // Bitmaps fuer Tree-ListBox im Effekte-TabDialog #define BMP_PAGE RID_APP_START+42 @@ -96,50 +62,6 @@ // ----------------------------------------------------------------------------- // additional effects -#define BMP_EFFECT_DISCARD_FROM_UL RID_APP_START+130 -#define BMP_EFFECT_DISCARD_FROM_UR RID_APP_START+131 -#define BMP_EFFECT_DISCARD_FROM_LR RID_APP_START+132 -#define BMP_EFFECT_DISCARD_FROM_LL RID_APP_START+133 -#define BMP_EFFECT_DISCARD_S_FROM_L RID_APP_START+134 -#define BMP_EFFECT_DISCARD_S_FROM_UL RID_APP_START+135 -#define BMP_EFFECT_DISCARD_S_FROM_T RID_APP_START+136 -#define BMP_EFFECT_DISCARD_S_FROM_UR RID_APP_START+137 -#define BMP_EFFECT_DISCARD_S_FROM_R RID_APP_START+138 -#define BMP_EFFECT_DISCARD_S_FROM_LR RID_APP_START+139 -#define BMP_EFFECT_DISCARD_S_FROM_B RID_APP_START+140 -#define BMP_EFFECT_DISCARD_S_FROM_LL RID_APP_START+141 -#define BMP_EFFECT_VERTICAL_CHECKERBOARD RID_APP_START+142 -#define BMP_EFFECT_HORIZONTAL_CHECKERBOARD RID_APP_START+143 -#define BMP_EFFECT_STRTCH_FROM_L RID_APP_START+144 -#define BMP_EFFECT_STRTCH_FROM_UL RID_APP_START+145 -#define BMP_EFFECT_STRTCH_FROM_T RID_APP_START+146 -#define BMP_EFFECT_STRTCH_FROM_UR RID_APP_START+147 -#define BMP_EFFECT_STRTCH_FROM_R RID_APP_START+148 -#define BMP_EFFECT_STRTCH_FROM_LR RID_APP_START+149 -#define BMP_EFFECT_STRTCH_FROM_B RID_APP_START+150 -#define BMP_EFFECT_STRTCH_FROM_LL RID_APP_START+151 - -#define BMP_EFFECT_STRTCH_HORIZONTAL RID_APP_START+152 -#define BMP_EFFECT_STRTCH_VERTICAL RID_APP_START+153 -#define BMP_EFFECT_ROTATE_HORIZONTAL RID_APP_START+154 -#define BMP_EFFECT_ROTATE_VERTICAL RID_APP_START+155 - -#define BMP_FOIL_21 RID_APP_START+156 -#define BMP_FOIL_22 RID_APP_START+157 -#define BMP_FOIL_23 RID_APP_START+158 -#define BMP_FOIL_24 RID_APP_START+159 - -#define BMP_EFFECT_UNCOVER_TO_L RID_APP_START+165 -#define BMP_EFFECT_UNCOVER_TO_UL RID_APP_START+166 -#define BMP_EFFECT_UNCOVER_TO_T RID_APP_START+167 -#define BMP_EFFECT_UNCOVER_TO_UR RID_APP_START+168 -#define BMP_EFFECT_UNCOVER_TO_R RID_APP_START+169 -#define BMP_EFFECT_UNCOVER_TO_LR RID_APP_START+170 -#define BMP_EFFECT_UNCOVER_TO_B RID_APP_START+171 -#define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172 - -#define BMP_FOIL_NONE_H RID_SD_START+225 -#define BMP_WAIT_ICON_H RID_SD_START+229 #define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331 @@ -258,17 +180,6 @@ #define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+95 #define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+96 -/* - * Pointer (Mauszeiger) - */ -#define PTR_WATERCAN RID_APP_START+100 -#define PTR_PENCIL RID_APP_START+101 - - -/* - * Globale Dialog-IDs - */ -#define DLG_FONTWORK RID_APP_START+150 /* * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in @@ -276,20 +187,6 @@ * Konfigurationsstring muessen dieselbe ResourceID haben!). */ -// --> Jetzt in cfgids.hxx -/* -#define _RID_DRAW_TOOLBOX RID_APP_START+200 -#define _RID_SLIDE_TOOLBOX RID_APP_START+201 -#define _RID_DRAW_OBJ_TOOLBOX RID_APP_START+202 -#define _RID_SLIDE_OBJ_TOOLBOX RID_APP_START+203 -#define _RID_BEZIER_TOOLBOX RID_APP_START+204 -#define _RID_TEXT_TOOLBOX RID_APP_START+205 -#define _RID_OUTLINE_TOOLBOX RID_APP_START+206 -#define _RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+207 -#define _RID_GLUEPOINTS_TOOLBOX RID_APP_START+208 -*/ - - #define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390 #define RID_DRAW_GLUEPOINT_POPUP RID_APP_START+392 #define RID_DRAW_CONTROL_POPUP RID_APP_START+393 @@ -297,5 +194,3 @@ #define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 #define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 -#define RID_GRAPHICSCELLFAMILY RID_APP_START+397 - diff --git a/sd/source/ui/inc/tabtempl.hrc b/sd/source/ui/inc/tabtempl.hrc index 19fd9105b318..07fa2614955a 100644 --- a/sd/source/ui/inc/tabtempl.hrc +++ b/sd/source/ui/inc/tabtempl.hrc @@ -27,4 +27,3 @@ #include /* #define TAB_TEMPLATE RID_APP_START+??? */ #define TAB_TEMPLATE 637 -#define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/tbx_ww.hrc b/sd/source/ui/inc/tbx_ww.hrc deleted file mode 100644 index 0189eecf2739..000000000000 --- a/sd/source/ui/inc/tbx_ww.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#define TBX_ALIGNMENT 1 -#define TBX_ZOOM 1 -#define TBX_CONTROLS 1 -- cgit