diff options
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/charsets.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/dbumiscres.src | 7 |
3 files changed, 7 insertions, 13 deletions
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 93ea5a9c5eda..dc4a6e6f5bf5 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -62,10 +62,10 @@ #define RID_STR_UNO_END RID_STR_UNO_START + 20 // 414 - 433 #define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 56 // 434 - 489 +#define RID_STR_GEN_END RID_STR_GEN_START + 57 // 434 - 490 #define RID_STR_APP_START RID_STR_GEN_END -#define RID_STR_APP_END RID_STR_APP_START + 40 // 490 - 529 +#define RID_STR_APP_END RID_STR_APP_START + 40 // 491 - 530 #if RID_STR_GEN_END > RID_DBACCESS_END #error Resource-Id Ueberlauf in #file, #line @@ -229,10 +229,10 @@ #define STR_SPREADSHEET_HEADERTEXT RID_STR_GEN_START + 53 #define STR_SPREADSHEET_HELPTEXT RID_STR_GEN_START + 54 #define STR_SPREADSHEETPATH RID_STR_GEN_START + 55 +#define STR_RSC_CHARSETS RID_STR_GEN_START + 56 // untyped resources -#define RSC_CHARSETS RID_UNTYPED_START + 2 #define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 // various diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index dd7f90c331ba..3c03ad217ff9 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -22,7 +22,7 @@ #include "dbu_misc.hrc" #include <rtl/tencinfo.h> #include <tools/rcid.h> -#include "localresaccess.hxx" +#include "moduledbu.hxx" namespace dbaui { @@ -32,11 +32,8 @@ namespace dbaui OCharsetDisplay::OCharsetDisplay() :OCharsetMap() ,SvxTextEncodingTable() + , m_aSystemDisplayName(ModuleRes( STR_RSC_CHARSETS )) { - { - LocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE ); - m_aSystemDisplayName = ModuleRes( 1 ).toString(); - } } bool OCharsetDisplay::approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src index 9f334adea336..5a4e1c9dd688 100644 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ b/dbaccess/source/ui/misc/dbumiscres.src @@ -19,12 +19,9 @@ #include "dbu_misc.hrc" -Resource RSC_CHARSETS +String STR_RSC_CHARSETS { - String 1 - { - Text [ en-US ] = "System"; - }; + Text [ en-US ] = "System"; }; String STR_ERROR_DURING_CREATION |