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 --- 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 ---------- 8 files changed, 48 deletions(-) (limited to 'dbaccess') 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" ; -- cgit