summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-04-23 18:19:37 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-04-23 22:49:57 +0000
commit702f9c5176eebb95c5a1bfd31c1f256b79301b19 (patch)
tree2aedc04b1af4e2f36b0da9fd5b06570faa3eef40 /cui
parent513a21aa6cf350c094289a7976de9e0cc0e7b4d4 (diff)
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>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/cfg.src3
-rw-r--r--cui/source/customize/macropg.hrc34
-rw-r--r--cui/source/customize/macropg.src2
-rw-r--r--cui/source/inc/helpid.hrc120
-rw-r--r--cui/source/options/optinet2.cxx1
-rw-r--r--cui/source/options/optinet2.hrc35
-rw-r--r--cui/source/options/optinet2.src1
-rw-r--r--cui/source/options/treeopt.hrc1
8 files changed, 1 insertions, 196 deletions
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 7d9658010819..2efab498c79c 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -23,9 +23,6 @@
#define TEXT_RENAME \
Text [ en-US ] = "Rename..." ;\
-#define TEXT_DELETE \
- Text [ en-US ] = "Delete..." ;\
-
#define TEXT_DELETE_NODOTS \
Text [ en-US ] = "Delete" ;\
diff --git a/cui/source/customize/macropg.hrc b/cui/source/customize/macropg.hrc
index 7a1d3e29370c..fe37cc7adb32 100644
--- a/cui/source/customize/macropg.hrc
+++ b/cui/source/customize/macropg.hrc
@@ -39,40 +39,6 @@
#define FT_METHOD 44
#define EDIT_METHOD 45
-
-// COL0<---------------WIDTH_1_2--------------->COL3<->COL4<----WIDTH4---->COL5
-// <--WIDTH1-->COL1<-SPACE1->COL2<--WIDTH2->
-
-#define WIDTH_TP 260 // of whole tabpage
-#define COL5 (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define COL4 (COL5-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL3 (COL4-RSC_SP_CTRL_X)
-#define COL0 (RSC_SP_TBPG_INNERBORDER_LEFT)
-#define WIDTH1_2 (COL3-COL0) // width of upper listbox
-#define SPACE1 4 // space between lower listboxes
-#define WIDTH1 ((WIDTH1_2-SPACE1)/2) // width of lower left listbox
-#define WIDTH2 (WIDTH1_2-WIDTH1-SPACE1) // width of lower right listbox
-#define COL1 (COL0+WIDTH1)
-#define COL2 (COL1+SPACE1)
-
-#define HEIGHT0 158 // of upper listbox
-#define HEIGHT_TP (HEIGHT0+6) // of whole tabpage
-#define ROW0 6 // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design
-#define ROW0A (ROW0+RSC_CD_FIXEDTEXT_HEIGHT+SPACE1)
-#define ROW1 (ROW0A+RSC_CD_PUSHBUTTON_HEIGHT) // Assign button
-#define ROW2 (ROW1+RSC_SP_CTRL_GROUP_Y)
-#define ROW3 (ROW2+RSC_CD_PUSHBUTTON_HEIGHT) // Assign component button
-#define ROW4 (ROW3+RSC_SP_CTRL_GROUP_Y)
-#define ROW5_REMOVE (ROW4+RSC_SP_CTRL_GROUP_Y) // Remove button
-#define ROW5 (ROW4+RSC_CD_DROPDOWN_HEIGHT) // script type listbox (hidden)
-#define ROW6 (ROW0+HEIGHT0)
-#define ROW7 (ROW6+RSC_SP_CTRL_Y)
-#define HEIGHT_EXTRA7 (RSC_CD_FIXEDTEXT_HEIGHT) // additional height for FT_LABEL4LB_MACROS
-#define ROW7A (ROW7+HEIGHT_EXTRA7)
-#define ROW8 (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!)
-#define ROW9 (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM)
-#define HEIGHT8 (ROW9-ROW8) // of lower listboxes
-
#define COMP_EDIT_WIDTH 100
#define COMP_DIST_Y 6
#define COMP_WIDTH (COMP_EDIT_WIDTH+RSC_CD_PUSHBUTTON_WIDTH+3*COMP_DIST_Y)
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 199bb66f6789..0cc502a7c4c0 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -55,7 +55,7 @@ ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
};
FixedText FT_METHOD
{
- Pos = MAP_APPFONT ( COMP_COL0 , ROW0 ) ;
+ Pos = MAP_APPFONT ( COMP_COL0 , COMP_ROW0 ) ;
Size = MAP_APPFONT ( COMP_EDIT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "Component method name" ;
};
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 8b2386926319..bc15fab66256 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -22,10 +22,6 @@
#include <svx/svxcommands.h>
#include <sfx2/sfxcommands.h>
-// Help-Ids --------------------------------------------------------------
-
-#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
-#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
@@ -33,107 +29,10 @@
#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH"
#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
#define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX"
-#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST"
-#define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB"
-#define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB"
-#define HID_COLORPAGE_APPBACKGROUND_LB "CUI_HID_COLORPAGE_APPBACKGROUND_LB"
-#define HID_COLORPAGE_OBJECTBOUNDARIES_LB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB"
-#define HID_COLORPAGE_TABLEBOUNDARIES_LB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB"
-#define HID_COLORPAGE_FONTCOLOR_LB "CUI_HID_COLORPAGE_FONTCOLOR_LB"
-#define HID_COLORPAGE_LINKS_LB "CUI_HID_COLORPAGE_LINKS_LB"
-#define HID_COLORPAGE_LINKSVISITED_LB "CUI_HID_COLORPAGE_LINKSVISITED_LB"
-#define HID_COLORPAGE_SPELL_LB "CUI_HID_COLORPAGE_SPELL_LB"
-#define HID_COLORPAGE_SMARTTAGS_LB "CUI_HID_COLORPAGE_SMARTTAGS_LB"
-#define HID_COLORPAGE_SHADOWCOLOR_LB "CUI_HID_COLORPAGE_SHADOWCOLOR_LB"
-#define HID_COLORPAGE_WRITERTEXTGRID_LB "CUI_HID_COLORPAGE_WRITERTEXTGRID_LB"
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB"
-#define HID_COLORPAGE_WRITERIDXSHADINGS_LB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB"
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB"
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB"
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB"
-#define HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB "CUI_HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB"
-#define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB"
-#define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB"
-#define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB"
-#define HID_COLORPAGE_HTMLKEYWORD_LB "CUI_HID_COLORPAGE_HTMLKEYWORD_LB"
-#define HID_COLORPAGE_HTMLUNKNOWN_LB "CUI_HID_COLORPAGE_HTMLUNKNOWN_LB"
-#define HID_COLORPAGE_CALCGRID_LB "CUI_HID_COLORPAGE_CALCGRID_LB"
-#define HID_COLORPAGE_CALCPAGEBREAK_LB "CUI_HID_COLORPAGE_CALCPAGEBREAK_LB"
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB"
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB"
-#define HID_COLORPAGE_CALCDETECTIVE_LB "CUI_HID_COLORPAGE_CALCDETECTIVE_LB"
-#define HID_COLORPAGE_CALCDETECTIVEERROR_LB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB"
-#define HID_COLORPAGE_CALCREFERENCE_LB "CUI_HID_COLORPAGE_CALCREFERENCE_LB"
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB"
-#define HID_COLORPAGE_DRAWGRID_LB "CUI_HID_COLORPAGE_DRAWGRID_LB"
-#define HID_COLORPAGE_BASICIDENTIFIER_LB "CUI_HID_COLORPAGE_BASICIDENTIFIER_LB"
-#define HID_COLORPAGE_BASICCOMMENT_LB "CUI_HID_COLORPAGE_BASICCOMMENT_LB"
-#define HID_COLORPAGE_BASICNUMBER_LB "CUI_HID_COLORPAGE_BASICNUMBER_LB"
-#define HID_COLORPAGE_BASICSTRING_LB "CUI_HID_COLORPAGE_BASICSTRING_LB"
-#define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB"
-#define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB"
-#define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB"
-#define HID_COLORPAGE_SQLIDENTIFIER_LB "CUI_HID_COLORPAGE_SQLIDENTIFIER_LB"
-#define HID_COLORPAGE_SQLNUMBER_LB "CUI_HID_COLORPAGE_SQLNUMBER_LB"
-#define HID_COLORPAGE_SQLSTRING_LB "CUI_HID_COLORPAGE_SQLSTRING_LB"
-#define HID_COLORPAGE_SQLOPERATOR_LB "CUI_HID_COLORPAGE_SQLOPERATOR_LB"
-#define HID_COLORPAGE_SQLKEYWORD_LB "CUI_HID_COLORPAGE_SQLKEYWORD_LB"
-#define HID_COLORPAGE_SQLPARAMETER_LB "CUI_HID_COLORPAGE_SQLPARAMETER_LB"
-#define HID_COLORPAGE_SQLCOMMENT_LB "CUI_HID_COLORPAGE_SQLCOMMENT_LB"
-#define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB"
-#define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB"
-#define HID_COLORPAGE_APPBACKGROUND_CB "CUI_HID_COLORPAGE_APPBACKGROUND_CB"
-#define HID_COLORPAGE_OBJECTBOUNDARIES_CB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB"
-#define HID_COLORPAGE_TABLEBOUNDARIES_CB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB"
-#define HID_COLORPAGE_FONTCOLOR_CB "CUI_HID_COLORPAGE_FONTCOLOR_CB"
-#define HID_COLORPAGE_LINKS_CB "CUI_HID_COLORPAGE_LINKS_CB"
-#define HID_COLORPAGE_LINKSVISITED_CB "CUI_HID_COLORPAGE_LINKSVISITED_CB"
-#define HID_COLORPAGE_SPELL_CB "CUI_HID_COLORPAGE_SPELL_CB"
-#define HID_COLORPAGE_SMARTTAGS_CB "CUI_HID_COLORPAGE_SMARTTAGS_CB"
-#define HID_COLORPAGE_SHADOWCOLOR_CB "CUI_HID_COLORPAGE_SHADOWCOLOR_CB"
-#define HID_COLORPAGE_WRITERTEXTGRID_CB "CUI_HID_COLORPAGE_WRITERTEXTGRID_CB"
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB"
-#define HID_COLORPAGE_WRITERIDXSHADINGS_CB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB"
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_CB"
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB"
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB"
-#define HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB "CUI_HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB"
-#define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB"
-#define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB"
-#define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB"
-#define HID_COLORPAGE_HTMLKEYWORD_CB "CUI_HID_COLORPAGE_HTMLKEYWORD_CB"
-#define HID_COLORPAGE_HTMLUNKNOWN_CB "CUI_HID_COLORPAGE_HTMLUNKNOWN_CB"
-#define HID_COLORPAGE_CALCGRID_CB "CUI_HID_COLORPAGE_CALCGRID_CB"
-#define HID_COLORPAGE_CALCPAGEBREAK_CB "CUI_HID_COLORPAGE_CALCPAGEBREAK_CB"
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB"
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB"
-#define HID_COLORPAGE_CALCDETECTIVE_CB "CUI_HID_COLORPAGE_CALCDETECTIVE_CB"
-#define HID_COLORPAGE_CALCDETECTIVEERROR_CB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_CB"
-#define HID_COLORPAGE_CALCREFERENCE_CB "CUI_HID_COLORPAGE_CALCREFERENCE_CB"
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_CB"
-#define HID_COLORPAGE_DRAWGRID_CB "CUI_HID_COLORPAGE_DRAWGRID_CB"
-#define HID_COLORPAGE_BASICIDENTIFIER_CB "CUI_HID_COLORPAGE_BASICIDENTIFIER_CB"
-#define HID_COLORPAGE_BASICCOMMENT_CB "CUI_HID_COLORPAGE_BASICCOMMENT_CB"
-#define HID_COLORPAGE_BASICNUMBER_CB "CUI_HID_COLORPAGE_BASICNUMBER_CB"
-#define HID_COLORPAGE_BASICSTRING_CB "CUI_HID_COLORPAGE_BASICSTRING_CB"
-#define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB"
-#define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB"
-#define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB"
-#define HID_COLORPAGE_SQLIDENTIFIER_CB "CUI_HID_COLORPAGE_SQLIDENTIFIER_CB"
-#define HID_COLORPAGE_SQLNUMBER_CB "CUI_HID_COLORPAGE_SQLNUMBER_CB"
-#define HID_COLORPAGE_SQLSTRING_CB "CUI_HID_COLORPAGE_SQLSTRING_CB"
-#define HID_COLORPAGE_SQLOPERATOR_CB "CUI_HID_COLORPAGE_SQLOPERATOR_CB"
-#define HID_COLORPAGE_SQLKEYWORD_CB "CUI_HID_COLORPAGE_SQLKEYWORD_CB"
-#define HID_COLORPAGE_SQLPARAMETER_CB "CUI_HID_COLORPAGE_SQLPARAMETER_CB"
-#define HID_COLORPAGE_SQLCOMMENT_CB "CUI_HID_COLORPAGE_SQLCOMMENT_CB"
-#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE"
#define HID_CONFIG_EVENT_OFFICE_BASED "CUI_HID_CONFIG_EVENT_OFFICE_BASED"
#define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED"
#define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR"
#define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"
-#define HID_SVX_CONFIG_MENU_CONTENTS "CUI_HID_SVX_CONFIG_MENU_CONTENTS"
-#define HID_GALLERY_NEWTHEME_FINDFILES "CUI_HID_GALLERY_NEWTHEME_FINDFILES"
-#define HID_GALLERY_NEWTHEME_ADDFILES "CUI_HID_GALLERY_NEWTHEME_ADDFILES"
#define HID_HANGULDLG_BUTTON_OPTIONS "CUI_HID_HANGULDLG_BUTTON_OPTIONS"
#define HID_HANGULDLG_BUTTON_CLOSE "CUI_HID_HANGULDLG_BUTTON_CLOSE"
#define HID_HANGULDLG_BUTTON_IGNORE "CUI_HID_HANGULDLG_BUTTON_IGNORE"
@@ -141,9 +40,6 @@
#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE"
#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL"
#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD"
-#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET"
-#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT"
-#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR"
#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS"
#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID"
#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST"
@@ -160,26 +56,10 @@
#define HID_SVX_UP_TOOLBAR_ITEM "CUI_HID_SVX_UP_TOOLBAR_ITEM"
#define HID_SVX_DOWN_TOOLBAR_ITEM "CUI_HID_SVX_DOWN_TOOLBAR_ITEM"
#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN"
-#define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST"
#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
-#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL"
#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
-#define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1"
-#define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2"
-#define HID_TPCOLOR_RGB_3 "CUI_HID_TPCOLOR_RGB_3"
-#define HID_TPCOLOR_CMYK_1 "CUI_HID_TPCOLOR_CMYK_1"
-#define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2"
-#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3"
-
-#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION"
-#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
-#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
-
-#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
-
#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
-#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME"
#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL"
#define HID_HYPERLINK_DOCUMENT "CUI_HID_HYPERLINK_DOCUMENT"
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index d151e2f8b8e5..23851bd484a2 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -46,7 +46,6 @@
#include "optinet2.hxx"
#include <svx/svxdlg.hxx>
#include <cuires.hrc>
-#include "optinet2.hrc"
#include "helpid.hrc"
#include <svx/ofaitem.hxx>
#include <sfx2/htmlmode.hxx>
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
deleted file mode 100644
index cc5a06e9b16c..000000000000
--- a/cui/source/options/optinet2.hrc
+++ /dev/null
@@ -1,35 +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 _SVX_OPTINET_HRC
-#define _SVX_OPTINET_HRC
-
-#include <sfx2/tabpage.hrc>
-#include <svtools/controldims.hrc>
-
-// Defines - SvxEMailTabPage_Impl
-#define FL_MAIL 1
-#define FT_MAILERURL 2
-#define FI_MAILERURL 3
-#define ED_MAILERURL 4
-#define PB_MAILERURL 5
-#define STR_DEFAULT_FILENAME 6
-
-#endif // #ifndef _SVX_OPTINET_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 2c282accdca7..ffb829b41c3e 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -20,7 +20,6 @@
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
#include <cuires.hrc>
-#include "optinet2.hrc"
ErrorBox RID_SVXERR_OPT_PROXYPORTS
{
diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc
index aa502a4aa090..c3eb93193e42 100644
--- a/cui/source/options/treeopt.hrc
+++ b/cui/source/options/treeopt.hrc
@@ -28,7 +28,6 @@
#define FL_SEPARATOR 19
-#define FT_HINT 21
#define ST_LOAD_ERROR 24
// metrics