mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put the initialization out of 'if' scope

Browse Source 
A better change than the one I did in
97353e5c43.

The "DAV:lockdiscovery" property may not be returned, so the
initialization should be done before getting said property.

Change-Id: Iae87df798439fc582a66dd3c0fe353ebb859b7b6
Reviewed-on: https://gerrit.libreoffice.org/27767
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
This commit is contained in:
Giuseppe Castagno
2016-08-01 10:32:20 +02:00
parent 8e495518c3
commit 06cc80bb95
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sfx2/source/doc/docfile.cxx
View File

@@ -1008,8 +1008,16 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI )
// See http://tools.ietf.org/html/rfc4918#section-14.17 for details // See http://tools.ietf.org/html/rfc4918#section-14.17 for details
LockFileEntry aLockData; LockFileEntry aLockData;
aLockData[LockFileComponent::OOOUSERNAME] = "Unknown user"; aLockData[LockFileComponent::OOOUSERNAME] = "Unknown user";
// This solution works right when the LO user name and the WebDAV user
// name are the same.
// A better thing to do would be to obtain the 'real' WebDAV user name,
// but that's not possible from a WebDAV UCP provider client.
LockFileEntry aOwnData = svt::LockFileCommon::GenerateOwnEntry();
// use the current LO user name as the system name
aLockData[LockFileComponent::SYSUSERNAME] = aOwnData[LockFileComponent::SYSUSERNAME];
uno::Sequence< css::ucb::Lock > aLocks; uno::Sequence< css::ucb::Lock > aLocks;
// getting the property, send a PROPFIND to the server over the net
if( aContentToLock.getPropertyValue( "DAV:lockdiscovery" ) >>= aLocks ) if( aContentToLock.getPropertyValue( "DAV:lockdiscovery" ) >>= aLocks )
{ {
// got at least a lock, show the owner of the first lock returned // got at least a lock, show the owner of the first lock returned
@@ -1017,13 +1025,6 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI )
OUString aOwner; OUString aOwner;
if(aLock.Owner >>= aOwner) if(aLock.Owner >>= aOwner)
{ {
// This solution works right when the LO user name and the WebDAV user
// name are the same.
// A better thing to do would be to obtain the 'real' WebDAV user name,
// but that's not possible from a WebDAV UCP provider client.
LockFileEntry aOwnData = svt::LockFileCommon::GenerateOwnEntry();
// use the current LO user name as the system name
aLockData[LockFileComponent::SYSUSERNAME] = aOwnData[LockFileComponent::SYSUSERNAME];
// we need to display the WebDAV user name owning the lock, not the local one // we need to display the WebDAV user name owning the lock, not the local one
aLockData[LockFileComponent::OOOUSERNAME] = aOwner; aLockData[LockFileComponent::OOOUSERNAME] = aOwner;
} }