[Libreoffice-commits] .: 141 commits - chart2/Library_chartview.mk chart2/qa chart2/source drawinglayer/inc drawinglayer/Library_drawinglayer.mk drawinglayer/Package_inc.mk drawinglayer/source .gitignore sc/qa sd/CppunitTest_sd_regression_test.mk sd/Module_sd.mk sd/qa svx/source test/inc test/source

Markus Mohrhard mmohrhard at kemper.freedesktop.org
Fri Jul 13 12:22:58 PDT 2012


 .gitignore                                         |    3 
 chart2/Library_chartview.mk                        |    5 
 chart2/qa/unit/data/reference/testChart.xml        | 1168 ++++++++++++
 chart2/source/view/main/ChartView.cxx              |  117 -
 drawinglayer/Library_drawinglayer.mk               |    7 
 drawinglayer/Package_inc.mk                        |    1 
 drawinglayer/inc/drawinglayer/XShapeDumper.hxx     |   71 
 drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 1079 ++++++++++++
 drawinglayer/source/dumper/EnhancedShapeDumper.hxx |  149 +
 drawinglayer/source/dumper/XShapeDumper.cxx        | 1887 +++++++++++++++++++++
 sc/qa/extras/regression-test.cxx                   |    5 
 sd/CppunitTest_sd_regression_test.mk               |    2 
 sd/Module_sd.mk                                    |    3 
 sd/qa/unit/data/odp/shapes-test.odp                |binary
 sd/qa/unit/data/odp/text-test.odp                  |binary
 sd/qa/unit/data/tolerance.xml                      |    3 
 sd/qa/unit/data/xml/shapes-test_page0.xml          |  473 +++++
 sd/qa/unit/data/xml/shapes-test_page1.xml          |  255 ++
 sd/qa/unit/data/xml/shapes-test_page2.xml          |  392 ++++
 sd/qa/unit/data/xml/shapes-test_page3.xml          |  714 +++++++
 sd/qa/unit/data/xml/shapes-test_page4.xml          |  115 +
 sd/qa/unit/data/xml/shapes-test_page5.xml          |   91 +
 sd/qa/unit/data/xml/shapes-test_page6.xml          |    5 
 sd/qa/unit/data/xml/shapes-test_page7.xml          |   10 
 sd/qa/unit/regression-test.cxx                     |   81 
 svx/source/unodraw/unoshape.cxx                    |    1 
 test/inc/test/xmldiff.hxx                          |   70 
 test/source/diff/diff.cxx                          |   84 
 28 files changed, 6538 insertions(+), 253 deletions(-)

New commits:
commit 4e4d5683625538db61f05f676042f43d055fe368
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 13 21:20:38 2012 +0200

    enable sd tests again
    
    Change-Id: I773dc0dc4a2d5faf98420d3901d28c2a08e64c00

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 654f2aa..c15646d 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -42,7 +42,9 @@ $(eval $(call gb_Module_add_targets,sd,\
 
 ifneq ($(OS),DRAGONFLY)
 $(eval $(call gb_Module_add_check_targets,sd,\
+    CppunitTest_sd_uimpress \
     CppunitTest_sd_regression_test \
+    CppunitTest_sd_filters_test \
 ))
 endif
 
@@ -51,6 +53,4 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
     JunitTest_sd_unoapi \
 ))
 
-#    CppunitTest_sd_uimpress \
-#    CppunitTest_sd_filters_test \
 # vim: set noet sw=4 ts=4:
commit ba19b6b104bf64e33ec09874d17e39328f8b2c0d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 13 21:19:22 2012 +0200

    no need for libxml2 in chartview anymore
    
    Change-Id: I850b25843fa602269148b9097075bdfd7410086a

diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index a307e7e..83ea331 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -112,8 +112,4 @@ $(eval $(call gb_Library_add_exception_objects,chartview,\
     chart2/source/view/main/VTitle \
 ))
 
-$(eval $(call gb_Library_use_externals,chartview,\
-	libxml2 \
-))
-
 # vim: set noet sw=4 ts=4:
commit f1139806e56c468181d250bcfbb878d3a97eb94a
Merge: 76fd08e... 87c6bed...
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 13 21:16:54 2012 +0200

    Merge branch 'feature/gsoc_test_improvements2'

commit 87c6beddfb684cee702ec1c9225497b8541a780d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 13 12:29:03 2012 +0200

    test: move XMLDiff implementation details to cxx file
    
    This makes it unnecessary to link clients against libxml2.
    
    Change-Id: Ifd295623c01bdc6f579afbf81d5b609a2b29f4bf

diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
index 2c28105..e909467 100644
--- a/sc/qa/extras/regression-test.cxx
+++ b/sc/qa/extras/regression-test.cxx
@@ -73,9 +73,8 @@ bool checkDumpAgainstFile( const rtl::OUString& rDump, const rtl::OUString aFile
     CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.isEmpty());
 
     rtl::OString aDump = rtl::OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
-    XMLDiff aDiff(aOFile.getStr(), aDump.getStr(),static_cast<int>(rDump.getLength()), aToleranceFile.getStr());
-
-    return aDiff.compare();
+    return doXMLDiff(aOFile.getStr(), aDump.getStr(),
+            static_cast<int>(rDump.getLength()), aToleranceFile.getStr());
 }
 
 }
diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx
index 7cb0609..0b1dee1 100644
--- a/sd/qa/unit/regression-test.cxx
+++ b/sd/qa/unit/regression-test.cxx
@@ -214,10 +214,13 @@ void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const rtl::OStrin
 
         rtl::OString aFileName = aFileNameBuf.makeStringAndClear();
 
-        XMLDiff aDiff(aFileName.getStr(), rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(), static_cast<int>(aString.getLength()),
-                rtl::OUStringToOString(getPathFromSrc("/sd/qa/unit/data/tolerance.xml"), RTL_TEXTENCODING_UTF8).getStr());
         std::cout << aString << std::endl;
