loplugin:mergeclasses

Change-Id: Ic02d59708670949c3342566753882eebd086438f

compilerplugins/clang/mergeclasses.results

@@ -129,7 +129,6 @@ merge frm::ITextAttributeListener with frm::OAttributeDispatcher
 merge frm::ITextSelectionListener with frm::ORichTextPeer
 merge ftp::CurlInput with InsertData
 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
 merge io_stm::IRingBuffer with io_stm::MemRingBuffer
 merge io_stm::I_FIFO with io_stm::MemFIFO

xmlhelp/source/cxxhelp/provider/db.hxx

@@ -27,18 +27,6 @@
 
 namespace helpdatafileproxy {
 
-    namespace hdf_internal
-    {
-        class Noncopyable
-        {
-            Noncopyable(const Noncopyable&) SAL_DELETED_FUNCTION;
-            void operator=(const Noncopyable&) SAL_DELETED_FUNCTION;
-        protected:
-            Noncopyable() {}
-            ~Noncopyable() {}
-        };
-    }
-
     class HDFData
     {
         friend class        Hdf;
@@ -65,7 +53,7 @@ namespace helpdatafileproxy {
     typedef std::unordered_map< OString,std::pair<int,int>,OStringHash >   StringToValPosMap;
     typedef std::unordered_map< OString,OString,OStringHash >     StringToDataMap;
 
-    class Hdf : hdf_internal::Noncopyable
+    class Hdf
     {
         OUString       m_aFileURL;
         StringToDataMap*    m_pStringToDataMap;
@@ -108,7 +96,10 @@ namespace helpdatafileproxy {
         bool startIteration();
         bool getNextKeyAndValue( HDFData& rKey, HDFData& rValue );
         void stopIteration();
+        Hdf(const Hdf&) SAL_DELETED_FUNCTION;
+        void operator=(const Hdf&) SAL_DELETED_FUNCTION;
     };
+
 }
 
 #endif