diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 16:54:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 16:54:14 +0000 |
| commit | a6a6eaa336ffe19564ce5e475e0cafe309ef545b (patch) | |
| tree | 731ef6c8d7c88b8839c80c07d7acf2483b149592 /chart2/source/controller | |
| parent | ce25dc2e3e4dbe50511e4c601a1841cf9a17ba2d (diff) | |
INTEGRATION: CWS chart2mst3 (1.2.4); FILE MERGED
2006/01/27 09:51:20 bm 1.2.4.4: InlineContainer.hxx moved to comphelper
2005/10/07 11:26:31 bm 1.2.4.3: RESYNC: (1.2-1.3); FILE MERGED
2004/05/07 09:14:08 bm 1.2.4.2: enabling member-ids for all items
2004/02/13 16:51:18 bm 1.2.4.1: join from changes on branch bm_post_chart01
Diffstat (limited to 'chart2/source/controller')
| -rw-r--r-- | chart2/source/controller/inc/ItemPropertyMap.hxx | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx index f30c295971c0..5937eac2f52c 100644 --- a/chart2/source/controller/inc/ItemPropertyMap.hxx +++ b/chart2/source/controller/inc/ItemPropertyMap.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ItemPropertyMap.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 00:23:30 $ + * last change: $Author: vg $ $Date: 2007-05-22 17:54:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,15 +35,28 @@ #ifndef CHART_ITEMPROPERTYMAP_HXX #define CHART_ITEMPROPERTYMAP_HXX -#include "InlineContainer.hxx" + +#ifndef INCLUDED_COMPHELPER_INLINE_CONTAINER_HXX +#include <comphelper/InlineContainer.hxx> +#endif + +#ifndef CHART_ITEMCONVERTER_HXX +#include "ItemConverter.hxx" +#endif + + +#define IPM_MAP_ENTRY(wid,uno,mid) (wid, ::std::make_pair< ::comphelper::ItemConverter::tPropertyNameType, ::comphelper::ItemConverter::tMemberIdType >(\ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(uno)), mid)) namespace comphelper { -typedef ::std::map< USHORT, ::rtl::OUString > ItemPropertyMapType; -typedef ::comphelper::MakeMap< USHORT, ::rtl::OUString > MakeItemPropertyMap; +typedef ::std::map< ItemConverter::tWhichIdType, ::std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > > + ItemPropertyMapType; +typedef ::comphelper::MakeMap< ItemConverter::tWhichIdType, ::std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > > + MakeItemPropertyMap; -class FillItemSetFunc : public ::std::unary_function< void, ItemConverter * > +class FillItemSetFunc : public ::std::unary_function< ItemConverter *, void > { public: explicit FillItemSetFunc( SfxItemSet & rOutItemSet ) : @@ -59,7 +72,7 @@ private: SfxItemSet & m_rOutItemSet; }; -class ApplyItemSetFunc : public ::std::unary_function< void, ItemConverter * > +class ApplyItemSetFunc : public ::std::unary_function< ItemConverter *, void > { public: explicit ApplyItemSetFunc( const SfxItemSet & rItemSet, @@ -78,7 +91,7 @@ private: bool & m_rOutResult; }; -struct DeleteItemConverterPtr : public ::std::unary_function< void, ItemConverter * > +struct DeleteItemConverterPtr : public ::std::unary_function< ItemConverter *, void > { void operator() ( ItemConverter * pConv ) { delete pConv; } |