From f645294d3959ab204ac0efb6619e74b5ba85efa6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 13 Mar 2017 14:33:47 +0200 Subject: remove unused RID constants found with the attached bin/find-unused-rid.py script Change-Id: I1cf79caa6cafedb8bc642f394dc7e7da889d6fdf Reviewed-on: https://gerrit.libreoffice.org/35136 Tested-by: Jenkins Reviewed-by: Noel Grandin --- accessibility/inc/helper/accessiblestrings.hrc | 3 - accessibility/source/helper/accessiblestrings.src | 14 -- basctl/inc/basidesh.hrc | 15 --- basctl/source/basicide/basidesh.src | 60 --------- bin/find-unused-rid.py | 103 +++++++++++++++ cui/source/customize/cfg.src | 14 -- cui/source/customize/macropg.src | 20 --- cui/source/dialogs/hyperdlg.src | 5 - cui/source/dialogs/passwdomdlg.src | 5 - cui/source/dialogs/scriptdlg.src | 17 --- cui/source/inc/cuires.hrc | 24 ---- cui/source/options/optchart.src | 5 - cui/source/options/personalization.src | 5 - cui/source/tabpages/strings.src | 24 ---- dbaccess/source/core/inc/core_resource.hrc | 4 - dbaccess/source/core/resource/strings.src | 20 --- dbaccess/source/ui/app/app.src | 5 - dbaccess/source/ui/app/dbu_app.hrc | 1 - dbaccess/source/ui/browser/sbabrw.src | 5 - dbaccess/source/ui/inc/dbu_brw.hrc | 1 - dbaccess/source/ui/inc/dbu_qry.hrc | 2 - dbaccess/source/ui/querydesign/query.src | 10 -- .../deployment/registry/script/dp_script.hrc | 1 - .../deployment/registry/script/dp_script.src | 5 - editeng/source/items/svxitems.src | 54 -------- editeng/source/misc/lingu.src | 4 - editeng/source/outliner/outliner.src | 4 - extensions/source/abpilot/abpresid.hrc | 11 -- extensions/source/bibliography/bib.hrc | 2 - extensions/source/bibliography/bib.src | 9 -- extensions/source/dbpilots/dbpresid.hrc | 11 -- forms/source/inc/frm_resource.hrc | 3 - forms/source/resource/xforms.src | 15 --- fpicker/source/office/OfficeFilePicker.hrc | 1 - include/editeng/editrids.hrc | 20 --- include/sfx2/dialogs.hrc | 3 - include/sfx2/sfx.hrc | 3 - include/svx/dialogs.hrc | 63 --------- include/svx/fmresids.hrc | 10 -- include/svx/svxitems.hrc | 45 ------- reportdesign/inc/RptResId.hrc | 13 -- reportdesign/source/core/inc/core_resource.hrc | 3 +- reportdesign/source/core/resource/strings.src | 5 - reportdesign/source/ui/report/report.src | 57 -------- sc/inc/sc.hrc | 3 - sc/inc/scres.hrc | 7 - sc/source/ui/inc/filter.hrc | 4 - sc/source/ui/src/filter.src | 16 --- sfx2/inc/app.hrc | 3 - sfx2/inc/doc.hrc | 1 - sfx2/source/appl/app.src | 13 -- sfx2/source/sidebar/Sidebar.hrc | 2 - starmath/inc/starmath.hrc | 17 --- starmath/source/commands.src | 35 ----- svx/inc/accessibility.hrc | 2 - svx/inc/gallery.hrc | 19 --- svx/source/accessibility/accessibility.src | 8 -- svx/source/dialog/sdstring.src | 26 ---- svx/source/engine3d/float3d.src | 5 - svx/source/engine3d/string3d.src | 24 ---- svx/source/form/datanavi.src | 20 --- svx/source/form/fmstring.src | 32 ----- svx/source/gallery2/gallery.src | 77 ----------- svx/source/items/svxitems.src | 147 --------------------- svx/source/tbxctrls/tbcontrl.src | 5 - sw/source/uibase/inc/ribbar.hrc | 4 - 66 files changed, 104 insertions(+), 1070 deletions(-) create mode 100755 bin/find-unused-rid.py diff --git a/accessibility/inc/helper/accessiblestrings.hrc b/accessibility/inc/helper/accessiblestrings.hrc index f957ab93bfe3..780e0b583c8d 100644 --- a/accessibility/inc/helper/accessiblestrings.hrc +++ b/accessibility/inc/helper/accessiblestrings.hrc @@ -30,7 +30,6 @@ #define RID_STR_ACC_ACTION_DECLINE ( RID_TK_ACC_START + 4 ) #define RID_STR_ACC_ACTION_INCBLOCK ( RID_TK_ACC_START + 5 ) #define RID_STR_ACC_ACTION_DECBLOCK ( RID_TK_ACC_START + 6 ) -#define RID_STR_ACC_NAME_PREVIEW ( RID_TK_ACC_START + 7 ) #define STR_SVT_ACC_ACTION_EXPAND ( RID_TK_ACC_START + 8 ) #define STR_SVT_ACC_ACTION_COLLAPSE ( RID_TK_ACC_START + 9 ) @@ -38,7 +37,6 @@ #define RID_STR_ACC_ACTION_CHECK ( RID_TK_ACC_START + 11 ) #define RID_STR_ACC_ACTION_UNCHECK ( RID_TK_ACC_START + 12 ) -#define RID_STR_ACC_ACTION_DOUBLE_CLICK ( RID_TK_ACC_START + 13 ) #define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL ( RID_TK_ACC_START + 14 ) #define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL ( RID_TK_ACC_START + 15 ) #define RID_STR_ACC_PANEL_DESCRIPTION ( RID_TK_ACC_START + 16 ) @@ -47,7 +45,6 @@ #define RID_STR_ACC_ROW_NUM ( RID_TK_ACC_START + 18 ) #define RID_STR_ACC_NAME_BROWSEBUTTON ( RID_TK_ACC_START + 100 ) -#define RID_STR_ACC_DESC_PANELDECL_TABBAR ( RID_TK_ACC_START + 101 ) #endif // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src index 1a82275f19ec..82806565d8b7 100644 --- a/accessibility/source/helper/accessiblestrings.src +++ b/accessibility/source/helper/accessiblestrings.src @@ -74,11 +74,6 @@ String STR_SVT_ACC_LISTENTRY_SELCTED_STATE Text [ en-US ] = "(Selected)"; }; -String RID_STR_ACC_NAME_PREVIEW -{ - Text [ en-US ] = "Preview"; -}; - String RID_STR_ACC_ACTION_CHECK { Text [ en-US ] = "Check"; @@ -87,10 +82,6 @@ String RID_STR_ACC_ACTION_UNCHECK { Text [ en-US ] = "Uncheck"; }; -String RID_STR_ACC_ACTION_DOUBLE_CLICK -{ - Text [ en-US ] = "Double click"; -}; String RID_STR_ACC_SCROLLBAR_NAME_VERTICAL { @@ -116,9 +107,4 @@ String RID_STR_ACC_ROW_NUM Text [ en-US ] = "Row %ROWNUMBER"; }; -String RID_STR_ACC_DESC_PANELDECL_TABBAR -{ - Text [ en-US ] = "Panel Deck Tab Bar"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index 66a5b67ba27d..0f9150613182 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -43,23 +43,16 @@ // free #define RID_STR_CANNOTCLOSE ( RID_BASICIDE_START + 13 ) // free -#define RID_STR_INITIDE ( RID_BASICIDE_START + 15 ) #define RID_STR_STACKNAME ( RID_BASICIDE_START + 16 ) #define RID_STR_WATCHNAME ( RID_BASICIDE_START + 17 ) #define RID_STR_REMOVEWATCH ( RID_BASICIDE_START + 18 ) #define RID_STR_CANNOTRUNMACRO ( RID_BASICIDE_START + 19 ) -#define RID_STR_OPEN ( RID_BASICIDE_START + 20 ) -#define RID_STR_SAVE ( RID_BASICIDE_START + 21 ) -#define RID_STR_RUNTIMEERROR ( RID_BASICIDE_START + 22 ) #define RID_STR_STDDIALOGNAME ( RID_BASICIDE_START + 24 ) -#define RID_STR_STDMODULENAME ( RID_BASICIDE_START + 27 ) #define RID_STR_ALL ( RID_BASICIDE_START + 28 ) #define RID_STR_PAGE ( RID_BASICIDE_START + 30 ) #define RID_STR_BADSBXNAME ( RID_BASICIDE_START + 31 ) -#define RID_STR_STDLIBNAME ( RID_BASICIDE_START + 32 ) -#define RID_STR_ERROROPENSTORAGE ( RID_BASICIDE_START + 33 ) #define RID_STR_NOLIBINSTORAGE ( RID_BASICIDE_START + 34 ) #define RID_STR_SBXNAMEALLREADYUSED ( RID_BASICIDE_START + 35 ) #define RID_STR_SIGNED ( RID_BASICIDE_START + 36 ) @@ -72,13 +65,9 @@ #define RID_STR_SEARCHNOTFOUND ( RID_BASICIDE_START + 43 ) #define RID_STR_SEARCHREPLACES ( RID_BASICIDE_START + 44 ) #define RID_STR_CANNOTCHANGENAMESTDLIB ( RID_BASICIDE_START + 45 ) -#define RID_STR_CANNOTCHANGENAMEREFLIB ( RID_BASICIDE_START + 46 ) -#define RID_STR_CANNOTUNLOADSTDLIB ( RID_BASICIDE_START + 47 ) #define RID_STR_GENERATESOURCE ( RID_BASICIDE_START + 48 ) #define RID_STR_REFNOTPOSSIBLE ( RID_BASICIDE_START + 49 ) -#define RID_STR_FILEEXISTS ( RID_BASICIDE_START + 50 ) // free -#define RID_STR_ERROROPENLIB ( RID_BASICIDE_START + 55 ) #define RID_STR_NEWLIB ( RID_BASICIDE_START + 57 ) #define RID_STR_NEWMOD ( RID_BASICIDE_START + 58 ) #define RID_STR_NEWDLG ( RID_BASICIDE_START + 59 ) @@ -110,17 +99,13 @@ #define RID_STR_QUERYDELLIBREF ( RID_BASICIDE_START + 86 ) #define RID_STR_QUERYDELMODULE ( RID_BASICIDE_START + 87 ) #define RID_STR_BASIC ( RID_BASICIDE_START + 88 ) -#define RID_STR_DOC ( RID_BASICIDE_START + 89 ) -#define RID_STR_MACRONAMEREQ ( RID_BASICIDE_START + 90 ) #define RID_STR_WILLSTOPPRG ( RID_BASICIDE_START + 91 ) #define RID_STR_STACK ( RID_BASICIDE_START + 92 ) -#define RID_STR_OBJNOTFOUND ( RID_BASICIDE_START + 93 ) #define RID_STR_COULDNTREAD ( RID_BASICIDE_START + 94 ) #define RID_STR_COULDNTWRITE ( RID_BASICIDE_START + 95 ) #define RID_STR_WRONGPASSWORD ( RID_BASICIDE_START + 96 ) #define RID_STR_LINE ( RID_BASICIDE_START + 97 ) #define RID_STR_COLUMN ( RID_BASICIDE_START + 98 ) -#define RID_STR_SOURCETOBIG ( RID_BASICIDE_START + 99 ) #define RID_STR_EXPORTPACKAGE ( RID_BASICIDE_START + 100 ) #define RID_STR_EXPORTBASIC ( RID_BASICIDE_START + 101 ) #define RID_STR_PACKAGE_BUNDLE ( RID_BASICIDE_START + 102 ) diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 3538b0c1c18c..7d05eb495d32 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -33,26 +33,6 @@ String RID_STR_WRONGPASSWORD { Text [ en-US ] = "Incorrect Password" ; }; -String RID_STR_OPEN -{ - Text [ en-US ] = "Load" ; -}; -String RID_STR_SAVE -{ - Text [ en-US ] = "Save" ; -}; -String RID_STR_SOURCETOBIG -{ - Text [ en-US ] = "The source text is too large and can be neither compiled nor saved.\nDelete some of the comments or transfer some methods into another module." ; -}; -String RID_STR_ERROROPENSTORAGE -{ - Text [ en-US ] = "Error opening file" ; -}; -String RID_STR_ERROROPENLIB -{ - Text [ en-US ] = "Error loading library" ; -}; String RID_STR_NOLIBINSTORAGE { Text [ en-US ] = "The file does not contain any BASIC libraries" ; @@ -101,18 +81,10 @@ String RID_STR_SBXNAMEALLREADYUSED2 { Text [ en-US ] = "Object with same name already exists" ; }; -String RID_STR_FILEEXISTS -{ - Text [ en-US ] = "The 'XX' file already exists" ; -}; String RID_STR_CANNOTRUNMACRO { Text [ en-US ] = "For security reasons, you cannot run this macro.\n\nFor more information, check the security settings." ; }; -String RID_STR_RUNTIMEERROR -{ - Text [ en-US ] = "Runtime Error: #" ; -}; String RID_STR_SEARCHNOTFOUND { Text [ en-US ] = "Search key not found" ; @@ -137,14 +109,6 @@ String RID_STR_CANNOTCHANGENAMESTDLIB { Text [ en-US ] = "The name of the default library cannot be changed." ; }; -String RID_STR_CANNOTCHANGENAMEREFLIB -{ - Text [ en-US ] = "The name of a referenced library cannot be changed." ; -}; -String RID_STR_CANNOTUNLOADSTDLIB -{ - Text [ en-US ] = "The default library cannot be deactivated" ; -}; String RID_STR_GENERATESOURCE { Text [ en-US ] = "Generating source" ; @@ -177,10 +141,6 @@ String RID_STR_QUERYDELMODULE { Text [ en-US ] = "Do you want to delete the XX module?" ; }; -String RID_STR_OBJNOTFOUND -{ - Text [ en-US ] = "Object or method not found" ; -}; String RID_STR_BASIC { Text [ en-US ] = "BASIC" ; @@ -195,10 +155,6 @@ String RID_STR_COLUMN // Abkuerzung fuer 'Spalte' Text [ en-US ] = "Col" ; }; -String RID_STR_DOC -{ - Text [ en-US ] = "Document" ; -}; String RID_BASICIDE_OBJECTBAR { Text [ en-US ] = "Macro Bar" ; @@ -235,22 +191,10 @@ String RID_STR_STACKNAME { Text [ en-US ] = "Call Stack" ; }; -String RID_STR_INITIDE -{ - Text [ en-US ] = "BASIC Initialization" ; -}; -String RID_STR_STDMODULENAME -{ - Text [ en-US ] = "Module" ; -}; String RID_STR_STDDIALOGNAME { Text [ en-US ] = "Dialog" ; }; -String RID_STR_STDLIBNAME -{ - Text [ en-US ] = "Library" ; -}; String RID_STR_NEWLIB { Text [ en-US ] = "New Library" ; @@ -271,10 +215,6 @@ String RID_STR_PAGE { Text [ en-US ] = "Page" ; }; -String RID_STR_MACRONAMEREQ -{ - Text [ en-US ] = "A name must be entered." ; -}; String RID_STR_WILLSTOPPRG { Text [ en-US ] = "You will have to restart the program after this edit.\nContinue?" ; diff --git a/bin/find-unused-rid.py b/bin/find-unused-rid.py new file mode 100755 index 000000000000..82ea29303b0c --- /dev/null +++ b/bin/find-unused-rid.py @@ -0,0 +1,103 @@ +#!/usr/bin/python + +# Search for unused RID_ constants. +# +# Note that sometimes RID constants are calculated, so some careful checking of the output is necessary. +# +# Takes about 30min to run this on a fast machine. + +import subprocess +import sys + +exclusionSet = set([ + # List of RID constants where we compute a value using a base before calling one of the RESSTR methods + # Found with: git grep -P 'RID_\w+\s*\+' -- :/ ':!*.hrc' ':!*.src' ':!*.java' ':!*.py' ':!*.xba' + "RID_SVXSTR_KEY_", + "RID_SVXITEMS_SHADOW_", + "RID_SVXITEMS_BREAK_", + "RID_SVXITEMS_FRMDIR_", + "RID_SVXITEMS_COLOR", + "RID_SVXITEMS_HORJUST_", + "RID_SVXITEMS_VERJUST_", + "RID_SVXITEMS_JUSTMETHOD_", + "RID_SVXITEMS_ADJUST_", + "RID_SVXITEMS_WEIGHT_", + "RID_SVXITEMS_UL_", + "RID_SVXITEMS_OL_", + "RID_SVXITEMS_STRIKEOUT_", + "RID_SVXITEMS_CASEMAP_", + "RID_SVXITEMS_ESCAPEMENT_", + "RID_SVXITEMS_EMPHASIS_", + "RID_SVXITEMS_RELIEF_", + "RID_SVXITEMS_FRMDIR_", + "RID_UPDATE_BUBBLE_TEXT_", + "RID_UPDATE_BUBBLE_T_TEXT_", + "RID_SVXSTR_TBLAFMT_", + "RID_BMP_CONTENT_", + "RID_DROPMODE_", + "RID_BMP_LEVEL", + "RID_SVXSTR_BULLET_DESCRIPTION", + "RID_SVXSTR_SINGLENUM_DESCRIPTION", + "RID_SVXSTR_OUTLINENUM_DESCRIPTION", + "RID_SVXSTR_RULER_", + "RID_GALLERYSTR_THEME_", + "RID_SVXITEMS_ORI_", + "RID_SVXITEMS_PAGE_NUM_", + "RID_SVXSTR_BULLET_DESCRIPTION", + "RID_SVXSTR_SINGLENUM_DESCRIPTION", + "RID_SVXSTR_OUTLINENUM_DESCRIPTION", + # doing some weird stuff in svx/source/unodraw/unoprov.cxx involving mapping of UNO api names to translated names and back again + "RID_SVXSTR_GRDT", + "RID_SVXSTR_HATCH", + "RID_SVXSTR_BMP", + "RID_SVXSTR_DASH", + "RID_SVXSTR_LEND", + "RID_SVXSTR_TRASNGR", + # other places doing calculations + "RID_SVXSTR_DEPTH", + "RID_SUBSETSTR_" + ]) + + +def startswith_one_of( a, aset ): + for f in aset: + if a.startswith(f): + return True; + return False; + +a = subprocess.Popen("git grep -P '^#define\s+RID_\w+\s+' -- *.hrc | sort -u", stdout=subprocess.PIPE, shell=True) + +with a.stdout as txt: + for line in txt: + idx1 = line.find("#define ") + idx2 = line.find(" ", idx1 + 9) + ridName = line[idx1+8 : idx2] + # the various _START and _END constants are normally unused outside of the .hrc and .src files, and that's fine + if ridName.endswith("_START"): continue + if ridName.endswith("_BEGIN"): continue + if ridName.endswith("_END"): continue + if ridName == "RID_GROUPS_SFXOFFSET": continue + if ridName == "RID_SVX_FIRSTFREE": continue + if startswith_one_of(ridName, exclusionSet): continue + # search for the constant + b = subprocess.Popen(["git", "grep", "-w", ridName], stdout=subprocess.PIPE) + # check if we found one in actual code + found_in_code = False + # check that the constant is not being used as an identifier by MenuItem entries in .src files + found_menu_identifier = False + # check that the constant is not being used by the property controller extension or report inspection, which use macros + # to declare constants, hiding them from a search + found_property_macros = False + with b.stdout as txt2: + for line2 in txt2: + if not line2.endswith(".hrc") and not line2.endswith(".src"): found_in_code = True + if line2.find("Identifier = ") != -1: found_menu_identifier = True + if line2.find("extensions/source/propctrlr") != -1: found_property_macros = True + if line2.find("reportdesign/source/ui/inspection/inspection.src") != -1: found_property_macros = True + if not found_in_code and not found_menu_identifier and not found_property_macros: + sys.stdout.write(ridName + '\n') + # otherwise the previous line of output will be incorrectly mixed into the below git output, because of buffering + sys.stdout.flush() + # search again, so we log the location and filename of stuff we want to remove + subprocess.call(["git", "grep", "-wn", ridName]) + diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src index 3d6f4cc48121..08d352625cf8 100644 --- a/cui/source/customize/cfg.src +++ b/cui/source/customize/cfg.src @@ -52,10 +52,6 @@ String RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION }; // Strings --------------------------------------------------------------- -String RID_SVXSTR_IMPORT_ICON_ERROR -{ - Text [ en-US ] = "The files listed below could not be imported. The file format could not be interpreted." ; -}; String RID_SVXSTR_DELETE_ICON_CONFIRM //added for issue73355 { @@ -102,16 +98,6 @@ String RID_SVXSTR_COMMANDS Text [ en-US ] = "Commands" ; }; -String RID_SVXSTR_COMMAND -{ - Text [ en-US ] = "Command" ; -}; - -String RID_SVXSTR_TOOLBAR_NAME -{ - Text [ en-US ] = "Toolbar Name" ; -}; - String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR { Text [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?"; diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src index c4cc3675ea56..a57fa254be32 100644 --- a/cui/source/customize/macropg.src +++ b/cui/source/customize/macropg.src @@ -308,26 +308,6 @@ String RID_SVXSTR_EVENT_TITLECHANGED Text [ en-US ] = "Document title changed" ; }; -String RID_SVXSTR_EVENT_MODECHANGED -{ - Text [ en-US ] = "Document mode changed" ; -}; - -String RID_SVXSTR_EVENT_VISAREACHANGED -{ - Text [ en-US ] = "Visible area changed" ; -}; - -String RID_SVXSTR_EVENT_STORAGECHANGED -{ - Text [ en-US ] = "Document has got a new storage" ; -}; - -String RID_SVXSTR_EVENT_LAYOUT_FINISHED -{ - Text [ en-US ] = "Document layout finished" ; -}; - String RID_SVXSTR_EVENT_SELECTIONCHANGED { Text [ en-US ] = "Selection changed" ; diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index ba6c6eb99438..42b2d1ee70d3 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -114,11 +114,6 @@ Bitmap RID_SVXBMP_HLDOCNTP File = "hldocntp.png"; }; -Bitmap RID_SVXBMP_BROWSE -{ - File = "browse.png"; -}; - Bitmap RID_SVXBMP_SCRIPT { File = "script.png"; diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index b0953c876ccd..b041e741646e 100644 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -19,11 +19,6 @@ #include -String RID_SVXSTR_PASSWD_MUST_BE_CONFIRMED -{ - Text [ en-US ] = "Password must be confirmed" ; -}; - String RID_SVXSTR_ONE_PASSWORD_MISMATCH { Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ; diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src index 380a4854d29d..d1ad2824449e 100644 --- a/cui/source/dialogs/scriptdlg.src +++ b/cui/source/dialogs/scriptdlg.src @@ -32,10 +32,6 @@ String RID_SVXSTR_DELFAILED { Text [ en-US ] = "The selected object could not be deleted."; }; -String RID_SVXSTR_DELFAILEDPERM -{ - Text [ en-US ] = " You do not have permission to delete this object."; -}; String RID_SVXSTR_DELFAILED_TITLE { Text [ en-US ] = "Error Deleting Object"; @@ -48,10 +44,6 @@ String RID_SVXSTR_CREATEFAILEDDUP { Text [ en-US ] = " Object with the same name already exists."; }; -String RID_SVXSTR_CREATEFAILEDPERM -{ - Text [ en-US ] = " You do not have permission to create this object."; -}; String RID_SVXSTR_CREATEFAILED_TITLE { Text [ en-US ] = "Error Creating Object"; @@ -60,10 +52,6 @@ String RID_SVXSTR_RENAMEFAILED { Text [ en-US ] = "The object could not be renamed."; }; -String RID_SVXSTR_RENAMEFAILEDPERM -{ - Text [ en-US ] = " You do not have permission to rename this object."; -}; String RID_SVXSTR_RENAMEFAILED_TITLE { Text [ en-US ] = "Error Renaming Object"; @@ -103,11 +91,6 @@ String RID_SVXSTR_FRAMEWORK_ERROR_RUNNING Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME."; }; -String RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE -{ - Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER."; -}; - String RID_SVXSTR_ERROR_TYPE_LABEL { Text [ en-US ] = "Type:"; diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 2af1ad85184c..1ee2819e698b 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -40,7 +40,6 @@ // RID_CUI_GALLERY_END (RID_SVX_START + 410) // used in "tabpages" -#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230) #define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969) #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970) #define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971) @@ -68,21 +67,16 @@ #define RID_SVXSTR_EDIT_GRAPHIC (RID_SVX_START + 509) #define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163) -#define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166) -#define RID_SVXSTR_ASK_CHANGE_BITMAP (RID_SVX_START + 172) #define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168) #define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169) #define RID_SVXSTR_DESC_NEW_PATTERN (RID_SVX_START + 170) -#define RID_SVXSTR_ASK_CHANGE_PATTERN (RID_SVX_START + 171) #define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174) #define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177) #define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232) -#define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235) #define RID_SVXSTR_CHANGE (RID_SVX_START + 181) #define RID_SVXSTR_ADD (RID_SVX_START + 182) #define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215) -#define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218) #define RID_SVXSTR_TABLE (RID_SVX_START + 220) #define RID_SVXSTR_CONNECTOR (RID_SVX_START + 221) #define RID_SVXSTR_DIMENSION_LINE (RID_SVX_START + 222) @@ -124,7 +118,6 @@ #define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250) #define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246) #define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) -#define RID_OPTSTR_COLOR_CHART_DELETE (RID_SVX_START + 289) #define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247) #define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249) #define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 324) @@ -172,7 +165,6 @@ #define RID_SVXBMP_TARGET (RID_SVX_START + 551) #define RID_SVXBMP_FILEOPEN (RID_SVX_START + 552) #define RID_SVXBMP_NEWDOC (RID_SVX_START + 553) -#define RID_SVXBMP_BROWSE (RID_SVX_START + 554) #define RID_SVXBMP_ADRESSBOOK (RID_SVX_START + 555) #define RID_SVXBMP_HLINETTP (RID_SVX_START + 556) #define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557) @@ -242,14 +234,11 @@ #define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027) #define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028) #define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029) -#define RID_SVXSTR_DELFAILEDPERM (RID_SVX_START + 1030) #define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031) #define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032) -#define RID_SVXSTR_CREATEFAILEDPERM (RID_SVX_START + 1033) #define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034) #define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035) #define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036) -#define RID_SVXSTR_RENAMEFAILEDPERM (RID_SVX_START + 1037) #define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038) #define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100) #define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101) @@ -258,13 +247,9 @@ #define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104) #define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105) #define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106) -#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE (RID_SVX_START + 1107) #define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108) #define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109) -// customize -#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291) - #define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS (RID_SVX_START + 1167) #define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039) #define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040) @@ -272,7 +257,6 @@ #define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048) #define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049) #define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050) -#define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117) #define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355 #define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355 #define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355 @@ -281,8 +265,6 @@ #define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043) #define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044) #define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045) -#define RID_SVXSTR_COMMAND (RID_SVX_START + 1046) -#define RID_SVXSTR_TOOLBAR_NAME (RID_SVX_START + 1047) #define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115) #define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116) #define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135) @@ -350,13 +332,9 @@ #define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180) #define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181) #define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182) -#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183) -#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184) -#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185) #define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186) #define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187) #define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) -#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189) // For now, keep new IDs unique only within cui. // Later, cui should perhaps get an own range of IDs. @@ -435,7 +413,6 @@ #define RID_SVXSTR_THES (RID_SVX_START + 1255) #define RID_SVXSTR_GRAMMAR (RID_SVX_START + 1256) -#define RID_SVXSTR_PASSWD_MUST_BE_CONFIRMED (RID_SVX_START + 1257) #define RID_SVXSTR_ONE_PASSWORD_MISMATCH (RID_SVX_START + 1258) #define RID_SVXSTR_TWO_PASSWORDS_MISMATCH (RID_SVX_START + 1259) #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON (RID_SVX_START + 1260) @@ -454,7 +431,6 @@ #define RID_SVXSTR_HANJA (RID_SVX_START + 1271) // Search Persona Dialog -#define RID_SVXSTR_SEARCHTERM (RID_SVX_START + 1277) #define RID_SVXSTR_SELECTEDPERSONA (RID_SVX_START + 1278) #define RID_SVXSTR_SEARCHING (RID_SVX_START + 1279) #define RID_SVXSTR_SEARCHERROR (RID_SVX_START + 1280) diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src index 8c1cd2441bf8..f5ae78182f52 100644 --- a/cui/source/options/optchart.src +++ b/cui/source/options/optchart.src @@ -29,9 +29,4 @@ String RID_SVXSTR_DIAGRAM_ROW Text [ en-US ] = "Data Series $(ROW)" ; }; -String RID_OPTSTR_COLOR_CHART_DELETE -{ - Text [ en-US ] = "Chart Color Deletion" ; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/personalization.src b/cui/source/options/personalization.src index 6170dd979ba3..5886a61c7464 100644 --- a/cui/source/options/personalization.src +++ b/cui/source/options/personalization.src @@ -19,11 +19,6 @@ #include -String RID_SVXSTR_SEARCHTERM -{ - Text [ en-US ] = "Search term"; -}; - String RID_SVXSTR_SELECTEDPERSONA { Text [ en-US ] = "Selected Theme: "; diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index 0b296d647f89..d83d42c595e5 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -23,10 +23,6 @@ String RID_SVXSTR_DESC_GRADIENT { Text [ en-US ] = "Please enter a name for the gradient:" ; }; -String RID_SVXSTR_ASK_CHANGE_GRADIENT -{ - Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ; -}; String RID_SVXSTR_DESC_NEW_BITMAP { Text [ en-US ] = "Please enter a name for the bitmap:" ; @@ -39,14 +35,6 @@ String RID_SVXSTR_DESC_NEW_PATTERN { Text [ en-US ] = "Please enter a name for the pattern:" ; }; -String RID_SVXSTR_ASK_CHANGE_BITMAP -{ - Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ; -}; -String RID_SVXSTR_ASK_CHANGE_PATTERN -{ - Text [ en-US ] = "The pattern was modified without saving. \nModify the selected pattern or add a new pattern"; -}; String RID_SVXSTR_DESC_LINESTYLE { Text [ en-US ] = "Please enter a name for the line style:" ; @@ -59,10 +47,6 @@ String RID_SVXSTR_DESC_HATCH { Text [ en-US ] = "Please enter a name for the hatching:" ; }; -String RID_SVXSTR_ASK_CHANGE_HATCH -{ - Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ; -}; String RID_SVXSTR_CHANGE { Text [ en-US ] = "Modify" ; @@ -75,10 +59,6 @@ String RID_SVXSTR_DESC_COLOR { Text [ en-US ] = "Please enter a name for the new color:" ; }; -String RID_SVXSTR_ASK_CHANGE_COLOR -{ - Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ; -}; String RID_SVXSTR_TABLE { Text [ en-US ] = "Table" ; @@ -199,10 +179,6 @@ String RID_SVXSTR_DIMENSION_LINE { Text [en-US ] = "Dimension line"; }; -String RID_SVXSTR_READ_DATA_ERROR -{ - Text [ en-US ] = "The file could not be loaded!" ; -}; String RID_SVXSTR_LOAD_ERROR { Text [ en-US ] = "The selected module could not be loaded."; diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index 3789747af736..64bbb69efdb9 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -25,10 +25,8 @@ #define RID_CORE_STRINGS_START RID_DBACCESS_START //- String-IDs -#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 ) #define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) #define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 ) #define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) #define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) #define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) @@ -51,11 +49,9 @@ #define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) #define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) #define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) -#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 ) #define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) #define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) #define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) -#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 ) #define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) #define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) #define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index fdad3c68f117..f81344328458 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -20,11 +20,6 @@ #include "core_resource.hrc" #include "dbamiscres.hrc" -String RID_STR_TRIED_OPEN_TABLE -{ - Text [ en-US ] = "Tried to open the table $name$."; -}; - String RID_STR_CONNECTION_INVALID { Text [ en-US ] = "No connection could be established."; @@ -35,11 +30,6 @@ String RID_STR_TABLE_IS_FILTERED Text [ en-US ] = "The table $name$ already exists. It is not visible because it has been filtered out."; }; -String RID_STR_NEED_CONFIG_WRITE_ACCESS -{ - Text [ en-US ] = "You have no write access to the configuration data the object is based on."; -}; - String RID_STR_COULDNOTCONNECT_UNSPECIFIED { Text [ en-US ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective."; @@ -140,11 +130,6 @@ String RID_STR_NO_XQUERIESSUPPLIER Text [ en-US ] = "The interface XQueriesSupplier is not available."; }; -String RID_STR_NOT_SUPPORTED_BY_DRIVER -{ - Text [ en-US ] = "The driver does not support this function."; -}; - String RID_STR_NO_ABS_ZERO { Text [ en-US ] = "An 'absolute(0)' call is not allowed."; @@ -180,11 +165,6 @@ String RID_STR_NO_TABLE_RENAME Text [ en-US ] = "The driver does not support table renaming."; }; -String RID_STR_NO_ALTER_COLUMN_DEF -{ - Text [ en-US ] = "The driver does not support the modification of column descriptions."; -}; - String RID_STR_COLUMN_ALTER_BY_NAME { Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the name."; diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 7169c4782524..e8a40f49bce4 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -138,11 +138,6 @@ String RID_STR_VIEWS_HELP_TEXT_DESIGN Text [ en-US ] = "Create a view by specifying the tables and field names you would like to have visible." ; }; -String RID_STR_VIEWS_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "Opens the view wizard" ; -}; - String STR_DATABASE { Text [ en-US ] = "Database" ; diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc index a5cfcd05b288..9ba7461c4bfb 100644 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ b/dbaccess/source/ui/app/dbu_app.hrc @@ -40,7 +40,6 @@ #define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 #define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 #define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 -#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20 #define STR_DATABASE RID_STR_APP_START + 21 #define STR_TASKS RID_STR_APP_START + 22 #define STR_DESCRIPTION RID_STR_APP_START + 23 diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index c42634c748b7..2171873f2bd8 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -25,11 +25,6 @@ String STR_QUERY_BRW_DELETE_ROWS Text[ en-US ] = "Do you want to delete the selected data?" ; }; -String RID_STR_DATABROWSER_FILTERED -{ - Text [ en-US ] = "(filtered)" ; -}; - String SBA_BROWSER_SETTING_ORDER { Text [ en-US ] = "Error setting the sort criteria"; diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc index 324ba23b800a..a76785bd47a0 100644 --- a/dbaccess/source/ui/inc/dbu_brw.hrc +++ b/dbaccess/source/ui/inc/dbu_brw.hrc @@ -22,7 +22,6 @@ #include "dbu_resource.hrc" // FREE RID_STR_BRW_START + 0 -#define RID_STR_DATABROWSER_FILTERED RID_STR_BRW_START + 1 #define SBA_BROWSER_SETTING_ORDER RID_STR_BRW_START + 2 #define SBA_BROWSER_SETTING_FILTER RID_STR_BRW_START + 3 #define STR_DATASOURCE_GRIDCONTROL_DESC RID_STR_BRW_START + 4 diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc index b14c243a4031..4c87a882916c 100644 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ b/dbaccess/source/ui/inc/dbu_qry.hrc @@ -32,9 +32,7 @@ #define STR_QUERY_UNDO_TABFIELDDELETE RID_STR_QRY_START + 10 #define STR_QUERY_UNDO_TABFIELDCREATE RID_STR_QRY_START + 11 #define STR_QRY_TOOCOMPLEX RID_STR_QRY_START + 12 -#define RID_STR_TABLE_DOESNT_EXIST RID_STR_QRY_START + 13 #define RID_STR_FIELD_DOESNT_EXIST RID_STR_QRY_START + 14 -#define RID_STR_TOMUCHTABLES RID_STR_QRY_START + 15 #define STR_QUERY_INNER_JOIN RID_STR_QRY_START + 16 #define STR_QUERY_LEFTRIGHT_JOIN RID_STR_QRY_START + 17 #define STR_QUERY_FULL_JOIN RID_STR_QRY_START + 18 diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index 560afdf8735d..52e55ad62265 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -119,21 +119,11 @@ String STR_QUERY_UNDO_TABFIELDCREATE Text [ en-US ] = "Add Column" ; }; -String RID_STR_TABLE_DOESNT_EXIST -{ - Text [ en-US ] = "Invalid expression, table '$name$' does not exist."; -}; - String RID_STR_FIELD_DOESNT_EXIST { Text [ en-US ] = "Invalid expression, field name '$name$' does not exist."; }; -String RID_STR_TOMUCHTABLES -{ - Text [ en-US ] = "The query covers #num# tables. The selected database type, however, can only process a maximum of #maxnum# table(s) per statement."; -}; - String STR_QUERY_UNDO_TABWINDELETE { Text [ en-US ] = "Delete Table Window" ; diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc index 67062c53536b..7f75edb38ac0 100644 --- a/desktop/source/deployment/registry/script/dp_script.hrc +++ b/desktop/source/deployment/registry/script/dp_script.hrc @@ -25,7 +25,6 @@ #define RID_STR_BASIC_LIB (RID_DEPLOYMENT_SCRIPT_START+10) #define RID_STR_DIALOG_LIB (RID_DEPLOYMENT_SCRIPT_START+11) -#define RID_STR_LIBNAME_ALREADY_EXISTS (RID_DEPLOYMENT_SCRIPT_START+15) #define RID_STR_CANNOT_DETERMINE_LIBNAME (RID_DEPLOYMENT_SCRIPT_START+16) #endif diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src index 42909b79ad7e..f3162f8f86e3 100644 --- a/desktop/source/deployment/registry/script/dp_script.src +++ b/desktop/source/deployment/registry/script/dp_script.src @@ -34,9 +34,4 @@ String RID_STR_CANNOT_DETERMINE_LIBNAME Text [ en-US ] = "The library name could not be determined."; }; -String RID_STR_LIBNAME_ALREADY_EXISTS -{ - Text [ en-US ] = "This library name already exists. Please choose a different name."; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src index e173867c5cf9..087ee07bb6cd 100644 --- a/editeng/source/items/svxitems.src +++ b/editeng/source/items/svxitems.src @@ -19,15 +19,6 @@ #include - // Value strings ------------------------------------------------------------ -String RID_SVXITEMS_TRUE -{ - Text [ en-US ] = "True" ; -}; -String RID_SVXITEMS_FALSE -{ - Text [ en-US ] = "False" ; -}; // enum SvxBreak ------------------------------------------------------------ String RID_SVXITEMS_BREAK_NONE { @@ -502,35 +493,6 @@ String RID_SVXITEMS_ADJUST_CENTER String RID_SVXITEMS_ADJUST_BLOCKLINE { Text [ en-US ] = "Justify" ; -}; - // enum SvxTabAdjust -------------------------------------------------------- -String RID_SVXITEMS_TAB_DECIMAL_CHAR -{ - Text [ en-US ] = "Decimal Symbol:" ; -}; -String RID_SVXITEMS_TAB_FILL_CHAR -{ - Text [ en-US ] = "Fill character:" ; -}; -String RID_SVXITEMS_TAB_ADJUST_LEFT -{ - Text [ en-US ] = "Left" ; -}; -String RID_SVXITEMS_TAB_ADJUST_RIGHT -{ - Text [ en-US ] = "Right" ; -}; -String RID_SVXITEMS_TAB_ADJUST_DECIMAL -{ - Text [ en-US ] = "Decimal" ; -}; -String RID_SVXITEMS_TAB_ADJUST_CENTER -{ - Text [ en-US ] = "Centered" ; -}; -String RID_SVXITEMS_TAB_ADJUST_DEFAULT -{ - Text [ en-US ] = "Default" ; }; String RID_SOLID { @@ -669,22 +631,6 @@ String RID_SVXITEMS_CONTOUR_FALSE { Text [ en-US ] = "No Outline" ; }; -String RID_SVXITEMS_NOLINEBREAK_TRUE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOLINEBREAK_FALSE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOHYPHEN_TRUE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOHYPHEN_FALSE -{ - Text = "?" ; -}; String RID_SVXITEMS_PRINT_TRUE { Text [ en-US ] = "Print" ; diff --git a/editeng/source/misc/lingu.src b/editeng/source/misc/lingu.src index 01d579cd1d33..f21f75f0dd66 100644 --- a/editeng/source/misc/lingu.src +++ b/editeng/source/misc/lingu.src @@ -27,10 +27,6 @@ String RID_SVXSTR_QUERY_BW_CONTINUE { Text [ en-US ] = "Continue checking at end of document?" ; }; -String RID_SVXSTR_HMERR_THESAURUS -{ - Text [ en-US ] = "No thesaurus is available for the selected language. \nPlease check your installation and install the desired language\n" ; -}; String RID_SVXSTR_DIC_ERR_UNKNOWN { Text [ en-US ] = "Word cannot be added to dictionary\ndue to unknown reason."; diff --git a/editeng/source/outliner/outliner.src b/editeng/source/outliner/outliner.src index e42eec4e64e3..b01b3828c230 100644 --- a/editeng/source/outliner/outliner.src +++ b/editeng/source/outliner/outliner.src @@ -19,10 +19,6 @@ #include -String RID_OUTLUNDO_HEIGHT -{ - Text [ en-US ] = "Move" ; -}; String RID_OUTLUNDO_DEPTH { Text [ en-US ] = "Indent" ; diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc index 20151223b1f2..2cd1f8132b4c 100644 --- a/extensions/source/abpilot/abpresid.hrc +++ b/extensions/source/abpilot/abpresid.hrc @@ -27,7 +27,6 @@ #define RID_PAGE_START RID_ABP_START #define RID_STRING_START RID_ABP_START -#define RID_UNTYPED_START RID_ABP_START #define RID_BITMAP_START RID_ABP_START // strings @@ -51,13 +50,6 @@ #define RID_STRING_END RID_STR_QRY_NOTABLES -// untyped resources - -#define RID_RSC_NOTUSEDYET ( RID_UNTYPED_START + 0 ) -// please adjust RID_UNTYPED_END (below) when adding new untyped resources - -#define RID_UNTYPED_END RID_RSC_NOTUSEDYET - // bitmaps #define BMP_HEADERIMAGE ( RID_BITMAP_START + 0 ) @@ -70,9 +62,6 @@ #if RID_STRING_END > RID_ABP_END #error "please adjust the resource id ranges!!" #endif -#if RID_UNTYPED_END > RID_ABP_END - #error "please adjust the resource id ranges!!" -#endif #if RID_BITMAP_END > RID_ABP_END #error "please adjust the resource id ranges!!" #endif diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index 5c7ea6ed58a5..dbf34695e781 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -37,8 +37,6 @@ // Strings (500) #define RID_BIB_STRING (RID_BIB_START + 200) #define RID_BIB_STR_NONE (RID_BIB_STRING + 1) -#define RID_BIB_STR_FIELDSELECTION (RID_BIB_STRING + 2) -#define RID_BIB_STR_TABWIN_PREFIX (RID_BIB_STRING + 3) #define RID_BIB_STR_FRAME_TITLE (RID_BIB_STRING + 4) #define RID_MAP_QUESTION (RID_BIB_STRING + 5) diff --git a/extensions/source/bibliography/bib.src b/extensions/source/bibliography/bib.src index d234a187bfdc..1a5deb89c8a2 100644 --- a/extensions/source/bibliography/bib.src +++ b/extensions/source/bibliography/bib.src @@ -18,15 +18,6 @@ */ #include "bib.hrc" -String RID_BIB_STR_FIELDSELECTION -{ - Text [ en-US ] = "Field selection:"; -}; - -String RID_BIB_STR_TABWIN_PREFIX -{ - Text [ en-US ] = "Table;Query;Sql;Sql [Native]"; -}; String RID_BIB_STR_FRAME_TITLE { Text [ en-US ] = "Bibliography Database"; diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index 75b6b466ed48..d634b1b3cf50 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -28,7 +28,6 @@ #define RID_DIALOG_START RID_DBP_START #define RID_PAGE_START RID_DBP_START #define RID_STRING_START RID_DBP_START -#define RID_ERRORBOX_START RID_DBP_START // strings @@ -54,13 +53,6 @@ // please adjust RID_DIALOG_END (below) when adding new dialogs #define RID_DIALOG_END ( RID_DIALOG_START + 3 ) -// ErrorBox - -#define RID_ERR_INVALID_FORM_CONNECTION ( RID_ERRORBOX_START + 1 ) - -// please adjust RID_ERRORBOX_END (below) when adding new error boxes -#define RID_ERRORBOX_END RID_ERR_INVALID_FORM_CONNECTION - // range checks #if RID_STRING_END > RID_DBP_END @@ -69,9 +61,6 @@ #if RID_DIALOG_END > RID_DBP_END #error "please adjust the resource id ranges!!" #endif -#if RID_ERRORBOX_END > RID_DBP_END - #error "please adjust the resource id ranges!!" -#endif // local ids diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc index d1e1b7414889..e3a4eb04af90 100644 --- a/forms/source/inc/frm_resource.hrc +++ b/forms/source/inc/frm_resource.hrc @@ -57,7 +57,6 @@ #define RID_STR_XFORMS_VALUE_MAX_EXCL ( RID_FRM_STRINGS_START + 28 ) #define RID_STR_XFORMS_VALUE_MIN_INCL ( RID_FRM_STRINGS_START + 29 ) #define RID_STR_XFORMS_VALUE_MIN_EXCL ( RID_FRM_STRINGS_START + 30 ) -#define RID_STR_XFORMS_VALUE_PATTERN ( RID_FRM_STRINGS_START + 31 ) #define RID_STR_XFORMS_VALUE_TOTAL_DIGITS ( RID_FRM_STRINGS_START + 32 ) #define RID_STR_XFORMS_VALUE_FRACTION_DIGITS ( RID_FRM_STRINGS_START + 33 ) #define RID_STR_XFORMS_VALUE_LENGTH ( RID_FRM_STRINGS_START + 34 ) @@ -73,9 +72,7 @@ #define RID_STR_DATATYPE_DATE ( RID_FRM_STRINGS_START + 43 ) #define RID_STR_DATATYPE_TIME ( RID_FRM_STRINGS_START + 44 ) #define RID_STR_DATATYPE_DATETIME ( RID_FRM_STRINGS_START + 45 ) -#define RID_STR_DATATYPE_YEARMONTH ( RID_FRM_STRINGS_START + 46 ) #define RID_STR_DATATYPE_YEAR ( RID_FRM_STRINGS_START + 47 ) -#define RID_STR_DATATYPE_MONTHDAY ( RID_FRM_STRINGS_START + 48 ) #define RID_STR_DATATYPE_MONTH ( RID_FRM_STRINGS_START + 49 ) #define RID_STR_DATATYPE_DAY ( RID_FRM_STRINGS_START + 50 ) diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src index e4df19abfda5..f9debd60201f 100644 --- a/forms/source/resource/xforms.src +++ b/forms/source/resource/xforms.src @@ -69,11 +69,6 @@ String RID_STR_XFORMS_VALUE_MIN_EXCL Text [ en-US ] = "The value must be greater than $2."; }; -String RID_STR_XFORMS_VALUE_PATTERN -{ - Text [ en-US ] = "The value does not match the pattern '$2'."; -}; - String RID_STR_XFORMS_VALUE_TOTAL_DIGITS { Text [ en-US ] = "$2 digits allowed at most."; @@ -144,21 +139,11 @@ String RID_STR_DATATYPE_DATETIME Text [ en-US ] = "Date and Time"; }; -String RID_STR_DATATYPE_YEARMONTH -{ - Text [ en-US ] = "Month and year"; -}; - String RID_STR_DATATYPE_YEAR { Text [ en-US ] = "Year"; }; -String RID_STR_DATATYPE_MONTHDAY -{ - Text [ en-US ] = "Month and day"; -}; - String RID_STR_DATATYPE_MONTH { Text [ en-US ] = "Month"; diff --git a/fpicker/source/office/OfficeFilePicker.hrc b/fpicker/source/office/OfficeFilePicker.hrc index 68356b199708..4a6e5e358d24 100644 --- a/fpicker/source/office/OfficeFilePicker.hrc +++ b/fpicker/source/office/OfficeFilePicker.hrc @@ -13,7 +13,6 @@ #define DLG_FPICKER_PLACE_EDIT (RID_FPICKER_START+16) -#define RID_FILEPICKER_IMAGES (RID_FPICKER_START+17) #define STR_SVT_NEW_FOLDER (RID_FPICKER_START+19) #define RID_FILEOPEN_NOTEXISTENTFILE (RID_FPICKER_START+24) #define STR_SVT_NOREMOVABLEDEVICE (RID_FPICKER_START+25) diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc index 5a1defad9816..d7ed26fa4c91 100644 --- a/include/editeng/editrids.hrc +++ b/include/editeng/editrids.hrc @@ -30,7 +30,6 @@ #define RID_OUTLUNDO_ATTR (RID_EDIT_START + 4) #define RID_OUTLUNDO_INSERT (RID_EDIT_START + 5) #define RID_OUTLUNDO_DEPTH (RID_EDIT_START + 6) -#define RID_OUTLUNDO_HEIGHT (RID_EDIT_START + 7) // strings for items @@ -42,8 +41,6 @@ #define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_EDIT_START + 13) // RID_SVXITEMS_FRMDIR_END (RID_EDIT_START + 14) -#define RID_SVXITEMS_TRUE (RID_EDIT_START + 15) -#define RID_SVXITEMS_FALSE (RID_EDIT_START + 16) #define RID_SVXITEMS_BORDER_COMPLETE (RID_EDIT_START + 17) #define RID_SVXITEMS_BORDER_TOP (RID_EDIT_START + 18) #define RID_SVXITEMS_BORDER_BOTTOM (RID_EDIT_START + 19) @@ -72,10 +69,6 @@ #define RID_SVXITEMS_WORDLINE_FALSE (RID_EDIT_START + 39) #define RID_SVXITEMS_CONTOUR_TRUE (RID_EDIT_START + 40) #define RID_SVXITEMS_CONTOUR_FALSE (RID_EDIT_START + 41) -#define RID_SVXITEMS_NOLINEBREAK_TRUE (RID_EDIT_START + 42) -#define RID_SVXITEMS_NOLINEBREAK_FALSE (RID_EDIT_START + 43) -#define RID_SVXITEMS_NOHYPHEN_TRUE (RID_EDIT_START + 44) -#define RID_SVXITEMS_NOHYPHEN_FALSE (RID_EDIT_START + 45) #define RID_SVXITEMS_FMTKEEP_TRUE (RID_EDIT_START + 46) #define RID_SVXITEMS_FMTKEEP_FALSE (RID_EDIT_START + 47) #define RID_SVXITEMS_FMTSPLIT_TRUE (RID_EDIT_START + 48) @@ -120,9 +113,6 @@ #define RID_SVXITEMS_RELIEF_ENGRAVED (RID_EDIT_START + 87) // RID_SVXITEMS_RELIEF_END (RID_EDIT_START + 88) -// HM_ERR -#define RID_SVXSTR_HMERR_THESAURUS (RID_EDIT_START + 89) - // enum FontEmphasisMark --------------------------------------------------- #define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE (RID_EDIT_START + 90) #define RID_SVXITEMS_EMPHASIS_NONE_STYLE (RID_EDIT_START + 90) @@ -239,16 +229,6 @@ #define RID_SVXITEMS_ADJUST_CENTER (RID_EDIT_START + 212) #define RID_SVXITEMS_ADJUST_BLOCKLINE (RID_EDIT_START + 213) -#define RID_SVXITEMS_TAB_DECIMAL_CHAR (RID_EDIT_START + 214) -#define RID_SVXITEMS_TAB_FILL_CHAR (RID_EDIT_START + 215) - -#define RID_SVXITEMS_TAB_ADJUST_BEGIN (RID_EDIT_START + 217) -#define RID_SVXITEMS_TAB_ADJUST_LEFT (RID_EDIT_START + 217) -#define RID_SVXITEMS_TAB_ADJUST_RIGHT (RID_EDIT_START + 218) -#define RID_SVXITEMS_TAB_ADJUST_DECIMAL (RID_EDIT_START + 219) -#define RID_SVXITEMS_TAB_ADJUST_CENTER (RID_EDIT_START + 220) -#define RID_SVXITEMS_TAB_ADJUST_DEFAULT (RID_EDIT_START + 221) - // enum SvxBreak ------------------------------------------------------------ #define RID_SVXITEMS_BREAK_BEGIN (RID_EDIT_START + 222) #define RID_SVXITEMS_BREAK_NONE (RID_EDIT_START + 222) diff --git a/include/sfx2/dialogs.hrc b/include/sfx2/dialogs.hrc index d1e4f70e0de9..893feb9f221a 100644 --- a/include/sfx2/dialogs.hrc +++ b/include/sfx2/dialogs.hrc @@ -21,9 +21,6 @@ #include -#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101) -#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 2cd1da9c40c4..abb0606ffd19 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -179,14 +179,11 @@ #define RID_SFXPAGE_SAVE (RID_OPTIONS_START + 0) #define RID_SFXPAGE_GENERAL (RID_OPTIONS_START + 1) -#define RID_SFXDLG_EDITDICT (RID_OPTIONS_START + 4) #define RID_SFXPAGE_PATH (RID_OPTIONS_START + 6) #define RID_SFXPAGE_LINGU (RID_OPTIONS_START + 7) #define RID_SFXPAGE_PRINTOPTIONS (RID_OPTIONS_START + 12) -#define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) - // Member-Ids ------------------------------------------------------------ #define MID_DOCINFO_DESCRIPTION 0x13 diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 33224aee663e..3ae2db064bea 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -46,7 +46,6 @@ #define RID_SVXSTR_PATTERN_UNTITLED (RID_SVX_START + 169) #define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173) #define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311) -#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250) #define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_SVX_START + 251) #define RID_SVXSTR_GALLERY_THEMEITEMS (RID_SVX_START + 252) @@ -85,16 +84,8 @@ #define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216) #define RID_SVXPAGE_PICK_NUM (RID_SVX_START + 217) #define RID_SVXPAGE_PICK_BMP (RID_SVX_START + 218) -#define RID_SVXPAGE_HATCH (RID_SVX_START + 57) -#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58) -#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59) -#define RID_SVXPAGE_PATTERN (RID_SVX_START + 60) #define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296) -// why extra defines for pages that already exist? -#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998) -#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999) - // ID of tabpages implemented in SVX, but used in CUI #define RID_SVXPAGE_GRID (RID_SVX_START + 152) @@ -144,7 +135,6 @@ #define RID_SVXBMP_LAMP_ON (RID_SVX_START + 210) #define RID_SVXBMP_LAMP_OFF (RID_SVX_START + 211) -#define RID_SVXBMP_COLORDLG (RID_SVX_START + 214) #define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73) #define RID_SVXFLOAT3D_FIX_R (RID_SVX_START + 77) @@ -162,8 +152,6 @@ #define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 67) #define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 68) -#define RID_SVXBMP_GROUP_CLOSED (RID_SVX_START + 69) -#define RID_SVXBMP_GROUP_OPEN (RID_SVX_START + 70) #define RID_SVXBMP_ELEMENT (RID_SVX_START + 71) #define RID_SVXBMP_ATTRIBUTE (RID_SVX_START + 72) #define RID_SVXBMP_TEXT (RID_SVX_START + 73) @@ -261,7 +249,6 @@ // ResIds for the PageDialog // Strings of the ToolBox-Controls from tbcontrl.cxx -#define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191) #define RID_SVXSTR_FRAME (RID_SVX_START + 192) #define RID_SVXSTR_FRAME_STYLE (RID_SVX_START + 195) #define RID_SVXSTR_CLEARFORM (RID_SVX_START + 197) @@ -298,9 +285,6 @@ #define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 247) #define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 248) -// Close (in TabDialog line/aria) -#define RID_SVXSTR_CLOSE (RID_SVX_START + 260) - // Color strings #define RID_SVXSTR_COLOR_BLACK (RID_SVX_START + 275) #define RID_SVXSTR_COLOR_BLUE (RID_SVX_START + 276) @@ -327,9 +311,6 @@ #define RID_SVXSTR_CENTERED (RID_SVX_START + 306) #define RID_SVXSTR_NOTCENTERED (RID_SVX_START + 307) -#define RID_SVXSTR_VIEW (RID_SVX_START + 308) -#define RID_SVXSTR_FILTER (RID_SVX_START + 309) - // String-Arrays #define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312) @@ -371,16 +352,10 @@ // Defines for the 3D engine #define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489) -#define RID_SVX_3D_CREATE_LATHE (RID_SVX_START + 490) -#define RID_SVX_3D_UNDO_SEGMENTS (RID_SVX_START + 491) -#define RID_SVX_3D_UNDO_DEEPTH (RID_SVX_START + 492) -#define RID_SVX_3D_UNDO_FOCAL (RID_SVX_START + 493) -#define RID_SVX_3D_UNDO_CAMPOS (RID_SVX_START + 494) #define RID_SVX_3D_UNDO_ROTATE (RID_SVX_START + 495) #define RID_SVX_3D_UNDO_EXTRUDE (RID_SVX_START + 496) #define RID_SVX_3D_UNDO_LATHE (RID_SVX_START + 497) #define RID_SVX_3D_UNDO_BREAK_LATHE (RID_SVX_START + 498) -#define RID_SVX_3D_UNDO_ATTRIBUTES (RID_SVX_START + 499) // ResIds for graphics drawmode #define RID_SVXSTR_GRAFMODE_STANDARD (RID_SVX_START + 520) @@ -472,7 +447,6 @@ #define RID_SVXSTR_COLOR_DARKVIOLET_DEF (RID_SVX_START + 617) #define RID_SVXSTR_COLOR_SALMON_DEF (RID_SVX_START + 618) #define RID_SVXSTR_COLOR_SEABLUE_DEF (RID_SVX_START + 619) -#define RID_SVXSTR_COLOR_SUN_DEF (RID_SVX_START + 620) #define RID_SVXSTR_COLOR_CHART (RID_SVX_START + 621) #define RID_SVXSTR_COLOR_CHART_DEF (RID_SVX_START + 622) #define RID_SVXSTR_COLOR_PURPLE (RID_SVX_START + 623) @@ -964,38 +938,6 @@ #define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION (RID_SVX_START + 1194) #define RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION (RID_SVX_START + 1195) -#define RID_SVXSTR_GRAPHICS_DESCRIPTIONS (RID_SVX_START + 1200) -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_0 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 0) // 1200 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_1 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 1) // 1201 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_2 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 2) // 1202 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_3 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 3) // 1203 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_4 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 4) // 1204 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_5 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 5) // 1205 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_6 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 6) // 1206 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_7 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 7) // 1207 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_8 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 8) // 1208 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_9 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 9) // 1209 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_10 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 10) // 1210 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_11 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 11) // 1211 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_12 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 12) // 1212 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_13 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 13) // 1213 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_14 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 14) // 1214 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_15 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 15) // 1215 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_16 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 16) // 1216 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_17 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 17) // 1217 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_18 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 18) // 1218 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_19 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 19) // 1219 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_20 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 20) // 1220 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_21 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 21) // 1221 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_22 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 22) // 1222 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_23 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 23) // 1223 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_24 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 24) // 1224 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_25 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 25) // 1225 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_26 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 26) // 1226 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_27 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 27) // 1227 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_28 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 28) // 1228 -#define RID_SVXSTR_GRAPHICS_DESCRIPTION_29 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 29) // 1229 - // ooo-build specific resources #define SVX_OOO_BUILD_START (RID_SVX_START + 1230) @@ -1125,13 +1067,8 @@ // "ModalDialog" resource ids -// !!!! double defined ID's (see below) !!! -#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101) - // TabPages -------------------------------------------------------------- -// !!!! double defined ID's (see above) !!! - #define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215) #define STR_COLORTABLE (RID_OFA_START + 257) #define STR_SWITCH (RID_OFA_START + 258) diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc index cee1a7b48de1..320920e29e87 100644 --- a/include/svx/fmresids.hrc +++ b/include/svx/fmresids.hrc @@ -89,7 +89,6 @@ #define RID_STR_UNDO_CONTAINER_REMOVE (RID_FORMS_START + 16) #define RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE (RID_FORMS_START + 27) #define RID_STR_UNDO_CONTAINER_REPLACE (RID_FORMS_START + 28) -#define RID_STR_UNDO_DELETE_LOGICAL (RID_FORMS_START + 30) #define RID_STR_UNDO_MODEL_REPLACE (RID_FORMS_START + 31) #define RID_STR_NAVIGATIONBAR (RID_FORMS_START + 32) #define RID_STR_FORM (RID_FORMS_START + 36) @@ -102,11 +101,7 @@ #define RID_STR_WRITEERROR (RID_FORMS_START + 43) #define RID_STR_DELETECONFIRM_RECORD (RID_FORMS_START + 44) #define RID_STR_DELETECONFIRM (RID_FORMS_START + 45) -#define RID_STR_GROUPBOX (RID_FORMS_START + 46) -#define RID_STR_NAVIGATION (RID_FORMS_START + 47) #define RID_STR_COLUMN (RID_FORMS_START + 48) -#define RID_STR_DATE (RID_FORMS_START + 49) -#define RID_STR_TIME (RID_FORMS_START + 50) #define RID_STR_PROPTITLE_NAVBAR (RID_FORMS_START + 51) #define RID_STR_PROPTITLE_PUSHBUTTON (RID_FORMS_START + 52) #define RID_STR_PROPTITLE_RADIOBUTTON (RID_FORMS_START + 53) @@ -163,8 +158,6 @@ #define RID_STR_REPLACE_INST (RID_FORMS_START + 122) #define RID_STR_REPLACE_DOC (RID_FORMS_START + 123) #define RID_STR_DATANAVIGATOR (RID_FORMS_START + 124) -#define RID_STR_DATANAV_SUBM_PARENT (RID_FORMS_START + 125) -#define RID_STR_DATANAV_SUBM_ID (RID_FORMS_START + 126) #define RID_STR_DATANAV_SUBM_ACTION (RID_FORMS_START + 127) #define RID_STR_DATANAV_SUBM_METHOD (RID_FORMS_START + 128) #define RID_STR_DATANAV_SUBM_REF (RID_FORMS_START + 129) @@ -191,10 +184,7 @@ // Error-String-Id's ----------------------------------------------------------- #define RID_ERR_START (RID_FORMS_START + 600) -#define RID_ERR_CONTEXT_ADDFORM (RID_ERR_START + 0) -#define RID_ERR_DUPLICATE_NAME (RID_ERR_START + 1) #define RID_ERR_FIELDREQUIRED (RID_ERR_START + 2) -#define RID_ERR_NO_ELEMENT (RID_ERR_START + 4) // untyped resources ---------------------------------------------------------- diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc index 62e718b5d396..0ee3a67e476e 100644 --- a/include/svx/svxitems.hrc +++ b/include/svx/svxitems.hrc @@ -22,55 +22,12 @@ #include -// SvxSearchItem ------------------------------------------------------------ -// Kommando -#define RID_SVXITEMS_SEARCHCMD_FIND (RID_SVXITEMS_START + 10) -#define RID_SVXITEMS_SEARCHCMD_FIND_ALL (RID_SVXITEMS_START + 11) -#define RID_SVXITEMS_SEARCHCMD_REPLACE (RID_SVXITEMS_START + 12) -#define RID_SVXITEMS_SEARCHCMD_REPLACE_ALL (RID_SVXITEMS_START + 13) -// Vorlagen -#define RID_SVXITEMS_SEARCHSTYL_CHAR (RID_SVXITEMS_START + 14) -#define RID_SVXITEMS_SEARCHSTYL_PARA (RID_SVXITEMS_START + 15) -#define RID_SVXITEMS_SEARCHSTYL_FRAME (RID_SVXITEMS_START + 16) -#define RID_SVXITEMS_SEARCHSTYL_PAGE (RID_SVXITEMS_START + 17) -// Zellen-Typ -#define RID_SVXITEMS_SEARCHIN_FORMULA (RID_SVXITEMS_START + 20) -#define RID_SVXITEMS_SEARCHIN_VALUE (RID_SVXITEMS_START + 21) -#define RID_SVXITEMS_SEARCHIN_NOTE (RID_SVXITEMS_START + 22) -// Applikation -#define RID_SVXITEMS_SEARCHAPP_WRITER (RID_SVXITEMS_START + 25) -#define RID_SVXITEMS_SEARCHAPP_CALC (RID_SVXITEMS_START + 26) -#define RID_SVXITEMS_SEARCHAPP_DRAW (RID_SVXITEMS_START + 27) -#define RID_SVXITEMS_SEARCHAPP_BASE (RID_SVXITEMS_START + 28) - -// enum BrushStyle ---------------------------------------------------------- -#define RID_SVXITEMS_BRUSHSTYLE_NULL (RID_SVXITEMS_START + 45) -#define RID_SVXITEMS_BRUSHSTYLE_SOLID (RID_SVXITEMS_START + 46) -#define RID_SVXITEMS_BRUSHSTYLE_HORZ (RID_SVXITEMS_START + 47) -#define RID_SVXITEMS_BRUSHSTYLE_VERT (RID_SVXITEMS_START + 48) -#define RID_SVXITEMS_BRUSHSTYLE_CROSS (RID_SVXITEMS_START + 49) -#define RID_SVXITEMS_BRUSHSTYLE_DIAGCROSS (RID_SVXITEMS_START + 50) -#define RID_SVXITEMS_BRUSHSTYLE_UPDIAG (RID_SVXITEMS_START + 51) -#define RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG (RID_SVXITEMS_START + 52) -#define RID_SVXITEMS_BRUSHSTYLE_25 (RID_SVXITEMS_START + 53) -#define RID_SVXITEMS_BRUSHSTYLE_50 (RID_SVXITEMS_START + 54) -#define RID_SVXITEMS_BRUSHSTYLE_75 (RID_SVXITEMS_START + 55) -#define RID_SVXITEMS_BRUSHSTYLE_BITMAP (RID_SVXITEMS_START + 56) - // enum SvxCellOrientation #define RID_SVXITEMS_ORI_STANDARD (RID_SVXITEMS_START + 410) #define RID_SVXITEMS_ORI_TOPBOTTOM (RID_SVXITEMS_START + 411) #define RID_SVXITEMS_ORI_BOTTOMTOP (RID_SVXITEMS_START + 412) #define RID_SVXITEMS_ORI_STACKED (RID_SVXITEMS_START + 413) -// Id's fuer BoolItems -#define RID_SVXITEMS_BOXINF_TABLE_TRUE (RID_SVXITEMS_START + 443) -#define RID_SVXITEMS_BOXINF_TABLE_FALSE (RID_SVXITEMS_START + 444) -#define RID_SVXITEMS_BOXINF_DIST_TRUE (RID_SVXITEMS_START + 445) -#define RID_SVXITEMS_BOXINF_DIST_FALSE (RID_SVXITEMS_START + 446) -#define RID_SVXITEMS_BOXINF_MDIST_TRUE (RID_SVXITEMS_START + 447) -#define RID_SVXITEMS_BOXINF_MDIST_FALSE (RID_SVXITEMS_START + 448) - // Complete-Texte ----------------------------------------------------------- #define RID_SVXITEMS_MARGIN_LEFT (RID_SVXITEMS_START + 480) @@ -94,8 +51,6 @@ #define RID_SVXITEMS_AUTHOR_COMPLETE (RID_SVXITEMS_START + 521) #define RID_SVXITEMS_DATE_COMPLETE (RID_SVXITEMS_START + 522) #define RID_SVXITEMS_TEXT_COMPLETE (RID_SVXITEMS_START + 523) -#define RID_SVXITEMS_BACKGROUND_COLOR (RID_SVXITEMS_START + 524) -#define RID_SVXITEMS_PATTERN_COLOR (RID_SVXITEMS_START + 525) #define RID_SVXITEMS_BRUSH_CHAR (RID_SVXITEMS_START + 527) #define RID_ATTR_NAMES (RID_SVXITEMS_START + 528) diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 9ea0cf255b3b..154e0c36a506 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -52,8 +52,6 @@ // undo strings #define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER ( RID_STRING_START + 11 ) #define RID_STR_UNDO_ADD_REPORTHEADERFOOTER ( RID_STRING_START + 12 ) -#define RID_STR_UNDO_REMOVE_PAGEHEADERFOOTER ( RID_STRING_START + 13 ) -#define RID_STR_UNDO_ADD_PAGEHEADERFOOTER ( RID_STRING_START + 14 ) #define RID_STR_UNDO_PROPERTY ( RID_STRING_START + 15 ) #define RID_STR_UNDO_REMOVE_GROUP ( RID_STRING_START + 16 ) #define RID_STR_UNDO_APPEND_GROUP ( RID_STRING_START + 17 ) @@ -64,15 +62,9 @@ #define RID_STR_UNDO_CHANGE_SIZE ( RID_STRING_START + 22 ) #define RID_STR_UNDO_INSERT_CONTROL ( RID_STRING_START + 23 ) #define RID_STR_UNDO_DELETE_CONTROL ( RID_STRING_START + 24 ) -#define RID_STR_UNDO_GROUP ( RID_STRING_START + 25 ) -#define RID_STR_UNDO_UNGROUP ( RID_STRING_START + 26 ) #define RID_STR_UNDO_CHANGEPOSITION ( RID_STRING_START + 27 ) #define RID_STR_UNDO_ADDFUNCTION ( RID_STRING_START + 28 ) -#define RID_STR_UNDO_DELETEFUNCTION ( RID_STRING_START + 29 ) -// title of tab pages -#define RID_STR_DESIGN_VIEW ( RID_STRING_START + 30 ) -#define RID_STR_PREVIEW_VIEW ( RID_STRING_START + 31 ) // other #define STR_RPT_TITLE ( RID_STRING_START + 32 ) #define STR_RPT_LABEL ( RID_STRING_START + 33 ) @@ -140,11 +132,9 @@ #define RID_STR_BACKCOLOR (RID_STRING_START + 93) #define RID_STR_PRINTREPEATEDVALUES (RID_STRING_START + 94) #define RID_STR_CONDITIONALPRINTEXPRESSION (RID_STRING_START + 95) -#define RID_STR_COLUMNHEADERFOOTER_INSERT (RID_STRING_START + 96) #define RID_STR_STARTNEWCOLUMN (RID_STRING_START + 97) #define RID_STR_STARTNEWPAGE (RID_STRING_START + 98) #define RID_STR_RESETPAGENUMBER (RID_STRING_START + 99) -#define RID_STR_COLUMNHEADERFOOTER_DELETE (RID_STRING_START + 100) #define RID_STR_PRINTWHENGROUPCHANGE (RID_STRING_START + 102) #define RID_STR_REPORTHEADERFOOTER_INSERT (RID_STRING_START + 103) #define RID_STR_REPORTHEADERFOOTER_DELETE (RID_STRING_START + 104) @@ -159,8 +149,6 @@ #define RID_STR_REPORT_HEADER (RID_STRING_START + 112) #define RID_STR_REPORT_FOOTER (RID_STRING_START + 113) #define RID_STR_SCOPE_GROUP (RID_STRING_START + 114) -#define RID_APP_TITLE (RID_STRING_START + 115) -#define RID_APP_NEW_DOC (RID_STRING_START + 116) #define RID_STR_UNDO_ALIGNMENT (RID_STRING_START + 117) #define RID_STR_HEADER (RID_STRING_START + 118) #define RID_STR_FOOTER (RID_STRING_START + 119) @@ -230,7 +218,6 @@ #define RID_SVXBMP_ICON_DETAIL (RID_BITMAP_START + 16) #define RID_BMP_TREENODE_COLLAPSED (RID_BITMAP_START + 17) #define RID_BMP_TREENODE_EXPANDED (RID_BITMAP_START + 18) -#define RID_BMP_REPORT_TREE_ICON (RID_BITMAP_START + 19) // untyped --------------------------------------------------------------------- #define RID_STR_BOOL (RID_UNTYPED_START + 0 ) diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc index ead77509b5dd..9b4e58889fe5 100644 --- a/reportdesign/source/core/inc/core_resource.hrc +++ b/reportdesign/source/core/inc/core_resource.hrc @@ -30,12 +30,11 @@ #define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) #define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) #define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_PROPERTY_CHANGE_NOT_ALLOWED ( RID_CORE_STRINGS_START + 5 ) #define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) #define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) #define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) #define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) +#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) #define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) #define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) #define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src index 8ac0dd712e85..027f30415769 100644 --- a/reportdesign/source/core/resource/strings.src +++ b/reportdesign/source/core/resource/strings.src @@ -54,11 +54,6 @@ String RID_STR_REPORT_FOOTER Text [ en-US ] = "Report Footer"; }; -String RID_STR_PROPERTY_CHANGE_NOT_ALLOWED -{ - Text [ en-US ] = "The name '#1' already exists and cannot be assigned again."; -}; - String RID_STR_ERROR_WRONG_ARGUMENT { Text [ en-US ] = "You tried to set an illegal argument. Please have a look at '#1' for valid arguments."; diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index 84250e7d551f..5303dcf68167 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -134,16 +134,6 @@ String RID_STR_UNDO_ADD_REPORTHEADERFOOTER Text [ en-US ] = "Add report header / report footer"; }; -String RID_STR_UNDO_REMOVE_PAGEHEADERFOOTER -{ - Text [ en-US ] = "Remove page header / page footer"; -}; - -String RID_STR_UNDO_ADD_PAGEHEADERFOOTER -{ - Text [ en-US ] = "Add page header / page footer"; -}; - String RID_STR_UNDO_PROPERTY { Text [ en-US ] = "Change property '#'"; @@ -174,21 +164,6 @@ String RID_STR_UNDO_ADDFUNCTION Text [ en-US ] = "Add function"; }; -String RID_STR_UNDO_DELETEFUNCTION -{ - Text [ en-US ] = "Delete function"; -}; - -String RID_STR_DESIGN_VIEW -{ - Text [ en-US ] = "Design"; -}; - -String RID_STR_PREVIEW_VIEW -{ - Text [ en-US ] = "Preview"; -}; - String STR_RPT_TITLE { Text [ en-US ] = "Report #" ; @@ -238,16 +213,6 @@ String RID_STR_UNDO_DELETE_CONTROL Text [ en-US ] = "Delete Control" ; }; -String RID_STR_UNDO_GROUP -{ - Text [ en-US ] = "Insert Group" ; -}; - -String RID_STR_UNDO_UNGROUP -{ - Text [ en-US ] = "Delete Group" ; -}; - String RID_STR_GROUPHEADER { Text [ en-US ] = "GroupHeader"; @@ -269,15 +234,6 @@ String RID_STR_FILTER Text [ en-US ] = "Filter" ; }; -String RID_APP_TITLE -{ - Text [ en-US ] = " - %PRODUCTNAME Base Report" ; -}; - -String RID_APP_NEW_DOC -{ - Text [ en-US ] = "Untitled" ; -}; String RID_STR_UNDO_ALIGNMENT { Text [ en-US ] = "Change Alignment" ; @@ -305,11 +261,6 @@ String RID_STR_FUNCTION Text [ en-US ] = "Function" ; }; -Bitmap RID_BMP_REPORT_TREE_ICON -{ - File = "report_16"; -}; - String RID_STR_COULD_NOT_CREATE_REPORT { Text [ en-US ] = "An error occurred while creating the report." ; @@ -334,14 +285,6 @@ String RID_STR_PAGEHEADERFOOTER_DELETE { Text [ en-US ] = "Delete Page Header/Footer"; }; -String RID_STR_COLUMNHEADERFOOTER_INSERT -{ - Text [ en-US ] = "Insert Column Header/Footer"; -}; -String RID_STR_COLUMNHEADERFOOTER_DELETE -{ - Text [ en-US ] = "Delete Column Header/Footer"; -}; String RID_STR_REPORTHEADERFOOTER_INSERT { Text [ en-US ] = "Insert Report Header/Footer"; diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 65ce61874dfb..c93bbfd81156 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -684,13 +684,10 @@ #define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1) #define RID_TEXT_TOOLBOX (SC_RESOURCE_START+5) #define RID_OBJECTBAR_PREVIEW (SC_RESOURCE_START+6) -#define RID_DRAW_WIN (SC_RESOURCE_START+13) -#define RID_CNTRLR_WIN (SC_RESOURCE_START+14) #define SID_DATA_FORM (SC_RESOURCE_START+15) // menu (in Data menu) #define SID_INSERT_CURRENT_DATE (SC_RESOURCE_START+16) #define SID_INSERT_CURRENT_TIME (SC_RESOURCE_START+17) #define FID_TAB_TOGGLE_GRID (SC_RESOURCE_START+18) // toggle sheet grid -#define RID_ALIGNMENT_WIN (SC_RESOURCE_START+19) #define WID_SIMPLE_REF (SC_RESOURCE_START+20) #define RID_ERRHDLSC (SC_RESOURCE_START+23) #define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35) diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc index af981aef10be..f34b4456a27b 100644 --- a/sc/inc/scres.hrc +++ b/sc/inc/scres.hrc @@ -496,11 +496,6 @@ #define SC_DIALOGS_START (BMP_END) -#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12) - -#define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18) - -#define RID_SCPAGE_AREAS (SC_DIALOGS_START + 44) #define RID_SCDLG_STYLES_PAR (SC_DIALOGS_START + 46) #define RID_SCDLG_STYLES_PAGE (SC_DIALOGS_START + 48) @@ -524,8 +519,6 @@ #define RID_DROPMODE_LINK (SC_DIALOGS_START + 94) #define RID_DROPMODE_COPY (SC_DIALOGS_START + 95) -// derivations from RID_SCDLG_SELENTRY - #define RID_POPUP_NAVIPI_SCENARIO (SC_DIALOGS_START + 120) #define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121) #define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122) diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc index cda16f9d8568..32a8ec2a1d98 100644 --- a/sc/source/ui/inc/filter.hrc +++ b/sc/source/ui/inc/filter.hrc @@ -20,9 +20,5 @@ // Special filter #define STR_COPY_AREA_TO 5054 -#define RID_FILTER_OPERATOR 5055 -#define RID_FILTER_FIELDNAME 5056 -#define RID_FILTER_CONDITION 5057 -#define RID_FILTER_VALUE 5058 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src index aee5f7d5a5d2..5fcfa7b1dbf7 100644 --- a/sc/source/ui/src/filter.src +++ b/sc/source/ui/src/filter.src @@ -22,21 +22,5 @@ String STR_COPY_AREA_TO { Text [ en-US ] = "Copy results to" ; }; -String RID_FILTER_OPERATOR -{ - Text [ en-US ] = "Operator" ; -}; -String RID_FILTER_FIELDNAME -{ - Text [ en-US ] = "Field Name" ; -}; -String RID_FILTER_CONDITION -{ - Text [ en-US ] = "Condition" ; -}; -String RID_FILTER_VALUE -{ - Text [ en-US ] = "Value" ; -}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc index 760706fc92ea..90f2f70d36c5 100644 --- a/sfx2/inc/app.hrc +++ b/sfx2/inc/app.hrc @@ -33,7 +33,6 @@ #define RID_STR_HLPFILENOTEXIST (RID_SFX_APP_START+68) #define RID_STR_HELP (RID_SFX_APP_START+79) -#define RID_STR_NOAUTOSTARTHELPAGENT (RID_SFX_APP_START+80) #define CONFIG_PATH_START (RID_SFX_APP_START+98) @@ -116,11 +115,9 @@ #define RID_SVXSTR_GRFILTER_FORMATERROR (RID_SFX_APP_START + 200) #define RID_SVXSTR_GRFILTER_VERSIONERROR (RID_SFX_APP_START + 201) #define RID_SVXSTR_GRFILTER_FILTERERROR (RID_SFX_APP_START + 202) -#define RID_SVXSTR_GRFILTER_TOOBIG (RID_SFX_APP_START + 203) #define RID_SVXSTR_END_REDLINING_WARNING (RID_SFX_APP_START + 212) #define RID_SVXSTR_INCORRECT_PASSWORD (RID_SFX_APP_START + 213) -#define RID_SVXSTR_FORWARD_ERRMSSG (RID_SFX_APP_START + 214) #endif // #ifndef _SFX_APP_HRC diff --git a/sfx2/inc/doc.hrc b/sfx2/inc/doc.hrc index d89e7b50457b..f5e0ac1b479f 100644 --- a/sfx2/inc/doc.hrc +++ b/sfx2/inc/doc.hrc @@ -46,7 +46,6 @@ #define STR_DOCTYPENAME_SI (RID_SFX_DOC_START+ 73) #define STR_DOCTYPENAME_SD (RID_SFX_DOC_START+ 74) #define STR_DOCTYPENAME_MESSAGE (RID_SFX_DOC_START+ 75) -#define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) #define TEMPLATE_LONG_NAMES_ARY (RID_SFX_DOC_START+ 81) #define TEMPLATE_SHORT_NAMES_ARY (RID_SFX_DOC_START+ 82) diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 21c5f9175f2e..7d7f6d81c88b 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -213,11 +213,6 @@ String RID_STR_HELP Text [ en-US ] = "Help" ; }; -String RID_STR_NOAUTOSTARTHELPAGENT -{ - Text [ en-US ] = "No automatic start at 'XX'" ; -}; - String RID_STR_HLPFILENOTEXIST { Text [ en-US ] = "The help file for this topic is not installed." ; @@ -366,10 +361,6 @@ String RID_SVXSTR_GRFILTER_FILTERERROR { Text [ en-US ] = "Image filter not found" ; }; -String RID_SVXSTR_GRFILTER_TOOBIG -{ - Text [ en-US ] = "Not enough memory to insert image" ; -}; String RID_SVXSTR_END_REDLINING_WARNING { Text [ en-US ] = "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n" ; @@ -378,9 +369,5 @@ String RID_SVXSTR_INCORRECT_PASSWORD { Text [ en-US ] = "Incorrect password" ; }; -String RID_SVXSTR_FORWARD_ERRMSSG -{ - Text [ en-US ] = "If you select the option \"%PLACEHOLDER%\", you must enter a URL." ; -}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc index 2ab5e73b2202..e5fe67967615 100644 --- a/sfx2/source/sidebar/Sidebar.hrc +++ b/sfx2/source/sidebar/Sidebar.hrc @@ -18,8 +18,6 @@ */ #include -#define RID_SIDEBAR_RESOURCE (RID_SFX_SIDEBAR_START + 0) - #define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START + 1) #define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START + 2) #define SFX_STR_SIDEBAR_SETTINGS (RID_SFX_SIDEBAR_START + 3) diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index a09ebeca22d9..ff2813768bbe 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -158,10 +158,6 @@ #define RID_NEGX (RID_APP_START + 1213) #define RID_XANDY (RID_APP_START + 1214) #define RID_XORY (RID_APP_START + 1215) -#define RID_XODIVIDEY (RID_APP_START + 1216) -#define RID_XODOTY (RID_APP_START + 1217) -#define RID_XOMINUSY (RID_APP_START + 1218) -#define RID_XOPLUSY (RID_APP_START + 1219) #define RID_XOTIMESY (RID_APP_START + 1220) #define RID_XCIRCY (RID_APP_START + 1221) #define RID_XWIDESLASHY (RID_APP_START + 1222) @@ -185,9 +181,6 @@ #define RID_XTOWARDY (RID_APP_START + 1316) #define RID_XLLY (RID_APP_START + 1317) #define RID_XGGY (RID_APP_START + 1318) -#define RID_XDEFY (RID_APP_START + 1319) -#define RID_XTRANSLY (RID_APP_START + 1320) -#define RID_XTRANSRY (RID_APP_START + 1321) #define RID_XDIVIDESY (RID_APP_START + 1322) #define RID_XNDIVIDESY (RID_APP_START + 1323) #define RID_DLARROW (RID_APP_START + 1324) @@ -317,8 +310,6 @@ #define RID_FROMXTOY (RID_APP_START + 1613) #define RID_FROMX (RID_APP_START + 1614) #define RID_TOX (RID_APP_START + 1615) -#define RID_LIMINFX (RID_APP_START + 1616) -#define RID_LIMSUPX (RID_APP_START + 1617) #define RID_LIM_FROMX (RID_APP_START + 1621) #define RID_SUM_FROMX (RID_APP_START + 1622) @@ -383,8 +374,6 @@ #define RID_COLORX_CYAN (RID_APP_START + 1729) #define RID_COLORX_MAGENTA (RID_APP_START + 1730) #define RID_COLORX_YELLOW (RID_APP_START + 1731) -#define RID_COLORX_AQUA (RID_APP_START + 1732) -#define RID_COLORX_FUCHSIA (RID_APP_START + 1733) #define RID_COLORX_GRAY (RID_APP_START + 1734) #define RID_COLORX_LIME (RID_APP_START + 1735) #define RID_COLORX_MAROON (RID_APP_START + 1736) @@ -626,8 +615,6 @@ #define RID_IINTX_HELP (RID_APP_START + 4151) #define RID_IIINTX_HELP (RID_APP_START + 4152) #define RID_LINTX_HELP (RID_APP_START + 4153) -#define RID_LLINTX_HELP (RID_APP_START + 4154) -#define RID_LLLINTX_HELP (RID_APP_START + 4155) #define RID_LIM_FROMX_HELP (RID_APP_START + 4161) #define RID_SUM_FROMX_HELP (RID_APP_START + 4162) #define RID_PROD_FROMX_HELP (RID_APP_START + 4163) @@ -646,8 +633,6 @@ #define RID_IINT_TOX_HELP (RID_APP_START + 4176) #define RID_IIINT_TOX_HELP (RID_APP_START + 4177) #define RID_LINT_TOX_HELP (RID_APP_START + 4178) -#define RID_LLINT_TOX_HELP (RID_APP_START + 4179) -#define RID_LLLINT_TOX_HELP (RID_APP_START + 4180) #define RID_LIM_FROMTOX_HELP (RID_APP_START + 4181) #define RID_SUM_FROMTOX_HELP (RID_APP_START + 4182) #define RID_PROD_FROMTOX_HELP (RID_APP_START + 4183) @@ -659,8 +644,6 @@ #define RID_LLINT_FROMTOX_HELP (RID_APP_START + 4189) #define RID_LLLINT_FROMTOX_HELP (RID_APP_START + 4190) -#define RID_COLORX_AQUA_HELP (RID_APP_START + 4191) -#define RID_COLORX_FUCHSIA_HELP (RID_APP_START + 4192) #define RID_COLORX_GRAY_HELP (RID_APP_START + 4193) #define RID_COLORX_LIME_HELP (RID_APP_START + 4194) #define RID_COLORX_MAROON_HELP (RID_APP_START + 4195) diff --git a/starmath/source/commands.src b/starmath/source/commands.src index 3ab9258cff0f..0b0b04e86ec7 100644 --- a/starmath/source/commands.src +++ b/starmath/source/commands.src @@ -85,10 +85,6 @@ String RID_XOVERY_HELP { Text [ en-US ] = "Division (Fraction)" ; }; -String RID_XODIVIDEY { Text = " odivide " ; }; -String RID_XODOTY { Text = " odot " ; }; -String RID_XOMINUSY { Text = " ominus " ; }; -String RID_XOPLUSY { Text = " oplus " ; }; String RID_XOTIMESY { Text = " otimes " ; }; String RID_XOTIMESY_HELP { @@ -154,7 +150,6 @@ String RID_XGGY_HELP { Text [ en-US ] = "Is Much Greater Than" ; }; -String RID_XDEFY { Text = " def " ; }; String RID_XEQUIVY { Text = " equiv " ; }; String RID_XEQUIVY_HELP { @@ -195,8 +190,6 @@ String RID_XTOWARDY_HELP { Text [ en-US ] = "Toward" ; }; -String RID_XTRANSLY { Text = " transl " ; }; -String RID_XTRANSRY { Text = " transr " ; }; String RID_XINY { Text = " in " ; }; String RID_XINY_HELP { @@ -472,8 +465,6 @@ String RID_LIM_FROMTOX_HELP { Text [ en-US ] = "Limes Sup/Sub script" ; }; -String RID_LIMINFX { Text = "liminf " ; }; -String RID_LIMSUPX { Text = "limsup " ; }; String RID_EXISTS { Text = "exists " ; }; String RID_EXISTS_HELP { @@ -570,40 +561,24 @@ String RID_LINT_FROMTOX_HELP Text [ en-US ] = "Curve Integral Sup/Sub script" ; }; String RID_LLINTX { Text = "llint " ; }; -String RID_LLINTX_HELP -{ - Text [ en-US ] = "Double Curve Integral" ; -}; String RID_LLINT_FROMX { Text = "llint from{} " ; }; String RID_LLINT_FROMX_HELP { Text [ en-US ] = "Double Curve Integral Subscript Bottom" ; }; String RID_LLINT_TOX { Text = "llint to{} " ; }; -String RID_LLINT_TOX_HELP -{ - Text [ en-US ] = "Double Curve Integral Superscript Top" ; -}; String RID_LLINT_FROMTOX { Text = "llint from{} to{} " ; }; String RID_LLINT_FROMTOX_HELP { Text [ en-US ] = "Double Curve Integral Sup/Sub script" ; }; String RID_LLLINTX { Text = "lllint " ; }; -String RID_LLLINTX_HELP -{ - Text [ en-US ] = "Triple Curve Integral" ; -}; String RID_LLLINT_FROMX { Text = "lllint from{} " ; }; String RID_LLLINT_FROMX_HELP { Text [ en-US ] = "Triple Curve Integral Subscript Bottom" ; }; String RID_LLLINT_TOX { Text = "lllint to{} " ; }; -String RID_LLLINT_TOX_HELP -{ - Text [ en-US ] = "Triple Curve Integral Superscript Top" ; -}; String RID_LLLINT_FROMTOX { Text = "lllint from{} to{} " ; }; String RID_LLLINT_FROMTOX_HELP { @@ -742,16 +717,6 @@ String RID_COLORX_MAGENTA_HELP { Text [ en-US ] = "Color Magenta" ; }; -String RID_COLORX_AQUA { Text = "color aqua {} " ; }; -String RID_COLORX_AQUA_HELP -{ - Text [ en-US ] = "Color Aqua" ; -}; -String RID_COLORX_FUCHSIA { Text = "color fuchsia {} " ; }; -String RID_COLORX_FUCHSIA_HELP -{ - Text [ en-US ] = "Color Fuchsia" ; -}; String RID_COLORX_GRAY { Text = "color gray {} " ; }; String RID_COLORX_GRAY_HELP { diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc index 36a00c6c97d8..3fd1d8b4ee6b 100644 --- a/svx/inc/accessibility.hrc +++ b/svx/inc/accessibility.hrc @@ -23,8 +23,6 @@ #include #define RID_SVXSTR_A11Y_3D_MATERIAL_COLOR (RID_SVXSTR_ACCESSIBILITY_START + 1) -#define RID_SVXSTR_A11Y_TEXT_COLOR (RID_SVXSTR_ACCESSIBILITY_START + 2) -#define RID_SVXSTR_A11Y_BACKGROUND_COLOR (RID_SVXSTR_ACCESSIBILITY_START + 3) #define RID_SVXSTR_A11Y_FILLSTYLE_NONE (RID_SVXSTR_ACCESSIBILITY_START + 4) #define RID_SVXSTR_A11Y_FILLSTYLE_SOLID (RID_SVXSTR_ACCESSIBILITY_START + 5) #define RID_SVXSTR_A11Y_FILLSTYLE_HATCH (RID_SVXSTR_ACCESSIBILITY_START + 6) diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index b710d7cc13af..21844e3260e4 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -24,28 +24,10 @@ #include "galtheme.hrc" // Gallery-Strings -#define RID_SVXSTR_EXTFORMAT1_SYS (RID_SVX_GALLERY_START + 15) -#define RID_SVXSTR_EXTFORMAT1_UI (RID_SVX_GALLERY_START + 16) -#define RID_SVXSTR_EXTFORMAT2_SYS (RID_SVX_GALLERY_START + 17) -#define RID_SVXSTR_EXTFORMAT2_UI (RID_SVX_GALLERY_START + 18) -#define RID_SVXSTR_EXTFORMAT3_SYS (RID_SVX_GALLERY_START + 19) -#define RID_SVXSTR_EXTFORMAT3_UI (RID_SVX_GALLERY_START + 20) -#define RID_SVXSTR_GALLERY_FOPENERROR (RID_SVX_GALLERY_START + 11) -#define RID_SVXSTR_GALLERY_NOTHEME (RID_SVX_GALLERY_START + 13) -#define RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS (RID_SVX_GALLERY_START + 25) #define RID_SVXSTR_GALLERY_FILTER (RID_SVX_GALLERY_START + 26) -#define RID_SVXSTR_GALLERY_LENGTH (RID_SVX_GALLERY_START + 27) -#define RID_SVXSTR_GALLERY_SIZE (RID_SVX_GALLERY_START + 28) -#define RID_SVXSTR_GALLERY_DELETEDD (RID_SVX_GALLERY_START + 29) -#define RID_SVXSTR_GALLERY_SGIERROR (RID_SVX_GALLERY_START + 31) #define RID_SVXSTR_GALLERY_NEWTHEME (RID_SVX_GALLERY_START + 32) -#define RID_SVXSTR_GALLERY_BROWSER (RID_SVX_GALLERY_START + 33) -#define RID_SVXSTR_GALLERY_THEMEERR (RID_SVX_GALLERY_START + 34) -#define RID_SVXSTR_GALLERY_IMPORTTHEME (RID_SVX_GALLERY_START + 41) #define RID_SVXSTR_GALLERY_CREATETHEME (RID_SVX_GALLERY_START + 42) -#define RID_SVXSTR_GALLERY_DIALOGID (RID_SVX_GALLERY_START + 80) #define RID_SVXSTR_GALLERY_TITLE (RID_SVX_GALLERY_START + 84) -#define RID_SVXSTR_GALLERY_PATH (RID_SVX_GALLERY_START + 85) #define RID_SVXSTR_GALLERY_ICONVIEW (RID_SVX_GALLERY_START + 86) #define RID_SVXSTR_GALLERY_LISTVIEW (RID_SVX_GALLERY_START + 87) @@ -54,7 +36,6 @@ #define RID_SVXMN_GALLERY2 (RID_SVX_GALLERY_START + 37) // Images -#define RID_SVXBMP_GALLERY (RID_SVX_GALLERY_START + 46) #define RID_SVXBMP_THEME_NORMAL (RID_SVX_GALLERY_START + 48) #define RID_SVXBMP_THEME_READONLY (RID_SVX_GALLERY_START + 52) #define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54) diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src index 66722c87d262..37986e929a66 100644 --- a/svx/source/accessibility/accessibility.src +++ b/svx/source/accessibility/accessibility.src @@ -23,14 +23,6 @@ String RID_SVXSTR_A11Y_3D_MATERIAL_COLOR { Text [ en-US ] = "3D material color" ; }; -String RID_SVXSTR_A11Y_TEXT_COLOR -{ - Text [ en-US ] = "Font color" ; -}; -String RID_SVXSTR_A11Y_BACKGROUND_COLOR -{ - Text [ en-US ] = "Background color" ; -}; String RID_SVXSTR_A11Y_FILLSTYLE_NONE { Text [ en-US ] = "None" ; diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 79fc0f1ee81a..9ec239d64216 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -61,10 +61,6 @@ String RID_SVXSTR_LINEEND Text [ en-US ] = "Arrowheads" ; }; -String RID_SVXSTR_CLOSE -{ - Text [ en-US ] = "Close" ; -}; String RID_SVXSTR_COLOR_BLACK { Text [ en-US ] = "Black" ; @@ -447,12 +443,6 @@ String RID_SVXSTR_COLOR_SEABLUE_DEF Text = "Sea blue"; }; /* do not translate */ -String RID_SVXSTR_COLOR_SUN_DEF -{ - // attention: this is the color string for the Sun Microsystems specific colors !!! - Text = "Sun"; -}; -/* do not translate */ String RID_SVXSTR_COLOR_CHART_DEF { Text = "Chart"; @@ -2106,12 +2096,6 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE }; }; -// unknown text color -String RID_SVXSTR_COLOR_USER -{ - Text [ en-US ] = "User" ; -}; - String RID_SVXSTR_COLOR_LIBRE_GREEN_1 { Text [ en-US ] = "Green 1 (%PRODUCTNAME Main Color)" ; @@ -2285,16 +2269,6 @@ String RID_SVXSTR_GALLERY_PREVIEW Text [ en-US ] = "Preview"; }; -String RID_SVXSTR_FILTER -{ - Text [ en-US ] = "Filter" ; -}; - -String RID_SVXSTR_VIEW -{ - Text [ en-US ] = "List" ; -}; - Bitmap RID_SVXBMP_GREENCHECK { File = "nu01.png"; diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index e58ad58e7acb..8c15a5a45b93 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -31,11 +31,6 @@ Bitmap RID_SVXBMP_LAMP_OFF File = "light.bmp"; }; -Bitmap RID_SVXBMP_COLORDLG -{ - File = "colordlg.bmp"; -}; - String RID_SVXFLOAT3D_FAVORITE { Text [ en-US ] = "Favorite"; diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src index 3a9be10b47dc..d7451ae414c8 100644 --- a/svx/source/engine3d/string3d.src +++ b/svx/source/engine3d/string3d.src @@ -20,30 +20,10 @@ #include // Strings for the Draw Dialog -------------------------------------------- -String RID_SVX_3D_CREATE_LATHE -{ - Text [ en-US ] = "Create 3D rotation object" ; -}; String RID_SVX_3D_UNDO_EXCHANGE_PASTE { Text [ en-US ] = "Insert object(s)" ; }; -String RID_SVX_3D_UNDO_SEGMENTS -{ - Text [ en-US ] = "Number of segments" ; -}; -String RID_SVX_3D_UNDO_DEEPTH -{ - Text [ en-US ] = "Object depth" ; -}; -String RID_SVX_3D_UNDO_FOCAL -{ - Text [ en-US ] = "Focal length" ; -}; -String RID_SVX_3D_UNDO_CAMPOS -{ - Text [ en-US ] = "Camera position" ; -}; String RID_SVX_3D_UNDO_ROTATE { Text [ en-US ] = "Rotate 3D object" ; @@ -60,9 +40,5 @@ String RID_SVX_3D_UNDO_BREAK_LATHE { Text [ en-US ] = "Split 3D object" ; }; -String RID_SVX_3D_UNDO_ATTRIBUTES -{ - Text [ en-US ] = "3D Attributes" ; -}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 1636d1a61c0f..76c1c886febe 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -47,16 +47,6 @@ Bitmap RID_SVXBMP_REMOVE File = "tb05.png"; }; -Bitmap RID_SVXBMP_GROUP_CLOSED -{ - File = "da01.png"; -}; - -Bitmap RID_SVXBMP_GROUP_OPEN -{ - File = "da02.png"; -}; - Bitmap RID_SVXBMP_ELEMENT { File = "da03.png"; @@ -209,16 +199,6 @@ String RID_STR_REPLACE_DOC Text [ en-US ] = "Document" ; }; -String RID_STR_DATANAV_SUBM_PARENT -{ - Text [ en-US ] = "Submission: " ; -}; - -String RID_STR_DATANAV_SUBM_ID -{ - Text [ en-US ] = "ID: " ; -}; - String RID_STR_DATANAV_SUBM_BIND { Text [ en-US ] = "Binding: " ; diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src index 5ad484b332b6..a05decfa7634 100644 --- a/svx/source/form/fmstring.src +++ b/svx/source/form/fmstring.src @@ -19,18 +19,10 @@ #include "svx/fmresids.hrc" /* Strings fuer Uebersetzung */ -String RID_ERR_CONTEXT_ADDFORM -{ - Text [ en-US ] = "Error while creating form"; -}; String RID_ERR_FIELDREQUIRED { Text [ en-US ] = "Input required in field '#'. Please enter a value."; }; -String RID_ERR_DUPLICATE_NAME -{ - Text [ en-US ] = "Entry already exists.\nPlease choose another name."; -}; String RID_STR_FORMS { Text [ en-US ] = "Forms"; @@ -111,18 +103,6 @@ String RID_STR_DELETECONFIRM Text [ en-US ] = "If you click Yes, you won't be able to undo this operation.\nDo you want to continue anyway?"; }; -String RID_ERR_NO_ELEMENT -{ - Text [ en-US ] = "Choose an entry from the list or enter a text corresponding to one of the list items."; -}; -String RID_STR_GROUPBOX -{ - Text [ en-US ] = "Frame element"; -}; -String RID_STR_NAVIGATION -{ - Text [ en-US ] = "Navigation"; -}; String RID_STR_NAVIGATIONBAR { Text [ en-US ] = "Navigation bar"; @@ -151,22 +131,10 @@ String RID_STR_UNDO_CONTAINER_REPLACE { Text [ en-US ] = "Replace a container element"; }; -String RID_STR_UNDO_DELETE_LOGICAL -{ - Text [ en-US ] = "Delete structure"; -}; String RID_STR_UNDO_MODEL_REPLACE { Text [ en-US ] = "Replace Control"; }; -String RID_STR_DATE -{ - Text [ en-US ] = "Date"; -}; -String RID_STR_TIME -{ - Text [ en-US ] = "Time"; -}; String RID_STR_PROPTITLE_PUSHBUTTON { Text [ en-US ] = "Push Button"; diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index bbea8503d4c0..cf9bb15bf136 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -21,94 +21,22 @@ #include "helpid.hrc" #include "gallery.hrc" -String RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS -{ - Text [ en-US ] = "Update"; -}; -String RID_SVXSTR_GALLERY_FOPENERROR -{ - Text [ en-US ] = "This file cannot be opened" ; -}; -String RID_SVXSTR_GALLERY_NOTHEME -{ - Text [ en-US ] = "Invalid Theme Name!" ; -}; -String RID_SVXSTR_EXTFORMAT1_SYS -{ - Text = "wav" ; -}; -String RID_SVXSTR_EXTFORMAT1_UI -{ - Text [ en-US ] = "Wave - Sound File" ; -}; -String RID_SVXSTR_EXTFORMAT2_SYS -{ - Text = "aif" ; -}; -String RID_SVXSTR_EXTFORMAT2_UI -{ - Text [ en-US ] = "Audio Interchange File Format" ; -}; -String RID_SVXSTR_EXTFORMAT3_SYS -{ - Text = "au" ; -}; -String RID_SVXSTR_EXTFORMAT3_UI -{ - Text [ en-US ] = "AU - Sound File" ; -}; String RID_SVXSTR_GALLERY_FILTER { Text [ en-US ] = "Graphics filter" ; }; -String RID_SVXSTR_GALLERY_LENGTH -{ - Text [ en-US ] = "Length:" ; -}; -String RID_SVXSTR_GALLERY_SIZE -{ - Text [ en-US ] = "Size:" ; -}; -String RID_SVXSTR_GALLERY_DELETEDD -{ - Text [ en-US ] = "Do you want to delete the linked file?" ; -}; -String RID_SVXSTR_GALLERY_SGIERROR -{ - Text [ en-US ] = "This file cannot be opened.\nDo you want to enter a different search path? " ; -}; String RID_SVXSTR_GALLERY_NEWTHEME { Text [ en-US ] = "New Theme" ; }; -String RID_SVXSTR_GALLERY_BROWSER -{ - Text [ en-US ] = "~Organizer..." ; -}; -String RID_SVXSTR_GALLERY_THEMEERR -{ - Text [ en-US ] = "This theme name already exists.\nPlease choose a different one." ; -}; -String RID_SVXSTR_GALLERY_IMPORTTHEME -{ - Text [ en-US ] = "I~mport..." ; -}; String RID_SVXSTR_GALLERY_CREATETHEME { Text [ en-US ] = "New Theme..." ; }; -String RID_SVXSTR_GALLERY_DIALOGID -{ - Text [ en-US ] = "Assign ID" ; -}; String RID_SVXSTR_GALLERY_TITLE { Text [ en-US ] = "Title" ; }; -String RID_SVXSTR_GALLERY_PATH -{ - Text [ en-US ] = "Path" ; -}; String RID_SVXSTR_GALLERY_ICONVIEW { Text [ en-US ] = "Icon View"; @@ -118,11 +46,6 @@ String RID_SVXSTR_GALLERY_LISTVIEW Text [ en-US ] = "Detailed View"; }; -Bitmap RID_SVXBMP_GALLERY -{ - File = "lx03135.png" ; -}; - Bitmap RID_SVXBMP_THEME_NORMAL { File = "galnors.png" ; diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index 14980b69cf12..90ad9c097edc 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -87,120 +87,6 @@ StringArray RID_ATTR_NAMES }; }; - // SvxSearchItem ------------------------------------------------------------ - // Kommando -String RID_SVXITEMS_SEARCHCMD_FIND -{ - Text [ en-US ] = "Search" ; -}; -String RID_SVXITEMS_SEARCHCMD_FIND_ALL -{ - Text [ en-US ] = "Find All" ; -}; -String RID_SVXITEMS_SEARCHCMD_REPLACE -{ - Text [ en-US ] = "Replace" ; -}; -String RID_SVXITEMS_SEARCHCMD_REPLACE_ALL -{ - Text [ en-US ] = "Replace all" ; -}; - // Vorlagen -String RID_SVXITEMS_SEARCHSTYL_CHAR -{ - Text [ en-US ] = "Character Style" ; -}; -String RID_SVXITEMS_SEARCHSTYL_PARA -{ - Text [ en-US ] = "Paragraph Style" ; -}; -String RID_SVXITEMS_SEARCHSTYL_FRAME -{ - Text [ en-US ] = "Frame Style" ; -}; -String RID_SVXITEMS_SEARCHSTYL_PAGE -{ - Text [ en-US ] = "Page Style" ; -}; - // Zellen-Typ -String RID_SVXITEMS_SEARCHIN_FORMULA -{ - Text [ en-US ] = "Formula" ; -}; -String RID_SVXITEMS_SEARCHIN_VALUE -{ - Text [ en-US ] = "Value" ; -}; -String RID_SVXITEMS_SEARCHIN_NOTE -{ - Text [ en-US ] = "Note" ; -}; - // Applikation -String RID_SVXITEMS_SEARCHAPP_WRITER -{ - Text = "StarWriter" ; -}; -String RID_SVXITEMS_SEARCHAPP_CALC -{ - Text = "StarCalc" ; -}; -String RID_SVXITEMS_SEARCHAPP_DRAW -{ - Text = "StarDraw" ; -}; -String RID_SVXITEMS_SEARCHAPP_BASE -{ - Text = "StarBase" ; -}; - // enum BrushStyle ---------------------------------------------------------- -String RID_SVXITEMS_BRUSHSTYLE_NULL -{ - Text [ en-US ] = "None" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_SOLID -{ - Text [ en-US ] = "Solid" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_HORZ -{ - Text [ en-US ] = "Horizontal" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_VERT -{ - Text [ en-US ] = "Vertical" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_CROSS -{ - Text [ en-US ] = "Grid" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_DIAGCROSS -{ - Text [ en-US ] = "Diamond" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_UPDIAG -{ - Text [ en-US ] = "Diagonal up" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG -{ - Text [ en-US ] = "Diagonal down" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_25 -{ - Text = "25%" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_50 -{ - Text = "50%" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_75 -{ - Text = "75%" ; -}; -String RID_SVXITEMS_BRUSHSTYLE_BITMAP -{ - Text [ en-US ] = "Image" ; -}; // end enum ColorName ----------------------------------------------------------- String RID_SVXITEMS_ORI_STANDARD { @@ -217,31 +103,6 @@ String RID_SVXITEMS_ORI_BOTTOMTOP String RID_SVXITEMS_ORI_STACKED { Text [ en-US ] = "Stacked" ; -}; - // GetValueText von BoolItems -String RID_SVXITEMS_BOXINF_TABLE_TRUE -{ - Text [ en-US ] = "Table" ; -}; -String RID_SVXITEMS_BOXINF_TABLE_FALSE -{ - Text [ en-US ] = "Not Table" ; -}; -String RID_SVXITEMS_BOXINF_DIST_TRUE -{ - Text [ en-US ] = "Spacing enabled" ; -}; -String RID_SVXITEMS_BOXINF_DIST_FALSE -{ - Text [ en-US ] = "Spacing disabled" ; -}; -String RID_SVXITEMS_BOXINF_MDIST_TRUE -{ - Text [ en-US ] = "Keep spacing interval" ; -}; -String RID_SVXITEMS_BOXINF_MDIST_FALSE -{ - Text [ en-US ] = "Allowed to fall short of spacing interval" ; }; String RID_SVXITEMS_MARGIN_LEFT { @@ -323,14 +184,6 @@ String RID_SVXITEMS_TEXT_COMPLETE { Text [ en-US ] = "Text: " ; }; -String RID_SVXITEMS_BACKGROUND_COLOR -{ - Text [ en-US ] = "Background color: " ; -}; -String RID_SVXITEMS_PATTERN_COLOR -{ - Text [ en-US ] = "Pattern color: " ; -}; String RID_SVXITEMS_BRUSH_CHAR { Text [ en-US ] = "Character background"; diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index eb98816a5678..4372e1253736 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -94,11 +94,6 @@ String RID_SVXSTR_TRANSPARENT Text [ en-US ] = "Transparent"; }; -String RID_SVXSTR_FILLPATTERN -{ - Text [ en-US ] = "Pattern" ; -}; - String RID_SVXSTR_FRAME { Text [ en-US ] = "Borders" ; diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc index 4c16379e78b8..3d2d12632d9f 100644 --- a/sw/source/uibase/inc/ribbar.hrc +++ b/sw/source/uibase/inc/ribbar.hrc @@ -23,10 +23,6 @@ #define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +8) -#define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 9) -#define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 10) -#define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 11) - #define ST_TBL (RC_RIBBAR_BEGIN + 14) #define ST_FRM (RC_RIBBAR_BEGIN + 15) #define ST_PGE (RC_RIBBAR_BEGIN + 16) -- cgit