[Libreoffice-commits] core.git: 2 commits - cui/source dbaccess/source

[Thomas Arnhold]

 cui/source/tabpages/align.cxx           |    2 --
 dbaccess/source/ui/inc/dbu_resource.hrc |    6 +++---
 dbaccess/source/ui/misc/charsets.cxx    |    7 ++-----
 dbaccess/source/ui/misc/dbumiscres.src  |    7 ++-----
 4 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 5b5571505a1db0ccc98f471e358dbd644f8cd6e5
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Aug 10 00:27:36 2014 +0200

    cui align: no need for OLocalResourceAccess
    
    Change-Id: Id500403fb70787cd856e2413d7a8e9a949942ac0

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 7532118..a66e7d9 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -36,7 +36,6 @@
 #include <sfx2/itemconnect.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/languageoptions.hxx>
-#include <svtools/localresaccess.hxx>
 #include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
@@ -317,7 +316,6 @@ void AlignmentTabPage::DataChanged( const DataChangedEvent& rDCEvt )
     SfxTabPage::DataChanged( rDCEvt );
     if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        svt::OLocalResourceAccess aLocalResAcc( CUI_RES( RID_SVXPAGE_ALIGNMENT ), RSC_TABPAGE );
         InitVsRefEgde();
     }
 }
commit ac08537688971b55a5fd0982cf5bc18a8ffa961e
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sat Aug 9 18:41:08 2014 +0200

    make string a global resource
    
    Change-Id: I65eee002d2f04b09a73c597ece4b29d1f1593414

diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 93ea5a9..dc4a6e6 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 dd7f90c..3c03ad2 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 9f334ad..5a4e1c9 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