huge hrc and src file cleanup

* mostly fallout from ui conversion
* some completely unused defines from src files
* lots of unused HID ids

Change-Id: I976561205798db3d06ee139de6223f638e58f47a
Reviewed-on: https://gerrit.libreoffice.org/9142
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>

9 files changed, 1 insertions, 312 deletions

diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 173dd3f6305a..a18ddbf94718 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -31,7 +31,6 @@
 #include <editeng/unolingu.hxx>
 #include <svx/dialmgr.hxx>
 #include "svx/dialogs.hrc"
-#include "ctredlin.hrc"
 #include <svx/ctredlin.hxx>
 #include "helpid.hrc"
 
diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc
deleted file mode 100644
index 417192f165e0..000000000000
--- a/svx/source/dialog/ctredlin.hrc
+++ /dev/null
@@ -1,23 +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 .
- */
-
-#define TP_FILTER       11
-#define TP_VIEW         12
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc
index 88269f5a2849..9ba1e3c43911 100644
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.hrc
@@ -161,114 +161,6 @@
 
 #define BROKEN_CONTROLWIDTH         (BROKEN_COL4-BROKEN_COL0)
 
-// TabPage Error Report Welcome
-// most defines equal to TabPage Recovery
-
-
-// TabPage Error Report Send
-// borrow basic metrics from TabPage Recovery
-
-#define FT_ERRSEND_DOCTYPE          20
-#define ED_ERRSEND_DOCTYPE          21
-#define FT_ERRSEND_USING            22
-#define ML_ERRSEND_USING            23
-#define BTN_ERRSEND_SHOWREP         24
-#define BTN_ERRSEND_OPT             25
-#define CB_ERRSEND_CONTACT          26
-#define FT_ERRSEND_EMAILADDR        27
-#define ED_ERRSEND_EMAILADDR        28
-
-#define ERRSEND_WIDTH               (RECOV_WIDTH)
-#define ERRSEND_HEIGHT              (RECOV_HEIGHT)
-#define ERRSEND_TITLEWINHEIGHT      SAVE_TITLEWINHEIGHT
-
-#define ERRSEND_COL0                (RSC_SP_DLG_INNERBORDER_LEFT)
-#define ERRSEND_COL1                (ERRSEND_COL0+RSC_SP_CHK_TEXTINDENT)
-
-#define ERRSEND_COL4                (ERRSEND_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define ERRSEND_COL3                (ERRSEND_COL4-RSC_CD_PUSHBUTTON_WIDTH)
-#define ERRSEND_COL2                (ERRSEND_COL3-RSC_SP_CTRL_X)
-
-#define ERRSEND_COL6                (ERRSEND_COL3-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH)
-#define ERRSEND_COL5                (ERRSEND_COL6-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
-
-#define ERRSEND_CONTROLWIDTH1       (ERRSEND_COL4-ERRSEND_COL0)
-#define ERRSEND_CONTROLWIDTH2       (ERRSEND_COL2-ERRSEND_COL0)
-#define ERRSEND_CONTROLWIDTH3       (ERRSEND_COL2-ERRSEND_COL1)
-
-#define ERRSEND_ROW0                ((ERRSEND_TITLEWINHEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
-#define ERRSEND_ROW1                (ERRSEND_TITLEWINHEIGHT)
-#define ERRSEND_ROW2                (ERRSEND_ROW1+RSC_SP_CTRL_Y)
-#define ERRSEND_ROW3                (ERRSEND_ROW2+3*RSC_CD_FIXEDTEXT_HEIGHT)
-#define ERRSEND_ROW4                (ERRSEND_ROW3+RSC_SP_CTRL_GROUP_Y)
-#define ERRSEND_ROW5                (ERRSEND_ROW4+2*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_GROUP_Y)
-#define ERRSEND_ROW6                (ERRSEND_ROW5+RSC_CD_TEXTBOX_HEIGHT)
-#define ERRSEND_ROW7                (ERRSEND_ROW6+RSC_SP_CTRL_Y)
-#define ERRSEND_ROW8                (ERRSEND_ROW7+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_GROUP_Y)
-#define ERRSEND_ROW9                (ERRSEND_ROW8+RSC_CD_PUSHBUTTON_HEIGHT)
-#define ERRSEND_ROW10               (ERRSEND_ROW9+RSC_SP_CTRL_GROUP_Y)
-
-#define ERRSEND_ROW16               (ERRSEND_HEIGHT-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_HEIGHT)
-#define ERRSEND_ROW15               (ERRSEND_ROW16-RSC_SP_CTRL_GROUP_Y-RSC_CD_FIXEDLINE_HEIGHT)
-#define ERRSEND_ROW14               (ERRSEND_ROW15-RSC_SP_CTRL_GROUP_Y-RSC_CD_TEXTBOX_HEIGHT)
-#define ERRSEND_ROW13               (ERRSEND_ROW14-RSC_SP_CTRL_GROUP_Y-RSC_CD_FIXEDTEXT_HEIGHT)
-#define ERRSEND_ROW12               (ERRSEND_ROW13-RSC_SP_CTRL_GROUP_Y-RSC_CD_CHECKBOX_HEIGHT)
-
-// Error Report Options Dialog
-
-#define ERROPT_WIDTH    220
-#define ERROPT_HEIGHT   180
-
-#define FL_ERROPT_PROXY         1
-#define BTN_ERROPT_SYSTEM       2
-#define BTN_ERROPT_DIRECT       3
-#define BTN_ERROPT_MANUAL       4
-#define FT_ERROPT_PROXYSERVER   5
-#define ED_ERROPT_PROXYSERVER   6
-#define FT_ERROPT_PROXYPORT     7
-#define ED_ERROPT_PROXYPORT     8
-#define FT_ERROPT_DESCRIPTION   9
-#define FL_ERROPT_BUTTONS       10
-#define BTN_ERROPT_OK           11
-#define BTN_ERROPT_CANCEL       12
-
-#define ERROPT_COLA             (RSC_SP_DLG_INNERBORDER_LEFT)
-#define ERROPT_COLB             (ERROPT_COLA + RSC_SP_CTRL_X)
-#define ERROPT_COLC             (ERROPT_COLB + RSC_SP_CHK_TEXTINDENT)
-
-#define ERROPT_COLF             (ERROPT_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT)
-#define ERROPT_COLE             (ERROPT_COLF - RSC_CD_PUSHBUTTON_WIDTH)
-#define ERROPT_COLD             (ERROPT_COLE - RSC_SP_CTRL_DESC_X - RSC_CD_PUSHBUTTON_WIDTH)
-
-#define ERROPT_ROW0             (RSC_SP_DLG_INNERBORDER_TOP)
-#define ERROPT_ROW1             (ERROPT_ROW0 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_CTRL_Y)
-#define ERROPT_ROW2             (ERROPT_ROW1 + RSC_CD_RADIOBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y)
-#define ERROPT_ROW3             (ERROPT_ROW2 + RSC_CD_RADIOBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y)
-#define ERROPT_ROW4             (ERROPT_ROW3 + RSC_CD_RADIOBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y)
-#define ERROPT_ROW5             (ERROPT_ROW4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y)
-#define ERROPT_ROW6             (ERROPT_ROW5 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y)
-
-#define ERROPT_ROW9             (ERROPT_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT)
-#define ERROPT_ROW8             (ERROPT_ROW9 - RSC_SP_CTRL_DESC_Y - RSC_CD_FIXEDLINE_HEIGHT)
-#define ERROPT_ROW7             (ERROPT_ROW8 - RSC_SP_CTRL_DESC_Y)
-
-#define ERROPT_SERVER_WIDTH     150
-#define ERROPT_PORT_WIDTH       (ERROPT_COLF-ERROPT_COLC-RSC_SP_CTRL_GROUP_X-ERROPT_SERVER_WIDTH)
-
-// Error Report Preview Dialog
-
-#define ERRPREVIEW_WIDTH    300
-#define ERRPREVIEW_HEIGHT   200
-
-#define ML_ERRPREVIEW_CONTENT   1
-#define BTN_ERRPREVIEW_OK       2
-#define ERRPREVIEW_COLA         (RSC_SP_DLG_INNERBORDER_LEFT)
-#define ERRPREVIEW_COLB         (ERRPREVIEW_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - RSC_CD_PUSHBUTTON_WIDTH)
-#define ERRPREVIEW_COLC         (ERRPREVIEW_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT)
-#define ERRPREVIEW_ROW0         (RSC_SP_DLG_INNERBORDER_TOP)
-#define ERRPREVIEW_ROW1         (ERRPREVIEW_ROW2 - RSC_SP_CTRL_Y)
-#define ERRPREVIEW_ROW2         (ERRPREVIEW_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 0977b6177e83..74ae09242e89 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -80,14 +80,6 @@
 #define STR_HEADER_PREFIX       10
 #define STR_HEADER_URL          11
 
