[Libreoffice-commits] core.git: 3 commits - ucb/source

[Stephan Bergmann]

 ucb/source/ucp/webdav/AprEnv.hxx          |    2 +-
 ucb/source/ucp/webdav/SerfInputStream.cxx |    8 ++------
 ucb/source/ucp/webdav/SerfLockStore.hxx   |    2 +-
 ucb/source/ucp/webdav/SerfSession.cxx     |    6 +++---
 ucb/source/ucp/webdav/SerfUri.cxx         |    2 +-
 ucb/source/ucp/webdav/webdavprovider.cxx  |    6 +++---
 ucb/source/ucp/webdav/webdavresultset.cxx |    2 +-
 7 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 19f01900728fb77ec050e70c4fbd1129f6cddef4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 7 10:03:20 2017 +0100

    loplugin:unnecessaryparen
    
    Change-Id: Icb5dacd41bc5753ffa2498fdd244b1f78483699f

diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 7e66cfe0d5d1..78ea35df5a71 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -64,9 +64,9 @@ void SAL_CALL ContentProvider::release()
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
-    (static_cast< lang::XTypeProvider* >(this)),
-    (static_cast< lang::XServiceInfo* >(this)),
-    (static_cast< ucb::XContentProvider* >(this))
+    static_cast< lang::XTypeProvider* >(this),
+    static_cast< lang::XServiceInfo* >(this),
+    static_cast< ucb::XContentProvider* >(this)
                     );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
commit e6f40de5fc6ad3edd5a482f39779d54890fac2ed
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 7 10:02:27 2017 +0100

    loplugin:flatten
    
    Change-Id: Id43a9752ff21258296e56c8dc765c3618d360c7a

diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx
index 5aa9f262eed3..f0f954d64855 100644
--- a/ucb/source/ucp/webdav/SerfInputStream.cxx
+++ b/ucb/source/ucp/webdav/SerfInputStream.cxx
@@ -135,13 +135,9 @@ void SAL_CALL SerfInputStream::closeInput()
 
 void SAL_CALL SerfInputStream::seek( sal_Int64 location )
 {
-    if ( location < 0 )
-        throw css::lang::IllegalArgumentException();
-
-    if ( location <= mLen )
-        mPos = location;
-    else
+    if ( location < 0 || location > mLen )
         throw css::lang::IllegalArgumentException();
+    mPos = location;
 }
 
 
commit f8798dcb2a7b79558bc907862a9c279d2f75be26
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 7 10:00:13 2017 +0100

    loplugin:includeform: automatic rewrite in --with-webdav=serf code
    
    Change-Id: Ida1b0c2942071d5ee8a25dd1817e8608761732ac

diff --git a/ucb/source/ucp/webdav/AprEnv.hxx b/ucb/source/ucp/webdav/AprEnv.hxx
index 8dae15db3689..4590c64aab55 100644
--- a/ucb/source/ucp/webdav/AprEnv.hxx
+++ b/ucb/source/ucp/webdav/AprEnv.hxx
@@ -22,7 +22,7 @@
 #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_APRENV_HXX
 
 #include <apr_pools.h>
-#include <SerfLockStore.hxx>
+#include "SerfLockStore.hxx"
 
 namespace apr_environment
 {
diff --git a/ucb/source/ucp/webdav/SerfLockStore.hxx b/ucb/source/ucp/webdav/SerfLockStore.hxx
index 82f1a7717a28..6a927562b164 100644
--- a/ucb/source/ucp/webdav/SerfLockStore.hxx
+++ b/ucb/source/ucp/webdav/SerfLockStore.hxx
@@ -25,7 +25,7 @@
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <SerfSession.hxx>
+#include "SerfSession.hxx"
 
 namespace http_dav_ucp
 {
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 91e387158aa6..ab41f1f5ac0f 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -20,9 +20,9 @@
 #include <vector>
 #include <string.h>
 #include <rtl/string.h>
-#include "comphelper/processfactory.hxx"
-#include "comphelper/sequence.hxx"
-#include "ucbhelper/simplecertificatevalidationrequest.hxx"
+#include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
+#include <ucbhelper/simplecertificatevalidationrequest.hxx>
 
 #include "AprEnv.hxx"
 #include <apr_strings.h>
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx
index 78cb6da08284..43bf4ce56c85 100644
--- a/ucb/source/ucp/webdav/SerfUri.cxx
+++ b/ucb/source/ucp/webdav/SerfUri.cxx
@@ -25,7 +25,7 @@
 #include "DAVException.hxx"
 #include "AprEnv.hxx"
 
-#include "urihelper.hxx"
+#include <urihelper.hxx>
 
 using namespace http_dav_ucp;
 
diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx
index cc19f191151a..9233a5de8061 100644
--- a/ucb/source/ucp/webdav/webdavresultset.cxx
+++ b/ucb/source/ucp/webdav/webdavresultset.cxx
@@ -28,7 +28,7 @@
 #include "webdavresultset.hxx"
 #include "DAVSession.hxx"
 
-#include "comphelper/processfactory.hxx"
+#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
 using namespace http_dav_ucp;