CWS-TOOLING: integrate CWS os128

2009-04-22 12:58:26 +0200 b_michaelsen  r271093 : #i101084# using the frames enumeration for other SwXFrames-queries; also added a complex test to ensure the behavior to be the same
2009-04-20 14:53:03 +0200 mav  r270987 : #i101219# adjust the testcases to test memory cache and temporary file cache
2009-04-20 14:52:09 +0200 mav  r270986 : #i101219#,#i99077# use memory to cache data; no precopying on commit
2009-04-20 14:39:21 +0200 mav  r270984 : #i101219# use memory to cache data
2009-04-20 14:39:08 +0200 mav  r270983 : #i101219# use memory to cache data
2009-04-20 14:38:45 +0200 mav  r270982 : #i101219# use memory to cache data
2009-04-17 07:37:52 +0200 os  r270912 : CWS-TOOLING: rebase CWS os128 to trunk@270723 (milestone: DEV300:m46)
2009-04-15 14:54:18 +0200 b_michaelsen  r270845 : #i101084# using frame enumerations for paragraph export for better performance
2009-04-15 14:52:54 +0200 b_michaelsen  r270843 : #i101084# implemented XEnumerationAccess interface on framesets
2009-04-03 17:08:10 +0200 mav  r270504 : #i100722# do not compress streams of known compressed types per default
2009-04-03 13:49:50 +0200 os  r270484 : resync error fixed
2009-04-03 12:55:32 +0200 mav  r270470 : #i100722# do not compress streams of known compressed types per default
2009-04-03 10:00:58 +0200 os  r270463 : resync error fixed
2009-04-03 09:52:53 +0200 os  r270462 : resync error fixed
2009-04-03 09:10:14 +0200 os  r270449 : #i99568# string compare operator of hash_map changed
2009-04-03 09:03:49 +0200 os  r270446 : #i100683# normalize file URLs
2009-04-02 11:09:27 +0200 os  r270381 : #i100683# making URLs relative without file access
2009-04-02 09:04:42 +0200 os  r270366 : CWS-TOOLING: rebase CWS os128 to trunk@270033 (milestone: DEV300:m45)
2009-03-31 08:08:37 +0200 os  r270258 : #i100683# reducing calls to URIHelper::simpleNormalizeMakeRelative()
2009-03-19 17:06:22 +0100 os  r269756 : #i99568# XTolerantMultiPropertySet activated
2009-03-16 11:46:14 +0100 os  r269517 : wrong commit to #i97471# removed
2009-03-16 11:36:50 +0100 os  r269514 : #i97471# SwDrawTextShell::Init(): mouse double click and key input in group objects at the same time: prevent crash
2009-03-13 11:08:54 +0100 os  r269464 : #i99568# static SfxItemPropertySet
2009-03-13 11:03:22 +0100 os  r269463 : #i99568# static SfxItemPropertySet
2009-03-11 12:59:27 +0100 os  r269320 : #i99568# WhichId of properties handled from ScDocOptionsObj added
2009-03-06 09:09:58 +0100 os  r268972 : #i99568# SfxItemPropertySet improvements
2009-03-05 20:54:43 +0100 os  r268942 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 20:19:52 +0100 os  r268941 : #i99568# SfxItemPropertySet improvements
2009-03-05 20:05:03 +0100 os  r268940 : #i99568# SfxItemPropertySet improvements
2009-03-05 18:54:47 +0100 os  r268936 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 17:51:38 +0100 os  r268931 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 17:33:03 +0100 os  r268930 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 15:53:00 +0100 os  r268920 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 15:52:50 +0100 os  r268919 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 15:50:41 +0100 os  r268918 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 15:41:04 +0100 os  r268916 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 15:40:40 +0100 os  r268915 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 10:16:20 +0100 os  r268881 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-05 10:15:55 +0100 os  r268880 : #i99568# Sfx/SvxItemPropertySet improvements
2009-03-03 08:40:09 +0100 os  r268704 : ScTableSheetObj::GetItemPropertyMap fixed
2009-03-03 07:50:00 +0100 os  r268703 : SfxItemProperty set as pointer
2009-03-03 07:49:46 +0100 os  r268702 : SfxItemProperty set as pointer
2009-03-02 08:15:37 +0100 os  r268631 : minor fix
2009-03-02 07:58:38 +0100 os  r268630 : minor fix
2009-02-27 13:03:25 +0100 os  r268584 : exports
2009-02-27 11:17:04 +0100 os  r268567 : debug code removed
2009-02-27 11:04:07 +0100 os  r268565 : duplicate return removed
2009-02-27 10:17:37 +0100 os  r268558 : syntax fixed
2009-02-27 09:56:14 +0100 os  r268554 : #i99568# type mix fixed
2009-02-27 09:40:56 +0100 os  r268553 : #i99568# exports changes reverted
2009-02-25 12:50:54 +0100 os  r268433 : #i99568# SfxItemPropertySet rework
2009-02-25 12:13:39 +0100 os  r268432 : #i99568# SfxItemPropertySet rework
2009-02-25 12:12:47 +0100 os  r268431 : #i99568# SfxItemPropertySet rework
2009-02-25 12:10:27 +0100 os  r268430 : #i99568# SfxItemPropertySet rework
2009-02-25 12:09:36 +0100 os  r268429 : #i99568# SfxItemPropertySet rework
2009-02-25 12:07:39 +0100 os  r268428 : #i99568# SfxItemPropertySet rework
2009-02-25 11:59:35 +0100 os  r268427 : #i99568# SfxItemPropertySet rework
2009-02-25 11:52:52 +0100 os  r268425 : #i99568# SfxItemPropertySet rework
2009-02-25 11:49:17 +0100 os  r268424 : #i99568# SfxItemPropertySet rework
2009-02-25 11:45:17 +0100 os  r268423 : #i99568# SfxItemPropertySet rework
2009-02-11 11:39:04 +0100 os  r267587 : #i57008# use registration of index marks at SwUnoCallback

