From 92d94fc98efe24059ab8de0ed81ca31af5f8df98 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 10 Dec 2008 13:41:25 +0000 Subject: CWS-TOOLING: integrate CWS dba31f 2008-12-10 14:16:09 +0100 oj r265185 : #i96658# remove is 2008-12-10 08:46:07 +0100 oj r265147 : remove duplicate ids 2008-12-10 08:35:02 +0100 oj r265146 : #i96658# remove is 2008-12-09 11:44:35 +0100 oj r265072 : use of tools::StringresourceList 2008-12-09 11:43:41 +0100 oj r265071 : new class to read string elements from a Resource 2008-12-09 11:41:56 +0100 oj r265070 : export StringListResource 2008-12-09 11:38:17 +0100 oj r265068 : change string ; to more string objects 2008-12-08 12:11:43 +0100 oj r264985 : change default-license-id to lic-en-US 2008-12-05 12:06:09 +0100 oj r264896 : disable check to uncheck 2008-12-04 08:58:50 +0100 oj r264814 : #i96517,i96520,i96522# d&d, background, state fixed 2008-12-04 08:53:29 +0100 oj r264813 : #i96434# use document ui name from filter 2008-12-04 08:41:06 +0100 oj r264812 : #i96434# use document ui name from filter 2008-12-02 13:48:49 +0100 lla r264697 : #i96526# extra string for default otr wasn't found 2008-11-28 11:46:31 +0100 oj r264536 : move toolbar and resize add field dlg 2008-11-28 08:38:22 +0100 oj r264526 : load string resources 2008-11-27 19:28:52 +0100 oj r264520 : unsigned 2008-11-27 19:10:19 +0100 oj r264517 : move class into unnamed namespace 2008-11-27 18:33:38 +0100 oj r264514 : wrong param 2008-11-27 16:52:39 +0100 oj r264510 : #i96622# wrong string replacement 2008-11-27 16:46:03 +0100 oj r264509 : remove unused var 2008-11-27 13:37:16 +0100 oj r264484 : #i96432# notify only when not in special mode of the page 2008-11-27 13:16:47 +0100 oj r264479 : #i95224# accept alias in group by 2008-11-27 12:35:19 +0100 oj r264477 : #i95416# always show localized strings in the start marker 2008-11-27 09:49:29 +0100 oj r264455 : #i93460# set split pos 2008-11-27 09:05:27 +0100 oj r264447 : #i96453# use extension from mimetype / mediatype 2008-11-26 16:24:43 +0100 oj r264416 : #i96520# #i96522# #i96519# some changes at the add field dialog 2008-11-26 16:20:27 +0100 oj r264414 : #i93420# prevent to register a none system file url 2008-11-26 16:19:02 +0100 oj r264413 : #i96522# new class to paste multiple objects 2008-11-26 10:06:12 +0100 oj r264349 : #i96191# introduce new error message and check if type was defined aand should not be changed 2008-11-26 10:06:12 +0100 oj r264348 : #i96191# throw error when decimal is to big 2008-11-25 12:08:59 +0100 oj r264281 : #i96431# correct state for align and move 2008-11-25 11:54:47 +0100 oj r264280 : #i96428# when new bind to first table 2008-11-25 11:49:55 +0100 oj r264279 : #i96434# add report output format to inspection 2008-11-25 11:49:05 +0100 oj r264278 : #i96434# add report output format to inspection 2008-11-24 10:46:23 +0100 oj r264215 : #i96458# size width for controls 2008-11-24 09:28:56 +0100 oj r264199 : #i96459# mark detail section when nothing is selected 2008-11-20 12:02:35 +0100 oj r264038 : #i96191# fix check for prec 2008-11-20 08:06:32 +0100 oj r264026 : #i90949# patch MID function 2008-11-11 13:14:58 +0100 oj r263555 : #i96086# apply patch 2008-11-11 11:34:46 +0100 oj r263549 : #i94128# correct height of section when controls moved outside 2008-11-11 07:52:08 +0100 oj r263544 : #i94729# fix string with ; as sep 2008-11-11 07:45:27 +0100 oj r263543 : #i95222# export chart title style 2008-11-11 07:43:37 +0100 oj r263542 : #i92541# fix line height --- connectivity/source/inc/resource/adabas_res.hrc | 5 ----- connectivity/source/inc/resource/ado_res.hrc | 1 + connectivity/source/inc/resource/sharedresources.hxx | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'connectivity/source/inc') 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 +#include //........................................................................ 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 > _aStringToSubstitutes) const; }; //........................................................................ -- cgit