Revert "loplugin:constfields in ucb"

This reverts commit d8f8b4375998b62431c8605004e7c7d5c921ccc9.

Change-Id: Iece88b16cfb2e4ff18dd82bbf6624dc64a33cebf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90519
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

38 files changed, 56 insertions, 56 deletions

diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index a7d9f95a969a..367be847ea7f 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -36,7 +36,7 @@ public:
     virtual OUString SAL_CALL getContentProviderScheme() override;
 
 private:
-    OUString const m_aContentId;
+    OUString m_aContentId;
     OUString m_aProviderScheme;
 };
 
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 1dcb45a752c3..6de20ec52b87 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -36,7 +36,7 @@ class UcbPropertiesManager : public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::beans::XPropertySetInfo >
 {
-    css::uno::Sequence< css::beans::Property > const m_pProps;
+    css::uno::Sequence< css::beans::Property > m_pProps;
 
 private:
     bool queryProperty( const OUString& rName,
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 58b40331f210..782bb4cffed8 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -1055,7 +1055,7 @@ struct PersistentPropertySet_Impl
 {
     rtl::Reference<PropertySetRegistry>  m_pCreator;
     rtl::Reference<PropertySetInfo_Impl> m_pInfo;
-    OUString const              m_aKey;
+    OUString                    m_aKey;
     OUString                    m_aFullKey;
     osl::Mutex                  m_aMutex;
     std::unique_ptr<OInterfaceContainerHelper2>  m_pDisposeEventListeners;
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 1a6c65619a1c..4c7814164457 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -69,7 +69,7 @@ struct SortListData
 {
     bool        mbModified;
     sal_IntPtr  mnCurPos;
-    sal_IntPtr const  mnOldPos;
+    sal_IntPtr  mnOldPos;
 
     explicit SortListData( sal_IntPtr nPos );
 };
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
index e93ad79a9c66..24430401d278 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -28,8 +28,8 @@ namespace cmis
     {
         const css::uno::Reference< css::ucb::XCommandEnvironment>& m_xEnv;
         static css::uno::WeakReference< css::ucb::XCommandEnvironment> sm_xEnv;
-        OUString const m_sUrl;
-        OUString const m_sBindingUrl;
+        OUString m_sUrl;
+        OUString m_sBindingUrl;
 
         public:
             AuthProvider ( const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv,
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 797dd5368e3f..7aa7f42be62e 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -30,7 +30,7 @@ namespace cmis
     {
         const css::uno::Reference< css::ucb::XCommandEnvironment>& m_xEnv;
         const css::uno::Reference< css::uno::XComponentContext >& m_xContext;
-        OUString const m_sHostname;
+        OUString m_sHostname;
 
         public:
             CertValidationHandler (
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index de6260005543..82f27ce3af53 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -69,11 +69,11 @@ private:
     OUString          m_sObjectPath;
     OUString          m_sObjectId;
     OUString          m_sURL;
-    cmis::URL const   m_aURL;
+    cmis::URL         m_aURL;
 
     // Members to be set for non-persistent content
     bool                   m_bTransient;
-    bool const             m_bIsFolder;
+    bool                   m_bIsFolder;
     libcmis::ObjectTypePtr m_pObjectType;
     std::map< std::string, libcmis::PropertyPtr > m_pObjectProps;
 
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
index f5792a450ff0..f7cad8774dc4 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
@@ -35,7 +35,7 @@ namespace cmis
     {
         private:
             ChildrenProvider* m_pChildrenProvider;
-            sal_Int32 const mnOpenMode;
+            sal_Int32 mnOpenMode;
             bool mbCountFinal;
             void getData();
             std::vector< ResultListEntry > maResults;
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 3475172aa112..241d9fb44853 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -49,8 +49,8 @@ class RepoContent : public ::ucbhelper::ContentImplHelper,
                     public ChildrenProvider
 {
 private:
-    ContentProvider* const       m_pProvider;
-    URL const                    m_aURL;
+    ContentProvider*       m_pProvider;
+    URL                    m_aURL;
     OUString          m_sRepositoryId;
 
     std::vector< libcmis::RepositoryPtr > m_aRepositories;
diff --git a/ucb/source/ucp/cmis/cmis_resultset.hxx b/ucb/source/ucp/cmis/cmis_resultset.hxx
index 88327f05db8e..1393ac926e8d 100644
--- a/ucb/source/ucp/cmis/cmis_resultset.hxx
+++ b/ucb/source/ucp/cmis/cmis_resultset.hxx
@@ -20,7 +20,7 @@ namespace cmis
 
     class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
     {
-        ChildrenProvider* const m_pChildrenProvider;
+        ChildrenProvider* m_pChildrenProvider;
         css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
 
         private:
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 655bb3a46a07..b04a1c90309c 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -201,8 +201,8 @@ namespace fileaccess {
                      JustInserted = 2,
                      Deleted = 4,
                      FullFeatured = 8 };
-        bool const                                                                  m_bFolder;
-        sal_uInt16                                                                  m_nState;
+        bool                                                  m_bFolder;
+        sal_uInt16                                            m_nState;
 
         osl::Mutex                         m_aMutex;
 
diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index 035b51a05ea8..661852681ecd 100644
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
@@ -129,8 +129,8 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
 
     private:
 
-        XInteractionSupplyNameImpl* const p1;
-        XInteractionAbortImpl* const p2;
+        XInteractionSupplyNameImpl* p1;
+        XInteractionAbortImpl* p2;
 
         css::uno::Reference<css::task::XInteractionRequest> m_xRequest;
 
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index 301c016cd823..47ba891cab58 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -101,7 +101,7 @@ namespace fileaccess {
         osl::Mutex                                         m_aMutex;
         css::uno::Sequence< css::uno::Any >                m_aValueMap;
         bool                                               m_nWasNull;
-        TaskManager* const                                 m_pMyShell;
+        TaskManager*                                       m_pMyShell;
         css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
 
         bool isIndexOutOfBounds( sal_Int32 nIndex );
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 2c93713c1330..1979abeab54c 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -393,7 +393,7 @@ class XResultSet_impl :
         bool                                m_nIsOpen;
         sal_Int32                           m_nRow;
         bool                                m_nWasNull;
-        sal_Int32 const                     m_nOpenMode;
+        sal_Int32                           m_nOpenMode;
         bool                                m_bRowCountFinal;
 
         typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet;
@@ -405,8 +405,8 @@ class XResultSet_impl :
         const OUString                 m_aBaseDirectory;
 
         osl::Directory                        m_aFolder;
-        css::uno::Sequence< css::beans::Property > const      m_sProperty;
-        css::uno::Sequence< css::ucb::NumberedSortingInfo > const  m_sSortingInfo;
+        css::uno::Sequence< css::beans::Property >      m_sProperty;
+        css::uno::Sequence< css::ucb::NumberedSortingInfo >  m_sSortingInfo;
 
         osl::Mutex                          m_aMutex;
         osl::Mutex                          m_aEventListenerMutex;
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 94f0b59ac208..78e7e8c8219a 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -157,13 +157,13 @@ namespace fileaccess
         class MyProperty
         {
         private:
-            OUString const              PropertyName;
-            sal_Int32 const             Handle;
-            bool const                  isNative;
-            css::uno::Type const        Typ;        // Duplicates information in Value
+            OUString                    PropertyName;
+            sal_Int32                   Handle;
+            bool                        isNative;
+            css::uno::Type              Typ;        // Duplicates information in Value
             css::uno::Any               Value;
             css::beans::PropertyState   State;
-            sal_Int16 const             Attributes;
+            sal_Int16                   Attributes;
         public:
             explicit MyProperty( const OUString&  thePropertyName );
             MyProperty( bool                              theIsNative,
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index f702fb84b3fd..a44b73ffc392 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -113,7 +113,7 @@ private:
     FTPURL              m_aFTPURL;
     bool                m_bInserted;
     bool                m_bTitleSet;
-    css::ucb::ContentInfo const m_aInfo;
+    css::ucb::ContentInfo m_aInfo;
 
     virtual css::uno::Sequence< css::beans::Property >
         getProperties( const css::uno::Reference<
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index 218f4aaacac1..fd7c2a4a4c82 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -51,7 +51,7 @@ namespace ftp {
 
     private:
 
-        OUString const m_ident;
+        OUString m_ident;
     };
 
 }
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 315ce9703330..b7e0ed0cf265 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -71,7 +71,7 @@ namespace ftp {
 
     private:
 
-        XInteractionApproveImpl* const p1;
+        XInteractionApproveImpl* p1;
 
         css::uno::Reference<css::task::XInteractionRequest> m_xRequest;
 
diff --git a/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx
index 8718e47f52a7..0919c9b23b06 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.hxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.hxx
@@ -50,7 +50,7 @@ namespace ftp {
         FTPLoaderThread(const FTPLoaderThread&) = delete;
         FTPLoaderThread& operator=(const FTPLoaderThread&) = delete;
 
-        oslThreadKey const m_threadKey;
+        oslThreadKey m_threadKey;
 
     };  // end class FTPLoaderThread
 
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 8928e630f966..dddf514aa374 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -395,7 +395,7 @@ namespace ftp {
         ItemSet                             m_aItems;
         std::vector<OUString>               m_aPath;
 
-        css::uno::Sequence< css::beans::Property > const
+        css::uno::Sequence< css::beans::Property >
                                             m_sProperty;
 
         osl::Mutex                          m_aMutex;
diff --git a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
index 318da8df9d53..24102b870d5f 100644
--- a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
@@ -47,8 +47,8 @@ public:
 private:
     css::uno::Reference< css::uno::XComponentContext >        m_xContext;
     css::uno::Reference< css::ucb::XContentProvider >         m_xProvider;
-    css::uno::Sequence< css::beans::Property > const          m_seq;
-    std::vector<FTPDirentry> const                            m_dirvec;
+    css::uno::Sequence< css::beans::Property >                m_seq;
+    std::vector<FTPDirentry>                                  m_dirvec;
 };
 
 }
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 49c684c39984..3686cfe12fca 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -59,7 +59,7 @@ namespace ftp {
 
     private:
 
-        sal_Int32 const n_err;
+        sal_Int32 n_err;
     };
 
     class CurlInput {
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 8ba80fc4d53f..7a41c7bca03d 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -64,7 +64,7 @@ class ContentProvider;
 class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator
 {
 private:
-    ContentProvider * const m_pProvider;
+    ContentProvider  *m_pProvider;
     GFile* mpFile;
     GFileInfo *mpInfo;
     bool mbTransient;
diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index 75fd66f35634..a740af1a5cc5 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.hxx
@@ -36,7 +36,7 @@ struct ResultListEntry
     css::uno::Reference< css::ucb::XContentIdentifier > xId;
     css::uno::Reference< css::ucb::XContent > xContent;
     css::uno::Reference< css::sdbc::XRow > xRow;
-    GFileInfo * const pInfo;
+    GFileInfo *pInfo;
 
     explicit ResultListEntry( GFileInfo *pInInfo ) : pInfo(pInInfo)
     {
@@ -55,7 +55,7 @@ class DataSupplier : public ucbhelper::ResultSetDataSupplier
 {
 private:
     rtl::Reference< ::gio::Content > mxContent;
-    sal_Int32 const mnOpenMode;
+    sal_Int32 mnOpenMode;
     bool mbCountFinal;
     bool getData();
     ResultList maResults;
diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index 2a808ade71d5..687041add641 100644
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
@@ -34,7 +34,7 @@ namespace gio
 class InputStream final : public cppu::WeakImplHelper<css::io::XInputStream>
 {
 private:
-    GFileInputStream * const mpStream;
+    GFileInputStream *mpStream;
 
 public:
     explicit InputStream ( GFileInputStream *pStream );
diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index 705eb68955c8..6bf03ce96cb4 100644
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
@@ -38,7 +38,7 @@ class OutputStream final :
     public Seekable
 {
 private:
-    GFileOutputStream * const mpStream;
+    GFileOutputStream *mpStream;
 
 public:
     explicit OutputStream ( GFileOutputStream *pStream );
diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index 1c3bd493805f..0d3a62dccde2 100644
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
@@ -37,7 +37,7 @@ class Seekable : public css::io::XTruncate,
     public ::cppu::OWeakObject
 {
 private:
-    GSeekable * const mpStream;
+    GSeekable *mpStream;
 public:
     explicit Seekable( GSeekable *pStream );
     virtual ~Seekable() override;
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index d9571c758e86..5e5c63f940a7 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -84,7 +84,7 @@ class HierarchyDataAccess : public cppu::OWeakObject,
     uno::Reference< container::XElementAccess >          m_xCfgEA;
     uno::Reference< util::XChangesNotifier >             m_xCfgCN;
     uno::Reference< util::XChangesBatch >                m_xCfgCB;
-    bool const m_bReadOnly;
+    bool m_bReadOnly;
 
 public:
     HierarchyDataAccess( const uno::Reference<
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index fc1a0f0d9b64..2415714e7132 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -50,7 +50,7 @@ struct ResultListEntry
     uno::Reference< ucb::XContentIdentifier > xId;
     uno::Reference< ucb::XContent >           xContent;
     uno::Reference< sdbc::XRow >              xRow;
-    HierarchyEntryData const                  aData;
+    HierarchyEntryData                        aData;
 
     explicit ResultListEntry( const HierarchyEntryData& rEntry ) : aData( rEntry ) {}
 };
@@ -73,8 +73,8 @@ struct DataSupplier_Impl
     rtl::Reference< HierarchyContent >              m_xContent;
     uno::Reference< uno::XComponentContext >        m_xContext;
     HierarchyEntry                                  m_aFolder;
-    HierarchyEntry::iterator const                  m_aIterator;
-    sal_Int32 const                                 m_nOpenMode;
+    HierarchyEntry::iterator                        m_aIterator;
+    sal_Int32                                       m_nOpenMode;
     bool                                        m_bCountFinal;
 
     DataSupplier_Impl(
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index 596282b6a1f6..90e1b87a7bfd 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -51,7 +51,7 @@ namespace {
 
 struct ResultListEntry
 {
-    OUString const                            aURL;
+    OUString                                  aURL;
     uno::Reference< ucb::XContentIdentifier > xId;
     uno::Reference< ucb::XContent >           xContent;
     uno::Reference< sdbc::XRow >              xRow;
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index f364c9060d30..ee3db6ce087f 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -53,7 +53,7 @@ class Package : public cppu::OWeakObject,
 {
     friend ContentProvider;
 
-    OUString const                                       m_aName;
+    OUString                                             m_aName;
     uno::Reference< container::XHierarchicalNameAccess > m_xNA;
     ContentProvider*                                     m_pOwner;
 
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 218fc117e44e..33c4f11cbfa9 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -47,7 +47,7 @@ namespace {
 
 struct ResultListEntry
 {
-    OUString const                            aURL;
+    OUString                                  aURL;
     uno::Reference< ucb::XContentIdentifier > xId;
     uno::Reference< ucb::XContent >           xContent;
     uno::Reference< sdbc::XRow >              xRow;
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index a8df298e012d..acad1b4438e2 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -174,7 +174,7 @@ private:
     css::uno::Reference< css::embed::XTransactedObject >  m_xWrappedTransObj;
     css::uno::Reference< css::lang::XComponent >          m_xWrappedComponent;
     css::uno::Reference< css::lang::XTypeProvider >       m_xWrappedTypeProv;
-    bool const                                            m_bIsDocumentStorage;
+    bool                                                  m_bIsDocumentStorage;
 
     StorageElementFactory::StorageMap::iterator m_aContainerIt;
 
diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx
index 9e38d07172f8..0f6a34a3d0d8 100644
--- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx
@@ -195,9 +195,9 @@ namespace webdav_ucp
 
     struct ProppatchValue
     {
-        ProppatchOperation const  operation;
-        OUString const            name;
-        css::uno::Any const       value;
+        ProppatchOperation  operation;
+        OUString            name;
+        css::uno::Any       value;
 
         ProppatchValue( const ProppatchOperation o,
                         const OUString & n,
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
index 86fccb68a50f..fa64cb320374 100644
--- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
@@ -63,7 +63,7 @@ typedef std::map< NeonLock *, LockInfo > LockInfoMap;
 class NeonLockStore
 {
     osl::Mutex         m_aMutex;
-    ne_lock_store * const m_pNeonLockStore;
+    ne_lock_store    * m_pNeonLockStore;
     rtl::Reference< TickerThread > m_pTickerThread;
     LockInfoMap        m_aLockInfoMap;
     std::vector<NeonLock*> m_aRemoveDeferred;
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 061d97eda30c..51b477373571 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -52,10 +52,10 @@ private:
     OUString     m_aProxyName;
     sal_Int32         m_nPort;
     sal_Int32         m_nProxyPort;
-    css::uno::Sequence< css::beans::NamedValue > const m_aFlags;
+    css::uno::Sequence< css::beans::NamedValue > m_aFlags;
     HttpSession *     m_pHttpSession;
     bool m_bNeedNewSession = false; // Something happened that could invalidate m_pHttpSession
-    void * const      m_pRequestData;
+    void *            m_pRequestData;
     const ucbhelper::InternetProxyDecider & m_rProxyDecider;
 
     // @@@ This should really be per-request data. But Neon currently
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index dbe3102c744b..1a2c4503036d 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -94,7 +94,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
     ResourceType      m_eResourceTypeForLocks;
     ContentProvider*  m_pProvider; // No need for a ref, base class holds object
     bool              m_bTransient;
-    bool const        m_bCollection;
+    bool              m_bCollection;
     bool              m_bDidGetOrHead;
     std::vector< OUString > m_aFailedPropNames;
     // Options Cache lifetime
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 3051d3e465c7..7675f6c5d418 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -87,7 +87,7 @@ struct DataSupplier_Impl
     ResultList                                   m_Results;
     rtl::Reference< Content >                    m_xContent;
     uno::Reference< uno::XComponentContext >     m_xContext;
-    sal_Int32 const                              m_nOpenMode;
+    sal_Int32                                    m_nOpenMode;
     bool                                     m_bCountFinal;
     bool                                     m_bThrowException;