remove (yet yet another) StringListResource implementation

Change-Id: Ifaf89badfc339f8253a629c6960df8a943b8cce5

18 files changed, 17 insertions, 80 deletions

diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index d19fca85ccc7..4118915e16a4 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -39,7 +39,6 @@
 #include "callbacks.hxx"
 #include <dbaccess/IController.hxx>
 #include "moduledbu.hxx"
-#include <svtools/localresaccess.hxx>
 #include "svtools/treelistentry.hxx"
 #include "svtools/viewdataentry.hxx"
 #include <algorithm>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index b9c0bd70df4a..3a16604e8544 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -30,7 +30,7 @@
 #include <svl/intitem.hxx>
 #include "dsitems.hxx"
 #include "dbaccess_helpid.hrc"
-#include "localresaccess.hxx"
+#include "moduledbu.hxx"
 #include <osl/process.h>
 #include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 03e094ec4b26..7bef896839f6 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -32,13 +32,13 @@
 #include <unotools/moduleoptions.hxx>
 #include "dsitems.hxx"
 #include "dbaccess_helpid.hrc"
-#include "localresaccess.hxx"
 #include <osl/process.h>
 #include <vcl/msgbox.hxx>
 #include "dbadmin.hxx"
 #include <comphelper/types.hxx>
 #include <vcl/stdtext.hxx>
 #include "sqlmessage.hxx"
+#include "moduledbu.hxx"
 #include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 7341eb3897a2..e6a067c5cb9c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -26,13 +26,13 @@
 #include <svl/intitem.hxx>
 #include "dsitems.hxx"
 #include "dbaccess_helpid.hrc"
-#include "localresaccess.hxx"
 #include <osl/process.h>
 #include <vcl/msgbox.hxx>
 #include "dbadmin.hxx"
 #include <comphelper/types.hxx>
 #include <vcl/stdtext.hxx>
 #include "sqlmessage.hxx"
+#include "moduledbu.hxx"
 #include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index ca7b62e71f68..edad0abe55ea 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -30,7 +30,6 @@
 #include "dsitems.hxx"
 #include "dsnItem.hxx"
 #include "dbaccess_helpid.hrc"
-#include "localresaccess.hxx"
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
@@ -51,6 +50,7 @@
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include "finteraction.hxx"
+#include "moduledbu.hxx"
 #include <unotools/pathoptions.hxx>
 #include <svtools/roadmapwizard.hxx>
 #include "TextConnectionHelper.hxx"
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 3298d498a004..184a2c7c3245 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -31,7 +31,6 @@
 #include "dsitems.hxx"
 #include "dbfindex.hxx"
 #include "dbaccess_helpid.hrc"
-#include "localresaccess.hxx"
 #include <vcl/layout.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 2b3100c3a460..bd7c6b6a3ec5 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -26,7 +26,7 @@
 #include "dbustrings.hrc"
 #include "dsitems.hxx"
 #include "dsselect.hxx"
-#include "localresaccess.hxx"
+#include "moduledbu.hxx"
 #include "odbcconfig.hxx"
 #include "optionalboolitem.hxx"
 #include "sqlmessage.hxx"
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 1aa01c2182c0..0466f3c3480b 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -21,7 +21,6 @@
 #include "sqlmessage.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <svtools/localresaccess.hxx>
 #include "dbaccess_helpid.hrc"
 #include "dbu_resource.hrc"
 #include "dbu_dlg.hrc"
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 4c499f24f8ce..b84b94c5c7d5 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -29,7 +29,7 @@
 #include "dbustrings.hrc"
 #include "dsitems.hxx"
 #include "dsnItem.hxx"
-#include "localresaccess.hxx"
+#include "moduledbu.hxx"
 #include "optionalboolitem.hxx"
 #include "propertysetitem.hxx"
 #include "stringlistitem.hxx"
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 3eb5c8055dfc..669a607c669a 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -28,7 +28,6 @@
 #include "dbustrings.hrc"
 #include "adminpages.hxx"
 #include "generalpage.hxx"
-#include "localresaccess.hxx"
 #include "stringlistitem.hxx"
 #include "propertysetitem.hxx"
 #include <unotools/confignode.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 523a0a314090..f59d888ce01d 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -34,7 +34,6 @@
 #include <sfx2/docfilt.hxx>
 #include <unotools/ucbhelper.hxx>
 #include "generalpage.hxx"