-        aDiff.compare();
+        doXMLDiff(aFileName.getStr(),
+            rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(),
+            static_cast<int>(aString.getLength()),
+            rtl::OUStringToOString(
+                getPathFromSrc("/sd/qa/unit/data/tolerance.xml"),
+                RTL_TEXTENCODING_UTF8).getStr());
     }
     xDocShRef->DoClose();
 }
diff --git a/test/inc/test/xmldiff.hxx b/test/inc/test/xmldiff.hxx
index 0d768ae..cdba298 100644
--- a/test/inc/test/xmldiff.hxx
+++ b/test/inc/test/xmldiff.hxx
@@ -26,74 +26,10 @@
  * instead of those above.
  */
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xmlmemory.h>
-#include <string>
-#include <set>
 #include <test/testdllapi.hxx>
 
-#define USE_CPPUNIT 1
-
-struct tolerance
-{
-    ~tolerance()
-    {
-        xmlFree(elementName);
-        xmlFree(attribName);
-    }
-
-    tolerance()
-    {
-        elementName = NULL;
-        attribName = NULL;
-    }
-
-    tolerance(const tolerance& tol)
-    {
-        elementName = xmlStrdup(tol.elementName);
-        attribName = xmlStrdup(tol.attribName);
-        relative = tol.relative;
-        value = tol.value;
-    }
-
-    xmlChar* elementName;
-    xmlChar* attribName;
-    bool relative;
-    double value;
-    bool operator==(const tolerance& rTol) const { return xmlStrEqual(elementName, rTol.elementName) && xmlStrEqual(attribName, rTol.attribName); }
-    bool operator<(const tolerance& rTol) const
-    {
-        int cmp = xmlStrcmp(elementName, rTol.elementName);
-        if(cmp == 0)
-        {
-            cmp = xmlStrcmp(attribName, rTol.attribName);
-        }
-
-        if(cmp>=0)
-            return false;
-        else
-            return true;
-    }
-};
-
-class OOO_DLLPUBLIC_TEST XMLDiff
-{
-public:
-    XMLDiff(const char* pFileName, const char* pContent, int size, const char* pToleranceFileName);
-    ~XMLDiff();
-
-    bool compare();
-private:
-    typedef std::set<tolerance> ToleranceContainer;
-
-    void loadToleranceFile(xmlDocPtr xmlTolerance);
-    bool compareAttributes(xmlNodePtr node1, xmlNodePtr node2);
-    bool compareElements(xmlNodePtr node1, xmlNodePtr node2);
-
-    ToleranceContainer toleranceContainer;
-    xmlDocPtr xmlFile1;
-    xmlDocPtr xmlFile2;
-};
+bool OOO_DLLPUBLIC_TEST
+doXMLDiff(const char* pFileName, const char* pContent, int size,
+          const char* pToleranceFileName);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx
index 00e1444..048e783 100644
--- a/test/source/diff/diff.cxx
+++ b/test/source/diff/diff.cxx
@@ -26,10 +26,16 @@
  * instead of those above.
  */
 
+#define USE_CPPUNIT 1
 
 #include "test/xmldiff.hxx"
+
 #include <libxml/xpath.h>
-#include <rtl/math.hxx>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlmemory.h>
+
+#include <set>
 #include <cstring>
 #include <sstream>
 #include <cmath>
@@ -39,6 +45,73 @@
 #include <cppunit/extensions/HelperMacros.h>
 #endif
 
+#include <rtl/math.hxx>
+
+
+struct tolerance
+{
+    ~tolerance()
+    {
+        xmlFree(elementName);
+        xmlFree(attribName);
+    }
+
+    tolerance()
+    {
+        elementName = NULL;
+        attribName = NULL;
+    }
+
+    tolerance(const tolerance& tol)
+    {
+        elementName = xmlStrdup(tol.elementName);
+        attribName = xmlStrdup(tol.attribName);
+        relative = tol.relative;
+        value = tol.value;
+    }
+
+    xmlChar* elementName;
+    xmlChar* attribName;
+    bool relative;
+    double value;
+    bool operator==(const tolerance& rTol) const { return xmlStrEqual(elementName, rTol.elementName) && xmlStrEqual(attribName, rTol.attribName); }
+    bool operator<(const tolerance& rTol) const
+    {
+        int cmp = xmlStrcmp(elementName, rTol.elementName);
+        if(cmp == 0)
+        {
+            cmp = xmlStrcmp(attribName, rTol.attribName);
+        }
+
+        if(cmp>=0)
+            return false;
+        else
+            return true;
+    }
+};
+
+class XMLDiff
+{
+public:
+    XMLDiff(const char* pFileName, const char* pContent, int size, const char* pToleranceFileName);
+    ~XMLDiff();
+
+    bool compare();
+private:
+    typedef std::set<tolerance> ToleranceContainer;
+
+    void loadToleranceFile(xmlDocPtr xmlTolerance);
+    bool compareAttributes(xmlNodePtr node1, xmlNodePtr node2);
+    bool compareElements(xmlNodePtr node1, xmlNodePtr node2);
+
+    ToleranceContainer toleranceContainer;
+    xmlDocPtr xmlFile1;
+    xmlDocPtr xmlFile2;
+};
+
+
+
+
 XMLDiff::XMLDiff( const char* pFileName, const char* pContent, int size, const char* pToleranceFile)
 {
     xmlFile1 = xmlParseFile(pFileName);
@@ -290,4 +363,13 @@ bool XMLDiff::compareAttributes(xmlNodePtr node1, xmlNodePtr node2)
     return true;
 }
 
+
+bool
+doXMLDiff(char const*const pFileName, char const*const pContent, int const size,
+          char const*const pToleranceFileName)
+{
+    XMLDiff aDiff(pFileName, pContent, size, pToleranceFileName);
+    return aDiff.compare();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ee615aeb2c11ee1f288f903c2a7550299a9bc820
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 13 06:07:27 2012 +0200

    forgot to remove the header file from the deliver code
    
    Change-Id: Ifd6edd22e144948a3e98b02744ebf4852f0aa3e3

diff --git a/drawinglayer/Package_inc.mk b/drawinglayer/Package_inc.mk
index 585a027..7d41e6c 100644
--- a/drawinglayer/Package_inc.mk
+++ b/drawinglayer/Package_inc.mk
@@ -138,6 +138,5 @@ $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture3d.hxx,drawinglayer/texture/texture3d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture.hxx,drawinglayer/texture/texture.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/XShapeDumper.hxx,drawinglayer/XShapeDumper.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/XShapeDumper.hxx,drawinglayer/EnhancedShapeDumper.hxx))
 
 # vim: set noet sw=4 ts=4:
