[Libreoffice-commits] core.git: connectivity/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Mar 17 08:45:16 UTC 2017
connectivity/source/inc/resource/common_res.hrc | 2
connectivity/source/inc/resource/dbase_res.hrc | 1
connectivity/source/inc/resource/hsqldb_res.hrc | 1
connectivity/source/inc/resource/mork_res.hrc | 20 ---
connectivity/source/resource/conn_shared_res.src | 121 -----------------------
5 files changed, 145 deletions(-)
New commits:
commit e74eade4c10aec0021337c585494329b82a65c02
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Mar 16 15:45:17 2017 +0200
remove unused defines from HRC files in connectivity
Change-Id: I234acfe9aa489367a1691ca3669fabfd2e72eb01
Reviewed-on: https://gerrit.libreoffice.org/35275
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
index a4f24a46aa3e..842e1cc4724a 100644
--- a/connectivity/source/inc/resource/common_res.hrc
+++ b/connectivity/source/inc/resource/common_res.hrc
@@ -52,14 +52,12 @@
#define STR_INVALID_INDEX ( STR_COMMON_BASE + 26 )
#define STR_UNSUPPORTED_FUNCTION ( STR_COMMON_BASE + 27 )
#define STR_UNSUPPORTED_FEATURE ( STR_COMMON_BASE + 28 )
-#define STR_UNKNOWN_COLUMN_NAME ( STR_COMMON_BASE + 29 )
#define STR_INVALID_PARA_COUNT ( STR_COMMON_BASE + 30 )
#define STR_PRIVILEGE_NOT_GRANTED ( STR_COMMON_BASE + 31 )
#define STR_PRIVILEGE_NOT_REVOKED ( STR_COMMON_BASE + 32 )
#define STR_INVALID_BOOKMARK ( STR_COMMON_BASE + 33 )
#define STR_NO_ELEMENT_NAME ( STR_COMMON_BASE + 34 )
#define STR_NO_INPUTSTREAM ( STR_COMMON_BASE + 35 )
-#define STR_INPUTSTREAM_WRONG_LEN ( STR_COMMON_BASE + 36 )
#define STR_WRONG_PARAM_INDEX ( STR_COMMON_BASE + 37 )
#define STR_NO_CONNECTION_GIVEN ( STR_COMMON_BASE + 38 )
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
index d32caaba33b2..54f0232825df 100644
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ b/connectivity/source/inc/resource/dbase_res.hrc
@@ -46,7 +46,6 @@
#define STR_INVALID_COLUMN_VALUE ( STR_DBASE_BASE + 18 )
#define STR_TABLE_NOT_DROP ( STR_DBASE_BASE + 19 )
#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE ( STR_DBASE_BASE + 20 )
-#define STR_COULD_NOT_RENAME_FILE ( STR_DBASE_BASE + 21 )
#endif // CONNECTIVITY_RESOURCE_DBASE_HRC
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index 29be9d2fe19e..6065e6f8fb03 100644
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
@@ -28,7 +28,6 @@
#define STR_NO_STORAGE ( STR_HSQLDB_BASE + 0 )
#define STR_INVALID_FILE_URL ( STR_HSQLDB_BASE + 1 )
#define STR_NO_TABLE_CONTAINER ( STR_HSQLDB_BASE + 2 )
-#define STR_NO_TABLE_EDITOR_DIALOG ( STR_HSQLDB_BASE + 3 )
#define STR_NO_TABLENAME ( STR_HSQLDB_BASE + 4 )
#define STR_NO_DOCUMENTUI ( STR_HSQLDB_BASE + 5 )
#define STR_ERROR_NEW_VERSION ( STR_HSQLDB_BASE + 6 )
diff --git a/connectivity/source/inc/resource/mork_res.hrc b/connectivity/source/inc/resource/mork_res.hrc
index bafeaf753d8b..f69c136733be 100644
--- a/connectivity/source/inc/resource/mork_res.hrc
+++ b/connectivity/source/inc/resource/mork_res.hrc
@@ -24,37 +24,17 @@
// = the mozab driver's resource strings
-#define STR_MOZILLA_ADDRESSBOOKS ( STR_MORK_BASE + 0 )
-#define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MORK_BASE + 1 )
// FREE
-#define STR_NO_TABLE_CREATION_SUPPORT ( STR_MORK_BASE + 5 )
-#define STR_MOZILLA_IS_RUNNING ( STR_MORK_BASE + 6 )
-#define STR_COULD_NOT_RETRIEVE_AB_ENTRY ( STR_MORK_BASE + 7 )
-#define STR_COULD_NOT_GET_DIRECTORY_NAME ( STR_MORK_BASE + 8 )
-#define STR_TIMEOUT_WAITING ( STR_MORK_BASE + 9 )
#define STR_ERR_EXECUTING_QUERY ( STR_MORK_BASE + 10 )
-#define STR_MOZILLA_IS_RUNNIG_NO_CHANGES ( STR_MORK_BASE + 11 )
-#define STR_FOREIGN_PROCESS_CHANGED_AB ( STR_MORK_BASE + 12 )
-#define STR_CANT_FIND_ROW ( STR_MORK_BASE + 13 )
-#define STR_CANT_FIND_CARD_FOR_ROW ( STR_MORK_BASE + 14 )
#define STR_QUERY_INVALID_IS_NULL_COLUMN ( STR_MORK_BASE + 15 )
-#define STR_NO_HOSTNAME ( STR_MORK_BASE + 16 )
-#define STR_NO_BASEDN ( STR_MORK_BASE + 17 )
-#define STR_COULD_NOT_CONNECT_LDAP ( STR_MORK_BASE + 18 )
#define STR_ERROR_REFRESH_ROW ( STR_MORK_BASE + 19 )
#define STR_ILLEGAL_MOVEMENT ( STR_MORK_BASE + 20 )
#define STR_ERROR_GET_ROW ( STR_MORK_BASE + 21 )
#define STR_COMMIT_ROW ( STR_MORK_BASE + 22 )
-#define STR_INVALID_ROW_UPDATE ( STR_MORK_BASE + 23 )
-#define STR_ROW_CAN_NOT_SAVE ( STR_MORK_BASE + 24 )
-#define STR_CAN_NOT_CANCEL_ROW_UPDATE ( STR_MORK_BASE + 25 )
-#define STR_CAN_NOT_CREATE_ROW ( STR_MORK_BASE + 26 )
#define STR_QUERY_AT_LEAST_ONE_TABLES ( STR_MORK_BASE + 27 )
#define STR_NO_COUNT_SUPPORT ( STR_MORK_BASE + 28 )
#define STR_STMT_TYPE_NOT_SUPPORTED ( STR_MORK_BASE + 29 )
-#define STR_COULD_NOT_LOAD_LIB ( STR_MORK_BASE + 30 )
#define STR_UNSPECIFIED_ERROR ( STR_MORK_BASE + 31 )
-#define STR_COULD_NOT_CREATE_ADDRESSBOOK ( STR_MORK_BASE + 32 )
#endif // CONNECTIVITY_RESOURCE_MOZAB_HRC
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 38b0e9afec0f..f199414aa1f4 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -29,70 +29,11 @@
// = the mozab driver's resource strings
-String STR_MOZILLA_ADDRESSBOOKS
-{
- Text [ en-US ] = "Mozilla/Seamonkey Address Book Directory";
- Text [ x-comment ] = "This must be the term referring to address books in the user's "
- "Mozilla/Seamonkey profile in the system.";
-};
-
-String STR_THUNDERBIRD_ADDRESSBOOKS
-{
- Text [ en-US ] = "Thunderbird Address Book Directory";
- Text [ x-comment ] = "This must be the term referring to address books in the user's "
- "Thunderbird profile in the system.";
-};
-
-String STR_NO_TABLE_CREATION_SUPPORT
-{
- Text [ en-US ] = "Creating tables is not supported for this kind of address books.";
-};
-
-String STR_MOZILLA_IS_RUNNING
-{
- Text [ en-US ] = "Cannot create new address books while Mozilla is running.";
-};
-
-String STR_COULD_NOT_RETRIEVE_AB_ENTRY
-{
- Text [ en-US ] = "An address book entry could not be retrieved, an unknown error occurred.";
-};
-
-String STR_COULD_NOT_GET_DIRECTORY_NAME
-{
- Text [ en-US ] = "An address book directory name could not be retrieved, an unknown error occurred.";
-};
-
-String STR_TIMEOUT_WAITING
-{
- Text [ en-US ] = "Timed out while waiting for the result.";
-};
-
String STR_ERR_EXECUTING_QUERY
{
Text [ en-US ] = "An error occurred while executing the query.";
};
-String STR_MOZILLA_IS_RUNNIG_NO_CHANGES
-{
- Text [ en-US ] = "You can't make any changes to Mozilla Address Book when Mozilla is running.";
-};
-
-String STR_FOREIGN_PROCESS_CHANGED_AB
-{
- Text [ en-US ] = "Mozilla Address Book has been changed out of this process, we can't modify it in this condition.";
-};
-
-String STR_CANT_FIND_ROW
-{
- Text [ en-US ] = "Can't find the requested row.";
-};
-
-String STR_CANT_FIND_CARD_FOR_ROW
-{
- Text [ en-US ] = "Can't find the card for the requested row.";
-};
-
String STR_QUERY_AT_LEAST_ONE_TABLES
{
Text [ en-US ] = "The query can not be executed. It needs at least one table.";
@@ -113,16 +54,6 @@ String STR_UNSPECIFIED_ERROR
Text [ en-US ] = "An unknown error occurred.";
};
-String STR_COULD_NOT_CREATE_ADDRESSBOOK
-{
- Text [ en-US ] = "Could not create a new address book. Mozilla error code is $1$.";
-};
-
-String STR_COULD_NOT_LOAD_LIB
-{
- Text [ en-US ] = "The library '$libname$' could not be loaded.";
-};
-
String STR_ERROR_REFRESH_ROW
{
Text [ en-US ] = "An error occurred while refreshing the current row.";
@@ -133,16 +64,6 @@ String STR_ERROR_GET_ROW
Text [ en-US ] = "An error occurred while getting the current row.";
};
-String STR_CAN_NOT_CANCEL_ROW_UPDATE
-{
- Text [ en-US ] = "The row update can not be canceled.";
-};
-
-String STR_CAN_NOT_CREATE_ROW
-{
- Text [ en-US ] = "A new row can not be created.";
-};
-
String STR_QUERY_INVALID_IS_NULL_COLUMN
{
Text [ en-US ] = "The query can not be executed. The 'IS NULL' can only be used with a column name.";
@@ -158,31 +79,6 @@ String STR_COMMIT_ROW
Text [ en-US ] = "Please commit row '$position$' before update rows or insert new rows.";
};
-String STR_INVALID_ROW_UPDATE
-{
- Text [ en-US ] = "The update call can not be executed. The row is invalid.";
-};
-
-String STR_ROW_CAN_NOT_SAVE
-{
- Text [ en-US ] = "The current row can not be saved.";
-};
-
-String STR_NO_HOSTNAME
-{
- Text [ en-US ] = "No hostname was provided.";
-};
-
-String STR_NO_BASEDN
-{
- Text [ en-US ] = "No Base DN was provided.";
-};
-
-String STR_COULD_NOT_CONNECT_LDAP
-{
- Text [ en-US ] = "The connection to the LDAP server could not be established.";
-};
-
// = common strings
String STR_NO_CONNECTION_GIVEN
@@ -193,10 +89,6 @@ String STR_WRONG_PARAM_INDEX
{
Text [ en-US ] = "You tried to set a parameter at position '$pos$' but there is/are only '$count$' parameter(s) allowed. One reason may be that the property \"ParameterNameSubstitution\" is not set to TRUE in the data source.";
};
-String STR_INPUTSTREAM_WRONG_LEN
-{
- Text [ en-US ] = "End of InputStream reached before satisfying length specified when InputStream was set.";
-};
String STR_NO_INPUTSTREAM
{
Text [ en-US ] = "The input stream was not set.";
@@ -218,10 +110,6 @@ String STR_PRIVILEGE_NOT_REVOKED
Text [ en-US ] = "Privilege not revoked: Only table privileges can be revoked.";
};
-String STR_UNKNOWN_COLUMN_NAME
-{
- Text [ en-US ] = "The column name '$columnname$' is unknown.";
-};
String STR_ERRORMSG_SEQUENCE
{
Text [ en-US ] = "Function sequence error.";
@@ -394,11 +282,6 @@ String STR_COULD_NOT_DELETE_FILE
Text [ en-US ] = "The file $filename$ could not be deleted.";
};
-String STR_COULD_NOT_RENAME_FILE
-{
- Text [ en-US ] = "The file could not be renamed to $filename$.";
-};
-
String STR_INVALID_COLUMN_TYPE
{
Text [ en-US ] = "Invalid column type for column '$columnname$'.";
@@ -594,10 +477,6 @@ String STR_NO_TABLE_CONTAINER
{
Text [ en-US ] = "An error occurred while obtaining the connection's table container.";
};
-String STR_NO_TABLE_EDITOR_DIALOG
-{
- Text [ en-US ] = "An error occurred while creating the table editor dialog.";
-};
String STR_NO_TABLENAME
{
Text [ en-US ] = "There is no table named '$tablename$'.";
More information about the Libreoffice-commits
mailing list