-#include "localresaccess.hxx"
 #include "stringlistitem.hxx"
 #include "propertysetitem.hxx"
 #include <unotools/confignode.hxx>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index c84a438fb6ec..93702c9b58c1 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -25,8 +25,8 @@
 #include "DbAdminImpl.hxx"
 #include "dsitems.hxx"
 #include "dbfindex.hxx"
-#include "localresaccess.hxx"
 #include "dsnItem.hxx"
+#include "moduledbu.hxx"
 
 #include "dbaccess_helpid.hrc"
 #include "dbu_dlg.hrc"
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 10231f2ec1d9..4042b4635f71 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -20,7 +20,6 @@
 #include "dsselect.hxx"
 #include "dbu_dlg.hrc"
 #include <vcl/msgbox.hxx>
-#include "localresaccess.hxx"
 #include <tools/rcid.h>
 
 #include <com/sun/star/sdbcx/XCreateCatalog.hpp>
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index f5821d592028..8ad4dc7a727e 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -24,10 +24,10 @@
 #include "dsitems.hxx"
 #include "dbustrings.hrc"
 #include "dbadmin.hxx"
+#include "moduledbu.hxx"
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfilt.hxx>
 #include <vcl/stdtext.hxx>
-#include "localresaccess.hxx"
 #include <vcl/msgbox.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/waitobj.hxx>
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index a32a52f11477..e35f28615cd0 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -30,7 +30,6 @@
 #include <vcl/layout.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
-#include "localresaccess.hxx"
 #include <unotools/syslocale.hxx>
 
 #define EF_VISITED      0x0001
diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx
deleted file mode 100644
index 0a0d9b08d753..000000000000
--- a/dbaccess/source/ui/inc/localresaccess.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_LOCALRESACCESS_HXX
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_LOCALRESACCESS_HXX
-
-#include <svtools/localresaccess.hxx>
-#include "moduledbu.hxx"
-
-namespace dbaui
-{
-
-// LocalResourceAccess
-/** helper class for acessing local resources
-*/
-typedef ::svt::OLocalResourceAccess LRA_Base;
-class LocalResourceAccess : protected LRA_Base
-{
-    OModuleClient m_aModuleClient;
-public:
-    inline LocalResourceAccess( sal_uInt16 _nId, RESOURCE_TYPE _rType )
-        :LRA_Base( ModuleRes( _nId ), _rType )
-    {
-    }
-};
-
-}   // namespace dbaui
-
-#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_LOCALRESACCESS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 861e9b6c512c..14c49a2d6ff4 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -353,19 +353,13 @@ String STR_INFO_OPENING_IN_SQL_VIEW
         "(except \"SQL command\", which doesn't make sense here) will be inserted.";
 };
 
-Resource RSC_QUERY_OBJECT_TYPE
+StringArray RSC_QUERY_OBJECT_TYPE
 {
-    String 1
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "The table view";
-    };
-    String 2
-    {
-        Text [ en-US ] = "The query";
-    };
-    String 3
-    {
-        Text [ en-US ] = "The SQL statement";
+        < "The table view"; >;
+        < "The query"; >;
+        < "The SQL statement"; >;
     };
 };
 
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index cf07fa1ef03d..c683536ba40f 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -24,7 +24,6 @@
 #include "dbustrings.hrc"
 #include "defaultobjectnamecheck.hxx"
 #include "dlgsave.hxx"
-#include "localresaccess.hxx"
 #include "uiservices.hxx"
 #include "QTableWindow.hxx"
 #include "QTableWindowData.hxx"
@@ -75,7 +74,7 @@
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/localresaccess.hxx>
+#include <tools/resary.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
@@ -223,11 +222,9 @@ namespace dbaui
         OUString lcl_getObjectResourceString( sal_uInt16 _nResId, sal_Int32 _nCommandType )
         {
             OUString sMessageText = ModuleRes( _nResId );
-            OUString sObjectType;
-            {
-                LocalResourceAccess aLocalRes( RSC_QUERY_OBJECT_TYPE, RSC_RESOURCE );
-                sObjectType = ModuleRes( (sal_uInt16)( _nCommandType + 1 ) );
-            }
+            ModuleRes aResId(RSC_QUERY_OBJECT_TYPE);
+            ResStringArray aResList(aResId);
+            OUString sObjectType = aResList.GetString(_nCommandType);
             sMessageText = sMessageText.replaceFirst( "$object$", sObjectType );
             return sMessageText;
         }