[Libreoffice-commits] core.git: 7 commits - chart2/Library_chartcontroller.mk chart2/qa chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk oox/source

Markus Mohrhard markus.mohrhard at collabora.co.uk
Sat Jun 21 20:14:50 PDT 2014


 chart2/Library_chartcontroller.mk                               |    1 
 chart2/UIConfig_chart2.mk                                       |    1 
 chart2/qa/extras/chart2import.cxx                               |   13 
 chart2/qa/extras/data/xlsx/fdo78080.xlsx                        |binary
 chart2/qa/extras/xshape/chart2xshape.cxx                        |    8 
 chart2/qa/extras/xshape/data/ods/property-mapping-bar.ods       |binary
 chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml | 1164 ++++++++++
 chart2/source/controller/dialogs/DialogModel.cxx                |   31 
 chart2/source/controller/dialogs/dlg_PropertyMapping.cxx        |   73 
 chart2/source/controller/dialogs/dlg_PropertyMapping.hxx        |   46 
 chart2/source/controller/dialogs/tp_DataSource.cxx              |   29 
 chart2/source/controller/dialogs/tp_DataSource.hxx              |    2 
 chart2/source/view/charttypes/BarChart.cxx                      |    9 
 chart2/source/view/charttypes/BubbleChart.cxx                   |   18 
 chart2/source/view/charttypes/GL3DBarChart.cxx                  |    4 
 chart2/source/view/charttypes/PieChart.cxx                      |    9 
 chart2/source/view/main/VDataSeries.cxx                         |    2 
 chart2/uiconfig/ui/dlg_PropertyMapping.ui                       |  136 -
 chart2/uiconfig/ui/tp_DataSource.ui                             |   24 
 oox/source/drawingml/chart/chartspacefragment.cxx               |    3 
 oox/source/drawingml/chart/chartspacemodel.cxx                  |    2 
 21 files changed, 1236 insertions(+), 339 deletions(-)

New commits:
commit 113866583c5a34b9242aeb9040c4ce80e65da1ba
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 22 05:04:31 2014 +0200

    add test case for fdo#78080
    
    Change-Id: If676eb03f5bd19f8abf13d1d7826d500d51e542e

diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 01b9281..d5a42a1 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -40,6 +40,7 @@ public:
     void testSimpleStrictXLSX();
     void testDelayedCellImport(); // chart range referencing content on later sheets
     void testFlatODSStackedColumnChart();
+    void testFdo78080();
 
     CPPUNIT_TEST_SUITE(Chart2ImportTest);
     CPPUNIT_TEST(Fdo60083);
@@ -65,6 +66,7 @@ public:
     CPPUNIT_TEST(testSimpleStrictXLSX);
     CPPUNIT_TEST(testDelayedCellImport);
     CPPUNIT_TEST(testFlatODSStackedColumnChart);
+    CPPUNIT_TEST(testFdo78080);
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -370,6 +372,17 @@ void Chart2ImportTest::testFlatODSStackedColumnChart()
     CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aSeriesSeq.getLength());
 }
 
+void Chart2ImportTest::testFdo78080()
+{
+    load("/chart2/qa/extras/data/xlsx/", "fdo78080.xlsx");
+    Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
+    CPPUNIT_ASSERT(xChartDoc.is());
+
+    Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW);
+    Reference<chart2::XTitle> xTitle = xTitled->getTitleObject();
+    CPPUNIT_ASSERT(!xTitle.is());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/fdo78080.xlsx b/chart2/qa/extras/data/xlsx/fdo78080.xlsx
new file mode 100644
index 0000000..c4a4e3e
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/fdo78080.xlsx differ
commit 2f74e52a6efe7a51d6575cbb9b5f30b1ad99ee7c
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 22 04:47:36 2014 +0200

    use the correct default value, fdo#78080
    
    Change-Id: I8b01bf22e8e3b98ef013b947f617905d558d3554

diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index 6e19f77..eec0f1c 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -85,8 +85,7 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
             switch( nElement )
             {
                 case C_TOKEN( autoTitleDeleted ):
-                    // default is 'false', not 'true' as specified
-                    mrModel.mbAutoTitleDel = rAttribs.getBool( XML_val, false );
+                    mrModel.mbAutoTitleDel = rAttribs.getBool( XML_val, true );
                     return 0;
                 case C_TOKEN( backWall ):
                     return new WallFloorContext( *this, mrModel.mxBackWall.create() );
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx
index cf71f14..d6e920d 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -28,7 +28,7 @@ namespace chart {
 ChartSpaceModel::ChartSpaceModel() :
     mnDispBlanksAs( XML_gap ),  // not zero as specified
     mnStyle( 2 ),
-    mbAutoTitleDel( false ),
+    mbAutoTitleDel( true ),
     mbPlotVisOnly( false ),
     mbShowLabelsOverMax( false ),
     mbPivotChart( false )
commit c97424f82a8d9d50d98e868cf0c1c2731ee15e74
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 22 04:19:45 2014 +0200

    remove now unused dialog
    
    Change-Id: I42c340a6aee016e37ee558d46a8eab101837e9c5

diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index abc9e58..b7e86bf 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
     chart2/source/controller/dialogs/dlg_InsertTitle \
     chart2/source/controller/dialogs/dlg_NumberFormat \
     chart2/source/controller/dialogs/dlg_ObjectProperties \
-    chart2/source/controller/dialogs/dlg_PropertyMapping \
     chart2/source/controller/dialogs/dlg_ShapeFont \
     chart2/source/controller/dialogs/dlg_ShapeParagraph \
     chart2/source/controller/dialogs/dlg_View3D \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 44f8674..d59c29e 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
 	chart2/uiconfig/ui/datarangedialog \
 	chart2/uiconfig/ui/dlg_DataLabel \
 	chart2/uiconfig/ui/dlg_InsertErrorBars \
-	chart2/uiconfig/ui/dlg_PropertyMapping \
 	chart2/uiconfig/ui/insertaxisdlg \
 	chart2/uiconfig/ui/insertgriddlg \
 	chart2/uiconfig/ui/inserttitledlg \
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
deleted file mode 100644
index e9a933c..0000000
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "dlg_PropertyMapping.hxx"
-
-#include "DialogModel.hxx"
-
-using namespace com::sun::star;
-
-namespace chart {
-
-namespace {
-
-long pListBoxTabs[] =
-{
-    3,
-    0, 75, 150
-};
-
-}
-
-PropertyMappingDlg::PropertyMappingDlg(Window* pParent, uno::Reference< chart2::XChartType > xChartType )
-    : ModalDialog(pParent, "PropertyMappingDialog",
-        "modules/schart/ui/dlg_PropertyMapping.ui")
-{
-    get(mpMappingTable, "LST_PROPERTY_MAPPING");
-    get(mpBtnOk, "ok");
-    get(mpBtnCancel, "cancel");
-
-    mpMappingTable->SetTabs( pListBoxTabs, MAP_APPFONT );
-    uno::Sequence< OUString > aPropRoles = xChartType->getSupportedPropertyRoles();
-    for(sal_Int32 i = 0, n = aPropRoles.getLength(); i < n; ++i)
-    {
-        OUString aUIString = DialogModel::ConvertRoleFromInternalToUI(aPropRoles[i]);
-        mpMappingTable->InsertEntry(aUIString);
-    }
-    mpBtnOk->SetClickHdl( LINK( this, PropertyMappingDlg, OkBtnHdl ) );
-    mpBtnCancel->SetClickHdl( LINK( this, PropertyMappingDlg, CancelBtnHdl ) );
-}
-
-OUString PropertyMappingDlg::getSelectedEntry()
-{
-    if(mpMappingTable->GetSelectionCount())
-    {
-        SvTreeListEntry* pEntry = mpMappingTable->FirstSelected();
-        OUString aText = mpMappingTable->GetEntryText(pEntry, 0);
-        return aText;
-    }
-
-    return OUString();
-}
-
-IMPL_LINK_NOARG(PropertyMappingDlg, OkBtnHdl)
-{
-    EndDialog(RET_OK);
-    return 0;
-}
-
-IMPL_LINK_NOARG(PropertyMappingDlg, CancelBtnHdl)
-{
-    EndDialog(RET_CANCEL);
-    return 0;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
deleted file mode 100644
index 0358a84..0000000
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
-
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <svtools/svtabbx.hxx>
-
-#include <com/sun/star/chart2/XChartType.hpp>
-
-namespace chart {
-
-class DialogModel;
-
-class PropertyMappingDlg : public ModalDialog
-{
-public:
-
-    PropertyMappingDlg(Window* pParent, com::sun::star::uno::Reference<
-            com::sun::star::chart2::XChartType > xChartType);
-
-    OUString getSelectedEntry();
-
-private:
-
-    DECL_LINK( OkBtnHdl, void* );
-    DECL_LINK( CancelBtnHdl, void* );
-
-    SvTabListBox* mpMappingTable;
-    Button* mpBtnOk;
-    Button* mpBtnCancel;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/uiconfig/ui/dlg_PropertyMapping.ui b/chart2/uiconfig/ui/dlg_PropertyMapping.ui
deleted file mode 100644
index cbdd35b..0000000
--- a/chart2/uiconfig/ui/dlg_PropertyMapping.ui
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
-<interface>
-  <requires lib="gtk+" version="3.10"/>
-  <!-- interface-requires LibreOffice 1.0 -->
-  <object class="GtkDialog" id="PropertyMappingDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="title" translatable="yes">Add Property Mapping</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">Ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="LB_TITLE">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Select property mapping:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">LST_PROPERTY_MAPPING:border</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="svtlo-SvTabListBox" id="LST_PROPERTY_MAPPING:border">
-                <property name="width_request">110</property>
-                <property name="height_request">110</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="Tab List-selection"/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="LB_COLOR">
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Color</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="LB_FILLCOLOR">
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">FillColor</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="LB_BORDERCOLOR">
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">BorderColor</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
commit 77cec206e3c49490e6e380c52cb6d45277a03f65
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 22 04:12:04 2014 +0200

    show the property mapping sequences by default
    
    Change-Id: I32417ed53e491a66f700e77ae0fff2154fa5441c

diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 4cab7d9..e18c7d3 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -502,6 +502,10 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
             // add missing optional roles
             aRoles = xChartType->getSupportedOptionalRoles();
             addMissingRoles(aResult, aRoles);
+
+            // add missing property roles
+            aRoles = xChartType->getSupportedPropertyRoles();
+            addMissingRoles(aResult, aRoles);
         }
     }
     catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index a13a461..f8c93b4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -28,7 +28,6 @@
 #include "tp_DataSourceControls.hxx"
 #include "ControllerLockGuard.hxx"
 #include "DataSourceHelper.hxx"
-#include "dlg_PropertyMapping.hxx"
 #include <com/sun/star/sheet/XRangeSelection.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/chart2/XChartType.hpp>
@@ -217,7 +216,6 @@ DataSourceTabPage::DataSourceTabPage(
     get(m_pFT_DATALABELS  ,"FT_DATALABELS");
     get(m_pEDT_CATEGORIES ,"EDT_CATEGORIES");
     get(m_pIMB_RANGE_CAT  ,"IMB_RANGE_CAT");
-    get(m_pBtn_AddMapping ,"BTN_ADD_MAPPING");
 
     m_pFT_CAPTION->Show(!bHideDescription);
 
@@ -247,9 +245,6 @@ DataSourceTabPage::DataSourceTabPage(
     m_pEDT_RANGE->SetStyle( m_pEDT_RANGE->GetStyle() | WB_FORCECTRLBACKGROUND );
     m_pEDT_CATEGORIES->SetStyle( m_pEDT_CATEGORIES->GetStyle() | WB_FORCECTRLBACKGROUND );
 
-    // mapped properties
-    m_pBtn_AddMapping->SetClickHdl( LINK( this, DataSourceTabPage, AddMappingHdl ));
-
     // set symbol font for arrows
     // note: StarSymbol is substituted to OpenSymbol for OOo
     Font aSymbolFont( m_pBTN_UP->GetFont());
@@ -469,12 +464,6 @@ void DataSourceTabPage::fillRoleListBox()
         }
 
         m_pLB_ROLE->SetUpdateMode( true );
-
-        if(pSeriesEntry->m_xChartType
-                ->getSupportedPropertyRoles().getLength() == 0)
-            m_pBtn_AddMapping->Disable();
-        else
-            m_pBtn_AddMapping->Enable();
     }
 }
 
@@ -773,24 +762,6 @@ IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*, pEdit )
     return 0;
 }
 
-IMPL_LINK_NOARG( DataSourceTabPage, AddMappingHdl )
-{
-    SeriesEntry * pSeriesEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
-    if(!pSeriesEntry)
-        return 0;
-
-    PropertyMappingDlg aDlg(this, pSeriesEntry->m_xChartType);
-    short aRet = aDlg.Execute();
-    if(aRet == RET_OK)
-    {
-        OUString aNewMappingName = DialogModel::ConvertRoleFromUIToInternal(aDlg.getSelectedEntry());
-        if(!aNewMappingName.isEmpty())
-            m_pLB_ROLE->InsertEntry( lcl_GetRoleLBEntry( aNewMappingName, OUString()));
-    }
-
-    return 0;
-}
-
 void DataSourceTabPage::listeningFinished(
     const OUString & rNewRange )
 {
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index b89d4d4..496333e 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -82,7 +82,6 @@ protected:
     DECL_LINK( RangeUpdateDataHdl, Edit* );
     DECL_LINK( UpButtonClickedHdl, void* );
     DECL_LINK( DownButtonClickedHdl, void* );
-    DECL_LINK( AddMappingHdl, void* );
 
     // ____ RangeSelectionListenerParent ____
     virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE;
@@ -137,7 +136,6 @@ private:
     FixedText*     m_pFT_DATALABELS;//used for xy charts
     Edit*          m_pEDT_CATEGORIES;
     PushButton*    m_pIMB_RANGE_CAT;
-    PushButton*    m_pBtn_AddMapping;
 
     OUString       m_aFixedTextRange;
 
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui b/chart2/uiconfig/ui/tp_DataSource.ui
index a067a6f..f7bed1d 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkImage" id="imageIMB_RANGE_CAT">
     <property name="visible">True</property>
@@ -96,7 +97,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -112,7 +112,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="always_show_image">True</property>
                   </object>
                   <packing>
@@ -130,7 +129,6 @@
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
                     <property name="hexpand">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -146,7 +144,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -248,7 +245,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">imageIMB_RANGE_MAIN</property>
                   </object>
                   <packing>
@@ -330,7 +326,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">imageIMB_RANGE_CAT</property>
                   </object>
                   <packing>
@@ -346,21 +341,6 @@
                 <property name="position">5</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkButton" id="BTN_ADD_MAPPING">
-                <property name="label" translatable="yes">Add property mapping</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">6</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
commit 086d93f130c9e53d77ed25098cfefaabe5c108e2
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 22 03:37:24 2014 +0200

    extract common code
    
    Change-Id: I9327f232f1edb9ef052eb7868ac60774f3b6e4cf

diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index e3f9384..4cab7d9 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -468,6 +468,19 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const
     return aResult;
 }
 
+namespace {
+
+void addMissingRoles(DialogModel::tRolesWithRanges& rResult, const uno::Sequence<OUString>& rRoles)
+{
+    for(sal_Int32 i = 0, n = rRoles.getLength(); i < n; ++i)
+    {
+        if(rResult.find(rRoles[i]) == rResult.end())
+            rResult.insert(DialogModel::tRolesWithRanges::value_type(rRoles[i], OUString()));
+    }
+}
+
+}
+
 DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
     const Reference< XDataSeries > & xSeries,
     const OUString & aRoleOfSequenceForLabel,
@@ -484,21 +497,11 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
         {
             // add missing mandatory roles
             Sequence< OUString > aRoles( xChartType->getSupportedMandatoryRoles());
-            OUString aEmptyString;
-            sal_Int32 nI = 0;
-            for( nI=0; nI < aRoles.getLength(); ++nI )
-            {
-                if( aResult.find( aRoles[nI] ) == aResult.end() )
-                    aResult.insert( DialogModel::tRolesWithRanges::value_type( aRoles[nI], aEmptyString ));
-            }
+            addMissingRoles(aResult, aRoles);
 
             // add missing optional roles
             aRoles = xChartType->getSupportedOptionalRoles();
-            for( nI=0; nI < aRoles.getLength(); ++nI )
-            {
-                if( aResult.find( aRoles[nI] ) == aResult.end() )
-                    aResult.insert( DialogModel::tRolesWithRanges::value_type( aRoles[nI], aEmptyString ));
-            }
+            addMissingRoles(aResult, aRoles);
         }
     }
     catch( const uno::Exception & ex )
