chart2/source/controller/dialogs/TabPages.hrc | 28 -----
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 2
chart2/source/controller/dialogs/dlg_View3D.cxx | 2
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 2
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 2
chart2/source/controller/dialogs/tp_DataLabel.cxx | 2
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 2
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 2
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 2
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 2
chart2/source/controller/dialogs/tp_Trendline.cxx | 2
cui/source/dialogs/hyperdlg.src | 1
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 2
dbaccess/source/ui/dlg/dbadmin.hrc | 2
dbaccess/source/ui/dlg/dbadmin.src | 49 ---------
dbaccess/source/ui/dlg/paramdialog.cxx | 7 -
dbaccess/source/ui/dlg/paramdialog.hrc | 35 -------
dbaccess/source/ui/dlg/paramdialog.src | 69 --------------
dbaccess/source/ui/inc/dbu_dlg.hrc | 5 -
dbaccess/source/ui/inc/dbu_resource.hrc | 15 ---
desktop/AllLangResTarget_deploymentgui.mk | 1
desktop/source/deployment/gui/dp_gui.hrc | 5 -
desktop/source/deployment/gui/dp_gui_dependencydialog.src | 66 -------------
formula/source/ui/inc/ForResId.hrc | 1
fpicker/source/office/iodlg.hrc | 2
framework/inc/framework.hrc | 11 --
include/sfx2/dialogs.hrc | 1
include/sfx2/sfx.hrc | 2
include/sfx2/tabpage.hrc | 33 ------
include/svx/dialogs.hrc | 3
reportdesign/source/ui/dlg/CondFormat.hrc | 28 -----
reportdesign/source/ui/dlg/GroupsSorting.hrc | 2
sc/source/ui/formdlg/dwfunctr.src | 1
sc/source/ui/inc/datafdlg.hxx | 7 -
sfx2/source/dialog/dinfdlg.src | 1
sfx2/source/doc/doc.hrc | 5 -
starmath/source/smres.src | 1
sw/inc/envelp.hrc | 2
sw/inc/globals.hrc | 2
uui/source/ids.hrc | 2
xmlsecurity/source/dialogs/dialogs.hrc | 52 ----------
41 files changed, 20 insertions(+), 441 deletions(-)
New commits:
commit 273ed07a5779da84a3c7055866139bd422559818
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 10:22:32 2014 +0200
remove unused resource ids
Change-Id: I3971ecc7dc0c3faf8dd1ed63adc08a6e18dc2964
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index b805b84..a7a7827 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -36,11 +36,6 @@
#define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15)
#define MSG_REGION_NOTEMPTY (RID_SFX_DOC_START+17)
-#define DLG_DOC_TEMPLATE (RID_SFX_DOC_START+2)
-
-#define DLG_TEMPLATE_MANAGER (RID_SFX_DOC_START+4)
-#define TAB_TEMPLATE_MANAGER (RID_SFX_DOC_START+5)
-
#define BMP_STYLES_CLOSED (RID_SFX_DOC_START+ 0)
#define BMP_STYLES_OPENED (RID_SFX_DOC_START+ 1)
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 5708eb5..f73056e 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -25,7 +25,6 @@
#define RID_KEEP_PASSWORD (RID_UUI_START + 0)
#define RID_SAVE_PASSWORD (RID_UUI_START + 1)
-#define DLG_UUI_LOGIN (RID_UUI_START + 2)
#define DLG_FILTER_SELECT (RID_UUI_START + 10)
#define DLG_SIMPLE_NAME_CLASH (RID_UUI_START + 13)
#define STR_ERROR_PASSWORDS_NOT_IDENTICAL (RID_UUI_START + 13)
@@ -33,7 +32,6 @@
// RID_UUI_START + 15, 16, 17 are misused by syncaccess/source/ui/resids.hrc
#define RID_UUI_ERRHDL (RID_UUI_START + 20)
-#define DLG_UUI_MASTERPASSWORD_CRT (RID_UUI_START + 21)
#define STR_ERROR_SIMPLE_PASSWORD_WRONG (RID_UUI_START + 23)
#define STR_ERROR_PASSWORD_TO_OPEN_WRONG (RID_UUI_START + 24)
#define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25)
commit 1c5c0e48a3cbff0460fcfb4d09a866e5a9e5bbc1
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 10:19:25 2014 +0200
remove unused resources
Change-Id: Ifdb5ab9f2a0a59d3ca31ca1fa5112449e1a6aa11
diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
index 08c4c0a..431cecf 100644
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
@@ -23,7 +23,6 @@
#include "dbaccess_helpid.hrc"
#include "dbu_dlg.hrc"
-#define CHECKBOX_HEIGHT 8
#define FIXEDTEXT_HEIGHT 8
#define RELATED_CONTROLS 4
#define UNRELATED_CONTROLS 7
@@ -43,7 +42,6 @@
#define FT_SOCKET 96
#define FL_DATACONVERT 81
-#define FL_SEPARATOR1 82
#define PB_AUTOTESTDRIVERCLASS 80
#define PB_AUTOBROWSEURL 81
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc
b/dbaccess/source/ui/inc/dbu_dlg.hrc
index 051f911..307c09d 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -27,7 +27,6 @@
#define WIZARD_PAGE_Y 240
#define START_X 6
-#define CHECKBOX_HEIGHT 8
#define LISTBOX_HEIGHT 12
#define FIXEDTEXT_HEIGHT 8
#define RELATED_CONTROLS 4
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc
b/reportdesign/source/ui/dlg/GroupsSorting.hrc
index 64d6d3b..296ff61 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.hrc
+++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc
@@ -29,7 +29,6 @@
#define ED_GROUPINTERVALLST (8)
#define FT_KEEPTOGETHER (9)
#define LST_KEEPTOGETHERLST (10)
-#define PB_OK (11)
#define WND_CONTROL (14)
#define HELP_FIELD (15)
#define FT_ORDER (16)
@@ -40,7 +39,6 @@
#define FL_SEPARATOR3 (23)
#define TB_TOOLBOX (27)
-#define CHECKBOX_HEIGHT 8
#define FIXEDTEXT_HEIGHT 8
#define FIXEDTEXT_WIDTH 60
#define RELATED_CONTROLS 4
commit 519026e7aa10c9734c49a6ab6fe0b36293612d6a
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 10:18:57 2014 +0200
remove unused RID_SVXDLG_CALCFUNC
Change-Id: I9414c7cc0bd08e819016ed4d263682d8db7c0958
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 0c71500..b4b11dd 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -186,9 +186,6 @@
#define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142)
-// Dialog for functions
-#define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206)
-
// QueryBox for Exit Recovery Wizard
#define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215)
diff --git a/sc/source/ui/formdlg/dwfunctr.src
b/sc/source/ui/formdlg/dwfunctr.src
index 5cd41a2..bbfcd62 100644
--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.src
@@ -20,7 +20,6 @@
#include "sc.hrc"
#include "dwfunctr.hrc"
- // RID_SVXDLG_CALCFUNC --------------------------------------------------
DockingWindow FID_FUNCTION_BOX
{
Border = TRUE ;
commit 2811b75922e2ddfac0dc6c40260db9fc3d0890de
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 10:14:16 2014 +0200
dbadmin: clean up after ui conversion
Change-Id: I40b4f1c1474c12e54f57fb466610f35e5b4d527e
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc
b/dbaccess/source/ui/dlg/dbadmin.hrc
index 5fa069f..62ac7ca 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -31,8 +31,6 @@
#define CB_USECATALOG 4
-#define TLB_ACTIONS 1
-
#define NF_PORTNUMBER 1
#endif // _DBAUI_DBADMIN_HRC_
diff --git a/dbaccess/source/ui/dlg/dbadmin.src
b/dbaccess/source/ui/dlg/dbadmin.src
index e67416d..500341a 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -23,55 +23,6 @@
#include "dbadmin.hrc"
#include "browserids.hxx"
-#define AUTO_USECATALOG(AUTO_Y) \
- CheckBox CB_USECATALOG \
- { \
- Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \
- Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_USECATALOG; \
- Text[ en-US ] = "Use catalog for file-based databases"; \
- };
-
-#define AUTO_FIXEDLINE_CONNSETTINGS(AUTO_Y) \
- FixedLine FL_SEPARATOR1
\
- {
\
- Pos = MAP_APPFONT ( 4 , AUTO_Y ) ;
\
- Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
\
- Text[ en-US ] = "Connection Settings";
\
- };
\
-
-#define AUTO_HOST_AND_PORT(AUTO_Y)
\
- FixedText FT_HOSTNAME
\
- {
\
- Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ;
\
- Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
\
- Text[ en-US ] = "~Host name";
\
- };
\
- Edit ET_HOSTNAME
\
- {
\
- TabStop = TRUE ;
\
- Border = TRUE ;
\
- HelpId = HID_DSADMIN_HOSTNAME;
\
- Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ;
\
- Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
\
- };
\
- FixedText FT_PORTNUMBER
\
- {
\
- Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT
+ 2 ) ; \
- Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
\
- Text[ en-US ] = "~Port number";
\
- };
\
- NumericField NF_PORTNUMBER
\
- {
\
- TabStop = TRUE ;
\
- Border = TRUE ;
\
- HelpId = HID_DSADMIN_PORTNUMBER;
\
- NoThousandSep = TRUE;
\
- Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +UNRELATED_CONTROLS +
FIXEDTEXT_HEIGHT ) ; \
- Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
\
- };
-
String STR_DATABASE_TYPE_CHANGE
{
Text [ en-US ] = "Database properties" ;
commit d916726456ce2f5f365de0e62e583e2d1c6c8b69
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 10:08:28 2014 +0200
CondFormat.hrc: remove unused resources
Change-Id: I1a1c099a9da38038e52673ad0f8e899a4b54eb59
diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc
b/reportdesign/source/ui/dlg/CondFormat.hrc
index 5d776ff..f680e5e 100644
--- a/reportdesign/source/ui/dlg/CondFormat.hrc
+++ b/reportdesign/source/ui/dlg/CondFormat.hrc
@@ -19,35 +19,9 @@
#ifndef RPTUI_CONDFORMAT_HRC
#define RPTUI_CONDFORMAT_HRC
-#define CHECKBOX_HEIGHT 8
+#define RELATED_CONTROLS 4
#define FIXEDTEXT_WIDTH 60
#define FIXEDTEXT_HEIGHT 8
-#define EDIT_WIDTH 75
-#define RELATED_CONTROLS 4
-#define UNRELATED_CONTROLS 7
-#define EDIT_HEIGHT 12
-#define BUTTON_HEIGHT 14
-#define BUTTON_WIDTH 50
-#define COND_TYPE_WIDTH 50
-#define COND_OP_WIDTH 75
-#define OPERATOR_SEP_WIDTH 15
-#define SCROLLBAR_WIDTH 8
-#define IMAGE_BUTTON_WIDTH 12
-#define IMAGE_BUTTON_HEIGHT 14
-
-#define ROW_0_POS ( RELATED_CONTROLS )
-#define ROW_0_HEIGHT ( FIXEDTEXT_HEIGHT )
-#define ROW_1_POS ( ROW_0_POS + ROW_0_HEIGHT + UNRELATED_CONTROLS )
-#define ROW_1_HEIGHT ( EDIT_HEIGHT )
-#define ROW_2_POS ( ROW_1_POS + ROW_1_HEIGHT + UNRELATED_CONTROLS )
-#define ROW_2_HEIGHT ( 3 * FIXEDTEXT_HEIGHT )
-#define ROW_3_POS ( ROW_2_POS + ROW_2_HEIGHT + RELATED_CONTROLS )
-#define ROW_3_HEIGHT ( IMAGE_BUTTON_HEIGHT )
-
-#define CONDITION_WIDTH ( 6*UNRELATED_CONTROLS + COND_TYPE_WIDTH +
COND_OP_WIDTH + 2*EDIT_WIDTH + OPERATOR_SEP_WIDTH )
-#define COND_DLG_WIDTH ( CONDITION_WIDTH + SCROLLBAR_WIDTH +
UNRELATED_CONTROLS )
-#define CONDITION_HEIGHT ( ROW_3_POS + ROW_3_HEIGHT )
-#define COND_DLG_HEIGHT ( CONDITION_HEIGHT + 3*RELATED_CONTROLS +
BUTTON_HEIGHT + 1 )
#endif // RPTUI_PAGENUMBER_HRC
commit 17cf06b69b96fa9fef322df1b673d17a55e63808
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 10:06:28 2014 +0200
datafdlg.hxx: remove unused defines
Change-Id: I9b0e5b3803d7b291bd55cf91772dfa3e77646508
diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index 7847cb2..8587241 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -24,13 +24,6 @@
#define MAX_DATAFORM_COLS 256
#define MAX_DATAFORM_ROWS 32000
-#define FIXED_WIDTH 54
-#define EDIT_WIDTH 86
-#define FIXED_HEIGHT 10
-#define EDIT_HEIGHT 12
-#define FIXED_LEFT 6
-#define EDIT_LEFT 62
-#define LINE_HEIGHT 16
class ScDataFormDlg : public ModalDialog
{
commit cceb3b8ebd8bab553a12424fa178e1b2c5f08b19
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 09:51:51 2014 +0200
framework.hrc: just use the value
Change-Id: Ie3fad127ae834ba722efe1d474ed10e38eb6bf88
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 761d5c9..2b969e1 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -22,12 +22,10 @@
#include <svl/solar.hrc>
-#define RID_FWK_START 260
-
-#define RID_FWK_DIALOG_START_CORRECT (RID_FWK_START + 2048)
+#define RID_FWK_START 2409
// Ids of TabWindow
-#define WIN_TABWINDOW (RID_FWK_DIALOG_START_CORRECT+101)
+#define WIN_TABWINDOW (RID_FWK_START+0)
#define TC_TABCONTROL 1
#endif
commit 43e41eee0a3337d083c96f0fc516cc8798e0a6e9
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 09:47:43 2014 +0200
remove unused resource definitions
Change-Id: Ie982ad04c084841f04215b3f58705bb9d9544a71
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 9b28da9..761d5c9 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -24,13 +24,8 @@
#define RID_FWK_START 260
-#define RID_GROUPS_OFFSET 32000
-#define RID_GROUPS_END 32767
-
#define RID_FWK_DIALOG_START_CORRECT (RID_FWK_START + 2048)
-#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0)
-
// Ids of TabWindow
#define WIN_TABWINDOW (RID_FWK_DIALOG_START_CORRECT+101)
#define TC_TABCONTROL 1
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 0497f52..5d8e11b 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -23,9 +23,7 @@
#include <svl/solar.hrc>
#include <svl/memberid.hrc>
-#define RID_GROUPS_OFFSET 32000
#define RID_GROUPS_SFXOFFSET 32700
-#define RID_GROUPS_END 32767
#define EVENT_SFX_START 5000
// EVENT_SFX_END 9999
commit 2203ac5fee67f761ddae669cd8d11130b1806089
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 09:43:58 2014 +0200
remove obsolete comment
Change-Id: I6b3466e5dd8ce6b3814037382c865af1e50a025c
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 7f14764..23bf751 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -23,8 +23,6 @@
#include "svtools/helpid.hrc"
#include <vcl/fpicker.hrc>
-// ModalDialog DLG_SVT_EXPLORERFILE
-
#define IMG_FILEDLG_BTN_UP 10
#define IMG_FILEDLG_BTN_STD 11
#define IMG_FILEDLG_CREATEFOLDER 14
commit e79c427247197363d08f1d626670e4e14e289229
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 09:42:21 2014 +0200
remove unused dlg resources from dbu_resource.hrc
Change-Id: I70c5f673413bb6ac2d37a5c15b52fcd26da6683a
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 111df59..93ea5a9 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -22,7 +22,6 @@
#include <svl/solar.hrc>
-#define RID_DIALOG_START RID_DBACCESS_START
#define RID_PAGE_START RID_DBACCESS_START
#define RID_ERRORBOX_START RID_DBACCESS_START
#define RID_QUERYBOX_START RID_DBACCESS_START
@@ -72,18 +71,6 @@
#error Resource-Id Ueberlauf in #file, #line
#endif
-// dialog ids
-#define DLG_JOIN_TABADD RID_DIALOG_START + 14
- // FREE
- // FREE
- // FREE
-#define DLG_INDEXDESIGN RID_DIALOG_START + 19
- // FREE
- // FREE
- // FREE
- // FREE
-#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27
-
// tab pages
// FREE
diff --git a/formula/source/ui/inc/ForResId.hrc
b/formula/source/ui/inc/ForResId.hrc
index 3109a8d..d0ad17f 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -22,7 +22,6 @@
#include <svl/solar.hrc>
-#define RID_DIALOG_START RID_FORMULA_START
#define RID_PAGE_START RID_FORMULA_START
#define RID_ERRORBOX_START RID_FORMULA_START
#define RID_QUERYBOX_START RID_FORMULA_START
commit b62b3042e6cd687b6dc680afaa7cc677f2bfe238
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 09:35:54 2014 +0200
remove DLG_PARAMETERS resource stuff
clean up after b15c01e43071099c6cb631953e56e88e9961e29e
Change-Id: Id50032647d74892f33e1f5214226e9fd0b7d7b62
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx
b/dbaccess/source/ui/dlg/paramdialog.cxx
index c59e415..6a6fa5c 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -18,7 +18,6 @@
*/
#include "paramdialog.hxx"
-#include "paramdialog.hrc"
#include "dbu_dlg.hrc"
#include "commontypes.hxx"
#include "moduledbu.hxx"
@@ -195,11 +194,7 @@ namespace dbaui
DBG_UNHANDLED_EXCEPTION();
}
- OUString sMessage;
- {
- LocalResourceAccess aDummy(DLG_PARAMETERS,
RSC_MODALDIALOG);
- sMessage = ModuleRes(STR_COULD_NOT_CONVERT_PARAM);
- }
+ OUString sMessage(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
sMessage = sMessage.replaceAll( "$name$", sName );
ErrorBox(NULL, WB_OK, sMessage).Execute();
m_pParam->GrabFocus();
diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc
b/dbaccess/source/ui/dlg/paramdialog.hrc
deleted file mode 100644
index e625f51..0000000
--- a/dbaccess/source/ui/dlg/paramdialog.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 _DBAUI_PARAMDIALOG_HRC_
-#define _DBAUI_PARAMDIALOG_HRC_
-
-#define LB_ALLPARAMS 1
-#define FL_PARAMS 2
-#define FT_VALUE 3
-#define ET_PARAM 4
-#define BT_TRAVELNEXT 6
-#define BT_OK 7
-#define BT_CANCEL 8
-
-#define STR_COULD_NOT_CONVERT_PARAM 1
-
-#endif // _DBAUI_PARAMDIALOG_HRC_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/paramdialog.src
b/dbaccess/source/ui/dlg/paramdialog.src
index 2b745f3..fc8d020 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -17,76 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "paramdialog.hrc"
#include "dbu_dlg.hrc"
-#define LIST_WIDTH 100
-#define LIST_HEIGHT 50
-
-ModalDialog DLG_PARAMETERS
+String STR_COULD_NOT_CONVERT_PARAM
{
- HelpID = "dbaccess:ModalDialog:DLG_PARAMETERS";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 6 + LIST_WIDTH + 3 + 6 + BUTTON_WIDTH + 6, 98 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
-
- FixedLine FL_PARAMS
- {
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( 3 + LIST_WIDTH + 3 , 8 ) ;
- Text [ en-US ] = "~Parameters";
- };
- ListBox LB_ALLPARAMS
- {
- HelpID = "dbaccess:ListBox:DLG_PARAMETERS:LB_ALLPARAMS";
- Pos = MAP_APPFONT ( 7 , 12 ) ;
- Size = MAP_APPFONT ( LIST_WIDTH , LIST_HEIGHT ) ;
- Border = TRUE;
- SVLook = TRUE;
- };
- FixedText FT_VALUE
- {
- Pos = MAP_APPFONT ( 7 , 12 + LIST_HEIGHT + 4 ) ;
- Size = MAP_APPFONT ( LIST_WIDTH , 8 ) ;
- Text [ en-US ] = "~Value";
- };
- Edit ET_PARAM
- {
- HelpID = "dbaccess:Edit:DLG_PARAMETERS:ET_PARAM";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 7 , 12 + LIST_HEIGHT + 4 + 8 + 3 ) ;
- Size = MAP_APPFONT ( LIST_WIDTH , 12 ) ;
- TabStop = TRUE ;
- };
- PushButton BT_TRAVELNEXT
- {
- HelpID = "dbaccess:PushButton:DLG_PARAMETERS:BT_TRAVELNEXT";
- Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 12 + LIST_HEIGHT + 4
+ 8 + 3 + ( 12 - BUTTON_HEIGHT ) / 2) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Next";
- };
- OKButton BT_OK
- {
- Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 3 ) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 3 + BUTTON_HEIGHT + 3
) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- };
- Text [ en-US ] = "Parameter Input" ;
-
- String STR_COULD_NOT_CONVERT_PARAM
- {
- Text [ en-US ] = "The entry could not be converted to a valid value
for the \"$name$\"column";
- };
+ Text [ en-US ] = "The entry could not be converted to a valid value for
the \"$name$\"column";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc
b/dbaccess/source/ui/inc/dbu_dlg.hrc
index f3b3823..051f911 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -152,9 +152,11 @@
#define STR_DATABASE_TYPE_CHANGE RID_STR_DLG_START + 101
+#define STR_COULD_NOT_CONVERT_PARAM RID_STR_DLG_START + 102
+
// please adjust checking before insert new strings
-#define LAST_STR_HERE RID_STR_DLG_START + 102
+#define LAST_STR_HERE RID_STR_DLG_START + 103
#if LAST_STR_HERE > RID_STR_DLG_END
#error Resource-Id Overflow in #file, #line
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index f61c119..111df59 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -73,8 +73,6 @@
#endif
// dialog ids
-#define DLG_PARAMETERS RID_DIALOG_START + 5
-
#define DLG_JOIN_TABADD RID_DIALOG_START + 14
// FREE
// FREE
commit 2903650409566c69e89b7397dcb4bd556f3038cd
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 09:35:37 2014 +0200
remove unused HYPERDLG_IMGBUTTON_HEIGHT
Change-Id: I24b9740f20ef975ab6ea747e7e35c721a99e91d0
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index f94037a..393c118 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -22,7 +22,6 @@
#include "helpid.hrc"
#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF;
};
-#define HYPERDLG_IMGBUTTON_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT+2
String RID_SVXSTR_HYPDLG_APPLYBUT
{
commit 8f2990517ff9e17db5e8d96eb2fd6b9fedb94a69
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 09:00:16 2014 +0200
directly include ResourceIds.hrc header
Change-Id: Iaef6876ac2838f8727fea21c03a4cdc50683e675
diff --git a/chart2/source/controller/dialogs/TabPages.hrc
b/chart2/source/controller/dialogs/TabPages.hrc
deleted file mode 100644
index 70c2360..0000000
--- a/chart2/source/controller/dialogs/TabPages.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 .
- */
-#ifndef CHART_TABPAGES_HRC
-#define CHART_TABPAGES_HRC
-
-#include "ResourceIds.hrc"
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 4f6a017..0bc20ae 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -21,7 +21,7 @@
#include "dlg_ObjectProperties.hxx"
#include "ResourceIds.hrc"
#include "Strings.hrc"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "tp_AxisLabel.hxx"
#include "tp_DataLabel.hxx"
#include "tp_LegendPosition.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx
b/chart2/source/controller/dialogs/dlg_View3D.cxx
index d15e8b6..b393c17 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -19,7 +19,7 @@
#include "dlg_View3D.hxx"
#include "Strings.hrc"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "ResId.hxx"
#include "tp_3D_SceneGeometry.hxx"
#include "tp_3D_SceneAppearance.hxx"
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 6bf9cab..d44b48a 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -20,7 +20,7 @@
#include "tp_AxisLabel.hxx"
#include "ResId.hxx"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "chartview/ChartSfxItemIds.hxx"
#include <svx/chrtitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 2080c3a..e72c30d 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -20,7 +20,7 @@
#include "tp_AxisPositions.hxx"
#include "ResId.hxx"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "Strings.hrc"
#include "chartview/ChartSfxItemIds.hxx"
#include "AxisHelper.hxx"
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx
b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index f40eb3e..c5e9cce 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -19,7 +19,7 @@
#include "tp_DataLabel.hxx"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "ResId.hxx"
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 0c17984..c240e76 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -19,7 +19,7 @@
#include "tp_ErrorBars.hxx"
#include "ResId.hxx"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "TabPageNotifiable.hxx"
#include <vcl/settings.hxx>
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 6a0beef..13c2ff4 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -19,7 +19,7 @@
#include "tp_LegendPosition.hxx"
#include "ResId.hxx"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "res_LegendPosition.hxx"
#include "chartview/ChartSfxItemIds.hxx"
#include <svx/chrtitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 0e37cf5..5bd37ab 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -18,7 +18,7 @@
*/
#include "tp_PointGeometry.hxx"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "res_BarGeometry.hxx"
#include "ResId.hxx"
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index bfad013..56a8384 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -20,7 +20,7 @@
#include "tp_TitleRotation.hxx"
#include "ResId.hxx"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include "chartview/ChartSfxItemIds.hxx"
#include "HelpIds.hrc"
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx
b/chart2/source/controller/dialogs/tp_Trendline.cxx
index 074aef5..fe7c81f 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -19,7 +19,7 @@
#include "tp_Trendline.hxx"
#include "ResId.hxx"
-#include "TabPages.hrc"
+#include "ResourceIds.hrc"
#include <vcl/settings.hxx>
namespace chart
commit 987d933c582a49ec53511211c9022dfd2846b305
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 08:54:03 2014 +0200
remove now unused tabpage.hrc
as TP_WIDTH and TP_HEIGHT are unused now
Change-Id: I06ec7af8c2b3386d76e36284eb56ea1ab6b9ec5d
diff --git a/chart2/source/controller/dialogs/TabPages.hrc
b/chart2/source/controller/dialogs/TabPages.hrc
index 3e310f5..70c2360 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -19,8 +19,6 @@
#ifndef CHART_TABPAGES_HRC
#define CHART_TABPAGES_HRC
-#include <sfx2/tabpage.hrc>
-
#include "ResourceIds.hrc"
#endif
diff --git a/include/sfx2/dialogs.hrc b/include/sfx2/dialogs.hrc
index debf4e6..bdd4736 100644
--- a/include/sfx2/dialogs.hrc
+++ b/include/sfx2/dialogs.hrc
@@ -20,7 +20,6 @@
#define _SFX2_DIALOGS_HRC
#include <sfx2/sfxsids.hrc>
-#include <sfx2/tabpage.hrc>
#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101)
#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291)
diff --git a/include/sfx2/tabpage.hrc b/include/sfx2/tabpage.hrc
deleted file mode 100644
index 2c70183..0000000
--- a/include/sfx2/tabpage.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 INCLUDED_SFX2_TABPAGE_HRC
-#define INCLUDED_SFX2_TABPAGE_HRC
-
-// Width and height of all tab pages used in dialogs. Because tab pages
-// can be combined arbitrarily in tab dialogs, they have to have the
-// same dimensions. If you need to adjust either dimension of any tab
-// page (when adding new controls), do the change here.
-
-#define TP_WIDTH 260
-#define TP_HEIGHT 199
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 91de9bc..8f6ad2e 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -18,7 +18,6 @@
*/
#include <sfx2/sfx.hrc>
-#include <sfx2/tabpage.hrc>
#include "helpid.hrc"
#include "sfxlocal.hrc"
#include "dinfdlg.hrc"
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index a6eebb4..434ac2d 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -18,7 +18,6 @@
*/
#include <sfx2/sfx.hrc>
-#include <sfx2/tabpage.hrc>
#include <svx/globlmn.hrc>
#include "starmath.hrc"
#include "toolbox.hrc"
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index 8b3ac81..e5d6e24 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -20,8 +20,6 @@
#ifndef _ENVELP_HRC
#define _ENVELP_HRC
-#include <sfx2/tabpage.hrc>
-
#include "rcid.hrc"
// Dialoge --------------------------------------------------------------------
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 7edfdac..f00f775 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -20,8 +20,6 @@
#ifndef _GLOBALS_HRC
#define _GLOBALS_HRC
-#include <sfx2/tabpage.hrc>
-
#include "rcid.hrc"
// STRINGS -----------------------------------------------------------
commit ffa78fe20da1385337d372e1f00886de911517a6
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 08:49:39 2014 +0200
xmlsec: clean up resource file dialogs.hrc
now unused after ui conversion
Change-Id: Ic3e4f9fdd3f84c3890c6d9a33c11e372ab5b3bd0
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc
b/xmlsecurity/source/dialogs/dialogs.hrc
index 1973449..39483ad 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -25,9 +25,6 @@
#define STD_MASKCOLOR
Color{Red=0xffff;Green=0x0000;Blue=0xffff;}
-#define FL_BOTTOM_SEP 50
-#define BTN_HELP 53
-
#define STR_HEADERBAR 256
#define STR_VERSION 257
#define STR_SERIALNUM 258
@@ -44,65 +41,18 @@
// --------- general metrics ---------
#define DLGS_WIDTH 287
-#define DLGS_HEIGHT 195
-// --------- ... for tab dialogs -----
-#define TP_WIDTH 260
-#define TP_HEIGHT 185
-#define TD_SP_INNERBORDER_LEFT 3
-
-#define SEP_FL_SPACE_Y 6
-#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_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)
// --------- tab dialog Certificate viewer ---------
+// still used by certificateviewer.cxx
#define CS_COL_0 RSC_SP_DLG_INNERBORDER_LEFT
#define CS_COL_2
(DLGS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
#define CS_LB_WIDTH (CS_COL_2-CS_COL_0)
-#define CV_COL_0 TD_SP_INNERBORDER_LEFT
-#define CV_COL_1
(TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
-#define CV_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
-#define CV_ROW_3
(TP_HEIGHT-RSC_SP_TBPG_INNERBORDER_BOTTOM)
-#define CV_CONT_WIDTH (CV_COL_1-CV_COL_0)
-#define CV_CONT_HEIGHT (CV_ROW_3-CV_ROW_0)
-#define CV_ROW_1 (CV_ROW_0+2*CV_CONT_HEIGHT/3)
-#define CV_ROW_2 (CV_ROW_1+RSC_SP_CTRL_GROUP_Y)
-
// --------- tab page Certificate viewer - General ---------
#define STR_CERTIFICATE_NOT_VALIDATED 269
#define IMG_STATE_NOT_VALIDATED 270
-#define IMG1_WIDTH 33
-#define IMG1_HEIGHT 22
-#define IMG2_WIDTH 20
-#define IMG2_HEIGHT 20
-#define CW_COL_0 (CV_COL_0+RSC_SP_GRP_INNERBORDER_LEFT)
-#define CW_COL_1 (CW_COL_0+RSC_SP_FLGR_SPACE_X)
-#define CW_COL_1a (CW_COL_0+IMG2_WIDTH+1)
-#define CW_COL_2 (CW_COL_0+IMG1_WIDTH)
-#define CW_COL_3 (CW_COL_2+RSC_SP_CTRL_GROUP_X)
-#define CW_COL_4 (CW_COL_1+40)
-#define CW_COL_5
(CV_CONT_WIDTH-RSC_SP_GRP_INNERBORDER_RIGHT)
-#define CW_COL_5a (CW_COL_5-RSC_SP_GRP_INNERBORDER_RIGHT)
-#define CW_ROW_0 (CV_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
-#define CW_ROW_1 (CW_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
-#define CW_ROW_2 (CW_ROW_0+IMG1_HEIGHT)
-#define CW_ROW_3 (CW_ROW_2+3)
-#define CW_ROW_4
(CW_ROW_3+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
-#define CW_ROW_4a (CW_ROW_4+35)
-#define CW_ROW_5 (CW_ROW_4a+3)
-#define CW_ROW_6
(CW_ROW_5+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
-#define CW_ROW_7
(CW_ROW_6+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_8
(CW_ROW_7+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_9
(CW_ROW_8+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_10 (CW_ROW_9+2)
-
-
// --------- tab page Certificate viewer - Certification Path ---------
#define STR_PATH_CERT_OK 8
commit df64b892f5ac8febad05a9d27fb76cc25de12c31
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 08:26:12 2014 +0200
remove RID_DLG_DEPENDENCIES resources
unused since 8c0bd0deee50a5f54926afe87d849411757c2f18
Change-Id: If720d7022e291db870fd196cf2ea0a3bc44f3ad2
diff --git a/desktop/AllLangResTarget_deploymentgui.mk
b/desktop/AllLangResTarget_deploymentgui.mk
index 0bb9e63..bc9012f 100644
--- a/desktop/AllLangResTarget_deploymentgui.mk
+++ b/desktop/AllLangResTarget_deploymentgui.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\
))
$(eval $(call gb_SrsTarget_add_files,deploymentgui/res,\
- desktop/source/deployment/gui/dp_gui_dependencydialog.src \
desktop/source/deployment/gui/dp_gui_dialog2.src \
desktop/source/deployment/gui/dp_gui_dialog.src \
desktop/source/deployment/gui/dp_gui_updatedialog.src \
diff --git a/desktop/source/deployment/gui/dp_gui.hrc
b/desktop/source/deployment/gui/dp_gui.hrc
index c0a9aef..134df341 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -23,11 +23,6 @@
#include "deployment.hrc"
#include "helpid.hrc"
-#define RID_DLG_DEPENDENCIES (RID_DEPLOYMENT_GUI_START + 1)
-#define RID_DLG_DEPENDENCIES_TEXT 1
-#define RID_DLG_DEPENDENCIES_LIST 2
-#define RID_DLG_DEPENDENCIES_OK 3
-
#define RID_QUERYBOX_INSTALL_FOR_ALL
(RID_DEPLOYMENT_GUI_START + 2)
#define RID_WARNINGBOX_VERSION_LESS
(RID_DEPLOYMENT_GUI_START + 3)
#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES
(RID_DEPLOYMENT_GUI_START + 4)
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
deleted file mode 100644
index 1239388..0000000
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ /dev/null
@@ -1,66 +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 <svtools/controldims.hrc>
-
-#include "dp_gui.hrc"
-
-#define LOCAL_WIDTH (50 * RSC_BS_CHARWIDTH)
-#define LOCAL_TEXT_HEIGHT (2 * RSC_CD_FIXEDTEXT_HEIGHT)
-#define LOCAL_LIST_HEIGHT (6 * RSC_BS_CHARHEIGHT)
-
-ModalDialog RID_DLG_DEPENDENCIES {
- HelpID = "desktop:ModalDialog:RID_DLG_DEPENDENCIES";
- Size = MAP_APPFONT(
- (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH +
- RSC_SP_DLG_INNERBORDER_RIGHT),
- (RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +
- LOCAL_LIST_HEIGHT + RSC_SP_CTRL_Y + RSC_CD_PUSHBUTTON_HEIGHT +
- RSC_SP_DLG_INNERBORDER_BOTTOM));
- Text[en-US] = "System dependencies check";
- Sizeable = TRUE;
- Moveable = TRUE;
- Closeable = TRUE;
- FixedText RID_DLG_DEPENDENCIES_TEXT {
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP);
- Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_TEXT_HEIGHT);
- Text[en-US] = "The extension cannot be installed as the
following\nsystem dependencies are not fulfilled:";
- NoLabel = TRUE;
- };
- ListBox RID_DLG_DEPENDENCIES_LIST {
- HelpID =
"desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST";
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT,
- (RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y));
- Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_LIST_HEIGHT);
- };
- OKButton RID_DLG_DEPENDENCIES_OK {
- Pos = MAP_APPFONT(
- (RSC_SP_DLG_INNERBORDER_LEFT +
- (LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH) / 2),
- (RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_CTRL_Y));
- Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
- DefButton = TRUE;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