commit f11bfe90f8453c74c94717b816f05ad44ba00b1e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 13 06:00:35 2012 +0200

    move EnhancedShapeDumper to a module local location
    
    Change-Id: Idb4cd44da611973c92bda6de779daf3aa8425168

diff --git a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
deleted file mode 100644
index 7bad73c..0000000
--- a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Artur Dorda <artur.dorda+libo at gmail.com> (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include <libxml/xmlwriter.h>
-
-#include <drawinglayer/drawinglayerdllapi.h>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
-#include <com/sun/star/drawing/Direction3D.hpp>
-#include <com/sun/star/drawing/ShadeMode.hpp>
-#include <com/sun/star/drawing/ProjectionMode.hpp>
-#include <com/sun/star/drawing/Position3D.hpp>
-
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
-
-#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
-#include <com/sun/star/awt/Size.hpp>
-
-#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
-
-#ifndef EnhancedShapeDumper_hxx
-#define EnhancedShapeDumper_hxx
-
-class DRAWINGLAYER_DLLPUBLIC EnhancedShapeDumper
-{
-public:
-    EnhancedShapeDumper(xmlTextWriterPtr writer)
-    :
-    xmlWriter(writer)
-    {
-
-    }
-
-    // auxiliary functions
-    void dumpEnhancedCustomShapeParameterPair(com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair);
-    void dumpDirection3D(com::sun::star::drawing::Direction3D aDirection3D);
-    void dumpPropertyValueAsElement(com::sun::star::beans::PropertyValue aPropertyValue);
-    void dumpEnhancedCustomShapeParameter(com::sun::star::drawing::EnhancedCustomShapeParameter aParameter);
-
-    // EnhancedCustomShapeExtrusion.idl
-    void dumpEnhancedCustomShapeExtrusionService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
-    void dumpExtrusionAsAttribute(sal_Bool bExtrusion);
-    void dumpBrightnessAsAttribute(double aBrightness);
-    void dumpDepthAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepth);
-    void dumpDiffusionAsAttribute(double aDiffusion);
-    void dumpNumberOfLineSegmentsAsAttribute(sal_Int32 aNumberOfLineSegments);
-    void dumpLightFaceAsAttribute(sal_Bool bLightFace);
-    void dumpFirstLightHarshAsAttribute(sal_Bool bFirstLightHarsh);
-    void dumpSecondLightHarshAsAttribute(sal_Bool bSecondLightHarsh);
-    void dumpFirstLightLevelAsAttribute(double aFirstLightLevel);
-    void dumpSecondLightLevelAsAttribute(double aSecondLightLevel);
-    void dumpFirstLightDirectionAsElement(com::sun::star::drawing::Direction3D aFirstLightDirection);
-    void dumpSecondLightDirectionAsElement(com::sun::star::drawing::Direction3D aSecondLightDirection);
-    void dumpMetalAsAttribute(sal_Bool bMetal);
-    void dumpShadeModeAsAttribute(com::sun::star::drawing::ShadeMode eShadeMode);
-    void dumpRotateAngleAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngle);
-    void dumpRotationCenterAsElement(com::sun::star::drawing::Direction3D aRotationCenter);
-    void dumpShininessAsAttribute(double aShininess);
-    void dumpSkewAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkew);
-    void dumpSpecularityAsAttribute(double aSpecularity);
-    void dumpProjectionModeAsAttribute(com::sun::star::drawing::ProjectionMode eProjectionMode);
-    void dumpViewPointAsElement(com::sun::star::drawing::Position3D aViewPoint);
-    void dumpOriginAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aOrigin);
-    void dumpExtrusionColorAsAttribute(sal_Bool bExtrusionColor);
-
-    // EnhancedCustomShapeGeometry.idl
-    void dumpEnhancedCustomShapeGeometryService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
-    void dumpTypeAsAttribute(rtl::OUString sType);
-    void dumpViewBoxAsElement(com::sun::star::awt::Rectangle aViewBox);
-    void dumpMirroredXAsAttribute(sal_Bool bMirroredX); // also used in EnhancedCustomShapeHandle
-    void dumpMirroredYAsAttribute(sal_Bool bMirroredY); // also used in EnhancedCustomShapeHandle
-    void dumpTextRotateAngleAsAttribute(double aTextRotateAngle);
-    void dumpAdjustmentValuesAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue> aAdjustmentValues);
-    void dumpExtrusionAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aExtrusion);
-    void dumpPathAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aPath);
-    void dumpTextPathAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aTextPath);
-    void dumpEquationsAsElement(com::sun::star::uno::Sequence< rtl::OUString > aEquations);
-    void dumpHandlesAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > aHandles);
-
-    // EnhancedCustomShapeHandle.idl
-    void dumpEnhancedCustomShapeHandleService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
-    void dumpSwitchedAsAttribute(sal_Bool bSwitched);
-    void dumpPositionAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition);
-    void dumpPolarAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aPolar);
-    void dumpRefXAsAttribute(sal_Int32 aRefX);
-    void dumpRefYAsAttribute(sal_Int32 aRefY);
-    void dumpRefAngleAsAttribute(sal_Int32 aRefAngle);
-    void dumpRefRAsAttribute(sal_Int32 aRefR);
-    void dumpRangeXMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum);
-    void dumpRangeXMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum);
-    void dumpRangeYMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum);
-    void dumpRangeYMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum);
-    void dumpRadiusRangeMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum);
-    void dumpRadiusRangeMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum);
-
-    // EnhancedCustomShapePath.idl
-    void dumpEnhancedCustomShapePathService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
-    void dumpCoordinatesAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates);
-    void dumpSegmentsAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments);
-    void dumpStretchXAsAttribute(sal_Int32 aStretchX);
-    void dumpStretchYAsAttribute(sal_Int32 aStretchY);
-    void dumpTextFramesAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aTextFrames);
-    void dumpGluePointsAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aGluePoints);
-    void dumpGluePointLeavingDirectionsAsElement(com::sun::star::uno::Sequence< double > aGluePointLeavingDirections);
-    void dumpGluePointTypeAsAttribute(sal_Int32 aGluePointType);
-    void dumpExtrusionAllowedAsAttribute(sal_Bool bExtrusionAllowed);
-    void dumpConcentricGradientFillAllowedAsAttribute(sal_Bool bConcentricGradientFillAllowed);
-    void dumpTextPathAllowedAsAttribute(sal_Bool bTextPathAllowed);
-    void dumpSubViewSizeAsElement(com::sun::star::uno::Sequence< com::sun::star::awt::Size > aSubViewSize);
-
-    // EnhancedCustomShapePath.idl
-    void dumpEnhancedCustomShapeTextPathService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
-    void dumpTextPathAsAttribute(sal_Bool bTextPath);
-    void dumpTextPathModeAsAttribute(com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode);
-    void dumpScaleXAsAttribute(sal_Bool bScaleX);
-
-private:
-    xmlTextWriterPtr xmlWriter;
-};
-#endif
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index 7ecbb3c..4d7c056 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -26,7 +26,7 @@
  * instead of those above.
  */
 
