loplugin:mergeclasses

Change-Id: I6266369912413d51c9f1595b13dca97d3d74225f

compilerplugins/clang/mergeclasses.results

@@ -128,7 +128,6 @@ merge frm::IMultiAttributeDispatcher with frm::RichTextControl
 merge frm::ITextAttributeListener with frm::OAttributeDispatcher
 merge frm::ITextSelectionListener with frm::ORichTextPeer
 merge ftp::CurlInput with InsertData
-merge ftp::FTPHandleProvider with ftp::FTPContentProvider
 merge ftp::ResultSetFactory with ResultSetFactoryI
 merge helpdatafileproxy::hdf_internal::Noncopyable with helpdatafileproxy::Hdf
 merge i_xml_parser_event_handler with (anonymous namespace)::recently_used_file_filter

ucb/source/ucp/ftp/ftpcontentprovider.hxx

@@ -25,7 +25,6 @@
 #include <ucbhelper/proxydecider.hxx>
 #include <ucbhelper/providerhelper.hxx>
 #include <com/sun/star/ucb/XContentProviderManager.hpp>
-#include "ftphandleprovider.hxx"
 #include "ftpurl.hxx"
 
 // UNO service name for the provider. This name will be used by the UCB to
@@ -42,8 +41,7 @@ namespace ftp
     class FTPLoaderThread;
 
     class FTPContentProvider:
-        public ::ucbhelper::ContentProviderImplHelper,
+        public ::ucbhelper::ContentProviderImplHelper
-        public FTPHandleProvider
     {
     public:
 
@@ -93,21 +91,22 @@ namespace ftp
                    css::uno::RuntimeException,
                    std::exception ) SAL_OVERRIDE;
 
-        // FTPHandleProvider.
+        CURL* handle();
 
-        virtual CURL* handle() SAL_OVERRIDE;
+        /** host is in the form host:port.
+         */
 
-        virtual bool forHost(const OUString& host,
+        bool forHost(const OUString& host,
                              const OUString& port,
                              const OUString& username,
                              OUString& password,
-                             OUString& account) SAL_OVERRIDE;
+                             OUString& account);
 
-        virtual bool setHost(const OUString& host,
+        bool setHost(const OUString& host,
                              const OUString& port,
                              const OUString& username,
                              const OUString& password,
-                             const OUString& account) SAL_OVERRIDE;
+                             const OUString& account);
 
         struct ServerInfo
         {

ucb/source/ucp/ftp/ftphandleprovider.hxx

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPHANDLEPROVIDER_HXX
-#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPHANDLEPROVIDER_HXX
-
-#include <rtl/ustring.hxx>
-#include "curl.hxx"
-
-namespace ftp {
-
-    class FTPHandleProvider {
-    public:
-
-        virtual CURL* handle() = 0;
-
-
-        /** host is in the form host:port.
-         */
-
-        virtual bool forHost(const OUString& host,
-                             const OUString& port,
-                             const OUString& username,
-                             OUString& password,
-                             OUString& account) = 0;
-
-        virtual bool setHost(const OUString& host,
-                             const OUString& port,
-                             const OUString& username,
-                             const OUString& password,
-                             const OUString& account) = 0;
-
-    protected:
-        ~FTPHandleProvider() {}
-    };
-
-
-}
-
-#endif // INCLUDED_UCB_SOURCE_UCP_FTP_FTPHANDLEPROVIDER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

ucb/source/ucp/ftp/ftpurl.cxx

@@ -35,7 +35,7 @@
 
 #include "ftpstrcont.hxx"
 #include "ftpurl.hxx"
-#include "ftphandleprovider.hxx"
+#include "ftpcontentprovider.hxx"
 #include "ftpcfunc.hxx"
 #include "ftpcontainer.hxx"
 #include <memory>
@@ -126,7 +126,7 @@ FTPURL::FTPURL(const FTPURL& r)
 
 
 FTPURL::FTPURL(const OUString& url,
-               FTPHandleProvider* pFCP)
+               FTPContentProvider* pFCP)
     throw(
         malformed_exception
     )

ucb/source/ucp/ftp/ftpurl.hxx

@@ -43,7 +43,7 @@ namespace ftp {
     /** Forward declarations.
      */
 
-    class FTPHandleProvider;
+    class FTPContentProvider;
 
 
     enum FTPErrors { FILE_EXIST_DURING_INSERT = CURL_LAST +1,
@@ -84,7 +84,7 @@ namespace ftp {
 
         FTPURL(
             const OUString& aIdent,
-            FTPHandleProvider* pFCP = 0
+            FTPContentProvider* pFCP = 0
         )
             throw(
                 malformed_exception
@@ -142,7 +142,7 @@ namespace ftp {
 
     private:
 
-        FTPHandleProvider *m_pFCP;
+        FTPContentProvider *m_pFCP;
 
         mutable OUString m_aUsername;
         bool m_bShowPassword;