1 files changed, 22 insertions, 13 deletions

diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx
index d42bc836ca88..038b1e5733b6 100644
--- a/test/source/beans/xpropertyset.cxx
+++ b/test/source/beans/xpropertyset.cxx
@@ -17,12 +17,14 @@
 #include <com/sun/star/beans/XVetoableChangeListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/XComplexColor.hpp>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Type.h>
 
 #include <cppuhelper/implbase.hxx>
+#include <docmodel/uno/UnoComplexColor.hxx>
 #include <rtl/ref.hxx>
 
 #include <cppunit/TestAssert.h>
@@ -86,7 +88,7 @@ void XPropertySet::testPropertyChangeListener()
     {
         rtl::Reference<MockedPropertyChangeListener> xListener = new MockedPropertyChangeListener();
         xPropSet->addPropertyChangeListener(
-            aName, uno::Reference<beans::XPropertyChangeListener>(xListener.get()));
+            aName, uno::Reference<beans::XPropertyChangeListener>(xListener));
         if (!isPropertyValueChangeable(aName))
             continue;
 
@@ -94,7 +96,7 @@ void XPropertySet::testPropertyChangeListener()
 
         xListener->m_bListenerCalled = false;
         xPropSet->removePropertyChangeListener(
-            aName, uno::Reference<beans::XPropertyChangeListener>(xListener.get()));
+            aName, uno::Reference<beans::XPropertyChangeListener>(xListener));
         isPropertyValueChangeable(aName);
         CPPUNIT_ASSERT(!xListener->m_bListenerCalled);
     }
@@ -110,7 +112,7 @@ void XPropertySet::testVetoableChangeListener()
     {
         rtl::Reference<MockedVetoableChangeListener> xListener = new MockedVetoableChangeListener();
         xPropSet->addVetoableChangeListener(
-            aName, uno::Reference<beans::XVetoableChangeListener>(xListener.get()));
+            aName, uno::Reference<beans::XVetoableChangeListener>(xListener));
         if (!isPropertyValueChangeable(aName))
             continue;
 
@@ -118,7 +120,7 @@ void XPropertySet::testVetoableChangeListener()
 
         xListener->m_bListenerCalled = false;
         xPropSet->removeVetoableChangeListener(
-            aName, uno::Reference<beans::XVetoableChangeListener>(xListener.get()));
+            aName, uno::Reference<beans::XVetoableChangeListener>(xListener));
         isPropertyValueChangeable(aName);
         CPPUNIT_ASSERT(!xListener->m_bListenerCalled);
     }
@@ -184,63 +186,70 @@ bool XPropertySet::isPropertyValueChangeable(const OUString& rName)
         {
             // boolean type
             bool bOld = any.get<bool>();
-            xPropSet->setPropertyValue(rName, makeAny(!bOld));
+            xPropSet->setPropertyValue(rName, Any(!bOld));
         }
         else if (type == cppu::UnoType<sal_Int8>::get())
         {
             // 8-bit integer
             sal_Int8 nOld = any.get<sal_Int8>();
             sal_Int8 nNew = nOld + 1;
-            xPropSet->setPropertyValue(rName, makeAny(nNew));
+            xPropSet->setPropertyValue(rName, Any(nNew));
         }
         else if (type == cppu::UnoType<sal_Int16>::get())
         {
             // 16-bit integer
             sal_Int16 nOld = any.get<sal_Int16>();
             sal_Int16 nNew = nOld + 1;
-            xPropSet->setPropertyValue(rName, makeAny(nNew));
+            xPropSet->setPropertyValue(rName, Any(nNew));
         }
         else if (type == cppu::UnoType<sal_Int32>::get())
         {
             // 32-bit integer
             sal_Int32 nOld = any.get<sal_Int32>();
             sal_Int32 nNew = nOld + 3;
-            xPropSet->setPropertyValue(rName, makeAny(nNew));
+            xPropSet->setPropertyValue(rName, Any(nNew));
         }
         else if (type == cppu::UnoType<sal_Int64>::get())
         {
             // 64-bit integer
             sal_Int64 nOld = any.get<sal_Int64>();
             sal_Int64 nNew = nOld + 4;
-            xPropSet->setPropertyValue(rName, makeAny(nNew));
+            xPropSet->setPropertyValue(rName, Any(nNew));
         }
         else if (type == cppu::UnoType<float>::get())
         {
             // single precision
             float fOld = any.get<float>();
             float fNew = fOld + 1.2;
-            xPropSet->setPropertyValue(rName, makeAny(fNew));
+            xPropSet->setPropertyValue(rName, Any(fNew));
         }
         else if (type == cppu::UnoType<double>::get())
         {
             // double precision
             double fOld = any.get<double>();
             double fNew = fOld + 1.3;
-            xPropSet->setPropertyValue(rName, makeAny(fNew));
+            xPropSet->setPropertyValue(rName, Any(fNew));
         }
         else if (type == cppu::UnoType<OUString>::get())
         {
             // string type
             OUString aOld = any.get<OUString>();
             OUString aNew = aOld + "foo";
-            xPropSet->setPropertyValue(rName, makeAny(aNew));
+            xPropSet->setPropertyValue(rName, Any(aNew));
         }
         else if (type == cppu::UnoType<util::DateTime>::get())
         {
             // date time type
             util::DateTime aDT = any.get<util::DateTime>();
             aDT.Year += 1;
-            xPropSet->setPropertyValue(rName, makeAny(aDT));
+            xPropSet->setPropertyValue(rName, Any(aDT));
+        }
+        else if (type == cppu::UnoType<uno::Reference<util::XComplexColor>>::get())
+        {
+            auto xComplexColor = any.get<uno::Reference<util::XComplexColor>>();
+            auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
+            xPropSet->setPropertyValue(rName,
+                                       Any(model::color::createXComplexColor(aComplexColor)));
         }
         else
         {