18 files changed, 118 insertions, 116 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 04808bd1a8fc..ac64dcb85510 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -911,6 +911,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 
 #define FN_UNO_PARA_CONT_PREV_SUBTREE       (FN_EXTRA2 + 109)
 #define FN_UNO_PARA_NUM_STRING              (FN_EXTRA2 + 110)
+#define FN_UNO_TABLE_NAME                   (FN_EXTRA2 + 111)
 
 /*--------------------------------------------------------------------
     Bereich: Hilfe
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3985ddd7c829..a82ea0235359 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1403,7 +1403,7 @@ public:
         // Methoden fuer die Verzeichnisse:
         // - Verzeichnismarke einfuegen loeschen travel
     sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ) const;
-    void Delete( SwTOXMark* pTOXMark );
+    void Delete( const SwTOXMark* pTOXMark );
     const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark,
                                 SwTOXSearch eDir, sal_Bool bInReadOnly );
 
diff --git a/sw/inc/unoatxt.hxx b/sw/inc/unoatxt.hxx
index 8122cdb5dc09..b115919a5623 100644
--- a/sw/inc/unoatxt.hxx
+++ b/sw/inc/unoatxt.hxx
@@ -120,7 +120,7 @@ class SwXAutoTextGroup : public cppu::WeakImplHelper6
     ::com::sun::star::lang::XUnoTunnel
 >
 {
-    SfxItemPropertySet      aPropSet;
+    const SfxItemPropertySet* pPropSet;
     SwGlossaries*           pGlossaries;
     rtl::OUString           sName;
     String                  m_sGroupName;   // prefix m_ to disambiguate from some local vars in the implementation
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index a3936fbe6bb5..955030cbada8 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -281,7 +281,7 @@ class SwChartDataSequence :
     SwUnoCrsr*                  pTblCrsr;   // cursor spanned over cells to use
     SwDepend                    aCursorDepend; //the cursor is removed after the doc has been removed
 
-    const SfxItemPropertyMap*   pMap;
+    const SfxItemPropertySet*   _pPropSet;
 
     sal_Bool    bDisposed;
 
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 8363dcdbc847..99a089f1194e 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -33,6 +33,7 @@
 #include <flyenum.hxx>
 #include <vcl/timer.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <tools/string.hxx>
@@ -41,6 +42,7 @@
 #include <cppuhelper/implbase3.hxx> // helper for implementations
 #include <cppuhelper/implbase4.hxx> // helper for implementations
 #include <IMark.hxx>
+#include <unobaseclass.hxx>
 /***************************************************
  ***************************************************
  *
@@ -304,17 +306,23 @@ public:
     virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
 
     static ::com::sun::star::text::XTextTable*          GetObject( SwFrmFmt& rFmt );
 };
 
-/*-----------------11.12.97 10:14-------------------
+typedef
+cppu::WeakImplHelper4
+<
+    ::com::sun::star::container::XEnumerationAccess,
+    ::com::sun::star::container::XNameAccess,
+    ::com::sun::star::container::XIndexAccess,
+    ::com::sun::star::lang::XServiceInfo
+> SwXFramesBaseClass;
 
---------------------------------------------------*/
-class SwXFrames : public SwCollectionBaseClass,
+class SwXFrames : public SwXFramesBaseClass,
     public SwUnoCollection
 {
     const FlyCntType    eType;
@@ -323,6 +331,9 @@ protected:
 public:
     SwXFrames(SwDoc* pDoc, FlyCntType eSet);
 
+    //XEnumerationAccess
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
+
     //XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 6a74498cf724..7133f6edba46 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -32,9 +32,9 @@
 
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <unocrsr.hxx>
+#include <map>
 
-
-struct SfxItemPropertyMap;
+struct SfxItemPropertySimpleEntry;
 class SwPaM;
 class SwDoc;
 
@@ -46,12 +46,23 @@ namespace com{ namespace sun{ namespace star{
         struct PropertyValue;
     }
 }}}