-// class AddModelDialog
-#define FL_MODEL                10
-#define FT_MODEL_NAME           11
-#define ED_MODEL_NAME           12
-
-// class AddModelDialog
-#define CB_MODIFIES_DOCUMENT    1
-
 #endif //_SVX_DATANAVI_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hrc b/svx/source/sidebar/area/AreaPropertyPanel.hrc
index 7112ab4ccb4b..39a6283d59af 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hrc
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hrc
@@ -63,7 +63,6 @@
 #define CONTROL_HEIGHT      12
 #define CONTROL_WIDTH           45
 #define LISTBOX_HEIGHT     80
-#define ROTATE_BUTTON_WIDTH        13
 #define ROTATE_BUTTON_SPACING      15
 #define POP_WIDTH   2*POPUPPANEL_MARGIN_HORIZONTAL+2*CONTROL_WIDTH+CONTROL_SPACING_HORIZONTAL
 #define POP_HEIGHT  2*POPUPPANEL_MARGIN_VERTICAL + 4*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + MBOX_HEIGHT ) + 3*CONTROL_SPACING_VERTICAL
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index 02547f7effad..28598db7d1fd 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -21,15 +21,9 @@
 #define CUSTOM_W    74
 #define CUSTOM_H    POPUPPANEL_MARGIN_LARGE * 2 +  TEXT_HEIGHT + 12 +  TEXT_CONTROL_SPACING_VERTICAL
 
