diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-28 15:01:43 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:40 +0200 |
commit | 6bb742b9cbbdabbbd53dd9cdf6cb165e4b30bf86 (patch) | |
tree | e483f00c38dd38429e307a170f80d95dddf57d0e /include/unotools | |
parent | a9bfa6547ae2a4721363289f3816568e6a7e6a2d (diff) |
convert STR_EVENT constants to scoped enum
- also add needed infrastructure to o3tl::enumarray so we can use
std::find on it
- move the Impl inside the .cxx file, no need to expose it in the header
Change-Id: I7758a6175849f46723d97b1e657f846524c3b7cd
Diffstat (limited to 'include/unotools')
-rw-r--r-- | include/unotools/eventcfg.hxx | 90 |
1 files changed, 33 insertions, 57 deletions
diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index d1cc6fe95e30..ff11795e20f3 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -29,65 +29,41 @@ #include <unordered_map> #include <vector> -#define STR_EVENT_STARTAPP 0 -#define STR_EVENT_CLOSEAPP 1 -#define STR_EVENT_DOCCREATED 2 -#define STR_EVENT_CREATEDOC 3 -#define STR_EVENT_LOADFINISHED 4 -#define STR_EVENT_OPENDOC 5 -#define STR_EVENT_PREPARECLOSEDOC 6 -#define STR_EVENT_CLOSEDOC 7 -#define STR_EVENT_SAVEDOC 8 -#define STR_EVENT_SAVEDOCDONE 9 -#define STR_EVENT_SAVEDOCFAILED 10 -#define STR_EVENT_SAVEASDOC 11 -#define STR_EVENT_SAVEASDOCDONE 12 -#define STR_EVENT_SAVEASDOCFAILED 13 -#define STR_EVENT_SAVETODOC 14 -#define STR_EVENT_SAVETODOCDONE 15 -#define STR_EVENT_SAVETODOCFAILED 16 -#define STR_EVENT_ACTIVATEDOC 17 -#define STR_EVENT_DEACTIVATEDOC 18 -#define STR_EVENT_PRINTDOC 19 -#define STR_EVENT_VIEWCREATED 20 -#define STR_EVENT_PREPARECLOSEVIEW 21 -#define STR_EVENT_CLOSEVIEW 22 -#define STR_EVENT_MODIFYCHANGED 23 -#define STR_EVENT_TITLECHANGED 24 -#define STR_EVENT_VISAREACHANGED 25 -#define STR_EVENT_MODECHANGED 26 -#define STR_EVENT_STORAGECHANGED 27 - -typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > EventBindingHash; -typedef std::vector< css::uno::WeakReference< css::frame::XFrame > > FrameVector; -typedef std::vector< OUString > SupportedEventsVector; - -class GlobalEventConfig_Impl : public utl::ConfigItem +enum class GlobalEventId { -private: - EventBindingHash m_eventBindingHash; - FrameVector m_lFrames; - SupportedEventsVector m_supportedEvents; - - void initBindingInfo(); - - virtual void ImplCommit() SAL_OVERRIDE; - -public: - GlobalEventConfig_Impl( ); - virtual ~GlobalEventConfig_Impl( ); - - void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; - - void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); - bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); - OUString GetEventName( sal_Int32 nID ); + STARTAPP, + CLOSEAPP, + DOCCREATED, + CREATEDOC, + LOADFINISHED, + OPENDOC, + PREPARECLOSEDOC, + CLOSEDOC, + SAVEDOC, + SAVEDOCDONE, + SAVEDOCFAILED, + SAVEASDOC, + SAVEASDOCDONE, + SAVEASDOCFAILED, + SAVETODOC, + SAVETODOCDONE, + SAVETODOCFAILED, + ACTIVATEDOC, + DEACTIVATEDOC, + PRINTDOC, + VIEWCREATED, + PREPARECLOSEVIEW, + CLOSEVIEW, + MODIFYCHANGED, + TITLECHANGED, + VISAREACHANGED, + MODECHANGED, + STORAGECHANGED, + LAST = STORAGECHANGED }; +class GlobalEventConfig_Impl; + class UNOTOOLS_DLLPUBLIC GlobalEventConfig: public ::cppu::WeakImplHelper2 < ::com::sun::star::document::XEventsSupplier, ::com::sun::star::container::XNameReplace > { @@ -103,7 +79,7 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig: sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static OUString GetEventName( sal_Int32 nID ); + static OUString GetEventName( GlobalEventId nID ); private: static GlobalEventConfig_Impl* m_pImpl; |