-#include <drawinglayer/EnhancedShapeDumper.hxx>
+#include <EnhancedShapeDumper.hxx>
 #include <rtl/strbuf.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx
new file mode 100644
index 0000000..7ed9359
--- /dev/null
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx
@@ -0,0 +1,149 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Artur Dorda <artur.dorda+libo at gmail.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <libxml/xmlwriter.h>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
+#include <com/sun/star/drawing/Direction3D.hpp>
+#include <com/sun/star/drawing/ShadeMode.hpp>
+#include <com/sun/star/drawing/ProjectionMode.hpp>
+#include <com/sun/star/drawing/Position3D.hpp>
+
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
+
+#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
+#include <com/sun/star/awt/Size.hpp>
+
+#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
+
+#ifndef EnhancedShapeDumper_hxx
+#define EnhancedShapeDumper_hxx
+
+class EnhancedShapeDumper
+{
+public:
+    EnhancedShapeDumper(xmlTextWriterPtr writer)
+    :
+    xmlWriter(writer)
+    {
+
+    }
+
+    // auxiliary functions
+    void dumpEnhancedCustomShapeParameterPair(com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair);
+    void dumpDirection3D(com::sun::star::drawing::Direction3D aDirection3D);
+    void dumpPropertyValueAsElement(com::sun::star::beans::PropertyValue aPropertyValue);
+    void dumpEnhancedCustomShapeParameter(com::sun::star::drawing::EnhancedCustomShapeParameter aParameter);
+
+    // EnhancedCustomShapeExtrusion.idl
+    void dumpEnhancedCustomShapeExtrusionService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
+    void dumpExtrusionAsAttribute(sal_Bool bExtrusion);
+    void dumpBrightnessAsAttribute(double aBrightness);
+    void dumpDepthAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepth);
+    void dumpDiffusionAsAttribute(double aDiffusion);
+    void dumpNumberOfLineSegmentsAsAttribute(sal_Int32 aNumberOfLineSegments);
+    void dumpLightFaceAsAttribute(sal_Bool bLightFace);
+    void dumpFirstLightHarshAsAttribute(sal_Bool bFirstLightHarsh);
+    void dumpSecondLightHarshAsAttribute(sal_Bool bSecondLightHarsh);
+    void dumpFirstLightLevelAsAttribute(double aFirstLightLevel);
+    void dumpSecondLightLevelAsAttribute(double aSecondLightLevel);
+    void dumpFirstLightDirectionAsElement(com::sun::star::drawing::Direction3D aFirstLightDirection);
+    void dumpSecondLightDirectionAsElement(com::sun::star::drawing::Direction3D aSecondLightDirection);
+    void dumpMetalAsAttribute(sal_Bool bMetal);
+    void dumpShadeModeAsAttribute(com::sun::star::drawing::ShadeMode eShadeMode);
+    void dumpRotateAngleAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngle);
+    void dumpRotationCenterAsElement(com::sun::star::drawing::Direction3D aRotationCenter);
+    void dumpShininessAsAttribute(double aShininess);
+    void dumpSkewAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkew);
+    void dumpSpecularityAsAttribute(double aSpecularity);
+    void dumpProjectionModeAsAttribute(com::sun::star::drawing::ProjectionMode eProjectionMode);
+    void dumpViewPointAsElement(com::sun::star::drawing::Position3D aViewPoint);
+    void dumpOriginAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aOrigin);
+    void dumpExtrusionColorAsAttribute(sal_Bool bExtrusionColor);
+
+    // EnhancedCustomShapeGeometry.idl
+    void dumpEnhancedCustomShapeGeometryService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
+    void dumpTypeAsAttribute(rtl::OUString sType);
+    void dumpViewBoxAsElement(com::sun::star::awt::Rectangle aViewBox);
+    void dumpMirroredXAsAttribute(sal_Bool bMirroredX); // also used in EnhancedCustomShapeHandle
+    void dumpMirroredYAsAttribute(sal_Bool bMirroredY); // also used in EnhancedCustomShapeHandle
+    void dumpTextRotateAngleAsAttribute(double aTextRotateAngle);
+    void dumpAdjustmentValuesAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue> aAdjustmentValues);
+    void dumpExtrusionAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aExtrusion);
+    void dumpPathAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aPath);
+    void dumpTextPathAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aTextPath);
+    void dumpEquationsAsElement(com::sun::star::uno::Sequence< rtl::OUString > aEquations);
+    void dumpHandlesAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > aHandles);
+
+    // EnhancedCustomShapeHandle.idl
+    void dumpEnhancedCustomShapeHandleService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
+    void dumpSwitchedAsAttribute(sal_Bool bSwitched);
+    void dumpPositionAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition);
+    void dumpPolarAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aPolar);
+    void dumpRefXAsAttribute(sal_Int32 aRefX);
+    void dumpRefYAsAttribute(sal_Int32 aRefY);
+    void dumpRefAngleAsAttribute(sal_Int32 aRefAngle);
+    void dumpRefRAsAttribute(sal_Int32 aRefR);
+    void dumpRangeXMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum);
+    void dumpRangeXMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum);
+    void dumpRangeYMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum);
+    void dumpRangeYMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum);
+    void dumpRadiusRangeMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum);
+    void dumpRadiusRangeMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum);
+
+    // EnhancedCustomShapePath.idl
+    void dumpEnhancedCustomShapePathService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
+    void dumpCoordinatesAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates);
+    void dumpSegmentsAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments);
+    void dumpStretchXAsAttribute(sal_Int32 aStretchX);
+    void dumpStretchYAsAttribute(sal_Int32 aStretchY);
+    void dumpTextFramesAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aTextFrames);
+    void dumpGluePointsAsElement(com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aGluePoints);
+    void dumpGluePointLeavingDirectionsAsElement(com::sun::star::uno::Sequence< double > aGluePointLeavingDirections);
+    void dumpGluePointTypeAsAttribute(sal_Int32 aGluePointType);
+    void dumpExtrusionAllowedAsAttribute(sal_Bool bExtrusionAllowed);
+    void dumpConcentricGradientFillAllowedAsAttribute(sal_Bool bConcentricGradientFillAllowed);
+    void dumpTextPathAllowedAsAttribute(sal_Bool bTextPathAllowed);
+    void dumpSubViewSizeAsElement(com::sun::star::uno::Sequence< com::sun::star::awt::Size > aSubViewSize);
+
+    // EnhancedCustomShapePath.idl
+    void dumpEnhancedCustomShapeTextPathService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet);
+    void dumpTextPathAsAttribute(sal_Bool bTextPath);
+    void dumpTextPathModeAsAttribute(com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode);
+    void dumpScaleXAsAttribute(sal_Bool bScaleX);
+
+private:
+    xmlTextWriterPtr xmlWriter;
+};
+#endif
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx
index 7c31bb9..c505541 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -27,7 +27,7 @@
  */
 
 #include <drawinglayer/XShapeDumper.hxx>
