summaryrefslogtreecommitdiff
path: root/ucbhelper
diff options
context:
space:
mode:
Diffstat (limited to 'ucbhelper')
-rw-r--r--ucbhelper/source/provider/simpleauthenticationrequest.cxx5
-rw-r--r--ucbhelper/source/provider/simplenameclashresolverequest.cxx5
2 files changed, 3 insertions, 7 deletions
diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index ddc8fc9e4079..569876f29d6d 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
@@ -31,7 +31,6 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
const OUString & rRealm,
const OUString & rUserName,
const OUString & rPassword,
- const OUString & rAccount,
bool bAllowUseSystemCredentials,
bool bAllowSessionStoring )
{
@@ -50,9 +49,7 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
aRequest.UserName = rUserName;
aRequest.HasPassword = true;
aRequest.Password = rPassword;
- aRequest.HasAccount = !rAccount.isEmpty();
- if ( aRequest.HasAccount )
- aRequest.Account = rAccount;
+ aRequest.HasAccount = false;
aRequest.URL = rURL;
initialize(aRequest,
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index 912e559f989b..cd94391ad8c5 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
@@ -135,8 +135,7 @@ SimpleNameClashResolveRequest::~SimpleNameClashResolveRequest() {}
SimpleNameClashResolveRequest::SimpleNameClashResolveRequest(
const OUString & rTargetFolderURL,
- const OUString & rClashingName,
- const OUString & rProposedNewName )
+ const OUString & rClashingName )
{
// Fill request...
ucb::NameClashResolveRequest aRequest;
@@ -145,7 +144,7 @@ SimpleNameClashResolveRequest::SimpleNameClashResolveRequest(
aRequest.Classification = task::InteractionClassification_QUERY;
aRequest.TargetFolderURL = rTargetFolderURL;
aRequest.ClashingName = rClashingName;
- aRequest.ProposedNewName = rProposedNewName;
+ aRequest.ProposedNewName = OUString();
setRequest( uno::makeAny( aRequest ) );