commit a1d2c88124058a98b25d725927462ee734f71d85
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 22 03:25:28 2014 +0200

    add test case for property mapping
    
    Change-Id: Ib8630d15f40b00c8620eeb1c79d5d9f00d07ef49

diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx b/chart2/qa/extras/xshape/chart2xshape.cxx
index d46df46..0099eef 100644
--- a/chart2/qa/extras/xshape/chart2xshape.cxx
+++ b/chart2/qa/extras/xshape/chart2xshape.cxx
@@ -28,9 +28,11 @@ class Chart2XShapeTest : public ChartTest
 public:
 
     void testFdo75075();
+    void testPropertyMappingBarChart();
 
     CPPUNIT_TEST_SUITE(Chart2XShapeTest);
     CPPUNIT_TEST(testFdo75075);
+    CPPUNIT_TEST(testPropertyMappingBarChart);
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -79,6 +81,12 @@ void Chart2XShapeTest::testFdo75075()
     compareAgainstReference("fdo75075.xml");
 }
 
+void Chart2XShapeTest::testPropertyMappingBarChart()
+{
+    load("chart2/qa/extras/xshape/data/ods/", "property-mapping-bar.ods");
+    compareAgainstReference("property-mapping-bar.xml", true);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2XShapeTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/xshape/data/ods/property-mapping-bar.ods b/chart2/qa/extras/xshape/data/ods/property-mapping-bar.ods
new file mode 100644
index 0000000..1a4e826
Binary files /dev/null and b/chart2/qa/extras/xshape/data/ods/property-mapping-bar.ods differ
diff --git a/chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml b/chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml
new file mode 100644
index 0000000..3888875
--- /dev/null
+++ b/chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml
@@ -0,0 +1,1164 @@
+<?xml version="1.0"?>
+<XShapes>
+ <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="24.000000" fontColor="ffffffff" 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="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+  <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+  <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+  <FillHatch style="SINGLE" color="3465a4" 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="855" sizeX="13200" sizeY="7545" type="com.sun.star.drawing.GroupShape" name="CID/D=0">
+  <XShapes>
+   <XShape positionX="1206" positionY="1055" sizeX="12764" sizeY="6698" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" 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="729fcf" fillTransparence="0" fillTransparenceGradientName="">
+    <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+    <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+    <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+    <FillBitmap/>
+    <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+    <LineStart/>
+    <LineEnd/>
+    <Transformation>
+     <Line1 column1="12765.000000" column2="0.000000" column3="1206.000000"/>
+     <Line2 column1="0.000000" column2="6699.000000" column3="1055.000000"/>
+     <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+    </Transformation>
+   </XShape>
+   <XShape positionX="770" positionY="855" sizeX="13200" sizeY="7545" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="24.000000" fontColor="ffffffff" 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="729fcf" fillTransparence="0" fillTransparenceGradientName="">
+    <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+    <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+    <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+    <FillBitmap/>
+    <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+    <LineStart/>
+    <LineEnd/>
+    <Transformation>
+     <Line1 column1="13201.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="856" sizeX="13200" sizeY="7544" type="com.sun.star.drawing.GroupShape">
+    <XShapes>
+     <XShape positionX="1056" positionY="1054" sizeX="12914" sizeY="6848" type="com.sun.star.drawing.GroupShape">
+      <XShapes>
+       <XShape positionX="1206" positionY="1055" sizeX="12764" sizeY="6698" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes">
+        <XShapes>
+         <XShape positionX="1206" positionY="1055" sizeX="12764" sizeY="6698" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" fontHeight="24.000000" fontColor="ffffffff" 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="e6e6e6" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+          <FillBitmap/>
+          <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+          <LineStart/>
+          <LineEnd/>
+          <Transformation>
+           <Line1 column1="12765.000000" column2="0.000000" column3="1206.000000"/>
+           <Line2 column1="0.000000" column2="6699.000000" column3="1055.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+        </XShapes>
+        <Transformation>
+         <Line1 column1="12765.000000" column2="0.000000" column3="1206.000000"/>
+         <Line2 column1="0.000000" column2="6699.000000" column3="1055.000000"/>
+         <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+        </Transformation>
+       </XShape>
+       <XShape positionX="1056" positionY="1054" sizeX="12914" sizeY="6848" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID">
+        <XShapes>
+         <XShape positionX="1206" positionY="1054" sizeX="12764" sizeY="6698" type="com.sun.star.drawing.GroupShape">
+          <XShapes>
+           <XShape positionX="1206" positionY="1054" sizeX="12764" sizeY="6698" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0">
+            <XShapes>
+             <XShape positionX="1206" positionY="1054" sizeX="12764" sizeY="6698" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" 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="13970" positionY="7752"/>
+                <point positionX="1206" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="6795"/>
+                <point positionX="1206" positionY="6795"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="5838"/>
+                <point positionX="1206" positionY="5838"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="4881"/>
+                <point positionX="1206" positionY="4881"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="3924"/>
+                <point positionX="1206" positionY="3924"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="2967"/>
+                <point positionX="1206" positionY="2967"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="2010"/>
+                <point positionX="1206" positionY="2010"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="1054"/>
+                <point positionX="1206" positionY="1054"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="12764" positionY="6698"/>
+                <point positionX="0" positionY="6698"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="5741"/>
+                <point positionX="0" positionY="5741"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="4784"/>
+                <point positionX="0" positionY="4784"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="3827"/>
+                <point positionX="0" positionY="3827"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="2870"/>
+                <point positionX="0" positionY="2870"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="1913"/>
+                <point positionX="0" positionY="1913"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="956"/>
+                <point positionX="0" positionY="956"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="12764.000000" column2="0.000000" column3="1206.000000"/>
+               <Line2 column1="0.000000" column2="6698.000000" column3="1054.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="1206" positionY="1054" sizeX="0" sizeY="6698" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" fontHeight="24.000000" fontColor="ffffffff" 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="6795"/>
+                <point positionX="1206" positionY="5838"/>
+                <point positionX="1206" positionY="4881"/>
+                <point positionX="1206" positionY="3924"/>
+                <point positionX="1206" positionY="2967"/>
+                <point positionX="1206" positionY="2010"/>
+                <point positionX="1206" positionY="1054"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="6698"/>
+                <point positionX="0" positionY="5741"/>
+                <point positionX="0" positionY="4784"/>
+                <point positionX="0" positionY="3827"/>
+                <point positionX="0" positionY="2870"/>
+                <point positionX="0" positionY="1913"/>
+                <point positionX="0" positionY="956"/>
+                <point positionX="0" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="0.000000" column2="0.000000" column3="1206.000000"/>
+               <Line2 column1="0.000000" column2="6698.000000" column3="1054.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+            </XShapes>
+            <Transformation>
+             <Line1 column1="12765.000000" column2="0.000000" column3="1206.000000"/>
+             <Line2 column1="0.000000" column2="6699.000000" column3="1054.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
+           </XShape>
+          </XShapes>
+          <Transformation>
+           <Line1 column1="12765.000000" column2="0.000000" column3="1206.000000"/>
+           <Line2 column1="0.000000" column2="6699.000000" column3="1054.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+         <XShape positionX="1056" positionY="1054" sizeX="12914" sizeY="6848" type="com.sun.star.drawing.GroupShape">
+          <XShapes>
+           <XShape positionX="1206" positionY="7752" sizeX="12764" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0">
+            <XShapes>
+             <XShape positionX="1206" positionY="7752" sizeX="12764" sizeY="150" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" 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="4397" positionY="7902"/>
+                <point positionX="4397" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="4397" positionY="7902"/>
+                <point positionX="4397" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="7588" positionY="7902"/>
+                <point positionX="7588" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="7588" positionY="7902"/>
+                <point positionX="7588" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="10779" positionY="7902"/>
+                <point positionX="10779" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="10779" positionY="7902"/>
+                <point positionX="10779" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="7902"/>
+                <point positionX="13970" positionY="7752"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="13970" positionY="7902"/>
+                <point positionX="13970" 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="3191" positionY="150"/>
+                <point positionX="3191" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="3191" positionY="150"/>
+                <point positionX="3191" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="6382" positionY="150"/>
+                <point positionX="6382" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="6382" positionY="150"/>
+                <point positionX="6382" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="9573" positionY="150"/>
+                <point positionX="9573" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="9573" positionY="150"/>
+                <point positionX="9573" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="150"/>
+                <point positionX="12764" positionY="0"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="12764" positionY="150"/>
+                <point positionX="12764" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="12764.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="12764" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" 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="13970" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="0"/>
+                <point positionX="12764" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="12764.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="12765.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="1054" sizeX="150" sizeY="6698" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0">
+            <XShapes>
+             <XShape positionX="1056" positionY="1054" sizeX="150" sizeY="6698" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" 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="6795"/>
+                <point positionX="1206" positionY="6795"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="6795"/>
+                <point positionX="1206" positionY="6795"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="5838"/>
+                <point positionX="1206" positionY="5838"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="5838"/>
+                <point positionX="1206" positionY="5838"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="4881"/>
+                <point positionX="1206" positionY="4881"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="4881"/>
+                <point positionX="1206" positionY="4881"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="3924"/>
+                <point positionX="1206" positionY="3924"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="3924"/>
+                <point positionX="1206" positionY="3924"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="2967"/>
+                <point positionX="1206" positionY="2967"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="2967"/>
+                <point positionX="1206" positionY="2967"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="2010"/>
+                <point positionX="1206" positionY="2010"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="2010"/>
+                <point positionX="1206" positionY="2010"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="1054"/>
+                <point positionX="1206" positionY="1054"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="1056" positionY="1054"/>
+                <point positionX="1206" positionY="1054"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="6698"/>
+                <point positionX="150" positionY="6698"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="6698"/>
+                <point positionX="150" positionY="6698"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="5741"/>
+                <point positionX="150" positionY="5741"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="5741"/>
+                <point positionX="150" positionY="5741"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="4784"/>
+                <point positionX="150" positionY="4784"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="4784"/>
+                <point positionX="150" positionY="4784"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="3827"/>
+                <point positionX="150" positionY="3827"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="3827"/>
+                <point positionX="150" positionY="3827"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="2870"/>
+                <point positionX="150" positionY="2870"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="2870"/>
+                <point positionX="150" positionY="2870"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="1913"/>
+                <point positionX="150" positionY="1913"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="1913"/>
+                <point positionX="150" positionY="1913"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="956"/>
+                <point positionX="150" positionY="956"/>
+               </pointSequence>
+               <pointSequence>
+                <point positionX="0" positionY="956"/>
+                <point positionX="150" positionY="956"/>
+               </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="6698.000000" column3="1054.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="1206" positionY="1054" sizeX="0" sizeY="6698" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" 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="1054"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="6698"/>
+                <point positionX="0" positionY="0"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="0.000000" column2="0.000000" column3="1206.000000"/>
+               <Line2 column1="0.000000" column2="6698.000000" column3="1054.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="6699.000000" column3="1054.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
+           </XShape>
+          </XShapes>
+          <Transformation>
+           <Line1 column1="12915.000000" column2="0.000000" column3="1056.000000"/>
+           <Line2 column1="0.000000" column2="6849.000000" column3="1054.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+         <XShape positionX="1737" positionY="2010" sizeX="11701" sizeY="5742" type="com.sun.star.drawing.GroupShape">
+          <XShapes>
+           <XShape positionX="1737" positionY="3924" sizeX="10637" sizeY="3828" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0">
+            <XShapes>
+             <XShape positionX="11310" positionY="3924" sizeX="1064" sizeY="3828" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="24.000000" fontColor="ffffffff" 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="004586" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="11310" positionY="7752"/>
+                <point positionX="12374" positionY="7752"/>
+                <point positionX="12374" positionY="3924"/>
+                <point positionX="11310" positionY="3924"/>
+                <point positionX="11310" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="3828"/>
+                <point positionX="1064" positionY="3828"/>
+                <point positionX="1064" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="3828"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="1064.000000" column2="0.000000" column3="11310.000000"/>
+               <Line2 column1="0.000000" column2="3828.000000" column3="3924.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="8119" positionY="4881" sizeX="1064" sizeY="2871" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="24.000000" fontColor="ffffffff" 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="0000ff" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="8119" positionY="7752"/>
+                <point positionX="9183" positionY="7752"/>
+                <point positionX="9183" positionY="4881"/>
+                <point positionX="8119" positionY="4881"/>
+                <point positionX="8119" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="2871"/>
+                <point positionX="1064" positionY="2871"/>
+                <point positionX="1064" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="2871"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="1064.000000" column2="0.000000" column3="8119.000000"/>
+               <Line2 column1="0.000000" column2="2871.000000" column3="4881.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="4928" positionY="5838" sizeX="1064" sizeY="1914" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="24.000000" fontColor="ffffffff" 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="00ff00" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="4928" positionY="7752"/>
+                <point positionX="5992" positionY="7752"/>
+                <point positionX="5992" positionY="5838"/>
+                <point positionX="4928" positionY="5838"/>
+                <point positionX="4928" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="1914"/>
+                <point positionX="1064" positionY="1914"/>
+                <point positionX="1064" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="1914"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="1064.000000" column2="0.000000" column3="4928.000000"/>
+               <Line2 column1="0.000000" column2="1914.000000" column3="5838.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="1737" positionY="6795" sizeX="1064" sizeY="957" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="24.000000" fontColor="ffffffff" 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="ff0000" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="1737" positionY="7752"/>
+                <point positionX="2801" positionY="7752"/>
+                <point positionX="2801" positionY="6795"/>
+                <point positionX="1737" positionY="6795"/>
+                <point positionX="1737" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="957"/>
+                <point positionX="1064" positionY="957"/>
+                <point positionX="1064" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="957"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="1064.000000" column2="0.000000" column3="1737.000000"/>
+               <Line2 column1="0.000000" column2="957.000000" column3="6795.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+            </XShapes>
+            <Transformation>
+             <Line1 column1="10638.000000" column2="0.000000" column3="1737.000000"/>
+             <Line2 column1="0.000000" column2="3829.000000" column3="3924.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
+           </XShape>
+           <XShape positionX="2801" positionY="2010" sizeX="10637" sizeY="5742" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1">
+            <XShapes>
+             <XShape positionX="12374" positionY="2010" sizeX="1064" sizeY="5742" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=3" fontHeight="24.000000" fontColor="ffffffff" 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="ff420e" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="12374" positionY="7752"/>
+                <point positionX="13438" positionY="7752"/>
+                <point positionX="13438" positionY="2010"/>
+                <point positionX="12374" positionY="2010"/>
+                <point positionX="12374" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="5742"/>
+                <point positionX="1064" positionY="5742"/>
+                <point positionX="1064" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="5742"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="1064.000000" column2="0.000000" column3="12374.000000"/>
+               <Line2 column1="0.000000" column2="5742.000000" column3="2010.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="9183" positionY="2967" sizeX="1064" sizeY="4785" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2" fontHeight="24.000000" fontColor="ffffffff" 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="ff420e" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="9183" positionY="7752"/>
+                <point positionX="10247" positionY="7752"/>
+                <point positionX="10247" positionY="2967"/>
+                <point positionX="9183" positionY="2967"/>
+                <point positionX="9183" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="4785"/>
+                <point positionX="1064" positionY="4785"/>
+                <point positionX="1064" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="4785"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="1064.000000" column2="0.000000" column3="9183.000000"/>
+               <Line2 column1="0.000000" column2="4785.000000" column3="2967.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="5992" positionY="3924" sizeX="1064" sizeY="3828" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1" fontHeight="24.000000" fontColor="ffffffff" 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="ff420e" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="5992" positionY="7752"/>
+                <point positionX="7056" positionY="7752"/>
+                <point positionX="7056" positionY="3924"/>
+                <point positionX="5992" positionY="3924"/>
+                <point positionX="5992" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="3828"/>
+                <point positionX="1064" positionY="3828"/>
+                <point positionX="1064" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="3828"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="1064.000000" column2="0.000000" column3="5992.000000"/>
+               <Line2 column1="0.000000" column2="3828.000000" column3="3924.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+             <XShape positionX="2801" positionY="4881" sizeX="1064" sizeY="2871" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0" fontHeight="24.000000" fontColor="ffffffff" 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="ff420e" fillTransparence="0" fillTransparenceGradientName="">
+              <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+              <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
+              <FillBitmap/>
+              <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
+              <LineStart/>
+              <LineEnd/>
+              <PolyPolygon>
+               <pointSequence>
+                <point positionX="2801" positionY="7752"/>
+                <point positionX="3865" positionY="7752"/>
+                <point positionX="3865" positionY="4881"/>
+                <point positionX="2801" positionY="4881"/>
+                <point positionX="2801" positionY="7752"/>
+               </pointSequence>
+              </PolyPolygon>
+              <Geometry>
+               <pointSequence>
+                <point positionX="0" positionY="2871"/>
+                <point positionX="1064" positionY="2871"/>
+                <point positionX="1064" positionY="0"/>
+                <point positionX="0" positionY="0"/>
+                <point positionX="0" positionY="2871"/>
+               </pointSequence>
+              </Geometry>
+              <Transformation>
+               <Line1 column1="1064.000000" column2="0.000000" column3="2801.000000"/>
+               <Line2 column1="0.000000" column2="2871.000000" column3="4881.000000"/>
+               <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+              </Transformation>
+             </XShape>
+            </XShapes>
+            <Transformation>
+             <Line1 column1="10638.000000" column2="0.000000" column3="2801.000000"/>
+             <Line2 column1="0.000000" column2="5743.000000" column3="2010.000000"/>
+             <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+            </Transformation>
+           </XShape>
+          </XShapes>
+          <Transformation>
+           <Line1 column1="11702.000000" column2="0.000000" column3="1737.000000"/>
+           <Line2 column1="0.000000" column2="5743.000000" column3="2010.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+        </XShapes>
+        <Transformation>
+         <Line1 column1="12915.000000" column2="0.000000" column3="1056.000000"/>
+         <Line2 column1="0.000000" column2="6849.000000" column3="1054.000000"/>
+         <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+        </Transformation>
+       </XShape>
+      </XShapes>
+      <Transformation>
+       <Line1 column1="12915.000000" column2="0.000000" column3="1056.000000"/>
+       <Line2 column1="0.000000" column2="6849.000000" column3="1054.000000"/>
+       <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+      </Transformation>
+     </XShape>
+     <XShape positionX="770" positionY="856" sizeX="11698" sizeY="7544" type="com.sun.star.drawing.GroupShape">
+      <XShapes>
+       <XShape positionX="2708" positionY="8002" sizeX="9760" sizeY="398" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0">
+        <XShapes>
+         <XShape positionX="2708" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="ffffffff" 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="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" 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="2708.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="5899" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="ffffffff" 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="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" 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="5899.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="9090" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="ffffffff" 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="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" 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="9090.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="12281" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="ffffffff" 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="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" 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="12281.000000"/>
+           <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+        </XShapes>
+        <Transformation>
+         <Line1 column1="9761.000000" column2="0.000000" column3="2708.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="770" positionY="856" sizeX="187" sizeY="7096" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0">
+        <XShapes>
+         <XShape positionX="770" positionY="7554" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="0" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" 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="770.000000"/>
+           <Line2 column1="0.000000" column2="399.000000" column3="7554.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+         <XShape positionX="770" positionY="6597" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" 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="770.000000"/>
+           <Line2 column1="0.000000" column2="399.000000" column3="6597.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+         <XShape positionX="770" positionY="5640" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" 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="770.000000"/>
+           <Line2 column1="0.000000" column2="399.000000" column3="5640.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+         <XShape positionX="770" positionY="4683" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" 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="770.000000"/>
+           <Line2 column1="0.000000" column2="399.000000" column3="4683.000000"/>
+           <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+          </Transformation>
+         </XShape>
+         <XShape positionX="770" positionY="3726" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+          <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
+          <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list