[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl2' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit c8b7dbe846f559eea58732536b28eb9c33dfe418
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Dec 27 21:09:49 2013 +0100

        set a few more missed properties
    
    Change-Id: I30a606e2bea9c8c8d7861e5b05a6df0e7c00b9a5

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 972f02f..7e09cbc 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -235,6 +235,16 @@ void setProperties( uno::Reference< beans::XPropertySet > xPropSet, const tPrope
     }
 }
 
+void setProperties( const tNameSequence& rNames, const tAnySequence& rValues,
+        std::map<OUString, uno::Any>& rTargetMap)
+{
+    sal_Int32 nSize = std::min(rNames.getLength(), rValues.getLength());
+    for(sal_Int32 i = 0; i < nSize; ++i)
+    {
+        rTargetMap[rNames[i]] = rValues[i];
+    }
+}
+
 }
 
 DummyCube::DummyCube(const drawing::Position3D &rPos, const drawing::Direction3D& rSize,
@@ -363,18 +373,20 @@ DummyRectangle::DummyRectangle(const awt::Size& rSize)
     setSize(rSize);
 }
 
-DummyRectangle::DummyRectangle(const awt::Size& rSize, const awt::Point& rPoint, const tNameSequence& ,
-        const tAnySequence& )
+DummyRectangle::DummyRectangle(const awt::Size& rSize, const awt::Point& rPoint, const tNameSequence& rNames,
+        const tAnySequence& rValues)
 {
     setSize(rSize);
     setPosition(rPoint);
+    setProperties(rNames, rValues, maProperties);
 }
 
-DummyText::DummyText(const OUString& rText, const tNameSequence& ,
-        const tAnySequence& , const uno::Any& rTrans ):
+DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
+        const tAnySequence& rValues, const uno::Any& rTrans ):
     maText(rText),
     maTrans(rTrans)
 {
+    setProperties(rNames, rValues, maProperties);
 }
 
 DummyGroup3D::DummyGroup3D(const OUString& rName)