loplugin:mergeclasses

Change-Id: I592eef7503bd0b492f73ea5216f436302ad79ca8

7 files changed, 6 insertions, 81 deletions

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 0ed5086cef04..412b395f1b8d 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -326,4 +326,4 @@ merge ww8::WW8Struct with ww8::WW8Sttb
 merge xmloff::IEventAttacher with xmloff::OElementImport
 merge xmloff::IEventAttacherManager with xmloff::ODefaultEventAttacherManager
 merge xmloff::IFormsExportContext with xmloff::OFormLayerXMLExport_Impl
-merge xmloff::IPropertyHandler with xmloff::PropertyHandlerBase
+
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index bbda1060f37b..9575643ee951 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -176,7 +176,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/forms/property_meta_data \
     xmloff/source/forms/valueproperties \
     xmloff/source/forms/handler/form_handler_factory \
-    xmloff/source/forms/handler/property_handler_base \
     xmloff/source/forms/handler/vcl_date_handler \
     xmloff/source/forms/handler/vcl_time_handler \
     xmloff/source/meta/MetaExportComponent \
diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index 48658f129dfe..daa1f0f9ec12 100644
--- a/xmloff/inc/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -35,8 +35,7 @@ namespace xmloff
 
     typedef ::std::map< PropertyId, ::com::sun::star::uno::Any >    PropertyValues;
 
-    //= IPropertyHandler
-    class IPropertyHandler : public ::salhelper::SimpleReferenceObject
+    class PropertyHandlerBase : public ::salhelper::SimpleReferenceObject
     {
     public:
         /** retrieves the XML attribute value for the given property values
@@ -54,11 +53,11 @@ namespace xmloff
         virtual bool
             getPropertyValues( const OUString& i_attributeValue, PropertyValues& o_propertyValues ) const = 0;
 
-        virtual ~IPropertyHandler() { }
+        virtual ~PropertyHandlerBase() {}
     };
 
     //= PPropertyHandler
-    typedef ::rtl::Reference< IPropertyHandler >    PPropertyHandler;
+    typedef rtl::Reference< PropertyHandlerBase >    PPropertyHandler;
 
     //= PropertyHandlerFactory
     typedef PPropertyHandler (*PropertyHandlerFactory)( const PropertyId i_propertyId );
diff --git a/xmloff/source/forms/handler/property_handler_base.cxx b/xmloff/source/forms/handler/property_handler_base.cxx
deleted file mode 100644
index ea8f16bd1a4d..000000000000
--- a/xmloff/source/forms/handler/property_handler_base.cxx
+++ /dev/null
@@ -1,32 +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 .
- */
-
-#include "property_handler_base.hxx"
-
-namespace xmloff
-{
-
-    //= PropertyHandlerBase
-    PropertyHandlerBase::~PropertyHandlerBase()
-    {
-    }
-
-} // namespace xmloff
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx
deleted file mode 100644
index 0cf4d0d43e0d..000000000000
--- a/xmloff/source/forms/handler/property_handler_base.hxx
+++ /dev/null
@@ -1,41 +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_XMLOFF_SOURCE_FORMS_HANDLER_PROPERTY_HANDLER_BASE_HXX
-#define INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_PROPERTY_HANDLER_BASE_HXX
-
-#include "forms/property_handler.hxx"
-
-namespace xmloff
-{
-
-    //= PropertyHandlerBase
-    class PropertyHandlerBase : public IPropertyHandler
-    {
-    protected:
-        PropertyHandlerBase() {}
-
-        virtual ~PropertyHandlerBase();
-    };
-
-} // namespace xmloff
-
-#endif // INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_PROPERTY_HANDLER_BASE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx
index d188ca53e146..673efc773e33 100644
--- a/xmloff/source/forms/handler/vcl_date_handler.hxx
+++ b/xmloff/source/forms/handler/vcl_date_handler.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_DATE_HANDLER_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_DATE_HANDLER_HXX
 
-#include "property_handler_base.hxx"
+#include "forms/property_handler.hxx"
 
 namespace xmloff
 {
diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx
index 67a95ef1cb24..7dcc873f2146 100644
--- a/xmloff/source/forms/handler/vcl_time_handler.hxx
+++ b/xmloff/source/forms/handler/vcl_time_handler.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_TIME_HANDLER_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_TIME_HANDLER_HXX
 
-#include "property_handler_base.hxx"
+#include "forms/property_handler.hxx"
 
 namespace xmloff
 {