-#define TBI_STYLE           14
 #define STR_QH_TB_WIDTH     15
 #define STR_QH_TB_COLOR     16
 
-#define FT_EDGESTYLE        18
-#define LB_EDGESTYLE        19
-#define FT_CAPSTYLE         20
-#define LB_CAPSTYLE         21
-
 #define IMG_COLOR           (RID_SVX_SIDEBAR_BEGIN + 20)
 #define IMG_NONE_ICON       (RID_SVX_SIDEBAR_BEGIN + 21)
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index 24866bdebf25..4729c8a4e0c7 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -38,7 +38,6 @@
 #define IID_NUMBER          2
 //============================== popup bullet and numbering & back color =========================
 #define VS_VALUES           1
-#define IL_BULLET_BITMAPS   2
 #define CB_BULLET_MORE      4
 #define BMP_BULLET_MORE     5
 
@@ -57,8 +56,6 @@
 #define FT_CUSTOM                          14
 #define FT_LINE_SPACING                    15
 #define FT_OF                              16
-#define IMG_LPCUSTOMNOBORDER               27
-#define FI_CUSTOM_NOBORDER_LSPACE          28
 #define LINE_SPACING                       29
 #define STR_SPACING1                       30
 #define STR_SPACING115                     31
@@ -73,166 +70,26 @@
 #define STR_LS_OF                          42
 
 //============================== Help ID ==============================