+
 /* -----------------------------14.12.00 15:06--------------------------------
 
  ---------------------------------------------------------------------------*/
 namespace SwUnoCursorHelper
 {
-    sal_Bool                    getCrsrPropertyValue(const SfxItemPropertyMap* pMap
+    //  keep Any's mapped by (WhichId << 16 ) + (MemberId)
+    typedef std::map< sal_uInt32, com::sun::star::uno::Any *> AnyMapHelper_t;
+    class SwAnyMapHelper : public AnyMapHelper_t
+    {
+        public:
+            ~SwAnyMapHelper();
+
+            void    SetValue( USHORT nWhichId, USHORT nMemberId, const com::sun::star::uno::Any& rAny );
+            bool    FillValue( USHORT nWhichId, USHORT nMemberId, const com::sun::star::uno::Any*& pAny );
+    };
+    sal_Bool                    getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                                         , SwPaM& rPam
                                         , com::sun::star::uno::Any *pAny
                                         , com::sun::star::beans::PropertyState& eState
@@ -65,7 +76,7 @@ namespace SwUnoCursorHelper
                                         { return rUnoCrsr.GetCntntNode() &&
                                             rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetCntntNode()->Len();}
 
-    void                        resetCrsrPropertyValue(const SfxItemPropertyMap* pMap, SwPaM& rPam);
+    void                        resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam);
     void                        InsertFile(SwUnoCrsr* pUnoCrsr,
                                     const String& rURL,
                                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rOptions
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 0103e969e8be..ce673f4344c9 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -42,8 +42,10 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <cppuhelper/implbase4.hxx> // helper for implementations
 // --> OD 2004-07-22 #i31698#
 #include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 // <--
 #include <svtools/itemprop.hxx>
@@ -83,11 +85,9 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >  _CreateShape( SdrObject *pObj ) const throw ();
 };
 
-/* -----------------09.12.98 08:57-------------------
- *
- * --------------------------------------------------*/
-typedef cppu::WeakAggImplHelper3
+typedef cppu::WeakAggImplHelper4
 <
+    ::com::sun::star::container::XEnumerationAccess,
     ::com::sun::star::drawing::XDrawPage,
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::drawing::XShapeGrouper
@@ -102,6 +102,9 @@ public:
     SwXDrawPage(SwDoc* pDoc);
     ~SwXDrawPage();
 
+    //XEnumerationAccess
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
+
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -162,8 +165,8 @@ class SwXShape : public SwXShapeBaseClass,
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
     // <--
 
-    SfxItemPropertySet          aPropSet;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*           m_pPropSet;
+    const SfxItemPropertyMapEntry*      m_pPropertyMapEntries;
     com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId;
 
     SwShapeDescriptor_Impl*     pImpl;
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 417caf0290f5..a02999c8ca3d 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -43,6 +43,7 @@
  */
 
 class SwDoc;
+class SfxItemPropertSet;
 /*-----------------12.02.98 11:21-------------------
 
 --------------------------------------------------*/
@@ -59,9 +60,8 @@ class SwXFrame : public cppu::WeakImplHelper6
     public SwClient
 {
     SwEventListenerContainer        aLstnrCntnr;
-    SfxItemPropertySet              aPropSet;
-    const SfxItemPropertyMap*       _pMap;
-    SwDoc*                          mpDoc;
+    const SfxItemPropertySet*       m_pPropSet;
+    SwDoc*                          m_pDoc;
 
     const FlyCntType                eType;
 
@@ -79,10 +79,10 @@ protected:
     virtual ~SwXFrame();
 public:
     SwXFrame(FlyCntType eSet,
-                const SfxItemPropertyMap*   pMap,
+                const SfxItemPropertySet*    pPropSet,
                 SwDoc *pDoc ); //Descriptor-If
     SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet,
-                const SfxItemPropertyMap*   pMap);
+                const SfxItemPropertySet*    pPropSet);
 
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -166,7 +166,7 @@ class SwXTextFrame : public SwXTextFrameBaseClass,
     public SwXText,
     public SwXFrame
 {
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertSet*    _pPropSet;
 
 protected:
     virtual const SwStartNode *GetStartNode() const;
diff --git a/sw/inc/unoidx.hxx b/sw/inc/unoidx.hxx
index 3832f3376aea..5ea20f65c89d 100644
--- a/sw/inc/unoidx.hxx
+++ b/sw/inc/unoidx.hxx
@@ -60,7 +60,7 @@ class SwXDocumentIndex : public cppu::WeakImplHelper5
     friend class SwXIndexTokenAccess_Impl;
 
     SwEventListenerContainer    aLstnrCntnr;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropSet;
     SwDoc*                      m_pDoc;
     const SwTOXBaseSection*     pBase;
     TOXTypes                    eTOXType;
@@ -153,7 +153,7 @@ class SwXDocumentIndexMark : public cppu::WeakImplHelper4
     SwDepend                    aTypeDepend;
     SwDoc*                      m_pDoc;
     const SwTOXMark*            m_pTOXMark;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropSet;
 
     sal_Bool                    bIsDescriptor;
     sal_Bool                    bMainEntry;
diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx
index cb940dcb0ced..3dbe497b2e3c 100644
--- a/sw/inc/unomailmerge.hxx
+++ b/sw/inc/unomailmerge.hxx
@@ -109,7 +109,7 @@ class SwXMailMerge :
     OPropertyListenerContainerHelper    aPropListeners;
 
     //SfxItemPropertySet          aPropSet;
-    const SfxItemPropertyMap*   pMap;
+    const SfxItemPropertySet*   pPropSet;
 
     SfxObjectShellRef xDocSh;   // the document
 
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 7b1b90cce3b2..9de2db4f493c 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -134,18 +134,6 @@
 
 #define PROPERTY_MAP_END                                98
 
-#define PROPERTY_SET_CHAR_STYLE             1
-#define PROPERTY_SET_PARA_STYLE             2
-#define PROPERTY_SET_FRAME_STYLE            3
-#define PROPERTY_SET_PAGE_STYLE             4
-#define PROPERTY_SET_NUM_STYLE              5
-// basically the same as PROPERTY_SET_PARA_STYLE with additional property
-// that is only available for conditional para styles
-#define PROPERTY_SET_CONDITIONAL_PARA_STYLE 6
-#define PROPERTY_SET_CHAR_AUTO_STYLE        7
-#define PROPERTY_SET_RUBY_AUTO_STYLE        8
-#define PROPERTY_SET_PARA_AUTO_STYLE        9
-
 //S&E
 #define WID_WORDS                0
 #define WID_BACKWARDS            1
@@ -337,7 +325,7 @@ class SwItemPropertySet : public SfxItemPropertySet
 protected:
     virtual sal_Bool            FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, sal_Bool bGetProperty) const;
 public:
