diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/uibase/dialog/regionsw.src | 46 | ||||
-rw-r--r-- | sw/source/core/uibase/inc/frmui.hrc | 1 | ||||
-rw-r--r-- | sw/source/core/uibase/inc/misc.hrc | 2 | ||||
-rw-r--r-- | sw/source/core/uibase/inc/ribbar.hrc | 9 | ||||
-rw-r--r-- | sw/source/core/uibase/inc/shells.hrc | 1 | ||||
-rw-r--r-- | sw/source/core/uibase/inc/toolbox.hrc | 553 | ||||
-rw-r--r-- | sw/source/core/uibase/inc/utlui.hrc | 1 | ||||
-rw-r--r-- | sw/source/core/uibase/lingu/olmenu.hrc | 3 | ||||
-rw-r--r-- | sw/source/core/uibase/ribbar/workctrl.hrc | 2 | ||||
-rw-r--r-- | sw/source/core/uibase/sidebar/PagePropertyPanel.hrc | 29 | ||||
-rw-r--r-- | sw/source/core/uibase/utlui/navipi.hrc | 3 | ||||
-rw-r--r-- | sw/source/ui/app/mn.src | 8 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.hrc | 22 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.hrc | 9 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.hrc | 41 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/wrap.hrc | 57 | ||||
-rw-r--r-- | sw/source/ui/shells/shells.src | 8 |
19 files changed, 8 insertions, 789 deletions
diff --git a/sw/source/core/uibase/dialog/regionsw.src b/sw/source/core/uibase/dialog/regionsw.src index fa1e976bfa49..2d9755c37c88 100644 --- a/sw/source/core/uibase/dialog/regionsw.src +++ b/sw/source/core/uibase/dialog/regionsw.src @@ -26,52 +26,6 @@ Dialog "paste region" *************************************************************************/ -#define FT_SUBREG_TEXT \ - Text [ en-US ] = "~Section" ; \ - -#define CB_HIDE_TEXT \ - Text [ en-US ] = "H~ide" ;\ - -#define FL_HIDE_TEXT \ - Text [ en-US ] = "Hide" ;\ - -#define CB_CONDITION_TEXT \ - Text [ en-US ] = "~With Condition" ;\ - -#define FL_PROPERTIES_TEXT \ - Text [ en-US ] = "Properties" ;\ - -#define CB_EDIT_IN_READONLY_TEXT \ - Text [ en-US ] = "E~ditable in read-only document" ;\ - -#define FL_FILE_TEXT \ - Text [ en-US ] = "Link" ;\ - -#define CB_FILE_TEXT\ - Text [ en-US ] = "~Link";\ - -#define CB_DDE_TEXT \ - Text [ en-US ] = "DD~E" ;\ - -#define FT_DDE_TEXT \ - Text [ en-US ] = "DDE ~command" ;\ - -#define FT_FILE_TEXT \ - Text [ en-US ] = "~File name" ;\ - - -#define GB_HIDE_TEXT \ - Text [ en-US ] = "Hide";\ - -#define GB_OPTIONS_TEXT \ - Text [ en-US ] = "Options" ;\ - -#define FL_PROTECT_TEXT \ - Text [ en-US ] = "Write protection";\ - -#define CB_PASSWD_TEXT\ - Text [ en-US ] = "Wit~h password";\ - #define DLG_IMAGE_IDLIST \ IdList = \ { \ diff --git a/sw/source/core/uibase/inc/frmui.hrc b/sw/source/core/uibase/inc/frmui.hrc index 4e765f9c9456..60c81b32aac5 100644 --- a/sw/source/core/uibase/inc/frmui.hrc +++ b/sw/source/core/uibase/inc/frmui.hrc @@ -26,7 +26,6 @@ #define DLG_COLUMN (RC_FRMDLG_BEGIN + 4) #define DLG_CAPTION (RC_FRMDLG_BEGIN + 11) -#define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12) #define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16) #define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17) diff --git a/sw/source/core/uibase/inc/misc.hrc b/sw/source/core/uibase/inc/misc.hrc index 95113ff989f2..7112850be031 100644 --- a/sw/source/core/uibase/inc/misc.hrc +++ b/sw/source/core/uibase/inc/misc.hrc @@ -23,7 +23,7 @@ #include "rcid.hrc" #define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) -#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) + #define DLG_SORTING (RC_MISC_BEGIN + 19) #define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31) diff --git a/sw/source/core/uibase/inc/ribbar.hrc b/sw/source/core/uibase/inc/ribbar.hrc index 296b61d4b28c..7070d24d519a 100644 --- a/sw/source/core/uibase/inc/ribbar.hrc +++ b/sw/source/core/uibase/inc/ribbar.hrc @@ -21,15 +21,6 @@ #include "rcid.hrc" -#define MN_FORM1 1 // Defines fuer NumNames-Popup -#define MN_FORMBASE MN_FORM1 -#define MN_FORM2 2 -#define MN_FORM3 3 -#define MN_FORM4 4 -#define MN_FORM5 5 - -#define CB_FORMAT (RC_RIBBAR_BEGIN +1) -#define CB_SIZE (RC_RIBBAR_BEGIN +3) #define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6) #define FT_POS (RC_RIBBAR_BEGIN +7) #define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +9) diff --git a/sw/source/core/uibase/inc/shells.hrc b/sw/source/core/uibase/inc/shells.hrc index 4070dd2c8764..36b48c5835fe 100644 --- a/sw/source/core/uibase/inc/shells.hrc +++ b/sw/source/core/uibase/inc/shells.hrc @@ -71,7 +71,6 @@ #define STR_SWBG_FOOTER (RC_SHELLS_BEGIN + 46) #define STR_SHELLNAME_DRAWFORM (RC_SHELLS_BEGIN + 48) - // FREE #define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50) #define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51) diff --git a/sw/source/core/uibase/inc/toolbox.hrc b/sw/source/core/uibase/inc/toolbox.hrc deleted file mode 100644 index e65caf2bbcb3..000000000000 --- a/sw/source/core/uibase/inc/toolbox.hrc +++ /dev/null @@ -1,553 +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 _TOOLBOX_HRC -#define _TOOLBOX_HRC -#include "shells.hrc" -#include "globals.hrc" -#include "cmdid.h" -#define MN_FONT\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_FONT;\ - HelpID = SID_ATTR_CHAR_FONT;\ - };\ - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; \ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ - HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ - };\ - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - -#define MN_TEXT1( HIDE )\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_WEIGHT ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_POSTURE ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_UNDERLINE ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_OVERLINE ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SET_SUPER_SCRIPT;\ - HelpID = FN_SET_SUPER_SCRIPT;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SET_SUB_SCRIPT;\ - HelpID = FN_SET_SUB_SCRIPT;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ - RadioCheck = TRUE ; \ - };\ - -#define MN_TEXT1_RTL( HIDE )\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_WEIGHT ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_POSTURE ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_UNDERLINE ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_OVERLINE ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SET_SUPER_SCRIPT;\ - HelpID = FN_SET_SUPER_SCRIPT;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SET_SUB_SCRIPT;\ - HelpID = FN_SET_SUB_SCRIPT;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ - RadioCheck = TRUE ; \ - };\ - -#define MN_TEXT1_BLOCK \ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ - RadioCheck = TRUE ; \ - };\ - -#define MN_TEXT_LINESPACE \ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LINESPACE_10;\ - HelpID = SID_ATTR_PARA_LINESPACE_10;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LINESPACE_15;\ - HelpID = SID_ATTR_PARA_LINESPACE_15;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LINESPACE_20;\ - HelpID = SID_ATTR_PARA_LINESPACE_20;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - -#define MN_TEXT_LTR_RTL \ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT;\ - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT;\ - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - -#define MN_TEXT_RTL_LTR \ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT;\ - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT;\ - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - -#define MN_TEXT2\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_NUM_NUMBERING_ON ; \ - HelpID = FN_NUM_NUMBERING_ON ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_NUM_BULLET_ON ; \ - HelpID = FN_NUM_BULLET_ON ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_DEC_INDENT ; \ - HelpId = SID_DEC_INDENT ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_INC_INDENT ; \ - HelpId = SID_INC_INDENT ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_GROW_FONT_SIZE;\ - HelpID = FN_GROW_FONT_SIZE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SHRINK_FONT_SIZE;\ - HelpID = FN_SHRINK_FONT_SIZE;\ - Hide = TRUE;\ - };\ - -#define MN_BACKGROUND_COLOR\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_BACKGROUND_COLOR\ - }; - -#define MN_TEXT_BACKGROUND \ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_ATTR_CHAR_COLOR\ - Identifier = SID_ATTR_CHAR_COLOR2 ; \ - Command = ".uno:FontColor"; \ - DropDown = TRUE ;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND ; \ - HelpID = SID_ATTR_CHAR_COLOR_BACKGROUND ; \ - DropDown = TRUE ;\ - };\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_BACKGROUND_COLOR\ - Text [ en-US ] = "Paragraph Background" ; \ - }; - -#define MN_TEXT_DIALOGS(HIDE)\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_SELECTALL;\ - HelpId = SID_SELECTALL;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_CHAR_DLG;\ - HelpId = SID_CHAR_DLG;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_PARA_DLG;\ - HelpId = SID_PARA_DLG;\ - Hide = HIDE;\ - }; - - -#define MN_TEMPLATE\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_TEMPLATE_APPLY\ - };\ - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - -#define MN_FRAME_WRAP\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_NOWRAP ; \ - HelpID = FN_FRAME_NOWRAP ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP ; \ - HelpID = FN_FRAME_WRAP ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_IDEAL ; \ - HelpID = FN_FRAME_WRAP_IDEAL ; \ - RadioCheck = TRUE ; \ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_LEFT ; \ - HelpID = FN_FRAME_WRAP_LEFT ; \ - RadioCheck = TRUE ; \ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_RIGHT ; \ - HelpID = FN_FRAME_WRAP_RIGHT ; \ - RadioCheck = TRUE ; \ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAPTHRU ; \ - HelpID = FN_FRAME_WRAPTHRU ; \ - RadioCheck = TRUE ; \ - }; - -#define MN_FRAME_WRAP_WEB\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_NOWRAP ; \ - HelpID = FN_FRAME_NOWRAP ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_LEFT ; \ - HelpID = FN_FRAME_WRAP_LEFT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_RIGHT ; \ - HelpID = FN_FRAME_WRAP_RIGHT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_IMAP ; \ - HelpID = SID_IMAP ; \ - RadioCheck = TRUE ; \ - }; - -#define MN_CONTOUR\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_CONTOUR ; \ - HelpID = FN_FRAME_WRAP_CONTOUR ; \ - Hide = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_CONTOUR_DLG ; \ - HelpID = SID_CONTOUR_DLG ; \ - Hide = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_IMAP ; \ - HelpID = SID_IMAP ; \ - Hide = TRUE ; \ - }; - - -#define MN_FRAME1\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_HORZ_LEFT ; \ - HelpID = FN_FRAME_ALIGN_HORZ_LEFT ; \ - RadioCheck = TRUE ; \ - }; - -#define MN_FRAME2\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_HORZ_CENTER ; \ - HelpID = FN_FRAME_ALIGN_HORZ_CENTER ; \ - RadioCheck = TRUE ; \ - }; - -#define MN_FRAME3\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_HORZ_RIGHT ; \ - HelpID = FN_FRAME_ALIGN_HORZ_RIGHT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_VERT_TOP ; \ - HelpID = FN_FRAME_ALIGN_VERT_TOP ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_VERT_CENTER ; \ - HelpID = FN_FRAME_ALIGN_VERT_CENTER ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_VERT_BOTTOM ; \ - HelpID = FN_FRAME_ALIGN_VERT_BOTTOM ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - }; - -#define MN_LAYER\ - ToolBoxItem\ - {\ - Identifier = SID_FRAME_TO_TOP ; \ - HelpID = SID_FRAME_TO_TOP ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_FRAME_TO_BOTTOM ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ - }; - -#define MN_LINESTYLE\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_ATTR_BORDER\ - };\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_FRAME_LINESTYLE\ - };\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_FRAME_LINECOLOR\ - }; - -#define MN_ATTRIBUTES_FRAME\ - ToolBoxItem\ - {\ - Identifier = FN_FORMAT_FRAME_DLG ; \ - HelpID = FN_FORMAT_FRAME_DLG ; \ - }; - -#define MN_ATTRIBUTES_GRAFIK\ - ToolBoxItem\ - {\ - Identifier = FN_FORMAT_FRAME_DLG;\ - HelpID = FN_FORMAT_GRAFIC_DLG;\ - Text [ en-US ] = "Image Properties";\ - }; - - -#define MN_ATTRIBUTES_OLE\ - ToolBoxItem\ - {\ - Identifier = FN_FORMAT_FRAME_DLG;\ - HelpID = FN_FORMAT_FRAME_DLG;\ - Text [ en-US ] = "Object Properties";\ - }; - -#define MN_GRID(hide)\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_GRID_VISIBLE;\ - HelpID = SID_GRID_VISIBLE;\ - hide;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_GRID_USE;\ - HelpID = SID_GRID_USE;\ - hide;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_HELPLINES_MOVE;\ - HelpID = SID_HELPLINES_MOVE;\ - hide;\ - }; - - - -#endif // _TOOLBOX_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/uibase/inc/utlui.hrc b/sw/source/core/uibase/inc/utlui.hrc index 774a0b868231..60ff13ff6140 100644 --- a/sw/source/core/uibase/inc/utlui.hrc +++ b/sw/source/core/uibase/inc/utlui.hrc @@ -142,7 +142,6 @@ #define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) #define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1) -#define DLG_GLOSSARY_DECIDE_DLG (RC_UTLUI_BEGIN + 3) #define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4) #define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6) diff --git a/sw/source/core/uibase/lingu/olmenu.hrc b/sw/source/core/uibase/lingu/olmenu.hrc index 0a8ae91cec6e..fcd19f46d70b 100644 --- a/sw/source/core/uibase/lingu/olmenu.hrc +++ b/sw/source/core/uibase/lingu/olmenu.hrc @@ -81,9 +81,6 @@ #define MN_SET_PARA_RESET (MN_SET_LANGUAGE_PARAGRAPH_START + MN_RESET_OFFSET) #define MN_SET_PARA_MORE (MN_SET_LANGUAGE_PARAGRAPH_START + MN_MORE_OFFSET) -// id range for 'set language for all text' sub menu entries -#define MN_SET_LANGUAGE_ALL_TEXT_START 1300 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/uibase/ribbar/workctrl.hrc b/sw/source/core/uibase/ribbar/workctrl.hrc index cee389be0671..07c109548e43 100644 --- a/sw/source/core/uibase/ribbar/workctrl.hrc +++ b/sw/source/core/uibase/ribbar/workctrl.hrc @@ -21,8 +21,6 @@ #include "ribbar.hrc" #define IL_VALUES 5 -#define IMG_BTN 6 -#define ST_QUICK 7 #define FI_INFO 8 #define FL_SEP 9 diff --git a/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc b/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc index 0f827f0d84fe..5de37cc9c8b5 100644 --- a/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc +++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc @@ -69,10 +69,7 @@ #define IMG_LANDSCAPE 11 #define STR_PORTRAIT 12 #define STR_LANDSCAPE 13 -#define ED_SWPAPER_WIDTH 14 -#define ED_SWPAPER_HEIGHT 15 -#define LB_SWPAPER_TRAY 16 -#define LB_SWPAPER_SIZE 17 + #define MF_SWLEFT_MARGIN 18 #define MF_SWRIGHT_MARGIN 19 #define MF_SWTOP_MARGIN 20 @@ -124,10 +121,6 @@ #define IMG_NORMAL_L 110 #define IMG_WIDE_L 111 #define IMG_MIRRORED_L 112 -#define FLD_LEFT_MARGIN 113 -#define FLD_RIGHT_MARGIN 114 -#define FLD_TOP_MARGIN 115 -#define FLD_BOTTOM_MARGIN 116 #define IMG_CUSTOM_DIS 121 @@ -145,29 +138,11 @@ //========================================Position============================================== -#define FT_ORIENTATION_X SECTIONPAGE_MARGIN_HORIZONTAL -#define FT_ORIENTATION_Y SECTIONPAGE_MARGIN_VERTICAL_TOP -#define TBX_ORIENTATION_X FT_ORIENTATION_X -#define TBX_ORIENTATION_Y FT_ORIENTATION_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL -#define FT_MARGIN_X FT_ORIENTATION_X + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL -#define FT_MARGIN_Y FT_ORIENTATION_Y -#define TBX_MARGIN_X FT_MARGIN_X -#define TBX_MARGIN_Y TBX_ORIENTATION_Y -#define FT_SIZE_X FT_ORIENTATION_X -#define FT_SIZE_Y TBX_ORIENTATION_Y + 20 + CONTROL_SPACING_VERTICAL -#define TBX_SIZE_X FT_SIZE_X -#define TBX_SIZE_Y FT_SIZE_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL -#define FT_COLUMN_X FT_MARGIN_X -#define FT_COLUMN_Y FT_SIZE_Y -#define TBX_COLUMN_X FT_COLUMN_X -#define TBX_COLUMN_Y TBX_SIZE_Y - #define FT_CUSTOM_X POPUP_MARGIN + OFFSET_X #define FT_CUSTOM_Y POPUPPANEL_MARGIN_SMALL * 2 + ITEM_HEIGHT * 5 #define POP_BORDER_X POPUP_MARGIN + OFFSET_X + 1 #define POP_BORDER_Y POPUPPANEL_MARGIN_SMALL * 3 + ITEM_HEIGHT * 5 + TEXT_HEIGHT -#define BD_WIDTH VS_WIDTH - 6 #define BD_HEIGHT MBOX_HEIGHT*4 + CONTROL_SPACING_VERTICAL*5 #define FT_X POP_BORDER_X + CONTROL_SPACING_HORIZONTAL @@ -182,7 +157,5 @@ #define FT_BOTTOM_Y BOTTOM_MF_Y + 1 #define MARGIN_PANEL_HEIGHT POP_BORDER_Y + BD_HEIGHT + POPUP_MARGIN + OFFSET_Y -#define CUST_MORE_BUTTON_IMG_OFF_X POPUPPANEL_MARGIN_HORIZONTAL + OFFSET_X -#define PAGE_HEIGHT TBX_COLUMN_Y + 20 + SECTIONPAGE_MARGIN_VERTICAL_BOT /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/uibase/utlui/navipi.hrc b/sw/source/core/uibase/utlui/navipi.hrc index daed23f3d77a..651cd0dba506 100644 --- a/sw/source/core/uibase/utlui/navipi.hrc +++ b/sw/source/core/uibase/utlui/navipi.hrc @@ -68,7 +68,4 @@ #define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36) #define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37) -#define ST_TL_GLOBAL (ST_GLOBAL_CONTEXT_FIRST +38) -#define ST_TL_CONTENT (ST_GLOBAL_CONTEXT_FIRST +39) - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 1ea9f74f7b8c..95816563a615 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -247,14 +247,6 @@ ITEM_OPEN_SMARTTAGMENU \ }; -#define _MN_EDIT__HYPERLINK \ - MenuItem\ - {\ - Identifier = FN_EDIT_HYPERLINK ; \ - HelpId = CMD_FN_EDIT_HYPERLINK ; \ - Text [ en-US ] = "~Edit Hyperlink" ; \ - }; - #define _DEFAULT_TEXT_EDIT_ELEMENTS \ _MN_EDIT_FIELD \ _MN_EDIT_FOOTNOTE \ diff --git a/sw/source/ui/dbui/mmaddressblockpage.hrc b/sw/source/ui/dbui/mmaddressblockpage.hrc index 596fcd18fcca..e3cc2ff2f9be 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hrc +++ b/sw/source/ui/dbui/mmaddressblockpage.hrc @@ -19,25 +19,11 @@ #ifndef _MAILMERGEADDRESSBLOCKPAGE_HRC #define _MAILMERGEADDRESSBLOCKPAGE_HRC -#define FI_ADDRESSLIST 1 -#define PB_ADDRESSLIST 2 -#define FI_SETTINGS 3 -#define WIN_SETTINGS 4 -#define PB_SETTINGS 5 -#define CB_ADDRESS 6 #define FI_PREVIEW 7 #define WIN_PREVIEW 8 -#define PB_ASSIGN 9 -#define FI_DOCINDEX 10 -#define IB_PREVSET 11 -#define IB_NEXTSET 12 + #define STR_DOCUMENT 13 -#define FI_HEADER 14 -#define FI_CURRENTADDRESS 15 #define STR_CHANGEADDRESS 16 -#define FI_SECOND 17 -#define FI_THIRD 18 -#define FI_MATCH_FIELDS 19 #define FL_SEPARATOR 29 #define PB_OK 30 @@ -49,12 +35,6 @@ #define ST_SALUTATIONPREVIEW 72 #define ST_SALUTATIONMATCHING 73 #define ST_SALUTATIONELEMENT 74 -#define CB_HIDE_EMPTY_PARA 75 -#define FI_FIRST 76 -#define FL_FIRST 77 -#define FL_SECOND 78 -#define FL_THIRD 79 -#define FI_FOURTH 80 #define SCR_1 1 #define ST_ADDRESSELEMENT 2 diff --git a/sw/source/ui/dbui/mmgreetingspage.hrc b/sw/source/ui/dbui/mmgreetingspage.hrc index 530a17a2f75c..c3a9b93dd614 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hrc +++ b/sw/source/ui/dbui/mmgreetingspage.hrc @@ -19,7 +19,6 @@ #ifndef _MAILMERGEGREETINGSPAGE_HRC #define _MAILMERGEGREETINGSPAGE_HRC - #define CB_PERSONALIZED 2 #define LB_FEMALE 3 #define PB_FEMALE 4 @@ -34,14 +33,8 @@ #define CB_NEUTRAL 14 #define CB_GREETINGLINE 15 -#define FI_PREVIEW 16 -#define WIN_PREVIEW 17 -#define PB_ASSIGN 18 -#define FI_DOCINDEX 19 -#define IB_PREVSET 20 -#define IB_NEXTSET 21 + #define STR_DOCUMENT 22 -#define FI_HEADER 23 #define FT_FEMALE 24 #define FT_MALE 25 diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 6a1488ac0e56..ff3ef8ae0ebe 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -55,7 +55,6 @@ #include <vcl/settings.hxx> #include <unoprnms.hxx> -#include <mmlayoutpage.hrc> #include <dbui.hrc> #include <unomid.h> diff --git a/sw/source/ui/dbui/mmlayoutpage.hrc b/sw/source/ui/dbui/mmlayoutpage.hrc deleted file mode 100644 index 1c977aec12f5..000000000000 --- a/sw/source/ui/dbui/mmlayoutpage.hrc +++ /dev/null @@ -1,41 +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 _MAILMERGELAYOUTPAGE_HRC -#define _MAILMERGELAYOUTPAGE_HRC - -#define FI_HEADER 1 -#define FL_POSITION 2 -#define FT_LEFT 3 -#define MF_LEFT 4 -#define FT_TOP 5 -#define MF_TOP 6 -#define FL_GREETINGLINE 7 -#define FT_UP 8 -#define MF_UP 9 -#define FT_DOWN 10 -#define PB_DOWN 11 -#define CB_ALIGN 12 - -#define WIN_EXAMPLECONTAINER 13 -#define FT_ZOOM 14 -#define LB_ZOOM 15 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index d465fe5823a3..f18f687483f5 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -39,7 +39,6 @@ #include "frmmgr.hxx" #include "globals.hrc" #include "frmui.hrc" -#include "wrap.hrc" #include "wrap.hxx" using namespace ::com::sun::star; diff --git a/sw/source/ui/frmdlg/wrap.hrc b/sw/source/ui/frmdlg/wrap.hrc deleted file mode 100644 index 7751e6f746cb..000000000000 --- a/sw/source/ui/frmdlg/wrap.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 RB_NO_WRAP 2 -#define RB_WRAP_LEFT 3 -#define RB_WRAP_RIGHT 4 -#define RB_WRAP_PARALLEL 5 -#define RB_WRAP_THROUGH 6 -#define RB_WRAP_IDEAL 7 -#define CB_ANCHOR_ONLY 8 -#define FT_LEFT_MARGIN 13 -#define ED_LEFT_MARGIN 14 -#define FT_RIGHT_MARGIN 15 -#define ED_RIGHT_MARGIN 16 -#define FT_TOP_MARGIN 17 -#define ED_TOP_MARGIN 18 -#define ED_BOTTOM_MARGIN 19 -#define FT_BOTTOM_MARGIN 20 -#define FL_MARGIN 21 -#define CB_TRANSPARENT 22 -#define CB_OUTLINE 23 -#define FL_OPTION 24 -#define CB_ONLYOUTSIDE 25 -#define FL_OPTION_SEP 26 -#define C_WRAP_FL 31 - -#define IL_WRAP 32 -// nur fuer die ImageList -#define IMG_BEGIN 1 -#define IMG_NONE (IMG_BEGIN) -#define IMG_LEFT (IMG_BEGIN + 1) -#define IMG_RIGHT (IMG_BEGIN + 2) -#define IMG_PARALLEL (IMG_BEGIN + 3) -#define IMG_THROUGH (IMG_BEGIN + 4) -#define IMG_IDEAL (IMG_BEGIN + 5) -#define IMG_KON_NONE (IMG_BEGIN + 6) -#define IMG_KON_LEFT (IMG_BEGIN + 7) -#define IMG_KON_RIGHT (IMG_BEGIN + 8) -#define IMG_KON_PARALLEL (IMG_BEGIN + 9) -#define IMG_KON_IDEAL (IMG_BEGIN + 10) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index bc31e2ae4250..45c0112b8b88 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -18,8 +18,11 @@ */ #include <svx/svxids.hrc> #include <svx/globlmn.hrc> -#include "toolbox.hrc" #include "helpid.h" +#include "shells.hrc" +#include "globals.hrc" +#include "cmdid.h" + String STR_GRFILTER_OPENERROR { Text [ en-US ] = "Image file cannot be opened" ; @@ -231,7 +234,4 @@ String STR_SWBG_FOOTER }; //End: strings for gallery/background -// #i68101# no longer needed: -// String STR_NAME_SHAPE_LABEL {// String STR_NAME_SHAPE_DIALOG { Text [ en-US ] = "Name Object"; }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |