Revert "Don't hold css::uno::Type instances by pointer"

This reverts commit 90f91088d238469b4a2262c91de3117ba40f5bde for now:
Ach, old GCC doesn't like plain string literals to initialize members
of OUString type...

Change-Id: I50563a00406259bb5d41831e2a2796762450d097

1 files changed, 6 insertions, 5 deletions

diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index 71863b08c7e7..34b12e109b1a 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -39,14 +39,15 @@ namespace comphelper
 
 struct PropertyMapEntry
 {
-    OUString maName;
+    const sal_Char* mpName;
+    sal_uInt16 mnNameLen;
     sal_Int32 mnHandle;
-    com::sun::star::uno::Type maType;
+    const com::sun::star::uno::Type* mpType;
     sal_Int16 mnAttributes;
     sal_uInt8 mnMemberId;
 };
 
-typedef std::map<OUString, PropertyMapEntry const *> PropertyMap;
+typedef std::map<OUString, PropertyMapEntry*> PropertyMap;
 
 class PropertyMapImpl;
 
@@ -59,7 +60,7 @@ private:
     PropertyMapImpl* mpMap;
 public:
     PropertySetInfo() throw();
-    PropertySetInfo( PropertyMapEntry const * pMap ) throw();
+    PropertySetInfo( PropertyMapEntry* pMap ) throw();
     virtual ~PropertySetInfo() throw();
 
     /** returns a stl map with all PropertyMapEntry pointer.<p>
@@ -70,7 +71,7 @@ public:
     /** adds an array of PropertyMapEntry to this instance.<p>
         The end is marked with a PropertyMapEntry where mpName equals NULL</p>
     */
-    void add( PropertyMapEntry const * pMap ) throw();
+    void add( PropertyMapEntry* pMap ) throw();
 
     /** removes an already added PropertyMapEntry which string in mpName equals to aName */
     void remove( const OUString& aName ) throw();