diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-04-29 13:02:24 +0200 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-04-29 13:02:24 +0200 |
| commit | ffc0666792f90f2c95fbad065f956cc98dcd5b92 (patch) | |
| tree | e088a59ceb9cf21e9b04496e9232700d7fe4b17c /dbaccess/source | |
| parent | fbe48b903ecfc57f778478d5f04ba5f4d0dd7936 (diff) | |
cws tl79: fixed problems after merging with DEV300_m77
Diffstat (limited to 'dbaccess/source')
| -rwxr-xr-x | dbaccess/source/ui/dlg/DbAdminImpl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 5e38c7419936..de51c7dd2278 100755 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -270,9 +270,9 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler = Reference< XInteractionHandler >( m_xORB->createInstance( SERVICE_SDB_INTERACTION_HANDLER ), UNO_QUERY ); + xHandler = Reference< XInteractionHandler >( m_xORB->createInstance( SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY ); if ( !xHandler.is() ) - ShowServiceNotAvailableError(m_pParent->GetParent(), String(SERVICE_SDB_INTERACTION_HANDLER), sal_True); + ShowServiceNotAvailableError(m_pParent->GetParent(), String(SERVICE_TASK_INTERACTION_HANDLER), sal_True); } String sName = pName ? pName->GetValue() : String(); @@ -294,7 +294,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert aRequest.HasRealm = aRequest.HasAccount = sal_False; // aRequest.Realm aRequest.HasUserName = pUser != 0; - aRequest.UserName = pUser ? pUser->GetValue() : ::rtl::OUString(); + aRequest.UserName = pUser ? rtl::OUString(pUser->GetValue()) : ::rtl::OUString(); aRequest.HasPassword = sal_True; //aRequest.Password aRequest.HasAccount = sal_False; |