loplugin:mergeclasses

Change-Id: Id6e39c2c20ab3da5a8b8628f99a940b896feff78

compilerplugins/clang/mergeclasses.results

@@ -119,7 +119,6 @@ merge dbmm::IMigrationProgress with dbmm::ProgressPage
 merge dbmm::IProgressConsumer with dbmm::ProgressDelegator
 merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot
 merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
-merge frm::IAttributeHandler with frm::AttributeHandler
 merge frm::ICommandDescriptionProvider with frm::DefaultCommandDescriptionProvider
 merge frm::ICommandImageProvider with frm::DocumentCommandImageProvider
 merge frm::IEngineStatusListener with frm::RichTextControlImpl

forms/source/richtext/richtextimplcontrol.cxx

@@ -185,7 +185,7 @@ namespace frm
         AttributeHandlerPool::const_iterator aHandlerPos = m_aAttributeHandlers.find( _nAttributeId  );
         if ( aHandlerPos == m_aAttributeHandlers.end() )
         {
-            ::rtl::Reference< IAttributeHandler > aHandler = AttributeHandlerFactory::getHandlerFor( _nAttributeId, *m_pEngine->GetEmptyItemSet().GetPool() );
+            ::rtl::Reference< AttributeHandler > aHandler = AttributeHandlerFactory::getHandlerFor( _nAttributeId, *m_pEngine->GetEmptyItemSet().GetPool() );
             OSL_ENSURE( aHandler.is(), "RichTextControlImpl::enableAttributeNotification: no handler available for this attribute!" );
             if ( !aHandler.is() )
                 return;

forms/source/richtext/richtextimplcontrol.hxx

@@ -43,7 +43,7 @@ namespace frm
     class RichTextControlImpl : public IEngineStatusListener
     {
         typedef ::std::map< AttributeId, AttributeState >                           StateCache;
-        typedef ::std::map< AttributeId, ::rtl::Reference< IAttributeHandler > >    AttributeHandlerPool;
+        typedef ::std::map< AttributeId, ::rtl::Reference< AttributeHandler > >    AttributeHandlerPool;
         typedef ::std::map< AttributeId, ITextAttributeListener* >                  AttributeListenerPool;
 
         StateCache              m_aLastKnownStates;

forms/source/richtext/rtattributehandler.cxx

@@ -114,9 +114,9 @@ namespace frm
         }
     }
 
-    ::rtl::Reference< IAttributeHandler > AttributeHandlerFactory::getHandlerFor( AttributeId _nAttributeId, const SfxItemPool& _rEditEnginePool )
+    ::rtl::Reference< AttributeHandler > AttributeHandlerFactory::getHandlerFor( AttributeId _nAttributeId, const SfxItemPool& _rEditEnginePool )
     {
-        ::rtl::Reference< IAttributeHandler > pReturn;
+        ::rtl::Reference< AttributeHandler > pReturn;
         switch ( _nAttributeId )
         {
         case SID_ATTR_PARA_ADJUST_LEFT  :

forms/source/richtext/rtattributehandler.hxx

@@ -34,18 +34,7 @@ class SfxItemPool;
 namespace frm
 {
 
-    class IAttributeHandler : public salhelper::SimpleReferenceObject
-    {
-    public:
-        virtual     AttributeId     getAttributeId( ) const = 0;
-        virtual     AttributeState  getState( const SfxItemSet& _rAttribs ) const = 0;
-        virtual     void            executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const = 0;
-
-    protected:
-        virtual ~IAttributeHandler() {}
-    };
-
-    class AttributeHandler  : public IAttributeHandler
+    class AttributeHandler  : public salhelper::SimpleReferenceObject
     {
     private:
         AttributeId     m_nAttribute;
@@ -58,20 +47,19 @@ namespace frm
     public:
         AttributeHandler( AttributeId _nAttributeId, WhichId _nWhichId );
 
-        // IAttributeHandler
-        virtual     AttributeId     getAttributeId( ) const SAL_OVERRIDE;
-        virtual     AttributeState  getState( const SfxItemSet& _rAttribs ) const SAL_OVERRIDE;
-        virtual     void            executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const SAL_OVERRIDE = 0;
+        AttributeId             getAttributeId( ) const;
+        virtual AttributeState  getState( const SfxItemSet& _rAttribs ) const;
+        virtual void            executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const = 0;
 
     protected:
         /// helper method calling implGetCheckState
-        AttributeCheckState getCheckState( const SfxItemSet& _rAttribs ) const;
+        AttributeCheckState     getCheckState( const SfxItemSet& _rAttribs ) const;
 
         /// helper method putting an item into a set, respecting a script type
-        void        putItemForScript( SfxItemSet& _rAttribs, const SfxPoolItem& _rItem, SvtScriptType _nForScriptType ) const;
+        void                    putItemForScript( SfxItemSet& _rAttribs, const SfxPoolItem& _rItem, SvtScriptType _nForScriptType ) const;
 
         // pseudo-abstract
-        virtual     AttributeCheckState  implGetCheckState( const SfxPoolItem& _rItem ) const;
+        virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const;
 
     protected:
         virtual ~AttributeHandler();
@@ -79,7 +67,7 @@ namespace frm
 
     namespace AttributeHandlerFactory
     {
-        ::rtl::Reference< IAttributeHandler > getHandlerFor( AttributeId _nAttributeId, const SfxItemPool& _rEditEnginePool );
+        ::rtl::Reference< AttributeHandler > getHandlerFor( AttributeId _nAttributeId, const SfxItemPool& _rEditEnginePool );
     }
 
     class ParaAlignmentHandler : public AttributeHandler