CWS-TOOLING: integrate CWS aw063

2009-02-12 13:10:24 +0100 aw  r267649 : #i99123# when a primitive is invisible, it is not sufficient to produce no output when decomposing, but to add invisible data using HitTestPrimitive2D. This is needed for the slideshow which relies on geometry data in MetaFiles when painting invisible objects
2009-02-12 13:08:39 +0100 aw  r267648 : #i99123# do not ignore HitTestPrimitive2D, but draw empty rectangles instead. This is needed since Slideshow is based on getting MetaFile content when painting invisible objects
2009-02-11 16:04:28 +0100 aw  r267620 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:04:10 +0100 aw  r267619 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:03:56 +0100 aw  r267618 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:03:39 +0100 aw  r267617 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:03:21 +0100 aw  r267615 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:02:48 +0100 aw  r267614 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:02:24 +0100 aw  r267613 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:02:01 +0100 aw  r267612 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:01:32 +0100 aw  r267611 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:01:05 +0100 aw  r267610 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 16:00:15 +0100 aw  r267608 : #i98788# made SfxItemPool destructor protected, added static ::Free method
2009-02-11 11:27:33 +0100 aw  r267585 : #i98788# added missing include for STL
2009-02-10 17:46:50 +0100 aw  r267570 : #i98788# added reaction on pool destruction
2009-02-10 17:11:58 +0100 aw  r267562 : #i98788# added messaging mechanism to register for pool destruction
2009-02-10 13:35:35 +0100 aw  r267549 : #i98788# removing changes, too complicated and risky for 3.1
2009-02-10 12:13:48 +0100 aw  r267546 : #i98788# 4th round
2009-02-10 12:13:37 +0100 aw  r267545 : #i98788# 4th round
2009-02-10 12:13:26 +0100 aw  r267544 : #i98788# 4th round
2009-02-10 12:13:14 +0100 aw  r267543 : #i98788# 4th round
2009-02-10 12:13:03 +0100 aw  r267542 : #i98788# 4th round
2009-02-10 12:12:50 +0100 aw  r267541 : #i98788# 4th round
2009-02-10 12:12:37 +0100 aw  r267540 : #i98788# 4th round
2009-02-08 14:38:22 +0100 aw  r267495 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:38:06 +0100 aw  r267494 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:37:48 +0100 aw  r267493 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:37:17 +0100 aw  r267492 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:36:56 +0100 aw  r267491 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:36:44 +0100 aw  r267490 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:36:29 +0100 aw  r267489 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:36:16 +0100 aw  r267488 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:36:02 +0100 aw  r267487 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-08 14:35:46 +0100 aw  r267486 : #i98788# 3rd round of changes to SfxItemPool handling
2009-02-05 12:20:39 +0100 aw  r267415 : #i98788# 2nd batch of adaptions for SfxItemPoolHolder addition
2009-02-04 15:12:54 +0100 aw  r267385 : #i98788# added newline at EOF
2009-02-04 13:26:04 +0100 aw  r267379 : #i98788# make SfxItemPool holdable
2009-02-04 13:25:40 +0100 aw  r267378 : #i98788# make SfxItemPool holdable
2009-02-04 13:25:08 +0100 aw  r267377 : #i98788# make SfxItemPool holdable
2009-02-04 13:24:42 +0100 aw  r267376 : #i98788# make SfxItemPool holdable
2009-02-04 13:23:14 +0100 aw  r267375 : #i98788# make SfxItemPool holdable
2009-02-04 13:23:02 +0100 aw  r267374 : #i98788# make SfxItemPool holdable
2009-01-29 17:08:31 +0100 aw  r267159 : #i97628# completed the fix
2009-01-29 17:08:15 +0100 aw  r267158 : #i97628# completed the fix
2009-01-29 14:09:07 +0100 aw  r267132 : #i97628# Corrected usage of ParagraphData in headers
2009-01-29 14:06:58 +0100 iha  r267131 : #i98344# incorrect font size in charts
2009-01-29 12:13:46 +0100 aw  r267115 : #i97628# back to old state; triggers too many errors in other modules
2009-01-29 12:03:51 +0100 aw  r267114 : #i97628# enabled exceptions due to STL vector include
2009-01-29 11:21:37 +0100 aw  r267107 : #i97628# added needed include
2009-01-28 17:58:29 +0100 aw  r267077 : #i97628# first version of newly implemented OutlinerParaObject and adaptions
2009-01-28 17:58:12 +0100 aw  r267076 : #i97628# first version of newly implemented OutlinerParaObject and adaptions
2009-01-28 17:57:51 +0100 aw  r267074 : #i97628# first version of newly implemented OutlinerParaObject and adaptions
2009-01-28 17:57:21 +0100 aw  r267073 : #i97628# first version of newly implemented OutlinerParaObject and adaptions
2009-01-27 17:07:33 +0100 aw  r267011 : #i98402# added support for ViewRange when exporting MetaFiles in ObjectContactOfPageView::DoProcessDisplay to avoid to paint too much
2009-01-27 11:45:48 +0100 aw  r266973 : #i98404# Added a warning to a place where a conversion to rectangle should not be copied from
2009-01-26 21:44:36 +0100 iha  r266949 : #i98497# 3D charts are rendered with wrong size
2009-01-26 20:47:07 +0100 aw  r266947 : #i98404# handle BackgroundColorPrimitive2D directly in PixelRenderers and avoid AA under all circumstances
2009-01-26 14:50:36 +0100 aw  r266926 : #i98386# secured cloning of SdrObject in IMapUserData by boost::shared_prt usage
2009-01-26 12:51:30 +0100 aw  r266916 : #i96581# added separated FontStretching and fallback for small X!=Y scale differences
2009-01-23 16:14:55 +0100 aw  r266834 : #i96475# added missing implementation of TextDecoratedPortionPrimitive2D::getB2DRange
2009-01-23 15:24:34 +0100 aw  r266826 : #i98405# fixed fallback to DrawAlphaRect to use the correctly sized rectangle
2009-01-23 13:34:43 +0100 aw  r266813 : #i96474# fixed impSplitSingleWords for an unexpected case
2009-01-23 10:47:31 +0100 aw  r266786 : #i98289#,#i96474# tooling and new flags for tasks
2009-01-23 10:47:20 +0100 aw  r266785 : #i98289#,#i96474# tooling and new flags for tasks
2009-01-23 10:47:09 +0100 aw  r266783 : #i98289#,#i96474# tooling and new flags for tasks
2009-01-23 10:46:58 +0100 aw  r266782 : #i98289#,#i96474# tooling and new flags for tasks
2009-01-23 10:46:48 +0100 aw  r266781 : #i98289#,#i96474# tooling and new flags for tasks

