cws tl79: merge with DEV300_m83

4 files changed, 253 insertions, 220 deletions

diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
index ed02a80f571f..82d440df0c02 100644
--- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
+++ b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/beans/Property.hpp>
 #include <cppuhelper/weak.hxx>
 
 #include "osl/mutex.hxx"
@@ -43,7 +44,6 @@ namespace com { namespace sun { namespace star { namespace script {
 } } } }
 
 namespace com { namespace sun { namespace star { namespace beans {
-    struct Property;
     struct PropertyValue;
     class XPropertySet;
 } } } }
@@ -205,175 +205,205 @@ public:
       */
     sal_Int32 getLength() const;
 
-    /**
-      * This method appends a string to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendString   ( const ::com::sun::star::beans::Property& rProp,
-                          const ::rtl::OUString& rValue );
-
-    /**
-      * This method appends a boolean to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendBoolean  ( const ::com::sun::star::beans::Property& rProp,
-                          sal_Bool bValue );
-
-    /**
-      * This method appends a byte to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendByte     ( const ::com::sun::star::beans::Property& rProp,
-                          sal_Int8 nValue );
-
-    /**
-      * This method appends a short to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendShort    ( const ::com::sun::star::beans::Property& rProp,
-                          sal_Int16 nValue );
-
-    /**
-      * This method appends an int to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendInt      ( const ::com::sun::star::beans::Property& rProp,
-                          sal_Int32 nValue );
-
-    /**
-      * This method appends a long to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendLong     ( const ::com::sun::star::beans::Property& rProp,
-                          sal_Int64 nValue );
-
-    /**
-      * This method appends a float to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendFloat    ( const ::com::sun::star::beans::Property& rProp,
-                          float nValue );
-
-    /**
-      * This method appends a double to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendDouble   ( const ::com::sun::star::beans::Property& rProp,
-                          double nValue );
-
-    /**
-      * This method appends a byte sequence to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendBytes    ( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::uno::Sequence<
-                              sal_Int8 >& rValue );
-
-    /**
-      * This method appends a date to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendDate     ( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::util::Date& rValue );
-
-    /**
-      * This method appends a time to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendTime     ( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::util::Time& rValue );
-
-    /**
-      * This method appends a timestamp to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendTimestamp( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::util::DateTime& rValue );
-
-    /**
-      * This method appends a binary stream to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendBinaryStream   ( const ::com::sun::star::beans::Property& rProp,
-                                const ::com::sun::star::uno::Reference<
-                                    ::com::sun::star::io::XInputStream >&
-                                        rValue );
-
-    /**
-      * This method appends a character stream to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendCharacterStream( const ::com::sun::star::beans::Property& rProp,
-                                const ::com::sun::star::uno::Reference<
-                                    ::com::sun::star::io::XInputStream >&
-                                        rValue );
-
-    /**
-      * This method appends an object ( any ) to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendObject   ( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::uno::Any& rValue );
-
-    /**
-      * This method appends a ref to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendRef      ( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::sdbc::XRef >& rValue );
-
-    /**
-      * This method appends a blob to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendBlob     ( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::sdbc::XBlob >& rValue );
-
-    /**
-      * This method appends a clob to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendClob     ( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::sdbc::XClob >& rValue );
-
-    /**
-      * This method appends an array to the value set.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendArray    ( const ::com::sun::star::beans::Property& rProp,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::sdbc::XArray >& rValue );
-
-    /**
-      * This method appends a void value ( a "hole" ) to the value set. This
-      * is useful, since void values indicate errors, like non-existing
-      * property (-values) etc.
-      *
-      * @param rProp is the property the value belongs to.
-      */
-    void appendVoid     ( const ::com::sun::star::beans::Property& rProp );
+    void appendString( const ::rtl::OUString& rPropName, const ::rtl::OUString& rValue );
+    void appendString( const sal_Char* pAsciiPropName, const ::rtl::OUString& rValue )
+    {
+        appendString( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendString( const ::com::sun::star::beans::Property& rProp, const ::rtl::OUString& rValue )
+    {
+        appendString( rProp.Name, rValue );
+    }
+
+    void appendBoolean( const ::rtl::OUString& rPropName, sal_Bool bValue );
+    void appendBoolean( const sal_Char* pAsciiPropName, sal_Bool bValue )
+    {
+        appendBoolean( ::rtl::OUString::createFromAscii( pAsciiPropName ), bValue );
+    }
+    void appendBoolean( const ::com::sun::star::beans::Property& rProp, sal_Bool bValue )
+    {
+        appendBoolean( rProp.Name, bValue );
+    }
+
+    void appendByte( const ::rtl::OUString& rPropName, sal_Int8 nValue );
+    void appendByte( const sal_Char* pAsciiPropName, sal_Int8 nValue )
+    {
+        appendByte( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue );
+    }
+    void appendByte( const ::com::sun::star::beans::Property& rProp, sal_Int8 nValue )
+    {
+        appendByte( rProp.Name, nValue );
+    }
+
+    void appendShort( const ::rtl::OUString& rPropName, sal_Int16 nValue );
+    void appendShort( const sal_Char* pAsciiPropName, sal_Int16 nValue )
+    {
+        appendShort( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue );
+    }
+    void appendShort( const ::com::sun::star::beans::Property& rProp, sal_Int16 nValue )
+    {
+        appendShort( rProp.Name, nValue );
+    }
+
+    void appendInt( const ::rtl::OUString& rPropName, sal_Int32 nValue );
+    void appendInt( const sal_Char* pAsciiPropName, sal_Int32 nValue )
+    {
+        appendInt( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue );
+    }
+    void appendInt( const ::com::sun::star::beans::Property& rProp, sal_Int32 nValue )
+    {
+        appendInt( rProp.Name, nValue );
+    }
+
+    void appendLong( const ::rtl::OUString& rPropName, sal_Int64 nValue );
+    void appendLong( const sal_Char* pAsciiPropName, sal_Int64 nValue )
+    {
+        appendLong( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue );
+    }
+    void appendLong( const ::com::sun::star::beans::Property& rProp, sal_Int64 nValue )
+    {
+        appendLong( rProp.Name, nValue );
+    }
+
+    void appendFloat( const ::rtl::OUString& rPropName, float nValue );
+    void appendFloat( const sal_Char* pAsciiPropName, float nValue )
+    {
+        appendFloat( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue );
+    }
+    void appendFloat( const ::com::sun::star::beans::Property& rProp, float nValue )
+    {
+        appendFloat( rProp.Name, nValue );
+    }
+
+    void appendDouble( const ::rtl::OUString& rPropName, double nValue );
+    void appendDouble( const sal_Char* pAsciiPropName, double nValue )
+    {
+        appendDouble( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue );
+    }
+    void appendDouble( const ::com::sun::star::beans::Property& rProp, double nValue )
+    {
+        appendDouble( rProp.Name, nValue );
+    }
+
+    void appendBytes( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Sequence< sal_Int8 >& rValue );
+    void appendBytes( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Sequence< sal_Int8 >& rValue )
+    {
+        appendBytes( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendBytes( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Sequence< sal_Int8 >& rValue )
+    {
+        appendBytes( rProp.Name, rValue );
+    }
+
+    void appendDate( const ::rtl::OUString& rPropName, const ::com::sun::star::util::Date& rValue );
+    void appendDate( const sal_Char* pAsciiPropName, const ::com::sun::star::util::Date& rValue )
+    {
+        appendDate( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendDate( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::Date& rValue )
+    {
+        appendDate( rProp.Name, rValue );
+    }
+
+    void appendTime( const ::rtl::OUString& rPropName, const ::com::sun::star::util::Time& rValue );
+    void appendTime( const sal_Char* pAsciiPropName, const ::com::sun::star::util::Time& rValue )
+    {
+        appendTime( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendTime( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::Time& rValue )
+    {
+        appendTime( rProp.Name, rValue );
+    }
+
+    void appendTimestamp( const ::rtl::OUString& rPropName, const ::com::sun::star::util::DateTime& rValue );
+    void appendTimestamp( const sal_Char* pAsciiPropName, const ::com::sun::star::util::DateTime& rValue )
+    {
+        appendTimestamp( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendTimestamp( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::DateTime& rValue )
+    {
+        appendTimestamp( rProp.Name, rValue );
+    }
+
+    void appendBinaryStream( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue );
+    void appendBinaryStream( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue )
+    {
+        appendBinaryStream( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendBinaryStream( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue )
+    {
+        appendBinaryStream( rProp.Name, rValue );
+    }
+
+    void appendCharacterStream( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue );
+    void appendCharacterStream( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue )
+    {
+        appendCharacterStream( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendCharacterStream( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue )
+    {
+        appendCharacterStream( rProp.Name, rValue );
+    }
+
+    void appendObject( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
+    void appendObject( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Any& rValue )
+    {
+        appendObject( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendObject( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Any& rValue )
+    {
+        appendObject( rProp.Name, rValue );
+    }
+
+    void appendRef( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& rValue );
+    void appendRef( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& rValue )
+    {
+        appendRef( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendRef( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& rValue )
+    {
+        appendRef( rProp.Name, rValue );
+    }
+
+    void appendBlob( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& rValue );
+    void appendBlob( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& rValue )
+    {
+        appendBlob( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendBlob( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& rValue )
+    {
+        appendBlob( rProp.Name, rValue );
+    }
+
+    void appendClob( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& rValue );
+    void appendClob( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& rValue )
+    {
+        appendClob( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendClob( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& rValue )
+    {
+        appendClob( rProp.Name, rValue );
+    }
+
+    void appendArray( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& rValue );
+    void appendArray( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& rValue )
+    {
+        appendArray( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+    }
+    void appendArray( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& rValue )
+    {
+        appendArray( rProp.Name, rValue );
+    }
+
+    void appendVoid( const ::rtl::OUString& rPropName );
+    void appendVoid( const sal_Char* pAsciiPropName)
+    {
+        appendVoid( ::rtl::OUString::createFromAscii( pAsciiPropName ) );
+    }
+    void appendVoid( const ::com::sun::star::beans::Property& rProp )
+    {
+        appendVoid( rProp.Name );
+    }
 
     /**
       * This method tries to append all property values contained in a
diff --git a/ucbhelper/prj/build.lst b/ucbhelper/prj/build.lst
index 3f49d69c987f..bbd01df9022a 100644
--- a/ucbhelper/prj/build.lst
+++ b/ucbhelper/prj/build.lst
@@ -1,6 +1,7 @@
-uh	ucbhelper :    offuh sal cppu cppuhelper salhelper NULL
-uh	ucbhelper   			usr1	-	all	uh_mkout NULL
-uh	ucbhelper\inc   			nmake	-	all	uh_inc NULL
-uh	ucbhelper\source\client		nmake	-	all	uh_client uh_inc NULL
-uh	ucbhelper\source\provider	nmake	-	all	uh_provider uh_inc NULL
-uh	ucbhelper\util			nmake	-	all	uh_util uh_client uh_provider NULL
+uh	ucbhelper   :   offuh sal cppu cppuhelper salhelper NULL
+uh	ucbhelper                   usr1    -   all uh_mkout NULL
+uh	ucbhelper\inc               nmake   -   all uh_inc NULL
+uh	ucbhelper\source\client     nmake   -   all uh_client uh_inc NULL
+uh	ucbhelper\source\provider   nmake   -   all uh_provider uh_inc NULL
+uh	ucbhelper\util              nmake   -   all uh_util uh_client uh_provider NULL
+uh	ucbhelper\workben\myucp     nmake   -   all uh_wb_myucp uh_util NULL
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 5d9cfe31cf87..1c857ca467f0 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -89,7 +89,8 @@ const sal_uInt32 OBJECT_VALUE_SET           = 0x00040000;
 
 struct PropertyValue
 {
-    Property    aProperty;
+    ::rtl::OUString
+                sPropertyName;
 
     sal_uInt32  nPropsSet;
     sal_uInt32  nOrigValue;
@@ -240,12 +241,12 @@ class PropertyValues : public PropertyValuesVector {};
                         _member_name_,                                        \
                         getCppuType( static_cast< const _type_ * >( 0 ) ) )
 
-#define SETVALUE_IMPL( _property_, _type_name_, _member_name_, _value_ )      \
+#define SETVALUE_IMPL( _prop_name_, _type_name_, _member_name_, _value_ )     \
                                                                               \
     osl::MutexGuard aGuard( m_aMutex );                                       \
                                                                               \
     ucbhelper_impl::PropertyValue aNewValue;                                  \
-    aNewValue.aProperty     = _property_;                                     \
+    aNewValue.sPropertyName = _prop_name_;                                    \
     aNewValue.nPropsSet     = _type_name_;                                    \
     aNewValue.nOrigValue    = _type_name_;                                    \
     aNewValue._member_name_ = _value_;                                        \
@@ -642,7 +643,7 @@ sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName )
         sal_Int32 nCount = m_pValues->size();
         for ( sal_Int32 n = 0; n < nCount; ++n )
         {
-            if ( (*m_pValues)[ n ].aProperty.Name.equals( columnName ) )
+            if ( (*m_pValues)[ n ].sPropertyName.equals( columnName ) )
                 return sal_Int32( n + 1 ); // Index is 1-based.
         }
     }
@@ -682,144 +683,144 @@ sal_Int32 PropertyValueSet::getLength() const
 }
 
 //=========================================================================
-void PropertyValueSet::appendString( const Property& rProp,
+void PropertyValueSet::appendString( const ::rtl::OUString& rPropName,
                                      const OUString& rValue )
 {
-    SETVALUE_IMPL( rProp, STRING_VALUE_SET, aString, rValue );
+    SETVALUE_IMPL( rPropName, STRING_VALUE_SET, aString, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendBoolean( const Property& rProp,
+void PropertyValueSet::appendBoolean( const ::rtl::OUString& rPropName,
                                       sal_Bool bValue )
 {
-    SETVALUE_IMPL( rProp, BOOLEAN_VALUE_SET, bBoolean, bValue );
+    SETVALUE_IMPL( rPropName, BOOLEAN_VALUE_SET, bBoolean, bValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendByte( const Property& rProp,
+void PropertyValueSet::appendByte( const ::rtl::OUString& rPropName,
                                    sal_Int8 nValue )
 {
-    SETVALUE_IMPL( rProp, BYTE_VALUE_SET, nByte, nValue );
+    SETVALUE_IMPL( rPropName, BYTE_VALUE_SET, nByte, nValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendShort( const Property& rProp,
+void PropertyValueSet::appendShort( const ::rtl::OUString& rPropName,
                                     sal_Int16 nValue )
 {
-    SETVALUE_IMPL( rProp, SHORT_VALUE_SET, nShort, nValue );
+    SETVALUE_IMPL( rPropName, SHORT_VALUE_SET, nShort, nValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendInt( const Property& rProp,
+void PropertyValueSet::appendInt( const ::rtl::OUString& rPropName,
                                   sal_Int32 nValue )
 {
-    SETVALUE_IMPL( rProp, INT_VALUE_SET, nInt, nValue );
+    SETVALUE_IMPL( rPropName, INT_VALUE_SET, nInt, nValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendLong( const Property& rProp,
+void PropertyValueSet::appendLong( const ::rtl::OUString& rPropName,
                                    sal_Int64 nValue )
 {
-    SETVALUE_IMPL( rProp, LONG_VALUE_SET, nLong, nValue );
+    SETVALUE_IMPL( rPropName, LONG_VALUE_SET, nLong, nValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendFloat( const Property& rProp,
+void PropertyValueSet::appendFloat( const ::rtl::OUString& rPropName,
                                     float nValue )
 {
-    SETVALUE_IMPL( rProp, FLOAT_VALUE_SET, nFloat, nValue );
+    SETVALUE_IMPL( rPropName, FLOAT_VALUE_SET, nFloat, nValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendDouble( const Property& rProp,
+void PropertyValueSet::appendDouble( const ::rtl::OUString& rPropName,
                                      double nValue )
 {
-    SETVALUE_IMPL( rProp, DOUBLE_VALUE_SET, nDouble, nValue );
+    SETVALUE_IMPL( rPropName, DOUBLE_VALUE_SET, nDouble, nValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendBytes( const Property& rProp,
+void PropertyValueSet::appendBytes( const ::rtl::OUString& rPropName,
                                     const Sequence< sal_Int8 >& rValue )
 {
-    SETVALUE_IMPL( rProp, BYTES_VALUE_SET, aBytes, rValue );
+    SETVALUE_IMPL( rPropName, BYTES_VALUE_SET, aBytes, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendDate( const Property& rProp,
+void PropertyValueSet::appendDate( const ::rtl::OUString& rPropName,
                                    const Date& rValue )
 {
-    SETVALUE_IMPL( rProp, DATE_VALUE_SET, aDate, rValue );
+    SETVALUE_IMPL( rPropName, DATE_VALUE_SET, aDate, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendTime( const Property& rProp,
+void PropertyValueSet::appendTime( const ::rtl::OUString& rPropName,
                                    const Time& rValue )
 {
-    SETVALUE_IMPL( rProp, TIME_VALUE_SET, aTime, rValue );
+    SETVALUE_IMPL( rPropName, TIME_VALUE_SET, aTime, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendTimestamp( const Property& rProp,
+void PropertyValueSet::appendTimestamp( const ::rtl::OUString& rPropName,
                                         const DateTime& rValue )
 {
-    SETVALUE_IMPL( rProp, TIMESTAMP_VALUE_SET, aTimestamp, rValue );
+    SETVALUE_IMPL( rPropName, TIMESTAMP_VALUE_SET, aTimestamp, rValue );
 }
 
 //=========================================================================
 void PropertyValueSet::appendBinaryStream(
-                                const Property& rProp,
+                                const ::rtl::OUString& rPropName,
                                 const Reference< XInputStream >& rValue )
 {
-    SETVALUE_IMPL( rProp, BINARYSTREAM_VALUE_SET, xBinaryStream, rValue );
+    SETVALUE_IMPL( rPropName, BINARYSTREAM_VALUE_SET, xBinaryStream, rValue );
 }
 
 //=========================================================================
 void PropertyValueSet::appendCharacterStream(
-                                const Property& rProp,
+                                const ::rtl::OUString& rPropName,
                                 const Reference< XInputStream >& rValue )
 {
-    SETVALUE_IMPL( rProp, CHARACTERSTREAM_VALUE_SET, xCharacterStream, rValue );
+    SETVALUE_IMPL( rPropName, CHARACTERSTREAM_VALUE_SET, xCharacterStream, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendObject( const Property& rProp,
+void PropertyValueSet::appendObject( const ::rtl::OUString& rPropName,
                                      const Any& rValue )
 {
-    SETVALUE_IMPL( rProp, OBJECT_VALUE_SET, aObject, rValue );
+    SETVALUE_IMPL( rPropName, OBJECT_VALUE_SET, aObject, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendRef( const Property& rProp,
+void PropertyValueSet::appendRef( const ::rtl::OUString& rPropName,
                                   const Reference< XRef >& rValue )
 {
-    SETVALUE_IMPL( rProp, REF_VALUE_SET, xRef, rValue );
+    SETVALUE_IMPL( rPropName, REF_VALUE_SET, xRef, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendBlob( const Property& rProp,
+void PropertyValueSet::appendBlob( const ::rtl::OUString& rPropName,
                                    const Reference< XBlob >& rValue )
 {
-    SETVALUE_IMPL( rProp, BLOB_VALUE_SET, xBlob, rValue );
+    SETVALUE_IMPL( rPropName, BLOB_VALUE_SET, xBlob, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendClob( const Property& rProp,
+void PropertyValueSet::appendClob( const ::rtl::OUString& rPropName,
                                    const Reference< XClob >& rValue )
 {
-    SETVALUE_IMPL( rProp, CLOB_VALUE_SET, xClob, rValue );
+    SETVALUE_IMPL( rPropName, CLOB_VALUE_SET, xClob, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendArray( const Property& rProp,
+void PropertyValueSet::appendArray( const ::rtl::OUString& rPropName,
                                     const Reference< XArray >& rValue )
 {
-    SETVALUE_IMPL( rProp, ARRAY_VALUE_SET, xArray, rValue );
+    SETVALUE_IMPL( rPropName, ARRAY_VALUE_SET, xArray, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendVoid( const Property& rProp )
+void PropertyValueSet::appendVoid( const ::rtl::OUString& rPropName )
 {
-    SETVALUE_IMPL( rProp, NO_VALUE_SET, aObject, Any() );
+    SETVALUE_IMPL( rPropName, NO_VALUE_SET, aObject, Any() );
 }
 
 //=========================================================================
diff --git a/ucbhelper/workben/myucp/makefile.mk b/ucbhelper/workben/myucp/makefile.mk
index 77faad2e0396..6fbad4e8a953 100644
--- a/ucbhelper/workben/myucp/makefile.mk
+++ b/ucbhelper/workben/myucp/makefile.mk
@@ -46,6 +46,7 @@ NO_BSYMBOLIC=TRUE
 # --- Settings ---------------------------------------------------------
 
 .INCLUDE: settings.mk
+.INCLUDE :	../../version.mk
 
 # --- General -----------------------------------------------------