-    SwItemPropertySet( const SfxItemPropertyMap *pMap ) :
+    SwItemPropertySet( const SfxItemPropertyMapEntry *pMap ) :
         SfxItemPropertySet( pMap ){}
 };
 /* -----------------04.07.98 11:41-------------------
@@ -345,26 +333,16 @@ public:
  * --------------------------------------------------*/
 class SwUnoPropertyMapProvider
 {
-    SfxItemPropertyMap* aMapArr[PROPERTY_MAP_END];
-
-    SfxItemPropertySet* pCharStyleMap;
-    SfxItemPropertySet* pParaStyleMap;
-    SfxItemPropertySet* pFrameStyleMap;
-    SfxItemPropertySet* pPageStyleMap;
-    SfxItemPropertySet* pNumStyleMap;
-    SfxItemPropertySet* pConditionalParaStyleMap;
-    SfxItemPropertySet* pCharAutoStyleMap;
-    SfxItemPropertySet* pParaAutoStyleMap;
-    SfxItemPropertySet* pRubyAutoStyleMap;
+    SfxItemPropertyMapEntry*        aMapEntriesArr[PROPERTY_MAP_END];
+    SfxItemPropertySet*             aPropertySetArr[PROPERTY_MAP_END];
 
-    void            Sort(sal_uInt16 nId);
 public:
     SwUnoPropertyMapProvider();
     ~SwUnoPropertyMapProvider();
 
-    const SfxItemPropertyMap*       GetPropertyMap(sal_uInt16 PropertyId);
+    const SfxItemPropertyMapEntry*  GetPropertyMapEntries(sal_uInt16 PropertyId);
+    const SfxItemPropertySet*       GetPropertySet( sal_uInt16 PropertyId );
 
-    SfxItemPropertySet&             GetPropertySet(sal_Int8 nPropSetId);
 };
 
 extern SwUnoPropertyMapProvider aSwMapProvider;
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
index 838b1e134267..74a67295d23e 100644
--- a/sw/inc/unoobj.hxx
+++ b/sw/inc/unoobj.hxx
@@ -59,9 +59,7 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
-//#ifndef _COM_SUN_STAR_BEANS_XTOLERANTMULTIPROPERTYSET_HPP_
-//#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
-//#endif
+#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -216,7 +214,7 @@ class SwXText : public ::com::sun::star::lang::XTypeProvider,
     SwDoc*                      pDoc;
     BOOL                        bObjectValid;
     CursorType                  eCrsrType;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropSet;
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishOrAppendParagraph(
                 bool bFinish,
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & CharacterAndParagraphProperties )
@@ -317,7 +315,8 @@ enum SwGetPropertyStatesCaller
 {
     SW_PROPERTY_STATE_CALLER_DEFAULT,
     SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION,
-    SW_PROPERTY_STATE_CALLER_SINGLE_VALUE_ONLY
+    SW_PROPERTY_STATE_CALLER_SINGLE_VALUE_ONLY,
+    SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION_TOLERANT
 };
 #define CRSR_ATTR_MODE_TABLE        1   //attributes should be applied to a table selection
 #define CRSR_ATTR_MODE_DONTREPLACE  2   //attributes should be added, not replaced