8 files changed, 153 insertions, 61 deletions

diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx
index 9fc20b815494..f2a64e16acb6 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/svx/inc/svx/outliner.hxx
@@ -89,6 +89,7 @@ class SvxForbiddenCharactersTable;
 #include <vos/ref.hxx>
 #include <svx/svxfont.hxx>
 #include <svx/eedata.hxx>
+#include <svx/paragraphdata.hxx>
 
 class SvxFieldData;
 //////////////////////////////////////////////////////////////////////////////
@@ -122,25 +123,6 @@ namespace basegfx { class B2DPolyPolygon; }
 // #define OLUNDO_MOVEPARAGRAPHS    EDITUNDO_USER+7
 #define OLUNDO_CHECKPARA        EDITUNDO_USER+8
 
-// MT 07/00: Only for internal use, oder some kind like hPara for the few
-// functions where you need it outside ( eg. moving paragraphs... )
-
-class ParagraphData
-{
-    friend class Paragraph;
-    friend class OutlinerParaObject;
-protected:
-    sal_Int16           nDepth;
-    sal_Int16           mnNumberingStartValue;
-    sal_Bool            mbParaIsNumberingRestart;
-
-public:
-    ParagraphData( const ParagraphData& );
-    ParagraphData();
-
-    ParagraphData& operator=( const ParagraphData& );
-};
-
 class Paragraph : protected ParagraphData
 {
 private:
diff --git a/svx/inc/svx/outlobj.hxx b/svx/inc/svx/outlobj.hxx
index 32c59a051e3b..9a8efeaaddc1 100644
--- a/svx/inc/svx/outlobj.hxx
+++ b/svx/inc/svx/outlobj.hxx
@@ -31,61 +31,66 @@
 #ifndef _OUTLOBJ_HXX
 #define _OUTLOBJ_HXX
 
+//////////////////////////////////////////////////////////////////////////////
+
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <rsc/rscsfx.hxx>
-#include <svtools/itemset.hxx>
+#include <svx/paragraphdata.hxx>
 #include "svx/svxdllapi.h"
 
-#include <svx/eeitem.hxx>
-
-class Outliner;
 class EditTextObject;
-class SvStream;
-class SfxItemPool;
-class SfxStyleSheetPool;
-class ParagraphData;
+class ImplOutlinerParaObject;
+
+//////////////////////////////////////////////////////////////////////////////
 
 class SVX_DLLPUBLIC OutlinerParaObject
 {
-    friend class Outliner;
+private:
+    ImplOutlinerParaObject*        mpImplOutlinerParaObject;
 
-    EditTextObject*             pText;
-    ParagraphData*              pParagraphDataArr;
-    sal_uInt32                  nCount;
-    BOOL                        bIsEditDoc;
-                                OutlinerParaObject( USHORT nParaCount );
+    void ImplMakeUnique();
 
 public:
-                                OutlinerParaObject( const OutlinerParaObject& );
-                                OutlinerParaObject( const EditTextObject& rTObj );
-                                ~OutlinerParaObject();
+    // constructors/destructor
+    OutlinerParaObject(
+        const EditTextObject& rEditTextObject,
+        const ParagraphDataVector& rParagraphDataVector = ParagraphDataVector(),
+        bool bIsEditDoc = true);
+    OutlinerParaObject(const OutlinerParaObject& rCandidate);
+    ~OutlinerParaObject();
 
-    OutlinerParaObject*         Clone() const;
+    // assignment operator
+    OutlinerParaObject& operator=(const OutlinerParaObject& rCandidate);
 
-    USHORT                      GetOutlinerMode() const;
-    void                        SetOutlinerMode( USHORT n );
+    // compare operator
+    bool operator==(const OutlinerParaObject& rCandidate) const;
+    bool operator!=(const OutlinerParaObject& rCandidate) const { return !operator==(rCandidate); }
 
-    BOOL                        IsVertical() const;
-    void                        SetVertical( BOOL bVertical );
+    // outliner mode access
+    sal_uInt16 GetOutlinerMode() const;
+    void SetOutlinerMode(sal_uInt16 nNew);
 
-    sal_uInt32                  Count() const                   { return nCount; }
-    sal_Int16                   GetDepth( USHORT nPara ) const;
-    const EditTextObject&       GetTextObject() const           { return *pText; }
-    void                        ClearPortionInfo();
-    BOOL                        IsEditDoc() const               { return bIsEditDoc; }
-    void                        Store( SvStream& ) const;
-    static OutlinerParaObject*  Create( SvStream&, SfxItemPool* pTextObjectPool = 0 );
+    // vertical access
+    bool IsVertical() const;
+    void SetVertical(bool bNew);
 
-    BOOL                        ChangeStyleSheets(  const XubString& rOldName, SfxStyleFamily eOldFamily,
-                                                    const XubString& rNewName, SfxStyleFamily eNewFamily );
-    void                        ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName );
-    void                        SetStyleSheets( USHORT nLevel, const XubString rNewName, const SfxStyleFamily& rNewFamily );
+    // data read access
+    sal_uInt32 Count() const;
+    sal_Int16 GetDepth(sal_uInt16 nPara) const;
+    const EditTextObject& GetTextObject() const;
+    bool IsEditDoc() const;
+    const ParagraphData& GetParagraphData(sal_uInt32 nIndex) const;
 
-    BOOL                        RemoveCharAttribs( USHORT nWhich = 0 );
-    BOOL                        RemoveParaAttribs( USHORT nWhich = 0 );
+    // portion info support
+    void ClearPortionInfo();
 
-    void                        MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart = EE_CHAR_START, USHORT nEnd = EE_CHAR_END );
+    // StyleSheet support
+    bool ChangeStyleSheets(const XubString& rOldName, SfxStyleFamily eOldFamily, const XubString& rNewName, SfxStyleFamily eNewFamily);
+    void ChangeStyleSheetName(SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName);
+    void SetStyleSheets(sal_uInt16 nLevel, const XubString rNewName, const SfxStyleFamily& rNewFamily);
 };
 
