make these resources non-local, simplifies for ui conversion

Change-Id: I2654cf0522f2f04cd4a14d0e04f18f26e175e354

7 files changed, 19 insertions, 35 deletions

diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index f5da59101f8e..72fe127a3e83 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2890,8 +2890,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
             case DatabaseObjectContainer::DATA_SOURCE:
             {
                 OUString sMessage(
-                    OUString(
-                        OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE))).
+                        OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE)).
                     replaceFirst("$type$", OUString::number(pObject->Type)));
                 throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ));
             }
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index e8ea755a9b84..f06f29b6c3d4 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -456,4 +456,19 @@ String RID_STR_UNSUPPORTED_OBJECT_TYPE
     Text [ en-US ] = "Unsupported object type found ($type$).";
 };
 
+String STR_PAGETITLE_GENERAL
+{
+    Text [ en-US ] = "Advanced Properties" ;
+};
+
+String STR_PAGETITLE_ADVANCED
+{
+    Text [ en-US ] = "Additional Settings" ;
+};
+
+String STR_PAGETITLE_CONNECTION
+{
+    Text [ en-US ] = "Connection settings" ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 03acc00bf489..6102c2870d21 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -100,9 +100,6 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage)
 
 void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, CreateTabPage _pCreateFunc)
 {
-    // open our own resource block, as the page titles are strings local to this block
-    LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
-
     AddTabPage(_nPageId, OUString(ModuleRes(_nTextId)), _pCreateFunc, NULL);
     m_aCurrentDetailPages.push(_nPageId);
 }
@@ -162,7 +159,6 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
         case  ::dbaccess::DST_USERDEFINE9:
         case  ::dbaccess::DST_USERDEFINE10:
             {
-                LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
                 OUString aTitle(ModuleRes(STR_PAGETITLE_ADVANCED));
                 AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, 0, sal_False, 1);
                 m_aCurrentDetailPages.push(PAGE_USERDRIVER);
@@ -210,7 +206,6 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
     ::dbaccess::ODsnTypeCollection* pCollection = pCollectionItem->getCollection();
     if ( pCollection->determineType(getDatasourceType( *pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE )
     {
-        LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
         AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, NULL );
         RemoveTabPage( PAGE_CONNECTION );
         m_nMainPageID = PAGE_MYSQL_NATIVE;
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index f2f1cbc3504b..c0aaf6028401 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -57,13 +57,6 @@
 #define NF_PORTNUMBER           1
 #define NF_LDAPROWCOUNT         2
 
-//========================================================================
-// string ids (usually relative to other resources, that's why not necessarily unique)
-
-#define STR_PAGETITLE_GENERAL               1
-#define STR_PAGETITLE_CONNECTION            2
-#define STR_PAGETITLE_ADVANCED              3
-
 #endif // _DBAUI_DBADMIN_HRC_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 0fb28e85ca37..8f88911919a0 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -92,25 +92,9 @@ TabDialog DLG_DATABASE_ADMINISTRATION
         OutputSize = TRUE ;
     };
 
-    //.........................................................................
-    String STR_PAGETITLE_GENERAL
-    {
-        Text [ en-US ] = "Advanced Properties" ;
-    };
-    String STR_PAGETITLE_ADVANCED
-    {
-        Text [ en-US ] = "Additional Settings" ;
-    };
-    String STR_PAGETITLE_CONNECTION
-    {
-        Text [ en-US ] = "Connection settings" ;
-    };
-
     Text [ en-US ] = "Database properties" ;
 };
 
-// -----------------------------------------------------------------------------
-
 ModalDialog DLG_DATABASE_TYPE_CHANGE
 {
     OutputSize = TRUE ;
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 85c2beef440e..39b820da226a 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -288,9 +288,6 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState)
     {
         static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory( m_pImpl->getORB() );
         static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this);
-        // open our own resource block, as the page titles are strings local to this block
-        LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
-
         pPage->SetText(ModuleRes(nStringId));
         defaultButton( _nState == START_PAGE ? WZB_NEXT : WZB_FINISH );
         enableButtons( WZB_FINISH, _nState == START_PAGE ? sal_False : sal_True);
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index f7ac4f26f83f..a8323283baef 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -231,7 +231,7 @@
 #define STR_ERROR_DURING_CREATION           RID_STR_GEN_START + 1
 #define RID_STR_CONNECTION_LOST             RID_STR_GEN_START + 2
 #define STR_NAME_ALREADY_EXISTS             RID_STR_GEN_START + 3
-// free
+#define STR_PAGETITLE_GENERAL               RID_STR_GEN_START + 4
 #define STR_TITLE_CONFIRM_DELETION          RID_STR_GEN_START + 5
 #define STR_STAT_WARNING                    RID_STR_GEN_START + 6
 #define STR_TABLEDESIGN_DATASOURCE_DELETED  RID_STR_GEN_START + 7
@@ -266,8 +266,9 @@
 #define STR_FOLDER_LABEL                    RID_STR_GEN_START + 36
 #define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD    RID_STR_GEN_START + 37
 #define STR_TABLEDESIGN_NO_PRIM_KEY         RID_STR_GEN_START + 38
-    // FREE
+#define STR_PAGETITLE_ADVANCED              RID_STR_GEN_START + 39
 #define RID_STR_EXTENSION_NOT_PRESENT       RID_STR_GEN_START + 40
+#define STR_PAGETITLE_CONNECTION            RID_STR_GEN_START + 41
 
 //========================================================================
 // untyped resources