Simplify comphelper::PropertyInfo

...as its sole two uses (in sw) are already fine with initializing arrays of
it dynamically, there is no harm in changing it and thereby getting rid of the
last use of comphelper/TypeGeneration.hxx.

Change-Id: I11931dbbec48dac5a694a59cf6425206c806fbfb

3 files changed, 10 insertions, 13 deletions

diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index 5e8e546d0354..e5d731d429c6 100644
--- a/include/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/TypeGeneration.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 /*
@@ -44,13 +43,13 @@ namespace comphelper
         PropertyInfoHash maMap;
         com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties;
     public:
-        ChainablePropertySetInfo( PropertyInfo * pMap )
+        ChainablePropertySetInfo( PropertyInfo const * pMap )
             throw();
 
         virtual ~ChainablePropertySetInfo()
             throw();
 
-        void add( PropertyInfo* pMap, sal_Int32 nCount = -1 )
+        void add( PropertyInfo const * pMap, sal_Int32 nCount = -1 )
             throw();
         void remove( const OUString& aName )
             throw();
diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index 15664f185f01..e3553a9a6fc9 100644
--- a/include/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/TypeGeneration.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
@@ -36,11 +35,11 @@ namespace comphelper
         PropertyDataHash maMap;
         com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties;
     public:
-        MasterPropertySetInfo( PropertyInfo * pMap )
+        MasterPropertySetInfo( PropertyInfo const * pMap )
             throw();
         virtual ~MasterPropertySetInfo()
             throw();
-        void add( PropertyInfo* pMap, sal_Int32 nCount = -1, sal_uInt8 nMapId = 0 )
+        void add( PropertyInfo const * pMap, sal_Int32 nCount = -1, sal_uInt8 nMapId = 0 )
             throw();
         void add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
             throw();
diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx
index 25a1e8daba8d..b0c89a0b4363 100644
--- a/include/comphelper/PropertyInfoHash.hxx
+++ b/include/comphelper/PropertyInfoHash.hxx
@@ -21,31 +21,30 @@
 #define INCLUDED_COMPHELPER_PROPERTYINFOHASH_HXX
 
 #include <rtl/ustring.hxx>
-#include <comphelper/TypeGeneration.hxx>
+#include <com/sun/star/uno/Type.hxx>
 #include <boost/unordered_map.hpp>
 namespace comphelper
 {
     struct PropertyInfo
     {
-        const sal_Char* mpName;
-        sal_uInt16 mnNameLen;
+        OUString maName;
         sal_Int32 mnHandle;
-        CppuTypes meCppuType;
+        css::uno::Type maType;
         sal_Int16 mnAttributes;
         sal_uInt8 mnMemberId;
     };
     struct PropertyData
     {
         sal_uInt8 mnMapId;
-        PropertyInfo *mpInfo;
-        PropertyData ( sal_uInt8 nMapId, PropertyInfo *pInfo )
+        PropertyInfo const *mpInfo;
+        PropertyData ( sal_uInt8 nMapId, PropertyInfo const *pInfo )
         : mnMapId ( nMapId )
         , mpInfo ( pInfo ) {}
     };
 }
 
 typedef boost::unordered_map < OUString,
-                        ::comphelper::PropertyInfo*,
+                        ::comphelper::PropertyInfo const *,
                         OUStringHash > PropertyInfoHash;
 typedef boost::unordered_map < OUString,
                         ::comphelper::PropertyData*,