ucb/source/ucp/webdav-curl/webdavcontent.cxx | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
New commits:
commit ad85d647a3d501f9a3208d082b6bdbc371942053
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Oct 6 17:51:19 2021 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Nov 1 18:23:10 2021 +0100
ucb: webdav-curl: adjust some trivialities to match...
... commit 0c3500115c4fd86284a027fc32be704afcf77061 - turned out there
wasn't a substantive difference to the existing code after all, except
for the FTP URL scheme check, which i don't miss.
Change-Id: Ie24988a4117445cf729515958dea88d17627859a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123179
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/ucb/source/ucp/webdav-curl/webdavcontent.cxx
b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
index b14bd419bf3f..3bebf9125fed 100644
--- a/ucb/source/ucp/webdav-curl/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
@@ -875,8 +875,8 @@ void Content::addProperty( const
css::ucb::PropertyCommandArgument &aCmdArg,
{
try
{
- const ResourceType & rType = getResourceType( xEnv );
- switch ( rType )
+ const ResourceType eType = getResourceType( xEnv );
+ switch ( eType )
{
case UNKNOWN:
case DAV:
@@ -979,8 +979,8 @@ void Content::removeProperty( const OUString& Name,
{
try
{
- const ResourceType & rType = getResourceType( xEnv );
- switch ( rType )
+ const ResourceType eType = getResourceType( xEnv );
+ switch ( eType )
{
case UNKNOWN:
case DAV:
@@ -1284,9 +1284,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
// First, identify whether resource is DAV or not
bool bNetworkAccessAllowed = true;
- const ResourceType & rType = getResourceType( xEnv, xResAccess,
&bNetworkAccessAllowed );
+ const ResourceType eType = getResourceType(
+ xEnv, xResAccess, &bNetworkAccessAllowed );
- if ( DAV == rType )
+ if ( eType == DAV )
{
// cache lookup... getResourceType may fill the props cache via
// PROPFIND!
@@ -1364,8 +1365,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
}
catch ( DAVException const & e )
{
- bNetworkAccessAllowed = bNetworkAccessAllowed &&
- shouldAccessNetworkAfterException( e );
+ bNetworkAccessAllowed = bNetworkAccessAllowed
+ && shouldAccessNetworkAfterException( e );
if ( !bNetworkAccessAllowed )
{
@@ -1465,7 +1466,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
CurlUri const aUri( xResAccess->getURL() );
aUnescapedTitle = aUri.GetPathBaseNameUnescaped();
- if ( rType == UNKNOWN )
+ if ( eType == UNKNOWN )
{
xProps.reset( new ContentProperties( aUnescapedTitle ) );
}
@@ -1473,7 +1474,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
// For DAV resources we only know the Title, for non-DAV
// resources we additionally know that it is a document.
- if ( rType == DAV )
+ if ( eType == DAV )
{
//xProps.reset(
// new ContentProperties( aUnescapedTitle ) );
@@ -3222,11 +3223,9 @@ Content::ResourceType Content::getResourceType(
aProperties[ 3 ].Name = "MediaType";
aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK;
- ContentProperties::UCBNamesToDAVNames(
- aProperties, aPropNames );
+ ContentProperties::UCBNamesToDAVNames( aProperties, aPropNames );
- rResAccess->PROPFIND(
- DAVZERO, aPropNames, resources, xEnv );
+ rResAccess->PROPFIND( DAVZERO, aPropNames, resources, xEnv );
// TODO - is this really only one?
if ( resources.size() == 1 )