-#define HID_TBX_HORIZONTALALIGNMENT "HID_TBX_HORIZONTALALIGNMENT"
-#define HID_TBI_HOR_ALIGN_LEFT      "HID_TBI_HOR_ALIGN_LEFT"
-#define HID_TBI_HOR_ALIGN_CENTER    "HID_TBI_HOR_ALIGN_CENTER"
-#define HID_TBI_HOR_ALIGN_RIGHT     "HID_TBI_HOR_ALIGN_RIGHT"
-#define HID_TBI_HOR_ALIGN_JUSTIFY   "HID_TBI_HOR_ALIGN_JUSTIFY"
-
-#define HID_TBX_VERT_ALIGN          "HID_TBX_VERT_ALIGN"
-#define HID_TBI_VERT_ALIGN_TOP      "HID_TBI_VERT_ALIGN_TOP"
-#define HID_TBI_VERT_ALIGN_CENTER   "HID_TBI_VERT_ALIGN_CENTER"
-#define HID_TBI_VERT_ALIGN_BOT      "HID_TBI_VERT_ALIGN_BOT"
-
-#define HID_TBX_INDENT "HID_TBX_INDENT"
-#define HID_TBI_INDENT "HID_TBI_INDENT"
-//#define HID_TBX_LINESP 705263129
-//#define HID_TBI_LINESP 705262617
-#define HID_TBX_GRSPACE "HID_TBX_GRSPACE"
-#define HID_TBI_GRSPACE "HID_TBI_GRSPACE"
-#define HID_TBX_BACK_COLOR  "HID_TBX_BACK_COLOR"
-#define HID_TBI_BACK_COLOR  "HID_TBI_BACK_COLOR"
-
-//#define HID_TBX_INDENT_INC_DEC 705263121
-//#define HID_TBI_INDENT_DEC 705262662
-//#define HID_TBI_INDENT_INC 705262661
-//#define HID_TBX_UL_INC_DEC 705263137
-//#define HID_TBI_UL_INC 705262663
-//#define HID_TBI_UL_DEC 705262664
-
-//#define HID_TBX_NUM_BULLET 705263148
-//#define HID_TBI_NUMBERING 705262655
-//#define HID_TBI_BULLET    705262656
-
 #define HID_POPUP_BULLET_CB_BULLET_MORE "HID_POPUP_BULLET_CB_BULLET_MORE"
 #define HID_POPUP_BULLET_VS_VALUES      "HID_POPUP_BULLET_VS_VALUES"
 #define HID_POPUP_NUM_CB_NUMBERING_MORE "HID_POPUP_NUM_CB_NUMBERING_MORE"
 #define HID_POPUP_NUM_VS_NUMBERING      "HID_POPUP_NUM_VS_NUMBERING"
 
-#define HID_POPUP_INDENT_ED_INDENT_LEFTINDENT   "HID_POPUP_INDENT_ED_INDENT_LEFTINDENT"
-#define HID_POPUP_INDENT_ED_INDENT_RIGHTINDENT  "HID_POPUP_INDENT_ED_INDENT_RIGHTINDENT"
-#define HID_POPUP_INDENT_ED_INDENT_FLINDENT     "HID_POPUP_INDENT_ED_INDENT_FLINDENT"
-#define HID_POPUP_INDENT_TBX_INDENT_NONE    "HID_POPUP_INDENT_TBX_INDENT_NONE"
-#define HID_POPUP_INDENT_TBI_INDENT_NONE    "HID_POPUP_INDENT_TBI_INDENT_NONE"
-#define HID_POPUP_INDENT_TBX_INDENT_BEFORE1 "HID_POPUP_INDENT_TBX_INDENT_BEFORE1"
-#define HID_POPUP_INDENT_TBI_INDENT_BEFORE1 "HID_POPUP_INDENT_TBI_INDENT_BEFORE1"
-#define HID_POPUP_INDENT_TBX_INDENT_BEFORE2 "HID_POPUP_INDENT_TBX_INDENT_BEFORE2"
-#define HID_POPUP_INDENT_TBI_INDENT_BEFORE2 "HID_POPUP_INDENT_TBI_INDENT_BEFORE2"
-#define HID_POPUP_INDENT_TBX_INDENT_FLINE   "HID_POPUP_INDENT_TBX_INDENT_FLINE"
-#define HID_POPUP_INDENT_TBI_INDENT_FLINE   "HID_POPUP_INDENT_TBI_INDENT_FLINE"
-#define HID_POPUP_INDENT_TBX_INDENT_HANGING "HID_POPUP_INDENT_TBX_INDENT_HANGING"
-#define HID_POPUP_INDENT_TBI_INDENT_HANGING "HID_POPUP_INDENT_TBI_INDENT_HANGING"
-#define HID_POPUP_INDENT_TBX_INDENT_LCUSTOM "HID_POPUP_INDENT_TBX_INDENT_LCUSTOM"
-#define HID_POPUP_INDENT_TBI_INDENT_LCUSTOM "HID_POPUP_INDENT_TBI_INDENT_LCUSTOM"
-
 #define HID_POPUP_LS_LB_LINE_SPACING            "HID_POPUP_LS_LB_LINE_SPACING"
 #define HID_POPUP_LS_ED_SBINDE_LINEDISTPERCENT  "HID_POPUP_LS_ED_SBINDE_LINEDISTPERCENT"
 #define HID_POPUP_LS_ED_SBINDE_LINEDISTPOINT     "HID_POPUP_LS_ED_SBINDE_LINEDISTPOINT"