+//////////////////////////////////////////////////////////////////////////////
+
 #endif
diff --git a/svx/inc/svx/paragraphdata.hxx b/svx/inc/svx/paragraphdata.hxx
new file mode 100644
index 000000000000..ddd98a15e176
--- /dev/null
+++ b/svx/inc/svx/paragraphdata.hxx
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: outlobj.hxx,v $
+ * $Revision: 1.5.78.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _PARAGRAPH_DATA_HXX
+#define _PARAGRAPH_DATA_HXX
+
+#include <tools/solar.h>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+// MT 07/00: Only for internal use, oder some kind like hPara for the few
+// functions where you need it outside ( eg. moving paragraphs... )
+//
+// AW: Unfortunately NOT only local (formally in outliner.hxx), but also
+// used in outlobj.hxx. Moved to own header
+
+class ParagraphData
+{
+    friend class Paragraph;
+    friend class OutlinerParaObject;
+
+protected:
+    sal_Int16           nDepth;
+    sal_Int16           mnNumberingStartValue;
+    sal_Bool            mbParaIsNumberingRestart;
+
+public:
+    ParagraphData( const ParagraphData& );
+    ParagraphData();
+
+    ParagraphData& operator=( const ParagraphData& );
+
+    // compare operator
+    bool operator==(const ParagraphData& rCandidate) const;
+
+    // data read access
+    sal_Int16 getDepth() const { return nDepth; }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+typedef ::std::vector< ParagraphData > ParagraphDataVector;
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif // _PARAGRAPH_DATA_HXX
+
+// eof
diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
index 712f01b69334..9033135e6caa 100644
--- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
@@ -34,6 +34,7 @@
 
 #include <svx/xenum.hxx>
 #include <sal/types.h>
+#include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
@@ -53,7 +54,7 @@ namespace drawinglayer
         class SdrTextAttribute
         {
             const SdrText&                          mrSdrText;
-            const OutlinerParaObject*               mpOutlinerParaObject;
+            const OutlinerParaObject                maOutlinerParaObject;
             XFormTextStyle                          meFormTextStyle;
 
             sal_Int32                               maTextLeftDistance;
@@ -67,28 +68,35 @@ namespace drawinglayer
             unsigned                                mbHideContour : 1;
             unsigned                                mbBlink : 1;
             unsigned                                mbScroll : 1;
+            unsigned                                mbInEditMode : 1;
 
         public:
             SdrTextAttribute(
                 const SdrText& rSdrText,
+                const OutlinerParaObject& rOutlinerParaObjectPtr,
                 XFormTextStyle eFormTextStyle,
                 sal_Int32 aTextLeftDistance,
                 sal_Int32 aTextUpperDistance,
                 sal_Int32 aTextRightDistance,
                 sal_Int32 aTextLowerDistance,
-                bool bContour, bool bFitToSize,
-                bool bHideContour, bool bBlink,
-                bool bScroll);
+                bool bContour,
+                bool bFitToSize,
+                bool bHideContour,
+                bool bBlink,
+                bool bScroll,
+                bool bInEditMode);
             bool operator==(const SdrTextAttribute& rCandidate) const;
 
             // data access
             const SdrText& getSdrText() const { return mrSdrText; }
+            const OutlinerParaObject& getOutlinerParaObject() const { return maOutlinerParaObject; }
             bool isContour() const { return mbContour; }
             bool isFontwork() const { return (XFT_NONE != meFormTextStyle); }
             bool isFitToSize() const { return mbFitToSize; }
             bool isHideContour() const { return mbHideContour; }
             bool isBlink() const { return mbBlink; }
             bool isScroll() const { return mbScroll; }
+            bool isInEditMode() const { return mbInEditMode; }
             XFormTextStyle getFormTextStyle() const { return meFormTextStyle; }
             sal_Int32 getTextLeftDistance() const { return maTextLeftDistance; }
             sal_Int32 getTextUpperDistance() const { return maTextUpperDistance; }
diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
index 37edea1a5878..2d419e9cd45d 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
@@ -33,12 +33,14 @@
 #define INCLUDED_SDR_PRIMITIVE2D_PRIMITIVETOOLS_HXX
 
 #include <vcl/bitmapex.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
 
 namespace basegfx {
     class BColor;
+    class B2DHomMatrix;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -54,6 +56,9 @@ namespace drawinglayer
         // create a 7x7 gluepoint symbol in given colors as BitmapEx
         BitmapEx createDefaultGluepoint_7x7(const basegfx::BColor& rBColorA, const basegfx::BColor& rBColorB);
 
+        // #i99123#
+        Primitive2DReference createFallbackHitTestPrimitive(const basegfx::B2DHomMatrix& rMatrix);
+
     } // end of namespace primitive2d
 } // end of namespace drawinglayer
 
diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index 10b35c4dd027..8579b87e9470 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -36,6 +36,8 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
+#include <boost/shared_ptr.hpp>
+#include <svx/outlobj.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
@@ -54,6 +56,11 @@ namespace drawinglayer
             // something equal
             const SdrText&                          mrSdrText;              // text model data
 
+            // #i97628#
+            // The text content; now as OutlinerParaObject* and in exclusive, local, cloned
+            // form as needed in a primitive
+            const OutlinerParaObject                maOutlinerParaObject;
+
             // remeber last VisualizingPage for which a decomposition was made. If the new target
             // is not given or different, the decomposition needs to be potentially removed
             // for supporting e.g. page number change on MasterPage objects or the different
@@ -77,10 +84,13 @@ namespace drawinglayer
             void setLastSpellCheck(bool bNew) { mbLastSpellCheck = bNew; }
 
         public:
-            SdrTextPrimitive2D(const SdrText& rSdrText);
+            SdrTextPrimitive2D(
+                const SdrText& rSdrText,
+                const OutlinerParaObject& rOutlinerParaObjectPtr);
 
             // get data
             const SdrText& getSdrText() const { return mrSdrText; }
+            const OutlinerParaObject& getOutlinerParaObject() const { return maOutlinerParaObject; }
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
@@ -114,6 +124,7 @@ namespace drawinglayer
         public:
             SdrContourTextPrimitive2D(
                 const SdrText& rSdrText,
+                const OutlinerParaObject& rOutlinerParaObjectPtr,
                 const ::basegfx::B2DPolyPolygon& rUnitPolyPolygon,
                 const ::basegfx::B2DHomMatrix& rObjectTransform);
 
