summaryrefslogtreecommitdiff
path: root/xmlhelp/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-09 12:39:01 +0200
committerNoel Grandin <noel@peralex.com>2015-10-12 09:13:34 +0200
commit6b34ac24194ae56d2762fcb67ad1e5dcf1bf3a82 (patch)
tree95f8e6adef8319701ee0894b28a5242b3194c0e9 /xmlhelp/source
parent06e4a9899085465bb352d612e06a07b8ff536892 (diff)
loplugin:mergeclasses
Change-Id: Ic02d59708670949c3342566753882eebd086438f
Diffstat (limited to 'xmlhelp/source')
-rw-r--r--xmlhelp/source/cxxhelp/provider/db.hxx17
1 files changed, 4 insertions, 13 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 1fc09e47f45d..72eaf9456432 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/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