-#define HID_POPUP_LS_TBX_LINESP_1               "HID_POPUP_LS_TBX_LINESP_1"
-#define HID_POPUP_LS_TBI_LINESP_1               "HID_POPUP_LS_TBI_LINESP_1"
-#define HID_POPUP_LS_TBX_LINESP_15              "HID_POPUP_LS_TBX_LINESP_15"
-#define HID_POPUP_LS_TBI_LINESP_15              "HID_POPUP_LS_TBI_LINESP_15"
-#define HID_POPUP_LS_TBX_LINESP_2               "HID_POPUP_LS_TBX_LINESP_2"
-#define HID_POPUP_LS_TBI_LINESP_2               "HID_POPUP_LS_TBI_LINESP_2"
-#define HID_POPUP_LS_TBX_LINESP_115             "HID_POPUP_LS_TBX_LINESP_115"
-#define HID_POPUP_LS_TBI_LINESP_115             "HID_POPUP_LS_TBI_LINESP_115"
-#define HID_POPUP_LS_TBX_LINESP_LCUSTOM         "HID_POPUP_LS_TBX_LINESP_LCUSTOM"
-#define HID_POPUP_LS_TBI_LINESP_LCUSTOM         "HID_POPUP_LS_TBI_LINESP_LCUSTOM"
-
-#define HID_POPUP_PS_ED_SBINDE_TOPDIST      "HID_POPUP_PS_ED_SBINDE_TOPDIST"
-#define HID_POPUP_PS_ED_SBINDE_BOTTOMDIST   "HID_POPUP_PS_ED_SBINDE_BOTTOMDIST"
-#define HID_POPUP_PS_TBX_NORMAL             "HID_POPUP_PS_TBX_NORMAL"
-#define HID_POPUP_PS_TBI_NORMAL             "HID_POPUP_PS_TBI_NORMAL"
-#define HID_POPUP_PS_TBX_NARROW             "HID_POPUP_PS_TBX_NARROW"
-#define HID_POPUP_PS_TBI_NARROW             "HID_POPUP_PS_TBI_NARROW"
-#define HID_POPUP_PS_TBX_WIDE               "HID_POPUP_PS_TBX_WIDE"
-#define HID_POPUP_PS_TBI_WIDE               "HID_POPUP_PS_TBI_WIDE"
-#define HID_POPUP_PS_TBX_LASTCUSTOM         "HID_POPUP_PS_TBX_LASTCUSTOM"
-#define HID_POPUP_PS_TBI_LASTCUSTOM         "HID_POPUP_PS_TBI_LASTCUSTOM"
 
 //============================== Property ==============================
 #define _FIXED_TEXT_HEIGHT          9
 #define _FIXED_TEXT_WIDTH           40
 #define CONTROL_HEIGHT              15
 #define CONTROL_WIDTH               45
-#define ALIGNMENT_TBX_HEIGHT        17
-#define ALIGNMENT_TBX_WIDTH         13
 #define LISTBOX_HEIGHT              80
-#define IMAGE_SIZE                  16
-#define POPUP_TOOLBOX_SIZE          32
 #define TOOLBOX_HEIGHT              22
 #define TOOLBOX_WIDTH               23
-#define TEXT_SPACING_VERTICAL       2
-#define BUTTON_SPACING              18
-//#define TOOLBOX_ITEM_HEIGHT           17
 #define VS_SPACING_WIDTH            78
 
