Tag: cws_src680_oj14
User: oj      
Date: 2006/07/04 00:56:17

Modified:
   dba/dbaccess/source/ui/dlg/dbadmin.cxx

Log:
 RESYNC: (1.95-1.97); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/ui/dlg/
=======================================

File [changed]: dbadmin.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.95.4.3&r2=1.95.4.4
Delta lines:  +7 -6
-------------------
--- dbadmin.cxx 25 Apr 2006 13:02:54 -0000      1.95.4.3
+++ dbadmin.cxx 4 Jul 2006 07:56:14 -0000       1.95.4.4
@@ -92,7 +92,6 @@
 namespace dbaui
 {
 //.........................................................................
-using namespace dbtools;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::lang;
@@ -172,7 +171,7 @@
 void ODbAdminDialog::addDetailPage(USHORT _nPageId, USHORT _nTextId, 
CreateTabPage _pCreateFunc)
 {
        // open our own resource block, as the page titles are strings local to 
this block
-       OLocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
+       LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
 
        AddTabPage(_nPageId, String(ResId(_nTextId)), _pCreateFunc, NULL);
        m_aCurrentDetailPages.push(_nPageId);
@@ -242,12 +241,14 @@
                case DST_USERDEFINE9:
                case DST_USERDEFINE10:
                        {
-                               OLocalResourceAccess 
aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
+                               LocalResourceAccess 
aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
                                String aTitle(ResId(STR_PAGETITLE_ADVANCED));
                                AddTabPage(PAGE_USERDRIVER, aTitle, 
ODriversSettings::CreateUser, 0, sal_False, 1);
                                m_aCurrentDetailPages.push(PAGE_USERDRIVER);
                        }
                        break;
+        default:
+            break;
        }
 }
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to