diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-10-01 11:24:01 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-01 14:46:19 +0100 |
| commit | e89b0abfaa75f48f187565d7f4e6041e2f2ed5b3 (patch) | |
| tree | 1b9b95aba40775cfad751de9e90303c609fc369f /svx/inc | |
| parent | f410283f26dd2e850031e919666062344b744a16 (diff) | |
Port binfilter crash-on-exit fix ...
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/unoprov.hxx | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index 34cb60371582..46ab2b48c97a 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -29,6 +29,7 @@ #define SVX_UNOPROV_HXX #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <svl/itemprop.hxx> #include <tools/list.hxx> #include "svx/svxdllapi.h" @@ -40,29 +41,14 @@ class SfxItemPool; * class UHashMap * ***********************************************************************/ -struct UHashMapEntry -{ - ::rtl::OUString aIdentifier; - UINT32 nId; - - UHashMapEntry(const sal_Char * value, sal_Int32 length, UINT32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { } -}; - -DECLARE_LIST( UHashMapEntryList, UHashMapEntry* ) - -#define HASHARRAYSIZE 0x10 #define UHASHMAP_NOTFOUND sal::static_int_cast< UINT32 >(~0) - class UHashMap { -private: - UHashMapEntryList m_aHashList[HASHARRAYSIZE]; - + UHashMap() {} public: - UHashMap( UHashMapEntry* pMap ); - ~UHashMap() {}; - - UINT32 getId( const ::rtl::OUString& rCompareString ); + static sal_uInt32 getId( const ::rtl::OUString& rCompareString ); + static rtl::OUString getNameFromId (sal_uInt32 nId); + static ::com::sun::star::uno::Sequence< rtl::OUString > getServiceNames(); }; /*********************************************************************** @@ -119,8 +105,6 @@ const sal_Int16 OBJ_OLE2_APPLET = 100; const sal_Int16 OBJ_OLE2_PLUGIN = 101; extern SvxUnoPropertyMapProvider aSvxMapProvider; -extern UHashMapEntry pSdrShapeIdentifierMap[]; -extern UHashMap aSdrShapeIdentifierMap; #define E3D_INVENTOR_FLAG (0x80000000) |