-//==============================Section page position==============================
-
-#define TBX_HORI_ALIGN_X    SECTIONPAGE_MARGIN_HORIZONTAL + TBX_OUT_BORDER_OFFSET_X/2
-#define TBX_HORI_ALIGN_Y    SECTIONPAGE_MARGIN_VERTICAL_TOP
-
-#define TBX_VERT_ALIGN_X    TBX_HORI_ALIGN_X + TBX_OUT_BORDER_OFFSET_X*2 + TOOLBOX_ITEM_WIDTH * 4 + CONTROL_SPACING_HORIZONTAL
-
-#define TBX_NUM_BULLET_Y    TBX_HORI_ALIGN_Y + TOOLBOX_ITEM_HEIGHT + CONTROL_SPACING_VERTICAL - 1
-
-#define FT_PARA_SPACE_X     SECTIONPAGE_MARGIN_HORIZONTAL
-#define FT_PARA_SPACE_Y     TBX_NUM_BULLET_Y + TOOLBOX_ITEM_HEIGHT + CONTROL_SPACING_VERTICAL - 3
-#define FT_PARA_SPACE_Y2    TBX_HORI_ALIGN_Y + TOOLBOX_ITEM_HEIGHT + CONTROL_SPACING_VERTICAL - 2
-
-#define TBX_PARA_SPACE_INC_DEC_X    TBX_HORI_ALIGN_X
-#define TBX_PARA_SPACE_INC_DEC_Y    FT_PARA_SPACE_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
-#define TBX_PARA_SPACE_INC_DEC_Y2   FT_PARA_SPACE_Y2 + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
-
-#define FT_PARA_INDENT_X    TBX_VERT_ALIGN_X
-
-#define FT_PARA_INDENT_Y2   FT_PARA_SPACE_Y2
-
-#define TBX_PARA_INDENT_INC_DEC_X   TBX_VERT_ALIGN_X
-#define TBX_PARA_INDENT_INC_DEC_Y   TBX_PARA_SPACE_INC_DEC_Y
-#define TBX_PARA_INDENT_INC_DEC_Y2  TBX_PARA_SPACE_INC_DEC_Y2
-
-#define MBX_TOP_DIST_X      FT_PARA_SPACE_X + TOOLBOX_ITEM_WIDTH
-#define MBX_TOP_DIST_Y      TBX_PARA_SPACE_INC_DEC_Y + TOOLBOX_ITEM_WIDTH + CONTROL_SPACING_VERTICAL + 4*TBX_OUT_BORDER_OFFSET_Y - 1
-#define MBX_TOP_DIST_Y2     TBX_PARA_SPACE_INC_DEC_Y2 + TOOLBOX_ITEM_WIDTH + CONTROL_SPACING_VERTICAL + 4*TBX_OUT_BORDER_OFFSET_Y - 1
-#define MBX_BOT_DIST_X      MBX_TOP_DIST_X
-#define MBX_BOT_DIST_Y      MBX_TOP_DIST_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
-#define MBX_BOT_DIST_Y2     MBX_TOP_DIST_Y2 + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
-
-#define IMG_SPACE_X         FT_PARA_SPACE_X - 3
-#define IMG_SPACE1_Y        MBX_TOP_DIST_Y  - 1
-#define IMG_SPACE2_Y        MBX_BOT_DIST_Y  - 1
-#define IMG_SPACE1_Y2       MBX_TOP_DIST_Y2  - 1
-#define IMG_SPACE2_Y2       MBX_BOT_DIST_Y2  - 1
-
-#define MBX_LEFT_DIST_X     FT_PARA_INDENT_X + TOOLBOX_ITEM_WIDTH
-#define MBX_LEFT_DIST_Y     MBX_TOP_DIST_Y
-#define MBX_LEFT_DIST_Y2    MBX_TOP_DIST_Y2
-#define MBX_RIGHT_DIST_X    MBX_LEFT_DIST_X
-#define MBX_RIGHT_DIST_Y    MBX_BOT_DIST_Y
-#define MBX_RIGHT_DIST_Y2   MBX_BOT_DIST_Y2
-#define MBX_FLINE_DIST_X    MBX_LEFT_DIST_X
-#define MBX_FLINE_DIST_Y    MBX_RIGHT_DIST_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
-#define MBX_FLINE_DIST_Y2   MBX_RIGHT_DIST_Y2 + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
-
-#define TBX_LINE_SPACE_X    TBX_HORI_ALIGN_X
-#define TBX_LINE_SPACE_Y    MBX_FLINE_DIST_Y
-#define TBX_LINE_SPACE_Y2   MBX_FLINE_DIST_Y2
-
-#define PARA_SECTIONPAGE_HEIGHT     MBX_FLINE_DIST_Y + TOOLBOX_ITEM_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT
-#define PARA_SECTIONPAGE_HEIGHT_2   MBX_FLINE_DIST_Y2 + TOOLBOX_ITEM_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT
-
-#define LINE_X_WHITE        FT_PARA_INDENT_X - 5
-#define LINE_TOP_Y          FT_PARA_INDENT_Y + 1
-#define LINE_TOP_Y2         FT_PARA_INDENT_Y2 + 1
-#define LINE_BOT_Y          TBX_LINE_SPACE_Y + TOOLBOX_ITEM_HEIGHT - 1
-#define LINE_BOT_Y2         TBX_LINE_SPACE_Y2 + TOOLBOX_ITEM_HEIGHT - 1
-
 //==============================numbering and bullet==============================
