[Libreoffice-commits] core.git: basctl/inc basctl/source cui/source dbaccess/inc dbaccess/source desktop/source editeng/inc extensions/source fpicker/source framework/inc include/sfx2 include/svl include/svtools include/svx reportdesign/inc reportdesign/source sc/source sd/inc sd/source sfx2/source svtools/source svx/inc svx/source sw/inc sw/source vcl/inc xmlsecurity/source
Thomas Arnhold
thomas at arnhold.org
Wed Apr 23 15:50:23 PDT 2014
basctl/inc/helpid.hrc | 9
basctl/source/basicide/basidesh.src | 14
cui/source/customize/cfg.src | 3
cui/source/customize/macropg.hrc | 34 -
cui/source/customize/macropg.src | 2
cui/source/inc/helpid.hrc | 120 ----
cui/source/options/optinet2.cxx | 1
cui/source/options/optinet2.hrc | 35 -
cui/source/options/optinet2.src | 1
cui/source/options/treeopt.hrc | 1
dbaccess/inc/dbaccess_helpid.hrc | 92 ---
dbaccess/inc/dbaccess_slotid.hrc | 4
dbaccess/source/ui/dlg/UserAdmin.hrc | 2
dbaccess/source/ui/dlg/dbadmin.hrc | 4
dbaccess/source/ui/dlg/dbadminsetup.hrc | 4
dbaccess/source/ui/inc/dbu_dlg.hrc | 2
dbaccess/source/ui/inc/toolbox_tmpl.hrc | 19
dbaccess/source/ui/misc/WizardPages.hrc | 1
dbaccess/source/ui/querydesign/query.src | 11
dbaccess/source/ui/tabledesign/table.src | 11
desktop/source/deployment/gui/dp_gui_dialog2.src | 49 -
desktop/source/inc/helpid.hrc | 6
editeng/inc/helpid.hrc | 19
extensions/source/abpilot/abpresid.hrc | 23
extensions/source/bibliography/sections.hrc | 10
fpicker/source/office/iodlg.hrc | 6
framework/inc/helpid.hrc | 3
include/sfx2/sfx.hrc | 16
include/sfx2/sfxsids.hrc | 5
include/sfx2/sidebar/ResourceDefinitions.hrc | 70 --
include/svl/solar.hrc | 8
include/svl/svl.hrc | 5
include/svtools/controldims.hrc | 13
include/svtools/helpid.hrc | 28
include/svx/svxids.hrc | 2
reportdesign/inc/rptui_slotid.hrc | 3
reportdesign/source/ui/dlg/CondFormat.hrc | 2
reportdesign/source/ui/dlg/GroupsSorting.hrc | 2
sc/source/ui/drawfunc/drformsh.src | 12
sc/source/ui/inc/condformatdlg.hrc | 2
sc/source/ui/inc/submenu.hrc | 1
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 5
sc/source/ui/src/toolbox.src | 58 -
sd/inc/app.hrc | 6
sd/source/ui/app/menuids_tmpl.src | 8
sd/source/ui/app/sdmod2.cxx | 1
sd/source/ui/app/tbxids_tmpl.src | 49 -
sd/source/ui/dlg/tpoption.cxx | 1
sd/source/ui/inc/tpoption.hrc | 37 -
sfx2/source/control/templateview.hrc | 1
sfx2/source/dialog/dialog.hrc | 1
sfx2/source/dialog/templdlg.hrc | 3
sfx2/source/inc/helpid.hrc | 74 --
svtools/source/control/inettbc.cxx | 1
svtools/source/inc/iodlg.hrc | 96 ---
svx/inc/fmhelp.hrc | 16
svx/inc/globlmn_tmpl.hrc | 6
svx/inc/helpid.hrc | 115 ---
svx/source/dialog/ctredlin.cxx | 1
svx/source/dialog/ctredlin.hrc | 23
svx/source/dialog/docrecovery.hrc | 108 ---
svx/source/inc/datanavi.hrc | 8
svx/source/sidebar/area/AreaPropertyPanel.hrc | 1
svx/source/sidebar/line/LinePropertyPanel.hrc | 6
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 144 ----
svx/source/sidebar/paragraph/ParaPropertyPanel.src | 9
svx/source/svdraw/svdstr.src | 13
sw/inc/dbui.hrc | 5
sw/inc/dialog.hrc | 4
sw/inc/envelp.hrc | 6
sw/inc/fldui.hrc | 2
sw/inc/rcid.hrc | 6
sw/source/core/uibase/dialog/regionsw.src | 46 -
sw/source/core/uibase/inc/frmui.hrc | 1
sw/source/core/uibase/inc/misc.hrc | 2
sw/source/core/uibase/inc/ribbar.hrc | 9
sw/source/core/uibase/inc/shells.hrc | 1
sw/source/core/uibase/inc/toolbox.hrc | 553 -------------------
sw/source/core/uibase/inc/utlui.hrc | 1
sw/source/core/uibase/lingu/olmenu.hrc | 3
sw/source/core/uibase/ribbar/workctrl.hrc | 2
sw/source/core/uibase/sidebar/PagePropertyPanel.hrc | 29
sw/source/core/uibase/utlui/navipi.hrc | 3
sw/source/ui/app/mn.src | 8
sw/source/ui/dbui/mmaddressblockpage.hrc | 22
sw/source/ui/dbui/mmgreetingspage.hrc | 9
sw/source/ui/dbui/mmlayoutpage.cxx | 1
sw/source/ui/dbui/mmlayoutpage.hrc | 41 -
sw/source/ui/frmdlg/wrap.cxx | 1
sw/source/ui/frmdlg/wrap.hrc | 57 -
sw/source/ui/shells/shells.src | 8
vcl/inc/svids.hrc | 43 -
xmlsecurity/source/dialogs/dialogs.hrc | 29
xmlsecurity/source/dialogs/helpids.hrc | 4
94 files changed, 28 insertions(+), 2314 deletions(-)
New commits:
commit 702f9c5176eebb95c5a1bfd31c1f256b79301b19
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Apr 23 18:19:37 2014 +0200
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 at libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index e04f99c..5935bb3 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -19,15 +19,8 @@
#ifndef _BASCTL_HELPID_HRC
#define _BASCTL_HELPID_HRC
-#define HID_BASICIDE_TOOLBOX "BASCTL_HID_BASICIDE_TOOLBOX"
-#define HID_BASICIDE_OBJECTS "BASCTL_HID_BASICIDE_OBJECTS"
-#define HID_BASICIDE_MACROS "BASCTL_HID_BASICIDE_MACROS"
-#define HID_BASICIDE_LIBS "BASCTL_HID_BASICIDE_LIBS"
-
#define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT"
-#define HID_BASICIDE_OBJCAT_SHOW "BASCTL_HID_BASICIDE_OBJCAT_SHOW"
-
#define HID_BASICIDE_BRKDLG "BASCTL_HID_BASICIDE_BRKDLG"
#define HID_BASICIDE_ACTIV "BASCTL_HID_BASICIDE_ACTIV"
#define HID_BASICIDE_BRKPROPS "BASCTL_HID_BASICIDE_BRKPROPS"
@@ -45,8 +38,6 @@
#define HID_BASICIDE_WATCHWINDOW_LIST "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
#define HID_BASICIDE_STACKWINDOW_LIST "BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
-#define HID_BASICIDE_ADDNEW_LANGUAGE "BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE"
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index b52526e..70d6423 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -601,18 +601,4 @@ String RID_STR_DLGIMP_MISMATCH_TEXT
Text [ en-US ] = "The dialog to be imported supports other languages than the target library.\n\nAdd these languages to the library to keep additional language resources provided by the dialog or omit them to stay with the current library languages.\n\nNote: For languages not supported by the dialog the resources of the dialog's default language will be used.\n " ;
};
-#define MN_EDIT 20
-#define MN_VIEW 21
-#define MN_EXTRA 22
-#define MN_WIN 30
-#define MN_HELP 31
-#define MN_TEMPLATES 11
-
-/*
-
-The application menu bar resource has become obsolete. You can now find the menu bar definition at:
-<project>/basicide/menubar/menubar.xml.
-
-*/
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 7d96580..2efab49 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 7a1d3e2..fe37cc7 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 199bb66..0cc502a 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 8b23869..bc15fab6 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 d151e2f..23851bd 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 cc5a06e..0000000
--- 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 2c282ac..ffb829b 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 aa502a4..c3eb931 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
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 5128e46..eae7fa9 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -27,25 +27,14 @@
#define UID_DATABROWSE_DATAWINDOW "DBACCESS_UID_DATABROWSE_DATAWINDOW"
#define HID_CTL_TREEVIEW "DBACCESS_HID_CTL_TREEVIEW"
#define UID_CTL_CONTENT "DBACCESS_UID_CTL_CONTENT"
-#define HID_TLB_TABBROWSER "DBACCESS_HID_TLB_TABBROWSER"
#define HID_TLB_TREELISTBOX "DBACCESS_HID_TLB_TREELISTBOX"
-#define HID_DSADMIN_PAGE_GENERAL "DBACCESS_HID_DSADMIN_PAGE_GENERAL"
#define HID_DSADMIN_PAGE_DBASE "DBACCESS_HID_DSADMIN_PAGE_DBASE"
-#define HID_DSADMIN_PAGE_JDBC "DBACCESS_HID_DSADMIN_PAGE_JDBC"
#define HID_DSADMIN_PAGE_ODBC "DBACCESS_HID_DSADMIN_PAGE_ODBC"
#define HID_DSADMIN_PAGE_TEXT "DBACCESS_HID_DSADMIN_PAGE_TEXT"
-#define HID_DSADMIN_DSACTIONS_NEWDS "DBACCESS_HID_DSADMIN_DSACTIONS_NEWDS"
-#define HID_DSADMIN_DSACTIONS_DELETEDS "DBACCESS_HID_DSADMIN_DSACTIONS_DELETEDS"
-#define HID_DSADMIN_DSACTIONS_RESTOREDS "DBACCESS_HID_DSADMIN_DSACTIONS_RESTOREDS"
-#define HID_DSADMIN_DSNAME "DBACCESS_HID_DSADMIN_DSNAME"
-#define HID_DSADMIN_DSTYPE "DBACCESS_HID_DSADMIN_DSTYPE"
#define HID_DSADMIN_URL_GENERAL "DBACCESS_HID_DSADMIN_URL_GENERAL"
#define HID_DSADMIN_BROWSECONN "DBACCESS_HID_DSADMIN_BROWSECONN"
-#define HID_DSADMIN_LOGINTIMEOUT_NUMBER "DBACCESS_HID_DSADMIN_LOGINTIMEOUT_NUMBER"
-#define HID_DSADMIN_LOGINTIMEOUT_UNIT "DBACCESS_HID_DSADMIN_LOGINTIMEOUT_UNIT"
#define HID_DSADMIN_SHOWDELETED "DBACCESS_HID_DSADMIN_SHOWDELETED"
-#define HID_DSADMIN_ALLOWLONG "DBACCESS_HID_DSADMIN_ALLOWLONG"
#define HID_DSADMIN_DBASE_INDICIES "DBACCESS_HID_DSADMIN_DBASE_INDICIES"
#define HID_DSADMIN_DRIVERCLASS "DBACCESS_HID_DSADMIN_DRIVERCLASS"
#define HID_DSADMIN_ODBC_OPTIONS "DBACCESS_HID_DSADMIN_ODBC_OPTIONS"
@@ -54,12 +43,6 @@
#define HID_DSADMIN_TEXT_SEPARATOR "DBACCESS_HID_DSADMIN_TEXT_SEPARATOR"
#define HID_DSADMIN_DECIMAL_SEPARATOR "DBACCESS_HID_DSADMIN_DECIMAL_SEPARATOR"
#define HID_DSADMIN_THOUSANDS_SEPARATOR "DBACCESS_HID_DSADMIN_THOUSANDS_SEPARATOR"
-#define HID_DSADMIN_EXTENSION "DBACCESS_HID_DSADMIN_EXTENSION"
-#define HID_DSADMIN_ALL_TABLES "DBACCESS_HID_DSADMIN_ALL_TABLES"
-#define HID_DSADMIN_NO_TABLES "DBACCESS_HID_DSADMIN_NO_TABLES"
-#define HID_DSADMIN_SELECT_TABLES "DBACCESS_HID_DSADMIN_SELECT_TABLES"
-
-#define HID_GENERIC_SQL_ERROR "DBACCESS_HID_GENERIC_SQL_ERROR"
#define HID_BROWSER_COLUMNFORMAT "DBACCESS_HID_BROWSER_COLUMNFORMAT"
#define HID_BROWSER_COLUMNWIDTH "DBACCESS_HID_BROWSER_COLUMNWIDTH"
@@ -67,30 +50,16 @@
#define HID_BROWSER_ROWHEIGHT "DBACCESS_HID_BROWSER_ROWHEIGHT"
#define HID_BROWSER_EDIT_DATABASE "DBACCESS_HID_BROWSER_EDIT_DATABASE"
#define HID_BROWSER_CLOSECONN "DBACCESS_HID_BROWSER_CLOSECONN"
-#define HID_BROWSER_REFRESHCONN "DBACCESS_HID_BROWSER_REFRESHCONN"
-#define HID_TLB_QUERYDESIGN "DBACCESS_HID_TLB_QUERYDESIGN"
#define HID_CTL_QRYSQLEDIT "DBACCESS_HID_CTL_QRYSQLEDIT"
-#define HID_DSADMIN_SPECIAL_MESSAGE "DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE"
#define HID_BROWSER_QUERY_CREATE_TEXT "DBACCESS_HID_BROWSER_QUERY_CREATE_TEXT"
-#define HID_DLG_ERROR "DBACCESS_HID_DLG_ERROR"
-#define HID_DLG_TEXT "DBACCESS_HID_DLG_TEXT"
#define UID_SQLERROR_BUTTONMORE "DBACCESS_UID_SQLERROR_BUTTONMORE"
-#define HID_BROWSER_QUERY_EDIT "DBACCESS_HID_BROWSER_QUERY_EDIT"
-#define HID_BROWSER_QUERY_DELETE "DBACCESS_HID_BROWSER_QUERY_DELETE"
-
-#define HID_DSADMIN_USER_ADO "DBACCESS_HID_DSADMIN_USER_ADO"
-#define HID_DSADMIN_PWDREC_ADO "DBACCESS_HID_DSADMIN_PWDREC_ADO"
-#define HID_DSADMIN_CONNURL_ADOPAGE "DBACCESS_HID_DSADMIN_CONNURL_ADOPAGE"
#define HID_DSADMIN_PAGE_ADO "DBACCESS_HID_DSADMIN_PAGE_ADO"
-
#define HID_CTL_QRYDGNTAB "DBACCESS_HID_CTL_QRYDGNTAB"
-#define HID_DLG_QRY_HELPTEXT "DBACCESS_HID_DLG_QRY_HELPTEXT"
-
#define HID_CTL_QRYDGNCRIT "DBACCESS_HID_CTL_QRYDGNCRIT"
#define HID_QRYDGN_ROW_VISIBLE "DBACCESS_HID_QRYDGN_ROW_VISIBLE"
#define HID_QRYDGN_ROW_TABLE "DBACCESS_HID_QRYDGN_ROW_TABLE"
@@ -107,18 +76,9 @@
#define HID_BROWSER_QUERY_CREATE_DESIGN "DBACCESS_HID_BROWSER_QUERY_CREATE_DESIGN"
-#define HID_DSADMIN_QUERIES "DBACCESS_HID_DSADMIN_QUERIES"
-#define HID_DSADMIN_QUERIES_NEW "DBACCESS_HID_DSADMIN_QUERIES_NEW"
-#define HID_DSADMIN_QUERIES_EDIT "DBACCESS_HID_DSADMIN_QUERIES_EDIT"
-#define HID_DSADMIN_QUERIES_DELETE "DBACCESS_HID_DSADMIN_QUERIES_DELETE"
-#define HID_DSADMIN_QUERYADMINISTRATION "DBACCESS_HID_DSADMIN_QUERYADMINISTRATION"
-
-
-#define HID_TAB_DESIGN_TABLE_DESC "DBACCESS_HID_TAB_DESIGN_TABLE_DESC"
#define HID_TAB_DESIGN_FIELDCONTROL "DBACCESS_HID_TAB_DESIGN_FIELDCONTROL"
#define HID_TABLE_DESIGN_HELP_WINDOW "DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW"
#define HID_TAB_DESIGN_DESCWIN "DBACCESS_HID_TAB_DESIGN_DESCWIN"
-#define HID_TAB_DESIGN_TABLE_PROPS "DBACCESS_HID_TAB_DESIGN_TABLE_PROPS"
#define HID_TABDESIGN_BACKGROUND "DBACCESS_HID_TABDESIGN_BACKGROUND"
#define HID_CTL_TABLEEDIT "DBACCESS_HID_CTL_TABLEEDIT"
#define HID_TABDESIGN_NAMECELL "DBACCESS_HID_TABDESIGN_NAMECELL"
@@ -126,7 +86,6 @@
#define HID_TABDESIGN_COMMENTCELL "DBACCESS_HID_TABDESIGN_COMMENTCELL"
#define HID_TABLEDESIGN_INSERTROWS "DBACCESS_HID_TABLEDESIGN_INSERTROWS"
#define HID_TABLEDESIGN_TABED_PRIMARYKEY "DBACCESS_HID_TABLEDESIGN_TABED_PRIMARYKEY"
-#define HID_TLB_TABLEDESIGN "DBACCESS_HID_TLB_TABLEDESIGN"
#define HID_TAB_DESIGN_HELP_TEXT_FRAME "DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME"
#define HID_TABLE_DESIGN_TABPAGE_GENERAL "DBACCESS_HID_TABLE_DESIGN_TABPAGE_GENERAL"
#define HID_TAB_ENT_DEFAULT "DBACCESS_HID_TAB_ENT_DEFAULT"
@@ -142,8 +101,6 @@
#define HID_TAB_ENT_LEN "DBACCESS_HID_TAB_ENT_LEN"
#define HID_TAB_ENT_SCALE "DBACCESS_HID_TAB_ENT_SCALE"
#define HID_BROWSER_TABLE_CREATE_DESIGN "DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN"
-#define HID_BROWSER_TABLE_EDIT "DBACCESS_HID_BROWSER_TABLE_EDIT"
-#define HID_BROWSER_TABLE_DELETE "DBACCESS_HID_BROWSER_TABLE_DELETE"
#define HID_TAB_WIZ_COLUMN_SELECT "DBACCESS_HID_TAB_WIZ_COLUMN_SELECT"
#define HID_TAB_WIZ_TYPE_SELECT "DBACCESS_HID_TAB_WIZ_TYPE_SELECT"
#define HID_TAB_NAMEMATCHING_COLS_AVAIL "DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL"
@@ -151,27 +108,16 @@
#define HID_TAB_WIZ_COPYTABLE "DBACCESS_HID_TAB_WIZ_COPYTABLE"
#define HID_TAB_WIZ_TABLENAME_EDIT "DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT"
#define HID_CTL_RELATIONTAB "DBACCESS_HID_CTL_RELATIONTAB"
-#define HID_TLB_RELATIONDESIGN "DBACCESS_HID_TLB_RELATIONDESIGN"
#define HID_RELATIONDIALOG_LEFTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"
#define HID_RELATIONDIALOG_RIGHTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"
-#define HID_BROWSER_RELATION_DESIGN "DBACCESS_HID_BROWSER_RELATION_DESIGN"
-#define HID_TABLE_DESIGN_NO_CONNECTION "DBACCESS_HID_TABLE_DESIGN_NO_CONNECTION"
-#define HID_DSADMIN_CREATEDATABASE "DBACCESS_HID_DSADMIN_CREATEDATABASE"
#define HID_BROWSER_COLUMNINFO "DBACCESS_HID_BROWSER_COLUMNINFO"
#define HID_DSADMIN_USECATALOG "DBACCESS_HID_DSADMIN_USECATALOG"
#define HID_BROWSER_VIEW_CREATE_DESIGN "DBACCESS_HID_BROWSER_VIEW_CREATE_DESIGN"
-#define HID_DSADMIN_DOCUMENTS "DBACCESS_HID_DSADMIN_DOCUMENTS"
-#define HID_DSADMIN_DOCUMENTLINKS "DBACCESS_HID_DSADMIN_DOCUMENTLINKS"
#define HID_CONFIRM_DROP_BUTTON_ALL "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"
-#define HID_DSBROWSER_BOOKMARK_SELECTED "DBACCESS_HID_DSBROWSER_BOOKMARK_SELECTED"
-#define HID_DSADMIN_TABLE_TOOLBOX "DBACCESS_HID_DSADMIN_TABLE_TOOLBOX"
-#define HID_DSADMIN_QUERY_TOOLBOX "DBACCESS_HID_DSADMIN_QUERY_TOOLBOX"
-#define HID_DSADMIN_BOOKMARK_TOOLBOX "DBACCESS_HID_DSADMIN_BOOKMARK_TOOLBOX"
#define HID_DSADMIN_PAGE_LDAP "DBACCESS_HID_DSADMIN_PAGE_LDAP"
#define HID_DSADMIN_LDAP_HOSTNAME "DBACCESS_HID_DSADMIN_LDAP_HOSTNAME"
#define HID_DSADMIN_LDAP_BASEDN "DBACCESS_HID_DSADMIN_LDAP_BASEDN"
#define HID_DSADMIN_LDAP_PORTNUMBER "DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER"
-#define HID_DSBROWSER_BOOKMARKSELECTED "DBACCESS_HID_DSBROWSER_BOOKMARKSELECTED"
#define HID_DSBROWSER_DISCONNECTING "DBACCESS_HID_DSBROWSER_DISCONNECTING"
#define HID_TAB_PAGE_USERADMIN "DBACCESS_HID_TAB_PAGE_USERADMIN"
#define HID_TAB_PAGE_PBUSER "DBACCESS_HID_TAB_PAGE_PBUSER"
@@ -179,15 +125,9 @@
#define HID_TAB_PAGE_PBUSERDELETE "DBACCESS_HID_TAB_PAGE_PBUSERDELETE"
#define HID_TAB_PAGE_TBLGRANTS "DBACCESS_HID_TAB_PAGE_TBLGRANTS"
#define HID_TAB_PAGE_LBUSER "DBACCESS_HID_TAB_PAGE_LBUSER"
-#define HID_DSBROWSER_DIRECTSQL "DBACCESS_HID_DSBROWSER_DIRECTSQL"
#define HID_DSADMIN_LDAP_ROWCOUNT "DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT"
-#define HID_BROWSER_QUERY_EDITSQL "DBACCESS_HID_BROWSER_QUERY_EDITSQL"
-#define HID_DSADMIN_PAGE_MOZILLA "DBACCESS_HID_DSADMIN_PAGE_MOZILLA"
#define HID_DSADMIN_MOZILLA_PROFILE_NAME "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"
#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"
-#define HID_BROWSER_OPEN_DOCUMENT "DBACCESS_HID_BROWSER_OPEN_DOCUMENT"
-#define HID_BROWSER_EDIT_DOCUMENT "DBACCESS_HID_BROWSER_EDIT_DOCUMENT"
-#define HID_BROWSER_BEW_DOCUMENT "DBACCESS_HID_BROWSER_BEW_DOCUMENT"
#define HID_DLGIDX_NEWINDEX "DBACCESS_HID_DLGIDX_NEWINDEX"
#define HID_DLGIDX_DROPINDEX "DBACCESS_HID_DLGIDX_DROPINDEX"
@@ -200,35 +140,18 @@
#define HID_DLGINDEX_INDEXDETAILS_FIELD "DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"
#define HID_DLGINDEX_INDEXDETAILS_SORTORDER "DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER"
-#define HID_DOCLINKEDIT_URL "DBACCESS_HID_DOCLINKEDIT_URL"
-#define HID_QUERY_SQLMODE "DBACCESS_HID_QUERY_SQLMODE"
-
-#define HID_BROWSER_REFRESH_REBUILDVIEW "DBACCESS_HID_BROWSER_REFRESH_REBUILDVIEW"
-#define HID_BROWSER_RENAME_ENTRY "DBACCESS_HID_BROWSER_RENAME_ENTRY"
-
#define HID_QUERY_EDIT_JOINCONNECTION "DBACCESS_HID_QUERY_EDIT_JOINCONNECTION"
#define HID_DOCUMENT_CREATE_REPWIZ "DBACCESS_HID_DOCUMENT_CREATE_REPWIZ"
#define HID_TAB_AUTOINCREMENTVALUE "DBACCESS_HID_TAB_AUTOINCREMENTVALUE"
-#define HID_DSADMIN_PAGE_MYSQL_ODBC "DBACCESS_HID_DSADMIN_PAGE_MYSQL_ODBC"
-#define HID_TAB_PAGE_TABLEPRIVILEGES "DBACCESS_HID_TAB_PAGE_TABLEPRIVILEGES"
-
#define HID_DSADMIN_PAGE_USERDRIVER "DBACCESS_HID_DSADMIN_PAGE_USERDRIVER"
-#define HID_DSADMIN_USER_DEFINED "DBACCESS_HID_DSADMIN_USER_DEFINED"
-#define HID_DSADMIN_USERDEF_OPTIONS "DBACCESS_HID_DSADMIN_USERDEF_OPTIONS"
-#define HID_DSADMIN_CHARSET_USERDEF "DBACCESS_HID_DSADMIN_CHARSET_USERDEF"
#define HID_DSADMIN_USESSL_LDAP "DBACCESS_HID_DSADMIN_USESSL_LDAP"
-#define HID_BROWSER_QUERY_WIZARD "DBACCESS_HID_BROWSER_QUERY_WIZARD"
-
-#define HID_DSADMIN_PAGE_MYSQL_JDBC "DBACCESS_HID_DSADMIN_PAGE_MYSQL_JDBC"
-
#define HID_DSADMIN_DBASE_PATH "DBACCESS_HID_DSADMIN_DBASE_PATH"
#define HID_DSADMIN_MYSQL_DATABASE "DBACCESS_HID_DSADMIN_MYSQL_DATABASE"
#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE "DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE"
#define HID_DSADMIN_ODBC_DATASOURCE "DBACCESS_HID_DSADMIN_ODBC_DATASOURCE"
#define HID_DSADMIN_MSACCESS_MDB_FILE "DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE"
-#define HID_DSADMIN_PAGE_MSACCESS "DBACCESS_HID_DSADMIN_PAGE_MSACCESS"
#define HID_DSADMIN_FLAT_PATH "DBACCESS_HID_DSADMIN_FLAT_PATH"
#define HID_DSADMIN_CALC_PATH "DBACCESS_HID_DSADMIN_CALC_PATH"
#define HID_DSADMIN_ORACLE_DATABASE "DBACCESS_HID_DSADMIN_ORACLE_DATABASE"
@@ -239,7 +162,6 @@
#define HID_APP_QUERY_TREE "DBACCESS_HID_APP_QUERY_TREE"
#define HID_APP_REPORT_TREE "DBACCESS_HID_APP_REPORT_TREE"
#define UID_APP_DETAIL_VIEW "DBACCESS_UID_APP_DETAIL_VIEW"
-#define UID_APP_VIEW_VERT_SPLIT "DBACCESS_UID_APP_VIEW_VERT_SPLIT"
#define UID_APP_VIEW_BORDER_WIN "DBACCESS_UID_APP_VIEW_BORDER_WIN"
#define HID_APP_CREATION_LIST "DBACCESS_HID_APP_CREATION_LIST"
#define UID_APP_SWAP_VIEW "DBACCESS_UID_APP_SWAP_VIEW"
@@ -274,26 +196,16 @@
#define HID_BROWSER_ADMINISTRATE "DBACCESS_HID_BROWSER_ADMINISTRATE"
-#define HID_PAGE_DBWIZARD_GENERALPAGE "DBACCESS_HID_PAGE_DBWIZARD_GENERALPAGE"
-#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE "DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE"
-#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE "DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE"
-
#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION "DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION"
#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION "DBACCESS_HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION"
-
#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES"
#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES"
#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES"
#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION "DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION"
-
#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE "DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE"
#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE "DBACCESS_HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE"
-#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR"
-#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR"
-#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR"
-#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR"
#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION "DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION"
#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION "DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION"
@@ -302,7 +214,6 @@
#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN"
#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER"
#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL "DBACCESS_HID_PAGE_DBWIZARD_LDAP_CB_USESSL"
-#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION"
#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC"
#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC"
@@ -325,10 +236,8 @@
#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS"
#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS"
-
#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL "DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL"
#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL "DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_ADOURL"
-#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION"
#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE"
#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE"
@@ -347,7 +256,6 @@
#define HID_DLG_DATABASE_WIZARD "DBACCESS_HID_DLG_DATABASE_WIZARD"
-#define HID_EXTENSION_NOT_PRESENT_DLG "DBACCESS_HID_EXTENSION_NOT_PRESENT_DLG"
#define HID_MACRO_MIGRATION_BACKUP_LOCATION "DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION"
#endif // _DBA_DBACCESS_HELPID_HRC_
diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc
index c1b7fe3..f5d6fe6 100644
--- a/dbaccess/inc/dbaccess_slotid.hrc
+++ b/dbaccess/inc/dbaccess_slotid.hrc
@@ -24,7 +24,7 @@
#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 )
#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 )
-#define SID_DB_NEW ( SID_DBACCESS_START + 2 )
+// free
#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 )
#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 )
#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 )
@@ -38,7 +38,7 @@
#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 )
#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 )
#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 )
-#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 )
+// free
#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 )
#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 )
#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 )
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hrc b/dbaccess/source/ui/dlg/UserAdmin.hrc
index 131f569..5977108 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hrc
+++ b/dbaccess/source/ui/dlg/UserAdmin.hrc
@@ -23,8 +23,6 @@
#define LB_USER 1
-#define NF_TIMEOUT 1
-
#define FL_TABLE_GRANTS 1
#define FL_USER 2
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index df32700..e8da953 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -23,12 +23,8 @@
// control ids
- // FREE
- // FREE
#define FT_USERNAME 3
-#define FT_PASSWORD 4
#define FT_OPTIONS 5
- // FREE
#define FT_JDBCDRIVERCLASS 7
#define FT_SPECIAL_MESSAGE 8
#define FT_HOSTNAME 10
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index 0415460..e14e55e 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -92,13 +92,9 @@
#define RB_CONNECTVIAODBC 1
#define RB_CONNECTVIAJDBC 2
-#define RB_REGISTERDATASOURCE 3
-#define RB_DONTREGISTERDATASOURCE 4
#define RB_CONNECTVIANATIVE 5
#define CB_WIZ_USESSL 1
-#define CB_STARTTABLEWIZARD 2
-#define CB_OPENAFTERWARDS 3
#define CB_SPREADSHEETPASSWORDREQUIRED 4
#define CB_GENERALPASSWORDREQUIRED 5
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index be45335..13cd58e 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -26,8 +26,6 @@
#define WIZARD_PAGE_X 225
#define WIZARD_PAGE_Y 210
#define START_X 6
-#define START_Y 6
-
#define CHECKBOX_HEIGHT 8
#define LISTBOX_HEIGHT 12
diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index 3736273..3cd6f6a 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -36,24 +36,12 @@
Text [ en-US ] = "New ~Table Design" ;\
-#define MID_QUERY_WIZARD \
- Identifier = ID_NEW_QUERY_WIZARD; \
- HelpId = HID_BROWSER_QUERY_WIZARD ; \
- Text[ en-US ] = "Query AutoPilot..."; \
-
-
#define MID_QUERY_NEW_DESIGN \
Identifier = ID_NEW_QUERY_DESIGN; \
HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ; \
Text [ en-US ] = "New ~Query (Design View)" ; \
-#define MID_QUERY_EDIT_DESIGN \
- Identifier = ID_EDIT_QUERY_DESIGN; \
- HelpId = HID_BROWSER_QUERY_EDIT ; \
- Text [ en-US ] = "~Edit Query" ; \
-
-
#define MID_QUERY_NEW_SQL \
Identifier = ID_NEW_QUERY_SQL; \
HelpId = HID_BROWSER_QUERY_CREATE_TEXT ; \
@@ -77,13 +65,6 @@
HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\
Text [ en-US ] = "Report Wizard..."; \
-
-#define MID_DOCUMENT_NEW_AUTOPILOT \
- Identifier = SID_DB_FORM_NEW_PILOT; \
- HelpID = SID_DB_FORM_NEW_PILOT ;\
- Text [ en-US ] = "Form AutoPilot..."; \
-
-
#endif // DBAUI_TOOLBOX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/WizardPages.hrc b/dbaccess/source/ui/misc/WizardPages.hrc
index f7031ba..1cceae6 100644
--- a/dbaccess/source/ui/misc/WizardPages.hrc
+++ b/dbaccess/source/ui/misc/WizardPages.hrc
@@ -33,7 +33,6 @@
#define PB_HELP 8
#define PB_NEXT 9
#define PB_PREV 10
-#define PB_UNDO 11
#define IB_COLUMN_UP 12
#define IB_COLUMN_DOWN 13
#define IB_COLUMN_UP_RIGHT 14
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 08a728b..89aa1b8 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -24,13 +24,6 @@
#include "dbaccess_helpid.hrc"
#include "toolbox.hrc"
-#define MN_EDIT 20
-#define MN_VIEW 21
-#define MN_EXTRA 22
-#define MN_INSERT 23
-#define MN_WIN 30
-#define MN_HELP 31
-
Menu RID_MENU_JOINVIEW_CONNECTION
{
ItemList =
@@ -300,10 +293,6 @@ String STR_QUERYDESIGN_NO_VIEW_ASK
Text [ en-US ] = "Do you want to create a query instead?";
};
-/*
- The menubar resource has become obsolete - you can now find the menubar definition at: <project>/uiconfig/dbquery/menubar/menubar.xml
- */
-
String STR_DATASOURCE_DELETED
{
Text [ en-US ] = "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved.";
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index 0410b0b..3a0d7c0 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -24,12 +24,6 @@
#include <svx/globlmn.hrc>
#include "toolbox.hrc"
-#define MN_EDIT 20
-#define MN_VIEW 21
-#define MN_EXTRA 22
-#define MN_WIN 30
-#define MN_HELP 31
-
String STR_TABLEDESIGN_DBFIELDTYPES
{
Text [ en-US ] = "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)";
@@ -372,16 +366,11 @@ String STR_TABLEDESIGN_NO_PRIM_KEY
Text [ en-US ] = "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ;
};
-
String STR_TABLEDESIGN_TITLE
{
Text [ en-US ] = " - %PRODUCTNAME Base: Table Design";
};
-/*
- The menubar resource has become obsolete - you can now find the menubar definition at: <project>/uiconfig/dbtable/menubar/menubar.xml
-*/
-
String STR_TABLEDESIGN_ALTER_ERROR
{
Text [ en-US ] = "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?" ;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 971d149..06366b1 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -109,53 +109,4 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
Message[en-US] = "Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment.\n\nFor whom do you want to install the extension?\n";
};
-
-// Dialog layout
-
-// row 1 | multi line edit
-// ---------------------------------------------------
-// row 2 | fixed text
-// ---------------------------------------------------
-// row 3 | img | fixed text | fixed text | button
-// ---------------------------------------------------
-// row 4 | img | fixed text | fixed text
-// ---------------------------------------------------
-// row 5 |fixed line
-// ---------------------------------------------------
-// row 6 | | |button | button
-// ---------------------------------------------------
-// | col 1 | col 2 | col3 | col4 | col5
-
-//To change the overall size of the multi line edit change
-//ROW1_HEIGHT and COL3_WIDTH
-
-#define ROW1_Y RSC_SP_DLG_INNERBORDER_TOP
-#define ROW1_HEIGHT 16*RSC_CD_FIXEDTEXT_HEIGHT
-#define ROW2_Y ROW1_Y+ROW1_HEIGHT+RSC_SP_CTRL_GROUP_Y
-#define ROW2_HEIGHT 2*RSC_CD_FIXEDTEXT_HEIGHT
-#define ROW3_Y ROW2_Y+ROW2_HEIGHT+RSC_SP_CTRL_GROUP_Y
-#define ROW3_HEIGHT 3*RSC_CD_FIXEDTEXT_HEIGHT
-#define ROW4_Y ROW3_Y+ROW3_HEIGHT+RSC_SP_CTRL_GROUP_Y
-#define ROW4_HEIGHT 3*RSC_CD_FIXEDTEXT_HEIGHT
-#define ROW5_Y ROW4_Y+ROW4_HEIGHT+RSC_SP_CTRL_GROUP_Y
-#define ROW5_HEIGHT RSC_CD_FIXEDTEXT_HEIGHT
-#define ROW6_Y ROW5_Y+ROW5_HEIGHT+RSC_SP_CTRL_GROUP_Y
-#define ROW6_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT
-
-#define LIC_DLG_HEIGHT ROW6_Y+ROW6_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM
-
-#define COL1_X RSC_SP_DLG_INNERBORDER_LEFT
-#define IMG_ARROW_WIDTH 16
-#define COL1_WIDTH IMG_ARROW_WIDTH
-#define COL2_X COL1_X+COL1_WIDTH
-#define COL2_WIDTH 10
-#define COL3_X COL2_X+COL2_WIDTH+RSC_SP_CTRL_GROUP_X
-#define COL3_WIDTH 150
-#define COL4_X COL3_X+COL3_WIDTH
-#define COL4_WIDTH RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_GROUP_X
-#define COL5_X COL4_X+COL4_WIDTH
-
-#define LIC_DLG_WIDTH COL5_X+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_DLG_INNERBORDER_RIGHT
-#define BODYWIDTH LIC_DLG_WIDTH-RSC_SP_DLG_INNERBORDER_LEFT-RSC_SP_DLG_INNERBORDER_RIGHT
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 7b62e72..eec32c3 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -20,11 +20,6 @@
#ifndef INCLUDED_DESKTOP_HELPID_HRC
#define INCLUDED_DESKTOP_HELPID_HRC
-#define HID_FIRSTSTART_PREV "DESKTOP_HID_FIRSTSTART_PREV"
-#define HID_FIRSTSTART_NEXT "DESKTOP_HID_FIRSTSTART_NEXT"
-#define HID_FIRSTSTART_CANCEL "DESKTOP_HID_FIRSTSTART_CANCEL"
-#define HID_FIRSTSTART_FINISH "DESKTOP_HID_FIRSTSTART_FINISH"
-#define UID_FIRSTSTART_HELP "DESKTOP_UID_FIRSTSTART_HELP"
#define HID_DEPLOYMENT_GUI_UPDATE "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE"
#define HID_DEPLOYMENT_GUI_UPDATEINSTALL "DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL"
#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER"
@@ -37,7 +32,6 @@
#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"
#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE"
-
#define HID_PACKAGE_MANAGER_UPD_REQ "DESKTOP_HID_PACKAGE_MANAGER_UPD_REQ"
#endif
diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc
index b7daa63..0a38643 100644
--- a/editeng/inc/helpid.hrc
+++ b/editeng/inc/helpid.hrc
@@ -26,25 +26,6 @@
#define HID_EDITENG_SPELLER_IGNORE "EDITENG_HID_EDITENG_SPELLER_IGNORE"
#define HID_EDITENG_SPELLER_START "EDITENG_HID_EDITENG_SPELLER_START"
-#define HID_AUTOCORR_HELP_WORD "EDITENG_HID_AUTOCORR_HELP_START"
-#define HID_AUTOCORR_HELP_SENT "EDITENG_HID_AUTOCORR_HELP_SENT"
-#define HID_AUTOCORR_HELP_SENTWORD "EDITENG_HID_AUTOCORR_HELP_SENTWORD"
-#define HID_AUTOCORR_HELP_ACORWORD "EDITENG_HID_AUTOCORR_HELP_ACORWORD"
-#define HID_AUTOCORR_HELP_ACORSENTWORD "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORD"
-#define HID_AUTOCORR_HELP_CHGTOENEMDASH "EDITENG_HID_AUTOCORR_HELP_CHGTOENEMDASH"
-#define HID_AUTOCORR_HELP_WORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_WORDENEMDASH"
-#define HID_AUTOCORR_HELP_SENTENEMDASH "EDITENG_HID_AUTOCORR_HELP_SENTENEMDASH"
-#define HID_AUTOCORR_HELP_SENTWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_SENTWORDENEMDASH"
-#define HID_AUTOCORR_HELP_ACORWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_ACORWORDENEMDASH"
-#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH"
-#define HID_AUTOCORR_HELP_CHGQUOTES "EDITENG_HID_AUTOCORR_HELP_CHGQUOTES"
-#define HID_AUTOCORR_HELP_CHGSGLQUOTES "EDITENG_HID_AUTOCORR_HELP_CHGSGLQUOTES"
-#define HID_AUTOCORR_HELP_SETINETATTR "EDITENG_HID_AUTOCORR_HELP_SETINETATTR"
-#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE "EDITENG_HID_AUTOCORR_HELP_INGNOREDOUBLESPACE"
-#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL "EDITENG_HID_AUTOCORR_HELP_CHGWEIGHTUNDERL"
-#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL "EDITENG_HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL"
-#define HID_AUTOCORR_HELP_CHGORDINALNUMBER "EDITENG_HID_AUTOCORR_HELP_CHGORDINALNUMBER"
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index 8f0d7d5..cc8f18b 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -23,7 +23,6 @@
#include "abpilot.hrc"
#include "extensio.hrc"
-
// basics
#define RID_DIALOG_START RID_ABP_START
@@ -127,39 +126,27 @@
// local resource ids
-
-
#define FL_SEPARATOR 1
-#define FL_TYPE 2
-
-#define FT_TYPE_HINTS 1
#define FT_ADMINEXPLANATION 3
#define FT_NAME_EXPL 4
#define FT_ERROR 5
#define FL_TOOMUCHTABLES 6
-#define FT_ASSIGNEDFIELDS 8
#define FT_FINISH_EXPL 9
#define FT_DUPLICATENAME 10
#define FT_LOCATION 11
-
#define ET_DATASOURCENAME 1
-
#define PB_INVOKE_ADMIN_DIALOG 1
#define PB_BROWSE 3
-
#define LB_TABLELIST 1
-
#define CB_REGISTER_DS 1
-
#define CBB_LOCATION 1
-
#define STR_SELECT_ABTYPE 1
#define STR_INVOKE_ADMIN_DIALOG 2
#define STR_TABLE_SELECTION 3
@@ -168,8 +155,6 @@
// some defines
-
-
#define WINDOW_SIZE_X 240
#define WINDOW_SIZE_Y 185
@@ -183,14 +168,6 @@
#define BORDER_X 12
-
-
#endif // EXTENSIONS_ABPRESID_HRC
-/*************************************************************************
- * history:
- *
- * Revision 1.0 30.01.01 16:38:29 fs
- ************************************************************************/
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/sections.hrc b/extensions/source/bibliography/sections.hrc
index 308da32..9d04056 100644
--- a/extensions/source/bibliography/sections.hrc
+++ b/extensions/source/bibliography/sections.hrc
@@ -59,16 +59,6 @@
#define FL_2 35
#define FL_3 36
-//Business Address
-#define FT_STREET 2
-#define FT_CITY 3
-#define FT_COUNTRY 5
-#define ED_STREET 8
-#define ED_CITY 9
-#define ED_STATE 10
-#define ED_COUNTRY 11
-#define ED_ZIP 12
-
#define ST_TYPE_ARTICLE 40
#define ST_TYPE_BOOK 41
#define ST_TYPE_BOOKLET 42
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index b16bc8eb..c2ae61e 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -56,7 +56,6 @@
#define EXPLORERFILE_SPLITTER 52
-
#define STR_EXPLORERFILE_OPEN 1
#define STR_EXPLORERFILE_SAVE 2
#define STR_EXPLORERFILE_BUTTONSAVE 3
@@ -68,11 +67,6 @@
#define STR_DEFAULT_DIRECTORY 9
#define STR_PLACES_TITLE 10
-
-
-#define SID_SFX_START 5000
-#define SID_OPENURL (SID_SFX_START + 596)
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index e319817..19f74d3 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -20,11 +20,8 @@
#define _FRAMEWORK_HELPID_HRC
#define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW"
-#define HID_LICENSEDIALOG "FWK_HID_LICENSEDIALOG"
#define HID_STATUSBAR "FWK_HID_STATUSBAR"
#endif // #ifndef _FRAMEWORK_HELPID_HRC
-// ******************************************************************* EOF
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 5a21d82..b8ccfa4 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -252,18 +252,6 @@
#define MID_DOCINFO_DELETEUSERDATA 0x32
// only for FastPropertySet
-#define MID_DOCINFO_REVISION 0x15
-#define MID_DOCINFO_EDITTIME 0x16
-#define MID_DOCINFO_MODIFICATIONAUTHOR 0x18
-#define MID_DOCINFO_TEMPLATE 0x1c
-#define MID_DOCINFO_PRINTDATE 0x28
-#define MID_DOCINFO_PRINTEDBY 0x2a
-#define MID_DOCINFO_TEMPLATEDATE 0x2b
-#define MID_DOCINFO_STATISTIC 0x33
-#define MID_DOCINFO_CHARLOCALE 0x34
-#define MID_CATEGORY 0x35
-#define MID_COMPANY 0x36
-#define MID_MANAGER 0x37
#define MID_TYPE 0x38
#define MID_VALUE 0x39
#define MID_VALUESET 0x40
@@ -285,10 +273,6 @@
#include <sfx2/sfxsids.hrc>
-#define HID_INTERFACE_SFXHELP_VIEWSH 24
-
#endif // #ifndef _SFX_HRC
-// ******************************************************************* EOF
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 8144a57..b9daddf 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -302,7 +302,6 @@
#define SID_ACTIVATE (SID_SFX_START + 525)
#define SID_PRINTOUT (SID_SFX_START + 526)
-#define SID_FILE_LONGNAME (SID_SFX_START + 529)
#define SID_FILTER_NAME (SID_SFX_START + 530)
#define SID_DOC_SALVAGE (SID_SFX_START + 531)
#define SID_INSERTDOC (SID_SFX_START + 532)
@@ -370,7 +369,6 @@
#define SID_STYLE_REFERENCE (SID_SFX_START + 1602)
#define SID_TEMPLATE_NAME (SID_SFX_START + 660)
-#define SID_TEMPLATE_REGION (SID_SFX_START + 661)
#define SID_TEMPLATE_REGIONNAME (SID_SFX_START + 662)
#define SID_TEMPLATE_LOAD (SID_SFX_START + 663)
@@ -675,7 +673,6 @@
#define SID_BASICIDE_ARG_DOCUMENT_MODEL ( SID_BASICIDE_START + 51 )
#define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 )
#define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 )
-#define SID_BASICIDE_IDEOPTIONS ( SID_BASICIDE_START + 54 )
// SlotIds for Apps --------------------------------------------------------
#define FN_PARAM (SID_SW_START + 1100)
@@ -759,6 +756,4 @@
#define FID_CHG_RECORD (EDIT_MENU_START + 18)
#define SID_CHG_PROTECT (SC_VIEW_START + 84)
-// eof ------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc
index 7d7fd12..13077f3 100644
--- a/include/sfx2/sidebar/ResourceDefinitions.hrc
+++ b/include/sfx2/sidebar/ResourceDefinitions.hrc
@@ -21,33 +21,7 @@
#include <sfx2/sfx.hrc>
-//section page RID
-#define RC_PROPERTYPANEL_START RID_SFX_PROPERTYPANEL_START
-#define DLG_PROPERTY_DOCKING_WINDOW ( RC_PROPERTYPANEL_START + 0 )
-#define BMP_PROPERTYPANEL_EXPAND ( RC_PROPERTYPANEL_START + 1 )
-#define BMP_PROPERTYPANEL_COLLAPSE ( RC_PROPERTYPANEL_START + 2 )
-#define BMP_PROPERTYPANEL_MOREPROPERTY ( RC_PROPERTYPANEL_START + 5 )
-#define FT_PROPERTYPANEL_NOTSUPPORT_DESC ( RC_PROPERTYPANEL_START + 7 )
-
-#define RID_PROPERTYPANEL_TEXTPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 8 )
-#define RID_PROPERTYPANEL_PARAGRAPHPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 9 )
-#define RID_PROPERTYPANEL_AREAPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 10 )
-#define RID_PROPERTYPANEL_TBLDESIGNPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 11 )
-#define RID_PROPERTYPANEL_LINEPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 12 )
-#define RID_PROPERTYPANEL_POSIZEPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 13 )
-#define RID_PROPERTYPANEL_GRAPHICPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 14 )
-#define RID_PROPERTYPANEL_CELLAPPEARPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 15 )
-#define RID_PROPERTYPANEL_SWPAGE_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 16)
-#define RID_PROPERTYPANEL_SWOBJWRAP_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 17)
-#define RID_PROPERTYPANEL_SCCELL_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 18)
-#define RID_PROPERTYPANEL_SCALIGNMENT_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 19)
-#define RID_PROPERTYPANEL_SD_PAGELAYOUT_TITLEBAR (RC_PROPERTYPANEL_START+20)
-#define RID_PROPERTYPANEL_SD_PAGEPROPERTY_TITLEBAR (RC_PROPERTYPANEL_START+21)
-#define RID_PROPERTYPANEL_SD_TABLEDESIGN_TITLEBAR (RC_PROPERTYPANEL_START+22)
-#define RID_PROPERTYPANEL_NUMFORMAT_PAGE_TITLEBAR (RC_PROPERTYPANEL_START+23)
-
-#define RID_PANELDOCK_WINDOW ( RC_PROPERTYPANEL_START + 24 )
-#define STR_TITLE_DISCRIPTION ( RC_PROPERTYPANEL_START + 25 )
+#define STR_TITLE_DISCRIPTION ( RID_SFX_PROPERTYPANEL_START + 0 )
#ifndef STD_MASKCOLOR
#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
@@ -58,30 +32,9 @@
#define PROPERTYPAGE_WIDTH 109
//about titlebar
-
-#define FI_EXPANSION_INDICATOR 1
-#define FT_TITLE 2
#define STR_MOREPROPERTY_QUICKHELP 3
-#define TITLEBAR_WIDTH PROPERTYPAGE_WIDTH
-#define TITLEBAR_HEIGHT 13
-
-#define TITLEBAR_MARGIN_HORIZONTAL 3
-#define TITLEBAR_CONTROL_SPACING_HORIZONTAL 3
-
-#define FI_EXPANSION_INDICATOR_WIDTH 6
-#define FI_EXPANSION_INDICATOR_HEIGHT 6
-#define FI_EXPANSION_INDICATOR_X TITLEBAR_MARGIN_HORIZONTAL
-#define FI_EXPANSION_INDICATOR_Y (TITLEBAR_HEIGHT - FI_EXPANSION_INDICATOR_HEIGHT)/2
-
-#define FT_TITLE_WIDTH 85
-#define FT_TITLE_HEIGHT 10
-#define FT_TITLE_X FI_EXPANSION_INDICATOR_X + FI_EXPANSION_INDICATOR_WIDTH + TITLEBAR_CONTROL_SPACING_HORIZONTAL
-#define FT_TITLE_Y (TITLEBAR_HEIGHT - FT_TITLE_HEIGHT)/2 + 1
-
-
//about section page
-#define SECTIONPAGE_MARGIN_VERTICAL 12
#define SECTIONPAGE_MARGIN_VERTICAL_TOP 1
#define SECTIONPAGE_MARGIN_VERTICAL_BOT 5
#define SECTIONPAGE_MARGIN_HORIZONTAL 3
@@ -99,37 +52,16 @@
//for 16*16 pixel bmp
#define TOOLBOX_ITEM_HEIGHT 15
#define TOOLBOX_ITEM_WIDTH 13
-#define TOOLBOX_ITEM_DD_WIDTH 19
-
-//for 24*16 pixel bmp
-#define TOOLBOX_24_16_ITEM_HEIGHT 15
-#define TOOLBOX_24_16_ITEM_DD_WIDTH 23
-
-//for 24*24 pixel bmp
-#define TOOLBOX_24_24_ITEM_HEIGHT 18
-#define TOOLBOX_24_24_ITEM_DD_WIDTH 24
//about popup panel
#define POPUPPANEL_MARGIN_VERTICAL 7
#define POPUPPANEL_MARGIN_HORIZONTAL 7
-//for 42*42 pixel bmp
-#define TOOLBOX_42_42_ITEM_HEIGHT 30
-#define TOOLBOX_42_42_ITEM_DD_WIDTH 27
-#define TB_BORDER 2
-
-#define POPUPPANEL_SEP_VERTICAL_1 10
-#define POPUPPANEL_SEP_VERTICAL_2 6
-#define POPUPPANEL_SEP_HEIGHT 1
-
#define POPUP_BORDER_WIDTH 2
#define POPUP_BORDER_HEIGHT 3
#define OFFSET_X 1
#define OFFSET_Y 1
-#define POPUP_TOP_GRADIENT_HEIGHT 4
-#define POPUP_BOT_GRADIENT_HEIGHT 6
-
#define POPUP_COLOR_PICKER_WIDTH 97
#define POPUP_COLOR_PICKER_HEIGHT 114
//new
diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc
index 8978487..bef9d31 100644
--- a/include/svl/solar.hrc
+++ b/include/svl/solar.hrc
@@ -123,12 +123,12 @@
#define HID_START 32768
-#define HID_VCL_START (HID_START+100)
+// HID_VCL_START (HID_START+100)
// HID_VCL_END (HID_START+150)
// free: 200-299
-#define HID_SFX_START (HID_START+300)
+// HID_SFX_START (HID_START+300)
// HID_SFX_END (HID_START+999)
#define HID_LIB_START (HID_START+1000)
@@ -141,7 +141,7 @@
// free: HID_LIB_START 2000-2050
-#define HID_CHAOS_START (HID_LIB_START+2051)
+// HID_CHAOS_START (HID_LIB_START+2051)
// HID_CHAOS_END (HID_LIB_START+2069)
// free: HID_LIB_START 2070-9999
@@ -156,7 +156,7 @@
// free: HID_START 28000-29999
-#define HID_OBJ_START (HID_START+30000)
+// HID_OBJ_START (HID_START+30000)
// HID_OBJ_END (HID_START+32767)
// free: HID_OBJ_START+2281 to HID_OBJ_START+2800
diff --git a/include/svl/svl.hrc b/include/svl/svl.hrc
index 0abe18b..d29bde9 100644
--- a/include/svl/svl.hrc
+++ b/include/svl/svl.hrc
@@ -99,14 +99,11 @@
#define STR_SVT_MIMETYPE_APP_SXGLOBAL (STR_SVT_MIMETYPE_START+76)
#define STR_SVT_MIMETYPE_APP_SXIPACKED (STR_SVT_MIMETYPE_START+77)
-
#define STR_SVT_MIMETYPE_VIDEO_WEBM (STR_SVT_MIMETYPE_START+78)
#define STR_SVT_MIMETYPE_AUDIO_WEBM (STR_SVT_MIMETYPE_START+79)
#define STR_SVT_MIMETYPE_END (STR_SVT_MIMETYPE_AUDIO_WEBM)
-#endif // #ifndef _SVTOOLS_HRC
-
-// ******************************************************************* EOF
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hrc
index 4a0e54a7..0bacbbf 100644
--- a/include/svtools/controldims.hrc
+++ b/include/svtools/controldims.hrc
@@ -24,14 +24,8 @@
// From: Dialogue Specification and Guidelines - Visual Design V1.3
// by Christian Jansen
-
-
-// Usage:
-
-
// all values have to be mapped by MAP_APPFONT
-
// Base
#define RSC_BS_CHARHEIGHT 8
#define RSC_BS_CHARWIDTH 4
@@ -42,9 +36,7 @@
#define RSC_CD_FIXEDTEXT_HEIGHT RSC_BS_CHARHEIGHT
#define RSC_CD_FIXEDLINE_HEIGHT RSC_BS_CHARHEIGHT
-#define RSC_CD_FIXEDLINE_WIDTH RSC_BS_CHARWIDTH // for vertical FixedLines
-#define RSC_CD_DROPDOWN_HEIGHT 12 // also combobox and dropdown list
#define RSC_CD_TEXTBOX_HEIGHT 12 // also numeric fields etc.
#define RSC_CD_CHECKBOX_HEIGHT 10 // also tristate
@@ -62,8 +54,6 @@
#define RSC_SP_FLGR_SPACE_X 6 // between groupings made with FixedLine
#define RSC_SP_FLGR_SPACE_Y 4
#define RSC_SP_GRP_SPACE_X 6 // between groupings made with GroupBox
-#define RSC_SP_GRP_SPACE_Y 6
-#define RSC_SP_CHK_TEXTINDENT 8 // x indent of text aligned to checkbox title
// dialog inner border
#define RSC_SP_DLG_INNERBORDER_LEFT 6
@@ -72,15 +62,12 @@
#define RSC_SP_DLG_INNERBORDER_BOTTOM 6
// tab page inner border
-#define RSC_SP_TBPG_INNERBORDER_LEFT 6 // for tabpage groupings
#define RSC_SP_TBPG_INNERBORDER_TOP 3
#define RSC_SP_TBPG_INNERBORDER_RIGHT 6
#define RSC_SP_TBPG_INNERBORDER_BOTTOM 6
// FixedLine group inner border
-#define RSC_SP_FLGR_INNERBORDER_LEFT 6 // for FixedLine groupings
#define RSC_SP_FLGR_INNERBORDER_TOP 3
-#define RSC_SP_FLGR_INNERBORDER_RIGHT 0
#define RSC_SP_FLGR_INNERBORDER_BOTTOM 0
// GroupBox inner border
diff --git a/include/svtools/helpid.hrc b/include/svtools/helpid.hrc
index 0751c5b..479a214 100644
--- a/include/svtools/helpid.hrc
+++ b/include/svtools/helpid.hrc
@@ -20,34 +20,10 @@
#ifndef _SVT_HELPID_HRC
#define _SVT_HELPID_HRC
-#define HID_FILEDLG_PATHDLG "SVT_HID_FILEDLG_PATHDLG"
-#define HID_FILEDLG_DIR "SVT_HID_FILEDLG_DIR"
-#define HID_FILEDLG_EDIT "SVT_HID_FILEDLG_EDIT"
-#define HID_FILEDLG_DIRS "SVT_HID_FILEDLG_DIRS"
-#define HID_FILEDLG_DRIVE "SVT_HID_FILEDLG_DRIVE"
-#define HID_FILEDLG_DRIVES "SVT_HID_FILEDLG_DRIVES"
-#define HID_FILEDLG_NEWDIR "SVT_HID_FILEDLG_NEWDIR"
-#define HID_FILEDLG_HOME "SVT_HID_FILEDLG_HOME"
-#define HID_FILEDLG_FILE "SVT_HID_FILEDLG_FILE"
#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB"
#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB"
#define HID_FILEDLG_STANDARD "SVT_HID_FILEDLG_STANDARD"
-#define HID_FILEDLG_MANAGER "SVT_HID_FILEDLG_MANAGER"
-#define HID_FILEDLG_URL "SVT_HID_FILEDLG_URL"
-#define HID_FILEDLG_USE_PASSWD "SVT_HID_FILEDLG_USE_PASSWD"
-#define HID_FILEDLG_READ_ONLY "SVT_HID_FILEDLG_READ_ONLY"
#define HID_FILEDLG_AUTOCOMPLETEBOX "SVT_HID_FILEDLG_AUTOCOMPLETEBOX"
-#define HID_FILEDLG_SAVE_BTN "SVT_HID_FILEDLG_SAVE_BTN"
-#define HID_FILEDLG_SAVE_FILENAME "SVT_HID_FILEDLG_SAVE_FILENAME"
-#define HID_FILEDLG_SAVE_FILETYPE "SVT_HID_FILEDLG_SAVE_FILETYPE"
-#define HID_FILEDLG_INSERT_BTN "SVT_HID_FILEDLG_INSERT_BTN"
-#define HID_FILEDLG_PATH_BTN "SVT_HID_FILEDLG_PATH_BTN"
-#define HID_FILEDLG_PATH_FILENAME "SVT_HID_FILEDLG_PATH_FILENAME"
-#define HID_FILEDLG_FOLDER_BTN "SVT_HID_FILEDLG_FOLDER_BTN"
-#define HID_FILEDLG_FOLDER_FILENAME "SVT_HID_FILEDLG_FOLDER_FILENAME"
-#define HID_FILEDLG_SRCHFOLDER_BTN "SVT_HID_FILEDLG_SRCHFOLDER_BTN"
-#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SVT_HID_FILEDLG_EDIT_FAVORITES_LISTBOX"
-#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SVT_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR"
// Help ids of template dialog
#define HID_TEMPLATEDLG_DIALOG "SVT_HID_TEMPLATEDLG_DIALOG"
@@ -67,10 +43,8 @@
#define HID_FILEVIEW_MENU_RENAME "SVT_HID_FILEVIEW_MENU_RENAME"
// help ids for the different modi of the file picker dialog
- // FREE
#define HID_FILESAVE_LEVELUP "SVT_HID_FILESAVE_LEVELUP"
#define HID_FILESAVE_CREATEDIRECTORY "SVT_HID_FILESAVE_CREATEDIRECTORY"
-#define HID_FILESAVE_DEFAULTDIRECTORY "SVT_HID_FILESAVE_DEFAULTDIRECTORY"
#define HID_FILESAVE_FILEVIEW "SVT_HID_FILESAVE_FILEVIEW"
#define HID_FILESAVE_TEMPLATE "SVT_HID_FILESAVE_TEMPLATE"
#define HID_FILESAVE_FILEURL "SVT_HID_FILESAVE_FILEURL"
@@ -87,8 +61,6 @@
#define HID_FILEOPEN_VERSION "SVT_HID_FILEOPEN_VERSION"
#define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE"
-#define HID_PRINTDIALOG_TOFILE "SVT_HID_PRINTDIALOG_TOFILE"
-
#define HID_WIZARD_NEXT "SVT_HID_WIZARD_NEXT"
#define HID_WIZARD_PREVIOUS "SVT_HID_WIZARD_PREVIOUS"
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index a4fe309..0bd819f 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -283,7 +283,7 @@
#define SID_ATTR_POSTIT_AUTHOR ( SID_SVX_START + 44 )
#define SID_ATTR_POSTIT_DATE ( SID_SVX_START + 45 )
#define SID_ATTR_POSTIT_TEXT ( SID_SVX_START + 46 )
-#define SID_ATTR_SEARCH ( SID_SVX_START + 47 )
+// free
// CAUTION! Range <48 .. 49> used by EditEngine (!)
diff --git a/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc
index dc939a5..5a62580 100644
--- a/reportdesign/inc/rptui_slotid.hrc
+++ b/reportdesign/inc/rptui_slotid.hrc
@@ -29,7 +29,7 @@
#define SID_CONDITIONALFORMATTING ( SID_RPTUI_START + 4 )
#define SID_PAGEDIALOG ( SID_RPTUI_START + 5 )
#define SID_SETCONTROLDEFAULTS ( SID_RPTUI_START + 6 )
-#define SID_INSERTBREAK ( SID_RPTUI_START + 7 )
+// free
#define SID_PAGEHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 8 )
#define SID_PAGEFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 9 )
#define SID_REPORTHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 10 )
@@ -48,7 +48,6 @@
#define SID_SPLIT_POSITION ( SID_RPTUI_START + 23 )
#define SID_PROPERTYBROWSER_LAST_PAGE ( SID_RPTUI_START + 24 )
// free
-
#define SID_DRAWTBX_CS_BASIC1 ( SID_RPTUI_START + 26 )
#define SID_DRAWTBX_CS_BASIC2 ( SID_RPTUI_START + 27 )
#define SID_DRAWTBX_CS_BASIC3 ( SID_RPTUI_START + 28 )
diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc
index 7978ab7..515c2d0 100644
--- a/reportdesign/source/ui/dlg/CondFormat.hrc
+++ b/reportdesign/source/ui/dlg/CondFormat.hrc
@@ -35,8 +35,6 @@
#define IMAGE_BUTTON_WIDTH 12
#define IMAGE_BUTTON_HEIGHT 14
-
-#define FL_FORMAT 1
#define FL_CONDITION_HEADER 2
#define CRTL_FORMAT_PREVIEW 3
#define TB_FORMAT 4
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc
index 5ecc454..0700f52 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.hrc
+++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc
@@ -36,8 +36,6 @@
#define LST_ORDER (17)
#define FL_SEPARATOR1 (18)
#define FT_MOVELABEL (19)
-#define PB_UP (20)
-#define PB_DOWN (21)
#define FL_SEPARATOR2 (22)
#define FL_SEPARATOR3 (23)
#define TB_TOOLBOX (27)
diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src
index 0709803..fae81bf 100644
--- a/sc/source/ui/drawfunc/drformsh.src
+++ b/sc/source/ui/drawfunc/drformsh.src
@@ -23,18 +23,6 @@
// Defines -------------------------------------------------------------------------------
-#define MN_LAYER\
- ToolBoxItem\
- {\
- Identifier = SID_FRAME_TO_TOP ; \
- HelpID = CMD_SID_FRAME_TO_TOP ; \
- };\
- ToolBoxItem\
- {\
- Identifier = SID_FRAME_TO_BOTTOM ; \
- HelpID = CMD_SID_FRAME_TO_BOTTOM ; \
- };
-
#define MN_RENAME_OBJECT \
MenuItem\
{\
diff --git a/sc/source/ui/inc/condformatdlg.hrc b/sc/source/ui/inc/condformatdlg.hrc
index ebb8757..5aa27e6 100644
--- a/sc/source/ui/inc/condformatdlg.hrc
+++ b/sc/source/ui/inc/condformatdlg.hrc
@@ -15,8 +15,6 @@
#define BTN_ADD 10
#define BTN_REMOVE 11
-#define CTRL_LIST 12
-
#define LB_TYPE 14
#define FT_COND_NR 15
#define FT_CONDITION 16
diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc
index 6672c6a..f397cca 100644
--- a/sc/source/ui/inc/submenu.hrc
+++ b/sc/source/ui/inc/submenu.hrc
@@ -20,6 +20,5 @@
#define SUBMENU_OBJARRANGE 23
#define SUBMENU_ANCHOR 24
#define SUBMENU_OBJMIRROR 33
-#define MN_TEMPLATES 39
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index 838cac4..272e4e4 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
@@ -24,15 +24,10 @@
#define TOOLBOX_WIDTH 50
#define TOOLBOX_HEIGHT 15
-#define TOOLBOX_WIDTH_2 34
-#define TOOLBOX_HEIGHT_2 30
-
#define TOOLBOX_BORDER_WIDTH 107
-#define PB_BORDER_MOREBTN 57
#define POPUPPANEL_MARGIN_SMALL_PIXEL 8
-
Image IMG_CELL_BORDER
{
ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";};
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index 9c2c5fe..3181f92 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -21,64 +21,6 @@
#include <svx/globlmn.hrc>
#include "tbinsert.hrc"
-
- // ToolBoxen: ----------------------------------------------------------------
-
-/*
- * ToolBox mit Eingabezeile: HelpStrings fuer Knoepfe und Fenster:
- */
-
-#define ITEM_TOOLBAR_SORT_ASCENDING \
- Identifier = SID_SORT_ASCENDING ; \
- HelpId = SID_SORT_ASCENDING ;
-
-#define ITEM_TOOLBAR_SORT_DESCENDING \
- Identifier = SID_SORT_DESCENDING ; \
- HelpId = SID_SORT_DESCENDING ;
-
-#define ITEM_TOOLBAR_INSERT_FRAME \
- Identifier = SID_INSERT_FRAME ; \
- HelpId = SID_INSERT_FRAME ;
-
-
-#define ITEM_TOOLBAR_INSERT_GRAPHIC \
- Identifier = SID_INSERT_GRAPHIC ; \
- HelpId = SID_INSERT_GRAPHIC ;
-
-#define ITEM_TOOLBAR_AUTO_FILTER \
- Identifier = SID_AUTO_FILTER ; \
- HelpId = SID_AUTO_FILTER ;
-
-
-#define ITEM_TOOLBAR_OUTLINE_MAKE \
- Identifier = SID_OUTLINE_MAKE ; \
- HelpId = SID_OUTLINE_MAKE ;
-
-
-#define ITEM_TOOLBAR_OUTLINE_REMOVE \
- Identifier = SID_OUTLINE_REMOVE ; \
- HelpId = SID_OUTLINE_REMOVE ;
-
-#define ITEM_TOOLBAR_DRAW_CHART \
- Identifier = SID_INSERT_DIAGRAM ; \
- HelpId = SID_DRAW_CHART ;
-
-#define ITEM_TOOLBAR_SPELLING \
- Identifier = SID_SPELL_DIALOG ; \
- HelpId = SID_SPELL_DIALOG ;
-
-#define ITEM_TOOLBAR_THESAURUS \
- Identifier = SID_THESAURUS ; \
- HelpId = SID_THESAURUS ;
-
-#define ITEM_TOOLBAR_FILTER \
- Identifier = SID_FILTER ; \
- HelpId = SID_FILTER ;
-
-#define ITEM_TOOLBAR_SPECIAL_FILTER \
- Identifier = SID_SPECIAL_FILTER;\
- HelpId = SID_SPECIAL_FILTER ;
-
String SCSTR_QHELP_POSWND
{
Text [ en-US ] = "Name Box" ;
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 1c63092..aa15783 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -62,11 +62,6 @@
#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198)
#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199)
-#define SHELLID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174)
-#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175)
-#define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176)
-#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177)
-
#define SID_PAGESETUP (SID_SD_START+2)
#define SID_COPYOBJECTS (SID_SD_START+4)
#define SID_MANAGE_LINKS (SID_SD_START+5)
@@ -265,7 +260,6 @@
#define ID_VAL_DISTANCE (SID_SD_START+245)
#define ID_VAL_INDEX (SID_SD_START+246)
#define ID_VAL_WIDTH (SID_SD_START+247)
-#define ID_VAL_PANEL_INDEX (SID_SD_START+249)
// just for tests, namely that APP:HRC ff. has not to be build every time
#define ID_VAL_DUMMY0 (SID_SD_START+230)
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 1b47207..9a5c5c6 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -1102,14 +1102,6 @@
};\
};
-#define MNSUB_ROTATE \
- MenuItem\
- {\
- Identifier = SID_OBJECT_ROTATE ; \
- HelpId = CMD_SID_OBJECT_ROTATE ; \
- Text [ en-US ] = "~Rotate";\
- };
-
#define MN_CONNECT \
MenuItem\
{\
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 33e9d72..750b27b 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -52,7 +52,6 @@
#include "ViewShell.hxx"
#include "FrameView.hxx"
#include "sdattr.hxx"
-#include "tpoption.hrc"
#include "optsitem.hxx"
#include "DrawDocShell.hxx"
#include "drawdoc.hxx"
diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src
index 13e718a..57dd9cb 100644
--- a/sd/source/ui/app/tbxids_tmpl.src
+++ b/sd/source/ui/app/tbxids_tmpl.src
@@ -326,55 +326,6 @@
Hide = TRUE; \
};
-#define TBI_TRANSPARENCE \
- ToolBoxItem\
- {\
- Identifier = SID_OBJECT_TRANSPARENCE; \
- HelpID = SID_OBJECT_TRANSPARENCE; \
- Hide = TRUE; \
- };
-
-#define TBI_GRADIENT \
- ToolBoxItem\
- {\
- Identifier = SID_OBJECT_GRADIENT; \
- HelpID = SID_OBJECT_GRADIENT; \
- Hide = TRUE; \
- };
-
-#define TBI_CONVERT \
- ToolBoxItem\
- {\
- Identifier = SID_CONVERT;\
- HelpID = SID_CONVERT;\
- Hide = TRUE; \
- };
-
-#define TBI_LSPACE_10 \
- ToolBoxItem \
- {\
- Identifier = SID_ATTR_PARA_LINESPACE_10; \
- HelpID = SID_ATTR_PARA_LINESPACE_10; \
- Hide = TRUE; \
- };
-
-#define TBI_LSPACE_15 \
- ToolBoxItem \
- {\
- Identifier = SID_ATTR_PARA_LINESPACE_15; \
- HelpID = SID_ATTR_PARA_LINESPACE_15; \
- Hide = TRUE; \
- };
-
-#define TBI_LSPACE_20 \
- ToolBoxItem \
- {\
- Identifier = SID_ATTR_PARA_LINESPACE_20; \
- HelpID = SID_ATTR_PARA_LINESPACE_20; \
- Hide = TRUE; \
- };
-
-
// Option bar
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index d347d43..b8c4a01 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -36,7 +36,6 @@
#include "sdattr.hxx"
#include "sdresid.hxx"
#include "optsitem.hxx"
-#include "tpoption.hrc"
#include "tpoption.hxx"
#include "strings.hrc"
#include "app.hrc"
diff --git a/sd/source/ui/inc/tpoption.hrc b/sd/source/ui/inc/tpoption.hrc
deleted file mode 100644
index e93b380..0000000
--- a/sd/source/ui/inc/tpoption.hrc
+++ /dev/null
@@ -1,37 +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_OPTIONS_LAYOUT 596
-#define TP_OPTIONS_SNAP 598
-#define GRP_SNAP 1
-#define GRP_ORTHO 2
-#define FT_SNAP_AREA 1
-#define FT_BEZ_ANGLE 4
-#define MTR_FLD_SNAP_AREA 1
-#define MTR_FLD_ANGLE 2
-#define MTR_FLD_BEZ_ANGLE 3
-#define CBX_ROTATE 8
-#define CBX_ORTHO 6
-#define CBX_BIGORTHO 7
-#define CBX_SNAPGRID 1
-#define CBX_SNAP_HELPLINES 2
-#define CBX_SNAP_BORDER 3
-#define CBX_SNAP_FRAME 4
-#define CBX_SNAP_POINTS 5
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateview.hrc b/sfx2/source/control/templateview.hrc
index e5608c9..95bf930 100644
--- a/sfx2/source/control/templateview.hrc
+++ b/sfx2/source/control/templateview.hrc
@@ -8,7 +8,6 @@
*/
#define BTN_ALL_TEMPLATES 256
-#define CONTROL_BUTTONS 257
#define FT_NAME 258
#define STR_WELCOME_LINE1 259
#define STR_WELCOME_LINE2 260
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 233cd59..9b0d421 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -37,7 +37,6 @@
#define MSG_OVERWRITE ( RC_DIALOG_BEGIN + 1)
#define MSG_TABPAGE_INVALIDNAME ( RC_DIALOG_BEGIN + 13)
#define MSG_TABPAGE_INVALIDSTYLE ( RC_DIALOG_BEGIN + 14)
-#define DLG_NEW_STYLE_BY_EXAMPLE ( RC_DIALOG_BEGIN + 15)
#define MSG_POOL_STYLE_NAME ( RC_DIALOG_BEGIN + 16)
#define MSG_TABPAGE_INVALIDPARENT ( RC_DIALOG_BEGIN + 18)
diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc
index a29e5bd..3c128df 100644
--- a/sfx2/source/dialog/templdlg.hrc
+++ b/sfx2/source/dialog/templdlg.hrc
@@ -18,7 +18,4 @@
*/
#define TB_ACTION 15
-#define BT_FLIST 8
-#define BT_VLIST 9
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 139c90c..d3d32fb 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -21,79 +21,23 @@
#include <sfx2/sfxcommands.h>
-// Help-Ids -----------------------------------------------------------------
-
-#define HID_PRINTMONITOR "SFX2_HID_PRINTMONITOR"
-#define HID_CONFIG_EVENT "SFX2_HID_CONFIG_EVENT"
-#define HID_BROWSERCONTROL "SFX2_HID_BROWSERCONTROL"
-#define HID_PREVIEW_FRAME "SFX2_HID_PREVIEW_FRAME"
-#define HID_DOCINFO_FRAME "SFX2_HID_DOCINFO_FRAME"
-#define HID_EXPLORER_FRAME "SFX2_HID_EXPLORER_FRAME"
-#define HID_APP_WIN "SFX2_HID_APP_WIN"
#define HID_TEMPLATE_FMT "SFX2_HID_TEMPLATE_FMT"
#define HID_TEMPLATE_FILTER "SFX2_HID_TEMPLATE_FILTER"
-#define HID_SEARCH_DLG_TABLB "SFX2_HID_SEARCH_DLG_TABLB"
#define HID_TEMPLDLG_NEWBYEXAMPLE "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE"
#define HID_TEMPLDLG_UPDATEBYEXAMPLE "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE"
#define HID_TEMPLDLG_WATERCAN "SFX2_HID_TEMPLDLG_WATERCAN"
-#define HID_DESKTOP "SFX2_HID_DESKTOP"
#define HID_FULLSCREENTOOLBOX "SFX2_HID_FULLSCREENTOOLBOX"
#define HID_HELPBAR "SFX2_HID_HELPBAR"
#define HID_NAVIGATOR_WINDOW "SFX2_HID_NAVIGATOR_WINDOW"
#define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN"
#define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN"
-#define HID_HELPAGENT_TIP_BOX "SFX2_HID_HELPAGENT_TIP_BOX"
#define HID_TEMPLDLG_TOOLBOX_LEFT "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT"
#define HID_TEMPLDLG_TOOLBOX_RIGHT "SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT"
-#define HID_EXPLORER_SRCH_COUNT "SFX2_HID_EXPLORER_SRCH_COUNT"
-#define HID_EXPLORER_SRCH_LATEST_COUNT "SFX2_HID_EXPLORER_SRCH_LATEST_COUNT"
#define HID_CONFIG_EVENT_OFFICE_BASED "SFX2_HID_CONFIG_EVENT_OFFICE_BASED"
#define HID_CONFIG_EVENT_DOCUMENT_BASED "SFX2_HID_CONFIG_EVENT_DOCUMENT_BASED"
#define HID_STYLIST_NEW "SFX2_HID_STYLIST_NEW"
#define HID_STYLIST_EDIT "SFX2_HID_STYLIST_EDIT"
#define HID_STYLIST_DELETE "SFX2_HID_STYLIST_DELETE"
-#define HID_EXPLORERMENU_ARRANGEICONS "SFX2_HID_EXPLORERMENU_ARRANGEICONS"
-#define HID_EXPLORERMENU_STDTEMPLATE "SFX2_HID_EXPLORERMENU_STDTEMPLATE"
-#define HID_EXPLORER_DOCVIEW_ICON "SFX2_HID_EXPLORER_DOCVIEW_ICON"
-#define HID_EXPLORER_DOCVIEW_DETAILS "SFX2_HID_EXPLORER_DOCVIEW_DETAILS"
-#define HID_BRWBOX_HEADERBAR "SFX2_HID_BRWBOX_HEADERBAR"
-#define HID_TASKBAR "SFX2_HID_TASKBAR"
-#define HID_TASKBUTTONBAR "SFX2_HID_TASKBUTTONBAR"
-#define HID_TASKTOOLBAR "SFX2_HID_TASKTOOLBAR"
-#define HID_CNT_DLG_SEARCH_BT_SHOW "SFX2_HID_CNT_DLG_SEARCH_BT_SHOW"
-#define HID_CNT_DLG_SEARCH_BT_UPDATE "SFX2_HID_CNT_DLG_SEARCH_BT_UPDATE"
-#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE "SFX2_HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE"
-#define HID_CNT_DLG_SEARCH_BT_STOP "SFX2_HID_CNT_DLG_SEARCH_BT_STOP"
-#define HID_CNT_PAGE_HEADER "SFX2_HID_CNT_PAGE_HEADER"
-#define HID_CNT_PAGE_DESCRIPTION "SFX2_HID_CNT_PAGE_DESCRIPTION"
-#define HID_CNT_LB_HEADER "SFX2_HID_CNT_LB_HEADER"
-#define HID_CNT_LB_DESCRIPTION "SFX2_HID_CNT_LB_DESCRIPTION"
-#define HID_GROUPVIEW_CONTENT_BIG "SFX2_HID_GROUPVIEW_CONTENT_BIG"
-#define HID_GROUPVIEW_CONTENT_SMALL "SFX2_HID_GROUPVIEW_CONTENT_SMALL"
-#define HID_GROUPVIEW_CONTENT_TREE "SFX2_HID_GROUPVIEW_CONTENT_TREE"
-#define HID_TASKSTATUSBAR "SFX2_HID_TASKSTATUSBAR"
-#define HID_CNT_PAGE_HEADER_TABBAR "SFX2_HID_CNT_PAGE_HEADER_TABBAR"
-#define HID_CNT_PAGE_SUBSCR_TABBAR "SFX2_HID_CNT_PAGE_SUBSCR_TABBAR"
-#define HID_STATUSINDICATOR_TEXT "SFX2_HID_STATUSINDICATOR_TEXT"
-#define HID_STATUSINDICATOR_PROGRESS "SFX2_HID_STATUSINDICATOR_PROGRESS"
-#define HID_CNT_VALUE_ADDED_NONE "SFX2_HID_CNT_VALUE_ADDED_NONE"
-#define HID_CNT_VALUE_ADDED_DOCINFO "SFX2_HID_CNT_VALUE_ADDED_DOCINFO"
-#define HID_CNT_VALUE_ADDED_FULL "SFX2_HID_CNT_VALUE_ADDED_FULL"
-#define HID_CNT_MESSAGE_STOREMODE_REMOTE "SFX2_HID_CNT_MESSAGE_STOREMODE_REMOTE"
-#define HID_CNT_MESSAGE_STOREMODE_LOCAL "SFX2_HID_CNT_MESSAGE_STOREMODE_LOCAL"
-#define HID_CNT_VIEW_ALL_ARTICLES "SFX2_HID_CNT_VIEW_ALL_ARTICLES"
-#define HID_CNT_VIEW_UNREAD_ARTICLES "SFX2_HID_CNT_VIEW_UNREAD_ARTICLES"
-#define HID_CNT_VIEW_READ_ARTICLES "SFX2_HID_CNT_VIEW_READ_ARTICLES"
-#define HID_CNT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_VIEW_MARKED_ARTICLES"
-#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES "SFX2_HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES"
-#define HID_CNT_VIEW_ALL_FOLDERS "SFX2_HID_CNT_VIEW_ALL_FOLDERS"
-#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS "SFX2_HID_CNT_VIEW_SUBSCRIBED_FOLDERS"
-#define HID_CNT_VIEW_ACTIVE_FOLDERS "SFX2_HID_CNT_VIEW_ACTIVE_FOLDERS"
-#define HID_CNT_SENT_VIEW_ALL_ARTICLES "SFX2_HID_CNT_SENT_VIEW_ALL_ARTICLES"
-#define HID_CNT_SENT_VIEW_SENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_SENT_ARTICLES"
-#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_UNSENT_ARTICLES"
-#define HID_CNT_SENT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_SENT_VIEW_MARKED_ARTICLES"
-#define HID_TABDLG_APPLY_BTN "SFX2_HID_TABDLG_APPLY_BTN"
#define HID_HELP_WINDOW "SFX2_HID_HELP_WINDOW"
#define HID_HELP_LISTBOX "SFX2_HID_HELP_LISTBOX"
#define HID_HELP_TABCONTROL "SFX2_HID_HELP_TABCONTROL"
@@ -104,12 +48,10 @@
#define HID_HELP_TOOLBOXITEM_FORWARD "SFX2_HID_HELP_TOOLBOXITEM_FORWARD"
#define HID_HELP_TOOLBOXITEM_PRINT "SFX2_HID_HELP_TOOLBOXITEM_PRINT"
#define HID_HELP_TOOLBOXITEM_BOOKMARKS "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS"
-#define HID_TBXCONTROL_FILENEW "SFX2_HID_TBXCONTROL_FILENEW"
#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG"
#define HID_HELP_BOOKMARKS_OPEN "SFX2_HID_HELP_BOOKMARKS_OPEN"
#define HID_HELP_BOOKMARKS_RENAME "SFX2_HID_HELP_BOOKMARKS_RENAME"
#define HID_HELP_BOOKMARKS_DELETE "SFX2_HID_HELP_BOOKMARKS_DELETE"
-#define HID_CLOSE_WARNING "SFX2_HID_CLOSE_WARNING"
#define HID_DID_SAVE_PACKED_XML "SFX2_HID_DID_SAVE_PACKED_XML"
#define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE"
@@ -117,26 +59,12 @@
#define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE"
-#define HID_XMLSEC_QUERY_SAVEBEFORESIGN "SFX2_HID_XMLSEC_QUERY_SAVEBEFORESIGN"
#define HID_XMLSECDLG_MACROWARN "SFX2_HID_XMLSECDLG_MACROWARN"
-#define HID_XMLSEC_INFO_WRONGDOCFORMAT "SFX2_HID_XMLSEC_INFO_WRONGDOCFORMAT"
-#define HID_WARNING_MACROSDISABLED "SFX2_HID_WARNING_MACROSDISABLED"
#define HID_HELP_ONSTARTUP_BOX "SFX2_HID_HELP_ONSTARTUP_BOX"
-#define HID_DLG_CHECKFORONLINEUPDATE "SFX2_HID_DLG_CHECKFORONLINEUPDATE"
#define HID_CTRL_CUSTOMPROPS_YES_NO "SFX2_HID_CTRL_CUSTOMPROPS_YES_NO"
-#define HID_HELP_ONHELP "SFX2_HID_HELP_ONHELP"
-
#define HID_QUERY_LOAD_TEMPLATE "SFX2_HID_QUERY_LOAD_TEMPLATE"
-#define HID_SECURITYTAB_PASSWORD_TO_OPEN "SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN"
-#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN "SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN"
-#define HID_SECURITYTAB_PASSWORD_TO_MODIFY "SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY"
-#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY "SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY"
-#define HID_SECURITYTAB_OPEN_FILE_READONLY "SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY"
-#define HID_SECURITYTAB_RECORD_CHANGES "SFX2_HID_SECURITYTAB_RECORD_CHANGES"
-#define HID_SECURITYTAB_PROTECTION "SFX2_HID_SECURITYTAB_PROTECTION"
-
#define HID_TASKPANE_WINDOW "SFX2_HID_TASKPANE_WINDOW"
#define HID_TASKPANE_VIEW_MENU "SFX2_HID_TASKPANE_VIEW_MENU"
@@ -144,6 +72,4 @@
#endif // #ifndef _SFX_HELPID_HRC
-// ******************************************************************* EOF
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 8189d72..a8604b3 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -56,7 +56,6 @@
#include <ucbhelper/content.hxx>
#include <unotools/localfilehelper.hxx>
#include <unotools/ucbhelper.hxx>
-#include "iodlg.hrc"
#include <svtools/asynclink.hxx>
#include <svl/urlfilter.hxx>
diff --git a/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc
deleted file mode 100644
index 7f244b0..0000000
--- a/svtools/source/inc/iodlg.hrc
+++ /dev/null
@@ -1,96 +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 _SVTOOLS_IODLGIMPL_HRC
-#define _SVTOOLS_IODLGIMPL_HRC
-
-#include <svtools/svtools.hrc>
-
-// ModalDialog DLG_SVT_EXPLORERFILE
-
-#define FT_EXPLORERFILE_CURRENTPATH 10
-#define BTN_EXPLORERFILE_NEWFOLDER 11
-#define BTN_EXPLORERFILE_UP 12
-// BTN_EXPLORERFILE_STANDARD 13
-#define BTN_EXPLORERFILE_OPEN 14
-#define BTN_EXPLORERFILE_CANCEL 15
-#define BTN_EXPLORERFILE_HELP 16
-
-#define IMG_FILEDLG_BTN_UP 10
-#define IMG_FILEDLG_BTN_STD 11
-#define IMG_FILEDLG_CREATEFOLDER 15
-
-#define CTL_EXPLORERFILE_FILELIST 20
-
-#define FT_EXPLORERFILE_FILENAME 30
-#define ED_EXPLORERFILE_FILENAME 31
-#define FT_EXPLORERFILE_SHARED_LISTBOX 32
-#define LB_EXPLORERFILE_SHARED_LISTBOX 33
-#define FT_EXPLORERFILE_FILETYPE 34
-#define LB_EXPLORERFILE_FILETYPE 35
-
-#define CB_EXPLORERFILE_READONLY 40
-#define CB_EXPLORERFILE_PASSWORD 41
-#define CB_AUTO_EXTENSION 42
-#define CB_OPTIONS 43
-
-
-
-#define STR_EXPLORERFILE_OPEN 1
-#define STR_EXPLORERFILE_SAVE 2
-#define STR_EXPLORERFILE_BUTTONSAVE 3
-#define STR_PATHNAME 4
-#define STR_PATHSELECT 5
-#define STR_BUTTONSELECT 6
-#define STR_ACTUALVERSION 7
-
-// DLG_SVT_QUERYFOLDERNAME -----------------------
-
-#define FT_SVT_QUERYFOLDERNAME_DLG_NAME 10
-#define ED_SVT_QUERYFOLDERNAME_DLG_NAME 11
-#define FL_SVT_QUERYFOLDERNAME_DLG_NAME 12
-#define BT_SVT_QUERYFOLDERNAME_DLG_OK 13
-#define BT_SVT_QUERYFOLDERNAME_DLG_CANCEL 14
-#define BT_SVT_QUERYFOLDERNAME_DLG_HELP 15
-
-
-
-#define SID_SFX_START 5000
-#define SID_OPENURL (SID_SFX_START + 596)
-
-#define HID_FILEDLG_STANDARD (HID_SFX_START + 27)
-#define HID_FILEDLG_MANAGER (HID_SFX_START + 28)
-#define HID_FILEDLG_URL (HID_SFX_START + 29)
-#define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31)
-#define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32)
-
-#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list