diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-16 06:57:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-16 06:57:26 +0000 |
| commit | ae562e931a98e708a75e8d140cf1ff24854acfc7 (patch) | |
| tree | 4ccb1ec3b4d4a9157e03f949d62b6687b8aa88eb /svx/inc | |
| parent | 7bf29c44efa5985f59c160ba5a75dc212f955d42 (diff) | |
CWS-TOOLING: integrate CWS odbmacros3
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/macropg.hxx | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/svx/inc/macropg.hxx b/svx/inc/macropg.hxx index d5af503adf20..1eba2a28f596 100644 --- a/svx/inc/macropg.hxx +++ b/svx/inc/macropg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macropg.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.166.1 $ * * This file is part of OpenOffice.org. * @@ -45,9 +45,22 @@ #include "svx/svxdllapi.h" #include <hash_map> +#include <vector> typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; -typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > UIEventsStringHash; + +struct SVX_DLLPRIVATE EventDisplayName +{ + const sal_Char* pAsciiEventName; + USHORT nEventResourceID; + EventDisplayName() : pAsciiEventName( NULL ), nEventResourceID(0) { } + EventDisplayName( const sal_Char* _pAsciiName, const USHORT _nResId ) + : pAsciiEventName( _pAsciiName ) + , nEventResourceID( _nResId ) + { + } +}; +typedef ::std::vector< EventDisplayName > EventDisplayNames; class _SvxMacroTabPage; class SvStringsDtor; @@ -77,7 +90,7 @@ protected: EventsHash m_appEventsHash; EventsHash m_docEventsHash; bool bReadOnly, bDocModified, bAppEvents, bInitialized; - UIEventsStringHash aUIStrings; + EventDisplayNames aDisplayNames; _SvxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet ); |