-#include <drawinglayer/EnhancedShapeDumper.hxx>
+#include "EnhancedShapeDumper.hxx"
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
commit 4a2398e6c96849a4f62a32585b04b3f07f72e2f6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 12 03:20:57 2012 +0200

    this change was a mistake
    
    Change-Id: I440ad9fa94b43135e4953c9d3fb31fcb177477e7

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2381d7a..3afcaf2 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -47,12 +47,13 @@ $(eval $(call gb_Module_add_check_targets,sc,\
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc,\
-    CppunitTest_sc_chart_regression_test \
+    CppunitTest_sc_subsequent_filters_test \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
     JunitTest_sc_complex \
     JunitTest_sc_unoapi \
+    CppunitTest_sc_chart_regression_test \
     CppunitTest_sc_annotationshapeobj \
     CppunitTest_sc_cellrangeobj \
     $(if $(filter-out $(OS),IOS), \
commit ff805a2bd1eec8a665004378d95acd15dd6a3189
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 12 03:06:53 2012 +0200

    adapt chart regression test to new dumper code
    
    Change-Id: Ia84f85062a254fd6434783f6ee323f27835ae8df

diff --git a/chart2/qa/unit/data/reference/testChart.xml b/chart2/qa/unit/data/reference/testChart.xml
index c8eae26..03ad3d9 100644
--- a/chart2/qa/unit/data/reference/testChart.xml
+++ b/chart2/qa/unit/data/reference/testChart.xml
@@ -1,18 +1,75 @@
 <?xml version="1.0"?>
 <XShapes>
- <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page="/>
+ <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName="">
+  <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+  <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+  <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+  <FillBitmap/>
+  <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+  <LineStart/>
+  <LineEnd/>
+  <Transformation>
+   <Line1 column1="16001.000000" column2="0.000000" column3="0.000000"/>
+   <Line2 column1="0.000000" column2="9001.000000" column3="0.000000"/>
+   <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+  </Transformation>
+ </XShape>
  <XShape positionX="770" positionY="854" sizeX="13068" sizeY="7546" type="com.sun.star.drawing.GroupShape" name="CID/D=0">
   <XShapes>
-   <XShape positionX="1206" positionY="1054" sizeX="12632" sizeY="6699" type="com.sun.star.drawing.RectangleShape" name="MarkHandles"/>
-   <XShape positionX="770" positionY="855" sizeX="13068" sizeY="7545" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes"/>
+   <XShape positionX="1206" positionY="1054" sizeX="12632" sizeY="6699" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="10079487" fillTransparence="0" fillTransparenceGradientName="">
+    <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+    <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+    <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+    <FillBitmap/>
+    <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+    <LineStart/>
+    <LineEnd/>
+    <Transformation>
+     <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/>
+     <Line2 column1="0.000000" column2="6700.000000" column3="1054.000000"/>
+     <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+    </Transformation>
+   </XShape>
+   <XShape positionX="770" positionY="855" sizeX="13068" sizeY="7545" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="10079487" fillTransparence="0" fillTransparenceGradientName="">
+    <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+    <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+    <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+    <FillBitmap/>
+    <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+    <LineStart/>
+    <LineEnd/>
+    <Transformation>
+     <Line1 column1="13069.000000" column2="0.000000" column3="770.000000"/>
+     <Line2 column1="0.000000" column2="7546.000000" column3="855.000000"/>
+     <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+    </Transformation>
+   </XShape>
    <XShape positionX="770" positionY="854" sizeX="13068" sizeY="7546" type="com.sun.star.drawing.GroupShape">
     <XShapes>
      <XShape positionX="1056" positionY="1052" sizeX="12782" sizeY="6850" type="com.sun.star.drawing.GroupShape">
       <XShapes>
        <XShape positionX="1206" positionY="1054" sizeX="12632" sizeY="6699" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes">
         <XShapes>
-         <XShape positionX="1206" positionY="1054" sizeX="12632" sizeY="6699" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall="/>
+         <XShape positionX="1206" positionY="1054" sizeX="12632" sizeY="6699" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="15132390" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+          <FillBitmap/>
+          <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+          <LineStart/>
+          <LineEnd/>
+          <Transformation>
+           <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/>
+           <Line2 column1="0.000000" column2="6700.000000" column3="1054.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
         </XShapes>
+        <Transformation>
+         <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/>
+         <Line2 column1="0.000000" column2="6700.000000" column3="1054.000000"/>
+         <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+        </Transformation>
        </XShape>
        <XShape positionX="1056" positionY="1052" sizeX="12782" sizeY="6850" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID">
         <XShapes>
@@ -20,107 +77,1140 @@
           <XShapes>
            <XShape positionX="1206" positionY="1052" sizeX="12632" sizeY="6700" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0">
             <XShapes>
-             <XShape positionX="1206" positionY="1052" sizeX="12632" sizeY="6700" type="com.sun.star.drawing.PolyLineShape"/>
-             <XShape positionX="1206" positionY="1052" sizeX="0" sizeY="6700" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly"/>
+             <XShape positionX="1206" positionY="1052" sizeX="12632" sizeY="6700" type="com.sun.star.drawing.PolyLineShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID">
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="13838" positionY="7752"/>
+                <point positionX="1206" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13838" positionY="6635"/>
+                <point positionX="1206" positionY="6635"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13838" positionY="5519"/>
+                <point positionX="1206" positionY="5519"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13838" positionY="4402"/>
+                <point positionX="1206" positionY="4402"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13838" positionY="3285"/>
+                <point positionX="1206" positionY="3285"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13838" positionY="2169"/>
+                <point positionX="1206" positionY="2169"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13838" positionY="1052"/>
+                <point positionX="1206" positionY="1052"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="12632" positionY="6700"/>
+                <point positionX="0" positionY="6700"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12632" positionY="5583"/>
+                <point positionX="0" positionY="5583"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12632" positionY="4467"/>
+                <point positionX="0" positionY="4467"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12632" positionY="3350"/>
+                <point positionX="0" positionY="3350"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12632" positionY="2233"/>
+                <point positionX="0" positionY="2233"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12632" positionY="1117"/>
+                <point positionX="0" positionY="1117"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12632" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="12632.000000" column2="0.000000" column3="1206.000000"/>
+               <Line2 column1="0.000000" column2="6700.000000" column3="1052.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="1206" positionY="1052" sizeX="0" sizeY="6700" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="NONE">
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="1206" positionY="7752"/>
+                <point positionX="1206" positionY="6635"/>
+                <point positionX="1206" positionY="5519"/>
+                <point positionX="1206" positionY="4402"/>
+                <point positionX="1206" positionY="3285"/>
+                <point positionX="1206" positionY="2169"/>
+                <point positionX="1206" positionY="1052"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="6700"/>
+                <point positionX="0" positionY="5583"/>
+                <point positionX="0" positionY="4467"/>
+                <point positionX="0" positionY="3350"/>
+                <point positionX="0" positionY="2233"/>
+                <point positionX="0" positionY="1117"/>
+                <point positionX="0" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="0.000000" column2="0.000000" column3="1206.000000"/>
+               <Line2 column1="0.000000" column2="6700.000000" column3="1052.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
             </XShapes>
+            <Transformation>
+             <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/>
+             <Line2 column1="0.000000" column2="6701.000000" column3="1052.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
            </XShape>
           </XShapes>
+          <Transformation>
+           <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/>
+           <Line2 column1="0.000000" column2="6701.000000" column3="1052.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
          </XShape>
          <XShape positionX="1056" positionY="1052" sizeX="12782" sizeY="6850" type="com.sun.star.drawing.GroupShape">
           <XShapes>
            <XShape positionX="1206" positionY="7752" sizeX="12632" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0">
             <XShapes>
-             <XShape positionX="1206" positionY="7752" sizeX="12632" sizeY="150" type="com.sun.star.drawing.PolyLineShape"/>
-             <XShape positionX="1206" positionY="7752" sizeX="12632" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles"/>
+             <XShape positionX="1206" positionY="7752" sizeX="12632" sizeY="150" type="com.sun.star.drawing.PolyLineShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID">
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="1206" positionY="7902"/>
+                <point positionX="1206" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1206" positionY="7902"/>
+                <point positionX="1206" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="3732" positionY="7902"/>
+                <point positionX="3732" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="3732" positionY="7902"/>
+                <point positionX="3732" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="6258" positionY="7902"/>
+                <point positionX="6258" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="6258" positionY="7902"/>
+                <point positionX="6258" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="8785" positionY="7902"/>
+                <point positionX="8785" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="8785" positionY="7902"/>
+                <point positionX="8785" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="11311" positionY="7902"/>
+                <point positionX="11311" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="11311" positionY="7902"/>
+                <point positionX="11311" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13838" positionY="7902"/>
+                <point positionX="13838" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13838" positionY="7902"/>
+                <point positionX="13838" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="150"/>
+                <point positionX="0" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="150"/>
+                <point positionX="0" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="2526" positionY="150"/>
+                <point positionX="2526" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="2526" positionY="150"/>
+                <point positionX="2526" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="5052" positionY="150"/>
+                <point positionX="5052" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="5052" positionY="150"/>
+                <point positionX="5052" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="7579" positionY="150"/>
+                <point positionX="7579" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="7579" positionY="150"/>
+                <point positionX="7579" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="10105" positionY="150"/>
+                <point positionX="10105" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="10105" positionY="150"/>
+                <point positionX="10105" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12632" positionY="150"/>
+                <point positionX="12632" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12632" positionY="150"/>
+                <point positionX="12632" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="12632.000000" column2="0.000000" column3="1206.000000"/>
+               <Line2 column1="0.000000" column2="150.000000" column3="7752.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="1206" positionY="7752" sizeX="12632" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID">
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="1206" positionY="7752"/>
+                <point positionX="13838" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="0"/>
+                <point positionX="12632" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="12632.000000" column2="0.000000" column3="1206.000000"/>
+               <Line2 column1="0.000000" column2="0.000000" column3="7752.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
             </XShapes>
+            <Transformation>
+             <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/>
+             <Line2 column1="0.000000" column2="151.000000" column3="7752.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
            </XShape>
            <XShape positionX="1056" positionY="1052" sizeX="150" sizeY="6700" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0">
             <XShapes>
-             <XShape positionX="1056" positionY="1052" sizeX="150" sizeY="6700" type="com.sun.star.drawing.PolyLineShape"/>
-             <XShape positionX="1206" positionY="1052" sizeX="0" sizeY="6700" type="com.sun.star.drawing.LineShape" name="MarkHandles"/>
+             <XShape positionX="1056" positionY="1052" sizeX="150" sizeY="6700" type="com.sun.star.drawing.PolyLineShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID">
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="1056" positionY="7752"/>
+                <point positionX="1206" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="7752"/>
+                <point positionX="1206" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="6635"/>
+                <point positionX="1206" positionY="6635"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="6635"/>
+                <point positionX="1206" positionY="6635"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="5519"/>
+                <point positionX="1206" positionY="5519"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="5519"/>
+                <point positionX="1206" positionY="5519"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="4402"/>
+                <point positionX="1206" positionY="4402"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="4402"/>
+                <point positionX="1206" positionY="4402"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="3285"/>
+                <point positionX="1206" positionY="3285"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="3285"/>
+                <point positionX="1206" positionY="3285"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="2169"/>
+                <point positionX="1206" positionY="2169"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="2169"/>
+                <point positionX="1206" positionY="2169"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="1052"/>
+                <point positionX="1206" positionY="1052"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="1052"/>
+                <point positionX="1206" positionY="1052"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="6700"/>
+                <point positionX="150" positionY="6700"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="6700"/>
+                <point positionX="150" positionY="6700"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="5583"/>
+                <point positionX="150" positionY="5583"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="5583"/>
+                <point positionX="150" positionY="5583"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="4467"/>
+                <point positionX="150" positionY="4467"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="4467"/>
+                <point positionX="150" positionY="4467"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="3350"/>
+                <point positionX="150" positionY="3350"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="3350"/>
+                <point positionX="150" positionY="3350"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="2233"/>
+                <point positionX="150" positionY="2233"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="2233"/>
+                <point positionX="150" positionY="2233"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="1117"/>
+                <point positionX="150" positionY="1117"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="1117"/>
+                <point positionX="150" positionY="1117"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="0"/>
+                <point positionX="150" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="0"/>
+                <point positionX="150" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="150.000000" column2="0.000000" column3="1056.000000"/>
+               <Line2 column1="0.000000" column2="6700.000000" column3="1052.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="1206" positionY="1052" sizeX="0" sizeY="6700" type="com.sun.star.drawing.LineShape" name="MarkHandles" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID">
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="1206" positionY="7752"/>
+                <point positionX="1206" positionY="1052"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="6700"/>
+                <point positionX="0" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="0.000000" column2="0.000000" column3="1206.000000"/>
+               <Line2 column1="0.000000" column2="6700.000000" column3="1052.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
             </XShapes>
+            <Transformation>
+             <Line1 column1="151.000000" column2="0.000000" column3="1056.000000"/>
+             <Line2 column1="0.000000" column2="6701.000000" column3="1052.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
            </XShape>
           </XShapes>
+          <Transformation>
+           <Line1 column1="12783.000000" column2="0.000000" column3="1056.000000"/>
+           <Line2 column1="0.000000" column2="6851.000000" column3="1052.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
          </XShape>
          <XShape positionX="1627" positionY="2169" sizeX="11789" sizeY="5583" type="com.sun.star.drawing.GroupShape">
           <XShapes>
            <XShape positionX="1627" positionY="2169" sizeX="10947" sizeY="5583" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0">
             <XShapes>
-             <XShape positionX="11732" positionY="2169" sizeX="842" sizeY="5583" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=4"/>
-             <XShape positionX="9206" positionY="3285" sizeX="842" sizeY="4467" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3"/>
-             <XShape positionX="6679" positionY="4402" sizeX="843" sizeY="3350" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2"/>
-             <XShape positionX="4153" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1"/>
-             <XShape positionX="1627" positionY="6635" sizeX="842" sizeY="1117" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0"/>
+             <XShape positionX="11732" positionY="2169" sizeX="842" sizeY="5583" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=4" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="11732" positionY="7752"/>
+                <point positionX="12574" positionY="7752"/>
+                <point positionX="12574" positionY="2169"/>
+                <point positionX="11732" positionY="2169"/>
+                <point positionX="11732" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="5583"/>
+                <point positionX="842" positionY="5583"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="5583"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="11732.000000"/>
+               <Line2 column1="0.000000" column2="5583.000000" column3="2169.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="9206" positionY="3285" sizeX="842" sizeY="4467" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="9206" positionY="7752"/>
+                <point positionX="10048" positionY="7752"/>
+                <point positionX="10048" positionY="3285"/>
+                <point positionX="9206" positionY="3285"/>
+                <point positionX="9206" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="4467"/>
+                <point positionX="842" positionY="4467"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="4467"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="9206.000000"/>
+               <Line2 column1="0.000000" column2="4467.000000" column3="3285.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="6679" positionY="4402" sizeX="843" sizeY="3350" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="6679" positionY="7752"/>
+                <point positionX="7522" positionY="7752"/>
+                <point positionX="7522" positionY="4402"/>
+                <point positionX="6679" positionY="4402"/>
+                <point positionX="6679" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="3350"/>
+                <point positionX="843" positionY="3350"/>
+                <point positionX="843" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="3350"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="843.000000" column2="0.000000" column3="6679.000000"/>
+               <Line2 column1="0.000000" column2="3350.000000" column3="4402.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="4153" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="4153" positionY="7752"/>
+                <point positionX="4995" positionY="7752"/>
+                <point positionX="4995" positionY="5519"/>
+                <point positionX="4153" positionY="5519"/>
+                <point positionX="4153" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="2233"/>
+                <point positionX="842" positionY="2233"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="2233"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="4153.000000"/>
+               <Line2 column1="0.000000" column2="2233.000000" column3="5519.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="1627" positionY="6635" sizeX="842" sizeY="1117" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="1627" positionY="7752"/>
+                <point positionX="2469" positionY="7752"/>
+                <point positionX="2469" positionY="6635"/>
+                <point positionX="1627" positionY="6635"/>
+                <point positionX="1627" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="1117"/>
+                <point positionX="842" positionY="1117"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="1117"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="1627.000000"/>
+               <Line2 column1="0.000000" column2="1117.000000" column3="6635.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
             </XShapes>
+            <Transformation>
+             <Line1 column1="10948.000000" column2="0.000000" column3="1627.000000"/>
+             <Line2 column1="0.000000" column2="5584.000000" column3="2169.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
            </XShape>
            <XShape positionX="2469" positionY="3285" sizeX="10947" sizeY="4467" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1">
             <XShapes>
-             <XShape positionX="12574" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=4"/>
-             <XShape positionX="10048" positionY="3285" sizeX="842" sizeY="4467" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=3"/>
-             <XShape positionX="7522" positionY="4402" sizeX="842" sizeY="3350" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2"/>
-             <XShape positionX="4995" positionY="6635" sizeX="842" sizeY="1117" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1"/>
-             <XShape positionX="2469" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0"/>
+             <XShape positionX="12574" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=4" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="12574" positionY="7752"/>
+                <point positionX="13416" positionY="7752"/>
+                <point positionX="13416" positionY="5519"/>
+                <point positionX="12574" positionY="5519"/>
+                <point positionX="12574" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="2233"/>
+                <point positionX="842" positionY="2233"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="2233"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="12574.000000"/>
+               <Line2 column1="0.000000" column2="2233.000000" column3="5519.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="10048" positionY="3285" sizeX="842" sizeY="4467" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=3" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="10048" positionY="7752"/>
+                <point positionX="10890" positionY="7752"/>
+                <point positionX="10890" positionY="3285"/>
+                <point positionX="10048" positionY="3285"/>
+                <point positionX="10048" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="4467"/>
+                <point positionX="842" positionY="4467"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="4467"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="10048.000000"/>
+               <Line2 column1="0.000000" column2="4467.000000" column3="3285.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="7522" positionY="4402" sizeX="842" sizeY="3350" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="7522" positionY="7752"/>
+                <point positionX="8364" positionY="7752"/>
+                <point positionX="8364" positionY="4402"/>
+                <point positionX="7522" positionY="4402"/>
+                <point positionX="7522" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="3350"/>
+                <point positionX="842" positionY="3350"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="3350"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="7522.000000"/>
+               <Line2 column1="0.000000" column2="3350.000000" column3="4402.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="4995" positionY="6635" sizeX="842" sizeY="1117" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="4995" positionY="7752"/>
+                <point positionX="5837" positionY="7752"/>
+                <point positionX="5837" positionY="6635"/>
+                <point positionX="4995" positionY="6635"/>
+                <point positionX="4995" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="1117"/>
+                <point positionX="842" positionY="1117"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="1117"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="4995.000000"/>
+               <Line2 column1="0.000000" column2="1117.000000" column3="6635.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="2469" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="2469" positionY="7752"/>
+                <point positionX="3311" positionY="7752"/>
+                <point positionX="3311" positionY="5519"/>
+                <point positionX="2469" positionY="5519"/>
+                <point positionX="2469" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="2233"/>
+                <point positionX="842" positionY="2233"/>
+                <point positionX="842" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="2233"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="842.000000" column2="0.000000" column3="2469.000000"/>
+               <Line2 column1="0.000000" column2="2233.000000" column3="5519.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
             </XShapes>
+            <Transformation>
+             <Line1 column1="10948.000000" column2="0.000000" column3="2469.000000"/>
+             <Line2 column1="0.000000" column2="4468.000000" column3="3285.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
            </XShape>
           </XShapes>
+          <Transformation>
+           <Line1 column1="11790.000000" column2="0.000000" column3="1627.000000"/>
+           <Line2 column1="0.000000" column2="5584.000000" column3="2169.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
          </XShape>
         </XShapes>
+        <Transformation>
+         <Line1 column1="12783.000000" column2="0.000000" column3="1056.000000"/>
+         <Line2 column1="0.000000" column2="6851.000000" column3="1052.000000"/>
+         <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+        </Transformation>
        </XShape>
       </XShapes>
+      <Transformation>
+       <Line1 column1="12783.000000" column2="0.000000" column3="1056.000000"/>
+       <Line2 column1="0.000000" column2="6851.000000" column3="1052.000000"/>
+       <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+      </Transformation>
      </XShape>
      <XShape positionX="770" positionY="854" sizeX="11898" sizeY="7546" type="com.sun.star.drawing.GroupShape">
       <XShapes>
        <XShape positionX="2376" positionY="8002" sizeX="10292" sizeY="398" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0">
         <XShapes>
-         <XShape positionX="2376" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="1"/>
-         <XShape positionX="4902" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="2"/>
-         <XShape positionX="7429" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="3"/>
-         <XShape positionX="9955" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="4"/>
-         <XShape positionX="12481" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="5"/>
+         <XShape positionX="2376" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+          <FillBitmap/>
+          <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+          <LineStart/>
+          <LineEnd/>
+          <Transformation>
+           <Line1 column1="188.000000" column2="0.000000" column3="2376.000000"/>
+           <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+         <XShape positionX="4902" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="0" distance="20" angle="0"/>
+          <FillBitmap/>
+          <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+          <LineStart/>
+          <LineEnd/>
+          <Transformation>
+           <Line1 column1="188.000000" column2="0.000000" column3="4902.000000"/>
+           <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+         <XShape positionX="7429" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list