@@ -341,7 +340,7 @@ class SwXTextCursor : public SwXTextCursor_Base,
     public OTextCursorHelper
 {
     SwEventListenerContainer    aLstnrCntnr;
-    SfxItemPropertySet          aPropSet;
+    const SfxItemPropertySet*   m_pPropSet;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >                   xParentText;
     SwSortOptions*              pLastSortOptions;
 
@@ -438,7 +437,6 @@ public:
                         const SfxItemPropertySet& rPropSet,
                         const rtl::OUString& rPropertyName,
                         const ::com::sun::star::uno::Any& aValue,
-                        const SfxItemPropertyMap* pMap = 0,
                         USHORT nAttrMode = 0)
                             throw(::com::sun::star::beans::UnknownPropertyException,
                                 ::com::sun::star::beans::PropertyVetoException,
@@ -446,8 +444,8 @@ public:
                                 ::com::sun::star::lang::WrappedTargetException,
                                 ::com::sun::star::uno::RuntimeException);
      static ::com::sun::star::uno::Any  GetPropertyValue(   SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const ::rtl::OUString& rPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > GetPropertyStates(    SwPaM& rPaM, SfxItemPropertySet& rPropSet,      const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, SwGetPropertyStatesCaller eCaller = SW_PROPERTY_STATE_CALLER_DEFAULT)          throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-     static ::com::sun::star::beans::PropertyState GetPropertyState( SwPaM& rPaM, SfxItemPropertySet& rPropSet, const ::rtl::OUString& rPropertyName)       throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > GetPropertyStates( SwPaM& rPaM, const SfxItemPropertySet& rPropSet,     const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, SwGetPropertyStatesCaller eCaller = SW_PROPERTY_STATE_CALLER_DEFAULT)          throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::beans::PropertyState GetPropertyState( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const ::rtl::OUString& rPropertyName)       throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
      static void SetPropertyToDefault( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const rtl::OUString& rPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     static ::com::sun::star::uno::Any  GetPropertyDefault( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const ::rtl::OUString& rPropertyName)   throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
@@ -739,13 +737,13 @@ class SW_DLLPUBLIC SwXTextRange : public cppu::WeakImplHelper8
         RANGE_INVALID  // von NewInstance erzeugt
     } eRangePosition;
 
-    SwDoc* pDoc;
-    SwTableBox* pBox;
-    const SwStartNode* pBoxStartNode;
-    SwDepend aObjectDepend; //Format der Tabelle oder des Rahmens anmelden
-    SfxItemPropertySet aPropSet;
+    SwDoc*              pDoc;
+    SwTableBox*         pBox;
+    const SwStartNode*  pBoxStartNode;
+    SwDepend            aObjectDepend; //Format der Tabelle oder des Rahmens anmelden
+    const SfxItemPropertySet*   m_pPropSet;
     //SwDepend  aFrameDepend;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText;
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >   xParentText;
     ::sw::mark::IMark* pMark;
 
     void    _CreateNewBookmark(SwPaM& rPam);
@@ -922,7 +920,7 @@ class SwXTextSection : public cppu::WeakImplHelper7
 {
     friend class SwXTextSectionClient;
     SwEventListenerContainer        aLstnrCntnr;
-    SfxItemPropertySet              aPropSet;
+    const SfxItemPropertySet*       m_pPropSet;
 
     BOOL                            m_bIsDescriptor;
     BOOL                            m_bIndexHeader;
@@ -1148,9 +1146,9 @@ public:
 /*-----------------07.04.98 08:15-------------------
 
 --------------------------------------------------*/
-class SwXParagraph : public cppu::WeakImplHelper9
+class SwXParagraph : public cppu::WeakImplHelper10
 <
-//    ::com::sun::star::beans::XTolerantMultiPropertySet,
+    ::com::sun::star::beans::XTolerantMultiPropertySet,
     ::com::sun::star::beans::XMultiPropertySet,
     ::com::sun::star::text::XTextRange,
     ::com::sun::star::beans::XPropertySet,
@@ -1165,7 +1163,7 @@ class SwXParagraph : public cppu::WeakImplHelper9
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >                   xParentText;
     SwEventListenerContainer    aLstnrCntnr;
-    SfxItemPropertySet          aPropSet;
+    const SfxItemPropertySet*   m_pPropSet;
     rtl::OUString               m_sText;
     sal_Int32                   nSelectionStartPos;
     sal_Int32                   nSelectionEndPos;
@@ -1176,9 +1174,9 @@ protected:
     void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-//    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl(
-//        const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames,
-//        sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl(
+        const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames,
+        sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException);
 
     virtual ~SwXParagraph();
 public:
@@ -1192,9 +1190,9 @@ public:
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     //XTolerantMultiPropertySet
-//    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-//    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
-//    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
 //    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/inc/unoport.hxx b/sw/inc/unoport.hxx
index 1d6b60436a7b..ed29a995dfe3 100644
--- a/sw/inc/unoport.hxx
+++ b/sw/inc/unoport.hxx
@@ -38,9 +38,7 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
-//#ifndef _COM_SUN_STAR_BEANS_XTOLERANTMULTIPROPERTYSET_HPP_
-//#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
-//#endif
+#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -80,9 +78,9 @@ enum SwTextPortionType
 
 class SwXRubyPortion;
 
-class SwXTextPortion : public cppu::WeakImplHelper8
+class SwXTextPortion : public cppu::WeakImplHelper9
 <
-//    ::com::sun::star::beans::XTolerantMultiPropertySet,
+    ::com::sun::star::beans::XTolerantMultiPropertySet,
     ::com::sun::star::beans::XMultiPropertySet,
     ::com::sun::star::beans::XPropertySet,
     ::com::sun::star::text::XTextRange,
@@ -96,7 +94,7 @@ class SwXTextPortion : public cppu::WeakImplHelper8
 {
     friend class SwXRubyPortion;
     SwEventListenerContainer    aLstnrCntnr;
-    SfxItemPropertySet          aPropSet;
+    const SfxItemPropertySet*  m_pPropSet;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >                   xParentText;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >    xRefMark;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >    xTOXMark;
@@ -117,10 +115,15 @@ class SwXTextPortion : public cppu::WeakImplHelper8
 
     SwFmtFld*           GetFldFmt(BOOL bInit = sal_False);
 protected:
-    SfxItemPropertySet& GetPropSet() { return aPropSet; }
+    //SfxItemPropertySet& GetPropSet() { return aPropSet; }
 
-    void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    void SAL_CALL SetPropertyValues_Impl(
+        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+            throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl(
+        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+            throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 //    ::com::sun::star::uno::Any  GetPropertyValue( const SfxItemPropertyMap *pEntry,
 //                                    SwUnoCrsr *pUnoCrsr,
@@ -130,11 +133,11 @@ protected:
                                     sal_Int32 nLength );
 
     void GetPropertyValue( ::com::sun::star::uno::Any &rVal,
-                const SfxItemPropertyMap *pEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet );
+                const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet );
 
-//    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl(
-//        const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames,
-//        sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl(
+        const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames,
+        sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException);
 
     virtual ~SwXTextPortion();
 public:
@@ -150,9 +153,9 @@ public:
     virtual void SAL_CALL  setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
 
     //XTolerantMultiPropertySet
-//    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-//    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
-//    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
 //    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 0fe1705c9988..bc9cd02a3ac7 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -44,13 +44,12 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <tools/string.hxx>
+#include <svtools/itemprop.hxx>
 
 class SwDoc;
 class SwFmtCol;
 class SwDocShell;
 class SwNumRule;
-struct SfxItemPropertyMap;
-
 /******************************************************************************
  *
  ******************************************************************************/
@@ -64,7 +63,7 @@ class SwXFootnoteProperties : public cppu::WeakAggImplHelper2
 >
 {
     SwDoc*                      pDoc;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropertySet;
 protected:
     virtual ~SwXFootnoteProperties();
 public:
@@ -98,7 +97,7 @@ class SwXEndnoteProperties : public cppu::WeakAggImplHelper2
 >
 {
     SwDoc*                      pDoc;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropertySet;
 protected:
     virtual ~SwXEndnoteProperties();
 public:
@@ -132,7 +131,7 @@ class SwXLineNumberingProperties : public cppu::WeakAggImplHelper2
 >
 {
     SwDoc*                      pDoc;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropertySet;
 protected:
     virtual ~SwXLineNumberingProperties();
 public:
@@ -175,7 +174,7 @@ class SwXNumberingRules : public cppu::WeakAggImplHelper5
     SwDoc*                      pDoc; // wird nur fuers anmelden gebraucht
     SwDocShell*                 pDocShell; //nur, wenn als ChapterNumbering verwendet
     SwNumRule*                  pNumRule;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropertySet;
     sal_Bool                    bOwnNumRuleCreated;
     static String               sInvalidStyle;
 protected:
@@ -275,7 +274,7 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4
     sal_Bool                    bIsAutomaticWidth;
     sal_Int32                   nAutoDistance;
 
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropSet;
 
     //separator line
     sal_Int32                   nSepLineWidth;
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 47b287d6c697..f03048f240b6 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -39,7 +39,7 @@
 /******************************************************************************
  *
  ******************************************************************************/
-struct SfxItemPropertyMap;
+class SfxItemPropertySet;
 class SwXTextDocument;
 class SwSearchProperties_Impl;
 class SfxItemSet;
@@ -68,7 +68,7 @@ class SwXTextSearch : public cppu::WeakImplHelper3
     SwSearchProperties_Impl*    pReplaceProperties;
 
 
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*   m_pPropSet;
     sal_Bool                    bAll  : 1;
     sal_Bool                    bWord : 1;
     sal_Bool                    bBack : 1;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 6d5b5a5db3fb..7c9e00f6671f 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -55,7 +55,7 @@
 #include <istyleaccess.hxx>
 
 class SwDocShell;
-struct SfxItemPropertyMap;
+class SfxItemPropertySet;
 class SwXStyle;
 class SwStyleProperties_Impl;
 class SwAutoStylesEnumImpl;
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 1d0fc4c7372d..0ad2b3c494c8 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -84,8 +84,8 @@ class SwXCell : public SwXCellBaseClass,
     friend void   lcl_setValue( SwXCell &rCell, double nVal );
 
 
-    SfxItemPropertySet      aPropSet;
-    SwTableBox*             pBox;       // only set in non-XML import
+    const SfxItemPropertySet*   m_pPropSet;
+    SwTableBox*                 pBox;       // only set in non-XML import
     const SwStartNode*      pStartNode; // only set in XML import
 
     // table position where pBox was found last
@@ -174,7 +174,7 @@ class SwXTextTableRow : public cppu::WeakImplHelper2
 >,
     public SwClient
 {
-    SfxItemPropertySet      aPropSet;
+    const SfxItemPropertySet*   m_pPropSet;
     SwTableLine*            pLine;
 
     SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
@@ -219,7 +219,7 @@ class SwXTextTableCursor : public SwXTextTableCursor_Base
     ,public OTextCursorHelper
 {
     SwDepend                aCrsrDepend;
-    SfxItemPropertySet      aPropSet;
+    const SfxItemPropertySet*   m_pPropSet;
 
     SwFrmFmt*       GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
     //  SwUnoCrsr*      GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
@@ -304,8 +304,7 @@ class SwXTextTable : public cppu::WeakImplHelper10
 {
     SwEventListenerContainer        aLstnrCntnr;
     SwChartEventListenerContainer   aChartLstnrCntnr;
-    SfxItemPropertySet          aPropSet;
-    const SfxItemPropertyMap*   _pMap;
+    const SfxItemPropertySet*       m_pPropSet;
 
     // Descriptor-interface
     SwTableProperties_Impl*     pTableProps;
@@ -431,10 +430,9 @@ class SwXCellRange : public cppu::WeakImplHelper7
     SwChartEventListenerContainer   aChartLstnrCntnr;
 
     SwRangeDescriptor           aRgDesc;
-    SfxItemPropertySet          aPropSet;
+    const SfxItemPropertySet*   m_pPropSet;
 
     SwUnoCrsr*                  pTblCrsr;
-    const SfxItemPropertyMap*   _pMap;
 
     sal_Bool                        bFirstRowAsLabel    :1;
     sal_Bool                        bFirstColumnAsLabel :1;
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 7c0f8af1b072..d2f251bcf295 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -175,7 +175,7 @@ class SwXTextDocument : public SwXTextDocumentBaseClass,
     ActionContextArr        aActionArr;
     SwRefreshListenerContainer  aRefreshCont;
 
-    SfxItemPropertySet      aPropSet;
+    const SfxItemPropertySet* pPropSet;
 
     SwDocShell*             pDocShell;
     sal_Bool                    bObjectValid;
@@ -474,7 +474,7 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
 >
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    xRealAccess;
-    SfxItemPropertySet                                                              aPropSet;
+    const SfxItemPropertySet*                                                       pPropSet;
     const String                                                                    sLinkSuffix;
     const String                                                                    sLinkDisplayName;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument >       xDoc;
@@ -524,8 +524,8 @@ class SwXOutlineTarget : public cppu::WeakImplHelper2
     ::com::sun::star::lang::XServiceInfo
 >
 {
-    SfxItemPropertySet      aPropSet;
-    String                  sOutlineText;
+    const SfxItemPropertySet*   pPropSet;
+    String                      sOutlineText;
 
 public:
     SwXOutlineTarget(const String& rOutlineText);