mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert framework::AcceleratorConfigurationReader to WeakImplHelper

Browse Source 
Change-Id: I2e2528c539ba93eb72466bd361c189be5746ecfe
This commit is contained in:
Noel Grandin
2013-07-02 16:36:13 +02:00
parent ca8bdb17df
commit a30c91fd02
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
framework/inc/xml/acceleratorconfigurationreader.hxx
View File

@@ -31,14 +31,13 @@
#include <com/sun/star/xml/sax/XLocator.hpp> #include <com/sun/star/xml/sax/XLocator.hpp>
#include <salhelper/singletonref.hxx> #include <salhelper/singletonref.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
namespace framework{ namespace framework{
class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler class AcceleratorConfigurationReader : private ThreadHelpBase
, private ThreadHelpBase , public ::cppu::WeakImplHelper1< css::xml::sax::XDocumentHandler >
, public ::cppu::OWeakObject
{ {
//------------------------------------------- //-------------------------------------------
// const, types // const, types
@@ -134,10 +133,6 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler
/** @short does nothing real ... */ /** @short does nothing real ... */
virtual ~AcceleratorConfigurationReader(); virtual ~AcceleratorConfigurationReader();
//---------------------------------------
// XInterface
FWK_DECLARE_XINTERFACE
//--------------------------------------- //---------------------------------------
// XDocumentHandler // XDocumentHandler
virtual void SAL_CALL startDocument() virtual void SAL_CALL startDocument()

7
framework/source/xml/acceleratorconfigurationreader.cxx
View File

@@ -56,16 +56,9 @@ namespace framework{
css::uno::Any()); \ css::uno::Any()); \
} }
//-----------------------------------------------
// XInterface
DEFINE_XINTERFACE_1(AcceleratorConfigurationReader ,
OWeakObject ,
DIRECT_INTERFACE(css::xml::sax::XDocumentHandler))
//----------------------------------------------- //-----------------------------------------------
AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer) AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer)
: ThreadHelpBase (&Application::GetSolarMutex()) : ThreadHelpBase (&Application::GetSolarMutex())
, OWeakObject ( )
, m_rContainer (rContainer ) , m_rContainer (rContainer )
, m_bInsideAcceleratorList(sal_False ) , m_bInsideAcceleratorList(sal_False )
, m_bInsideAcceleratorItem(sal_False ) , m_bInsideAcceleratorItem(sal_False )