[Libreoffice-commits] core.git: 4 commits - chart2/source cui/source dbaccess/source extensions/source framework/inc reportdesign/source sc/source sd/source sfx2/source svx/inc svx/source sw/inc sw/source uui/source xmlsecurity/source
Thomas Arnhold
thomas at arnhold.org
Tue Apr 22 04:06:30 PDT 2014
chart2/source/controller/dialogs/CommonResources.hrc | 48 ------
chart2/source/controller/dialogs/dlg_ChartType.cxx | 1
chart2/source/controller/dialogs/dlg_ChartType.hrc | 29 ----
chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc | 57 --------
cui/source/customize/acccfg.hrc | 22 ---
cui/source/customize/cfg.hrc | 30 ----
cui/source/dialogs/hangulhanjadlg.hrc | 41 -----
cui/source/dialogs/scriptdlg.hrc | 7
cui/source/dialogs/svuidlg.hrc | 2
cui/source/options/internationaloptions.hrc | 65 ---------
dbaccess/source/ui/control/RelationControl.cxx | 1
dbaccess/source/ui/dlg/RelationDlg.cxx | 1
dbaccess/source/ui/dlg/RelationDlg.hrc | 44 ------
dbaccess/source/ui/inc/RelationControl.hrc | 27 ---
extensions/source/abpilot/abpresid.hrc | 1
framework/inc/services/logindialog.hrc | 24 ---
reportdesign/source/ui/dlg/GroupsSorting.hrc | 2
sc/source/ui/dbgui/pvfundlg.hrc | 44 ------
sc/source/ui/inc/acredlin.hrc | 4
sc/source/ui/inc/dbnamdlg.hrc | 44 ------
sc/source/ui/inc/miscdlgs.hrc | 23 ---
sc/source/ui/inc/optdlg.hrc | 71 ----------
sc/source/ui/inc/optload.hrc | 32 ----
sc/source/ui/inc/solveroptions.hrc | 38 -----
sc/source/ui/miscdlgs/solveroptions.cxx | 1
sc/source/ui/optdlg/opredlin.cxx | 3
sc/source/ui/optdlg/tpcalc.cxx | 1
sc/source/ui/optdlg/tpcompatibility.cxx | 2
sc/source/ui/optdlg/tpdefaults.cxx | 2
sc/source/ui/optdlg/tpformula.cxx | 2
sc/source/ui/optdlg/tpprint.cxx | 1
sc/source/ui/optdlg/tpusrlst.cxx | 1
sc/source/ui/optdlg/tpview.cxx | 3
sd/source/ui/annotations/annotations.hrc | 7
sd/source/ui/inc/fontwork.hrc | 26 ---
sd/source/ui/inc/optdlg.hrc | 24 ---
sfx2/source/dialog/dinfdlg.hrc | 20 --
sfx2/source/menu/menu.hrc | 16 --
svx/inc/gallery.hrc | 50 -------
svx/source/form/fmexpl.cxx | 1
svx/source/form/fmexpl.src | 1
svx/source/form/navigatortree.cxx | 1
svx/source/form/navigatortreemodel.cxx | 1
svx/source/inc/fmexpl.hrc | 33 ----
svx/source/tbxctrls/extrusioncontrols.hrc | 4
svx/source/unodialogs/textconversiondlgs/buttongroup.hrc | 57 --------
svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc | 28 ---
sw/inc/dbui.hrc | 5
sw/source/core/uibase/inc/cnttab.hxx | 4
sw/source/core/uibase/index/idxmrk.cxx | 1
sw/source/core/uibase/index/idxmrk.hrc | 26 ---
sw/source/core/uibase/utlui/unotools.hrc | 7
sw/source/ui/config/optdlg.hrc | 51 -------
sw/source/ui/config/optdlg.src | 1
sw/source/ui/config/optpage.cxx | 1
sw/source/ui/index/cnttab.hrc | 28 ---
sw/source/ui/index/idxmrk.src | 1
sw/source/ui/index/swuiidxmrk.cxx | 1
sw/source/ui/misc/srtdlg.hrc | 58 --------
uui/source/secmacrowarnings.hrc | 6
uui/source/unknownauthdlg.cxx | 1
uui/source/unknownauthdlg.hrc | 58 --------
xmlsecurity/source/dialogs/dialogs.hrc | 23 ---
63 files changed, 6 insertions(+), 1209 deletions(-)
New commits:
commit 4461330f3adff852d35d40887cc7cb314bec4519
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 22 12:38:01 2014 +0200
remove missing sc.hrc
from optdlg.hrc removal
Change-Id: If7681f1bcdd03a7f890467961d2532e5fa01c4cf
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index fabda3c..cb12ccd 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -11,6 +11,7 @@
#include <scmod.hxx>
#include "tpcompatibility.hxx"
+#include "sc.hrc"
#include "scresid.hxx"
#include "appoptio.hxx"
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index f15531e..44a1c34 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -11,6 +11,7 @@
#undef SC_DLLIMPLEMENTATION
#include "tpdefaults.hxx"
+#include "sc.hrc"
#include "scresid.hxx"
#include "scmod.hxx"
#include "defaultsoptions.hxx"
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index ebac619..ddb30b1 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -24,6 +24,7 @@
#include <svl/stritem.hxx>
#include "tpformula.hxx"
#include "formulaopt.hxx"
+#include "sc.hrc"
#include "scresid.hxx"
#include "formula/grammar.hxx"
#include "calcoptionsdlg.hxx"
commit a30fc66dd2b646af71d26e14ed3af40f0f1f8b94
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 22 08:19:50 2014 +0200
remove unused hrc files
Change-Id: I7ce04c206250db40076bed699bee892bdfbf19b6
diff --git a/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc b/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc
deleted file mode 100644
index 66be1e6..0000000
--- a/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc
+++ /dev/null
@@ -1,57 +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 FL_ERROR 1
-#define FL_INDICATE 2
-#define FL_PARAMETERS 3
-
-#define FT_POSITIVE 1
-#define FT_NEGATIVE 2
-
-#define RB_NONE 1
-#define RB_CONST 2
-#define RB_PERCENT 3
-#define RB_FUNCTION 4
-#define RB_BOTH 5
-#define RB_POSITIVE 6
-#define RB_NEGATIVE 7
-#define RB_RANGE 8
-
-#define ED_RANGE_POSITIVE 1
-#define ED_RANGE_NEGATIVE 2
-
-#define FI_BOTH 1
-#define FI_POSITIVE 2
-#define FI_NEGATIVE 3
-#define IB_RANGE_POSITIVE 4
-#define IB_RANGE_NEGATIVE 5
-
-#define LB_FUNCTION 1
-
-#define MF_POSITIVE 1
-#define MF_NEGATIVE 2
-
-#define CB_SYN_POS_NEG 1
-
-#define CHART_LB_FUNCTION_STD_ERROR 0
-#define CHART_LB_FUNCTION_STD_DEV 1
-#define CHART_LB_FUNCTION_VARIANCE 2
-#define CHART_LB_FUNCTION_ERROR_MARGIN 3
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuiimapdlg.hrc b/cui/source/dialogs/cuiimapdlg.hrc
deleted file mode 100644
index e69de29..0000000
diff --git a/cui/source/options/internationaloptions.hrc b/cui/source/options/internationaloptions.hrc
deleted file mode 100644
index 1165178..0000000
--- a/cui/source/options/internationaloptions.hrc
+++ /dev/null
@@ -1,65 +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 _OFFAPP_INTERNATIONALOPTIONS_HRC_
-#define _OFFAPP_INTERNATIONALOPTIONS_HRC_
-
-#include <svtools/controldims.hrc>
-
-// general sizes
-#define PAGE_SIZE_X 260
-#define PAGE_SIZE_Y 185
-
-// x-positions
-#define COL_0 RSC_SP_TBPG_INNERBORDER_LEFT
-#define COL_1 (COL_0 + RSC_SP_FLGR_SPACE_X)
-#define COL_2 (COL_1 + RSC_SP_CHK_TEXTINDENT)
-#define COL_LAST (PAGE_SIZE_X - RSC_SP_TBPG_INNERBORDER_RIGHT)
-
-// heights
-#define HEIGHT_FL RSC_CD_FIXEDLINE_HEIGHT
-#define HEIGHT_RB RSC_CD_RADIOBUTTON_HEIGHT
-#define HEIGHT_CB RSC_CD_CHECKBOX_HEIGHT
-
-// vertical spacing
-#define SPACE_FL_NEXTCTRL_Y RSC_SP_CTRL_DESC_Y
-
-// y-positions
-#define ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
-#define ROW_1 (ROW_0 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y)
-#define ROW_2 (ROW_1 + HEIGHT_RB + RSC_SP_CTRL_GROUP_Y)
-#define ROW_3 (ROW_2 + HEIGHT_RB + RSC_SP_FLGR_SPACE_Y)
-#define ROW_4 (ROW_3 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y)
-#define ROW_5 (ROW_4 + HEIGHT_CB + RSC_SP_CTRL_GROUP_Y)
-
-// misc calculation makros
-#define WIDTH2END( startcol ) (COL_LAST - startcol)
-
-
-// resource IDs
-#define FL_DEFTXTDIRECTION 1
-#define RB_TXTDIR_LEFT2RIGHT 2
-#define RB_TXTDIR_RIGHT2LEFT 3
-#define FL_SHEETVIEW 4
-#define CB_SHTVW_RIGHT2LEFT 5
-#define CB_SHTVW_CURRENTDOCONLY 6
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/taborder.hrc b/extensions/source/propctrlr/taborder.hrc
deleted file mode 100644
index e69de29..0000000
diff --git a/framework/inc/services/logindialog.hrc b/framework/inc/services/logindialog.hrc
deleted file mode 100644
index 017b2ed..0000000
--- a/framework/inc/services/logindialog.hrc
+++ /dev/null
@@ -1,24 +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 .
- */
-
-// controls
-#define RID_PB_OK 21
-#define RID_PB_CANCEL 22
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc
deleted file mode 100644
index 4b02977..0000000
--- a/sc/source/ui/inc/dbnamdlg.hrc
+++ /dev/null
@@ -1,26 +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 .
- */
-
-#include "sc.hrc"
-
-#define STR_ADD 30
-#define STR_MODIFY 31
-#define STR_DB_INVALID 32
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/dlgfield.hrc b/sd/source/ui/inc/dlgfield.hrc
deleted file mode 100644
index e69de29..0000000
diff --git a/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc
deleted file mode 100644
index 5250700..0000000
--- a/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc
+++ /dev/null
@@ -1,57 +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 _UNODIALOGS_BUTTONGROUP_HRC
-#define _UNODIALOGS_BUTTONGROUP_HRC
-
-#define PB_OK 1
-#define PB_CANCEL 1
-#define PB_HELP 1
-
-#define BUTTONGROUP_BUTTONWIDTH 40
-
-#define BUTTONS_OK_CANCEL_HELP( xRightPos, yTopPos, xOffset, yOffset ) \
-OKButton PB_OK \
-{ \
- Pos = MAP_APPFONT ( xRightPos-BUTTONGROUP_BUTTONWIDTH-xOffset-xOffset , yTopPos ) ; \
- Size = MAP_APPFONT ( BUTTONGROUP_BUTTONWIDTH , 14 ) ; \
- TabStop = TRUE ; \
- DefButton = TRUE ; \
-}; \
-CancelButton PB_CANCEL \
-{ \
- Pos = MAP_APPFONT ( xRightPos-BUTTONGROUP_BUTTONWIDTH-xOffset , yTopPos+yOffset ) ; \
- Size = MAP_APPFONT ( BUTTONGROUP_BUTTONWIDTH , 14 ) ; \
- TabStop = TRUE ; \
-}; \
-HelpButton PB_HELP \
-{ \
- Pos = MAP_APPFONT ( xRightPos-BUTTONGROUP_BUTTONWIDTH , yTopPos+yOffset+yOffset ) ; \
- Size = MAP_APPFONT ( BUTTONGROUP_BUTTONWIDTH , 14 ) ; \
- TabStop = TRUE ; \
-};
-
-#define BUTTONS_OK_CANCEL_HELP_STACKED( xRightPos ) \
-BUTTONS_OK_CANCEL_HELP( xRightPos, 6, 0, 17 )
-
-#define BUTTONS_OK_CANCEL_HELP_ABREAST( xRightPos, yTopPos ) \
-BUTTONS_OK_CANCEL_HELP( xRightPos, yTopPos, (BUTTONGROUP_BUTTONWIDTH+3), 0 )
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
deleted file mode 100644
index 19306e3..0000000
--- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
+++ /dev/null
@@ -1,28 +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 _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_IDS_HXX
-#define _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_IDS_HXX
-
-#define RB_TO_SIMPLIFIED 1
-#define RB_TO_TRADITIONAL 2
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/cnttab.hxx b/sw/source/core/uibase/inc/cnttab.hxx
index b9bade6..034ffd8 100644
--- a/sw/source/core/uibase/inc/cnttab.hxx
+++ b/sw/source/core/uibase/inc/cnttab.hxx
@@ -20,13 +20,9 @@
#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CNTTAB_HXX
#include <svx/stddlg.hxx>
-
#include <vcl/button.hxx>
-
#include <vcl/edit.hxx>
-
#include <vcl/fixed.hxx>
-
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc
deleted file mode 100644
index 8121705..0000000
--- a/sw/source/ui/index/cnttab.hrc
+++ /dev/null
@@ -1,28 +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 TO_CONTENT 1
-#define TO_INDEX 2
-#define TO_ILLUSTRATION 4
-#define TO_TABLE 8
-#define TO_USER 16
-#define TO_OBJECT 32
-#define TO_AUTHORITIES 64
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/srtdlg.hrc b/sw/source/ui/misc/srtdlg.hrc
deleted file mode 100644
index 68e4ea3..0000000
--- a/sw/source/ui/misc/srtdlg.hrc
+++ /dev/null
@@ -1,24 +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 STR_ROW 25
-#define STR_COL 26
-#define STR_NUMERIC 33
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit aa39d211074cfd72d5f539b1a65e57017e1241e8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 22 07:42:29 2014 +0200
clean up hrc files
Change-Id: I76756fe539589d2ab086fd1f1aeec50a9f39af37
diff --git a/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc
deleted file mode 100644
index 3f0667d..0000000
--- a/chart2/source/controller/dialogs/CommonResources.hrc
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _CHART2_RESOURCE_HXX
-#define _CHART2_RESOURCE_HXX
-
-#define BUTTONS_OK_CANCEL_HELP( xPos, yPos, xOffset, yOffset ) \
-OKButton BTN_OK \
-{ \
- Pos = MAP_APPFONT ( xPos , yPos ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- TabStop = TRUE ; \
- DefButton = TRUE ; \
-}; \
-CancelButton BTN_CANCEL \
-{ \
- Pos = MAP_APPFONT ( xPos+xOffset , yPos+yOffset ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- TabStop = TRUE ; \
-}; \
-HelpButton BTN_HELP \
-{ \
- Pos = MAP_APPFONT ( xPos+xOffset+xOffset , yPos+yOffset+yOffset ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- TabStop = TRUE ; \
-};
-
-#define BUTTONS_OK_CANCEL_HELP_STACKED( xPos ) \
-BUTTONS_OK_CANCEL_HELP( xPos, 6, 0, 17 )
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 657225f..49620c7 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -18,7 +18,6 @@
*/
#include "dlg_ChartType.hxx"
-#include "dlg_ChartType.hrc"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "Strings.hrc"
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.hrc b/chart2/source/controller/dialogs/dlg_ChartType.hrc
deleted file mode 100644
index e66a515..0000000
--- a/chart2/source/controller/dialogs/dlg_ChartType.hrc
+++ /dev/null
@@ -1,29 +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 .
- */
-#include "ResourceIds.hrc"
-
-#define TABCTRL 1
-
-#define FL_BUTTONS 1
-
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index 3abc97b..19a5459 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -17,30 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define GRP_FUNCTIONS 22
-#define BTN_ACC_CHANGE 3
-#define BTN_ACC_REMOVE 4
-#define BOX_ACC_ENTRIES 5
-#define GRP_ACC_KEYBOARD 8
-#define TXT_ACC_GROUP 9
-#define BOX_ACC_GROUP 10
-#define TXT_ACC_FUNCTION 11
-#define BOX_ACC_FUNCTION 12
-#define TXT_ACC_KEY 13
-#define BOX_ACC_KEY 14
-#define GRP_ACC_FUNCTIONS 15
-#define BTN_RESET 20
-#define BTN_LOAD 40
-#define BTN_SAVE 41
-#define RB_OFFICE 44
-#define RB_MODULE 45
-
#define STR_GROUP_STYLES 58
#define STR_PDF_EXPORT_SEND 59
-#define IMG_INFO 61
- // FREE
+
#define BMP_COLLAPSED 63
#define BMP_EXPANDED 64
+
#define STR_BASICMACROS 67
#define STR_HUMAN_APPNAME 69
#define STR_FILTERNAME_CFG 70
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 593cbe5..3c8d9d5 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -19,25 +19,6 @@
#define CFG_OFFSET 300
-#define GRP_MENUS (9 + CFG_OFFSET)
-#define FT_MENUS (10 + CFG_OFFSET)
-#define LB_MENUS (11 + CFG_OFFSET)
-#define BTN_NEW (12 + CFG_OFFSET)
-#define BTN_CHANGE (14 + CFG_OFFSET)
-#define GRP_MENU_SEPARATOR (15 + CFG_OFFSET)
-#define GRP_MENU_ENTRIES (16 + CFG_OFFSET)
-#define BOX_ENTRIES (17 + CFG_OFFSET)
-#define BTN_CHANGE_ENTRY (18 + CFG_OFFSET)
-#define BTN_UP (19 + CFG_OFFSET)
-#define BTN_DOWN (20 + CFG_OFFSET)
-#define FT_DESCRIPTION (22 + CFG_OFFSET)
-#define TXT_SAVEIN (23 + CFG_OFFSET)
-#define LB_SAVEIN (24 + CFG_OFFSET)
-#define ED_DESCRIPTION (25 + CFG_OFFSET)
-#define BTN_ADD_COMMANDS (26 + CFG_OFFSET)
-
-#define MODIFY_MENU (40 + CFG_OFFSET)
-#define MODIFY_ENTRY (41 + CFG_OFFSET)
#define ID_RENAME (42 + CFG_OFFSET)
#define ID_MOVE (43 + CFG_OFFSET)
#define ID_DELETE (44 + CFG_OFFSET)
@@ -62,16 +43,6 @@
#define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET)
#define QBX_CONFIRM_DELETE_TOOLBAR (67 + CFG_OFFSET)
-#define TXT_MENU (80 + CFG_OFFSET)
-#define BOX_MAIN_MENUS (81 + CFG_OFFSET)
-#define BTN_MENU_UP (82 + CFG_OFFSET)
-#define BTN_MENU_DOWN (83 + CFG_OFFSET)
-#define BTN_MENU_ADD (84 + CFG_OFFSET)
-#define BTN_MENU_CLOSE (85 + CFG_OFFSET)
-#define BTN_MENU_HELP (86 + CFG_OFFSET)
-#define TXT_MENU_NAME (87 + CFG_OFFSET)
-#define EDIT_MENU_NAME (88 + CFG_OFFSET)
-
#define MD_ICONSELECTOR (90 + CFG_OFFSET)
#define FT_SYMBOLS (91 + CFG_OFFSET)
#define TB_SYMBOLS (92 + CFG_OFFSET)
@@ -85,7 +56,6 @@
#define FL_SEPARATOR (108 + CFG_OFFSET)
#define BTN_DELETE (109 + CFG_OFFSET)
-//added for issue83555
#define MD_ICONCHANGE (119 + CFG_OFFSET)
#define FTCHGE_DESCRIPTION (120 + CFG_OFFSET)
#define EDT_ADDR (121 + CFG_OFFSET)
diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc
index b192541..bbec93a 100644
--- a/cui/source/dialogs/hangulhanjadlg.hrc
+++ b/cui/source/dialogs/hangulhanjadlg.hrc
@@ -65,54 +65,14 @@
#define FT_SUGGESTION 22
-
// Hangul / Hanja Options Dialog
-#define FT_USERDEFDICT 1
#define BTN_OPTIONS 10
-#define LB_DICTS 1
-
-#define CB_IGNOREPOST 1
-#define CB_SHOWRECENTLYFIRST 3
-#define CB_AUTOREPLACEUNIQUE 4
-
-#define PB_HHO_NEW 1
-#define PB_HHO_EDIT 2
-#define PB_HHO_DELETE 3
-#define PB_HHO_OK 4
-#define PB_HHO_CANCEL 5
-#define PB_HHO_HELP 6
-
// metrics
#define HHO_DLGWIDTH 287
#define HHx_DLGHIGHT 175
-#define HHO_COL_1 RSC_SP_DLG_INNERBORDER_LEFT
-#define HHO_COL_1a (HHO_COL_1+3)
-#define HHO_COL_6 (HHO_DLGWIDTH-6)
-#define HHO_COL_5 (HHO_COL_6-50)
-#define HHO_COL_4 (HHO_COL_5-12)
-#define HHO_COL_3 (HHO_COL_4-50)
-#define HHO_COL_2 (HHO_COL_3-6)
-
-#define HHO_ROW_1 RSC_SP_DLG_INNERBORDER_TOP
-#define HHO_ROW_2 (HHO_ROW_1+8+2)
-#define HHO_ROW_3 (HHO_ROW_2+14)
-#define HHO_ROW_4 (HHO_ROW_3+2)
-#define HHO_ROW_5 (HHO_ROW_4+14)
-#define HHO_ROW_6 (HHO_ROW_5+2)
-#define HHO_ROW_7 (HHO_ROW_6+14)
-#define HHO_ROW_8 (HHO_ROW_7+4)
-#define HHO_ROW_9 (HHO_ROW_8+8+4)
-#define HHO_ROW_11 (HHO_ROW_9+8+4)
-#define HHO_ROW_12 (HHO_ROW_11+8+4)
-
-#define HHO_ROW_a1 HHO_ROW_1
-#define HHO_ROW_a2 (HHO_ROW_a1+14)
-#define HHO_ROW_a3 (HHO_ROW_a2+2)
-#define HHO_ROW_a4 (HHO_ROW_a3+14)
-#define HHO_ROW_a5 (HHO_ROW_a4+4)
// Hangul Hanja Edit Custom Dictionary Dialog
#define MAXNUM_SUGGESTIONS 50
diff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc
index 29c5c93..d844095 100644
--- a/sc/source/ui/inc/acredlin.hrc
+++ b/sc/source/ui/inc/acredlin.hrc
@@ -19,10 +19,6 @@
#include "sc.hrc"
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 5
-
#define SC_CHANGES_COMMENT 49
#define SC_SUB_SORT 50
#define SC_SORT_ACTION 51
diff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrc
deleted file mode 100644
index 121beaf..0000000
--- a/sc/source/ui/inc/solveroptions.hrc
+++ /dev/null
@@ -1,38 +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 .
- */
-
-#include "sc.hrc"
-
-#define FT_ENGINE 1
-#define FT_SETTINGS 2
-#define FT_OPTIONNAME 3
-
-#define LB_ENGINE 1
-#define LB_SETTINGS 2
-
-#define FL_BUTTONS 1
-
-#define BTN_EDIT 1
-#define BTN_HELP 2
-#define BTN_OK 3
-#define BTN_CANCEL 4
-
-#define NF_VALUE 1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index cabc774..d316343 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -18,7 +18,6 @@
*/
#include "solveroptions.hxx"
-#include "solveroptions.hrc"
#include "scresid.hxx"
#include "global.hxx"
#include "miscuno.hxx"
diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc
index f4a9e73..685664f 100644
--- a/sd/source/ui/annotations/annotations.hrc
+++ b/sd/source/ui/annotations/annotations.hrc
@@ -41,13 +41,6 @@
#define RID_ANNOTATION_CONTEXTMENU (RID_ANNOTATIONS_START+0)
#define RID_ANNOTATION_TAG_CONTEXTMENU (RID_ANNOTATIONS_START+1)
-#define BTN_NEW 1
-#define BTN_DELETE 2
-#define BTN_NEXT 3
-#define BTN_PREV 4
-
-#define FT_AUTHOR 1
-
#endif // _SD_ANNOTATIONPANE_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/menu/menu.hrc b/sfx2/source/menu/menu.hrc
index 94adf5f..19f787e 100644
--- a/sfx2/source/menu/menu.hrc
+++ b/sfx2/source/menu/menu.hrc
@@ -24,18 +24,6 @@
#define IBX_MNUCFG_ALREADY_INCLUDED (RID_SFX_MENU_START+2)
-#define BTN_UP 3
-#define BTN_LEFT 4
-#define BTN_RIGHT 5
-#define BTN_DOWN 6
-#define BTN_NEW 7
-#define BTN_CHANGE 8
-#define BTN_REMOVE 9
-#define BOX_ENTRIES 10
-#define TXT_TEXT 11
-#define EDT_TEXT 12
-#define GRP_FUNCTIONS 22
-
#define STR_MENU_CFGITEM RID_SFX_MENU_START+1
#define STR_MENU_ADDONS RID_SFX_MENU_START+2
#define STR_MENU_ADDONHELP RID_SFX_MENU_START+3
diff --git a/uui/source/secmacrowarnings.hrc b/uui/source/secmacrowarnings.hrc
index a8f9750..7f7e9ae 100644
--- a/uui/source/secmacrowarnings.hrc
+++ b/uui/source/secmacrowarnings.hrc
@@ -24,12 +24,6 @@
// --------- general metrics ---------
-#define SEP_FL_SPACE_Y 6
-#define SEP_FL_ADJ_Y(val) (val-3)
-#define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM)
-#define DLGS_BOTTOM_BTN_Y(dlgh) (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT)
-#define DLGS_BOTTOM_FL_Y(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5)
-#define DLGS_BOTTOM_LAST_CTRL_L(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3)
#define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
#define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
#define DLGS_BOTTOM_OK_X(dlgw) (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH)
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index 0b3f0dd..858e980 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -27,10 +27,8 @@
#define FL_BOTTOM_SEP 50
#define BTN_HELP 53
-#define LB_SIGNATURES 54
-#define BTN_VIEWCERT 55
+
#define STR_HEADERBAR 56
-#define BTN_RESET 57
#define STR_VALID_SIGNATURE 58
#define STR_NO_INFO_TO_VERIFY 59
#define STR_INVALID_SIGNATURE 60
@@ -41,20 +39,14 @@
// --------- ... for tab dialogs -----
#define TP_WIDTH 260
#define TP_HEIGHT 185
-#define RIDDER_HEIGHT (RSC_CD_PUSHBUTTON_HEIGHT)
#define TD_SP_INNERBORDER_LEFT 3
#define TD_SP_INNERBORDER_RIGHT 3
-#define TD_SP_INNERBORDER_TOP 3
-#define TD_SP_INNERBORDER_BOTTOM 3
#define TD_WIDTH (TP_WIDTH+RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT)
-#define TD_HEIGHT (TP_HEIGHT+TD_SP_INNERBORDER_TOP+2*TD_SP_INNERBORDER_BOTTOM+RSC_CD_PUSHBUTTON_HEIGHT+RIDDER_HEIGHT)
#define SEP_FL_SPACE_Y 6
-#define SEP_FL_ADJ_Y(val) (val-3)
#define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM)
#define DLGS_BOTTOM_BTN_Y(dlgh) (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT)
#define DLGS_BOTTOM_FL_Y(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5)
-#define DLGS_BOTTOM_LAST_CTRL_L(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3)
#define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
#define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
#define DLGS_BOTTOM_OK_X(dlgw) (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_DESC_X-RSC_CD_PUSHBUTTON_WIDTH)
@@ -80,9 +72,6 @@
#define CV_COL_B (CV_COL_C-RSC_SP_CTRL_X)
#define CV_COL_A (CV_COL_B-RSC_CD_PUSHBUTTON_WIDTH)
-#define CV_ROW_B (TD_HEIGHT-TD_SP_INNERBORDER_BOTTOM)
-#define CV_ROW_A (CV_ROW_B-RSC_CD_PUSHBUTTON_HEIGHT)
-
// --------- tab page Certificate viewer - General ---------
#define WIN_FRAME 2
#define IMG_CERT 3
@@ -147,21 +136,12 @@
// --------- tab page Certificate viewer - Certification Path ---------
-#define FT_CERTPATH 1
-#define FT_CERTSTATUS 2
-#define ML_CERTSTATUS 3
-#define IMG_CERT_SMALL 4
-#define IMG_CERT_NOTVALIDATED_SMALL 6
#define STR_PATH_CERT_OK 8
#define STR_PATH_CERT_NOT_VALIDATED 9
#define CVP_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
#define CVP_ROW_1 (CVP_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
#define REST_HEIGHT (TP_HEIGHT-CVP_ROW_1-2*RSC_SP_GRP_SPACE_Y-RSC_CD_FIXEDTEXT_HEIGHT-RSC_CD_PUSHBUTTON_HEIGHT)
-#define CVP_ROW_2 (CVP_ROW_1+REST_HEIGHT/3*2+RSC_SP_CTRL_DESC_Y)
-#define CVP_ROW_3 (CVP_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT)
-#define CVP_ROW_4 (CVP_ROW_3+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-
// --------- tab dialog macro security ---------
commit 40064f479bbd8d7384b753328365e8770bda4fd1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 22 06:01:23 2014 +0200
clean up hrc files
and remove some unused stuff
Change-Id: Iea6177c3d2f9d0668187e66155b62688ae2ecb04
diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc
index bcce1ef..b192541 100644
--- a/cui/source/dialogs/hangulhanjadlg.hrc
+++ b/cui/source/dialogs/hangulhanjadlg.hrc
@@ -69,7 +69,6 @@
// Hangul / Hanja Options Dialog
#define FT_USERDEFDICT 1
-#define FL_OPTIONS 2
#define BTN_OPTIONS 10
#define LB_DICTS 1
diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index 89892e6..41bcc3f 100644
--- a/cui/source/dialogs/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.hrc
@@ -20,16 +20,9 @@
#ifndef _SCRIPTDLG_HRC
#define _SCRIPTDLG_HRC
-#include <svl/solar.hrc>
-
-// NewObjectDialog
-#define FT_NEWLIB 10
#define STR_FT_NEWMACRO 11
#define STR_NEWLIB 12
#define STR_NEWMACRO 13
-#define ED_LIBNAME 14
-#define PB_OK 15
-#define PB_CANCEL 16
#define STR_FT_RENAME 18
#define STR_RENAME 19
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index a134633..aca23ed 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -33,7 +33,6 @@
#define MD_UPDATE_BASELINKS 32002
-#define LB_LINKS 30
#define FT_FILES 31
#define FT_LINKS 32
#define FT_TYPE 33
@@ -49,7 +48,6 @@
#define RB_MANUAL 43
#define FT_FULL_SOURCE_NAME 44
#define FT_FULL_TYPE_NAME 45
-#define GB_LINK 46
#define FT_FILES2 47
#define FT_FULL_FILE_NAME 48
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index e877d50..c11deee 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -18,7 +18,6 @@
*/
#include "RelationControl.hxx"
-#include "RelationControl.hrc"
#include <svtools/editbrowsebox.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 8d20092..ee482d5 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "RelationDlg.hrc"
#include "RelationDlg.hxx"
#include <vcl/wrkwin.hxx>
diff --git a/dbaccess/source/ui/dlg/RelationDlg.hrc b/dbaccess/source/ui/dlg/RelationDlg.hrc
deleted file mode 100644
index 08d6667..0000000
--- a/dbaccess/source/ui/dlg/RelationDlg.hrc
+++ /dev/null
@@ -1,44 +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 DBAUI_RELATIONDIALOG_HRC
-#define DBAUI_RELATIONDIALOG_HRC
-
-#include "RelationControl.hrc"
-
-#define FL_CASC_DEL 3
-#define FL_CASC_UPD 4
-
-#define RB_NO_CASC_DEL 1
-#define RB_NO_CASC_UPD 2
-#define RB_CASC_DEL 3
-#define RB_CASC_UPD 4
-#define RB_CASC_DEL_NULL 5
-#define RB_CASC_DEL_DEFAULT 6
-#define RB_CASC_UPD_NULL 7
-#define RB_CASC_UPD_DEFAULT 8
-
-#define PB_OK 1
-#define PB_CANCEL 2
-#define PB_HELP 3
-
-#define WND_CONTROL 1
-
-#endif // DBAUI_RELATIONDIALOG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RelationControl.hrc b/dbaccess/source/ui/inc/RelationControl.hrc
deleted file mode 100644
index 12365e1..0000000
--- a/dbaccess/source/ui/inc/RelationControl.hrc
+++ /dev/null
@@ -1,27 +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 DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HRC
-#define DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HRC
-
-
-
-#endif // DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index 028dff9..8f0d7d5 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -131,7 +131,6 @@
#define FL_SEPARATOR 1
#define FL_TYPE 2
-#define FL_NAME 3
#define FT_TYPE_HINTS 1
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc
index ef881e5..5ecc454 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.hrc
+++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc
@@ -30,8 +30,6 @@
#define FT_KEEPTOGETHER (9)
#define LST_KEEPTOGETHERLST (10)
#define PB_OK (11)
-#define PB_CANCEL (12)
-#define PB_HELP (13)
#define WND_CONTROL (14)
#define HELP_FIELD (15)
#define FT_ORDER (16)
diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc
index eb5d959..02dd648 100644
--- a/sc/source/ui/dbgui/pvfundlg.hrc
+++ b/sc/source/ui/dbgui/pvfundlg.hrc
@@ -22,52 +22,8 @@
#define BTN_OK 1
#define BTN_CANCEL 2
#define BTN_HELP 3
-#define BTN_MORE 4
-#define BTN_OPTIONS 5
-#define RB_NONE 1
-#define RB_AUTO 2
-#define RB_USER 3
-#define RB_SORT_ASC 4
-#define RB_SORT_DESC 5
-#define RB_SORT_MAN 6
-
-#define FL_FUNC 1
-#define FL_DISPLAY 2
-#define FL_SORT_BY 3
-#define FL_LAYOUT 4
-#define FL_AUTOSHOW 5
-#define FL_HIDE 6
-
-#define LB_FUNC 1
-#define LB_TYPE 2
-#define LB_BASEFIELD 3
-#define LB_BASEITEM 4
-#define LB_SORT_BY 5
-#define LB_LAYOUT 6
-#define LB_SHOW_FROM 7
-#define LB_SHOW_USING 8
-#define LB_HIERARCHY 9
#define LB_DIMS 10
-
-#define FT_NAMELABEL 1
-#define FT_NAME 2
-#define FT_TYPE 3
-#define FT_BASEFIELD 4
-#define FT_BASEITEM 5
-#define FT_LAYOUT 6
-#define FT_SHOW 7
-#define FT_SHOW_FROM 8
-#define FT_SHOW_USING 9
-#define FT_HIERARCHY 10
#define FT_DIMS 11
-#define CB_SHOWALL 1
-#define CB_LAYOUT_EMPTY 2
-#define CB_SHOW 3
-
-#define NF_SHOW 1
-
-#define CT_HIDE 1
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc
index a2b325e..4b02977 100644
--- a/sc/source/ui/inc/dbnamdlg.hrc
+++ b/sc/source/ui/inc/dbnamdlg.hrc
@@ -19,26 +19,8 @@
#include "sc.hrc"
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_ADD 3
-#define BTN_REMOVE 4
-#define BTN_HELP 5
-#define FL_NAME 10
-#define ED_NAME 11
-#define FL_ASSIGN 12
-#define ED_DBAREA 13
-#define RB_DBAREA 14
-#define FL_OPTIONS 20
-#define BTN_HEADER 21
-#define BTN_SIZE 22
-#define BTN_FORMAT 23
-#define BTN_STRIPDATA 24
-#define FT_SOURCE 25
-#define FT_OPERATIONS 26
#define STR_ADD 30
#define STR_MODIFY 31
#define STR_DB_INVALID 32
-#define BTN_MORE 33
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index aeea75b..56f7aee 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -18,32 +18,9 @@
*/
#include "sc.hrc"
- // -> RID_SCDLG_MOVETAB
- // -> RID_SCDLG_SELENTRY
- // -> RID_SCDLG_FILLSERIES
-// General
-#define BTN_OK 100
-#define BTN_CANCEL 102
-#define BTN_HELP 103
-#define BTN_MORE 104
-#define BTN_ADD 105
-#define BTN_REMOVE 106
-#define FT_LABEL 110
-#define FL_FRAME 112
#define STR_BTN_CLOSE 200
-
-// String input
-#define ED_INPUT 10
-
-// Selection from a (String-)ListBox
-#define FL_ENTRYLIST 10
-#define LB_ENTRYLIST 11
-
-// Set/Reset Grouping:
-#define BTN_GROUP_COLS 1
-#define BTN_GROUP_ROWS 3
#define STR_GROUP 1
#define STR_UNGROUP 2
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
deleted file mode 100644
index b593ba7..0000000
--- a/sc/source/ui/inc/optdlg.hrc
+++ /dev/null
@@ -1,71 +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 .
- */
-
-#include "sc.hrc"
-
-#define TP_GENERAL 1
-#define TP_SAVE 2
-#define TP_PATH 3
-#define TP_CALC 6
-#define TP_USERLISTS 7
-#define TP_PRINT 8
-#define TP_GRID 10
-#define TP_LAYOUT 12
-#define TP_INPUT 13
-#define TP_FORMULA 15
-
-// TP_VIEW:
-#define BTN_GRID 6
-
-#define BTN_FORMULAS 20
-#define BTN_NULLVALS 21
-#define BTN_NOTES 22
-
-// TP_LAYOUT
-#define CB_DOCONLY 5
-#define CB_MERGE_PARA_DIST 6
-#define GB_COMPAT 7
-#define CB_AUTO_UPDATE_FIELDS 8
-#define CB_AUTO_UPDATE_CHARTS 9
-
-// TP_FORMULA
-#define FL_FORMULA_OPTIONS 80
-#define FT_FORMULA_SYNTAX 81
-#define LB_FORMULA_SYNTAX 82
-#define CB_ENGLISH_FUNC_NAME 83
-#define FL_FORMULA_SEPS 84
-#define FT_FORMULA_SEP_ARG 85
-#define ED_FORMULA_SEP_ARG 86
-#define FT_FORMULA_SEP_ARRAY_R 87
-#define ED_FORMULA_SEP_ARRAY_R 88
-#define FT_FORMULA_SEP_ARRAY_C 89
-#define ED_FORMULA_SEP_ARRAY_C 90
-#define BTN_FORMULA_SEP_RESET 91
-#define FL_CUSTOM_CALC_OPTIONS 92
-#define BTN_CUSTOM_CALC_DEFAULT 93
-#define BTN_CUSTOM_CALC_CUSTOM 94
-#define BTN_CUSTOM_CALC_DETAILS 95
-#define FL_RECALC_OPTIONS 96
-#define FT_OOXML_RECALC 97
-#define LB_OOXML_RECALC 98
-#define FT_ODF_RECALC 99
-#define LB_ODF_RECALC 100
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrc
deleted file mode 100644
index c816099..0000000
--- a/sc/source/ui/inc/optload.hrc
+++ /dev/null
@@ -1,32 +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 .
- */
-#include "sc.hrc"
-
-#define GB_LINK 1
-#define RB_ALWAYS 2
-#define RB_REQUEST 3
-#define RB_NEVER 4
-#define CB_DOCONLY 5
-#define CB_MERGE_PARA_DIST 6
-#define GB_COMPAT 7
-#define CB_AUTO_UPDATE_FIELDS 8
-#define CB_AUTO_UPDATE_CHARTS 9
-#define FT_UPDATE_LINKS 10
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index c9988b8..ada6c99 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -20,8 +20,6 @@
#undef SC_DLLIMPLEMENTATION
-
-
#include <svx/dlgutil.hxx>
#include <svx/drawitem.hxx>
#include <svx/xtable.hxx>
@@ -37,7 +35,6 @@
#include "scresid.hxx"
#include "docsh.hxx"
#include "sc.hrc"
-#include "optdlg.hrc"
#include "globstr.hrc"
#include "opredlin.hxx"
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 71401ed..2bbee5a 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -30,7 +30,6 @@
#include "docoptio.hxx"
#include "scresid.hxx"
#include "sc.hrc"
-#include "optdlg.hrc"
#include "tpcalc.hxx"
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 93d75aa..fabda3c 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -11,7 +11,6 @@
#include <scmod.hxx>
#include "tpcompatibility.hxx"
-#include "optdlg.hrc"
#include "scresid.hxx"
#include "appoptio.hxx"
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index ef07199..f15531e 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -11,7 +11,6 @@
#undef SC_DLLIMPLEMENTATION
#include "tpdefaults.hxx"
-#include "optdlg.hrc"
#include "scresid.hxx"
#include "scmod.hxx"
#include "defaultsoptions.hxx"
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 2b79c99..ebac619 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -24,7 +24,6 @@
#include <svl/stritem.hxx>
#include "tpformula.hxx"
#include "formulaopt.hxx"
-#include "optdlg.hrc"
#include "scresid.hxx"
#include "formula/grammar.hxx"
#include "calcoptionsdlg.hxx"
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index 27c70d4..8ad0101 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -27,7 +27,6 @@
#include "scmod.hxx"
#include "scresid.hxx"
#include "sc.hrc"
-#include "optdlg.hrc"
ScTpPrintOptions::ScTpPrintOptions( Window* pParent,
const SfxItemSet& rCoreAttrs )
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index da438c0..cd25475 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -33,7 +33,6 @@
#include "crdlg.hxx"
#include "scresid.hxx"
#include "sc.hrc"
-#include "optdlg.hrc"
#include "globstr.hrc"
#define _TPUSRLST_CXX
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index d713259..e0f54d9 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -20,8 +20,6 @@
#undef SC_DLLIMPLEMENTATION
-
-
#include "scitems.hxx"
#include "tpview.hxx"
#include "global.hxx"
@@ -31,7 +29,6 @@
#include "scresid.hxx"
#include "docsh.hxx"
#include "sc.hrc"
-#include "optdlg.hrc"
#include "globstr.hrc"
#include <appoptio.hxx>
#include <scmod.hxx>
diff --git a/sd/source/ui/inc/fontwork.hrc b/sd/source/ui/inc/fontwork.hrc
deleted file mode 100644
index ef4c5db..0000000
--- a/sd/source/ui/inc/fontwork.hrc
+++ /dev/null
@@ -1,26 +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 MTR_FLD_DISTANCE 1
-#define MTR_FLD_TEXTSTART 2
-#define FT_DISTANCE 1
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/optdlg.hrc b/sd/source/ui/inc/optdlg.hrc
deleted file mode 100644
index 6e22d9c..0000000
--- a/sd/source/ui/inc/optdlg.hrc
+++ /dev/null
@@ -1,24 +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_GENERAL 1
-#define TP_SAVE 2
-#define TP_PATH 3
-#define TP_PRINT 4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc
index a2b7e5d..20a6231 100644
--- a/sfx2/source/dialog/dinfdlg.hrc
+++ b/sfx2/source/dialog/dinfdlg.hrc
@@ -42,26 +42,6 @@
#define RB_PROPERTY_YES 100
#define RB_PROPERTY_NO 101
-#define PB_OK 100
-#define PB_CANCEL 101
-#define PB_HELP 102
-#define CB_NEGATIVE 103
-#define FT_YEAR 104
-#define ED_YEAR 105
-#define FT_MONTH 106
-#define ED_MONTH 107
-#define FT_DAY 108
-#define ED_DAY 109
-#define FT_HOUR 110
-#define ED_HOUR 111
-#define FT_MINUTE 112
-#define ED_MINUTE 113
-#define FT_SECOND 114
-#define ED_SECOND 115
-#define FT_MSECOND 116
-#define ED_MSECOND 117
-#define FL_DURATION 118
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/menu/menu.hrc b/sfx2/source/menu/menu.hrc
index ca76830..94adf5f 100644
--- a/sfx2/source/menu/menu.hrc
+++ b/sfx2/source/menu/menu.hrc
@@ -22,12 +22,8 @@
#include <sfx2/sfx.hrc>
-// #defines *****************************************************************
-
#define IBX_MNUCFG_ALREADY_INCLUDED (RID_SFX_MENU_START+2)
-#define BTN_OK 1
-#define BTN_CANCEL 2
#define BTN_UP 3
#define BTN_LEFT 4
#define BTN_RIGHT 5
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 1897612..47cd183 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -75,35 +75,6 @@
#define RID_SVXBMP_GALLERY_MEDIA (RID_SVX_GALLERY_START + 71)
// lokale Defines
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-
-#define FL_INFO 1
-#define FT_SIZE 1
-#define FT_DEPTH 2
-#define FT_FORMAT 4
-#define LBX_FOUND 1
-#define BTN_TAKE 5
-#define BTN_IMPORT 5
-#define BTN_PATH 1
-#define BTN_SEARCH 4
-#define CBX_PREVIEW 3
-#define FT_PATH 1
-#define FT_FILETYPE 2
-#define CBB_FILETYPE 1
-#define FL_SEARCH_DIR 1
-#define FL_SEARCH_TYPE 2
-#define FT_SEARCH_DIR 1
-#define FT_SEARCH_TYPE 2
-#define FL_TAKE_PROGRESS 1
-#define FT_TAKE_FILE 1
-#define BTN_ADD 2
-#define WND_PREVIEW 1
-#define BTN_TAKEALL 1
-#define BTN_PREVIEW 6
-#define WND_BRSPRV 1
-#define MN_ADDMENU 2
#define MN_ADD 6
#define MN_PREVIEW 10
#define MN_DELETE 12
@@ -117,27 +88,6 @@
#define MN_PROPERTIES 23
#define MN_ASSIGN_ID 24
-#define FL_ACTUALIZE_PROGRESS 1
-#define FT_ACTUALIZE_FILE 1
-#define FL_ID 1
-#define LB_RESNAME 1
-#define EDT_TITLE 20
-#define FL_TITLE 21
-
-// Gallery-TabDialog
-#define FI_MS_IMAGE 1
-#define EDT_MS_NAME 1
-#define FL_MS_GENERAL_FIRST 1
-#define FT_MS_TYPE 2
-#define FT_MS_SHOW_TYPE 3
-#define FT_MS_PATH 4
-#define FT_MS_SHOW_PATH 5
-#define FT_MS_CONTENT 6
-#define FT_MS_SHOW_CONTENT 7
-#define FL_MS_GENERAL_SECOND 2
-#define FT_MS_CHANGEDATE 10
-#define FT_MS_SHOW_CHANGEDATE 11
-
// Gallery Browser
#define GALLERY_BROWSER1 1
#define GALLERY_BROWSER2 2
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 2e9fbed..290312ca 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -19,7 +19,6 @@
#include "svx/fmresids.hrc"
-#include "fmexpl.hrc"
#include "fmexpl.hxx"
#include "fmhelp.hrc"
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index e6b203b..b171b89 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -19,7 +19,6 @@
#include <svx/svxids.hrc>
#include "svx/fmresids.hrc"
-#include "fmexpl.hrc"
#include "globlmn.hrc"
#include <svx/svxcommands.h>
#include "fmhelp.hrc"
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 8f06ca7..f1254f1 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -25,7 +25,6 @@
#include "svx/svditer.hxx"
#include "fmhelp.hrc"
-#include "fmexpl.hrc"
#include "fmexpl.hxx"
#include "svx/fmresids.hrc"
#include "fmshimp.hxx"
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 1f57c80..5f9b8ca 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -30,7 +30,6 @@
#include "fmundo.hxx"
#include "fmhelp.hrc"
-#include "fmexpl.hrc"
#include "fmexpl.hxx"
#include "svx/fmresids.hrc"
#include "fmshimp.hxx"
diff --git a/svx/source/inc/fmexpl.hrc b/svx/source/inc/fmexpl.hrc
deleted file mode 100644
index d208b9f..0000000
--- a/svx/source/inc/fmexpl.hrc
+++ /dev/null
@@ -1,33 +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_FMEXPL_HRC
-#define _SVX_FMEXPL_HRC
-
-#define FT_PATH 1
-
-#define GB_PATH 1
-
-#define PB_OK 1
-#define PB_CANCEL 2
-#define PB_HELP 3
-
-#endif //_SVX_FMEXPL_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc
index 6193cca..96bf7e6 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ b/svx/source/tbxctrls/extrusioncontrols.hrc
@@ -80,8 +80,4 @@
#define IMG_LIGHTING_NORMAL 111
#define IMG_LIGHTING_DIM 112
-#define BTN_OK 3
-#define BTN_CANCEL 4
-#define BTN_HELP 5
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index fbf51dd..cf91ddb 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -74,11 +74,6 @@
#define ST_CONFIGUREMAIL (RC_DBUI_BEGIN + 32)
// Elements -----------------------------------------------------------------
-
-#define BTN_OK 2
-#define BTN_CANCEL 3
-#define BTN_HELP 4
-
#define MM_PART_TITLE 0
#define MM_PART_FIRSTNAME 1
#define MM_PART_LASTNAME 2
diff --git a/sw/source/core/uibase/index/idxmrk.cxx b/sw/source/core/uibase/index/idxmrk.cxx
index 7a717fd..f81f63b 100644
--- a/sw/source/core/uibase/index/idxmrk.cxx
+++ b/sw/source/core/uibase/index/idxmrk.cxx
@@ -43,7 +43,6 @@
#include <swundo.hxx>
#include <cmdid.h>
#include <index.hrc>
-#include <idxmrk.hrc>
#include <swmodule.hxx>
#include <fldmgr.hxx>
#include <fldbas.hxx>
diff --git a/sw/source/core/uibase/index/idxmrk.hrc b/sw/source/core/uibase/index/idxmrk.hrc
deleted file mode 100644
index 2a748b7..0000000
--- a/sw/source/core/uibase/index/idxmrk.hrc
+++ /dev/null
@@ -1,26 +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 PB_OK 22
-#define PB_CANCEL 23
-#define PB_HELP 24
-#define FL_NAME 37
-#define FT_NAME 38
-#define ED_NAME 39
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/utlui/unotools.hrc b/sw/source/core/uibase/utlui/unotools.hrc
index db3d780..da2555a 100644
--- a/sw/source/core/uibase/utlui/unotools.hrc
+++ b/sw/source/core/uibase/utlui/unotools.hrc
@@ -19,13 +19,6 @@
#ifndef _UNOTOOLS_HRC
#define _UNOTOOLS_HRC
-#define FT_NEW_NAME 1
-#define ED_NEW_NAME 2
-#define FL_NAME 3
-#define PB_OK 4
-#define PB_HELP 5
-#define PB_CANCEL 6
-
#define ST_MENU_ZOOM 1
#define ST_MENU_UP 2
#define ST_MENU_DOWN 3
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
deleted file mode 100644
index cd5f366..0000000
--- a/sw/source/ui/config/optdlg.hrc
+++ /dev/null
@@ -1,51 +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 CB_SMOOTH_SCROLL 37
-
-#define BT_OK 38
-#define BT_CANCEL 39
-#define BT_MORE 40
-
-#define CB_INDEX 44
-
-#define LB_COLOR 50
-#define BT_EDIT 55
-#define BT_NEW 56
-#define BT_DELETE 57
-// Print-Extra-Page
-#define CB_PGRF 61
-#define CB_LEFTP 64
-#define CB_RIGHTP 65
-#define CB_PROSPECT 67
-#define CB_CTRLFLD 69
-#define CB_PAPERFROMSETUP 70
-#define FL_1 71
-#define FL_2 72
-#define FL_3 73
-#define FL_4 74
-#define FT_FAX 76
-#define CB_BACKGROUND 79
-
-#define RB_NO 80
-#define RB_ONLY 81
-#define RB_END 82
-#define RB_PAGEEND 83
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index b5ae69c..a082a5e 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -21,7 +21,6 @@
#include <svx/dialogs.hrc>
#include "globals.hrc"
#include "config.hrc"
-#include "optdlg.hrc"
#include "helpid.h"
String ST_SCRIPT_ASIAN
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7e3ada0..db1bbea 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -41,7 +41,6 @@
#include <viewopt.hxx>
#include <globals.hrc>
#include <config.hrc>
-#include <optdlg.hrc>
#include <swwrtshitem.hxx>
#include <unomid.h>
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 5835d83..072fa46 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -19,7 +19,6 @@
#include <svtools/controldims.hrc>
#include "index.hrc"
-#include "idxmrk.hrc"
#include "helpid.h"
#include "cmdid.h"
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 33c4403..6cc7086 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -49,7 +49,6 @@
#include <cmdid.h>
#include <app.hrc>
#include <index.hrc>
-#include <../../core/uibase/index/idxmrk.hrc>
#include <swmodule.hxx>
#include <fldmgr.hxx>
#include <fldbas.hxx>
diff --git a/sw/source/ui/misc/srtdlg.hrc b/sw/source/ui/misc/srtdlg.hrc
index f312278..68e4ea3 100644
--- a/sw/source/ui/misc/srtdlg.hrc
+++ b/sw/source/ui/misc/srtdlg.hrc
@@ -16,43 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define BT_OK 1
-#define BT_CANCEL 2
-#define FT_COL 3
-#define FT_KEYTYP 4
-#define CB_KEY1 5
-#define ED_KEY1 6
-#define DLB_KEY1 7
-#define CB_KEY2 8
-#define ED_KEY2 9
-#define DLB_KEY2 10
-#define CB_KEY3 11
-#define ED_KEY3 12
-#define DLB_KEY3 13
-#define FL_SORT_2 14
-#define RB_COL 15
-#define RB_ROW 16
-#define FL_DIR 17
-#define RB_UP 18
-#define RB_DN 19
-#define FL_ORDER 20
-#define RB_TAB 21
-#define RB_TABCH 22
-#define ED_TABCH 23
-#define FL_DELIM 24
+
#define STR_ROW 25
#define STR_COL 26
-#define BT_HELP 27
-#define FT_DIR 28
-#define RB_UP2 29
-#define RB_DN2 30
-#define RB_UP3 31
-#define RB_DN3 32
#define STR_NUMERIC 33
-#define PB_DELIM 34
-#define FL_LANG 35
-#define LB_LANG 36
-#define FL_SORT 37
-#define CB_CASE 38
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 0eb3a4c..cb4d962 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -20,7 +20,6 @@
#include <vcl/msgbox.hxx>
#include <ids.hrc>
-#include <unknownauthdlg.hrc>
#include <unknownauthdlg.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/uui/source/unknownauthdlg.hrc b/uui/source/unknownauthdlg.hrc
deleted file mode 100644
index 0dc18e7..0000000
--- a/uui/source/unknownauthdlg.hrc
+++ /dev/null
@@ -1,58 +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 UUI_UNKNOWNAUTH_HRC
-#define UUI_UNKNOWNAUTH_HRC
-
-#include <svtools/controldims.hrc>
-
-// local identifiers
-#define RB_ACCEPT_1 1
-#define PB_OK 2
-#define PB_VIEW__CERTIFICATE 3
-#define PB_CANCEL 4
-#define FT_LABEL_1 5
-#define RB_DONTACCEPT_2 6
-#define IMG_WARN 7
-#define PB_HELP 8
-#define FL_LINE 10
-
-// Dims
-
-#define DLG_WIDTH 230
-#define DLG_HEIGHT 140
-
-#define DLG_WARMIMG_HEIGHT 20
-#define DLG_WARMIMG_WIDTH 20
-
-#define DLG_TEXT_1_HEIGHT 50
-
-#define DLG_TEXT_START_X RSC_SP_DLG_INNERBORDER_LEFT + DLG_WARMIMG_WIDTH + RSC_SP_CTRL_X
-
-#define DLG_RADIOBTN_START_Y RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_Y + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y
-
-#define DLG_CTLBTN_START_Y DLG_HEIGHT - RSC_SP_CTRL_X - RSC_CD_PUSHBUTTON_HEIGHT
-
-
-#define DLG_CTLBTN_OK_START_X DLG_CTLBTN_CANCEL_START_X - RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X
-#define DLG_CTLBTN_CANCEL_START_X DLG_CTLBTN_HELP_START_X - RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X
-#define DLG_CTLBTN_HELP_START_X DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - RSC_CD_PUSHBUTTON_WIDTH
-
-#endif //UUI_UNKNOWNAUTH_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index c8d4cae..0b3f0dd 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -26,7 +26,6 @@
#define STD_MASKCOLOR Color{Red=0xffff;Green=0x0000;Blue=0xffff;}
#define FL_BOTTOM_SEP 50
-#define BTN_OK 51
#define BTN_HELP 53
#define LB_SIGNATURES 54
#define BTN_VIEWCERT 55
More information about the Libreoffice-commits
mailing list