@@ -151,6 +162,7 @@ namespace drawinglayer
         public:
             SdrPathTextPrimitive2D(
                 const SdrText& rSdrText,
+                const OutlinerParaObject& rOutlinerParaObjectPtr,
                 const ::basegfx::B2DPolyPolygon& rPathPolyPolygon);
 
             // get data
@@ -191,6 +203,7 @@ namespace drawinglayer
         public:
             SdrBlockTextPrimitive2D(
                 const SdrText& rSdrText,
+                const OutlinerParaObject& rOutlinerParaObjectPtr,
                 const ::basegfx::B2DHomMatrix& rTextRangeTransform,
                 bool bUnlimitedPage,
                 bool bCellText,
@@ -232,6 +245,7 @@ namespace drawinglayer
         public:
             SdrStretchTextPrimitive2D(
                 const SdrText& rSdrText,
+                const OutlinerParaObject& rOutlinerParaObjectPtr,
                 const ::basegfx::B2DHomMatrix& rTextRangeTransform);
 
             // get data
diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx
index 12ce8d669f4d..d6cf4f8543b6 100644
--- a/svx/inc/svx/svdpool.hxx
+++ b/svx/inc/svx/svdpool.hxx
@@ -45,7 +45,9 @@ class SVX_DLLPUBLIC SdrItemPool : public XOutdevItemPool
 public:
     SdrItemPool(SfxItemPool* pMaster = 0L, sal_Bool bLoadRefCounts = sal_True);
     SdrItemPool(const SdrItemPool& rPool);
+protected:
     virtual ~SdrItemPool();
+public:
 
     virtual SfxItemPool* Clone() const;
     virtual SfxItemPresentation GetPresentation(const SfxPoolItem& rItem,
diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx
index 6492f4dd6c6a..c8e944801941 100644
--- a/svx/inc/svx/xpool.hxx
+++ b/svx/inc/svx/xpool.hxx
@@ -56,7 +56,8 @@ public:
     XOutdevItemPool(const XOutdevItemPool& rPool);
 
     virtual SfxItemPool* Clone() const;
-    ~XOutdevItemPool();
+protected:
+    virtual ~XOutdevItemPool();
 };
 
 #endif      // _XPOOL_HXX