summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compilerplugins/clang/mergeclasses.results1
-rw-r--r--forms/source/richtext/richtextimplcontrol.cxx2
-rw-r--r--forms/source/richtext/richtextimplcontrol.hxx2
-rw-r--r--forms/source/richtext/rtattributehandler.cxx4
-rw-r--r--forms/source/richtext/rtattributehandler.hxx28
5 files changed, 12 insertions, 25 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 6d669f132f98..62fbf55db1f5 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/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
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 2bece2f25133..040fda57952c 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/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;
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index 7d0f3489a78d..7f8652449482 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/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;
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index 89b3221affdb..da0d9c4596ad 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/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 :
diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx
index 6555369a41cf..3d27321c2cea 100644
--- a/forms/source/richtext/rtattributehandler.hxx
+++ b/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
generated by cgit (git 2.34.1) at 2024-08-13 23:53:56 +0000