1 files changed, 4 insertions, 28 deletions
diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx
index 3c7f87f58fbd..1f0fa8c3b891 100644
--- a/svx/inc/svx/unoprov.hxx
+++ b/svx/inc/svx/unoprov.hxx
@@ -32,12 +32,13 @@
 #define SVX_UNOPROV_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <svx/svdpool.hxx>
 #include <svl/itemprop.hxx>
 #include <tools/list.hxx>
 #include "svx/svxdllapi.h"
 
 class SvxItemPropertySet;
+class SfxItemPool;
+
 /***********************************************************************
 * class UHashMap                                                       *
 ***********************************************************************/
@@ -110,7 +111,7 @@ public:
     SvxUnoPropertyMapProvider();
     ~SvxUnoPropertyMapProvider();
     const SfxItemPropertyMapEntry* GetMap(UINT16 nPropertyId);
-    const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId);
+    const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool);
 };
 
 /***********************************************************************
@@ -124,34 +125,9 @@ extern SvxUnoPropertyMapProvider aSvxMapProvider;
 extern UHashMapEntry pSdrShapeIdentifierMap[];
 extern UHashMap aSdrShapeIdentifierMap;
 
-#define SFX_METRIC_ITEM             (0x40)
 #define E3D_INVENTOR_FLAG           (0x80000000)
 
-#include <svx/unoipset.hxx>
-
-/***********************************************************************
-* class SvxServiceInfoHelper                                           *
-***********************************************************************/
-
-/** this class provides a basic helper for classes suporting the XServiceInfo Interface.
- *
- *  you can overload the <code>getSupprotedServiceNames</code> to implement a XServiceInfo.
- *  you can use the static helper methods to combine your services with that of parent
- *  or aggregatet classes.
- */
-class SVX_DLLPUBLIC SvxServiceInfoHelper : public ::com::sun::star::lang::XServiceInfo
-{
-public:
-    // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_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() throw(::com::sun::star::uno::RuntimeException);
-
-    // helper
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw();
-    static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq,UINT16 nServices, /* sal_Char* */... ) throw();
-    static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw();
-};
+#include <editeng/unoipset.hxx>
 
 /***********************************************************************
 * class SvxPropertySetInfoPool                                         *