diff options
Diffstat (limited to 'connectivity/source/inc')
| -rw-r--r-- | connectivity/source/inc/resource/adabas_res.hrc | 5 | ||||
| -rw-r--r-- | connectivity/source/inc/resource/ado_res.hrc | 1 | ||||
| -rw-r--r-- | connectivity/source/inc/resource/sharedresources.hxx | 14 |
3 files changed, 15 insertions, 5 deletions
diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc index 69684f696f2c..f918edd4dc62 100644 --- a/connectivity/source/inc/resource/adabas_res.hrc +++ b/connectivity/source/inc/resource/adabas_res.hrc @@ -40,11 +40,6 @@ #define STR_NO_DISK_SPACE ( STR_ADABAS_BASE + 1 ) #define STR_COMMAND_NOT_FOUND ( STR_ADABAS_BASE + 2 ) #define STR_DATABASE_NEEDS_CONVERTING ( STR_ADABAS_BASE + 3 ) -#define STR_INVALID_KEY_DESCRIPTOR_ERROR ( STR_ADABAS_BASE + 4 ) -#define STR_INVALID_TABLE_DESCRIPTOR_ERROR ( STR_ADABAS_BASE + 5 ) -#define STR_INVALID_USER_DESCRIPTOR_ERROR ( STR_ADABAS_BASE + 6 ) -#define STR_INVALID_VIEW_DESCRIPTOR_ERROR ( STR_ADABAS_BASE + 7 ) -#define STR_VIEW_NO_COMMAND_ERROR ( STR_ADABAS_BASE + 8 ) #define STR_USER_NO_DELETE ( STR_ADABAS_BASE + 9 ) #endif // CONNECTIVITY_RESOURCE_ADABAS_HRC diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc index e995c58fe7da..ebe5c51e5753 100644 --- a/connectivity/source/inc/resource/ado_res.hrc +++ b/connectivity/source/inc/resource/ado_res.hrc @@ -46,6 +46,7 @@ #define STR_INVALID_VIEW_DESCRIPTOR_ERROR ( STR_ADO_BASE + 7 ) #define STR_VIEW_NO_COMMAND_ERROR ( STR_ADO_BASE + 8 ) #define STR_TYPE_NOT_CONVERT ( STR_ADO_BASE + 9 ) +#define STR_NO_CONNECTION ( STR_ADO_BASE + 10 ) #endif // CONNECTIVITY_RESOURCE_ADO_HRC diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index b6683882929f..9a75e40315fc 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -35,6 +35,7 @@ /** === end UNO includes === **/ #include <rtl/ustring.hxx> +#include <list> //........................................................................ namespace connectivity @@ -142,6 +143,19 @@ namespace connectivity const sal_Char* _pAsciiPatternToReplace3, const ::rtl::OUString& _rStringToSubstitute3 ) const; + + /** loads a string from the shared resource file, and replaces a given ASCII pattern with a given string + + @param _nResId + the resource ID of the string to load + @param _aStringToSubstitutes + A list of substitutions. + + @return + the string from the resource file, with applied string substitution + */ + ::rtl::OUString getResourceStringWithSubstitution( ResourceId _nResId, + const ::std::list< ::std::pair<const sal_Char* , ::rtl::OUString > > _aStringToSubstitutes) const; }; //........................................................................ |