7 files changed, 6 insertions, 25 deletions
diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index 90a28229f9dd..eec9d2d26926 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
@@ -91,11 +91,10 @@ class Content_Impl;
   * convenient API for frequently used functionality then the "raw"
   * UCB-API does.
   */
-class UCBHELPER_DLLPUBLIC Content
+class UCBHELPER_DLLPUBLIC Content final
 {
     rtl::Reference< Content_Impl > m_xImpl;
 
-protected:
     /// @throws css::ucb::CommandAbortedException
     /// @throws css::uno::RuntimeException,
     /// @throws css::uno::Exception
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index e6f55d70c750..b30fd3735587 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -76,15 +76,12 @@ ResultSetColumnData::ResultSetColumnData()
  * css::sdbc::XResultSetMetaDataSupplier, which is required for
  * implementations of service com.sun.star.ucb.ContentResultSet.
  */
-class UCBHELPER_DLLPUBLIC ResultSetMetaData :
+class UCBHELPER_DLLPUBLIC ResultSetMetaData final :
                 public ::cppu::OWeakObject,
                 public css::lang::XTypeProvider,
                 public css::sdbc::XResultSetMetaData
 {
-private:
     std::unique_ptr<ucbhelper_impl::ResultSetMetaData_Impl> m_pImpl;
-
-protected:
     css::uno::Reference< css::uno::XComponentContext >    m_xContext;
     css::uno::Sequence< css::beans::Property >            m_aProps;
 
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index ae3c02c525b3..bd317df8e0cb 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -362,13 +362,12 @@ private:
 };
 
 
-class CachedContentResultSetFactory
+class CachedContentResultSetFactory final
                 : public cppu::OWeakObject
                 , public css::lang::XTypeProvider
                 , public css::lang::XServiceInfo
                 , public css::ucb::XCachedContentResultSetFactory
 {
-protected:
     css::uno::Reference< css::uno::XComponentContext >    m_xContext;
 
 public:
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 81387c50867a..3c03e8cd3854 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -137,13 +137,12 @@ public:
 };
 
 
-class CachedContentResultSetStubFactory
+class CachedContentResultSetStubFactory final
                 : public cppu::OWeakObject
                 , public css::lang::XTypeProvider
                 , public css::lang::XServiceInfo
                 , public css::ucb::XCachedContentResultSetStubFactory
 {
-protected:
     css::uno::Reference< css::lang::XMultiServiceFactory >    m_xSMgr;
 
 public:
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 07b9f991d716..2d61acec1114 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -74,13 +74,12 @@ public:
 };
 
 
-class CachedDynamicResultSetFactory
+class CachedDynamicResultSetFactory final
                 : public cppu::OWeakObject
                 , public css::lang::XTypeProvider
                 , public css::lang::XServiceInfo
                 , public css::ucb::XCachedDynamicResultSetFactory
 {
-protected:
     css::uno::Reference< css::uno::XComponentContext >    m_xContext;
 
 public:
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index 54edc472ad7b..eb2102332601 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -64,13 +64,12 @@ public:
 };
 
 
-class CachedDynamicResultSetStubFactory
+class CachedDynamicResultSetStubFactory final
                 : public cppu::OWeakObject
                 , public css::lang::XTypeProvider
                 , public css::lang::XServiceInfo
                 , public css::ucb::XCachedDynamicResultSetStubFactory
 {
-protected:
     css::uno::Reference< css::uno::XComponentContext >    m_xContext;
 
 public:
diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx
index f7899edf7dd2..2967b3b58ba4 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.hxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.hxx
@@ -28,17 +28,6 @@
 #include <rtl/ustring.hxx>
 
 
-namespace ftp {
-
-    class FTPStreamContainer
-    {
-    protected:
-        ~FTPStreamContainer() {}
-    };
-
-}
-
-
 extern "C" {
 
     /** callback for curl_easy_perform(),