-#define NB_MARGIN_VERTICAL      POPUPPANEL_MARGIN_VERTICAL
-#define NB_MARGIN_HORIZONTAL    POPUPPANEL_MARGIN_HORIZONTAL
-#define SPACING_VERTICAL_S3         8
-//#define SPACING_VERTICAL_S1       12
 #define POPUPPANEL_MARGIN_NB   4
 
 #define NB_IMAGE_WIDTH      25
@@ -262,7 +119,6 @@
 #define POPUP_HEIGHT_NUM    VS_HEIGHT_NUM + POPUPPANEL_MARGIN_NB * 3 + CUST_MORE_BUTTON_HEIGHT
 
 #define CUST_MORE_BUTTON_X  1
-#define CUST_MORE_BUTTON_IMG_OFF_X      2   //NB_MARGIN_HORIZONTAL - CUST_MORE_BUTTON_X + OFFSET_X
 
 //==============================Line Spacing popup page=======================
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 91ecf45cf298..8938c367c157 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -21,15 +21,6 @@
 
 #define MASKCOLOR   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
 
-#define SVX_PROPERTYPANEL_PARA_VERT_IDLIST \
-    IdList =               \
-    {                      \
-        IID_VERT_TOP ;     \
-        IID_VERT_CENTER ;   \
-        IID_VERT_BOTTOM ;   \
-    };                     \
-    IdCount = { 3 ; };
-
 #define SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST \
     IdList =               \
     {                      \
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 9d88fd1fde45..957c2aeeff51 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -18,7 +18,7 @@
  */
 
 #include "svx/svdstr.hrc"
- // Ab hier gecachte Strings
+
 String STR_ObjNameSingulNONE
 {
     Text [ en-US ] = "draw object" ;
@@ -453,7 +453,6 @@ String STR_ObjNamePluralGRAFSVG
 };
 
 
-
 String STR_ObjNameSingulOLE2
 {
     Text [ en-US ] = "embedded object (OLE)" ;
@@ -547,9 +546,6 @@ String STR_ObjNameSingulPlural
 };
 
 
-
-
-
 // New in 537: names for 3D objects
 String STR_ObjNameSingulCube3d
 {
@@ -627,9 +623,6 @@ String STR_ObjNamePluralSphere3d
 };
 
 
-
-
-
 String STR_EditWithCopy
 {
     Text [ en-US ] = "with copy" ;
@@ -1118,7 +1111,6 @@ String STR_StandardLayerName
 };
 
 
-
 String STR_ItemValON
 {
     Text [ en-US ] = "on" ;
@@ -1570,9 +1562,6 @@ String STR_ItemNam_SHEARANGLE
 };
 
 
-
- // End of cached strings
-
  // Now: bitmaps:
 Bitmap BMAP_GrafikEi { File = "grafikei.png" ; };
 Bitmap BMAP_GrafikDe { File = "grafikde.png" ; };