CWS-TOOLING: integrate CWS chart30

202 files changed, 917 insertions, 12328 deletions

diff --git a/chart2/MANIFEST b/chart2/MANIFEST
index d347879a3e32..e69de29bb2d1 100644
--- a/chart2/MANIFEST
+++ b/chart2/MANIFEST
@@ -1,160 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: MANIFEST,v $
-#
-# $Revision: 1.5 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-Directory Structure
--------------------
-
-+--inc
-+--prj
-+--res
-+--source
-|  +--controller
-|  |  +---dialogs
-|  |  +---drawinglayer
-|  |  +---itemsetwrapper
-|  |  +---main
-|  |  +---menu
-|  +--inc
-|  +--model
-|  |  +---inc
-|  |  +---main
-|  |  +---oldapi
-|  |  +---template
-|  |  +---tree
-|  +--tools
-|  +--view
-|  |  +---axes
-|  |  +---charttypes
-|  |  +---diagram
-|  |  +---inc
-|  |  +---main
-+--qa
-+--util
-+--workbench
-   +--anyperformance
-   +--fileformat
-   +--officeintegration
-   +--prj
-   +--sampledata
-   +--stub
-
-
-makefile.mk
------------
-
-The top-level makefile is for generating a jar-file containing all compiled
-java-files that were generated from the chart-idl files.  The jar is necessary
-for test-programs (see qa subdirectory)
-
-prj
----
-
-Contains the build.lst, which determines in which order the subdirectories have
-to be built.
-
-Also contains the d.lst which tells the deliver command which files to export
-into the output tree, so that other modules have access.  These are currently
-only C++-headers of project-specific UNO-classes.
-
-source
-------
-
-   inc
-   ---
-
-   Contains header files that have to be shared between files of model, view and
-   controller.  Apart from tools-headers, this should only include headers for
-   model objects, not view objects.
-
-   controller
-   ----------
-
-   Contains files concerning the controller.  All dialogs used in the UI of the
-   component are in the dialogs subfolder.  In drawinglayer, there is code that
-   builds the bridge to the drawing-layer via non-UNO code.  Itemsetwrapper
-   offers classes that convert XPropertySets of chart objects into non-UNO
-   SfxItemSets that are used to feed dialogs.
-
-   model
-   -----
-
-   Contains files concerning the model.  In oldapi there is code that implements
-   the old UNO-API (com.sun.star.chart.*) and wraps the new objects, thus it is
-   possible to talk to the new objects via the old API.  Until the XML-filter is
-   adapted to the new API it will use this wrapper to communicate via the old
-   API.
-
-   In the tree-subfolder, there are all classes that have to do with the
-   data-series tree provided by the XDiagram.  Template contains code that
-   provides templates for all different chart-types.
-
-    view
-	----
-
-	Axes, charttypes and diagram implement the respective view-objects.
-
-util
-----
-
-Contains the makefile to assemble the idl files into an rdb, and to generate C++
-headers for them.
-
-workbench
----------
-
-Contains files for testing and files needed during prototyping.
-
-    officeintegration
-    -----------------
-
-    Contains the install.pl script that installs the chart once it is build into
-    an existing office installation.  This should become deprecated soon, when
-    the new chart will be a package.
-
-
-   sampledata
-   ----------
-
-   Contains sample files of data to feed a chart with.  The files are loaded via
-   the FileDataSource and is thought for testing only.
-
-   stub
-   ----
-
-   Contains some templates for newly created files.
-
-qa
---
-
-Contains java-programs that execute so-called complex-testcases.  Type dmake in
-this directory to build the tests (they are not automatically built) and then
-type dmake runtest to execute all tests.  For most tests you will have to have a
-running office in the background that listens to requests on port 8100.
diff --git a/chart2/NOTES b/chart2/NOTES
index 40283baa73b4..e69de29bb2d1 100644
--- a/chart2/NOTES
+++ b/chart2/NOTES
@@ -1,129 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: NOTES,v $
-#
-# $Revision: 1.6 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-NOTES
-=====
-
-Activate the New Chart
-----------------------
-
-After installation of an Office, you will still get the old chart
-implementation.  In order to get the new implementation you have to activate it
-via the configuration.
-
-Set the boolean Config-Item Office.Common/Internal:DevelopmentChart to true.
-
-HOW-TO:
-
-* Open the file Common.xcu of the Registry.
-
-Location on Unix:
-$HOME/StarOffice8/user/registry/data/org/openoffice/Office/Common.xcu 
-
-Location on Windows:
-"%UserProfile%\Application Data\StarOffice8\user\registry\data\org\openoffice\Office\Common.xcu"
-
-* Under the configuration-node "Internal" (see <node oor:name="Internal"> tag)
-  you have to add the property "DevelopmentChart" and set this to "true":
-
-* Add the following after the "Internal"-node:
-
-  <prop oor:name="DevelopmentChart" oor:type="xs:boolean">
-   <value>true</value>
-  </prop>
-
-After that, your Common.xcu may look like this:
-
-,----[ Common.xcu example ]
-| <?xml version="1.0" encoding="UTF-8"?>
-| <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office">
-|  <node oor:name="Internal">
-|   <prop oor:name="DevelopmentChart" oor:type="xs:boolean">
-|    <value>true</value>
-|   </prop>
-|   <prop oor:name="CurrentTempURL" oor:type="xs:string">
-|    <value/>
-|   </prop>
-|  </node>
-|  <node oor:name="Help">
-|   <node oor:name="Registration">
-|    <prop oor:name="ReminderDate" oor:type="xs:string">
-|     <value xsi:nil="true"/>
-|    </prop>
-|    <prop oor:name="RequestDialog" oor:type="xs:int">
-|     <value>0</value>
-|    </prop>
-|   </node>
-|  </node>
-|  <node oor:name="Misc">
-|   <prop oor:name="FirstRun" oor:type="xs:boolean">
-|    <value>false</value>
-|   </prop>
-|  </node>
-| </oor:component-data>
-`----
-
-* To switch back, you can either replace the "true" by a "false", or you can
-  delete the complete "DevelopmentChart" property (the three lines) you
-  inserted.
-
-FileDataSource
---------------
-
-For testing the FileDataSource:  Currently the following files are read (hard-coded)
-* Win:  D:\files\data.chd
-* Unix: /work/data/data.chd
-
-You can find sample data in workbench/sampledata
-
-Testing
--------
-
-* To create a chart using the abovementioned file for data, Call the menu item
-  'File/Save all'.  To rebuild the chart call 'File/Save'.
-
-* You can also create a chart from spreadsheet data.
-
-* To run a test for the old API run "dmake" in the qa subdirectory.  Note that
-  you have to deliver the private chart2.rdb (just type "deliver") and call the
-  workbench/officeintegration/install.pl script for registering the private
-  Chart API at the global registry in order to run the test.  Currently the test
-  has to use new API, but in the future this will of course no longer be
-  necessary.
-
-  For running the API-test you must have a running office with the correct
-  parameters that allow remote access from external components (like the API
-  test).  Use the following command-line argument:
-
-  "-accept=socket,host=0,port=8100;urp"
-
-  With host=0 you allow access only from your local machine, so this should be
-  no network security problem.
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 888cc4477548..de6a2ed33838 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AreaWrapper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -42,8 +42,6 @@
 #include "LineProperties.hxx"
 #include "FillProperties.hxx"
 #include "UserDefinedProperties.hxx"
-// #include "NamedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
 
 #include <algorithm>
 
@@ -189,8 +187,6 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
 
     aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U("LineStyle"), C2U("LineStyle") ) );
 
-//     WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
-
     return aWrappedProperties;
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 350d51b2bfa6..96eb55f5f369 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AxisWrapper.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.8.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -43,15 +43,14 @@
 
 #include "CharacterProperties.hxx"
 #include "LineProperties.hxx"
-// #include "NamedLineProperties.hxx"
 #include "UserDefinedProperties.hxx"
 #include "WrappedCharacterHeightProperty.hxx"
 #include "WrappedTextRotationProperty.hxx"
-// #include "WrappedNamedProperty.hxx"
 #include "WrappedGapwidthProperty.hxx"
 #include "WrappedScaleProperty.hxx"
 #include "WrappedDefaultProperty.hxx"
 #include "WrappedNumberFormatProperty.hxx"
+#include "WrappedScaleTextProperties.hxx"
 
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
@@ -306,6 +305,7 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
 //         ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+        ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
         // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -440,26 +440,27 @@ void SAL_CALL AxisWrapper::removeEventListener(
 // ================================================================================
 
 //ReferenceSizePropertyProvider
-void AxisWrapper::setCurrentSizeAsReference()
+void AxisWrapper::updateReferenceSize()
 {
-    /*
     Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY );
     if( xProp.is() )
-        xProp->setPropertyValue( C2U("ReferenceDiagramSize"), uno::makeAny(
-                            m_spChart2ModelContact->GetDiagramSize() ));
-    */
+    {
+        if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
+            xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+            m_spChart2ModelContact->GetPageSize() ));
+    }
 }
 Any AxisWrapper::getReferenceSize()
 {
     Any aRet;
     Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY );
     if( xProp.is() )
-        aRet = xProp->getPropertyValue( C2U("ReferenceDiagramSize") );
+        aRet = xProp->getPropertyValue( C2U("ReferencePageSize") );
     return aRet;
 }
 awt::Size AxisWrapper::getCurrentSizeForReference()
 {
-    return m_spChart2ModelContact->GetDiagramSize();
+    return m_spChart2ModelContact->GetPageSize();
 }
 
 // ================================================================================
@@ -534,9 +535,8 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
 
     WrappedScaleProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
 
-    //aWrappedProperties.push_back( new WrappedStackedTextProperty() );
-//     WrappedNamedProperty::addWrappedLineProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this );
+    WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
 
     return aWrappedProperties;
 }
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 4d18df938b66..b7708dcf2ac2 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AxisWrapper.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -82,7 +82,7 @@ public:
     APPHELPER_XSERVICEINFO_DECL()
 
     //ReferenceSizePropertyProvider
-    virtual void setCurrentSizeAsReference();
+    virtual void updateReferenceSize();
     virtual ::com::sun::star::uno::Any getReferenceSize();
     virtual ::com::sun::star::awt::Size getCurrentSizeForReference();
 
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 609a451ec7bb..4b44b2e0593d 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Chart2ModelContact.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -178,87 +178,12 @@ sal_Int32 Chart2ModelContact::getExplicitNumberFormatKeyForAxis(
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-uno::Any Chart2ModelContact::GetListElementByName(
-    const rtl::OUString& rElementName, const rtl::OUString& rTableTypePropertyName )
-{
-    uno::Any aResult;
-    try
-    {
-        tTableMap::iterator aIter( m_aTableMap.find(rTableTypePropertyName) );
-        if( aIter == m_aTableMap.end() )
-        {
-            DBG_ERROR("no container found for the given type (gradient/hatch etc)");
-            return aResult;
-        }
-
-        if( !aIter->second->hasByName(rElementName) )
-        {
-            DBG_ERROR("no element with the given name found");
-            return aResult;
-        }
-
-        aResult = aIter->second->getByName(rElementName);
-    }
-    catch( uno::Exception& e)
-    {
-        ASSERT_EXCEPTION( e );
-    }
-    return aResult;
-}
-
-::rtl::OUString Chart2ModelContact::GetNameOfListElement(
-        const uno::Any& rElementValue, const ::rtl::OUString& rTableTypePropertyName )
-{
-    try
-    {
-        tTableMap::iterator aIter( m_aTableMap.find(rTableTypePropertyName) );
-        if( aIter == m_aTableMap.end() )
-        {
-            DBG_ERROR("no container found for the given type (gradient/hatch etc)");
-            return ::rtl::OUString();
-        }
-
-        uno::Reference< container::XNameContainer > xTable( aIter->second, uno::UNO_QUERY );
-        if( xTable.is() )
-        {
-            uno::Sequence< rtl::OUString > aNames( xTable->getElementNames() );
-            for( sal_Int32 nN = aNames.getLength(); nN--; )
-            {
-                if( xTable->getByName( aNames[nN] ) == rElementValue )
-                {
-                    return aNames[nN];
-                }
-            }
-        }
-    }
-    catch( uno::Exception& e)
-    {
-        ASSERT_EXCEPTION( e );
-    }
-    return ::rtl::OUString();
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 awt::Size Chart2ModelContact::GetPageSize() const
 {
     return ChartModelHelper::getPageSize(m_xChartModel);
 }
 
-awt::Size Chart2ModelContact::GetDiagramSize() const
-{
-    awt::Size aSize;
-    ExplicitValueProvider* pProvider( getExplicitValueProvider() );
-    if( pProvider )
-    {
-        aSize = ToSize( pProvider->getRectangleOfObject( lcl_getCIDForDiagram( m_xChartModel ) ) );
-    }
-    return aSize;
-}
-
 awt::Rectangle Chart2ModelContact::GetDiagramRectangleInclusive() const
 {
     awt::Rectangle aRect;
@@ -285,17 +210,6 @@ awt::Point Chart2ModelContact::GetDiagramPositionInclusive() const
     return ToPoint( this->GetDiagramRectangleInclusive() );
 }
 
-awt::Point Chart2ModelContact::GetDiagramPosition() const
-{
-    awt::Point aPoint;
-    ExplicitValueProvider* pProvider( getExplicitValueProvider() );
-    if( pProvider )
-    {
-        aPoint = ToPoint( pProvider->getRectangleOfObject( lcl_getCIDForDiagram( m_xChartModel ) ) );
-    }
-    return aPoint;
-}
-
 awt::Size Chart2ModelContact::GetLegendSize() const
 {
     awt::Size aSize;
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index 82257d63b544..b8ce668dff28 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Chart2ModelContact.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -87,38 +87,16 @@ public:
     sal_Int32 getExplicitNumberFormatKeyForAxis(
             const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
 
-    /** returns an element with name rElementName found in the list corresponding to the type PropertyName
-    (e.g. if rTableTypePropertyName == "FillGradientName" and rElementName == "Gradient 3", then this method will return the corresponding gradient )
-    */
-    ::com::sun::star::uno::Any GetListElementByName(
-        const ::rtl::OUString & rElementName, const ::rtl::OUString & rTableTypePropertyName );
-
-    /** search the list corresponding to rTableTypePropertyName for an element that has the same values as rElement.
-    returns the found name.
-    */
-    ::rtl::OUString GetNameOfListElement(
-        const ::com::sun::star::uno::Any& rElementValue, const ::rtl::OUString & rTableTypePropertyName );
-
-
     /** Returns the size of the page in logic coordinates.  This value is used
         for setting an appropriate "ReferencePageSize" for FontHeights.
      */
     ::com::sun::star::awt::Size GetPageSize() const;
 
-    /** Returns the size of the diagram object in logic coordinates.  This value
-        is used for setting an appropriate "ReferenceDiagramSize" for FontHeights.
-     */
-    ::com::sun::star::awt::Size GetDiagramSize() const;
-
     /** Returns the size of the diagram object in logic coordinates inclusive
         the space reserved for axis titles.
      */
     ::com::sun::star::awt::Size GetDiagramSizeInclusive() const;
 
-    /** Returns the position of the object in logic coordinates.
-     */
-    ::com::sun::star::awt::Point GetDiagramPosition() const;
-
     /** Returns the position of the diagram in logic coordinates inclusive
         the space reserved for axis titles.
      */
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 5b3a7a977ff1..fc62b3b77223 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataSeriesPointWrapper.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.44.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,6 +49,7 @@
 #include "WrappedSymbolProperties.hxx"
 #include "WrappedDataCaptionProperties.hxx"
 #include "WrappedSeriesAreaOrLineProperty.hxx"
+#include "WrappedScaleTextProperties.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 // header for define DBG_ASSERT
@@ -184,6 +185,7 @@ const uno::Sequence< Property > & lcl_GetPropertySequence( DataSeriesPointWrappe
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+        ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
         // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() );
@@ -582,26 +584,27 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getDataPointProperties(
 // ================================================================================
 
 //ReferenceSizePropertyProvider
-void DataSeriesPointWrapper::setCurrentSizeAsReference()
+void DataSeriesPointWrapper::updateReferenceSize()
 {
-    /*
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
     if( xProp.is() )
-        xProp->setPropertyValue( C2U("ReferenceDiagramSize"), uno::makeAny(
-                            m_spChart2ModelContact->GetDiagramSize() ));
-    */
+    {
+        if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
+            xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+                m_spChart2ModelContact->GetPageSize() ));
+    }
 }
 Any DataSeriesPointWrapper::getReferenceSize()
 {
     Any aRet;
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
     if( xProp.is() )
-        aRet = xProp->getPropertyValue( C2U("ReferenceDiagramSize") );
+        aRet = xProp->getPropertyValue( C2U("ReferencePageSize") );
     return aRet;
 }
 awt::Size DataSeriesPointWrapper::getCurrentSizeForReference()
 {
-    return m_spChart2ModelContact->GetDiagramSize();
+    return m_spChart2ModelContact->GetPageSize();
 }
 
 // ================================================================================
@@ -705,6 +708,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
 
     WrappedSymbolProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact );
     WrappedDataCaptionProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact );
+    WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
 
     //add unnamed fill properties (different inner names here)
 //     aWrappedProperties.push_back( new  WrappedUnnamedProperty( C2U( "FillGradient" ), C2U( "GradientName" ) ) );
@@ -742,10 +746,6 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
     aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapPositionOffsetX" ), C2U( "FillBitmapPositionOffsetX" ) ) );
     aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapPositionOffsetY" ), C2U( "FillBitmapPositionOffsetY" ) ) );
 
-    //aWrappedProperties.push_back( new  WrappedNamedProperty( C2U( "FillBitmapName" ), C2U( "FillBitmap" ), m_spChart2ModelContact ) );
-    //[optional, property] com::sun::star::awt::XBitmap FillBitmap;
-    //[optional, property] string FillBitmapURL;
-
     aWrappedProperties.push_back( new WrappedProperty( C2U( "SolidType" ), C2U( "Geometry3D" ) ) );
     aWrappedProperties.push_back( new WrappedSegmentOffsetProperty() );
     aWrappedProperties.push_back( new WrappedProperty( C2U( "D3DPercentDiagonal" ), C2U( "PercentDiagonal" ) ) );
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index b43c34988d44..0e3b87605b77 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataSeriesPointWrapper.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -92,7 +92,7 @@ public:
                 throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     //ReferenceSizePropertyProvider
-    virtual void setCurrentSizeAsReference();
+    virtual void updateReferenceSize();
     virtual ::com::sun::star::uno::Any getReferenceSize();
     virtual ::com::sun::star::awt::Size getCurrentSizeForReference();
 
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index f7a2abebb8da..c8220254d94e 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DiagramWrapper.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.17.32.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -61,6 +61,7 @@
 #include "ModifyListenerHelper.hxx"
 #include "DisposeHelper.hxx"
 #include <comphelper/InlineContainer.hxx>
+#include "WrappedAutomaticPositionProperties.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
@@ -73,8 +74,6 @@
 #include "FillProperties.hxx"
 #include "UserDefinedProperties.hxx"
 #include "SceneProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
-// #include "WrappedSceneProperty.hxx"
 
 #include <map>
 #include <algorithm>
@@ -150,7 +149,9 @@ enum
     PROP_DIAGRAM_HAS_SECOND_Y_AXIS_DESCR,
 
     PROP_DIAGRAM_HAS_SECOND_X_AXIS_TITLE,
-    PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE
+    PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE,
+
+    PROP_DIAGRAM_AUTOMATIC_SIZE
 };
 
 void lcl_AddPropertiesToVector(
@@ -418,6 +419,13 @@ void lcl_AddPropertiesToVector(
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
+
+    rOutProperties.push_back(
+        Property( C2U( "AutomaticSize" ),
+                  PROP_DIAGRAM_AUTOMATIC_SIZE,
+                  ::getBooleanCppuType(),
+                  beans::PropertyAttribute::BOUND
+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
 const uno::Sequence< Property > & lcl_GetPropertySequence()
@@ -440,6 +448,7 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
         WrappedDataCaptionProperties::addProperties( aProperties );
         WrappedSplineProperties::addProperties( aProperties );
         WrappedStockProperties::addProperties( aProperties );
+        WrappedAutomaticPositionProperties::addProperties( aProperties );
 
         // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -1886,6 +1895,81 @@ Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPrope
 //-----------------------------------------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------------------------------------------
 
+class WrappedAutomaticSizeProperty : public WrappedProperty
+{
+public:
+    WrappedAutomaticSizeProperty();
+    virtual ~WrappedAutomaticSizeProperty();
+
+    virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
+                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+};
+
+WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty()
+            : WrappedProperty( C2U( "AutomaticSize" ), OUString() )
+{
+}
+
+WrappedAutomaticSizeProperty::~WrappedAutomaticSizeProperty()
+{
+}
+
+void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    if( xInnerPropertySet.is() )
+    {
+        bool bNewValue = true;
+        if( ! (rOuterValue >>= bNewValue) )
+            throw lang::IllegalArgumentException( C2U("Property AutomaticSize requires value of type boolean"), 0, 0 );
+
+        try
+        {
+            if( bNewValue )
+            {
+                Any aRelativeSize( xInnerPropertySet->getPropertyValue( C2U( "RelativeSize" ) ) );
+                if( aRelativeSize.hasValue() )
+                    xInnerPropertySet->setPropertyValue( C2U( "RelativeSize" ), Any() );
+            }
+        }
+        catch( uno::Exception & ex )
+        {
+            ASSERT_EXCEPTION( ex );
+        }
+    }
+}
+
+Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
+    if( xInnerPropertySet.is() )
+    {
+        Any aRelativeSize( xInnerPropertySet->getPropertyValue( C2U( "RelativeSize" ) ) );
+        if( !aRelativeSize.hasValue() )
+            aRet <<= true;
+    }
+    return aRet;
+}
+
+Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
+                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    Any aRet;
+    aRet <<= false;
+    return aRet;
+}
+
+//-----------------------------------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------------------------------------------
+
 // ____ XDiagramProvider ____
 Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram()
     throw (uno::RuntimeException)
@@ -1917,7 +2001,6 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
 {
     ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
 
-    //WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedAxisAndGridExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedAxisTitleExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedAxisLabelExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
@@ -1929,6 +2012,7 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
     WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( aWrappedProperties, m_spChart2ModelContact );
     WrappedSplineProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedStockProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
+    WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties );
 
     aWrappedProperties.push_back( new WrappedDataRowSourceProperty( m_spChart2ModelContact ) );
     aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED,m_spChart2ModelContact ) );
@@ -1940,6 +2024,7 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
     aWrappedProperties.push_back( new WrappedAttributedDataPointsProperty( m_spChart2ModelContact ) );
     aWrappedProperties.push_back( new WrappedProperty( C2U( "StackedBarsConnected" ), C2U( "ConnectBars" ) ) );
     aWrappedProperties.push_back( new WrappedSolidTypeProperty( m_spChart2ModelContact ) );
+    aWrappedProperties.push_back( new WrappedAutomaticSizeProperty() );
     return aWrappedProperties;
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 30ea7d1ecfa4..11cf4cbb3102 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: GridWrapper.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -42,9 +42,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include "LineProperties.hxx"
-// #include "NamedLineProperties.hxx"
 #include "UserDefinedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
 #include "WrappedDefaultProperty.hxx"
 
 #include <algorithm>
@@ -192,7 +190,6 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
 {
     ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
 
-//     WrappedNamedProperty::addWrappedLineProperties( aWrappedProperties, m_spChart2ModelContact );
     aWrappedProperties.push_back( new WrappedDefaultProperty( C2U("LineColor"), C2U("LineColor"), uno::makeAny( sal_Int32( 0x000000) ) ) ); // black
 
     return aWrappedProperties;
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 93a8b3533eab..e6b63308b01d 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: LegendWrapper.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.16.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,11 +48,11 @@
 #include "LineProperties.hxx"
 #include "FillProperties.hxx"
 #include "UserDefinedProperties.hxx"
-// #include "NamedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
 #include "WrappedCharacterHeightProperty.hxx"
 #include "PositionAndSizeHelper.hxx"
 #include "WrappedDirectStateProperty.hxx"
+#include "WrappedAutomaticPositionProperties.hxx"
+#include "WrappedScaleTextProperties.hxx"
 
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
@@ -265,6 +265,8 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
 //         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+        ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
+        ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
         // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -380,12 +382,15 @@ void SAL_CALL LegendWrapper::removeEventListener(
 // ================================================================================
 
 //ReferenceSizePropertyProvider
-void LegendWrapper::setCurrentSizeAsReference()
+void LegendWrapper::updateReferenceSize()
 {
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
     if( xProp.is() )
-        xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
-                            m_spChart2ModelContact->GetPageSize() ));
+    {
+        if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
+            xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+                m_spChart2ModelContact->GetPageSize() ));
+    }
 }
 Any LegendWrapper::getReferenceSize()
 {
@@ -424,11 +429,12 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties()
     ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
 
     aWrappedProperties.push_back( new WrappedLegendAlignmentProperty() );
-//     WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this );
     //same problem as for wall: thje defaults ion the old chart are different for different charttypes, so we need to export explicitly
     aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U("FillStyle"), C2U("FillStyle") ) );
     aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U("FillColor"), C2U("FillColor") ));
+    WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties );
+    WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
 
     return aWrappedProperties;
 }
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 6d92c70de4a7..85483ec6c59c 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: LegendWrapper.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -69,7 +69,7 @@ public:
     APPHELPER_XSERVICEINFO_DECL()
 
     //ReferenceSizePropertyProvider
-    virtual void setCurrentSizeAsReference();
+    virtual void updateReferenceSize();
     virtual ::com::sun::star::uno::Any getReferenceSize();
     virtual ::com::sun::star::awt::Size getCurrentSizeForReference();
 
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index cb5661e75d1a..f545e54f872b 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: MinMaxLineWrapper.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -98,7 +98,6 @@ MinMaxLineWrapper::MinMaxLineWrapper( ::boost::shared_ptr< Chart2ModelContact >
         : m_spChart2ModelContact( spChart2ModelContact )
         , m_aEventListenerContainer( m_aMutex )
         , m_pPropertyArrayHelper()
-        //, m_aWrappedLineDashNameProperty( spChart2ModelContact )
         , m_aWrappedLineJointProperty( C2U("LineJoint"), uno::makeAny( drawing::LineJoint_NONE ))
 {
 }
@@ -192,8 +191,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const ::rtl::OUString& rPrope
                             xPropSet->setPropertyValue( C2U("Transparency"), rValue );
                         else if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
                             m_aWrappedLineJointProperty.setPropertyValue( rValue, xPropSet );
-                        //else if( rPropertyName.equals( m_aWrappedLineDashNameProperty.getOuterName() ) )
-                        //    m_aWrappedLineDashNameProperty.setPropertyValue( rValue, xPropSet );
                         else
                             xPropSet->setPropertyValue( rPropertyName, rValue );
                         return;
@@ -238,8 +235,6 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const ::rtl::OUString& rP
             aRet = xPropSet->getPropertyValue( C2U("Transparency") );
         else if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
             aRet = m_aWrappedLineJointProperty.getPropertyValue( xPropSet );
-        //else if( rPropertyName.equals( m_aWrappedLineDashNameProperty.getOuterName() ) )
-        //    aRet = m_aWrappedLineDashNameProperty.getPropertyValue( xPropSet );
         else
             aRet = xPropSet->getPropertyValue( rPropertyName );
 
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 04379894a69f..411c97e71a5e 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: MinMaxLineWrapper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,7 +33,6 @@
 #include "ServiceMacros.hxx"
 #include "MutexContainer.hxx"
 #include "WrappedIgnoreProperty.hxx"
-//#include "WrappedNamedProperty.hxx"
 #include <cppuhelper/interfacecontainer.hxx>
 
 
@@ -133,7 +132,6 @@ private: //member
 
     ::boost::shared_ptr< ::cppu::OPropertyArrayHelper > m_pPropertyArrayHelper;
 
-//    WrappedLineDashNameProperty         m_aWrappedLineDashNameProperty;
     WrappedIgnoreProperty               m_aWrappedLineJointProperty;
 };
 
diff --git a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
index 5e5616a3b3ca..c9199bcadaff 100644
--- a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
+++ b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ReferenceSizePropertyProvider.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,7 +39,7 @@ namespace wrapper
 class ReferenceSizePropertyProvider
 {
 public:
-    virtual void setCurrentSizeAsReference() = 0;
+    virtual void updateReferenceSize() = 0;
     virtual ::com::sun::star::uno::Any getReferenceSize() = 0;
     virtual ::com::sun::star::awt::Size getCurrentSizeForReference() = 0;
 };
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index d715ddc661e3..e0e9511cf71d 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: TitleWrapper.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.44.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -41,10 +41,10 @@
 #include "LineProperties.hxx"
 #include "FillProperties.hxx"
 #include "UserDefinedProperties.hxx"
-// #include "NamedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
 #include "WrappedCharacterHeightProperty.hxx"
 #include "WrappedTextRotationProperty.hxx"
+#include "WrappedAutomaticPositionProperties.hxx"
+#include "WrappedScaleTextProperties.hxx"
 
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
@@ -199,6 +199,8 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
 //         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+        ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
+        ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
         // and sort them for access via bsearch
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -455,12 +457,15 @@ Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName )
 // ================================================================================
 
 //ReferenceSizePropertyProvider
-void TitleWrapper::setCurrentSizeAsReference()
+void TitleWrapper::updateReferenceSize()
 {
     Reference< beans::XPropertySet > xProp( this->getTitleObject(), uno::UNO_QUERY );
     if( xProp.is() )
-        xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+    {
+        if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
+            xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
                             m_spChart2ModelContact->GetPageSize() ));
+    }
 }
 Any TitleWrapper::getReferenceSize()
 {
@@ -502,8 +507,9 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties()
     aWrappedProperties.push_back( new WrappedTitleStringProperty( m_spChart2ModelContact->m_xContext ) );
     aWrappedProperties.push_back( new WrappedTextRotationProperty() );
     aWrappedProperties.push_back( new WrappedStackedTextProperty() );
-//     WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this );
+    WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties );
+    WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
 
     return aWrappedProperties;
 }
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index 8c0d87bd440b..3e0db1ed1e42 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: TitleWrapper.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -68,7 +68,7 @@ public:
     APPHELPER_XSERVICEINFO_DECL()
 
     //ReferenceSizePropertyProvider
-    virtual void setCurrentSizeAsReference();
+    virtual void updateReferenceSize();
     virtual ::com::sun::star::uno::Any getReferenceSize();
     virtual ::com::sun::star::awt::Size getCurrentSizeForReference();
 
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 48186e173df1..e2a74834d249 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: UpDownBarWrapper.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -103,11 +103,6 @@ UpDownBarWrapper::UpDownBarWrapper(
         , m_aPropertySetName( bUp ? C2U("WhiteDay") : C2U("BlackDay") )
         , m_xInfo(0)
         , m_pPropertyArrayHelper()
-//        , m_aWrappedFillGradientNameProperty( m_spChart2ModelContact )
-//        , m_aWrappedFillHatchNameProperty( m_spChart2ModelContact )
-//        , m_aWrappedFillBitmapNameProperty( m_spChart2ModelContact )
-//        , m_aWrappedFillTransparenceGradientNameProperty( m_spChart2ModelContact )
-//        , m_aWrappedLineDashNameProperty( m_spChart2ModelContact )
 {
 }
 
@@ -192,20 +187,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValue( const ::rtl::OUString& rProper
         }
     }
     if(xPropSet.is())
-    {
-//        if( rPropertyName.equals( m_aWrappedFillGradientNameProperty.getOuterName() ) )
-//            m_aWrappedFillGradientNameProperty.setPropertyValue( rValue, xPropSet );
-//        else if( rPropertyName.equals( m_aWrappedFillHatchNameProperty.getOuterName() ) )
-//            m_aWrappedFillHatchNameProperty.setPropertyValue( rValue, xPropSet );
-//        else if( rPropertyName.equals( m_aWrappedFillBitmapNameProperty.getOuterName() ) )
-//            m_aWrappedFillBitmapNameProperty.setPropertyValue( rValue, xPropSet );
-//        else if( rPropertyName.equals( m_aWrappedFillTransparenceGradientNameProperty.getOuterName() ) )
-//            m_aWrappedFillTransparenceGradientNameProperty.setPropertyValue( rValue, xPropSet );
-//        else if( rPropertyName.equals( m_aWrappedLineDashNameProperty.getOuterName() ) )
-//            m_aWrappedLineDashNameProperty.setPropertyValue( rValue, xPropSet );
-//        else
         xPropSet->setPropertyValue( rPropertyName, rValue );
-    }
 }
 uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPropertyName )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
@@ -229,20 +211,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPr
         }
     }
     if(xPropSet.is())
-    {
-//        if( rPropertyName.equals( m_aWrappedFillGradientNameProperty.getOuterName() ) )
-//            aRet = m_aWrappedFillGradientNameProperty.getPropertyValue( xPropSet );
-//        else if( rPropertyName.equals( m_aWrappedFillHatchNameProperty.getOuterName() ) )
-//            aRet = m_aWrappedFillHatchNameProperty.getPropertyValue( xPropSet );
-//        else if( rPropertyName.equals( m_aWrappedFillBitmapNameProperty.getOuterName() ) )
-//            aRet = m_aWrappedFillBitmapNameProperty.getPropertyValue( xPropSet );
-//        else if( rPropertyName.equals( m_aWrappedFillTransparenceGradientNameProperty.getOuterName() ) )
-//            aRet = m_aWrappedFillTransparenceGradientNameProperty.getPropertyValue( xPropSet );
-//        else if( rPropertyName.equals( m_aWrappedLineDashNameProperty.getOuterName() ) )
-//            aRet = m_aWrappedLineDashNameProperty.getPropertyValue( xPropSet );
-//        else
         aRet = xPropSet->getPropertyValue( rPropertyName );
-    }
     return aRet;
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index 0fac6a278e05..ce83ece0a4bf 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: UpDownBarWrapper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +32,6 @@
 
 #include "ServiceMacros.hxx"
 #include "MutexContainer.hxx"
-// #include "WrappedNamedProperty.hxx"
 #include <cppuhelper/interfacecontainer.hxx>
 
 
@@ -132,11 +131,6 @@ private: //member
                         m_xInfo;//outer PropertySetInfo
     ::boost::shared_ptr< ::cppu::OPropertyArrayHelper > m_pPropertyArrayHelper;
 
-//    WrappedFillGradientNameProperty     m_aWrappedFillGradientNameProperty;
-//    WrappedFillHatchNameProperty        m_aWrappedFillHatchNameProperty;
-//    WrappedFillBitmapNameProperty       m_aWrappedFillBitmapNameProperty;
-//    WrappedFillTransparenceGradientNameProperty     m_aWrappedFillTransparenceGradientNameProperty;
-//    WrappedLineDashNameProperty         m_aWrappedLineDashNameProperty;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 740ad4a0959b..7e9aa4c6aeb9 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: WallFloorWrapper.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,11 +39,9 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 
-// #include "NamedProperties.hxx"
 #include "FillProperties.hxx"
 #include "LineProperties.hxx"
 #include "UserDefinedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
 #include "WrappedDirectStateProperty.hxx"
 
 #include <algorithm>
@@ -168,8 +166,6 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties(
 {
     ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
 
-//     WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
-
     // use direct state always, so that in XML the value is always
     // exported. Because in the old chart the defaults is as follows:
     // Floor: SOLID (new and old model default), Wall: NONE, except for some chart types (line, scatter)
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
new file mode 100644
index 000000000000..dfba4f0cf5ab
--- /dev/null
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -0,0 +1,159 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: WrappedAutomaticPositionProperties.cxx,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_chart2.hxx"
+
+#include "WrappedAutomaticPositionProperties.hxx"
+#include "FastPropertyIdRanges.hxx"
+#include "macros.hxx"
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/chart2/RelativePosition.hpp>
+
+using namespace ::com::sun::star;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::beans::Property;
+using ::rtl::OUString;
+
+//.............................................................................
+namespace chart
+{
+namespace wrapper
+{
+
+class WrappedAutomaticPositionProperty : public WrappedProperty
+{
+public:
+    WrappedAutomaticPositionProperty();
+    virtual ~WrappedAutomaticPositionProperty();
+
+    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException);
+    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+    virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
+                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+};
+
+WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
+    : ::chart::WrappedProperty( C2U( "AutomaticPosition" ), rtl::OUString() )
+{
+}
+WrappedAutomaticPositionProperty::~WrappedAutomaticPositionProperty()
+{
+}
+
+void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    if( xInnerPropertySet.is() )
+    {
+        bool bNewValue = true;
+        if( ! (rOuterValue >>= bNewValue) )
+            throw lang::IllegalArgumentException( C2U("Property AutomaticPosition requires value of type boolean"), 0, 0 );
+
+        try
+        {
+            if( bNewValue )
+            {
+                Any aRelativePosition( xInnerPropertySet->getPropertyValue( C2U( "RelativePosition" ) ) );
+                if( aRelativePosition.hasValue() )
+                    xInnerPropertySet->setPropertyValue( C2U( "RelativePosition" ), Any() );
+            }
+        }
+        catch( uno::Exception & ex )
+        {
+            ASSERT_EXCEPTION( ex );
+        }
+    }
+}
+
+Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
+    if( xInnerPropertySet.is() )
+    {
+        Any aRelativePosition( xInnerPropertySet->getPropertyValue( C2U( "RelativePosition" ) ) );
+        if( !aRelativePosition.hasValue() )
+            aRet <<= true;
+    }
+    return aRet;
+}
+
+Any WrappedAutomaticPositionProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
+                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    Any aRet;
+    aRet <<= false;
+    return aRet;
+}
+
+namespace
+{
+enum
+{
+    PROP_CHART_AUTOMATIC_POSITION = FAST_PROPERTY_ID_START_CHART_AUTOPOSITION_PROP
+};
+
+void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList )
+{
+    rList.push_back( new WrappedAutomaticPositionProperty() );
+}
+
+}//anonymous namespace
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//static
+void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property > & rOutProperties )
+{
+    rOutProperties.push_back(
+        Property( C2U( "AutomaticPosition" ),
+                  PROP_CHART_AUTOMATIC_POSITION,
+                  ::getBooleanCppuType(),
+                  beans::PropertyAttribute::BOUND
+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+//static
+void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList )
+{
+    lcl_addWrappedProperties( rList );
+}
+
+} //namespace wrapper
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
new file mode 100644
index 000000000000..edb9127fcd31
--- /dev/null
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: WrappedAutomaticPositionProperties.hxx,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef CHART_WRAPPED_AUTOMATICPOSITION_PROPERTIES_HXX
+#define CHART_WRAPPED_AUTOMATICPOSITION_PROPERTIES_HXX
+
+#include "WrappedProperty.hxx"
+#include <vector>
+
+//.............................................................................
+namespace chart
+{
+namespace wrapper
+{
+
+class WrappedAutomaticPositionProperties
+{
+public:
+    static void addProperties( ::std::vector< ::com::sun::star::beans::Property >& rOutProperties );
+    static void addWrappedProperties( std::vector< WrappedProperty* >& rList );
+};
+
+} //namespace wrapper
+} //namespace chart
+#endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index eeca8936727b..94f1c58fe27a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: WrappedCharacterHeightProperty.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -80,7 +80,7 @@ void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterVal
     if(xInnerPropertySet.is())
     {
         if( m_pRefSizePropProvider )
-            m_pRefSizePropProvider->setCurrentSizeAsReference();
+            m_pRefSizePropProvider->updateReferenceSize();
         xInnerPropertySet->setPropertyValue( m_aInnerName, rOuterValue );
     }
 }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx
index e84cfbfd27d4..e69de29bb2d1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx
@@ -1,154 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: WrappedNamedProperty.cxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include "WrappedNamedProperty.hxx"
-#include "macros.hxx"
-
-using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
-
-
-//.............................................................................
-namespace chart
-{
-namespace wrapper
-{
-
-WrappedNamedProperty::WrappedNamedProperty(
-                                  const OUString& rOuterName
-                                , const OUString& rInnerName
-                                , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-                           : WrappedProperty( rOuterName, rInnerName )
-                           , m_spChart2ModelContact( spChart2ModelContact )
-{
-}
-WrappedNamedProperty::~WrappedNamedProperty()
-{
-}
-
-//static
-void WrappedNamedProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact  )
-{
-    addWrappedFillProperties( rList, spChart2ModelContact  );
-    addWrappedLineProperties( rList, spChart2ModelContact  );
-}
-
-//static
-void WrappedNamedProperty::addWrappedFillProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact  )
-{
-    rList.push_back( new WrappedFillGradientNameProperty( spChart2ModelContact ) );
-    rList.push_back( new WrappedFillHatchNameProperty( spChart2ModelContact ) );
-    rList.push_back( new WrappedFillBitmapNameProperty( spChart2ModelContact ) );
-    rList.push_back( new WrappedFillTransparenceGradientNameProperty( spChart2ModelContact ) );
-}
-
-//static
-void WrappedNamedProperty::addWrappedLineProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact  )
-{
-    rList.push_back( new WrappedLineDashNameProperty( spChart2ModelContact ) );
-}
-
-::com::sun::star::uno::Any WrappedNamedProperty::convertInnerToOuterValue( const Any& rInnerValue ) const
-{
-    Any aRet;
-    ::rtl::OUString aName = m_spChart2ModelContact->GetNameOfListElement( rInnerValue, m_aOuterName );
-    aRet <<= aName;
-    return aRet;
-
-}
-Any WrappedNamedProperty::convertOuterToInnerValue( const Any& rOuterValue ) const
-{
-    Any aRet;
-    OUString aName;
-    if( rOuterValue >>= aName )
-    {
-        aRet = m_spChart2ModelContact->GetListElementByName( aName, m_aOuterName );
-    }
-    return aRet;
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-WrappedFillGradientNameProperty::WrappedFillGradientNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-        : WrappedNamedProperty( C2U( "FillGradientName" ), C2U( "FillGradient" ), spChart2ModelContact )
-{
-}
-WrappedFillGradientNameProperty::~WrappedFillGradientNameProperty()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-WrappedFillHatchNameProperty::WrappedFillHatchNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-        : WrappedNamedProperty( C2U( "FillHatchName" ), C2U( "FillHatch" ), spChart2ModelContact )
-{
-}
-WrappedFillHatchNameProperty::~WrappedFillHatchNameProperty()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-WrappedFillBitmapNameProperty::WrappedFillBitmapNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-        : WrappedNamedProperty( C2U( "FillBitmapName" ), C2U( "FillBitmap" ), spChart2ModelContact )
-{
-}
-WrappedFillBitmapNameProperty::~WrappedFillBitmapNameProperty()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-WrappedFillTransparenceGradientNameProperty::WrappedFillTransparenceGradientNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-        : WrappedNamedProperty( C2U( "FillTransparenceGradientName" ), C2U( "FillTransparenceGradient" ), spChart2ModelContact )
-{
-}
-WrappedFillTransparenceGradientNameProperty::~WrappedFillTransparenceGradientNameProperty()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-WrappedLineDashNameProperty::WrappedLineDashNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-        : WrappedNamedProperty( C2U( "LineDashName" ), C2U( "LineDash" ), spChart2ModelContact )
-{
-}
-WrappedLineDashNameProperty::~WrappedLineDashNameProperty()
-{
-}
-
-} //namespace wrapper
-} //namespace chart
-//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx
index 9ee92c269956..e69de29bb2d1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx
@@ -1,115 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: WrappedNamedProperty.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_WRAPPEDNAMEDPROPERTY_HXX
-#define CHART_WRAPPEDNAMEDPROPERTY_HXX
-
-#include "WrappedProperty.hxx"
-#include "Chart2ModelContact.hxx"
-
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
-//.............................................................................
-namespace chart
-{
-namespace wrapper
-{
-
-class WrappedNamedProperty : public WrappedProperty
-{
-public:
-    WrappedNamedProperty( const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
-    virtual ~WrappedNamedProperty();
-
-    static void addWrappedProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact  );
-    static void addWrappedFillProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact  );
-    static void addWrappedLineProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact  );
-
-protected:
-    virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const;
-    virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const;
-
-protected:
-    ::boost::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
-};
-
-//-----------------------------------------------------------------------------
-
-class WrappedFillGradientNameProperty : public WrappedNamedProperty
-{
-public:
-    WrappedFillGradientNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
-    virtual ~WrappedFillGradientNameProperty();
-};
-
-//-----------------------------------------------------------------------------
-
-class WrappedFillHatchNameProperty : public WrappedNamedProperty
-{
-public:
-    WrappedFillHatchNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
-    virtual ~WrappedFillHatchNameProperty();
-};
-
-//-----------------------------------------------------------------------------
-
-class WrappedFillBitmapNameProperty : public WrappedNamedProperty
-{
-public:
-    WrappedFillBitmapNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
-    virtual ~WrappedFillBitmapNameProperty();
-};
-
-//-----------------------------------------------------------------------------
-
-class WrappedFillTransparenceGradientNameProperty : public WrappedNamedProperty
-{
-public:
-    WrappedFillTransparenceGradientNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
-    virtual ~WrappedFillTransparenceGradientNameProperty();
-};
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-class WrappedLineDashNameProperty : public WrappedNamedProperty
-{
-public:
-    WrappedLineDashNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
-    virtual ~WrappedLineDashNameProperty();
-};
-
-} //namespace wrapper
-} //namespace chart
-//.............................................................................
-
-// CHART_WRAPPEDNAMEDPROPERTY_HXX
-#endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
new file mode 100644
index 000000000000..5a22ae7f184f
--- /dev/null
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -0,0 +1,170 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: WrappedScaleTextProperties.cxx,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_chart2.hxx"
+
+#include "WrappedScaleTextProperties.hxx"
+#include "FastPropertyIdRanges.hxx"
+#include "macros.hxx"
+
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+
+using namespace ::com::sun::star;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::beans::Property;
+using ::rtl::OUString;
+
+//.............................................................................
+namespace chart
+{
+namespace wrapper
+{
+
+class WrappedScaleTextProperty : public WrappedProperty
+{
+public:
+    WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+    virtual ~WrappedScaleTextProperty();
+
+    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException);
+    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+    virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
+                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+
+private:
+    ::boost::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
+};
+
+WrappedScaleTextProperty::WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+    : ::chart::WrappedProperty( C2U( "ScaleText" ), rtl::OUString() )
+    , m_spChart2ModelContact( spChart2ModelContact )
+{
+}
+
+WrappedScaleTextProperty::~WrappedScaleTextProperty()
+{
+}
+
+void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize") );
+
+    if( xInnerPropertySet.is() )
+    {
+        bool bNewValue = false;
+        if( ! (rOuterValue >>= bNewValue) )
+        {
+            if( rOuterValue.hasValue() )
+                throw lang::IllegalArgumentException( C2U("Property ScaleText requires value of type boolean"), 0, 0 );
+        }
+
+        try
+        {
+            if( bNewValue )
+            {
+                awt::Size aRefSize( m_spChart2ModelContact->GetPageSize() );
+                xInnerPropertySet->setPropertyValue( aRefSizeName, uno::makeAny( aRefSize ) );
+            }
+            else
+                xInnerPropertySet->setPropertyValue( aRefSizeName, Any() );
+        }
+        catch( uno::Exception & ex )
+        {
+            ASSERT_EXCEPTION( ex );
+        }
+    }
+}
+
+Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize") );
+
+    Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
+    if( xInnerPropertySet.is() )
+    {
+        if( xInnerPropertySet->getPropertyValue( aRefSizeName ).hasValue() )
+            aRet <<= true;
+        else
+            aRet <<= false;
+    }
+
+    return aRet;
+}
+
+Any WrappedScaleTextProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
+                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    Any aRet;
+    aRet <<= false;
+    return aRet;
+}
+
+namespace
+{
+enum
+{
+    PROP_CHART_SCALE_TEXT = FAST_PROPERTY_ID_START_SCALE_TEXT_PROP
+};
+
+}//anonymous namespace
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//static
+void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOutProperties )
+{
+    rOutProperties.push_back(
+        Property( C2U( "ScaleText" ),
+                  PROP_CHART_SCALE_TEXT,
+                  ::getBooleanCppuType(),
+                  beans::PropertyAttribute::MAYBEVOID
+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+//static
+void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
+                                 , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+{
+    rList.push_back( new WrappedScaleTextProperty( spChart2ModelContact ) );
+}
+
+} //namespace wrapper
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
new file mode 100644
index 000000000000..433a91254bcc
--- /dev/null
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: WrappedScaleTextProperties.hxx,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef CHART_WRAPPED_SCALETEXT_PROPERTIES_HXX
+#define CHART_WRAPPED_SCALETEXT_PROPERTIES_HXX
+
+#include "WrappedProperty.hxx"
+#include "Chart2ModelContact.hxx"
+
+#include <boost/shared_ptr.hpp>
+#include <vector>
+
+//.............................................................................
+namespace chart
+{
+namespace wrapper
+{
+
+class WrappedScaleTextProperties
+{
+public:
+    static void addProperties( ::std::vector< ::com::sun::star::beans::Property >& rOutProperties );
+    static void addWrappedProperties( std::vector< WrappedProperty* >& rList
+                    , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+};
+
+} //namespace wrapper
+} //namespace chart
+//.............................................................................
+#endif
diff --git a/chart2/source/controller/chartapiwrapper/makefile.mk b/chart2/source/controller/chartapiwrapper/makefile.mk
index 6a4f4ce0fd8e..e5b742e54346 100644
--- a/chart2/source/controller/chartapiwrapper/makefile.mk
+++ b/chart2/source/controller/chartapiwrapper/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.4 $
+# $Revision: 1.4.44.3 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -58,7 +58,7 @@ SLOFILES=	\
     $(SLO)$/MinMaxLineWrapper.obj \
     $(SLO)$/UpDownBarWrapper.obj \
     $(SLO)$/WallFloorWrapper.obj \
-    $(SLO)$/WrappedNamedProperty.obj \
+    $(SLO)$/WrappedAutomaticPositionProperties.obj \
     $(SLO)$/WrappedCharacterHeightProperty.obj \
     $(SLO)$/WrappedDataCaptionProperties.obj \
     $(SLO)$/WrappedTextRotationProperty.obj \
@@ -72,7 +72,8 @@ SLOFILES=	\
     $(SLO)$/WrappedStatisticProperties.obj \
     $(SLO)$/WrappedSceneProperty.obj \
     $(SLO)$/WrappedSeriesAreaOrLineProperty.obj \
-    $(SLO)$/WrappedAddInProperty.obj
+    $(SLO)$/WrappedAddInProperty.obj \
+    $(SLO)$/WrappedScaleTextProperties.obj
 
 # --- Targets -----------------------------------------------------------------
 
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index ccc4bfa8c7df..6dbce3afac61 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataBrowser.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -228,9 +228,6 @@ public:
     void SetGetFocusHdl( const Link& rLink );
 
     void SetEditChangedHdl( const Link & rLink );
-    const Link & GetEditChangedHdl() const;
-
-    ::boost::shared_ptr< SeriesHeaderEdit >  GetSeriesNameEditField() const;
 
     bool HasFocus() const;
 
@@ -395,11 +392,6 @@ void SeriesHeader::SetEditChangedHdl( const Link & rLink )
     m_aChangeLink = rLink;
 }
 
-const Link & SeriesHeader::GetEditChangedHdl() const
-{
-    return m_aChangeLink;
-}
-
 IMPL_LINK( SeriesHeader, SeriesNameChanged, void * , EMPTYARG )
 {
     notifyChanges();
@@ -417,11 +409,6 @@ void SeriesHeader::SetGetFocusHdl( const Link& rLink )
     m_spSeriesName->SetGetFocusHdl( rLink );
 }
 
-::boost::shared_ptr< SeriesHeaderEdit > SeriesHeader::GetSeriesNameEditField() const
-{
-    return m_spSeriesName;
-}
-
 bool SeriesHeader::HasFocus() const
 {
     return m_spSeriesName->HasFocus();
@@ -798,11 +785,6 @@ bool DataBrowser::IsReadOnly() const
 }
 
 
-bool DataBrowser::IsDirty() const
-{
-    return m_bIsDirty;
-}
-
 void DataBrowser::SetClean()
 {
     m_bIsDirty = false;
@@ -1033,50 +1015,6 @@ void DataBrowser::SetCursorMovedHdl( const Link& rLink )
     m_aCursorMovedHdlLink = rLink;
 }
 
-const Link& DataBrowser::GetCursorMovedHdl() const
-{
-    return m_aCursorMovedHdlLink;
-}
-
-// void DataBrowser::QuickSortCol()
-// {
-//     DeactivateCell();
-//  m_apMemChart->SortCols( GetCurRow () - 1 );
-//  m_pLogBook->SetValid( FALSE );
-//  Invalidate();
-//     ActivateCell();
-//     SetDirty();
-// }
-
-// void DataBrowser::QuickSortRow()
-// {
-//     DeactivateCell();
-//  m_apMemChart->SortRows( GetCurColumnId () - 2 );
-//  m_pLogBook->SetValid( FALSE );
-//  Invalidate();
-//     ActivateCell();
-//     SetDirty();
-// }
-
-// void DataBrowser::QuickSortTableCols ()
-// {
-//     DeactivateCell();
-//  m_apMemChart->SortTableRows( GetCurColumnId () - 2 );
-//  m_pLogBook->SetValid( FALSE );
-//  Invalidate();
-//     ActivateCell();
-//     SetDirty();
-// }
-
-// void DataBrowser::QuickSortTableRows ()
-// {
-//  m_apMemChart->SortTableCols( GetCurRow () - 1 );
-//  m_pLogBook->SetValid( FALSE );
-//  Invalidate();
-//     ActivateCell();
-//     SetDirty();
-// }
-
 // implementations for ::svt::EditBrowseBox (pure virtual methods)
 void DataBrowser::PaintCell(
     OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index b43cc19b9822..a4147af84fcb 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataBrowser.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -103,8 +103,6 @@ public:
     bool SetReadOnly( bool bNewState );
     bool IsReadOnly() const;
 
-    /// @return true, if data has been modified
-    bool IsDirty() const;
     /// reset the dirty status, if changes have been saved
     void SetClean();
 
@@ -141,15 +139,7 @@ public:
     void SwapRow();
     void SwapColumn();
 
-//  void QuickSortRow();
-//  void QuickSortCol();
-
-    // sorting the entire table
-//  void QuickSortTableCols ();
-//  void QuickSortTableRows ();
-
     void SetCursorMovedHdl( const Link& rLink );
-    const Link& GetCursorMovedHdl() const;
 
     void SetCellModifiedHdl( const Link& rLink );
 
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 258a4c924b2e..6b6d682186c5 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataBrowserModel.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.16.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -298,14 +298,6 @@ DataBrowserModel::DataBrowserModel(
 DataBrowserModel::~DataBrowserModel()
 {}
 
-
-void DataBrowserModel::setModel(
-    const Reference< chart2::XChartDocument > & xChartDoc )
-{
-    m_xChartDocument.set( xChartDoc );
-    m_apDialogModel.reset( new DialogModel( xChartDoc, m_xContext ));
-}
-
 namespace
 {
 struct lcl_DataSeriesOfHeaderMatches : public ::std::unary_function< ::chart::DataBrowserModel::tDataHeader, bool >
@@ -641,15 +633,6 @@ bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const
         setCellAny( nAtColumn, nAtRow, uno::makeAny( rText ));
 }
 
-Reference< chart2::data::XLabeledDataSequence >
-    DataBrowserModel::getDataOfColumn( sal_Int32 nColumnIndex ) const
-{
-    if( 0 <= nColumnIndex &&
-        static_cast< tDataColumnVector::size_type >( nColumnIndex ) < m_aColumns.size())
-        return m_aColumns[ nColumnIndex ].m_xLabeledDataSequence;
-    return Reference< chart2::data::XLabeledDataSequence >();
-}
-
 sal_Int32 DataBrowserModel::getColumnCount() const
 {
     return static_cast< sal_Int32 >( m_aColumns.size());
@@ -773,13 +756,19 @@ void DataBrowserModel::updateFromModel()
                         nHeaderEnd = nHeaderStart;
 
                         // @todo: dimension index 1 for y-values used here. This is just a guess
-                        sal_Int32 nNumberFormatKey =
+                        sal_Int32 nYAxisNumberFormatKey =
                             DataSeriesHelper::getNumberFormatKeyFromAxis(
                                 aSeries[nSeriesIdx], aCooSysSeq[nCooSysIdx], 1 );
 
                         sal_Int32 nSeqIdx=0;
                         for( ; nSeqIdx<aLSeqs.getLength(); ++nSeqIdx )
                         {
+                            sal_Int32 nSequenceNumberFormatKey = nYAxisNumberFormatKey;
+                            OUString aRole = lcl_getRole( aLSeqs[nSeqIdx] );
+                            if( aRole.equals( C2U( "values-x" ) ) )
+                                nSequenceNumberFormatKey = DataSeriesHelper::getNumberFormatKeyFromAxis(
+                                    aSeries[nSeriesIdx], aCooSysSeq[nCooSysIdx], 0, 0 );
+
                             if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
                                              lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end())
                             {
@@ -791,7 +780,7 @@ void DataBrowserModel::updateFromModel()
                                         lcl_getUIRoleName( aLSeqs[nSeqIdx] ),
                                         aLSeqs[nSeqIdx],
                                         NUMBER,
-                                        nNumberFormatKey ));
+                                        nSequenceNumberFormatKey ));
                                 ++nHeaderEnd;
                             }
                             // else skip
@@ -809,7 +798,7 @@ void DataBrowserModel::updateFromModel()
 
                         // add ranges for error bars if present for a series
                         if( StatisticsHelper::usesErrorBarRanges( aSeries[nSeriesIdx], /* bYError = */ true ))
-                            addErrorBarRanges( aSeries[nSeriesIdx], nNumberFormatKey, nSeqIdx, nHeaderEnd );
+                            addErrorBarRanges( aSeries[nSeriesIdx], nYAxisNumberFormatKey, nSeqIdx, nHeaderEnd );
 
                         m_aHeaders.push_back(
                             tDataHeader(
@@ -829,10 +818,6 @@ void DataBrowserModel::updateFromModel()
     }
 }
 
-void DataBrowserModel::applyToModel()
-{
-}
-
 void DataBrowserModel::addErrorBarRanges(
     const Reference< chart2::XDataSeries > & xDataSeries,
     sal_Int32 nNumberFormatKey,
@@ -911,13 +896,4 @@ void DataBrowserModel::addErrorBarRanges(
     }
 }
 
-// static
-void DataBrowserModel::restoreModel(
-    const Reference< chart2::XChartDocument > & xSource,
-    const Reference< chart2::XChartDocument > & xDestination )
-{
-    DialogModel::restoreModel( xSource, xDestination );
-}
-
-
 } //  namespace chart
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index dad462b62c6c..95a3e4b2f0fa 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataBrowserModel.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -58,10 +58,6 @@ public:
             ::com::sun::star::uno::XComponentContext > & xContext );
     virtual ~DataBrowserModel();
 
-    void setModel(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xChartDoc );
-
     /** Inserts a new data series after the data series to which the data column
         with index nAfterColumnIndex belongs.
      */
@@ -101,22 +97,10 @@ public:
 
     sal_Int32 getColumnCount() const;
     sal_Int32 getMaxRowCount() const;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XLabeledDataSequence >
-        getDataOfColumn( sal_Int32 nColumnIndex ) const;
+
     // returns the UI string of the corresponding role
     ::rtl::OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const;
 
-    /** Applies the content of xSource to xDestination.  As a result
-        xDestination is a copy of xSource, but maintains its identity.
-        (Something like a flat assignment operator)
-     */
-    static void restoreModel(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xSource,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xDestination );
-
     struct tDataHeader
     {
         ::com::sun::star::uno::Reference<
@@ -164,7 +148,6 @@ public:
 
 private:
     void updateFromModel();
-    void applyToModel();
 
     void addErrorBarRanges(
         const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index e980b1550996..28d9f6420419 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DialogModel.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -717,37 +717,6 @@ bool DialogModel::setData(
 }
 
 // static
-void DialogModel::restoreModel(
-    const Reference< chart2::XChartDocument > & xSource,
-    const Reference< chart2::XChartDocument > & xDestination )
-{
-    ControllerLockGuard aLockedControllers( Reference< frame::XModel >( xDestination, uno::UNO_QUERY ) );
-
-    if( xSource.is() && xDestination.is())
-    {
-        try
-        {
-            // diagram
-            xDestination->setFirstDiagram( xSource->getFirstDiagram());
-
-            // main title
-            Reference< chart2::XTitled > xDestinationTitled( xDestination, uno::UNO_QUERY_THROW );
-            Reference< chart2::XTitled > xSourceTitled( xSource, uno::UNO_QUERY_THROW );
-            xDestinationTitled->setTitleObject( xSourceTitled->getTitleObject());
-
-            // page background
-            comphelper::copyProperties(
-                xSource->getPageBackground(),
-                xDestination->getPageBackground() );
-        }
-        catch( uno::Exception & ex )
-        {
-            ASSERT_EXCEPTION( ex );
-        }
-    }
-}
-
-// static
 OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString )
 {
     return lcl_ConvertRole( rRoleString, true );
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 7424630bcbdc..65579ab652be 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DialogModel.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -153,16 +153,6 @@ public:
 
     void startControllerLockTimer();
 
-    /** Applies the content of xSource to xDestination.  As a result
-        xDestination is a copy of xSource, but maintains its identity.
-        (Something like a flat assignment operator)
-     */
-    static void restoreModel(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xSource,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xDestination );
-
     static ::rtl::OUString ConvertRoleFromInternalToUI( const ::rtl::OUString & rRoleString );
     static ::rtl::OUString ConvertRoleFromUIToInternal( const ::rtl::OUString & rRoleString );
     static ::rtl::OUString GetRoleDataLabel();
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index 677e287fe18e..88f93413ce67 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: RangeSelectionHelper.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -55,57 +55,6 @@ using ::rtl::OUString;
 
 // ----------------------------------------
 
-namespace
-{
-OUString lcl_getTextFromRanges( const Sequence < Reference< table::XCellRange > >& xRanges )
-{
-    ::rtl::OUStringBuffer aResultBuf;
-
-    try
-    {
-        sal_Int32 nCount(xRanges.getLength());
-        for (sal_Int32 i = 0; i < nCount; ++i)
-        {
-            Reference< sheet::XCellRangeAddressable > xAddressable( xRanges[i], uno::UNO_QUERY );
-            if( xAddressable.is())
-            {
-                // iterate through columns first
-                table::CellRangeAddress aAddr = xAddressable->getRangeAddress();
-                bool bInsSpace = false;
-                for( sal_Int32 nCol=aAddr.StartColumn; nCol<=aAddr.EndColumn; ++nCol )
-                    for( sal_Int32 nRow=aAddr.StartRow; nRow<=aAddr.EndRow; ++nRow )
-                    {
-                        if( bInsSpace )
-                            aResultBuf.append( sal_Unicode( ' ' ));
-                        else
-                            bInsSpace = true;
-                        Reference< text::XText > xText( xRanges[i]->getCellByPosition(
-                                                            nCol - aAddr.StartColumn,
-                                                            nRow - aAddr.StartRow ), uno::UNO_QUERY );
-                        if( xText.is())
-                            aResultBuf.append( xText->getString());
-                    }
-            }
-            else if (xRanges[i].is())
-            {
-                // assert that (0,0) is valid.  Otherwise an exception is thrown
-                Reference< text::XText > xText( xRanges[i]->getCellByPosition( 0, 0 ), uno::UNO_QUERY );
-                if( xText.is() )
-                    aResultBuf.append( xText->getString());
-            }
-        }
-    }
-    catch( uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-
-    return aResultBuf.makeStringAndClear();
-}
-} // anonymous namespace
-
-// ----------------------------------------
-
 namespace chart
 {
 
@@ -144,37 +93,6 @@ Reference< sheet::XRangeSelection > RangeSelectionHelper::getRangeSelection()
     return m_xRangeSelection;
 }
 
-Reference< sheet::XCellRangesAccess > RangeSelectionHelper::getCellRangesAccess()
-{
-    if( ! m_xCellRangesAccess.is() &&
-        m_xChartDocument.is())
-    {
-        try
-        {
-            Reference< sheet::XSpreadsheetDocument > xSpreadDoc;
-
-            // try controller
-            Reference< chart2::data::XDataProvider > xDataProvider( m_xChartDocument->getDataProvider());
-            if( xDataProvider.is())
-            {
-                Reference< frame::XController > xCtrl( xDataProvider->getRangeSelection(), uno::UNO_QUERY );
-
-                if( xCtrl.is() )
-                    xSpreadDoc.set( xCtrl->getModel(), uno::UNO_QUERY_THROW );
-            }
-
-            if( xSpreadDoc.is() )
-                m_xCellRangesAccess.set( xSpreadDoc->getSheets(), uno::UNO_QUERY );
-        }
-        catch( uno::Exception & ex )
-        {
-            ASSERT_EXCEPTION( ex );
-        }
-    }
-
-    return m_xCellRangesAccess;
-}
-
 void RangeSelectionHelper::raiseRangeSelectionDocument()
 {
     Reference< sheet::XRangeSelection > xRangeSel( getRangeSelection());
@@ -280,26 +198,4 @@ bool RangeSelectionHelper::verifyArguments( const Sequence< beans::PropertyValue
     return xDataProvider->createDataSourcePossible( rArguments );
 }
 
-OUString RangeSelectionHelper::getCellRangeContent( const OUString & rRangeStr )
-{
-    OUString aResult;
-
-    Reference< sheet::XCellRangesAccess > xRangesAccess( getCellRangesAccess());
-    if( xRangesAccess.is())
-    {
-        // @todo: the interface should provide a method to determine if a cell
-        // range is correct, rather than waiting for an exception
-        try
-        {
-            aResult = lcl_getTextFromRanges( xRangesAccess->getCellRangesByName( rRangeStr ) );
-        }
-        catch( const uno::Exception & ex )
-        {
-            ASSERT_EXCEPTION( ex );
-        }
-    }
-
-    return aResult;
-}
-
 } //  namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 5d4d28c07fec..e6b74c8e660a 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dlg_InsertErrorBars.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -78,11 +78,6 @@ InsertErrorBarsDialog::~InsertErrorBarsDialog()
 {
 }
 
-void InsertErrorBarsDialog::Reset()
-{
-    m_apErrorBarResources->Reset(rInAttrs);
-}
-
 void InsertErrorBarsDialog::FillItemSet(SfxItemSet& rOutAttrs)
 {
     m_apErrorBarResources->FillItemSet(rOutAttrs);
diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
index 9faed6426eb3..95c9754f3b7e 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dlg_InsertTrendline.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -98,11 +98,6 @@ void InsertTrendlineDialog::adjustSize()
     SetSizePixel( aDialogSize );
 }
 
-void InsertTrendlineDialog::Reset()
-{
-    m_apTrendlineResources->Reset(rInAttrs);
-}
-
 void InsertTrendlineDialog::FillItemSet(SfxItemSet& rOutAttrs)
 {
     m_apTrendlineResources->FillItemSet(rOutAttrs);
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index bf8362d46050..ad8baae5b417 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dlg_ObjectProperties.cxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.23.42.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -102,12 +102,10 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const rtl::OUS
         , m_aLocalizedName()
         , m_bHasGeometryProperties(false)
         , m_bHasStatisticProperties(false)
-        , m_bHasRegressionProperties(false)
         , m_bProvidesSecondaryYAxis(false)
         , m_bProvidesOverlapAndGapWidth(false)
         , m_bProvidesBarConnectors(false)
         , m_bHasAreaProperties(false)
-        , m_bHasLineProperties(false)
         , m_bHasSymbolProperties(false)
         , m_bHasScaleProperties(false)
         , m_bCanAxisLabelsBeStaggered(false)
@@ -151,7 +149,6 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
         if( bHasSeriesProperties )
         {
             m_bHasStatisticProperties =  ChartTypeHelper::isSupportingStatisticProperties( xChartType, nDimensionCount );
-            m_bHasRegressionProperties = ChartTypeHelper::isSupportingRegressionProperties( xChartType, nDimensionCount );
             m_bProvidesSecondaryYAxis =  ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount, 1 );
             m_bProvidesOverlapAndGapWidth =  ChartTypeHelper::isSupportingOverlapAndGapWidthProperties( xChartType, nDimensionCount );
             m_bProvidesBarConnectors =  ChartTypeHelper::isSupportingBarConnectors( xChartType, nDimensionCount );
@@ -161,12 +158,9 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
                                             .getLength() ? true : false;
         }
     }
-    m_bHasLineProperties     = true; //@todo ask object
 
     if( OBJECTTYPE_DATA_ERRORS == m_eObjectType )
         m_bHasStatisticProperties = true;
-    else if( OBJECTTYPE_DATA_CURVE == m_eObjectType )
-        m_bHasRegressionProperties = true;
 
     if( OBJECTTYPE_AXIS == m_eObjectType )
     {
@@ -217,10 +211,6 @@ bool ObjectPropertiesDialogParameter::HasStatisticProperties() const
 {
     return m_bHasStatisticProperties;
 }
-bool ObjectPropertiesDialogParameter::HasRegressionProperties() const
-{
-    return m_bHasRegressionProperties;
-}
 bool ObjectPropertiesDialogParameter::ProvidesSecondaryYAxis() const
 {
     return m_bProvidesSecondaryYAxis;
@@ -237,10 +227,6 @@ bool ObjectPropertiesDialogParameter::HasAreaProperties() const
 {
     return m_bHasAreaProperties;
 }
-bool ObjectPropertiesDialogParameter::HasLineProperties() const
-{
-    return m_bHasLineProperties;
-}
 bool ObjectPropertiesDialogParameter::HasSymbolProperties() const
 {
     return m_bHasSymbolProperties;
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index a8b5bc5f4700..a98ce3833e56 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: res_BarGeometry.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -63,10 +63,6 @@ void BarGeometryResources::SetPosPixel( const Point& rPosition )
     m_aFT_Geometry.SetPosPixel( rPosition );
     m_aLB_Geometry.SetPosPixel( Point( rPosition.X()+aDistanceSize.Width(), rPosition.Y()+m_aFT_Geometry.GetSizePixel().Height()+aDistanceSize.Height()) );
 }
-Point BarGeometryResources::GetPosPixel() const
-{
-    return m_aFT_Geometry.GetPosPixel();
-}
 Size BarGeometryResources::GetSizePixel() const
 {
     long nHeight = m_aLB_Geometry.GetPosPixel().Y()
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index c098b8e5f156..8bf2d81259a3 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: res_BarGeometry.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,7 +47,6 @@ public:
     virtual ~BarGeometryResources();
 
     void  SetPosPixel( const Point& rPosition );
-    Point GetPosPixel() const;
     Size  GetSizePixel() const;
 
     void Show( bool bShow );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 2a2a8870e1ab..eb5aef2a8375 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tp_ChartType.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.8.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -166,7 +166,6 @@ public:
     virtual ~Dim3DLookResourceGroup();
 
     void  showControls( bool bShow );
-    Point getPosition();
     long  getHeight();
     void  setPosition( const Point& rPoint );
 
@@ -202,10 +201,6 @@ void Dim3DLookResourceGroup::showControls( bool bShow )
     m_aCB_3DLook.Show(bShow);
     m_aLB_Scheme.Show(bShow);
 }
-Point Dim3DLookResourceGroup::getPosition()
-{
-    return m_aCB_3DLook.GetPosPixel();
-}
 long Dim3DLookResourceGroup::getHeight()
 {
     return m_aCB_3DLook.GetSizePixel().Height() + m_aLB_Scheme.LogicToPixel( Size(0,2), MapMode(MAP_APPFONT) ).Height();
@@ -266,7 +261,6 @@ public:
     virtual ~SortByXValuesResourceGroup();
 
     void  showControls( bool bShow );
-    Point getPosition();
     long  getHeight();
     void  setPosition( const Point& rPoint );
 
@@ -292,10 +286,6 @@ void SortByXValuesResourceGroup::showControls( bool bShow )
 {
     m_aCB_XValueSorting.Show(bShow);
 }
-Point SortByXValuesResourceGroup::getPosition()
-{
-    return m_aCB_XValueSorting.GetPosPixel();
-}
 long SortByXValuesResourceGroup::getHeight()
 {
     return m_aCB_XValueSorting.GetSizePixel().Height();
@@ -730,7 +720,6 @@ public:
     virtual ~GeometryResourceGroup();
 
     void  showControls( bool bShow );
-    Point getPosition();
     long  getHeight();
     void  setPosition( const Point& rPoint );
 
@@ -756,10 +745,6 @@ void GeometryResourceGroup::showControls( bool bShow )
 {
     m_aGeometryResources.Show(bShow);
 }
-Point GeometryResourceGroup::getPosition()
-{
-    return m_aGeometryResources.GetPosPixel();
-}
 long GeometryResourceGroup::getHeight()
 {
     return m_aGeometryResources.GetSizePixel().Height();
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 9a42b96a4a8a..77c861d529e9 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tp_DataSource.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.5.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -573,31 +573,6 @@ void DataSourceTabPage::updateControlState()
     isValid();
 }
 
-
-void DataSourceTabPage::disableAll()
-{
-    m_aFT_SERIES.Disable();
-    m_apLB_SERIES->Disable();
-
-    m_aBTN_ADD.Disable();
-    m_aBTN_REMOVE.Disable();
-
-    m_aFT_ROLE.Disable();
-    m_aLB_ROLE.Disable();
-
-    m_aFT_RANGE.Disable();
-    m_aEDT_RANGE.Disable();
-    m_aIMB_RANGE_MAIN.Disable();
-
-    m_aFT_CATEGORIES.Disable();
-    m_aFT_DATALABELS.Disable();
-    m_aEDT_CATEGORIES.Disable();
-    m_aIMB_RANGE_CAT.Disable();
-
-    m_aBTN_UP.Disable();
-    m_aBTN_DOWN.Disable();
-}
-
 IMPL_LINK( DataSourceTabPage, SeriesSelectionChangedHdl, void *, EMPTYARG )
 {
     m_rDialogModel.startControllerLockTimer();
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 39068e891a27..2703836d5d1d 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tp_DataSource.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.4.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -119,9 +119,6 @@ protected:
      */
     bool updateModelFromControl( Edit * pField = 0 );
 
-    /// disable all controls (while Calc range chooser is active)
-    void disableAll();
-
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >
         getSelectionRangeListener();
 
diff --git a/chart2/source/controller/dialogs/tp_Location.cxx b/chart2/source/controller/dialogs/tp_Location.cxx
index 45b3287a8079..cce4cd520b12 100644
--- a/chart2/source/controller/dialogs/tp_Location.cxx
+++ b/chart2/source/controller/dialogs/tp_Location.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tp_Location.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -44,6 +44,7 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
+#ifdef LOCATION_PAGE
 
 LocationTabPage::LocationTabPage( svt::OWizardMachine* pParent
         , const uno::Reference< XChartDocument >& xChartModel
@@ -67,7 +68,7 @@ bool LocationTabPage::canAdvance() const
 {
     return false;
 }
-
+#endif
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_Location.hxx b/chart2/source/controller/dialogs/tp_Location.hxx
index 8c128e0b4eec..8b472d2a6c92 100644
--- a/chart2/source/controller/dialogs/tp_Location.hxx
+++ b/chart2/source/controller/dialogs/tp_Location.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tp_Location.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,7 +48,7 @@ namespace chart
 //-----------------------------------------------------------------------------
 /**
 */
-
+#ifdef LOCATION_PAGE
 class LocationTabPage : public svt::OWizardPage
 {
 public:
@@ -71,6 +71,7 @@ protected:
     ::com::sun::star::uno::Reference<
                        ::com::sun::star::uno::XComponentContext>    m_xCC;
 };
+#endif
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 32f411a0500e..2c2bc3fc6892 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tp_RangeChooser.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.5.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index db38da850678..01062ba4c0f1 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tp_RangeChooser.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.5.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 3fbe604c72f5..f2dde8aa7b8f 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: GraphicPropertyItemConverter.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -74,11 +74,6 @@ protected:
     virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
-    void FillBitmapItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
-        throw( ::com::sun::star::beans::UnknownPropertyException );
-    void ApplyBitmapItem( USHORT nWhichId, const SfxItemSet & rItemSet )
-        throw( ::com::sun::star::beans::UnknownPropertyException );
-
 private:
     eGraphicObjectType              m_eGraphicObjectType;
     SdrModel &                      m_rDrawModel;
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 517cd4a54d48..9f21d00dd0a1 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ItemConverter.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -128,17 +128,6 @@ public:
      */
     SfxItemSet CreateEmptyItemSet() const;
 
-    /** States whether conversion is still likely to work.
-
-        In particular, it is checked if the XPropertySet given in the CTOR is
-        still valid, i.e. not disposed.  It is assumed that the XPropertySet is
-        valid when the converter is constructed.
-
-        This only works if the XPropertySet given in the CTOR supports the
-        interface ::com::sun::star::lang::XComponent.
-     */
-    bool IsValid() const;
-
     /** Invalidates all items in rDestSet, that are set (state SFX_ITEM_SET) in
         both item sets (rDestSet and rSourceSet) and have differing content.
      */
diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx
index a715d6585244..ec280b0da2e8 100755
--- a/chart2/source/controller/inc/RangeSelectionHelper.hxx
+++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: RangeSelectionHelper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -57,8 +57,6 @@ public:
     bool hasRangeSelection();
     ::com::sun::star::uno::Reference<
             ::com::sun::star::sheet::XRangeSelection > getRangeSelection();
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::sheet::XCellRangesAccess > getCellRangesAccess();
     void raiseRangeSelectionDocument();
     bool chooseRange(
         const ::rtl::OUString & aCurrentRange,
@@ -67,7 +65,6 @@ public:
     void stopRangeListening( bool bRemoveListener = true );
     bool verifyCellRange( const ::rtl::OUString & rRangeStr );
     bool verifyArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments );
-    ::rtl::OUString getCellRangeContent( const ::rtl::OUString & rRangeStr );
 
 private:
     ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index d5ab8118180b..13382ff9bffa 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dlg_InsertErrorBars.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,7 +65,6 @@ public:
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
 
 private:
-    void Reset();
     const SfxItemSet & rInAttrs;
 
     OKButton          aBtnOK;
diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
index 4e1ca9eeeff8..517da8fb6930 100644
--- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dlg_InsertTrendline.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -55,7 +55,6 @@ public:
     void adjustSize();
 
 private:
-    void Reset();
     const SfxItemSet & rInAttrs;
 
     OKButton          aBtnOK;
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 7999de0d5ea1..3eee59149103 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dlg_ObjectProperties.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.11.42.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -53,12 +53,10 @@ public:
 
     bool HasGeometryProperties() const;
     bool HasStatisticProperties() const;
-    bool HasRegressionProperties() const;
     bool ProvidesSecondaryYAxis() const;
     bool ProvidesOverlapAndGapWidth() const;
     bool ProvidesBarConnectors() const;
     bool HasAreaProperties() const;
-    bool HasLineProperties() const;
     bool HasSymbolProperties() const;
     bool HasScaleProperties() const;
     bool CanAxisLabelsBeStaggered() const;
@@ -78,12 +76,10 @@ private:
 
     bool m_bHasGeometryProperties;
     bool m_bHasStatisticProperties;
-    bool m_bHasRegressionProperties;
     bool m_bProvidesSecondaryYAxis;
     bool m_bProvidesOverlapAndGapWidth;
     bool m_bProvidesBarConnectors;
     bool m_bHasAreaProperties;
-    bool m_bHasLineProperties;
     bool m_bHasSymbolProperties;
     bool m_bHasScaleProperties;
     bool m_bCanAxisLabelsBeStaggered;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index cf9209ed3df5..f827b7893cf6 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AxisItemConverter.cxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -111,7 +111,7 @@ AxisItemConverter::AxisItemConverter(
                                  xNamedPropertyContainerFactory,
                                  GraphicPropertyItemConverter::LINE_PROPERTIES ));
     m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
-                                                                 C2U( "ReferenceDiagramSize" ) ));
+                                                                 C2U( "ReferencePageSize" ) ));
 
     m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) );
     OSL_ASSERT( m_xAxis.is());
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 0ef301f5b6bb..4593230d65cc 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataPointItemConverter.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -244,7 +244,7 @@ DataPointItemConverter::DataPointItemConverter(
     m_aConverters.push_back( new GraphicPropertyItemConverter(
                                  rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, eMapTo ));
     m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
-                                                                 C2U( "ReferenceDiagramSize" )));
+                                                                 C2U( "ReferencePageSize" )));
     if( bDataSeries )
     {
         m_aConverters.push_back( new StatisticsItemConverter( xChartModel, rPropertySet, rItemPool ));
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 52c250b03d4f..593b523316e3 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: GraphicPropertyItemConverter.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -291,29 +291,6 @@ void GraphicPropertyItemConverter::FillSpecialItem(
         }
         break;
 
-//         case XATTR_FILLBMP_POS:
-//         case XATTR_FILLBMP_SIZEX:
-//         case XATTR_FILLBMP_SIZEY:
-//         case XATTR_FILLBMP_SIZELOG:
-//         case XATTR_FILLBMP_TILEOFFSETX:
-//         case XATTR_FILLBMP_TILEOFFSETY:
-//         case XATTR_FILLBMP_STRETCH:
-//         case XATTR_FILLBMP_POSOFFSETX:
-//         case XATTR_FILLBMP_POSOFFSETY:
-//             if( lcl_supportsFillProperties( m_eGraphicObjectType ))
-//             {
-                // avoid assertions while bitmap stuff is not working
-//             try
-//             {
-//                 FillBitmapItem( nWhichId, rOutItemSet );
-//             }
-//             catch( beans::UnknownPropertyException ex )
-//             {
-//                 ASSERT_EXCEPTION( ex );
-//             }
-//             }
-//             break;
-
         case XATTR_FILLFLOATTRANSPARENCE:
             try
             {
@@ -544,30 +521,6 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
             }
             break;
 
-//         case XATTR_FILLBMP_POS:
-//         case XATTR_FILLBMP_SIZEX:
-//         case XATTR_FILLBMP_SIZEY:
-//         case XATTR_FILLBMP_SIZELOG:
-//         case XATTR_FILLBMP_TILEOFFSETX:
-//         case XATTR_FILLBMP_TILEOFFSETY:
-//         case XATTR_FILLBMP_STRETCH:
-//         case XATTR_FILLBMP_POSOFFSETX:
-//         case XATTR_FILLBMP_POSOFFSETY:
-//             if( lcl_supportsFillProperties( m_eGraphicObjectType ))
-//             {
-            // avoid assertions while bitmap stuff is not working
-//             try
-//             {
-//                 ApplyBitmapItem( nWhichId, rItemSet );
-//                 bChanged = true;
-//             }
-//             catch( beans::UnknownPropertyException ex )
-//             {
-//                 ASSERT_EXCEPTION( ex );
-//             }
-//             }
-//             break;
-
         case XATTR_FILLFLOATTRANSPARENCE:
             try
             {
@@ -858,132 +811,5 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
     return bChanged;
 }
 
-void GraphicPropertyItemConverter::FillBitmapItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( beans::UnknownPropertyException )
-{
-    uno::Reference< beans::XPropertySet > xProp( GetPropertySet() );
-    OSL_ASSERT( xProp.is());
-    chart2::FillBitmap aBitmap;
-    ( xProp->getPropertyValue( C2U( "Bitmap" ))) >>= aBitmap;
-
-    switch( nWhichId )
-    {
-        // bitmap property
-        case XATTR_FILLBITMAP:
-        {
-            XFillBitmapItem aBmpIt;
-            aBmpIt.PutValue( uno::makeAny( aBitmap.aURL ), MID_GRAFURL );
-            rOutItemSet.Put( aBmpIt );
-        }
-        break;
-
-        case XATTR_FILLBMP_TILE:
-            rOutItemSet.Put( XFillBmpTileItem(
-                                 aBitmap.aBitmapMode == drawing::BitmapMode_REPEAT ));
-            rOutItemSet.Put( XFillBmpStretchItem( FALSE ));
-            break;
-        case XATTR_FILLBMP_STRETCH:
-            rOutItemSet.Put( XFillBmpStretchItem(
-                                 aBitmap.aBitmapMode == drawing::BitmapMode_STRETCH ));
-            rOutItemSet.Put( XFillBmpTileItem( FALSE ));
-            break;
-        case XATTR_FILLBMP_POS:
-            break;
-        case XATTR_FILLBMP_SIZEX:
-            break;
-        case XATTR_FILLBMP_SIZEY:
-            break;
-        case XATTR_FILLBMP_SIZELOG:
-            break;
-        case XATTR_FILLBMP_TILEOFFSETX:
-            break;
-        case XATTR_FILLBMP_TILEOFFSETY:
-            break;
-        case XATTR_FILLBMP_POSOFFSETX:
-            break;
-        case XATTR_FILLBMP_POSOFFSETY:
-            break;
-    }
-}
-
-void GraphicPropertyItemConverter::ApplyBitmapItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
-    throw( beans::UnknownPropertyException )
-{
-    static const ::rtl::OUString aBitmapPropName(
-        RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ));
-    uno::Reference< beans::XPropertySet > xProp( GetPropertySet() );
-    OSL_ASSERT( xProp.is());
-    chart2::FillBitmap aBitmap;
-    uno::Any aValue;
-
-    try
-    {
-        ( xProp->getPropertyValue( aBitmapPropName )) >>= aBitmap;
-
-        switch( nWhichId )
-        {
-            // bitmap property
-            case XATTR_FILLBITMAP:
-            {
-                const XFillBitmapItem & rBitmapItem =
-                    static_cast< const XFillBitmapItem & >(
-                        rItemSet.Get( nWhichId ));
-                rBitmapItem.QueryValue( aValue, MID_GRAFURL );
-                aValue >>= aBitmap.aURL;
-
-                // must remember bitmap, so that URL stays valid
-                //ToDo: Never deleted yet !!!
-//                 GraphicObject * pTESTING_CACHE = new GraphicObject(
-//                     rBitmapItem.GetValue().GetGraphicObject() );
-            }
-            break;
-
-            case XATTR_FILLBMP_TILE:
-            case XATTR_FILLBMP_STRETCH:
-            {
-                const XFillBmpStretchItem & rStretchItem =
-                    static_cast< const XFillBmpStretchItem & >(
-                        rItemSet.Get( XATTR_FILLBMP_STRETCH ));
-                const XFillBmpTileItem & rTileItem =
-                    static_cast< const XFillBmpTileItem & >(
-                        rItemSet.Get( XATTR_FILLBMP_TILE ));
-
-                if( rTileItem.GetValue() != FALSE )
-                    aBitmap.aBitmapMode = drawing::BitmapMode_REPEAT;
-                else if( rStretchItem.GetValue() != FALSE )
-                    aBitmap.aBitmapMode = drawing::BitmapMode_STRETCH;
-                else
-                    aBitmap.aBitmapMode = drawing::BitmapMode_NO_REPEAT;
-            }
-            break;
-
-            case XATTR_FILLBMP_POS:
-                break;
-            case XATTR_FILLBMP_SIZEX:
-                break;
-            case XATTR_FILLBMP_SIZEY:
-                break;
-            case XATTR_FILLBMP_SIZELOG:
-                break;
-            case XATTR_FILLBMP_TILEOFFSETX:
-                break;
-            case XATTR_FILLBMP_TILEOFFSETY:
-                break;
-            case XATTR_FILLBMP_POSOFFSETX:
-                break;
-            case XATTR_FILLBMP_POSOFFSETY:
-                break;
-        }
-
-        xProp->setPropertyValue( aBitmapPropName, uno::makeAny( aBitmap ));
-    }
-    catch( beans::UnknownPropertyException ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-}
-
 } //  namespace wrapper
 } //  namespace chart
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 6421429ef34c..e0a7b20bfa6f 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ItemConverter.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -88,11 +88,6 @@ SfxItemSet ItemConverter::CreateEmptyItemSet() const
     return SfxItemSet( GetItemPool(), GetWhichPairs() );
 }
 
-bool ItemConverter::IsValid() const
-{
-    return m_bIsValid;
-}
-
 uno::Reference< beans::XPropertySet > ItemConverter::GetPropertySet() const
 {
     return m_xPropertySet;
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 2303782263d9..8368e76baa82 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartController.cxx,v $
- * $Revision: 1.30 $
+ * $Revision: 1.30.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1050,11 +1050,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
     else if(aCommand.equals("Cut"))
         this->executeDispatch_Cut();
     else if(aCommand.equals("DataRanges"))
-    {
-        //only test:
-//         this->executeDispatch_ObjectToDefault();
         this->executeDispatch_SourceData();
-    }
     //----------------------------------
     else if(aCommand.equals("Update")) //Update Chart
     {
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index d36325675fae..0b81df0a2367 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartController.hxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.12.44.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -584,7 +584,6 @@ private:
     //private methods
 
     sal_Bool            impl_isDisposedOrSuspended() const;
-    ::com::sun::star::awt::Size impl_getDiagramSize( sal_Int32 nDiaIndex = 0 ) const;
     ::std::auto_ptr< ReferenceSizeProvider > impl_createReferenceSizeProvider() const;
     void                impl_adaptDataSeriesAutoResize();
 
@@ -597,7 +596,6 @@ private:
     void SAL_CALL       executeDlg_ObjectProperties( const ::rtl::OUString& rObjectCID );
 
     void SAL_CALL       executeDispatch_ChartType();
-    void SAL_CALL       executeDispatch_ObjectToDefault();
 
     void SAL_CALL       executeDispatch_InsertTitle();
     void SAL_CALL       executeDispatch_InsertLegend();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 7afa5fb32543..d847965b6022 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartController_Insert.cxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,7 +45,6 @@
 #include "AxisHelper.hxx"
 #include "TitleHelper.hxx"
 #include "DiagramHelper.hxx"
-#include "ContextHelper.hxx"
 #include "macros.hxx"
 #include "chartview/DrawModelWrapper.hxx"
 #include "chartview/NumberFormatterWrapper.hxx"
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index aa1a3bdc8e51..3b5b3d6fa7ba 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartController_Properties.cxx,v $
- * $Revision: 1.33 $
+ * $Revision: 1.33.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,10 +67,6 @@
 //for auto_ptr
 #include <memory>
 
-// for test in executeDispatch_ObjectToDefault
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
 // for SolarMutex
@@ -167,7 +163,7 @@ namespace
             {
                 ::std::auto_ptr< awt::Size > pRefSize;
                 if( pRefSizeProvider.get() )
-                    pRefSize.reset( new awt::Size( pRefSizeProvider->getDiagramSize()));
+                    pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
 
                 uno::Reference< beans::XPropertySet > xDiaProp;
                 xDiaProp.set( ChartModelHelper::findDiagram( xChartModel ), uno::UNO_QUERY );
@@ -200,7 +196,7 @@ namespace
             {
                 ::std::auto_ptr< awt::Size > pRefSize;
                 if( pRefSizeProvider.get() )
-                    pRefSize.reset( new awt::Size( pRefSizeProvider->getDiagramSize()));
+                    pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
 
                 wrapper::GraphicPropertyItemConverter::eGraphicObjectType eMapTo =
                     wrapper::GraphicPropertyItemConverter::FILLED_DATA_POINT;
@@ -323,7 +319,7 @@ namespace
             {
                 ::std::auto_ptr< awt::Size > pRefSize;
                 if( pRefSizeProvider.get() )
-                    pRefSize.reset( new awt::Size( pRefSizeProvider->getDiagramSize()));
+                    pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
 
                 pItemConverter =  new wrapper::AllAxisItemConverter( xChartModel, rDrawModel.GetItemPool(),
                                                                      rDrawModel, uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ), pRefSize );
@@ -663,50 +659,6 @@ void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUStrin
     }
 }
 
-void SAL_CALL ChartController::executeDispatch_ObjectToDefault()
-{
-    ::rtl::OUString aObjectCID(m_aSelection.getSelectedCID());
-    if( !aObjectCID.getLength() )
-    {
-        DBG_ERROR("nothing is selected");
-        return;
-    }
-
-    try
-    {
-        //-------------------------------------------------------------
-        //get type of selected object
-        ObjectType eObjectType = ObjectIdentifier::getObjectType( aObjectCID );
-        if( OBJECTTYPE_UNKNOWN==eObjectType )
-        {
-            DBG_ERROR("unknown ObjectType");
-            return;
-        }
-        //-------------------------------------------------------------
-        //get properties of selected object
-        uno::Reference< beans::XPropertySet > xObjectProperties = NULL;
-        xObjectProperties = ObjectIdentifier::getObjectPropertySet( aObjectCID, getModel() );
-        if(!xObjectProperties.is())
-            return;
-
-        uno::Sequence< beans::Property > aProps( xObjectProperties->getPropertySetInfo()->getProperties() );
-        uno::Reference< beans::XPropertyState > xState( xObjectProperties, uno::UNO_QUERY );
-
-        if( xState.is() )
-        {
-            for( sal_Int32 i = 0; i < aProps.getLength(); ++i )
-            {
-                if( aProps[i].Attributes & beans::PropertyAttribute::MAYBEDEFAULT )
-                    xState->setPropertyToDefault( aProps[i].Name );
-            }
-        }
-    }
-    catch( uno::Exception& e )
-    {
-        ASSERT_EXCEPTION( e );
-    }
-}
-
 void SAL_CALL ChartController::executeDispatch_View3D()
 {
     try
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 501f9c7cd92f..5db316196e1d 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartController_Tools.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.36.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -233,42 +233,12 @@ void lcl_InsertStringAsTextShapeIntoDrawPage(
 namespace chart
 {
 
-awt::Size ChartController::impl_getDiagramSize( sal_Int32 nDiaIndex ) const
-{
-   awt::Size aResult;
-
-    try
-    {
-        ExplicitValueProvider * pValueProvider(
-        ExplicitValueProvider::getExplicitValueProvider( m_xChartView ));
-        if( pValueProvider )
-        {
-            awt::Rectangle aRect( pValueProvider->getRectangleOfObject( ObjectIdentifier::createClassifiedIdentifier(
-                OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32( nDiaIndex )))));
-            aResult.Width = aRect.Width;
-            aResult.Height = aRect.Height;
-        }
-        else
-        {
-            // fallback: page size
-            aResult = ChartModelHelper::getPageSize( m_aModel->getModel() );
-        }
-    }
-    catch( const uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-
-    return aResult;
-}
-
 ::std::auto_ptr< ReferenceSizeProvider > ChartController::impl_createReferenceSizeProvider() const
 {
     awt::Size aPageSize( ChartModelHelper::getPageSize( m_aModel->getModel()) );
 
     return ::std::auto_ptr< ReferenceSizeProvider >(
-        new ReferenceSizeProvider(
-            aPageSize, impl_getDiagramSize(),
+        new ReferenceSizeProvider( aPageSize,
             Reference< chart2::XChartDocument >( m_aModel->getModel(), uno::UNO_QUERY )));
 }
 
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index ef3c5678c795..ce6db7db7bef 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartController_Window.cxx,v $
- * $Revision: 1.32 $
+ * $Revision: 1.31.24.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1328,16 +1328,14 @@ bool ChartController::impl_moveOrResizeObject(
             if( bNeedResize )
                 eActionType = ActionDescriptionProvider::RESIZE;
 
-            UndoGuard aUndoGuard(
-                ActionDescriptionProvider::createDescription(
-                    eActionType,
-                    ObjectNameProvider::getName( ObjectIdentifier::getObjectType( rCID ))),
-                m_xUndoManager, xChartModel );
+            ObjectType eObjectType = ObjectIdentifier::getObjectType( rCID );
+            UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
+                    eActionType, ObjectNameProvider::getName( eObjectType )), m_xUndoManager, xChartModel );
             {
                 ControllerLockGuard aCLGuard( xChartModel );
                 if( bNeedShift )
                     xObjProp->setPropertyValue( C2U("RelativePosition"), uno::makeAny( aRelPos ));
-                if( bNeedResize )
+                if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also set an explicat size at the diagram when an explicit position is set
                     xObjProp->setPropertyValue( C2U("RelativeSize"), uno::makeAny( aRelSize ));
             }
             aUndoGuard.commitAction();
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 223dc701a984..4dcf766c7d7e 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: CachedDataSequence.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -107,24 +107,6 @@ public:
 
     virtual ~CachedDataSequence();
 
-    /** optimizes internal storage such that getData() is the fastest method for
-        retrieving data.
-    */
-    void PreferMixedData();
-    /** optimizes internal storage such that getNumericalData() is the fastest
-        method for retrieving data.
-     */
-    void PreferNumericalData();
-    /** optimizes internal storage such that getTextualData() is the fastest
-        method for retrieving data.
-     */
-    void PreferTextualData();
-
-    /** Allows setting the source-identifier.  This should only be called once.
-        (Late initialization)
-     */
-//     void SetSourceIdentifier( const ::rtl::OUString & aId );
-
     /// establish methods for factory instatiation
     APPHELPER_SERVICE_FACTORY_HELPER( CachedDataSequence )
     /// declare XServiceInfo methods
@@ -181,8 +163,6 @@ protected:
     virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments)
         throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception);
 
-    void fireModifyEvent();
-
     // <properties>
     sal_Int32                                       m_nNumberFormatKey;
     ::rtl::OUString                                 m_sRole;
@@ -202,28 +182,16 @@ protected:
      */
     void registerProperties();
 
-    /** is used by interface method getNumericalData() as well as
-        PreferNumericalData().
+    /** is used by interface method getNumericalData().
      */
     ::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const;
-    /** is used by interface method getTextualData() as well as
-        PreferTextualData().
+    /** is used by interface method getTextualData().
      */
     ::com::sun::star::uno::Sequence< ::rtl::OUString > Impl_getTextualData() const;
-    /** is used by interface method getData() as well as PreferMixedData().
+    /** is used by interface method getData().
      */
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Impl_getMixedData() const;
 
-    /** is used by PreferNumericalData().
-     */
-    void Impl_setNumericalData( const ::com::sun::star::uno::Sequence< double > & rSeq );
-    /** is used by PreferTextualData().
-     */
-    void Impl_setTextualData( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rSeq );
-    /** is used by PreferMixedData().
-     */
-    void Impl_setMixedData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & rSeq );
-
 private:
     enum DataType                                       m_eCurrentDataType;
 
diff --git a/chart2/source/inc/ChartDebugTrace.hxx b/chart2/source/inc/ChartDebugTrace.hxx
index 64c01a6b1e65..4c7b306410c2 100644
--- a/chart2/source/inc/ChartDebugTrace.hxx
+++ b/chart2/source/inc/ChartDebugTrace.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartDebugTrace.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,6 +40,7 @@ namespace chart
 namespace debug
 {
 
+#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
 /** Does several OSL_TRACEs that show information about the given chart document
     (e.g. the chart-type manager, diagrams etc.)
 
@@ -61,6 +62,7 @@ void ChartDebugTraceDiagram(
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XDiagram > & xDiagram,
     int nIndent = 0 );
+#endif
 
 } // namespace debug
 } //  namespace chart
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index 28ecbd313944..4ceadbc8401d 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: CommonConverters.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -83,8 +83,6 @@ com::sun::star::drawing::HomogenMatrix
 com::sun::star::drawing::HomogenMatrix3
                 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM );
 
-::basegfx::B2DHomMatrix HomogenMatrix3ToB2DHomMatrix( const com::sun::star::drawing::HomogenMatrix3& rHM );
-
 //-----------------------------------------------------------------------------
 /** Position3D -> B3DPoint
 */
@@ -96,11 +94,6 @@ com::sun::star::drawing::HomogenMatrix3
 com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector);
 
 //-----------------------------------------------------------------------------
-/** B3DVector -> Position3D
-*/
-com::sun::star::drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rVector);
-
-//-----------------------------------------------------------------------------
 /** B3DPoint -> Position3D
 */
 com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint);
@@ -111,13 +104,6 @@ com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPo
 ::basegfx::B3DPoint Direction3DToB3DPoint( const com::sun::star::drawing::Direction3D& rDirection);
 
 //-----------------------------------------------------------------------------
-/** two drawing::Position3D -> PolyPolygonShape3D
-*/
-::com::sun::star::drawing::PolyPolygonShape3D
-    MakeLine3D( const ::com::sun::star::drawing::Position3D & rStart,
-                const ::com::sun::star::drawing::Position3D & rEnd );
-
-//-----------------------------------------------------------------------------
 /** PolyPolygonShape3D + drawing::Position3D -> PolyPolygonShape3D
 */
 void AddPointToPoly( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly
@@ -144,12 +130,6 @@ com::sun::star::drawing::PolyPolygonShape3D BezierToPoly(
     const com::sun::star::drawing::PolyPolygonBezierCoords& rBezier );
 
 //-----------------------------------------------------------------------------
-/** drawing::PointSequenceSequence (2D) -> PolyPolygonShape3D
-*/
-com::sun::star::drawing::PolyPolygonShape3D PointSequenceToPoly(
-                const com::sun::star::drawing::PointSequenceSequence& rPointSequence );
-
-//-----------------------------------------------------------------------------
 /** PolyPolygonShape3D -> drawing::PointSequenceSequence (2D)
 */
 com::sun::star::drawing::PointSequenceSequence PolyToPointSequence(
@@ -162,19 +142,6 @@ void appendPointSequence( com::sun::star::drawing::PointSequenceSequence& rTarge
                         , com::sun::star::drawing::PointSequenceSequence& rAdd );
 
 //-----------------------------------------------------------------------------
-/** PolyPolygonShape3D -> Polygon (2D,integer!)
-*/
-Polygon PolyToToolsPoly(
-                const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon );
-
-//-----------------------------------------------------------------------------
-/** tools Polygon (2D,integer!) -> PolyPolygonShape3D
-*/
-com::sun::star::drawing::PolyPolygonShape3D ToolsPolyToPoly(
-                const Polygon& rToolsPoly, double zValue  );
-
-
-//-----------------------------------------------------------------------------
 /** Position3D + Direction3D == Position3D
 */
 com::sun::star::drawing::Position3D
@@ -237,11 +204,6 @@ bool            operator==( const com::sun::star::drawing::Position3D& rPos1
 ::com::sun::star::awt::Size Direction3DToAWTSize( const com::sun::star::drawing::Direction3D& rDirection );
 
 //-----------------------------------------------------------------------------
-/** Sequence<double> -> B3DPoint
-*/
-::basegfx::B3DPoint SequenceToB3DPoint( const com::sun::star::uno::Sequence< double >& rSeq );
-
-//-----------------------------------------------------------------------------
 /** B3DPoint -> Sequence<double>
 */
 com::sun::star::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint );
@@ -260,19 +222,6 @@ com::sun::star::uno::Sequence< double >
                 Position3DToSequence( const com::sun::star::drawing::Position3D& rPosition );
 
 //-----------------------------------------------------------------------------
-/** Sequence<double> -> drawing::Direction3D
-*/
-com::sun::star::drawing::Direction3D
-                SequenceToDirection3D( const com::sun::star::uno::Sequence< double >& rSeq );
-
-//-----------------------------------------------------------------------------
-/** drawing::Direction3D -> Sequence<double>
-*/
-
-com::sun::star::uno::Sequence< double >
-                Direction3DToSequence( const com::sun::star::drawing::Direction3D& rDirection );
-
-//-----------------------------------------------------------------------------
 /** drawing::Direction3D / double
 */
 
@@ -280,12 +229,6 @@ com::sun::star::drawing::Direction3D
                 operator/( const com::sun::star::drawing::Direction3D& rDirection, double f );
 
 //-----------------------------------------------------------------------------
-/** text::WritingMode2 -> text::WritingMode
-*/
-
-com::sun::star::text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWritingMode );
-
-//-----------------------------------------------------------------------------
 /** chart2::XDataSequence -> uno::Sequence< double >
 */
 
diff --git a/chart2/source/inc/ContextHelper.hxx b/chart2/source/inc/ContextHelper.hxx
index dc322eafcf62..e69de29bb2d1 100644
--- a/chart2/source/inc/ContextHelper.hxx
+++ b/chart2/source/inc/ContextHelper.hxx
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ContextHelper.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_CONTEXTHELPER_HXX
-#define CHART_CONTEXTHELPER_HXX
-
-#include <comphelper/InlineContainer.hxx>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <rtl/ustring.hxx>
-
-#include <map>
-
-namespace chart
-{
-
-namespace ContextHelper
-{
-
-typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any >
-    tContextEntryMapType;
-typedef ::comphelper::MakeMap< ::rtl::OUString, ::com::sun::star::uno::Any >
-    MakeContextEntryMap;
-
-/** creates a component context containing the properties given in the map.
-
-    @param rDelegateContext
-        delegation to further context
- */
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-    createContext( const tContextEntryMapType & rMap,
-                   const ::com::sun::star::uno::Reference<
-                       ::com::sun::star::uno::XComponentContext > & rDelegateContext =
-                   ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() );
-
-} //  namespace ContextHelper
-
-} //  namespace chart
-
-// CHART_CONTEXTHELPER_HXX
-#endif
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index ae023328fb37..262217a743e6 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataSeriesHelper.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -52,11 +52,6 @@ namespace DataSeriesHelper
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence );
 
-void SetRole(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence,
-        const ::rtl::OUString& rRole );
-
 /** Retrieves the data sequence in the given data source that matches the
     given role.  If more than one sequences match the role, the first match
     is returned.  If no sequence matches, an empty reference is returned.
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index f906c6db562b..555bbad847c4 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataSource.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -55,17 +55,6 @@ public:
         const ::com::sun::star::uno::Sequence<
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XLabeledDataSequence > > & rSequences );
-    explicit DataSource(
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSequence > > & rSequences );
-    explicit DataSource(
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSequence > > & rSequences,
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSequence > > & rLabel );
 
     virtual ~DataSource();
 
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index cc6a4ff31ede..289628efcecc 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataSourceHelper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -133,13 +133,6 @@ public:
         static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromDataSource(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XDataSource > & xSource );
-
-        static bool migrateData(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartDocument > & xChartDoc,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataProvider > & xNewDataProvider );
-
 };
 
 //.............................................................................
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 7fc3fb2edbbf..95aa249e84c9 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DiagramHelper.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.9.22.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -191,14 +191,6 @@ public:
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XDataSeries >& xSeries );
 
-    static ::com::sun::star::uno::Reference<
-    ::com::sun::star::chart2::XCoordinateSystem >
-        getCoordinateSystemOfChartType(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram >& xDiagram,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartType >& xChartType );
-
     static ::std::vector<
             ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XDataSeries > >
@@ -308,12 +300,6 @@ public:
           ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries,
                 bool bForward );
 
-    static sal_Int32 getIndexOfSeriesWithinChartType(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDataSeries >& xDataSeries,
-               const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XChartType >& xChartType );
-
     static bool isSupportingFloorAndWall( const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XDiagram > & xDiagram );
 
diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx b/chart2/source/inc/FastPropertyIdRanges.hxx
index af8ed49beb14..4dd7ed7febe5 100644
--- a/chart2/source/inc/FastPropertyIdRanges.hxx
+++ b/chart2/source/inc/FastPropertyIdRanges.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: FastPropertyIdRanges.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,7 +49,9 @@ enum FastPropertyIdRanges
     FAST_PROPERTY_ID_START_CHART_SYMBOL_PROP = FAST_PROPERTY_ID_START + 13000,
     FAST_PROPERTY_ID_START_CHART_DATACAPTION_PROP = FAST_PROPERTY_ID_START + 14000,
     FAST_PROPERTY_ID_START_CHART_SPLINE_PROP = FAST_PROPERTY_ID_START + 15000,
-    FAST_PROPERTY_ID_START_CHART_STOCK_PROP = FAST_PROPERTY_ID_START + 16000
+    FAST_PROPERTY_ID_START_CHART_STOCK_PROP = FAST_PROPERTY_ID_START + 16000,
+    FAST_PROPERTY_ID_START_CHART_AUTOPOSITION_PROP = FAST_PROPERTY_ID_START + 17000,
+    FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index 6ad99d1b5663..3eba45bd2df9 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: LabeledDataSequence.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -104,8 +104,6 @@ protected:
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
         throw (::com::sun::star::uno::RuntimeException);
 
-    void fireModifyEvent();
-
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xData;
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xLabel;
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 2fd0997b26fa..4b8698fc7fc4 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: MediaDescriptorHelper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -63,8 +63,6 @@ public:
     virtual ~MediaDescriptorHelper();
 
     ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue > getAll();
-    ::com::sun::star::uno::Sequence<
                 ::com::sun::star::beans::PropertyValue > getReducedForModel();
 
 public:
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index fe49052ae2a4..f5dbb370560b 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ModifyListenerHelper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -126,36 +126,6 @@ private:
 
 // ================================================================================
 
-class ModifyListenerOnDemmandRefresh :
-        public ::cppu::WeakImplHelper1<
-        ::com::sun::star::util::XModifyListener >
-{
-public:
-    explicit ModifyListenerOnDemmandRefresh( ::osl::Mutex & rMutex );
-
-    void listenAtDocument( const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::chart2::XChartDocument > & xChartDoc );
-
-    void update();
-    bool needsUpdate() const;
-
-    // ____ XModifyListener ____
-    virtual void SAL_CALL modified(
-        const ::com::sun::star::lang::EventObject& aEvent )
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // ____ XEventListener (base of XModifyListener) ____
-    virtual void SAL_CALL disposing(
-        const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException);
-
-private:
-    ::osl::Mutex & m_rMutex;
-    bool m_bNeedsUpdate;
-};
-
-// ================================================================================
-
 namespace impl
 {
 
diff --git a/chart2/source/inc/OEnumeration.hxx b/chart2/source/inc/OEnumeration.hxx
index 2ae7b42e2a43..e69de29bb2d1 100644
--- a/chart2/source/inc/OEnumeration.hxx
+++ b/chart2/source/inc/OEnumeration.hxx
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OEnumeration.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_OENUMERATION_HXX
-#define CHART_OENUMERATION_HXX
-
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/container/XEnumeration.hpp>
-
-#include <vector>
-
-namespace comphelper
-{
-
-class OEnumeration :
-        public ::cppu::WeakImplHelper1<
-    ::com::sun::star::container::XEnumeration >
-{
-public:
-    OEnumeration( const ::std::vector< ::com::sun::star::uno::Any > & rContainer );
-    virtual ~OEnumeration();
-
-protected:
-    // ____ XEnumeration ____
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
-        throw (::com::sun::star::container::NoSuchElementException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException);
-
-private:
-    ::std::vector< ::com::sun::star::uno::Any > m_aContainer;
-    ::std::vector< ::com::sun::star::uno::Any >::const_iterator m_aIter;
-};
-
-} //  namespace comphelper
-
-// CHART_OENUMERATION_HXX
-#endif
diff --git a/chart2/source/inc/OIndexContainer.hxx b/chart2/source/inc/OIndexContainer.hxx
index 60fc2bc273f3..e69de29bb2d1 100644
--- a/chart2/source/inc/OIndexContainer.hxx
+++ b/chart2/source/inc/OIndexContainer.hxx
@@ -1,110 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OIndexContainer.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_OINDEXCONTAINER_HXX
-#define CHART_OINDEXCONTAINER_HXX
-
-#include <cppuhelper/implbase1.hxx>
-#include <osl/mutex.hxx>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-
-#include <vector>
-
-namespace comphelper
-{
-
-class OIndexContainer :
-        public ::com::sun::star::container::XIndexContainer
-{
-public:
-    explicit OIndexContainer( ::osl::Mutex & rMutex );
-    virtual ~OIndexContainer();
-
-    ::osl::Mutex & GetMutex();
-
-    // ____ XInterface ____
-    virtual ::com::sun::star::uno::Any SAL_CALL
-        queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw (::com::sun::star::uno::RuntimeException);
-
-protected:
-    /// implemented as a standard-library vector
-    typedef ::std::vector< ::com::sun::star::uno::Any > tHelperContainerType;
-
-    /// allows direct standard-library access to the container
-    tHelperContainerType      m_aContainer;
-
-    // you have to implement this in derived classes
-    // ____ XElementAccess ____
-//     virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
-//         throw (::com::sun::star::uno::RuntimeException) = 0;
-
-    // implemented by this class
-    // =========================
-
-    // ____ XIndexContainer ____
-    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-        throw (::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException);
-
-    // ____ XIndexReplace ____
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException);
-
-    // ____ XIndexAccess ____
-    virtual sal_Int32 SAL_CALL getCount()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-        throw (::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException);
-
-    // ____ XElementAccess ____
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (::com::sun::star::uno::RuntimeException);
-
-private:
-    ::osl::Mutex &  m_rMutex;
-};
-
-} //  namespace comphelper
-
-// CHART_OINDEXCONTAINER_HXX
-#endif
diff --git a/chart2/source/inc/OStyle.hxx b/chart2/source/inc/OStyle.hxx
index c1bb32f7ca44..e69de29bb2d1 100644
--- a/chart2/source/inc/OStyle.hxx
+++ b/chart2/source/inc/OStyle.hxx
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OStyle.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_OSTYLE_HXX
-#define CHART_OSTYLE_HXX
-
-#include "OPropertySet.hxx"
-#include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-
-namespace property
-{
-
-class OStyle :
-        public OPropertySet,
-        public ::com::sun::star::style::XStyle
-{
-public:
-    OStyle( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XNameAccess > &xStyleFamily,
-            ::osl::Mutex & rMutex );
-    virtual ~OStyle();
-
-    ::osl::Mutex & GetMutex();
-
-//  inline SAL_CALL operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > () throw ()
-//     { return static_cast< ::cppu::OWeakObject * >( this ); }
-
-protected:
-
-    // ____ XStyle ____
-    virtual sal_Bool SAL_CALL isUserDefined()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isInUse()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getParentStyle()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle )
-        throw (::com::sun::star::container::NoSuchElementException,
-               ::com::sun::star::uno::RuntimeException);
-
-    // ____ XNamed (base of XStyle) ____
-    virtual ::rtl::OUString SAL_CALL getName()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setName( const ::rtl::OUString& aName )
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // necessary overloads from OPropertySet
-
-    // ____ XInterface ____
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw (::com::sun::star::uno::RuntimeException);
-//     virtual void SAL_CALL acquire() throw ();
-//     virtual void SAL_CALL release() throw ();
-
-    // ____ XServiceInfo ____
-//     virtual ::rtl::OUString SAL_CALL
-//         getImplementationName()
-//         throw (::com::sun::star::uno::RuntimeException);
-//     virtual sal_Bool SAL_CALL
-//         supportsService( const ::rtl::OUString& ServiceName )
-//         throw (::com::sun::star::uno::RuntimeException);
-//     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-//         getSupportedServiceNames()
-//         throw (::com::sun::star::uno::RuntimeException);
-
-    // ____ XTypeProvider ____
-//     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
-//         getTypes()
-//         throw (::com::sun::star::uno::RuntimeException);
-//     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
-//         getImplementationId()
-//         throw (::com::sun::star::uno::RuntimeException);
-
-private:
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameAccess > m_xStyleFamily;
-
-    ::rtl::OUString    m_aName;
-    ::rtl::OUString    m_aParentStyleName;
-    sal_Bool           m_bUserDefined;
-
-    ::osl::Mutex &     m_rMutex;
-};
-
-} //  namespace property
-
-// CHART_OSTYLE_HXX
-#endif
-
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index dc90d58e914b..a5dc0429297c 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ObjectIdentifier.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -101,8 +101,6 @@ class ObjectIdentifier
     //where Type: getStringForType( ObjectType eType ) or other string
 
 public:
-    ObjectIdentifier();
-
     static rtl::OUString createClassifiedIdentifierForObject(
           const ::com::sun::star::uno::Reference<
                     ::com::sun::star::uno::XInterface >& xObject
@@ -144,12 +142,6 @@ public:
         , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
 
-    static rtl::OUString createParticleForChartType(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XChartType >& xChartType
-        , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
-
     static rtl::OUString createParticleForAxis(
                       sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
 
diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx
index 54456c11fb64..4951743c3b61 100644
--- a/chart2/source/inc/ReferenceSizeProvider.hxx
+++ b/chart2/source/inc/ReferenceSizeProvider.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ReferenceSizeProvider.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -57,20 +57,12 @@ public:
         AUTO_RESIZE_UNKNOWN
     };
 
-    enum ReferenceSizeType
-    {
-        REF_PAGE,
-        REF_DIAGRAM
-    };
-
     ReferenceSizeProvider(
         ::com::sun::star::awt::Size aPageSize,
-        ::com::sun::star::awt::Size aDiagramSize,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartDocument > & xChartDoc );
 
     ::com::sun::star::awt::Size getPageSize() const;
-    ::com::sun::star::awt::Size getDiagramSize() const;
     bool useAutoScale() const;
 
     /** Retrieves the state auto-resize from all objects that support this
@@ -102,17 +94,13 @@ public:
     */
     void setAutoResizeState( AutoResizeState eNewState );
 
-
-
     /** Sets the ReferencePageSize according to the internal settings of this
         class at the XPropertySet, and the adapted font sizes if bAdaptFontSizes
-        is </TRUE>.  The type determines whether the diagram or the page is used
-        for reference.
+        is </TRUE>.
      */
     void setValuesAtPropertySet(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & xProp,
-        ReferenceSizeType eType,
         bool bAdaptFontSizes = true );
 
     /** Sets the ReferencePageSize according to the internal settings of this
@@ -125,8 +113,7 @@ public:
 
     /** Sets the internal value at all data series in the currently set model.
         This is useful, if you have changed a chart-type and thus probably added
-        some new data series via model functionality (which does not know the
-        diagram size).
+        some new data series via model functionality.
      */
     void setValuesAtAllDataSeries();
 
@@ -140,7 +127,6 @@ public:
     static void getAutoResizeFromPropSet(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & xProp,
-        ReferenceSizeType eType,
         AutoResizeState & rInOutState );
 
     /** calls getAutoResizeFromPropSet with the title's property set
@@ -160,7 +146,6 @@ private:
         AutoResizeState & rInOutState );
 
     ::com::sun::star::awt::Size m_aPageSize;
-    ::com::sun::star::awt::Size m_aDiagramSize;
     ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartDocument > m_xChartDoc;
     bool      m_bUseAutoScale;
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index 79c0a0c07fd9..73317572236c 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: RegressionCurveHelper.hxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -165,11 +165,6 @@ public:
 
     // ------------------------------------------------------------
 
-    /// returns a calculator object for mean-value lines (used by the view)
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XRegressionCurveCalculator >
-        createMeanValueLineCalculator();
-
     /// returns a calculator object for regression curves (used by the view)
     static ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XRegressionCurveCalculator >
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx
index ef47fa422c86..936e6e4ab4cf 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: WeakListenerAdapter.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -98,8 +98,6 @@ class WeakModifyListenerAdapter :
 {
 public:
     explicit WeakModifyListenerAdapter(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > & xListener );
-    explicit WeakModifyListenerAdapter(
         const ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > & xListener );
     virtual ~WeakModifyListenerAdapter();
 
@@ -117,8 +115,6 @@ class WeakSelectionChangeListenerAdapter :
 public:
     explicit WeakSelectionChangeListenerAdapter(
         const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener );
-    explicit WeakSelectionChangeListenerAdapter(
-        const ::com::sun::star::uno::WeakReference< ::com::sun::star::view::XSelectionChangeListener > & xListener );
     virtual ~WeakSelectionChangeListenerAdapter();
 
 protected:
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 23ddca726e0d..9e933a099109 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: macros.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,7 +47,7 @@
     ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr())
 #else
 //avoid compilation warnings
-#define ASSERT_EXCEPTION(ex) (void)(ex);
+#define ASSERT_EXCEPTION(ex) (void)(ex)
 #endif
 
 #define U2C(ouString) (::rtl::OUStringToOString(ouString,RTL_TEXTENCODING_ASCII_US).getStr())
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index f499d0ec1f27..e25cb92d4012 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: XMLFilter.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,7 +33,6 @@
 
 #include "XMLFilter.hxx"
 #include "macros.hxx"
-#include "ContextHelper.hxx"
 #include "MediaDescriptorHelper.hxx"
 #include "ContainerHelper.hxx"
 #include <comphelper/mediadescriptor.hxx>
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 5595606a8557..08e30b1ef561 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Axis.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -160,7 +160,7 @@ void lcl_AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "ReferenceDiagramSize" ),
+        Property( C2U( "ReferencePageSize" ),
                   PROP_AXIS_REFERENCE_DIAGRAM_SIZE,
                   ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
                   beans::PropertyAttribute::BOUND
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 7d3c7396874e..49551bf78c7c 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartModel.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.8.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -81,46 +81,6 @@ const OUString lcl_aGDIMetaFileMIMEType(
 const OUString lcl_aGDIMetaFileMIMETypeHighContrast(
     RTL_CONSTASCII_USTRINGPARAM("application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\""));
 
-Reference< chart2::data::XDataProvider > lcl_getDataProviderFromParent(
-    const Reference< frame::XModel > & xParent )
-{
-    Reference< chart2::data::XDataProvider > xResult;
-    const OUString aDataProviderServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider"));
-    Reference< lang::XMultiServiceFactory > xFact( xParent, uno::UNO_QUERY );
-    if( xFact.is())
-    {
-        uno::Sequence< OUString > aServiceNames( xFact->getAvailableServiceNames());
-        const OUString * pBegin = aServiceNames.getConstArray();
-        const OUString * pEnd = pBegin + aServiceNames.getLength();
-        if( ::std::find( pBegin, pEnd, aDataProviderServiceName ) != pEnd )
-        {
-            xResult.set(
-                xFact->createInstance( aDataProviderServiceName ), uno::UNO_QUERY );
-        }
-    }
-    return xResult;
-}
-
-bool lcl_ParentIsTempDocument(
-    const Reference< uno::XInterface > & xParent )
-{
-    bool bResult = false;
-    try
-    {
-        Reference< beans::XPropertySet > xDocProp( xParent, uno::UNO_QUERY );
-        if( xDocProp.is())
-            xDocProp->getPropertyValue( C2U("InternalDocument")) >>= bResult;
-    }
-    catch( const beans::UnknownPropertyException & )
-    {}
-    catch( const uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-
-    return bResult;
-}
-
 } // anonymous namespace
 
 //-----------------------------------------------------------------
@@ -664,108 +624,6 @@ uno::Reference< document::XDocumentProperties > SAL_CALL
     return m_xDocumentProperties;
 }
 
-/*
-//-----------------------------------------------------------------
-// view::XPrintable (optional interface)
-//-----------------------------------------------------------------
-        uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel
-::getPrinter() throw(uno::RuntimeException)
-{
-    //@todo  guard
-    return m_aPrinterOptions;
-}
-
-        void SAL_CALL ChartModel
-::setPrinter( const uno::Sequence< beans::PropertyValue >& rPrinter )
-        throw(lang::IllegalArgumentException, uno::RuntimeException)
-{
-    //@todo  guard
-    m_aPrinterOptions = rPrinter;
-}
-
-        void SAL_CALL ChartModel
-::print( const uno::Sequence< beans::PropertyValue >& rOptions )
-        throw(lang::IllegalArgumentException, uno::RuntimeException)
-{
-    //@todo
-}
-
-//-----------------------------------------------------------------
-// document::XEventBroadcaster (optional interface)
-//-----------------------------------------------------------------
-
-        void SAL_CALL ChartModel
-::addEventListener( const uno::Reference< document::XEventListener >& xListener )
-        throw(uno::RuntimeException)
-{
-    //@todo
-}
-
-        void SAL_CALL ChartModel
-::removeEventListener( const uno::Reference< document::XEventListener >& xListener )
-        throw(uno::RuntimeException)
-{
-    //@todo
-}
-
-//-----------------------------------------------------------------
-// document::XEventsSupplier (optional interface)
-//-----------------------------------------------------------------
-
-        uno::Reference< container::XNameReplace > SAL_CALL ChartModel
-::getEvents() throw(uno::RuntimeException)
-{
-    //@todo
-}
-
-//-----------------------------------------------------------------
-// document::XViewDataSupplier (optional interface)
-//-----------------------------------------------------------------
-
-        uno::Reference< container::XIndexAccess > SAL_CALL ChartModel
-::getViewData() throw(uno::RuntimeException)
-{
-    //@todo
-}
-
-        void SAL_CALL ChartModel
-::setViewData( const uno::Reference< container::XIndexAccess >& xData )
-        throw(uno::RuntimeException)
-{
-    //m_bModified = sal_True;//@todo? is this really correct
-    //@todo
-}
-*/
-
-//-----------------------------------------------------------------
-// ::com::sun::star::style::XStyleFamiliesSupplier
-//-----------------------------------------------------------------
-// ::com::sun::star::uno::Reference<
-//     ::com::sun::star::container::XNameAccess > SAL_CALL ChartModel
-//     ::getStyleFamilies()
-//         throw (uno::RuntimeException)
-// {
-//     OSL_ASSERT( m_pImplChartModel.get() != 0 );
-//     // /--
-//     MutexGuard aGuard( m_aModelMutex );
-//     return m_pImplChartModel->GetStyleFamilies();
-//     // \--
-// }
-
-//-----------------------------------------------------------------
-// chart2::XModelDataProvider
-//-----------------------------------------------------------------
-//         Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartModel
-// ::getDataSeries()
-//         throw (uno::RuntimeException)
-// {
-//     OSL_ASSERT( m_pImplChartModel.get() != 0 );
-//     // /--
-//     MutexGuard aGuard( m_aModelMutex );
-//     return m_pImplChartModel->GetDataSeries();
-//     // \--
-// }
-
 //-----------------------------------------------------------------
 // chart2::XChartDocument
 //-----------------------------------------------------------------
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index 339f754ec04b..bee4332a857c 100644
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartModel.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.8.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,11 +37,7 @@
 #include <com/sun/star/frame/XStorable2.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/view/XPrintable.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -97,18 +93,12 @@ typedef ::comphelper::WeakImplHelper20<
         ,::com::sun::star::frame::XStorable2    //(extension of XStorable)
 //      ,::com::sun::star::frame::XStorable     //(required interface) base of XStorable2
         ,::com::sun::star::util::XModifiable    //comprehends XModifyBroadcaster (required interface)
-//      ,::com::sun::star::view::XPrintable     //(optional interface)
-//      ,::com::sun::star::document::XEventBroadcaster      //(optional interface)
-//      ,::com::sun::star::document::XEventsSupplier        //(optional interface)
-//      ,::com::sun::star::document::XViewDataSupplier      //(optional interface)
     //  ,::com::sun::star::uno::XWeak           // implemented by WeakImplHelper(optional interface)
     //  ,::com::sun::star::uno::XInterface      // implemented by WeakImplHelper(optional interface)
     //  ,::com::sun::star::lang::XTypeProvider  // implemented by WeakImplHelper
         ,::com::sun::star::lang::XServiceInfo
-//         ,::com::sun::star::chart2::XModelDataProvider
         ,::com::sun::star::chart2::XChartDocument  // derived from XModel
         ,::com::sun::star::chart2::data::XDataReceiver   // public API
-//         ,::com::sun::star::style::XStyleFamiliesSupplier
         ,::com::sun::star::chart2::XTitled
         ,::com::sun::star::frame::XLoadable
         ,::com::sun::star::util::XCloneable
@@ -402,74 +392,6 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL
         getDocumentProperties(  ) throw (::com::sun::star::uno::RuntimeException);
 
-/*
-    //-----------------------------------------------------------------
-    // ::com::sun::star::view::XPrintable (optional interface)
-    //-----------------------------------------------------------------
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
-        getPrinter()        throw (::com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL
-        setPrinter( const ::com::sun::star::uno::Sequence<
-                            ::com::sun::star::beans::PropertyValue >& rPrinter )
-                            throw (::com::sun::star::lang::IllegalArgumentException
-                            , ::com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL
-        print( const ::com::sun::star::uno::Sequence<
-                            ::com::sun::star::beans::PropertyValue >& rOptions )
-                            throw (::com::sun::star::lang::IllegalArgumentException
-                            , ::com::sun::star::uno::RuntimeException);
-
-    //-----------------------------------------------------------------
-    // ::com::sun::star::document::XEventBroadcaster (optional interface)
-    //-----------------------------------------------------------------
-
-    virtual void SAL_CALL
-        addEventListener( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::document::XEventListener >& xListener )
-                            throw (::com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL
-        removeEventListener( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::document::XEventListener >& xListener )
-                            throw (::com::sun::star::uno::RuntimeException);
-
-    //-----------------------------------------------------------------
-    // ::com::sun::star::document::XEventsSupplier (optional interface)
-    //-----------------------------------------------------------------
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL
-        getEvents()         throw (::com::sun::star::uno::RuntimeException);
-
-    //-----------------------------------------------------------------
-    // ::com::sun::star::document::XViewDataSupplier (optional interface)
-    //-----------------------------------------------------------------
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL
-        getViewData()       throw (::com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL
-        setViewData( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::container::XIndexAccess >& xData )
-                            throw (::com::sun::star::uno::RuntimeException);
-    */
-
-    //-----------------------------------------------------------------
-    // ::com::sun::star::style::XStyleFamiliesSupplier
-    //-----------------------------------------------------------------
-//     virtual ::com::sun::star::uno::Reference<
-//             ::com::sun::star::container::XNameAccess > SAL_CALL
-//         getStyleFamilies() throw (::com::sun::star::uno::RuntimeException);
-
-    //-----------------------------------------------------------------
-    // ::com::sun::star::chart2::XModelDataProvider
-    //-----------------------------------------------------------------
-//     virtual ::com::sun::star::uno::Sequence<
-//                 ::com::sun::star::uno::Reference<
-//                     ::com::sun::star::chart2::XDataSeries > > SAL_CALL
-//         getDataSeries()    throw (::com::sun::star::uno::RuntimeException);
-
     //-----------------------------------------------------------------
     // ::com::sun::star::chart2::XChartDocument
     //-----------------------------------------------------------------
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 4f270e221725..57680c4c15e7 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataPoint.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -87,12 +87,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
 namespace chart
 {
 
-DataPoint::DataPoint() :
-        ::property::OPropertySet( m_aMutex ),
-        m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()),
-        m_bNoParentPropAllowed( false )
-{}
-
 DataPoint::DataPoint( const uno::Reference< beans::XPropertySet > & rParentProperties ) :
         ::property::OPropertySet( m_aMutex ),
         m_xParentProperties( rParentProperties ),
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index b2ba60c0e900..7117276800df 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataPoint.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,7 +65,6 @@ class DataPoint :
         public ::property::OPropertySet
 {
 public:
-    DataPoint();
     DataPoint( const ::com::sun::star::uno::Reference<
                    ::com::sun::star::beans::XPropertySet > & rParentProperties );
     virtual ~DataPoint();
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 9b46136d2980..8e80bc1e8a47 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataPointProperties.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -326,7 +326,7 @@ void DataPointProperties::AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "ReferenceDiagramSize" ),
+        Property( C2U( "ReferencePageSize" ),
                   PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE,
                   ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
                   beans::PropertyAttribute::BOUND
diff --git a/chart2/source/model/main/DataPointStyle.cxx b/chart2/source/model/main/DataPointStyle.cxx
index 3e4155e1646d..e69de29bb2d1 100644
--- a/chart2/source/model/main/DataPointStyle.cxx
+++ b/chart2/source/model/main/DataPointStyle.cxx
@@ -1,174 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DataPointStyle.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "DataPointStyle.hxx"
-#include "DataPointProperties.hxx"
-#include "PropertyHelper.hxx"
-#include "macros.hxx"
-#include "ContainerHelper.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <algorithm>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
-
-// ____________________________________________________________
-
-namespace
-{
-const uno::Sequence< Property > & lcl_GetPropertySequence()
-{
-    static uno::Sequence< Property > aPropSeq;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
-    {
-        // get properties
-        ::std::vector< ::com::sun::star::beans::Property > aProperties;
-        ::chart::DataPointProperties::AddPropertiesToVector( aProperties );
-
-        // and sort them for access via bsearch
-        ::std::sort( aProperties.begin(), aProperties.end(),
-                     ::chart::PropertyNameLess() );
-
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
-    }
-
-    return aPropSeq;
-}
-} // anonymous namespace
-
-// ____________________________________________________________
-
-namespace chart
-{
-
-DataPointStyle::DataPointStyle(
-    const uno::Reference< container::XNameAccess > & xStyleFamily,
-    ::osl::Mutex & par_rMutex ) :
-        ::property::OStyle( xStyleFamily, par_rMutex ),
-    m_rMutex( par_rMutex )
-{}
-
-DataPointStyle::~DataPointStyle()
-{}
-
-// ____ XInterface ____
-uno::Any SAL_CALL DataPointStyle::queryInterface(
-    const uno::Type & rType )
-    throw (uno::RuntimeException)
-{
-    return ::cppu::OWeakObject::queryInterface( rType );
-}
-
-void SAL_CALL DataPointStyle::acquire() throw ()
-{
-    ::cppu::OWeakObject::acquire();
-}
-
-void SAL_CALL DataPointStyle::release() throw ()
-{
-    ::cppu::OWeakObject::release();
-}
-
-// ____ OPropertySet ____
-uno::Any DataPointStyle::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
-{
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        DataPointProperties::AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
-        throw beans::UnknownPropertyException();
-
-    return (*aFound).second;
-    // \--
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataPointStyle::getInfoHelper()
-{
-    return getInfoHelperConst();
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataPointStyle::getInfoHelperConst() const
-{
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
-
-    return aArrayHelper;
-}
-
-// ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    DataPointStyle::getPropertySetInfo()
-    throw (uno::RuntimeException)
-{
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
-}
-
-::osl::Mutex & DataPointStyle::GetMutex()
-{
-    return m_rMutex;
-}
-
-} //  namespace chart
diff --git a/chart2/source/model/main/DataPointStyle.hxx b/chart2/source/model/main/DataPointStyle.hxx
index 6cf3638bbe86..e69de29bb2d1 100644
--- a/chart2/source/model/main/DataPointStyle.hxx
+++ b/chart2/source/model/main/DataPointStyle.hxx
@@ -1,83 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DataPointStyle.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_DATAPOINTSTYLE_HXX
-#define CHART_DATAPOINTSTYLE_HXX
-
-#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
-
-#include "OStyle.hxx"
-
-namespace chart
-{
-
-class DataPointStyle :
-        public ::cppu::OWeakObject,
-        public ::property::OStyle
-{
-public:
-    DataPointStyle( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::container::XNameAccess > & xStyleFamily,
-                    ::osl::Mutex & rMutex );
-    virtual ~DataPointStyle();
-
-    // ____ XInterface ____
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-        const ::com::sun::star::uno::Type & rType )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
-
-protected:
-    // ____ OPropertySet ____
-    virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(::com::sun::star::beans::UnknownPropertyException);
-
-    virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
-    // ____ XPropertySet ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (::com::sun::star::uno::RuntimeException);
-
-    ::osl::Mutex & GetMutex();
-
-    /** const variant of getInfoHelper()
-     */
-    ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelperConst() const;
-
-private:
-    ::osl::Mutex & m_rMutex;
-};
-
-} //  namespace chart
-
-// CHART_DATAPOINTSTYLE_HXX
-#endif
diff --git a/chart2/source/model/main/DataSeriesStyle.cxx b/chart2/source/model/main/DataSeriesStyle.cxx
index 24799da9749e..e69de29bb2d1 100644
--- a/chart2/source/model/main/DataSeriesStyle.cxx
+++ b/chart2/source/model/main/DataSeriesStyle.cxx
@@ -1,177 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DataSeriesStyle.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "DataSeriesStyle.hxx"
-#include "DataSeriesProperties.hxx"
-#include "CharacterProperties.hxx"
-#include "PropertyHelper.hxx"
-#include "macros.hxx"
-#include "ContainerHelper.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <algorithm>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
-
-// ____________________________________________________________
-
-namespace
-{
-const uno::Sequence< Property > & lcl_GetPropertySequence()
-{
-    static uno::Sequence< Property > aPropSeq;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
-    {
-        // get properties
-        ::std::vector< ::com::sun::star::beans::Property > aProperties;
-        ::chart::DataSeriesProperties::AddPropertiesToVector( aProperties );
-        ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
-
-        // and sort them for access via bsearch
-        ::std::sort( aProperties.begin(), aProperties.end(),
-                     ::chart::PropertyNameLess() );
-
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
-    }
-
-    return aPropSeq;
-}
-} // anonymous namespace
-
-// ____________________________________________________________
-
-namespace chart
-{
-
-DataSeriesStyle::DataSeriesStyle(
-    const uno::Reference< container::XNameAccess > & xStyleFamily,
-    ::osl::Mutex & par_rMutex ) :
-        ::property::OStyle( xStyleFamily, par_rMutex ),
-    m_rMutex( par_rMutex )
-{}
-
-DataSeriesStyle::~DataSeriesStyle()
-{}
-
-// ____ XInterface ____
-uno::Any SAL_CALL DataSeriesStyle::queryInterface(
-    const uno::Type & rType )
-    throw (uno::RuntimeException)
-{
-    return ::cppu::OWeakObject::queryInterface( rType );
-}
-
-void SAL_CALL DataSeriesStyle::acquire() throw ()
-{
-    ::cppu::OWeakObject::acquire();
-}
-
-void SAL_CALL DataSeriesStyle::release() throw ()
-{
-    ::cppu::OWeakObject::release();
-}
-
-// ____ OPropertySet ____
-uno::Any DataSeriesStyle::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
-{
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        DataSeriesProperties::AddDefaultsToMap( aStaticDefaults );
-        CharacterProperties::AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
-        throw beans::UnknownPropertyException();
-
-    return (*aFound).second;
-    // \--
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataSeriesStyle::getInfoHelper()
-{
-    return getInfoHelperConst();
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataSeriesStyle::getInfoHelperConst() const
-{
-    static ::cppu::OPropertyArrayHelper aArrayHelper(
-        lcl_GetPropertySequence(),
-        /* bSorted = */ sal_True );
-
-    return aArrayHelper;
-}
-
-// ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
-    DataSeriesStyle::getPropertySetInfo()
-    throw (uno::RuntimeException)
-{
-    static Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
-}
-
-::osl::Mutex & DataSeriesStyle::GetMutex()
-{
-    return m_rMutex;
-}
-
-} //  namespace chart
diff --git a/chart2/source/model/main/DataSeriesStyle.hxx b/chart2/source/model/main/DataSeriesStyle.hxx
index cd781016471f..e69de29bb2d1 100644
--- a/chart2/source/model/main/DataSeriesStyle.hxx
+++ b/chart2/source/model/main/DataSeriesStyle.hxx
@@ -1,83 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DataSeriesStyle.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_DATASERIESSTYLE_HXX
-#define CHART_DATASERIESSTYLE_HXX
-
-#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
-
-#include "OStyle.hxx"
-
-namespace chart
-{
-
-class DataSeriesStyle :
-        public ::cppu::OWeakObject,
-        public ::property::OStyle
-{
-public:
-    DataSeriesStyle( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::container::XNameAccess > & xStyleFamily,
-                     ::osl::Mutex & rMutex );
-    virtual ~DataSeriesStyle();
-
-    // ____ XInterface ____
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-        const ::com::sun::star::uno::Type & rType )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
-
-protected:
-    // ____ OPropertySet ____
-    virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(::com::sun::star::beans::UnknownPropertyException);
-
-    virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
-    // ____ XPropertySet ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (::com::sun::star::uno::RuntimeException);
-
-    ::osl::Mutex & GetMutex();
-
-    /** const variant of getInfoHelper()
-     */
-    ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelperConst() const;
-
-private:
-    ::osl::Mutex & m_rMutex;
-};
-
-} //  namespace chart
-
-// CHART_DATASERIESSTYLE_HXX
-#endif
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 3d2ae5875ed9..1718ddb1646d 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: Diagram.cxx,v $
  *
- * $Revision: 1.25 $
+ * $Revision: 1.24.32.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,7 +35,6 @@
 #include "macros.hxx"
 #include "PropertyHelper.hxx"
 #include "Wall.hxx"
-#include "ContextHelper.hxx"
 #include "UserDefinedProperties.hxx"
 #include "ConfigColorScheme.hxx"
 #include "ContainerHelper.hxx"
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 56d0602e901b..a2175b68a1da 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: FormattedString.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -87,12 +87,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
 namespace chart
 {
 
-FormattedString::FormattedString( const ::rtl::OUString & rString ) :
-        ::property::OPropertySet( m_aMutex ),
-    m_aString( rString ),
-    m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder())
-{}
-
 FormattedString::FormattedString(
         uno::Reference< uno::XComponentContext > const & /* xContext */ ) :
         ::property::OPropertySet( m_aMutex ),
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 66251ddebc58..de2c8adc40b5 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: FormattedString.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -61,7 +61,6 @@ class FormattedString :
     public ::property::OPropertySet
 {
 public:
-    FormattedString( const ::rtl::OUString & rString );
     FormattedString( ::com::sun::star::uno::Reference<
            ::com::sun::star::uno::XComponentContext > const & xContext );
     virtual ~FormattedString();
diff --git a/chart2/source/model/main/ImplChartModel.cxx b/chart2/source/model/main/ImplChartModel.cxx
index 73f267739f79..6360ccc7ee9c 100644
--- a/chart2/source/model/main/ImplChartModel.cxx
+++ b/chart2/source/model/main/ImplChartModel.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ImplChartModel.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,10 +32,7 @@
 #include "precompiled_chart2.hxx"
 #include "ImplChartModel.hxx"
 #include "DataSeries.hxx"
-#include "StyleFamilies.hxx"
-#include "StyleFamily.hxx"
 #include "macros.hxx"
-#include "ContextHelper.hxx"
 #include "PageBackground.hxx"
 #include "DiagramHelper.hxx"
 #include "NameContainer.hxx"
@@ -164,93 +161,8 @@ ImplChartModel::ImplChartModel( const ImplChartModel & rOther, const Reference<
 ImplChartModel::~ImplChartModel()
 {}
 
-// ImplChartModel::CreateStyles()
-// {
-//     // set style
-//     Reference< container::XNameAccess > xGraphicsFamily(
-//         GetStyleFamilies()->getByName( C2U( "graphics" )), uno::UNO_QUERY );
-
-//     if( xGraphicsFamily.is())
-//         const sal_Int32 nModul = Reference< container::XIndexAccess >(
-//             xGraphicsFamily, uno::UNO_QUERY )->getCount();
-//     for( size_t nI = 0; nI < nMaxSeries; ++nI )
-//     {
-//         try
-//         {
-//             Reference< ::com::sun::star::style::XStyle > xStyle(
-//                 xGraphicsFamily->getByName(
-//                     aStyleNameStub + OUString::valueOf(
-//                         static_cast< sal_Int32 >( (nI % nModul)+1 ))), uno::UNO_QUERY );
-
-//             Reference< beans::XPropertySet > xSeriesProp(
-//                 aResult[ nI ], uno::UNO_QUERY );
-
-//             if( xSeriesProp.is())
-//             {
-//                 xSeriesProp->setPropertyValue(
-//                     C2U( "Color" ),
-//                     uno::makeAny( nDefaultColors[ sal_Int32( nI % nMaxDefaultColors ) ]));
-
-//                 // set style
-//                 Reference< ::com::sun::star::style::XStyleSupplier >
-//                     xStyleSupp( xSeriesProp->getPropertyValue( C2U( "FirstGraphicsFormat" )),
-//                                 uno::UNO_QUERY );
-
-//                 if( xStyleSupp.is())
-//                 {
-//                     xStyleSupp->setStyle( xStyle );
-//                 }
-//             }
-//         }
-//         catch( uno::Exception ex )
-//         {
-//             OSL_ENSURE( false, "Couldn't set style" );
-//         }
-//     }
-// }
-
-
 Reference< container::XNameAccess > ImplChartModel::GetStyleFamilies()
 {
-    if( ! m_xFamilies.is())
-    {
-//         StyleFamilies * pStyleFamilies = new StyleFamilies();
-//         StyleFamily *  pGraphicsFamily = new StyleFamily();
-//         Reference< container::XNameAccess > xGraphicsFamily( pGraphicsFamily );
-
-        // add some default styles for graphics
-
-        // randomly generated default colors
-
-//         sal_Int32 i = 0;
-//         const sal_Int32 nMax = sizeof( nDefaults ) / sizeof( sal_Int32 );
-//         for( ; i < nMax; ++i )
-//         {
-//             try
-//             {
-//                 Reference< ::com::sun::star::style::XStyle > xStyle(
-//                     new GraphicsPropertiesStyle( xGraphicsFamily ) );
-//                 xStyle->setName( C2U( "Series " ) + OUString::valueOf( static_cast< sal_Int32 >(i + 1) ) );
-//                 Reference< beans::XPropertySet > xProp( xStyle, uno::UNO_QUERY );
-//                 if( xProp.is())
-//                 {
-//                     xProp->setPropertyValue( C2U( "Color" ), uno::makeAny( nDefaults[ i ] ));
-//                 }
-//                 pGraphicsFamily->AddStyle( xStyle );
-//             }
-//             catch( uno::Exception ex )
-//             {
-//                 OSL_ENSURE( false, "Error on creating styles" );
-//             }
-//         }
-
-//         bool bResult = pStyleFamilies->AddStyleFamily(
-//             C2U( "graphics" ), xGraphicsFamily );
-
-//         OSL_ASSERT( bResult );
-//         m_xFamilies.set( pStyleFamilies );
-    }
-
     return m_xFamilies;
 }
 
@@ -262,19 +174,6 @@ void ImplChartModel::RemoveAllDiagrams()
     m_aDiagrams.clear();
 }
 
-bool ImplChartModel::RemoveDiagram( const Reference< chart2::XDiagram > & xDiagram )
-{
-    tDiagramContainer::iterator aIt( ::std::find(
-                                         m_aDiagrams.begin(), m_aDiagrams.end(),
-                                         xDiagram ));
-    if( aIt == m_aDiagrams.end() )
-        return false;
-
-    ModifyListenerHelper::removeListener( *aIt, m_xModifyListener );
-    m_aDiagrams.erase( aIt );
-    return true;
-}
-
 void ImplChartModel::AppendDiagram( const Reference< chart2::XDiagram > & xDiagram )
 {
     Reference< util::XModifyBroadcaster > xBroadcaster( xDiagram, uno::UNO_QUERY );
@@ -414,12 +313,6 @@ Reference< chart2::XChartTypeManager > ImplChartModel::GetChartTypeManager()
     return m_xChartTypeManager;
 }
 
-void ImplChartModel::SetChartTypeTemplate(
-    const Reference< chart2::XChartTypeTemplate > & xTemplate )
-{
-    m_xChartTypeTemplate = xTemplate;
-}
-
 Reference< chart2::XChartTypeTemplate > ImplChartModel::GetChartTypeTemplate()
 {
     return m_xChartTypeTemplate;
@@ -562,45 +455,6 @@ Reference< chart2::XUndoManager > ImplChartModel::GetUndoManager()
     return m_xUndoManager;
 }
 
-// OUString
-::std::vector< Reference< chart2::data::XLabeledDataSequence > > ImplChartModel::GetData()
-{
-    ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResult;
-
-    Reference< chart2::XDiagram > xDia;
-    if( m_aDiagrams.size() > 0 )
-        xDia.set( GetDiagram(0) );
-
-    if( xDia.is())
-    {
-        try
-        {
-            // categories
-            Reference< chart2::data::XLabeledDataSequence > xCategories(
-                DiagramHelper::getCategoriesFromDiagram( xDia ));
-            aResult.push_back( xCategories );
-
-            // data series
-            ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
-                DiagramHelper::getDataSeriesFromDiagram( xDia ));
-            for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
-                     aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
-            {
-                Reference< chart2::data::XDataSource > xSource( *aIt, uno::UNO_QUERY_THROW );
-                Sequence< Reference< chart2::data::XLabeledDataSequence > > aDataSeq( xSource->getDataSequences());
-                ::std::copy( aDataSeq.getConstArray(), aDataSeq.getConstArray() + aDataSeq.getLength(),
-                             back_inserter( aResult ));
-            }
-        }
-        catch( uno::Exception & ex )
-        {
-            ASSERT_EXCEPTION( ex );
-        }
-    }
-
-    return aResult;
-}
-
 void ImplChartModel::SetNewData( const Reference< chart2::data::XDataSource > & xDataSource,
                                  const Sequence< beans::PropertyValue > & rArgs )
 {
diff --git a/chart2/source/model/main/ImplChartModel.hxx b/chart2/source/model/main/ImplChartModel.hxx
index edfa7be60727..9a912feee246 100644
--- a/chart2/source/model/main/ImplChartModel.hxx
+++ b/chart2/source/model/main/ImplChartModel.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ImplChartModel.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -106,8 +106,6 @@ public:
     void RemoveAllDiagrams();
     /** @return true, if the chart was found and removed, false otherwise.
      */
-    bool RemoveDiagram( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::chart2::XDiagram > & xDiagram );
     void AppendDiagram( const ::com::sun::star::uno::Reference<
                             ::com::sun::star::chart2::XDiagram > & xDiagram );
     ::com::sun::star::uno::Reference<
@@ -141,10 +139,6 @@ public:
         ::com::sun::star::chart2::XChartTypeManager >
         GetChartTypeManager();
 
-    void SetChartTypeTemplate(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartTypeTemplate > & xTemplate );
-
     ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XChartTypeTemplate >
         GetChartTypeTemplate();
@@ -166,9 +160,6 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XUndoManager >
         GetUndoManager();
 
-    ::std::vector< ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XLabeledDataSequence > > GetData();
-
     void CreateDefaultChart();
 
     ::com::sun::star::uno::Reference<
diff --git a/chart2/source/model/main/Style.cxx b/chart2/source/model/main/Style.cxx
index b9cfee4ecce7..e69de29bb2d1 100644
--- a/chart2/source/model/main/Style.cxx
+++ b/chart2/source/model/main/Style.cxx
@@ -1,161 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Style.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "Style.hxx"
-#include "macros.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-
-using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::RuntimeException;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-
-// necessary for MS compiler
-using ::comphelper::OPropertyContainer;
-using ::chart::impl::Style_Base;
-
-namespace
-{
-static const ::rtl::OUString lcl_aImplName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.Style" ));
-}  // anonymous namespace
-
-namespace chart
-{
-
-Style::Style( const Reference< container::XNameContainer > & xStyleFamiliyToAddTo ) :
-        OPropertyContainer( GetBroadcastHelper()),
-        Style_Base( GetMutex()),
-        m_xStyleFamily( xStyleFamiliyToAddTo ),
-        m_aName( C2U( "Default" ) ),
-        m_bUserDefined( sal_False )
-{
-    OSL_ENSURE( m_xStyleFamily.is(), "No StyleFamily to add style to" );
-}
-
-Style::~Style()
-{}
-
-sal_Bool SAL_CALL Style::isUserDefined()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    return m_bUserDefined;
-    // \--
-}
-
-sal_Bool SAL_CALL Style::isInUse()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-
-    // aBoundLC is a member of cppuhelper::OPropertySetHelper
-    // it is assumed that a style is in use whenever some component is
-    // registered here as listener
-    return ( aBoundLC.getContainedTypes().getLength() > 0 );
-    // \--
-}
-
-OUString SAL_CALL Style::getParentStyle()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    return m_aParentStyleName;
-    // \--
-}
-
-void SAL_CALL Style::setParentStyle( const OUString& aParentStyle )
-    throw (container::NoSuchElementException,
-           RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    m_aParentStyleName = aParentStyle;
-    // \--
-}
-
-
-OUString SAL_CALL Style::getName()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    return m_aName;
-    // \--
-}
-
-void SAL_CALL Style::setName( const OUString& aName )
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    OSL_ASSERT( m_xStyleFamily.is());
-
-    if( m_xStyleFamily.is() )
-    {
-        // remove old name
-        if( m_aName.getLength() > 0 )
-        {
-            Reference< container::XNameAccess > xAccess( m_xStyleFamily, uno::UNO_QUERY );
-            OSL_ASSERT( xAccess.is());
-            if( xAccess->hasByName( m_aName ))
-                m_xStyleFamily->removeByName( m_aName );
-        }
-
-        // change name
-        m_aName = aName;
-
-        // add new name
-        m_xStyleFamily->insertByName( m_aName, uno::makeAny( this ));
-    }
-    // \--
-}
-
-IMPLEMENT_FORWARD_XINTERFACE2( Style, Style_Base, OPropertyContainer )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( Style, Style_Base, OPropertyContainer )
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( Style, lcl_aImplName )
-
-uno::Sequence< OUString > Style::getSupportedServiceNames_Static()
-{
-    uno::Sequence< OUString > aServices( 1 );
-    aServices[ 0 ] = C2U( "com.sun.star.style.Style" );
-    return aServices;
-}
-
-} //  namespace chart
diff --git a/chart2/source/model/main/Style.hxx b/chart2/source/model/main/Style.hxx
index feee550f089f..e69de29bb2d1 100644
--- a/chart2/source/model/main/Style.hxx
+++ b/chart2/source/model/main/Style.hxx
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Style.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_STYLE_HXX
-#define CHART_STYLE_HXX
-
-// helper classes
-#include <cppuhelper/compbase2.hxx>
-#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
-#include <comphelper/propertycontainer.hxx>
-#include <comphelper/proparrhlp.hxx>
-
-#include "ServiceMacros.hxx"
-
-// interfaces and types
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/style/XStyle.hpp>
-
-namespace com { namespace sun { namespace star { namespace container {
-    class XNameContainer;
-}}}}
-
-namespace chart
-{
-
-namespace impl
-{
-typedef ::cppu::WeakComponentImplHelper2<
-    ::com::sun::star::style::XStyle,
-    ::com::sun::star::lang::XServiceInfo > Style_Base;
-}
-
-class Style :
-        public ::comphelper::OMutexAndBroadcastHelper,
-        public ::comphelper::OPropertyContainer,
-        public ::comphelper::OPropertyArrayUsageHelper< Style >,
-        public impl::Style_Base
-{
-public:
-    Style( const ::com::sun::star::uno::Reference<
-               ::com::sun::star::container::XNameContainer > & xStyleFamiliyToAddTo );
-    virtual ~Style();
-
-    void RegisterProperties(
-        const ::std::vector< ::com::sun::star::beans::Property > & rProperties,
-        ::std::vector< ::com::sun::star::uno::Any > & rOutProperties );
-
-    /// declare XServiceInfo methods
-    APPHELPER_XSERVICEINFO_DECL()
-
-    /// merge XInterface implementations
-    DECLARE_XINTERFACE()
-    /// merge XTypeProvider implementations
-    DECLARE_XTYPEPROVIDER()
-
-protected:
-    // ____ style::XStyle ____
-    virtual sal_Bool SAL_CALL isUserDefined() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isInUse() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getParentStyle() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-
-    // ____ container::XNamed (base of XStyle) ____
-    virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-
-    // ____ beans::XPropertySet ____
-    /// @see ::com::sun::star::beans::XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (::com::sun::star::uno::RuntimeException);
-    /// @see ::comphelper::OPropertySetHelper
-    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-    /// @see ::comphelper::OPropertyArrayUsageHelper
-    virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const;
-
-private:
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameContainer > m_xStyleFamily;
-
-    ::rtl::OUString    m_aName;
-    ::rtl::OUString    m_aParentStyleName;
-    sal_Bool           m_bUserDefined;
-};
-
-} //  namespace chart
-
-// CHART_STYLE_HXX
-#endif
diff --git a/chart2/source/model/main/StyleFamilies.cxx b/chart2/source/model/main/StyleFamilies.cxx
index 32c9d978de0d..e69de29bb2d1 100644
--- a/chart2/source/model/main/StyleFamilies.cxx
+++ b/chart2/source/model/main/StyleFamilies.cxx
@@ -1,179 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StyleFamilies.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "StyleFamilies.hxx"
-#include "macros.hxx"
-
-#include <algorithm>
-#include <functional>
-
-using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-
-namespace chart
-{
-
-StyleFamilies::StyleFamilies()
-{
-}
-
-StyleFamilies::~StyleFamilies()
-{}
-
-bool StyleFamilies::AddStyleFamily(
-    const OUString & rName,
-    const Reference< container::XNameAccess > & rFamily )
-{
-    if( m_aStyleFamilies.find( rName ) == m_aStyleFamilies.end() )
-    {
-        m_aStyleFamilies[ rName ] = rFamily;
-        return true;
-    }
-
-    return false;
-}
-
-// container::XNameAccess
-Any SAL_CALL StyleFamilies::getByName( const OUString& aName )
-    throw (container::NoSuchElementException,
-           lang::WrappedTargetException,
-           RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-
-    tStyleFamilyContainer::const_iterator aIt( m_aStyleFamilies.find( aName ));
-    if( aIt == m_aStyleFamilies.end())
-    {
-        throw container::NoSuchElementException(
-            aName,
-            static_cast< ::cppu::OWeakObject* >( this ));
-    }
-
-    OSL_ASSERT( (*aIt).first.equals( aName ));
-    return uno::makeAny( (*aIt).second );
-    // \--
-}
-
-uno::Sequence< OUString > SAL_CALL StyleFamilies::getElementNames()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    Sequence< OUString > aResult( m_aStyleFamilies.size());
-
-    ::std::transform( m_aStyleFamilies.begin(), m_aStyleFamilies.end(),
-                      aResult.getArray(),
-                      ::std::select1st< tStyleFamilyContainer::value_type >() );
-
-    return aResult;
-    // \--
-}
-
-sal_Bool SAL_CALL StyleFamilies::hasByName( const OUString& aName )
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-
-    return ( m_aStyleFamilies.find( aName ) != m_aStyleFamilies.end() );
-    // \--
-}
-
-
-// container::XIndexAccess (optional)
-sal_Int32 SAL_CALL StyleFamilies::getCount()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    return m_aStyleFamilies.size();
-    // \--
-}
-
-Any SAL_CALL StyleFamilies::getByIndex( sal_Int32 Index )
-    throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    tStyleFamilyContainer::const_iterator aIt( m_aStyleFamilies.begin());
-    sal_Int32 nCounter = 0;
-    for( ;
-         ( nCounter < Index ) && ( aIt != m_aStyleFamilies.end());
-         ++nCounter, ++aIt );
-
-    if( aIt == m_aStyleFamilies.end())
-    {
-        throw container::NoSuchElementException(
-            OUString::valueOf( Index ),
-            static_cast< ::cppu::OWeakObject* >( this ));
-    }
-
-    return uno::makeAny( (*aIt).second );
-    // \--
-}
-
-
-// container::XElementAccess (base of XNameAccess and XIndexAccess)
-uno::Type SAL_CALL StyleFamilies::getElementType()
-    throw (RuntimeException)
-{
-    return ::getCppuType( reinterpret_cast< Reference< container::XNameAccess > * >(0));
-}
-
-sal_Bool SAL_CALL StyleFamilies::hasElements()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    return ! m_aStyleFamilies.empty();
-    // \--
-}
-
-// lang::XServiceInfo
-
-APPHELPER_XSERVICEINFO_IMPL( StyleFamilies, C2U( "com.sun.star.comp.chart2.StyleFamilies" ))
-
-Sequence< OUString > StyleFamilies::getSupportedServiceNames_Static()
-{
-    uno::Sequence< OUString > aServices( 1 );
-    aServices[ 0 ] = C2U( "com.sun.star.style.StyleFamilies" );
-
-    return aServices;
-}
-
-} //  namespace chart
diff --git a/chart2/source/model/main/StyleFamilies.hxx b/chart2/source/model/main/StyleFamilies.hxx
index 5598dbf0eacc..e69de29bb2d1 100644
--- a/chart2/source/model/main/StyleFamilies.hxx
+++ b/chart2/source/model/main/StyleFamilies.hxx
@@ -1,103 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StyleFamilies.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_STYLEFAMILIES_HXX
-#define CHART_STYLEFAMILIES_HXX
-
-#include <cppuhelper/implbase2.hxx>
-#include <osl/mutex.hxx>
-
-#include "ServiceMacros.hxx"
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-#include <map>
-
-namespace chart
-{
-
-class StyleFamilies : public ::cppu::WeakImplHelper2 <
-    ::com::sun::star::container::XNameAccess,
-    ::com::sun::star::lang::XServiceInfo >
-{
-public:
-    StyleFamilies();
-    virtual ~StyleFamilies();
-
-    /** adds a style family.
-
-        @param rName the name under which the family can later be accessed
-               through the XNameAccess.
-
-        @param rFamily the style family object supporting the service
-               ::com::sun::star::style::StyleFamily.
-
-        @return true, if the family was added.  In case there already exists a
-                family with the name given in rName, nothing is done and false
-                is returned.
-     */
-    bool AddStyleFamily(
-        const ::rtl::OUString & rName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XNameAccess > & rFamily );
-
-protected:
-    // container::XNameAccess
-    //
-    // Note: The elements within this collection are StyleFamily instances.
-    //       (only mandatory interface: XNameAccess)
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-
-    // container::XIndexAccess (optional)
-    virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    // container::XElementAccess (base of XNameAccess and XIndexAccess)
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException);
-
-    APPHELPER_XSERVICEINFO_DECL()
-
-    typedef ::std::map< ::rtl::OUString,
-                        ::com::sun::star::uno::Reference<
-                            ::com::sun::star::container::XNameAccess > >
-        tStyleFamilyContainer;
-
-private:
-    tStyleFamilyContainer     m_aStyleFamilies;
-    ::osl::Mutex              m_aMutex;
-};
-
-} //  namespace chart
-
-// CHART_STYLEFAMILIES_HXX
-#endif
diff --git a/chart2/source/model/main/StyleFamily.cxx b/chart2/source/model/main/StyleFamily.cxx
index f5cfe8bbccbe..e69de29bb2d1 100644
--- a/chart2/source/model/main/StyleFamily.cxx
+++ b/chart2/source/model/main/StyleFamily.cxx
@@ -1,267 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StyleFamily.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "StyleFamily.hxx"
-#include "macros.hxx"
-#include <com/sun/star/style/XStyle.hpp>
-
-#include <algorithm>
-#include <functional>
-
-using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-
-namespace chart
-{
-
-StyleFamily::StyleFamily()
-{}
-
-StyleFamily::~StyleFamily()
-{}
-
-bool StyleFamily::AddStyle(
-    const Reference< style::XStyle > & rStyle )
-{
-    bool bRet = false;
-
-    if( rStyle.is())
-    {
-        OUString aName( rStyle->getName() );
-        m_aStyles[ aName ] = rStyle;
-        bRet = true;
-    }
-
-    return bRet;
-}
-
-// container::XNameAccess (also base of XNameReplace)
-uno::Any SAL_CALL StyleFamily::getByName( const OUString& aName )
-    throw (container::NoSuchElementException,
-           lang::WrappedTargetException,
-           RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-
-    tStyleContainer::const_iterator aIt( m_aStyles.find( aName ));
-    if( aIt == m_aStyles.end())
-    {
-        throw container::NoSuchElementException(
-            aName,
-            static_cast< ::cppu::OWeakObject* >( this ));
-    }
-
-    OSL_ASSERT( (*aIt).first.equals( aName ));
-    return uno::makeAny( (*aIt).second );
-    // \--
-}
-
-Sequence< OUString > SAL_CALL StyleFamily::getElementNames()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    Sequence< OUString > aResult( m_aStyles.size());
-
-    ::std::transform( m_aStyles.begin(), m_aStyles.end(),
-                      aResult.getArray(),
-                      ::std::select1st< tStyleContainer::value_type >() );
-
-    return aResult;
-    // \--
-}
-
-sal_Bool SAL_CALL StyleFamily::hasByName( const OUString& aName )
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-
-    return ( m_aStyles.find( aName ) != m_aStyles.end() );
-    // \--
-}
-
-
-// container::XNameContainer (optional)
-void SAL_CALL StyleFamily::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw (lang::IllegalArgumentException,
-           container::ElementExistException,
-           lang::WrappedTargetException,
-           RuntimeException)
-{
-    uno::Reference< style::XStyle > xStyle;
-    if( aElement >>= xStyle )
-    {
-        // /--
-        MutexGuard aGuard( m_aMutex );
-        if( m_aStyles.find( aName ) != m_aStyles.end() )
-        {
-            throw container::ElementExistException(
-                aName,
-                static_cast< ::cppu::OWeakObject* >( this ) );
-        }
-
-        m_aStyles[ aName ] = xStyle;
-        // \--
-    }
-    else
-    {
-        throw lang::IllegalArgumentException(
-            aName,
-            static_cast< ::cppu::OWeakObject* >( this ),
-            1 /* index */ );
-    }
-}
-
-void SAL_CALL StyleFamily::removeByName( const OUString& Name )
-    throw (container::NoSuchElementException,
-           lang::WrappedTargetException,
-           RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    tStyleContainer::iterator aIt( m_aStyles.find( Name ));
-    if( aIt == m_aStyles.end())
-    {
-        throw container::NoSuchElementException(
-            Name,
-            static_cast< ::cppu::OWeakObject* >( this ) );
-    }
-
-    m_aStyles.erase( aIt );
-    // \--
-}
-
-
-// container::XIndexAccess (optional)
-sal_Int32 SAL_CALL StyleFamily::getCount()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    return m_aStyles.size();
-    // \--
-}
-
-uno::Any SAL_CALL StyleFamily::getByIndex( sal_Int32 Index )
-    throw (lang::IndexOutOfBoundsException,
-           lang::WrappedTargetException,
-           RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    tStyleContainer::const_iterator aIt( m_aStyles.begin());
-    sal_Int32 nCounter = 0;
-    for( ;
-         ( nCounter < Index ) && ( aIt != m_aStyles.end());
-         ++nCounter, ++aIt );
-
-    if( aIt == m_aStyles.end())
-    {
-        throw container::NoSuchElementException(
-            OUString::valueOf( Index ),
-            static_cast< ::cppu::OWeakObject* >( this ));
-    }
-
-    return uno::makeAny( (*aIt).second );
-    // \--
-}
-
-
-// container::XElementAccess (base of XNameAccess and XIndexAccess)
-uno::Type SAL_CALL StyleFamily::getElementType()
-    throw (RuntimeException)
-{
-    return ::getCppuType( reinterpret_cast< Reference< style::XStyle > * >(0));
-}
-
-sal_Bool SAL_CALL StyleFamily::hasElements()
-    throw (RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( m_aMutex );
-    return ! m_aStyles.empty();
-    // \--
-}
-
-
-// container::XNameReplace
-void SAL_CALL StyleFamily::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw (lang::IllegalArgumentException,
-           container::NoSuchElementException,
-           lang::WrappedTargetException,
-           RuntimeException)
-{
-    uno::Reference< style::XStyle > xStyle;
-    if( aElement >>= xStyle )
-    {
-        // /--
-        MutexGuard aGuard( m_aMutex );
-        tStyleContainer::const_iterator aIt( m_aStyles.begin());
-        if( aIt == m_aStyles.end())
-        {
-            throw container::NoSuchElementException(
-                aName,
-                static_cast< ::cppu::OWeakObject* >( this ) );
-        }
-
-        m_aStyles[ aName ] = xStyle;
-        // \--
-    }
-    else
-    {
-        throw lang::IllegalArgumentException(
-            aName,
-            static_cast< ::cppu::OWeakObject* >( this ),
-            1 /* index */ );
-    }
-}
-
-// lang::XServiceInfo
-
-APPHELPER_XSERVICEINFO_IMPL( StyleFamily, C2U( "com.sun.star.comp.chart2.StyleFamily" ))
-
-Sequence< OUString > StyleFamily::getSupportedServiceNames_Static()
-{
-    uno::Sequence< OUString > aServices( 1 );
-    aServices[ 0 ] = C2U( "com.sun.star.style.StyleFamily" );
-
-    return aServices;
-}
-
-} //  namespace chart
diff --git a/chart2/source/model/main/StyleFamily.hxx b/chart2/source/model/main/StyleFamily.hxx
index 200c5dc5549e..e69de29bb2d1 100644
--- a/chart2/source/model/main/StyleFamily.hxx
+++ b/chart2/source/model/main/StyleFamily.hxx
@@ -1,115 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StyleFamily.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_STYLEFAMILY_HXX
-#define CHART_STYLEFAMILY_HXX
-
-#include <cppuhelper/implbase3.hxx>
-#include <osl/mutex.hxx>
-
-#include "ServiceMacros.hxx"
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-#include <map>
-
-namespace com { namespace sun { namespace star {
-    namespace style {
-        class XStyle;
-    }
-}}}
-
-namespace chart
-{
-
-class StyleFamily : public
-    ::cppu::WeakImplHelper3<
-        ::com::sun::star::container::XNameContainer,
-        ::com::sun::star::container::XIndexAccess,
-        ::com::sun::star::lang::XServiceInfo
-    >
-{
-public:
-    StyleFamily();
-    virtual ~StyleFamily();
-
-    /** adds a style.
-
-        @param rStyle the style object supporting the service
-               ::com::sun::star::style::Style.  The name under which this object
-               can be accessed through XNameAccess is the one you get from
-               XNamed::getName() (XNamed is a base interface for XStyle.)
-
-        @return true, if the style was added.  In case there already exists a
-                style with the name given in getName(), nothing is done and
-                false is returned.
-     */
-    bool AddStyle( const ::com::sun::star::uno::Reference<
-                             ::com::sun::star::style::XStyle > & rStyle );
-
-protected:
-
-    // container::XNameAccess (also base of XNameReplace)
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-
-    // container::XNameContainer (optional, base of XNameReplace)
-    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    // container::XIndexAccess (optional)
-    virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    // container::XElementAccess (base of XNameAccess and XIndexAccess)
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException);
-
-    // container::XNameReplace (base of XNameAccess)
-    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    APPHELPER_XSERVICEINFO_DECL()
-
-    typedef     ::std::map< ::rtl::OUString,
-                            ::com::sun::star::uno::Reference<
-                                ::com::sun::star::style::XStyle > >
-        tStyleContainer;
-
-private:
-    tStyleContainer    m_aStyles;
-    ::osl::Mutex       m_aMutex;
-};
-
-} //  namespace chart
-
-// CHART_STYLEFAMILY_HXX
-#endif
diff --git a/chart2/source/model/main/makefile.mk b/chart2/source/model/main/makefile.mk
index e9188385aef2..775e7b60e9b9 100644
--- a/chart2/source/model/main/makefile.mk
+++ b/chart2/source/model/main/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.8 $
+# $Revision: 1.8.44.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -54,9 +54,7 @@ SLOFILES=	\
     $(SLO)$/ChartModel_Persistence.obj		\
     $(SLO)$/DataPoint.obj \
     $(SLO)$/DataPointProperties.obj \
-    $(SLO)$/DataPointStyle.obj \
     $(SLO)$/DataSeries.obj \
-    $(SLO)$/DataSeriesStyle.obj \
     $(SLO)$/Diagram.obj \
     $(SLO)$/DataSeriesProperties.obj \
     $(SLO)$/FormattedString.obj \
@@ -65,8 +63,6 @@ SLOFILES=	\
     $(SLO)$/PageBackground.obj \
     $(SLO)$/PolarCoordinateSystem.obj \
     $(SLO)$/StockBar.obj \
-    $(SLO)$/StyleFamilies.obj \
-    $(SLO)$/StyleFamily.obj \
     $(SLO)$/Title.obj \
     $(SLO)$/Wall.obj \
     $(SLO)$/_serviceregistration_model.obj
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 083bcc47d4b9..a8eb36d6e5c8 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartTypeManager.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +32,6 @@
 #include "precompiled_chart2.hxx"
 #include "ChartTypeManager.hxx"
 #include "macros.hxx"
-#include "ContextHelper.hxx"
 #include "StackMode.hxx"
 #include "ContainerHelper.hxx"
 
@@ -48,6 +47,7 @@
 #include "StockChartTypeTemplate.hxx"
 #include "NetChartTypeTemplate.hxx"
 #include <cppuhelper/component_context.hxx>
+#include <comphelper/InlineContainer.hxx>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/chart/ChartSolidType.hpp>
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 580b1516a372..c433292fe6ee 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AxisHelper.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -134,7 +134,7 @@ Reference< XAxis > AxisHelper::createAxis(
 
             // set correct initial AutoScale
             if( pRefSizeProvider )
-                pRefSizeProvider->setValuesAtPropertySet( xProp, ReferenceSizeProvider::REF_DIAGRAM );
+                pRefSizeProvider->setValuesAtPropertySet( xProp );
         }
         catch( uno::Exception& e )
         {
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 1542b586bc72..68cbcb50caa7 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: CachedDataSequence.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -201,24 +201,6 @@ void CachedDataSequence::registerProperties()
                       ::getCppuType( & m_aHiddenValues ) );
 }
 
-void CachedDataSequence::PreferMixedData()
-{
-    if( m_eCurrentDataType != MIXED )
-        Impl_setMixedData( Impl_getMixedData() );
-}
-
-void CachedDataSequence::PreferNumericalData()
-{
-    if( m_eCurrentDataType != NUMERICAL )
-        Impl_setNumericalData( Impl_getNumericalData() );
-}
-
-void CachedDataSequence::PreferTextualData()
-{
-    if( m_eCurrentDataType != TEXTUAL )
-        Impl_setTextualData( Impl_getTextualData() );
-}
-
 Sequence< double > CachedDataSequence::Impl_getNumericalData() const
 {
     if( m_eCurrentDataType == NUMERICAL )
@@ -311,39 +293,6 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const
     return aResult;
 }
 
-void CachedDataSequence::Impl_setNumericalData( const Sequence< double > & rSeq )
-{
-    if( m_eCurrentDataType != NUMERICAL )
-    {
-        m_aTextualSequence.realloc( 0 );
-        m_aMixedSequence.realloc( 0 );
-        m_eCurrentDataType = NUMERICAL;
-    }
-    m_aNumericalSequence = rSeq;
-}
-
-void CachedDataSequence::Impl_setTextualData( const Sequence< OUString > & rSeq )
-{
-    if( m_eCurrentDataType != TEXTUAL )
-    {
-        m_aNumericalSequence.realloc( 0 );
-        m_aMixedSequence.realloc( 0 );
-        m_eCurrentDataType = TEXTUAL;
-    }
-    m_aTextualSequence = rSeq;
-}
-
-void CachedDataSequence::Impl_setMixedData( const Sequence< uno::Any > & rSeq )
-{
-    if( m_eCurrentDataType != MIXED )
-    {
-        m_aNumericalSequence.realloc( 0 );
-        m_aTextualSequence.realloc( 0 );
-        m_eCurrentDataType = MIXED;
-    }
-    m_aMixedSequence = rSeq;
-}
-
 // ================================================================================
 
 Sequence< OUString > CachedDataSequence::getSupportedServiceNames_Static()
@@ -403,16 +352,6 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
     // \--
 }
 
-// void SAL_CALL CachedDataSequence::setNumericalData( const Sequence< double >& aData )
-//     throw (uno::RuntimeException)
-// {
-//     // /--
-//     MutexGuard aGuard( GetMutex() );
-//     Impl_setNumericalData( aData );
-//     // \--
-// }
-
-
 // ________ XTextualDataSequence ________
 Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
     throw (uno::RuntimeException)
@@ -502,11 +441,6 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X
     }
 }
 
-void CachedDataSequence::fireModifyEvent()
-{
-    // note: currently never called, as the data is not mutable
-    m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
-}
 // lang::XInitialization:
 void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception)
 {
diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx
index 27824a6694c8..9486180ececd 100644
--- a/chart2/source/tools/ChartDebugTrace.cxx
+++ b/chart2/source/tools/ChartDebugTrace.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartDebugTrace.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -321,6 +321,8 @@ namespace chart
 namespace debug
 {
 
+#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
+
 void ChartDebugTraceDocument(
     const Reference< XChartDocument > & /*xDoc*/,
     int /*nIndent*/ )
@@ -412,6 +414,7 @@ void ChartDebugTraceDiagram(
 
 */
 }
+#endif
 
 } // namespace debug
 } //  namespace chart
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 92210445f29d..b85cb717bff6 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: CommonConverters.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -129,21 +129,6 @@ drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMat
     return aHM;
 }
 
-::basegfx::B2DHomMatrix HomogenMatrix3ToB2DHomMatrix( const drawing::HomogenMatrix3& rHM )
-{
-    ::basegfx::B2DHomMatrix aM;
-    aM.set(0, 0, rHM.Line1.Column1);
-    aM.set(0, 1, rHM.Line1.Column2);
-    aM.set(0, 2, rHM.Line1.Column3);
-    aM.set(1, 0, rHM.Line2.Column1);
-    aM.set(1, 1, rHM.Line2.Column2);
-    aM.set(1, 2, rHM.Line2.Column3);
-    aM.set(2, 0, rHM.Line3.Column1);
-    aM.set(2, 1, rHM.Line3.Column2);
-    aM.set(2, 2, rHM.Line3.Column3);
-    return aM;
-}
-
 ::basegfx::B3DPoint Position3DToB3DPoint( const drawing::Position3D& rPosition )
 {
     return ::basegfx::B3DPoint(
@@ -161,15 +146,6 @@ drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector
         );
 }
 
-drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rVector)
-{
-    return drawing::Position3D(
-          rVector.getX()
-        , rVector.getY()
-        , rVector.getZ()
-        );
-}
-
 drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint)
 {
         return drawing::Position3D(
@@ -188,39 +164,6 @@ drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint)
         );
 }
 
-drawing::PolyPolygonShape3D MakeLine3D(
-    const drawing::Position3D & rStart,
-    const drawing::Position3D & rEnd )
-{
-    drawing::PolyPolygonShape3D aPP;
-
-    aPP.SequenceX.realloc(1);
-    aPP.SequenceY.realloc(1);
-    aPP.SequenceZ.realloc(1);
-
-    drawing::DoubleSequence* pOuterSequenceX = aPP.SequenceX.getArray();
-    drawing::DoubleSequence* pOuterSequenceY = aPP.SequenceY.getArray();
-    drawing::DoubleSequence* pOuterSequenceZ = aPP.SequenceZ.getArray();
-
-    pOuterSequenceX->realloc(2);
-    pOuterSequenceY->realloc(2);
-    pOuterSequenceZ->realloc(2);
-
-    double* pInnerSequenceX = pOuterSequenceX->getArray();
-    double* pInnerSequenceY = pOuterSequenceY->getArray();
-    double* pInnerSequenceZ = pOuterSequenceZ->getArray();
-
-    *pInnerSequenceX++ = rStart.PositionX;
-    *pInnerSequenceY++ = rStart.PositionY;
-    *pInnerSequenceZ++ = rStart.PositionZ;
-
-    *pInnerSequenceX++ = rEnd.PositionX;
-    *pInnerSequenceY++ = rEnd.PositionY;
-    *pInnerSequenceZ++ = rEnd.PositionZ;
-
-    return aPP;
-}
-
 void AddPointToPoly( drawing::PolyPolygonShape3D& rPoly, const drawing::Position3D& rPos, sal_Int32 nPolygonIndex )
 {
     if(nPolygonIndex<0)
@@ -467,31 +410,6 @@ drawing::PolyPolygonShape3D BezierToPoly(
     return aRet;
 }
 
-drawing::PolyPolygonShape3D PointSequenceToPoly(
-                const drawing::PointSequenceSequence& rPointSequence )
-{
-    drawing::PolyPolygonShape3D aRet;
-    aRet.SequenceX.realloc( rPointSequence.getLength() );
-    aRet.SequenceY.realloc( rPointSequence.getLength() );
-    aRet.SequenceZ.realloc( rPointSequence.getLength() );
-
-    for(sal_Int32 nN = 0; nN < rPointSequence.getLength(); nN++)
-    {
-        sal_Int32 nInnerLength = rPointSequence[nN].getLength();
-        aRet.SequenceX[nN].realloc( nInnerLength );
-        aRet.SequenceY[nN].realloc( nInnerLength );
-        aRet.SequenceZ[nN].realloc( nInnerLength );
-
-        for( sal_Int32 nM = 0; nM < nInnerLength; nM++)
-        {
-            aRet.SequenceX[nN][nM] = rPointSequence[nN][nM].X;
-            aRet.SequenceY[nN][nM] = rPointSequence[nN][nM].Y;
-            aRet.SequenceZ[nN][nM] = 0.0;
-        }
-    }
-    return aRet;
-}
-
 drawing::PointSequenceSequence PolyToPointSequence(
                 const drawing::PolyPolygonShape3D& rPolyPolygon )
 {
@@ -524,66 +442,6 @@ void appendPointSequence( drawing::PointSequenceSequence& rTarget
         rTarget[nOldCount+nS]=rAdd[nS];
 }
 
-Polygon PolyToToolsPoly( const drawing::PolyPolygonShape3D& rPolyPolygon )
-{
-    sal_Int32 nOuterLength = rPolyPolygon.SequenceX.getLength();
-    if(!nOuterLength)
-        return Polygon();
-
-    sal_Int32 nNewSize = nOuterLength;
-    sal_Int32 nNewIndex = 0;
-    Polygon aRet(static_cast<USHORT>(nNewSize));
-
-    for(sal_Int32 nN = 0; nN < nOuterLength; nN++)
-    {
-        sal_Int32 nInnerLength = rPolyPolygon.SequenceX[nN].getLength();
-        nNewSize += nInnerLength-1,
-        aRet.SetSize(static_cast<USHORT>(nNewSize));
-        for( sal_Int32 nM = 0; nM < nInnerLength; nM++)
-        {
-            aRet.SetPoint( Point( static_cast<long>(rPolyPolygon.SequenceX[nN][nM])
-                                , static_cast<long>(rPolyPolygon.SequenceY[nN][nM])
-                                )
-                                , static_cast<USHORT>(nNewIndex) );
-            nNewIndex++;
-        }
-    }
-    return aRet;
-}
-
-drawing::PolyPolygonShape3D ToolsPolyToPoly( const Polygon& rToolsPoly, double zValue )
-{
-    sal_Int32 nPointCount = rToolsPoly.GetSize();
-
-    drawing::PolyPolygonShape3D aPP;
-
-    aPP.SequenceX.realloc(1);
-    aPP.SequenceY.realloc(1);
-    aPP.SequenceZ.realloc(1);
-
-    drawing::DoubleSequence* pOuterSequenceX = aPP.SequenceX.getArray();
-    drawing::DoubleSequence* pOuterSequenceY = aPP.SequenceY.getArray();
-    drawing::DoubleSequence* pOuterSequenceZ = aPP.SequenceZ.getArray();
-
-    pOuterSequenceX->realloc(nPointCount);
-    pOuterSequenceY->realloc(nPointCount);
-    pOuterSequenceZ->realloc(nPointCount);
-
-    double* pInnerSequenceX = pOuterSequenceX->getArray();
-    double* pInnerSequenceY = pOuterSequenceY->getArray();
-    double* pInnerSequenceZ = pOuterSequenceZ->getArray();
-
-    for( sal_Int32 nN = 0; nN<nPointCount; nN++ )
-    {
-        const Point& rPos = rToolsPoly.GetPoint( static_cast<USHORT>(nN) );
-        *pInnerSequenceX++ = rPos.X();
-        *pInnerSequenceY++ = rPos.Y();
-        *pInnerSequenceZ++ = zValue;
-    }
-
-    return aPP;
-}
-
 drawing::Position3D  operator+( const drawing::Position3D& rPos
                            , const drawing::Direction3D& rDirection)
 {
@@ -668,18 +526,6 @@ awt::Size Direction3DToAWTSize( const drawing::Direction3D& rDirection )
     return aRet;
 }
 
-::basegfx::B3DPoint SequenceToB3DPoint( const uno::Sequence< double >& rSeq )
-{
-    OSL_ENSURE(rSeq.getLength()==3,"The sequence needs to have length 3 for conversion into vector");
-
-    double x=rSeq.getLength()>0?rSeq[0]:0.0;
-    double y=rSeq.getLength()>1?rSeq[1]:0.0;
-    double z=rSeq.getLength()>2?rSeq[2]:0.0;
-
-    ::basegfx::B3DPoint aRet(x,y,z);
-    return aRet;
-}
-
 uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint )
 {
     uno::Sequence< double > aRet(3);
@@ -709,24 +555,6 @@ uno::Sequence< double > Position3DToSequence( const drawing::Position3D& rPositi
     return aRet;
 }
 
-drawing::Direction3D SequenceToDirection3D( const uno::Sequence< double >& rSeq )
-{
-    drawing::Direction3D aRet;
-    aRet.DirectionX = rSeq.getLength()>0?rSeq[0]:0.0;
-    aRet.DirectionY = rSeq.getLength()>1?rSeq[1]:0.0;
-    aRet.DirectionZ = rSeq.getLength()>2?rSeq[2]:0.0;
-    return aRet;
-}
-
-uno::Sequence< double > Direction3DToSequence( const drawing::Direction3D& rDirection )
-{
-    uno::Sequence< double > aRet(3);
-    aRet[0] = rDirection.DirectionX;
-    aRet[1] = rDirection.DirectionY;
-    aRet[2] = rDirection.DirectionZ;
-    return aRet;
-}
-
 drawing::Direction3D operator/( const drawing::Direction3D& rDirection, double f )
 {
     OSL_ENSURE(f,"a Direction3D is divided by NULL");
@@ -737,21 +565,6 @@ drawing::Direction3D operator/( const drawing::Direction3D& rDirection, double f
         );
 }
 
-text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWritingMode2 )
-{
-    switch(nWritingMode2)
-    {
-        case text::WritingMode2::RL_TB:
-            return  text::WritingMode_RL_TB;
-        case text::WritingMode2::TB_RL:
-            return  text::WritingMode_TB_RL;
-        case text::WritingMode2::LR_TB:
-            return  text::WritingMode_LR_TB;
-        default: // TL
-            return  text::WritingMode_TB_RL;//there can no correct conversion be done here
-    }
-}
-
 using namespace ::com::sun::star::chart2;
 
 uno::Sequence< double > DataSequenceToDoubleSequence(
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 75964b42ead5..7e418f04ab7b 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ConfigColorScheme.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,7 +65,6 @@ public:
     virtual ~ChartConfigItem();
 
     void addPropertyNotification( const OUString & rPropertyName );
-    void removePropertyNotification( const OUString & rPropertyName );
 
     uno::Any getProperty( const OUString & aPropertyName );
 
@@ -101,12 +100,6 @@ void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName )
     EnableNotification( ContainerHelper::ContainerToSequence( m_aPropertiesToNotify ));
 }
 
-void ChartConfigItem::removePropertyNotification( const OUString & rPropertyName )
-{
-    if( m_aPropertiesToNotify.erase( rPropertyName ))
-        EnableNotification( ContainerHelper::ContainerToSequence( m_aPropertiesToNotify ));
-}
-
 uno::Any ChartConfigItem::getProperty( const OUString & aPropertyName )
 {
     Sequence< uno::Any > aValues(
diff --git a/chart2/source/tools/ContextHelper.cxx b/chart2/source/tools/ContextHelper.cxx
index 541c22950869..e69de29bb2d1 100644
--- a/chart2/source/tools/ContextHelper.cxx
+++ b/chart2/source/tools/ContextHelper.cxx
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ContextHelper.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "ContextHelper.hxx"
-#include <cppuhelper/component_context.hxx>
-
-#include <vector>
-
-using namespace ::com::sun::star;
-
-namespace chart
-{
-
-namespace ContextHelper
-{
-
-uno::Reference< uno::XComponentContext >
-    createContext(
-        const tContextEntryMapType & rMap,
-        const uno::Reference< uno::XComponentContext > & rDelegateContext )
-{
-    ::std::vector< ::cppu::ContextEntry_Init > aVec( rMap.size());
-    for( tContextEntryMapType::const_iterator aIt = rMap.begin();
-         aIt != rMap.end();
-         ++aIt )
-    {
-        aVec.push_back( ::cppu::ContextEntry_Init( (*aIt).first, (*aIt).second) );
-    }
-
-    return ::cppu::createComponentContext( & aVec[0], aVec.size(), rDelegateContext );
-}
-
-} //  namespace ContextHelper
-
-} //  namespace chart
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 646410dd28a9..c8dfbffec354 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataSeriesHelper.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -176,17 +176,6 @@ OUString GetRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xL
     return aRet;
 }
 
-void SetRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xLabeledDataSequence,
-                const ::rtl::OUString& rRole )
-{
-    if( xLabeledDataSequence.is() )
-    {
-        Reference< beans::XPropertySet > xProp( xLabeledDataSequence->getValues(), uno::UNO_QUERY );
-        if( xProp.is() )
-            xProp->setPropertyValue( C2U("Role"), uno::makeAny(rRole) ) ;
-    }
-}
-
 Reference< chart2::data::XLabeledDataSequence >
     getDataSequenceByRole(
         const Reference< chart2::data::XDataSource > & xSource, OUString aRole,
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index db69c039070d..5814de4724fa 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataSource.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -61,32 +61,6 @@ DataSource::DataSource(
         m_aDataSeq( rSequences )
 {}
 
-DataSource::DataSource(
-    const Sequence< Reference< chart2::data::XDataSequence > > & rSequences )
-{
-    m_aDataSeq.realloc( rSequences.getLength());
-    sal_Int32 i;
-    for(i=rSequences.getLength(); --i;)
-    {
-        m_aDataSeq[i].set( new LabeledDataSequence( rSequences[i] ));
-    }
-}
-
-DataSource::DataSource(
-    const Sequence< Reference< chart2::data::XDataSequence > > & rSequences,
-    const Sequence< Reference< chart2::data::XDataSequence > > & rLabel )
-{
-    m_aDataSeq.realloc( rSequences.getLength());
-    for( sal_Int32 i=0; i<rSequences.getLength(); ++i )
-    {
-        if( i < rLabel.getLength())
-            m_aDataSeq[i].set( new LabeledDataSequence( rSequences[i], rLabel[i] ));
-        else
-            m_aDataSeq[i].set( new LabeledDataSequence( rSequences[i],
-                                                        Reference< chart2::data::XDataSequence >() ));
-    }
-}
-
 DataSource::~DataSource()
 {}
 
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 9224a1c98d17..0de52f8a53ea 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataSourceHelper.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -115,43 +115,6 @@ void lcl_addErrorBarRanges(
     }
 }
 
-struct lcl_migrateData : public ::std::unary_function<
-        Reference< chart2::data::XLabeledDataSequence >, void >
-{
-    lcl_migrateData( const Reference< chart2::data::XDataProvider > & xDataProvider ) :
-            m_xDataProvider( xDataProvider )
-    {}
-
-    Reference< chart2::data::XDataSequence > migrateData(
-        const Reference< chart2::data::XDataSequence > & xOldData )
-    {
-        if( ! xOldData.is())
-            return xOldData;
-
-        OSL_ASSERT( m_xDataProvider.is());
-        Reference< chart2::data::XDataSequence > xNewData(
-            m_xDataProvider->createDataSequenceByRangeRepresentation(
-                xOldData->getSourceRangeRepresentation()));
-        comphelper::copyProperties(
-            Reference< beans::XPropertySet >( xOldData, uno::UNO_QUERY ),
-            Reference< beans::XPropertySet >( xNewData, uno::UNO_QUERY ));
-        return xNewData;
-    }
-
-    void operator()( const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
-    {
-        if( m_xDataProvider.is() && xLSeq.is())
-        {
-            xLSeq->setValues( migrateData( xLSeq->getValues()));
-            xLSeq->setLabel( migrateData( xLSeq->getLabel()));
-        }
-    }
-
-private:
-    Reference< chart2::data::XDataProvider > m_xDataProvider;
-};
-
-
 } // anonymous namespace
 
 uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
@@ -554,25 +517,6 @@ Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference<
     return ContainerHelper::ContainerToSequence( aResult );
 }
 
-bool DataSourceHelper::migrateData(
-    const Reference< chart2::XChartDocument > & xChartDoc,
-    const Reference< chart2::data::XDataProvider > & xNewDataProvider )
-{
-    if( ! ( xChartDoc.is() && xNewDataProvider.is()))
-        return false;
-
-    bool bCouldMigrate = true;
-    Reference< chart2::data::XDataSource > xDataSource(
-        DataSourceHelper::getUsedData( xChartDoc, true /* bIncludeUnusedData */ ));
-    Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq(
-        xDataSource->getDataSequences());
-    ::std::for_each( aLSeq.getArray(), aLSeq.getArray() + aLSeq.getLength(),
-                     lcl_migrateData( xNewDataProvider ));
-
-    return bCouldMigrate;
-}
-
-
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 9a92be9bcfe1..a32655946259 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DiagramHelper.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.18.22.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -62,26 +62,6 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::rtl::OUString;
 
-namespace
-{
-bool lcl_ChartTypeIsMemberOfCooSys(
-    const Reference< chart2::XCoordinateSystem > & xCooSys,
-    const Reference< chart2::XChartType > & xChartType )
-{
-    Reference< chart2::XChartTypeContainer > xCTCnt( xCooSys, uno::UNO_QUERY );
-    if( xCTCnt.is())
-    {
-        Sequence< Reference< chart2::XChartType > > aChartTypes( xCTCnt->getChartTypes());
-        for( sal_Int32 i=0; i<aChartTypes.getLength(); ++i )
-            if( aChartTypes[i] == xChartType )
-                return true;
-    }
-
-    return false;
-}
-
-} // anonymous namespace
-
 namespace chart
 {
 
@@ -412,11 +392,6 @@ StackMode DiagramHelper::getStackModeFromChartType(
     bool& rbFound, bool& rbAmbiguous,
     const Reference< XCoordinateSystem > & xCorrespondingCoordinateSystem )
 {
-    OSL_ASSERT( !xCorrespondingCoordinateSystem.is() ||
-                lcl_ChartTypeIsMemberOfCooSys(
-                    xCorrespondingCoordinateSystem,
-                    xChartType ));
-
     StackMode eStackMode = StackMode_NONE;
     rbFound = false;
     rbAmbiguous = false;
@@ -713,44 +688,6 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
     return 0;
 }
 
-//static
-uno::Reference< XCoordinateSystem > DiagramHelper::getCoordinateSystemOfChartType(
-              const uno::Reference< chart2::XDiagram >& xDiagram
-            , const uno::Reference< XChartType >& xGivenChartType )
-{
-    if( !xGivenChartType.is() )
-        return 0;
-
-    //iterate through the model to find the given xChartType
-    //the found parent indicates the coordinate system
-
-    //iterate through all coordinate systems
-    uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY );
-    if( !xCooSysContainer.is())
-        return 0;
-
-    uno::Sequence< uno::Reference< XCoordinateSystem > > aCooSysList( xCooSysContainer->getCoordinateSystems() );
-    for( sal_Int32 nCS = 0; nCS < aCooSysList.getLength(); ++nCS )
-    {
-        uno::Reference< XCoordinateSystem > xCooSys( aCooSysList[nCS] );
-
-        //iterate through all chart types in the current coordinate system
-        uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY );
-        OSL_ASSERT( xChartTypeContainer.is());
-        if( !xChartTypeContainer.is() )
-            continue;
-        uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() );
-        for( sal_Int32 nT = 0; nT < aChartTypeList.getLength(); ++nT )
-        {
-            uno::Reference< XChartType > xChartType( aChartTypeList[nT] );
-
-            if( xGivenChartType==xChartType )
-                return xCooSys;
-        }
-    }
-    return 0;
-}
-
 // static
 ::std::vector< Reference< XDataSeries > >
     DiagramHelper::getDataSeriesFromDiagram(
@@ -1362,29 +1299,6 @@ bool DiagramHelper::moveSeries( const Reference< XDiagram >& xDiagram, const Ref
     return bMoved;
 }
 
-sal_Int32 DiagramHelper::getIndexOfSeriesWithinChartType(
-                const Reference< XDataSeries >& xDataSeries,
-               const Reference< XChartType >& xChartType )
-{
-    sal_Int32 nRet = -1;
-
-    uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
-    if( xDataSeriesContainer.is() )
-    {
-        uno::Sequence< uno::Reference< XDataSeries > > aSeriesList( xDataSeriesContainer->getDataSeries() );
-        for( sal_Int32 nS = 0; nS < aSeriesList.getLength(); ++nS )
-        {
-            if( xDataSeries==aSeriesList[nS] )
-            {
-                nRet = nS;
-                break;
-            }
-        }
-    }
-
-    return nRet;
-}
-
 bool DiagramHelper::isSupportingFloorAndWall( const Reference<
                 chart2::XDiagram >& xDiagram )
 {
diff --git a/chart2/source/tools/ImplUndoManager.cxx b/chart2/source/tools/ImplUndoManager.cxx
index 84da1ea0f534..d5eab1b4b652 100644
--- a/chart2/source/tools/ImplUndoManager.cxx
+++ b/chart2/source/tools/ImplUndoManager.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ImplUndoManager.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -419,11 +419,6 @@ void UndoStack::limitSize( sal_Int32 nMaxSize )
     applyLimitation();
 }
 
-sal_Int32 UndoStack::getCurrentLimitation() const
-{
-    return m_nSizeLimit;
-}
-
 void UndoStack::applyLimitation()
 {
     if( m_aStack.size() > static_cast< sal_uInt32 >( m_nSizeLimit ))
diff --git a/chart2/source/tools/ImplUndoManager.hxx b/chart2/source/tools/ImplUndoManager.hxx
index 842c6ae3dbca..94d04b69a5a4 100644
--- a/chart2/source/tools/ImplUndoManager.hxx
+++ b/chart2/source/tools/ImplUndoManager.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ImplUndoManager.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -177,7 +177,6 @@ public:
     // removes all actions that have been inserted more than nMaxSize steps ago.
     // The models of those actions are disposed of
     void limitSize( sal_Int32 nMaxSize );
-    sal_Int32 getCurrentLimitation() const;
 
 private:
     void applyLimitation();
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 65377a19d3a3..83c3a1e5a059 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: LabeledDataSequence.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -164,11 +164,6 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::
     }
 }
 
-void LabeledDataSequence::fireModifyEvent()
-{
-    m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
-}
-
 // ================================================================================
 
 Sequence< OUString > LabeledDataSequence::getSupportedServiceNames_Static()
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index b27be669532c..d379d2152a38 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: MediaDescriptorHelper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -217,27 +217,6 @@ MediaDescriptorHelper::~MediaDescriptorHelper()
 }
 
     uno::Sequence< beans::PropertyValue > MediaDescriptorHelper
-::getAll()
-{
-    uno::Sequence< beans::PropertyValue > aAll( m_aRegularProperties );
-    //write properties to aAll
-    if( m_aDeprecatedProperties.getLength() )
-    {
-        sal_Int32 nCount = aAll.getLength();
-        aAll.realloc( nCount + m_aDeprecatedProperties.getLength());
-        for(sal_Int32 i=0;i<m_aDeprecatedProperties.getLength();i++)
-            aAll[nCount+i]=m_aDeprecatedProperties[i];
-    }
-    if( m_aAdditionalProperties.getLength() )
-    {
-        sal_Int32 nCount = aAll.getLength();
-        aAll.realloc(nCount + m_aAdditionalProperties.getLength());
-        for(sal_Int32 i=0;i<m_aAdditionalProperties.getLength();i++)
-            aAll[nCount+i]=m_aAdditionalProperties[i];
-    }
-    return aAll;
-}
-    uno::Sequence< beans::PropertyValue > MediaDescriptorHelper
 ::getReducedForModel()
 {
     return m_aModelProperties;
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 8fdc05e38006..42943d192c0f 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ModifyListenerHelper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -212,56 +212,5 @@ void SAL_CALL ModifyEventForwarder::disposing()
     DisposeAndClear( this );
 }
 
-// ================================================================================
-
-ModifyListenerOnDemmandRefresh::ModifyListenerOnDemmandRefresh( ::osl::Mutex & rMutex )
-        : m_rMutex( rMutex ),
-          m_bNeedsUpdate( true )
-{
-}
-
-void ModifyListenerOnDemmandRefresh::listenAtDocument(
-    const Reference< chart2::XChartDocument > & xModel )
-{
-    Reference< util::XModifyBroadcaster > xBroadcaster( xModel, uno::UNO_QUERY );
-    if( xBroadcaster.is())
-    {
-        try
-        {
-            xBroadcaster->addModifyListener( Reference< util::XModifyListener >( this ));
-        }
-        catch( const uno::Exception & ex )
-        {
-            ASSERT_EXCEPTION( ex );
-        }
-    }
-}
-
-void ModifyListenerOnDemmandRefresh::update()
-{
-    m_bNeedsUpdate = false;
-}
-
-bool ModifyListenerOnDemmandRefresh::needsUpdate() const
-{
-    return m_bNeedsUpdate;
-}
-
-// ____ XModifyListener ____
-void SAL_CALL ModifyListenerOnDemmandRefresh::modified(
-    const lang::EventObject& /* aEvent */ )
-    throw (uno::RuntimeException)
-{
-    m_bNeedsUpdate = true;
-}
-
-// ____ XEventListener (base of XModifyListener) ____
-void SAL_CALL ModifyListenerOnDemmandRefresh::disposing(
-    const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException)
-{
-    m_bNeedsUpdate = true;
-}
-
 } //  namespace ModifyListenerHelper
 } //  namespace chart
diff --git a/chart2/source/tools/OEnumeration.cxx b/chart2/source/tools/OEnumeration.cxx
index 4db2487b9266..e69de29bb2d1 100644
--- a/chart2/source/tools/OEnumeration.cxx
+++ b/chart2/source/tools/OEnumeration.cxx
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OEnumeration.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "OEnumeration.hxx"
-
-using namespace ::com::sun::star;
-
-namespace comphelper
-{
-
-OEnumeration::OEnumeration(
-    const ::std::vector< uno::Any > & rContainer ) :
-        m_aContainer( rContainer ),
-        m_aIter( m_aContainer.begin() )
-{}
-
-OEnumeration::~OEnumeration()
-{}
-
-sal_Bool SAL_CALL OEnumeration::hasMoreElements()
-    throw (uno::RuntimeException)
-{
-    return ! m_aContainer.empty();
-}
-
-uno::Any SAL_CALL OEnumeration::nextElement()
-    throw (container::NoSuchElementException,
-           lang::WrappedTargetException,
-           uno::RuntimeException)
-{
-    if( m_aIter == m_aContainer.end())
-        throw container::NoSuchElementException();
-
-    return *m_aIter++;
-}
-
-
-} //  namespace comphelper
diff --git a/chart2/source/tools/OIndexContainer.cxx b/chart2/source/tools/OIndexContainer.cxx
index cce7ca539f80..e69de29bb2d1 100644
--- a/chart2/source/tools/OIndexContainer.cxx
+++ b/chart2/source/tools/OIndexContainer.cxx
@@ -1,183 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OIndexContainer.cxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "OIndexContainer.hxx"
-#include <cppuhelper/queryinterface.hxx>
-
-using namespace ::com::sun::star;
-using ::osl::MutexGuard;
-
-namespace comphelper
-{
-
-OIndexContainer::OIndexContainer( ::osl::Mutex & rMutex ) :
-        m_rMutex( rMutex )
-{
-}
-
-OIndexContainer::~OIndexContainer()
-{
-}
-
-::osl::Mutex & OIndexContainer::GetMutex()
-{
-    return m_rMutex;
-}
-
-// ____ XInterface ____
-uno::Any SAL_CALL OIndexContainer::queryInterface( const uno::Type& aType )
-    throw (uno::RuntimeException)
-{
-    return ::cppu::queryInterface(
-        aType,
-        static_cast< container::XIndexContainer * >( this ),
-        static_cast< container::XIndexReplace * >( this ),
-        static_cast< container::XIndexAccess * >( this ),
-        static_cast< container::XElementAccess * >( this ) );
-}
-
-// ____ XIndexContainer ____
-void SAL_CALL OIndexContainer::insertByIndex( sal_Int32 Index, const uno::Any& Element )
-    throw (lang::IllegalArgumentException,
-           lang::IndexOutOfBoundsException,
-           lang::WrappedTargetException,
-           uno::RuntimeException)
-{
-    // valid range [0..size]
-    size_t nIndex( Index );
-
-    // /--
-    MutexGuard aGuard( GetMutex());
-
-    if( Index < 0 ||
-        nIndex > m_aContainer.size() )
-        throw lang::IndexOutOfBoundsException();
-
-    if( getElementType().isAssignableFrom( Element.getValueType()) )
-        throw lang::IllegalArgumentException();
-
-    if( nIndex == m_aContainer.size())
-        m_aContainer.push_back( Element );
-    else
-    {
-        m_aContainer.insert( m_aContainer.begin() + nIndex, Element );
-    }
-    // \--
-}
-
-void SAL_CALL OIndexContainer::removeByIndex( sal_Int32 Index )
-    throw (lang::IndexOutOfBoundsException,
-           lang::WrappedTargetException,
-           uno::RuntimeException)
-{
-    // valid range [0..size-1]
-    size_t nIndex( Index );
-
-    // /--
-    MutexGuard aGuard( GetMutex());
-
-    if( Index < 0 ||
-        nIndex > m_aContainer.size() )
-        throw lang::IndexOutOfBoundsException();
-
-    m_aContainer.erase( m_aContainer.begin() + nIndex );
-    // \--
-}
-
-
-// ____ XIndexReplace ____
-void SAL_CALL OIndexContainer::replaceByIndex( sal_Int32 Index, const uno::Any& Element )
-    throw (lang::IllegalArgumentException,
-           lang::IndexOutOfBoundsException,
-           lang::WrappedTargetException,
-           uno::RuntimeException)
-{
-    // valid range [0..size-1]
-    size_t nIndex( Index );
-
-    // /--
-    MutexGuard aGuard( GetMutex());
-
-    if( Index < 0 ||
-        nIndex > m_aContainer.size() )
-        throw lang::IndexOutOfBoundsException();
-
-    if( getElementType().isAssignableFrom( Element.getValueType()) )
-        throw lang::IllegalArgumentException();
-
-    m_aContainer[ nIndex ] = Element;
-    // \--
-}
-
-
-// ____ XIndexAccess ____
-sal_Int32 SAL_CALL OIndexContainer::getCount()
-    throw (uno::RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex());
-
-    return m_aContainer.size();
-    // \--
-}
-
-uno::Any SAL_CALL OIndexContainer::getByIndex( sal_Int32 Index )
-    throw (lang::IndexOutOfBoundsException,
-           lang::WrappedTargetException,
-           uno::RuntimeException)
-{
-    // valid range [0..size-1]
-    size_t nIndex( Index );
-
-    // /--
-    MutexGuard aGuard( GetMutex());
-
-    if( Index < 0 ||
-        nIndex > m_aContainer.size() )
-        throw lang::IndexOutOfBoundsException();
-
-    return m_aContainer.at( nIndex );
-    // \--
-}
-
-sal_Bool SAL_CALL OIndexContainer::hasElements()
-    throw (uno::RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex());
-
-    return ! m_aContainer.empty();
-    // \--
-}
-
-
-} //  namespace comphelper
diff --git a/chart2/source/tools/OStyle.cxx b/chart2/source/tools/OStyle.cxx
index 76b2b7036668..e69de29bb2d1 100644
--- a/chart2/source/tools/OStyle.cxx
+++ b/chart2/source/tools/OStyle.cxx
@@ -1,233 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OStyle.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "OStyle.hxx"
-#include "macros.hxx"
-#include <rtl/uuid.h>
-#include <cppuhelper/queryinterface.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-
-namespace property
-{
-
-OStyle::OStyle( const Reference< container::XNameAccess > & xStyleFamily,
-                ::osl::Mutex & par_rMutex ) :
-        OPropertySet( par_rMutex ),
-        m_xStyleFamily( xStyleFamily ),
-        m_bUserDefined( false ),
-        m_rMutex( par_rMutex )
-{}
-
-OStyle::~OStyle()
-{}
-
-::osl::Mutex & OStyle::GetMutex()
-{
-    return m_rMutex;
-}
-
-// ____ XStyle ____
-sal_Bool SAL_CALL OStyle::isUserDefined()
-    throw (uno::RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    return m_bUserDefined;
-    // \--
-}
-
-sal_Bool SAL_CALL OStyle::isInUse()
-    throw (uno::RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-
-    // aBoundLC is a member of cppuhelper::OPropertySetHelper
-    // it is assumed that a style is in use whenever some component is
-    // registered here as listener
-    return ( aBoundLC.getContainedTypes().getLength() > 0 );
-    // \--
-}
-
-OUString SAL_CALL OStyle::getParentStyle()
-    throw (uno::RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    return m_aParentStyleName;
-    // \--
-}
-
-void SAL_CALL OStyle::setParentStyle( const OUString& aParentStyle )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    m_aParentStyleName = aParentStyle;
-    // \--
-}
-
-// ____ XNamed (base of XStyle) ____
-
-OUString SAL_CALL OStyle::getName()
-    throw (uno::RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    return m_aName;
-    // \--
-}
-
-void SAL_CALL OStyle::setName( const ::rtl::OUString& aName )
-    throw (uno::RuntimeException)
-{
-    // /--
-    MutexGuard aGuard( GetMutex() );
-    OSL_ASSERT( m_xStyleFamily.is() );
-
-    // note: RuntimeException is not very apropriate for this, but I have no
-    // other choice
-    if( m_xStyleFamily->hasByName( aName ))
-    {
-        OSL_ENSURE( false, "Style name already exists!" );
-        throw uno::RuntimeException(
-            C2U( "Style name already exists: " ) + aName,
-            static_cast< style::XStyle * >( this ));
-    }
-    else
-    {
-        // ToDo: Change the name in the container (XStyleFamiliy)
-        m_aName = aName;
-    }
-    // \--
-}
-
-// ____ XInterface ____
-uno::Any SAL_CALL OStyle::queryInterface( const uno::Type& aType )
-    throw (uno::RuntimeException)
-{
-    uno::Any aResult = OPropertySet::queryInterface( aType );
-
-    if( ! aResult.hasValue())
-    {
-        return ::cppu::queryInterface(
-            aType,
-            static_cast< style::XStyle * >( this ));
-    }
-
-    return aResult;
-}
-
-// void SAL_CALL OStyle::acquire() throw ()
-// {
-//     OPropertySet::acquire();
-// }
-
-// void SAL_CALL OStyle::release() throw ()
-// {
-//     OPropertySet::release();
-// }
-
-
-
-// ____ XServiceInfo ____
-// OUString SAL_CALL
-//     OStyle::getImplementationName()
-//     throw (uno::RuntimeException)
-// {
-//     return OUString( RTL_CONSTASCII_USTRINGPARAM( "property::OStyle" ));
-// }
-
-// sal_Bool SAL_CALL
-//     OStyle::supportsService( const OUString& ServiceName )
-//     throw (uno::RuntimeException)
-// {
-//     Sequence< OUString > aServices( getSupportedServiceNames() );
-
-//     sal_Int32 nI = aServices.getLength() - 1;
-//     for( ; nI >= 0; --nI )
-//     {
-//         if( aServices[ nI ].equals( ServiceName ))
-//             return sal_True;
-//     }
-//     return sal_False;
-// }
-
-// Sequence< OUString > SAL_CALL
-//     OStyle::getSupportedServiceNames()
-//     throw (uno::RuntimeException)
-// {
-//     Sequence< OUString > aServiceNames( 2 );
-//     // from base OPropertySet
-//     aServiceNames[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.PropertySet" ));
-//     // new service
-//     aServiceNames[ 1 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.Style" ));
-//     return aServiceNames;
-// }
-
-
-// ____ XTypeProvider ____
-// Sequence< uno::Type > SAL_CALL
-//     OStyle::getTypes()
-//     throw (uno::RuntimeException)
-// {
-//     Sequence< uno::Type > aResult( OPropertySet::getTypes() );
-//     aResult.realloc( aResult.getLength() + 1 );
-//     aResult[ aResult.getLength() - 1 ] =
-//         ::getCppuType( reinterpret_cast< const Reference< style::XStyle > *>(0));
-
-//     return aResult;
-// }
-
-// Sequence< sal_Int8 > SAL_CALL
-//     OStyle::getImplementationId()
-//     throw (uno::RuntimeException)
-// {
-//  static uno::Sequence< sal_Int8 > aId;
-//  if( aId.getLength() == 0 )
-//  {
-//      aId.realloc( 16 );
-//      rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True );
-//  }
-//  return aId;
-// }
-
-
-} //  namespace property
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index db5dd56e59be..57c8ef01d5d6 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ObjectIdentifier.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.24.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -254,11 +254,6 @@ void lcl_getDiagramAndCooSys( const OUString& rObjectCID
 
 } //anonymous namespace
 
-ObjectIdentifier::ObjectIdentifier()
-{
-}
-
-
 //static
 OUString ObjectIdentifier::createClassifiedIdentifierForObject(
           const Reference< uno::XInterface >& xObject
@@ -417,35 +412,6 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
 }
 
 //static
-OUString ObjectIdentifier::createParticleForChartType(
-          const Reference< XChartType >& xChartType
-        , const Reference< frame::XModel >& xChartModel )
-{
-    OUStringBuffer aRet;
-
-    Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
-    Reference< XCoordinateSystem > xCooSys( DiagramHelper::getCoordinateSystemOfChartType( xDiagram, xChartType ) );
-    Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY );
-    if( xChartTypeContainer.is() )
-    {
-        uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() );
-        for( sal_Int32 nT = 0; nT < aChartTypeList.getLength(); ++nT )
-        {
-            uno::Reference< XChartType > xCurrentChartType( aChartTypeList[nT] );
-            if( xChartType == xCurrentChartType )
-            {
-                aRet = ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel );
-                aRet.appendAscii(":CT=");
-                aRet.append( OUString::valueOf( nT ) );
-                break;
-            }
-        }
-    }
-
-    return aRet.makeStringAndClear();
-}
-
-//static
 OUString ObjectIdentifier::createParticleForAxis(
             sal_Int32 nDimensionIndex
           , sal_Int32 nAxisIndex )
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index fc5e637ce5bb..780a5ba373d9 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: RangeHighlighter.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -69,23 +69,6 @@ void lcl_fillRanges(
     }
 }
 
-sal_Int32 lcl_getColor( const Reference< beans::XPropertySet > & xProp )
-{
-    sal_Int32 nResult = PREFERED_DEFAULT_COLOR;
-
-    try
-    {
-        if( xProp.is())
-            xProp->getPropertyValue( C2U("Color")) >>= nResult;
-    }
-    catch( const uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-
-    return nResult;
-}
-
 } // anonymous namespace
 
 namespace chart
@@ -216,7 +199,6 @@ void RangeHighlighter::fillRangesForDiagram( const Reference< chart2::XDiagram >
 void RangeHighlighter::fillRangesForDataSeries( const uno::Reference< chart2::XDataSeries > & xSeries )
 {
     sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
-//         lcl_getColor( Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ));
     Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY );
     if( xSource.is())
         lcl_fillRanges( m_aSelectedRanges,
@@ -270,7 +252,6 @@ void RangeHighlighter::fillRangesForCategories( const Reference< chart2::XAxis >
 void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface > & xDataSeries, sal_Int32 nIndex )
 {
     sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
-//         lcl_getColor( Reference< beans::XPropertySet >( xDataPoint, uno::UNO_QUERY ));
     if( xDataSeries.is())
     {
         Reference< chart2::data::XDataSource > xSource( xDataSeries, uno::UNO_QUERY );
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 2f1e9bed1c73..93ba4b43cfc3 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ReferenceSizeProvider.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,6 +37,7 @@
 #include "DiagramHelper.hxx"
 #include "macros.hxx"
 #include "AxisHelper.hxx"
+#include "DataSeriesHelper.hxx"
 
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart2/XTitle.hpp>
@@ -58,10 +59,8 @@ namespace chart
 
 ReferenceSizeProvider::ReferenceSizeProvider(
     awt::Size aPageSize,
-    awt::Size aDiagramSize,
     const Reference< XChartDocument > & xChartDoc ) :
         m_aPageSize( aPageSize ),
-        m_aDiagramSize( aDiagramSize ),
         m_xChartDoc( xChartDoc ),
         m_bUseAutoScale( getAutoResizeState( xChartDoc ) == AUTO_RESIZE_YES )
 {}
@@ -71,11 +70,6 @@ awt::Size ReferenceSizeProvider::getPageSize() const
     return m_aPageSize;
 }
 
-awt::Size ReferenceSizeProvider::getDiagramSize() const
-{
-    return m_aDiagramSize;
-}
-
 bool ReferenceSizeProvider::useAutoScale() const
 {
     return m_bUseAutoScale;
@@ -115,7 +109,7 @@ void ReferenceSizeProvider::setValuesAtTitle(
             }
         }
 
-        setValuesAtPropertySet( xTitleProp, REF_PAGE, /* bAdaptFontSizes = */ false );
+        setValuesAtPropertySet( xTitleProp, /* bAdaptFontSizes = */ false );
     }
     catch( const uno::Exception & ex )
     {
@@ -145,7 +139,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries()
                 {
                     for( sal_Int32 i=0; i< aPointIndexes.getLength(); ++i )
                         setValuesAtPropertySet(
-                            (*aIt)->getDataPointByIndex( aPointIndexes[i] ), REF_DIAGRAM );
+                            (*aIt)->getDataPointByIndex( aPointIndexes[i] ) );
                 }
             }
             catch( const uno::Exception & ex )
@@ -154,26 +148,23 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries()
             }
 
             //it is important to correct the datapoint properties first as they do reference the series properties
-            setValuesAtPropertySet( xSeriesProp, REF_DIAGRAM );
+            setValuesAtPropertySet( xSeriesProp );
         }
     }
 }
 
 void ReferenceSizeProvider::setValuesAtPropertySet(
     const Reference< beans::XPropertySet > & xProp,
-    ReferenceSizeProvider::ReferenceSizeType eType,
     bool bAdaptFontSizes /* = true */ )
 {
     if( ! xProp.is())
         return;
 
-    static const OUString aPageRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
-    static const OUString aDiaRefStr(  RTL_CONSTASCII_USTRINGPARAM("ReferenceDiagramSize"));
+    static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
 
     try
     {
-        OUString aRefSizeName( (eType == REF_PAGE) ? aPageRefStr : aDiaRefStr );
-        awt::Size aRefSize( (eType == REF_PAGE) ? getPageSize() : getDiagramSize() );
+        awt::Size aRefSize( getPageSize() );
         awt::Size aOldRefSize;
         bool bHasOldRefSize( xProp->getPropertyValue( aRefSizeName ) >>= aOldRefSize );
 
@@ -202,18 +193,16 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
 
 void ReferenceSizeProvider::getAutoResizeFromPropSet(
     const Reference< beans::XPropertySet > & xProp,
-    ReferenceSizeProvider::ReferenceSizeType eType,
     ReferenceSizeProvider::AutoResizeState & rInOutState )
 {
-    static const OUString aPageRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
-    static const OUString aDiaRefStr(  RTL_CONSTASCII_USTRINGPARAM("ReferenceDiagramSize"));
+    static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
     AutoResizeState eSingleState = AUTO_RESIZE_UNKNOWN;
 
     if( xProp.is())
     {
         try
         {
-            if( xProp->getPropertyValue((eType == REF_PAGE) ? aPageRefStr : aDiaRefStr ).hasValue())
+            if( xProp->getPropertyValue( aRefSizeName ).hasValue())
                 eSingleState = AUTO_RESIZE_YES;
             else
                 eSingleState = AUTO_RESIZE_NO;
@@ -243,7 +232,7 @@ void ReferenceSizeProvider::getAutoResizeFromTitle(
 {
     Reference< beans::XPropertySet > xProp( xTitle, uno::UNO_QUERY );
     if( xProp.is())
-        getAutoResizeFromPropSet( xProp, REF_PAGE, rInOutState );
+        getAutoResizeFromPropSet( xProp, rInOutState );
 }
 
 void ReferenceSizeProvider::impl_getAutoResizeFromTitled(
@@ -298,7 +287,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
     // Legend
     Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY );
     if( xLegendProp.is())
-        getAutoResizeFromPropSet( xLegendProp, REF_PAGE, eResult );
+        getAutoResizeFromPropSet( xLegendProp, eResult );
     if( eResult == AUTO_RESIZE_AMBIGUOUS )
         return eResult;
 
@@ -308,7 +297,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
     {
         Reference< beans::XPropertySet > xProp( aAxes[i], uno::UNO_QUERY );
         if( xProp.is())
-            getAutoResizeFromPropSet( xProp, REF_DIAGRAM, eResult );
+            getAutoResizeFromPropSet( xProp, eResult );
         Reference< XTitled > xTitled( aAxes[i], uno::UNO_QUERY );
         if( xTitled.is())
         {
@@ -328,7 +317,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
         Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY );
         if( xSeriesProp.is())
         {
-            getAutoResizeFromPropSet( xSeriesProp, REF_DIAGRAM, eResult );
+            getAutoResizeFromPropSet( xSeriesProp, eResult );
             if( eResult == AUTO_RESIZE_AMBIGUOUS )
                 return eResult;
 
@@ -341,8 +330,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
                     for( sal_Int32 i=0; i< aPointIndexes.getLength(); ++i )
                     {
                         getAutoResizeFromPropSet(
-                            (*aIt)->getDataPointByIndex( aPointIndexes[i] ),
-                            REF_DIAGRAM, eResult );
+                            (*aIt)->getDataPointByIndex( aPointIndexes[i] ), eResult );
                         if( eResult == AUTO_RESIZE_AMBIGUOUS )
                             return eResult;
                     }
@@ -385,7 +373,7 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz
     // Legend
     Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY );
     if( xLegendProp.is())
-        setValuesAtPropertySet( xLegendProp, REF_PAGE );
+        setValuesAtPropertySet( xLegendProp );
 
     // Axes (incl. Axis Titles)
     Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) );
@@ -393,7 +381,7 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz
     {
         Reference< beans::XPropertySet > xProp( aAxes[i], uno::UNO_QUERY );
         if( xProp.is())
-            setValuesAtPropertySet( xProp, REF_DIAGRAM );
+            setValuesAtPropertySet( xProp );
         impl_setValuesAtTitled( Reference< XTitled >( aAxes[i], uno::UNO_QUERY ));
     }
 
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 9372bee0d14a..7686b2c7009d 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: RegressionCurveHelper.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -138,12 +138,6 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
 // ------------------------------------------------------------
 
 // static
-Reference< XRegressionCurveCalculator > RegressionCurveHelper::createMeanValueLineCalculator()
-{
-    return Reference< XRegressionCurveCalculator >( new MeanValueRegressionCurveCalculator());
-}
-
-// static
 Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName(
     ::rtl::OUString aServiceName )
 {
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 48a33bf00b6d..24e55ccfc90e 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: TitleHelper.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,56 +46,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 
-namespace
-{
-
-rtl::OUString lcl_getIdentifierForTitle( TitleHelper::eTitleType nTitleIndex )
-{
-    switch( nTitleIndex )
-    {
-        case TitleHelper::MAIN_TITLE:
-        {
-            static rtl::OUString m_aIdentifier( C2U( "@main-title" ) );
-            return m_aIdentifier;
-        }
-        case TitleHelper::SUB_TITLE:
-        {
-            static rtl::OUString m_aIdentifier( C2U( "@sub-title" ) );
-            return m_aIdentifier;
-        }
-        case TitleHelper::X_AXIS_TITLE:
-        {
-            static rtl::OUString m_aIdentifier( C2U( "@xaxis-title" ) );
-            return m_aIdentifier;
-        }
-        case TitleHelper::Y_AXIS_TITLE:
-        {
-            static rtl::OUString m_aIdentifier( C2U( "@yaxis-title" ) );
-            return m_aIdentifier;
-        }
-        case TitleHelper::Z_AXIS_TITLE:
-        {
-            static rtl::OUString m_aIdentifier( C2U( "@zaxis-title" ) );
-            return m_aIdentifier;
-        }
-        case TitleHelper::SECONDARY_X_AXIS_TITLE:
-        {
-            static rtl::OUString m_aIdentifier( C2U( "@secondaryxaxis-title" ) );
-            return m_aIdentifier;
-        }
-        case TitleHelper::SECONDARY_Y_AXIS_TITLE:
-        {
-            static rtl::OUString m_aIdentifier( C2U( "@secondaryyaxis-title" ) );
-            return m_aIdentifier;
-        }
-        default:
-            OSL_ENSURE( false, "Unsupported Title-Type requested" );
-            return ::rtl::OUString();
-    }
-}
-
-} //anonymous namespace
-
 uno::Reference< XTitled > lcl_getTitleParentFromDiagram(
       TitleHelper::eTitleType nTitleIndex
     , const uno::Reference< XDiagram >& xDiagram )
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx
index 37906d77b6a0..8f3d732ec877 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: WeakListenerAdapter.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -43,11 +43,6 @@ namespace chart
 {
 
 WeakModifyListenerAdapter::WeakModifyListenerAdapter(
-    const Reference< util::XModifyListener > & xListener ) :
-        WeakListenerAdapter< ::com::sun::star::util::XModifyListener >( xListener )
-{}
-
-WeakModifyListenerAdapter::WeakModifyListenerAdapter(
     const uno::WeakReference< util::XModifyListener > & xListener ) :
         WeakListenerAdapter< ::com::sun::star::util::XModifyListener >( xListener )
 {}
@@ -70,11 +65,6 @@ WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter(
         WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener )
 {}
 
-WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter(
-    const uno::WeakReference< view::XSelectionChangeListener > & xListener ) :
-        WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener )
-{}
-
 WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter()
 {}
 
diff --git a/chart2/source/tools/makefile.mk b/chart2/source/tools/makefile.mk
index ef78453194c8..a6e05c8e9a68 100644
--- a/chart2/source/tools/makefile.mk
+++ b/chart2/source/tools/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.28 $
+# $Revision: 1.28.42.2 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -59,7 +59,6 @@ SLOFILES=	\
     $(SLO)$/ObjectIdentifier.obj \
     $(SLO)$/CachedDataSequence.obj \
     $(SLO)$/CommonConverters.obj \
-    $(SLO)$/ContextHelper.obj \
     $(SLO)$/DataSeriesHelper.obj \
     $(SLO)$/DataSource.obj \
     $(SLO)$/DataSourceHelper.obj \
@@ -71,15 +70,12 @@ SLOFILES=	\
     $(SLO)$/LinearRegressionCurveCalculator.obj \
     $(SLO)$/LogarithmicRegressionCurveCalculator.obj \
     $(SLO)$/MeanValueRegressionCurveCalculator.obj \
-    $(SLO)$/OEnumeration.obj \
-    $(SLO)$/OIndexContainer.obj \
     $(SLO)$/OPropertySet.obj \
     $(SLO)$/WrappedPropertySet.obj \
     $(SLO)$/WrappedProperty.obj \
     $(SLO)$/WrappedIgnoreProperty.obj \
     $(SLO)$/WrappedDefaultProperty.obj \
     $(SLO)$/WrappedDirectStateProperty.obj \
-    $(SLO)$/OStyle.obj \
     $(SLO)$/PotentialRegressionCurveCalculator.obj \
     $(SLO)$/RegressionCurveHelper.obj \
     $(SLO)$/RegressionCurveModel.obj \
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 9f24b193276e..29e4fc0d06da 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ScaleAutomatism.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -185,6 +185,11 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
     }
 }
 
+ScaleData ScaleAutomatism::getScale() const
+{
+    return m_aSourceScale;
+}
+
 // private --------------------------------------------------------------------
 
 void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx
index 3202b6311476..25de4dc61864 100644
--- a/chart2/source/view/axes/TickmarkHelper.cxx
+++ b/chart2/source/view/axes/TickmarkHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: TickmarkHelper.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -344,11 +344,6 @@ double TickmarkHelper::getMaximumAtIncrement( double fMax, const ExplicitIncreme
     return fRet;
 }
 
-double TickmarkHelper::getScaledWidth() const
-{
-    return m_fScaledVisibleMax - m_fScaledVisibleMin;
-}
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -557,20 +552,6 @@ bool TickmarkHelper::isVisible( double fScaledValue ) const
     return true;
 }
 
-bool TickmarkHelper::isPostEquidistant( sal_Int32 nDepth ) const
-{
-    if( nDepth<0 || nDepth>m_rIncrement.SubIncrements.getLength() )
-    {
-        DBG_ERROR("invalid depth for tickmark");
-        return true;
-    }
-
-    if( nDepth==0 )
-        return m_rIncrement.PostEquidistant;
-
-    return m_rIncrement.SubIncrements[nDepth-1].PostEquidistant;
-}
-
 void TickmarkHelper::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
 {
     uno::Sequence< uno::Sequence< double > > aAllTicks;
diff --git a/chart2/source/view/axes/TickmarkHelper.hxx b/chart2/source/view/axes/TickmarkHelper.hxx
index 4e758aa0ceb5..287635ee9487 100644
--- a/chart2/source/view/axes/TickmarkHelper.hxx
+++ b/chart2/source/view/axes/TickmarkHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: TickmarkHelper.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -156,14 +156,11 @@ public:
 
     void          getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
     void          getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
-    bool          isPostEquidistant( sal_Int32 nDepth ) const;
 
     //
     static double getMinimumAtIncrement( double fMin, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement );
     static double getMaximumAtIncrement( double fMax, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement );
 
-    double        getScaledWidth() const;
-
 protected: //methods
     void        addSubTicks( sal_Int32 nDepth,
                         ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index b152210134ea..6e43ebc75b67 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VCoordinateSystem.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.36.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -333,23 +333,6 @@ ExplicitIncrementData VCoordinateSystem::getExplicitIncrement( sal_Int32 nDimens
     return aRet;
 }
 
-sal_Int32 VCoordinateSystem::getMaximumIncrementIndexByDimension( sal_Int32 nDimensionIndex ) const
-{
-    sal_Int32 nRet = 0;
-    tFullExplicitIncrementMap::const_iterator aIt = m_aSecondaryExplicitIncrements.begin();
-    tFullExplicitIncrementMap::const_iterator aEnd = m_aSecondaryExplicitIncrements.end();
-    for(; aIt!=aEnd; ++aIt)
-    {
-        if(aIt->first.first==nDimensionIndex)
-        {
-            sal_Int32 nLocalIdx = aIt->first.second;
-            if( nRet < nLocalIdx )
-                nRet = nLocalIdx;
-        }
-    }
-    return nRet;
-}
-
 rtl::OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
 {
     rtl::OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) );
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 770f8791f372..f9278b94b245 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VPolarGrid.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -117,7 +117,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis(
     else
         rPoints[0].realloc(0);
 }
-
+#ifdef NOTYET
 void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicTarget
         , ::std::vector< ::std::vector< TickInfo > >& /* rRadiusTickInfos */
         , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
@@ -176,6 +176,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
         m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") );
     }
 }
+#endif
 
 void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget
         , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index 672b7da09c5c..74cd7fac27ed 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VPolarGrid.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -85,10 +85,12 @@ private: //member
                     , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
                     , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
                     , const ::std::vector<VLineProperties>& rLinePropertiesList );
+#if NOTYET
     void    create2DAngleGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget
                     , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
                     , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
                     , const ::std::vector<VLineProperties>& rLinePropertiesList );
+#endif
 };
 
 //.............................................................................
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 1bc61f8ca0e8..1401ab43a159 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AreaChart.cxx,v $
- * $Revision: 1.54 $
+ * $Revision: 1.53.42.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -862,15 +862,7 @@ void AreaChart::createShapes()
                         drawing::Direction3D aSymbolSize(0,0,0);
                         if( bCreateSymbol )
                         {
-                            if(m_nDimension==3)
-                            {
-                                /* //no symbols for 3D
-                                m_pShapeFactory->createSymbol3D( xPointGroupShape_Shapes
-                                        , aScenePosition, aTransformedGeom.m_aSize
-                                        , (*aSeriesIter)->getSymbolTypeOfPoint( nIndex ) );
-                                        */
-                            }
-                            else //m_nDimension!=3
+                            if(m_nDimension!=3)
                             {
                                 if( pSymbolProperties )
                                 {
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index 4afa853b702f..2a42c3ab87ce 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: CategoryPositionHelper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -56,14 +56,6 @@ CategoryPositionHelper::CategoryPositionHelper( const CategoryPositionHelper& rS
 {
 }
 
-CategoryPositionHelper::CategoryPositionHelper()
-    : m_fSeriesCount(1.0)
-    , m_fCategoryWidth(1.0)
-    , m_fInnerDistance(0.0)
-    , m_fOuterDistance(0.0)
-{
-}
-
 CategoryPositionHelper::~CategoryPositionHelper()
 {
 }
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
index fa59bfa14169..dea85190d528 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: CategoryPositionHelper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,7 +45,6 @@ class CategoryPositionHelper
 public:
     CategoryPositionHelper( double fSeriesCount, double CategoryWidth = 1.0);
     CategoryPositionHelper( const CategoryPositionHelper& rSource );
-    CategoryPositionHelper();
     virtual ~CategoryPositionHelper();
 
     double getSlotWidth() const;
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 7266c4d931a2..774ea4dd5815 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: PieChart.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.20.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -197,13 +197,6 @@ APPHELPER_XSERVICEINFO_IMPL(PieChart,CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION
 }
 */
 
-bool PieChart::isSingleRingChart() const
-{
-    if( m_aZSlots.size() == 1 && m_aZSlots[0].size() ==1 )
-        return true;
-    return !m_bUseRings;
-}
-
 uno::Reference< drawing::XShape > PieChart::createDataPoint(
           const uno::Reference< drawing::XShapes >& xTarget
         , const uno::Reference< beans::XPropertySet >& xObjectProperties
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index 51e1ded6d9fc..e65cfdcc5626 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: PieChart.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -105,7 +105,6 @@ private: //methods
                         , double fLogicZ, double fDepth, double fExplodePercentage
                         , tPropertyNameValueMap* pOverWritePropertiesMap );
 
-    bool                isSingleRingChart() const;
     double              getMaxOffset() const;
     bool                detectLabelOverlapsAndMove(const ::com::sun::star::awt::Size& rPageSize);//returns true when there might be more to do
     void                resetLabelPositionsToPreviousState();
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 2266d72d7370..a684b9a3228e 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Splines.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -62,95 +62,6 @@ struct lcl_EqualsFirstDoubleOfPair : ::std::binary_function< ::std::pair< double
 
 //-----------------------------------------------------------------------------
 
-struct Point3D
-{
-    Point3D( double X, double Y, double Z );
-    Point3D();
-
-    double X;
-    double Y;
-    double Z;
-};
-Point3D::Point3D( double fX, double fY, double fZ )
-: X(fX), Y(fY), Z(fZ)
-{
-}
-Point3D::Point3D()
-: X(0.0), Y(0.0), Z(0.0)
-{
-}
-
-typedef ::std::vector< Point3D >  t3DPointVecType;
-
-
-struct lcl_LessXOfPoint3D : ::std::binary_function< Point3D, Point3D, bool >
-{
-    inline bool operator() ( const Point3D& rOne, const Point3D& rOther )
-    {
-        return ( rOne.X < rOther.X );
-    }
-};
-
-t3DPointVecType lcl_makeVector3D( const drawing::PolyPolygonShape3D& rPoly, sal_Int32 nPolyIndex=0 )
-{
-    t3DPointVecType aRet;
-    if(nPolyIndex>=0&&nPolyIndex<rPoly.SequenceX.getLength())
-    {
-        sal_Int32 nPointCount = rPoly.SequenceX[nPolyIndex].getLength();
-        if(nPointCount)
-        {
-            const double* pXSequence = rPoly.SequenceX[nPolyIndex].getConstArray();
-            const double* pYSequence = rPoly.SequenceY[nPolyIndex].getConstArray();
-            const double* pZSequence = rPoly.SequenceZ[nPolyIndex].getConstArray();
-            aRet.resize(nPointCount);
-            for(sal_Int32 nN=0;nN<nPointCount;nN++)
-            {
-                aRet[ nN ].X  = pXSequence[nN];
-                aRet[ nN ].Y  = pYSequence[nN];
-                aRet[ nN ].Z  = pZSequence[nN];
-            }
-        }
-    }
-    return aRet;
-}
-
-void lcl_makePolygonFromVector3D( const t3DPointVecType& rVector, drawing::PolyPolygonShape3D& rPoly )
-{
-    sal_Int32 nPointCount = static_cast<sal_Int32>(rVector.size());
-
-    rPoly.SequenceX.realloc(1);
-    rPoly.SequenceY.realloc(1);
-    rPoly.SequenceZ.realloc(1);
-    rPoly.SequenceX[0].realloc( nPointCount );
-    rPoly.SequenceY[0].realloc( nPointCount );
-    rPoly.SequenceZ[0].realloc( nPointCount );
-
-    if(!nPointCount)
-        return;
-
-    double* pXSequence = rPoly.SequenceX[0].getArray();
-    double* pYSequence = rPoly.SequenceY[0].getArray();
-    double* pZSequence = rPoly.SequenceZ[0].getArray();
-
-    for(sal_Int32 nN=0;nN<nPointCount;nN++)
-    {
-        Point3D aP = rVector[nN];
-        pXSequence[nN] = aP.X;
-        pYSequence[nN] = aP.Y;
-        pZSequence[nN] = aP.Z;
-    }
-}
-
-void lcl_getSortedPolyPolygonShape3D( const drawing::PolyPolygonShape3D& rUnsortedInput, drawing::PolyPolygonShape3D& rSortedOutput )
-{
-
-    t3DPointVecType aVector = lcl_makeVector3D( rUnsortedInput);
-    ::std::sort( aVector.begin(), aVector.end(), lcl_LessXOfPoint3D() );
-    lcl_makePolygonFromVector3D( aVector, rSortedOutput );
-}
-
-//-----------------------------------------------------------------------------
-
 typedef ::std::pair< double, double >   tPointType;
 typedef ::std::vector< tPointType >     tPointVecType;
 typedef tPointVecType::size_type        lcl_tSizeType;
@@ -344,30 +255,6 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x )
              ( h*h ) / 6.0 );
 }
 
-tPointVecType makeVector( const drawing::PolyPolygonShape3D& rPoly, sal_Int32 nPolyIndex=0 )
-{
-    //creates a vector from only one poly within the PolyPolygon
-    //the third dimension is ignored (3D->2D)
-
-    tPointVecType aRet;
-    if(nPolyIndex>=0&&nPolyIndex<rPoly.SequenceX.getLength())
-    {
-        sal_Int32 nPointCount = rPoly.SequenceX[nPolyIndex].getLength();
-        if(nPointCount)
-        {
-            const double* pXSequence = rPoly.SequenceX[nPolyIndex].getConstArray();
-            const double* pYSequence = rPoly.SequenceY[nPolyIndex].getConstArray();
-            aRet.resize(nPointCount);
-            for(sal_Int32 nN=0;nN<nPointCount;nN++)
-            {
-                aRet[ nN ].first  = pXSequence[nN];
-                aRet[ nN ].second = pYSequence[nN];
-            }
-        }
-    }
-    return aRet;
-}
-
 //-----------------------------------------------------------------------------
 
 //create knot vector for B-spline
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index ffb9484cd09c..1f37ae7c3aea 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VSeriesPlotter.cxx,v $
- * $Revision: 1.44 $
+ * $Revision: 1.44.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1693,15 +1693,15 @@ uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const
 
 namespace
 {
-struct lcl_setDiaRefSizeAtSeriesGroup : public ::std::unary_function< VDataSeriesGroup, void >
+struct lcl_setRefSizeAtSeriesGroup : public ::std::unary_function< VDataSeriesGroup, void >
 {
-    lcl_setDiaRefSizeAtSeriesGroup( awt::Size aRefSize ) : m_aRefSize( aRefSize ) {}
+    lcl_setRefSizeAtSeriesGroup( awt::Size aRefSize ) : m_aRefSize( aRefSize ) {}
     void operator()( VDataSeriesGroup & rGroup )
     {
         ::std::vector< VDataSeries* >::iterator aIt( rGroup.m_aSeriesVector.begin());
         const ::std::vector< VDataSeries* >::iterator aEndIt( rGroup.m_aSeriesVector.end());
         for( ; aIt != aEndIt; ++aIt )
-            (*aIt)->setDiagramReferenceSize( m_aRefSize );
+            (*aIt)->setPageReferenceSize( m_aRefSize );
     }
 
 private:
@@ -1709,20 +1709,15 @@ private:
 };
 } // anonymous namespace
 
-void VSeriesPlotter::setDiagramReferenceSize( const ::com::sun::star::awt::Size & rDiagramRefSize )
+void VSeriesPlotter::setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize )
 {
-    m_aDiagramReferenceSize = rDiagramRefSize;
+    m_aPageReferenceSize = rPageRefSize;
 
     // set reference size also at all data series
 
     ::std::vector< VDataSeriesGroup > aSeriesGroups( FlattenVector( m_aZSlots ));
     ::std::for_each( aSeriesGroups.begin(), aSeriesGroups.end(),
-                     lcl_setDiaRefSizeAtSeriesGroup( m_aDiagramReferenceSize ));
-}
-
-void VSeriesPlotter::setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize )
-{
-    m_aPageReferenceSize = rPageRefSize;
+                     lcl_setRefSizeAtSeriesGroup( m_aPageReferenceSize ));
 }
 
 //better performance for big data
diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx
index 0023e0434655..8b14869aa773 100644
--- a/chart2/source/view/inc/LabelPositionHelper.hxx
+++ b/chart2/source/view/inc/LabelPositionHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: LabelPositionHelper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -60,8 +60,6 @@ public:
 
     ::com::sun::star::awt::Point transformSceneToScreenPosition(
             const ::com::sun::star::drawing::Position3D& rScenePosition3D ) const;
-    ::com::sun::star::awt::Point transformScaledLogicToScreenPosition(
-            const ::com::sun::star::drawing::Position3D& rScenePosition3D ) const;
 
     static void changeTextAdjustment( tAnySequence& rPropValues, const tNameSequence& rPropNames, LabelAlignment eAlignment);
     static void doDynamicFontResize(  tAnySequence& rPropValues, const tNameSequence& rPropNames
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx
index a286f31d3bcd..bd16fbab4eb4 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ScaleAutomatism.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -83,6 +83,8 @@ public:
                             ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale,
                             ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ) const;
 
+    ::com::sun::star::chart2::ScaleData getScale() const;
+
 private:
     /** Fills the passed scale data and increment data for category scaling. */
     void                calculateExplicitIncrementAndScaleForCategory(
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx
index 1297d2e4385a..63a7c7558a5b 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ShapeFactory.hxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -150,14 +150,6 @@ public:
                     , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-        createSymbol3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget
-                    , const ::com::sun::star::drawing::Position3D& rPos
-                    , const ::com::sun::star::drawing::Direction3D& rSize
-                    , sal_Int32 nStandardSymbol
-                    , sal_Int32 nBorderColor=0
-                    , sal_Int32 nFillColor=0 );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
         createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget
                     , const ::com::sun::star::drawing::PointSequenceSequence& rPoints
                     , const VLineProperties* pLineProperties = NULL );
diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx
index c90968294a98..fe3a728daa02 100644
--- a/chart2/source/view/inc/Stripe.hxx
+++ b/chart2/source/view/inc/Stripe.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Stripe.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -72,8 +72,6 @@ public:
     ::com::sun::star::drawing::Position3D GetPosition3() const { return m_aPoint3; }
     ::com::sun::star::drawing::Position3D GetPosition4() const { return m_aPoint4; }
 
-    ::com::sun::star::drawing::Direction3D GetDirectionTo4() const;
-
 private:
     ::com::sun::star::drawing::Position3D m_aPoint1;
     ::com::sun::star::drawing::Position3D m_aPoint2;
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index b183e02cfb4e..f9a575be0123 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VCoordinateSystem.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.36.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -146,8 +146,6 @@ protected: //methods
 
     void prepareScaleAutomatism( ScaleAutomatism& rScaleAutomatism, double fMin, double fMax, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
 
-    sal_Int32 getMaximumIncrementIndexByDimension( sal_Int32 nDimensionIndex ) const;
-
     rtl::OUString createCIDForAxis( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XAxis >& xAxis
                     , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index a7437db88d2e..d3f14a9a1bdd 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VDataSeries.hxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.21.8.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -86,7 +86,7 @@ public:
     void setCategoryXAxis();
     void setParticle( const rtl::OUString& rSeriesParticle );
     void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex );
-    void setDiagramReferenceSize( const ::com::sun::star::awt::Size & rDiagramRefSize );
+    void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
 
     sal_Int32   getTotalPointCount() const;
     double      getX( sal_Int32 index ) const;
diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx
index f1e8b7189d94..321c171223ea 100644
--- a/chart2/source/view/inc/VLegendSymbolFactory.hxx
+++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VLegendSymbolFactory.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -63,18 +63,6 @@ public:
             tPropertyType ePropertyType,
             const ::com::sun::star::uno::Any& rExplicitSymbol /*should contain a ::com::sun::star::chart2::Symbol without automatic symbol if the charttype does support symbols else empty*/);
 
-    /// @param bWhiteDay: if <FALSE/> this symbol is for BlackDays
-    static ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShape >
-        createJapaneseCandleStickSymbol(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShapes > xSymbolContainer,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XMultiServiceFactory > & xShapeFactory,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & xLegendEntryProperties,
-            bool bWhiteDay );
-
     enum tStockLineType
     {
         STOCK_LINE_TYPE_VERT,
@@ -82,17 +70,6 @@ public:
         STOCK_LINE_TYPE_CLOSE
     };
 
-    static ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShape >
-        createStockLineSymbol(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShapes > xSymbolContainer,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XMultiServiceFactory > & xShapeFactory,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & xLegendEntryProperties,
-            tStockLineType eType );
-
 private:
      VLegendSymbolFactory();
 };
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 27671de5f7f2..b5ea7f7c2bfd 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VSeriesPlotter.hxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -285,8 +285,6 @@ public:
     //get series names for the z axis labels
     ::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const;
 
-    void setDiagramReferenceSize( const ::com::sun::star::awt::Size & rDiagramRefSize );
-
     void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
     //better performance for big data
     void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution );
@@ -448,7 +446,6 @@ private: //member
 
     typedef std::map< sal_Int32 , PlottingPositionHelper* > tSecondaryPosHelperMap;
     mutable tSecondaryPosHelperMap   m_aSecondaryPosHelperMap;
-    ::com::sun::star::awt::Size      m_aDiagramReferenceSize;
     ::com::sun::star::awt::Size      m_aPageReferenceSize;
 };
 
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index c14aa06456f3..fcae915faa51 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartItemPool.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.9.42.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -68,13 +68,6 @@ struct ChartItemPoolInitialization
 namespace chart
 {
 
-ChartItemPool * GetChartItemPool()
-{
-    return rtl_Instance< ChartItemPool, ChartItemPoolInitialization, ::osl::MutexGuard,
-        ::osl::GetGlobalMutex >::create(
-            ChartItemPoolInitialization(), ::osl::GetGlobalMutex());
-}
-
 ChartItemPool::ChartItemPool():
         SfxItemPool( String( RTL_CONSTASCII_USTRINGPARAM( "ChartItemPool" )), SCHATTR_START, SCHATTR_END, NULL, NULL )
 {
diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx
index dbc51e4fabe1..98d52b30b374 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartItemPool.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -53,10 +53,6 @@ public:
     static SfxItemPool* CreateChartItemPool();
 };
 
-/** global function to get a singleton ChartItemPool
- */
-ChartItemPool * GetChartItemPool();
-
 } //  namespace chart
 
 #endif
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index b17a3b5337cf..28be0740d23d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartView.cxx,v $
- * $Revision: 1.47 $
+ * $Revision: 1.46.22.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -551,17 +551,18 @@ public:
 
     void initializeCooSysAndSeriesPlotter( const uno::Reference< frame::XModel >& xChartModel );
     void initAxisUsageList();
-    void doAutoScaling();
+    void doAutoScaling( const uno::Reference< frame::XModel >& xChartModel );
     void updateScalesAndIncrementsOnAxes();
     void setScalesFromCooSysToPlotter();
     void setNumberFormatsFromAxes();
     drawing::Direction3D getPreferredAspectRatio();
-    bool shouldKeep2DAspectRatio();
 
     std::vector< VSeriesPlotter* >& getSeriesPlotterList() { return m_aSeriesPlotterList; }
     std::vector< VCoordinateSystem* >& getCooSysList() { return m_rVCooSysList; }
     std::vector< LegendEntryProvider* > getLegendEntryProviderList();
 
+    void AdaptScaleOfYAxisWithoutAttachedSeries( const uno::Reference< frame::XModel >& xChartModel );
+
 private:
     std::vector< VSeriesPlotter* > m_aSeriesPlotterList;
     std::vector< VCoordinateSystem* >& m_rVCooSysList;
@@ -882,7 +883,7 @@ void SeriesPlotterContainer::updateScalesAndIncrementsOnAxes()
         m_rVCooSysList[nC]->updateScalesAndIncrementsOnAxes();
 }
 
-void SeriesPlotterContainer::doAutoScaling()
+void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel >& xChartModel )
 {
     //precondition: need a initialized m_aSeriesPlotterList
     //precondition: need a initialized m_aAxisUsageList
@@ -947,6 +948,109 @@ void SeriesPlotterContainer::doAutoScaling()
                 aVCooSysList_Z[nC]->setExplicitScaleAndIncrement( 2, nAxisIndex, aExplicitScale, aExplicitIncrement );
         }
     }
+    AdaptScaleOfYAxisWithoutAttachedSeries( xChartModel );
+}
+
+void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::Reference< frame::XModel >& xChartModel )
+{
+    //issue #i80518#
+
+    ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator             aAxisIter    = m_aAxisUsageList.begin();
+    const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
+
+    for( sal_Int32 nAxisIndex=0; nAxisIndex<=m_nMaxAxisIndex; nAxisIndex++ )
+    {
+        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+        {
+            AxisUsage& rAxisUsage = (*aAxisIter).second;
+            ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex );
+            if( !aVCooSysList_Y.size() )
+                continue;
+
+            uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
+            if( xDiagram.is() )
+            {
+                bool bSeriesAttachedToThisAxis = false;
+                sal_Int32 nAttachedAxisIndex = -1;
+                {
+                    ::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+                    ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
+                    for( ; aIter != aSeriesVector.end(); aIter++ )
+                    {
+                        sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
+                        if( nAxisIndex == nCurrentIndex )
+                        {
+                            bSeriesAttachedToThisAxis = true;
+                            break;
+                        }
+                        else if( nAttachedAxisIndex<0 || nAttachedAxisIndex>nCurrentIndex )
+                            nAttachedAxisIndex=nCurrentIndex;
+                    }
+                }
+
+                if( !bSeriesAttachedToThisAxis && nAttachedAxisIndex >= 0 )
+                {
+                    for( size_t nC = 0; nC < aVCooSysList_Y.size(); ++nC )
+                    {
+                        aVCooSysList_Y[nC]->prepareScaleAutomatismForDimensionAndIndex( rAxisUsage.aScaleAutomatism, 1, nAttachedAxisIndex );
+
+                        ExplicitScaleData aExplicitScaleSource = aVCooSysList_Y[nC]->getExplicitScale( 1,nAttachedAxisIndex );
+                        ExplicitIncrementData aExplicitIncrementSource = aVCooSysList_Y[nC]->getExplicitIncrement( 1,nAttachedAxisIndex );
+
+                        ExplicitScaleData aExplicitScaleDest = aVCooSysList_Y[nC]->getExplicitScale( 1,nAxisIndex );;
+                        ExplicitIncrementData aExplicitIncrementDest = aVCooSysList_Y[nC]->getExplicitIncrement( 1,nAxisIndex );;
+
+                        aExplicitScaleDest.Orientation = aExplicitScaleSource.Orientation;
+                        aExplicitScaleDest.Scaling = aExplicitScaleSource.Scaling;
+                        aExplicitScaleDest.Breaks = aExplicitScaleSource.Breaks;
+                        aExplicitScaleDest.AxisType = aExplicitScaleSource.AxisType;
+
+                        aExplicitIncrementDest.BaseValue = aExplicitIncrementSource.BaseValue;
+
+                        ScaleData aScale( rAxisUsage.aScaleAutomatism.getScale() );
+                        if( !aScale.Minimum.hasValue() )
+                        {
+                            bool bNewMinOK = true;
+                            double fMax=0.0;
+                            if( aScale.Maximum >>= fMax )
+                                bNewMinOK = (aExplicitScaleSource.Minimum <= fMax);
+                            if( bNewMinOK )
+                                aExplicitScaleDest.Minimum = aExplicitScaleSource.Minimum;
+                        }
+                        else
+                            aExplicitIncrementDest.BaseValue = aExplicitScaleDest.Minimum;
+
+                        if( !aScale.Maximum.hasValue() )
+                        {
+                            bool bNewMaxOK = true;
+                            double fMin=0.0;
+                            if( aScale.Minimum >>= fMin )
+                                bNewMaxOK = (fMin <= aExplicitScaleSource.Maximum);
+                            if( bNewMaxOK )
+                                aExplicitScaleDest.Maximum = aExplicitScaleSource.Maximum;
+                        }
+                        if( !aScale.Origin.hasValue() )
+                            aExplicitScaleDest.Origin = aExplicitScaleSource.Origin;
+
+                        if( !aScale.IncrementData.Distance.hasValue() )
+                            aExplicitIncrementDest.Distance = aExplicitIncrementSource.Distance;
+
+                        bool bAutoMinorInterval = true;
+                        if( aScale.IncrementData.SubIncrements.getLength() )
+                            bAutoMinorInterval = !( aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() );
+                        if( bAutoMinorInterval )
+                        {
+                            if( aExplicitIncrementDest.SubIncrements.getLength() && aExplicitIncrementSource.SubIncrements.getLength() )
+                                aExplicitIncrementDest.SubIncrements[0].IntervalCount =
+                                    aExplicitIncrementSource.SubIncrements[0].IntervalCount;
+                        }
+
+                        aVCooSysList_Y[nC]->setExplicitScaleAndIncrement( 1, nAxisIndex, aExplicitScaleDest, aExplicitIncrementDest );
+                    }
+                }
+            }
+        }
+    }
 }
 
 drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio()
@@ -994,22 +1098,6 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio()
     return aPreferredAspectRatio;
 }
 
-bool SeriesPlotterContainer::shouldKeep2DAspectRatio()
-{
-    bool bOutKeep2DAspectRatio = false;
-
-    //detect wether the aspect ratio needs to be kept
-    ::std::vector< VSeriesPlotter* >::const_iterator       aPlotterIter = m_aSeriesPlotterList.begin();
-    const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd  = m_aSeriesPlotterList.end();
-    for( aPlotterIter = m_aSeriesPlotterList.begin()
-        ; aPlotterIter != aPlotterEnd; aPlotterIter++ )
-    {
-        bOutKeep2DAspectRatio = bOutKeep2DAspectRatio || (*aPlotterIter)->keepAspectRatio();
-    }
-
-    return bOutKeep2DAspectRatio;
-}
-
 //-----------------------------------------------------
 
 namespace
@@ -1065,7 +1153,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
             pVCooSys->set3DWallPositions( eLeftWallPos, eBackWallPos, eBottomPos );
         }
         pVCooSys->createVAxisList( xNumberFormatsSupplier
-                                        , rAvailableSize //font reference size
+                                        , rPageSize //font reference size
                                         , BaseGFXHelper::B2IRectangleToAWTRectangle( aAvailableOuterRect ) //maximum space for labels
                                         );
     }
@@ -1073,7 +1161,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
 
     // - prepare list of all axis and how they are used
     rSeriesPlotterContainer.initAxisUsageList();
-    rSeriesPlotterContainer.doAutoScaling();
+    rSeriesPlotterContainer.doAutoScaling( m_xChartModel );
     rSeriesPlotterContainer.setScalesFromCooSysToPlotter();
     rSeriesPlotterContainer.setNumberFormatsFromAxes();
 
@@ -1084,7 +1172,6 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
     //aspect ratio
     drawing::Direction3D aPreferredAspectRatio(
         rSeriesPlotterContainer.getPreferredAspectRatio() );
-//     bool bKeepAspectRatio = rSeriesPlotterContainer.shouldKeep2DAspectRatio();
 
     uno::Reference< drawing::XShapes > xCoordinateRegionTarget(0);
     VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount);
@@ -1131,7 +1218,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
             createTransformationSceneToScreen( aNewInnerRect ) ));
 
         //redo autoscaling to get size and text dependent automatic main increment count
-        rSeriesPlotterContainer.doAutoScaling();
+        rSeriesPlotterContainer.doAutoScaling( m_xChartModel );
         rSeriesPlotterContainer.updateScalesAndIncrementsOnAxes();
         rSeriesPlotterContainer.setScalesFromCooSysToPlotter();
 
@@ -1177,10 +1264,9 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
     {
         //------------ set transformation to plotter / create series
         VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
-        pSeriesPlotter->setPageReferenceSize( rPageSize );
         rtl::OUString aCID; //III
         pSeriesPlotter->initPlotter(xCoordinateRegionTarget,xTextTargetShapes,m_xShapeFactory,aCID);
-        pSeriesPlotter->setDiagramReferenceSize( rAvailableSize );
+        pSeriesPlotter->setPageReferenceSize( rPageSize );
         VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( rVCooSysList, pSeriesPlotter );
         if(2==nDimensionCount)
             pSeriesPlotter->setTransformationSceneToScreen( pVCooSys->getTransformationSceneToScreen() );
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index 3fba99fe2f76..b5bf518770fa 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: LabelPositionHelper.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -70,22 +70,6 @@ awt::Point LabelPositionHelper::transformSceneToScreenPosition( const drawing::P
                   rScenePosition3D, m_xLogicTarget, m_pShapeFactory, m_nDimensionCount );
 }
 
-awt::Point LabelPositionHelper::transformScaledLogicToScreenPosition( const drawing::Position3D& rLogicPosition3D ) const
-{
-    drawing::Position3D aScenePosition3D( SequenceToPosition3D(
-        m_pPosHelper->getTransformationScaledLogicToScene()->transform(
-            Position3DToSequence(rLogicPosition3D) ) ) );
-    /*
-    if(3==m_nDimensionCount)
-    {
-        drawing::Position3D aScenePosition3D_rotated( aScenePosition3D.PositionX, -aScenePosition3D.PositionZ, aScenePosition3D.PositionY );
-        aScenePosition3D = aScenePosition3D_rotated;
-    }
-    */
-    awt::Point aScreenPosition2D( this->transformSceneToScreenPosition( aScenePosition3D ) );
-    return aScreenPosition2D;
-}
-
 //static
 void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const tNameSequence& rPropNames, LabelAlignment eAlignment)
 {
@@ -136,7 +120,7 @@ void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues
     //-------------------------
     //handle dynamic font resize:
     awt::Size aOldReferenceSize;
-    if( xAxisModelProps->getPropertyValue( C2U("ReferenceDiagramSize")) >>= aOldReferenceSize )
+    if( xAxisModelProps->getPropertyValue( C2U("ReferencePageSize")) >>= aOldReferenceSize )
     {
         uno::Any* pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, C2U("CharHeight") );
         lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize );
diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx
index 820a2c9d8d05..41f7c6a8de64 100644
--- a/chart2/source/view/main/Linear3DTransformation.cxx
+++ b/chart2/source/view/main/Linear3DTransformation.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Linear3DTransformation.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -60,11 +60,6 @@ Sequence< double > SAL_CALL Linear3DTransformation::transform(
     double fZ = rSourceValues[2];
     if(m_bSwapXAndY)
         std::swap(fX,fY);
-    /*
-    ::basegfx::B3DPoint aSource( SequenceToB3DPoint( rSourceValues ) );
-    ::basegfx::B3DPoint aTarget = m_Matrix*aSource;
-    return B3DPointToSequence(aTarget);
-    */
     Sequence< double > aNewVec(3);
     double fZwi;
 
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 33c008ebeb31..21bf943c9899 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ShapeFactory.cxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -462,59 +462,6 @@ uno::Any createPolyPolygon_Cone(
     return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
 }
 
-uno::Any createPolyPolygon_PieSegment(
-              double fHeight
-            , double fWidthRadius
-            , double fInnerRadius = 0.0)
-{
-    DBG_ASSERT(fHeight>0, "The height of a pie segment needs to be > 0");
-    DBG_ASSERT(fInnerRadius>=0, "The inner radius of a pie segment needs to be >= 0");
-    DBG_ASSERT(fWidthRadius>0, "The width radius of a pie segment needs to be > 0");
-
-    const BOOL bClosed = true;
-
-    const sal_Int32 nPointCount = bClosed ? 5 : 4;
-
-    //--------------------------------------
-    drawing::PolyPolygonShape3D aPP;
-
-    aPP.SequenceX.realloc(1);
-    aPP.SequenceY.realloc(1);
-    aPP.SequenceZ.realloc(1);
-
-    drawing::DoubleSequence* pOuterSequenceX = aPP.SequenceX.getArray();
-    drawing::DoubleSequence* pOuterSequenceY = aPP.SequenceY.getArray();
-    drawing::DoubleSequence* pOuterSequenceZ = aPP.SequenceZ.getArray();
-
-    pOuterSequenceX->realloc(nPointCount);
-    pOuterSequenceY->realloc(nPointCount);
-    pOuterSequenceZ->realloc(nPointCount);
-
-    double* pInnerSequenceX = pOuterSequenceX->getArray();
-    double* pInnerSequenceY = pOuterSequenceY->getArray();
-    double* pInnerSequenceZ = pOuterSequenceZ->getArray();
-
-    for(sal_Int32 nN = nPointCount; nN--;)
-        *pInnerSequenceZ++ = 0.0;
-
-    *pInnerSequenceY++ = fHeight/2.0;
-    *pInnerSequenceY++ = fHeight/2.0;
-    *pInnerSequenceY++ = -fHeight/2.0;
-    *pInnerSequenceY++ = -fHeight/2.0;
-    if(bClosed)
-        *pInnerSequenceY++ = fHeight/2.0;
-
-    *pInnerSequenceX++ = fInnerRadius;
-    *pInnerSequenceX++ = fInnerRadius+fWidthRadius;
-    *pInnerSequenceX++ = fInnerRadius+fWidthRadius;
-    *pInnerSequenceX++ = fInnerRadius;
-    if(bClosed)
-        *pInnerSequenceX++ = fInnerRadius;
-
-    return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
-}
-
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  methods for 3D shape creation
@@ -1537,80 +1484,6 @@ uno::Reference< drawing::XShape >
     return xShape;
 }
 
-uno::Reference< drawing::XShape >
-        ShapeFactory::createSymbol3D( const uno::Reference< drawing::XShapes >& xTarget
-                    , const drawing::Position3D& rPosition
-                    , const drawing::Direction3D& rSize
-                    , sal_Int32 nStandardSymbol
-                    , sal_Int32 nBorderColor
-                    , sal_Int32 nFillColor )
-{
-    if( !xTarget.is() )
-        return 0;
-
-    //create shape
-    uno::Reference< drawing::XShape > xShape(
-        m_xShapeFactory->createInstance( C2U(
-            "com.sun.star.drawing.Shape3DExtrudeObject") ), uno::UNO_QUERY );
-    xTarget->add(xShape);
-
-    //set properties
-    uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
-    if( xProp.is())
-    {
-        try
-        {
-            //depth
-            xProp->setPropertyValue( C2U( UNO_NAME_3D_EXTRUDE_DEPTH )
-                , uno::makeAny((sal_Int32)rSize.DirectionZ) );
-
-            //PercentDiagonal
-            sal_Int16 nPercentDiagonal = 0;
-            xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL )
-                , uno::makeAny( nPercentDiagonal ) );
-
-            //Polygon
-            xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D )
-                , uno::makeAny( createPolyPolygon_Symbol( rPosition, rSize, nStandardSymbol ) ) );
-
-            //BorderColor
-            xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR )
-                , uno::makeAny( nBorderColor ) );
-
-            //FillColor
-            xProp->setPropertyValue( C2U( UNO_NAME_FILLCOLOR )
-                , uno::makeAny( nFillColor ) );
-        }
-        catch( uno::Exception& e )
-        {
-            ASSERT_EXCEPTION( e );
-        }
-    }
-    return xShape;
-}
-
-void setShapeName( uno::Reference< drawing::XShape >& xShape , const ::rtl::OUString& rName )
-{
-    if( !xShape.is() )
-        return;
-
-    uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
-    if( xProp.is())
-    {
-        try
-        {
-            xProp->setPropertyValue( C2U( UNO_NAME_MISC_OBJ_NAME )
-                , uno::makeAny( rName ) );
-        }
-        catch( uno::Exception& e )
-        {
-            ASSERT_EXCEPTION( e );
-        }
-    }
-}
-
 uno::Reference< drawing::XShapes >
         ShapeFactory::createGroup2D( const uno::Reference< drawing::XShapes >& xTarget
         , ::rtl::OUString aName )
diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx
index 121a76bed285..67b2396682aa 100644
--- a/chart2/source/view/main/Stripe.cxx
+++ b/chart2/source/view/main/Stripe.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Stripe.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,11 +67,6 @@ Stripe::Stripe( const drawing::Position3D& rPoint1
     m_aPoint4.PositionZ += fDepth;
 }
 
-drawing::Direction3D Stripe::GetDirectionTo4() const
-{
-    return m_aPoint4-m_aPoint1;
-}
-
 /*
 Stripe::Stripe( const drawing::Position3D& rPoint1
           , const drawing::Position3D& rPoint2
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 0dbd37ec6ef5..f15ed34d5209 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VDataSeries.cxx,v $
- * $Revision: 1.33 $
+ * $Revision: 1.32.8.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -455,9 +455,9 @@ rtl::OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) cons
     aRet = ObjectIdentifier::createDataCurveEquationCID( m_aSeriesParticle, nCurveIndex );
     return aRet;
 }
-void VDataSeries::setDiagramReferenceSize( const awt::Size & rDiagramRefSize )
+void VDataSeries::setPageReferenceSize( const awt::Size & rPageRefSize )
 {
-    m_aReferenceSize = rDiagramRefSize;
+    m_aReferenceSize = rPageRefSize;
 }
 
 StackingDirection VDataSeries::getStackingDirection() const
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 01fb9c995147..2442a154f8af 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VLegendSymbolFactory.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -364,149 +364,4 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
     return xResult;
 }
 
-// static
-Reference< drawing::XShape >
-    VLegendSymbolFactory::createJapaneseCandleStickSymbol(
-        const Reference< drawing::XShapes > xSymbolContainer,
-        const Reference< lang::XMultiServiceFactory > & xShapeFactory,
-        const Reference< beans::XPropertySet > & xLegendEntryProperties,
-        bool bWhiteDay )
-{
-    Reference< drawing::XShape > xResult;
-
-    if( ! (xSymbolContainer.is() &&
-           xShapeFactory.is()))
-        return xResult;
-
-    xResult.set( xShapeFactory->createInstance(
-                     C2U( "com.sun.star.drawing.GroupShape" )), uno::UNO_QUERY );
-    xSymbolContainer->add( xResult );
-    Reference< drawing::XShapes > xResultGroup( xResult, uno::UNO_QUERY );
-    if( ! xResultGroup.is())
-        return xResult;
-
-    // aspect ratio of symbols is always 3:2
-    awt::Size aBoundSize( 3000, 2000 );
-
-    try
-    {
-        // create bound
-        Reference< drawing::XShape > xBound( ShapeFactory(xShapeFactory).createInvisibleRectangle(
-            xResultGroup, aBoundSize  ));
-
-        Reference< drawing::XShape > xLine(
-            xShapeFactory->createInstance(
-                C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY );
-        if( xLine.is())
-        {
-            xResultGroup->add( xLine );
-            xLine->setSize(  awt::Size( 0, 250 ));
-            xLine->setPosition( awt::Point( 1500, 0 ));
-
-            lcl_setPropetiesToShape( xLegendEntryProperties, xLine, PROP_TYPE_LINE );
-        }
-        xLine.set(
-            xShapeFactory->createInstance(
-                C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY );
-        if( xLine.is())
-        {
-            xResultGroup->add( xLine );
-            xLine->setSize(  awt::Size( 0, 250 ));
-            xLine->setPosition( awt::Point( 1500, 1750 ));
-
-            lcl_setPropetiesToShape( xLegendEntryProperties, xLine, PROP_TYPE_LINE );
-        }
-
-        Reference< drawing::XShape > xBox(
-            xShapeFactory->createInstance(
-                C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY );
-        if( xBox.is())
-        {
-            xResultGroup->add( xBox );
-            sal_Int32 nSizeX = 1000;
-            sal_Int32 nSizeY = 1500;
-            xBox->setSize( awt::Size( nSizeX, nSizeY ));
-            xBox->setPosition( awt::Point( 1500 - nSizeX/2, 1000 - nSizeY/2 ));
-
-            // set CID to symbol for selection
-            ShapeFactory::setShapeName(
-                xBox, ObjectIdentifier::createClassifiedIdentifierWithParent(
-                    OBJECTTYPE_LEGEND_ENTRY,
-                    rtl::OUString(),
-                    ObjectIdentifier::createChildParticleWithIndex( bWhiteDay ? OBJECTTYPE_DATA_STOCK_GAIN : OBJECTTYPE_DATA_STOCK_LOSS, 0 )
-                     ));
-
-            lcl_setPropetiesToShape( xLegendEntryProperties, xBox, PROP_TYPE_FILL_AND_LINE );
-        }
-    }
-    catch( uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-
-    return xResult;
-}
-
-// static
-Reference< drawing::XShape >
-    VLegendSymbolFactory::createStockLineSymbol(
-        const Reference< drawing::XShapes > xSymbolContainer,
-        const Reference< lang::XMultiServiceFactory > & xShapeFactory,
-        const Reference< beans::XPropertySet > & xLegendEntryProperties,
-        tStockLineType eType )
-{
-    Reference< drawing::XShape > xResult;
-
-    if( ! (xSymbolContainer.is() &&
-           xShapeFactory.is()))
-        return xResult;
-
-    xResult.set( xShapeFactory->createInstance(
-                     C2U( "com.sun.star.drawing.GroupShape" )), uno::UNO_QUERY );
-    xSymbolContainer->add( xResult );
-    Reference< drawing::XShapes > xResultGroup( xResult, uno::UNO_QUERY );
-    if( ! xResultGroup.is())
-        return xResult;
-
-    // aspect ratio of symbols is always 3:2
-    awt::Size aBoundSize( 3000, 2000 );
-
-    try
-    {
-        // create bound
-        Reference< drawing::XShape > xBound( ShapeFactory(xShapeFactory).createInvisibleRectangle(
-            xResultGroup, aBoundSize  ));
-
-        Reference< drawing::XShape > xLine(
-            xShapeFactory->createInstance(
-                C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY );
-        if( xLine.is())
-        {
-            xResultGroup->add( xLine );
-            xLine->setSize(  awt::Size( 0, 2000 ));
-            xLine->setPosition( awt::Point( 1500, 0 ));
-
-            lcl_setPropetiesToShape( xLegendEntryProperties, xLine, PROP_TYPE_LINE_SERIES );
-        }
-
-        if( eType != STOCK_LINE_TYPE_VERT )
-        {
-            xLine.set(
-                xShapeFactory->createInstance(
-                    C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY_THROW );
-            xResultGroup->add( xLine );
-            xLine->setSize( awt::Size( 500, 0 ));
-            xLine->setPosition( awt::Point( ( eType == STOCK_LINE_TYPE_OPEN ) ? 1000 : 1500, 1000 ));
-
-            lcl_setPropetiesToShape( xLegendEntryProperties, xLine, PROP_TYPE_LINE_SERIES );
-        }
-    }
-    catch( uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-
-    return xResult;
-}
-
 } //  namespace chart
diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx
index cf055d6ede21..30a988aa99d0 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sampleaddin.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,13 +46,13 @@ using namespace rtl;
 extern "C" {
 
 void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
+    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
 sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, registry::XRegistryKey * pRegistryKey )
+    void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
 {
     if( pRegistryKey )
     {
@@ -81,7 +81,7 @@ sal_Bool SAL_CALL component_writeInfo(
 }
 
 void * SAL_CALL component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+    const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void* pRet = 0;
 
@@ -154,11 +154,11 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
                     if( bVertical )
                     {
                         aOutPosition.X = aPos.X;
-                        aOutPosition.Y = aPos.Y + nLength * (1.0 - fPercentage);    // y scale goes from top to bottom
+                        aOutPosition.Y = static_cast<sal_Int32>(aPos.Y + nLength * (1.0 - fPercentage));    // y scale goes from top to bottom
                     }
                     else
                     {
-                        aOutPosition.X = aPos.X + nLength * fPercentage;
+                        aOutPosition.X = static_cast<sal_Int32>(aPos.X + nLength * fPercentage);
                         aOutPosition.Y = aPos.Y;
                     }
                     bRet = sal_True;
@@ -389,7 +389,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                     // put the text centered below the red line
                     aPos.X += ( aSize.Width - mxMyRedLine->getPosition().X ) / 2;
                     aPos.Y += 1000;
-                    aPos.Y += 0.1 * xYAxisShape->getSize().Height;
+                    aPos.Y += static_cast<sal_Int32>(0.1 * xYAxisShape->getSize().Height);
                     mxMyText->setPosition( aPos );
                 }
             }
@@ -421,14 +421,14 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
 //      }
 }
 
-void SAL_CALL SampleAddIn::addRefreshListener( const uno::Reference< util::XRefreshListener >& l )
+void SAL_CALL SampleAddIn::addRefreshListener( const uno::Reference< util::XRefreshListener >&  )
     throw( uno::RuntimeException )
 {
     // not implemented - this is not necessary
     // (this method exists just because the interface requires it)
 }
 
-void SAL_CALL SampleAddIn::removeRefreshListener( const uno::Reference< util::XRefreshListener >& l )
+void SAL_CALL SampleAddIn::removeRefreshListener( const uno::Reference< util::XRefreshListener >&  )
     throw( uno::RuntimeException )
 {
     // not implemented - this is not necessary
diff --git a/chart2/workbench/anyperformance/anyperformance.cxx b/chart2/workbench/anyperformance/anyperformance.cxx
index d82da7126977..e69de29bb2d1 100644
--- a/chart2/workbench/anyperformance/anyperformance.cxx
+++ b/chart2/workbench/anyperformance/anyperformance.cxx
@@ -1,193 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: anyperformance.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include <cstdlib>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <algorithm>
-#include <iostream>
-#include <iterator>
-
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-using namespace ::std;
-using namespace ::com::sun::star;
-
-#define DBG_OUTPUT
-
-typedef double testType;
-// typedef sal_Int32 testType;
-
-struct lcl_Data
-{
-    int m_nSeries;
-    int m_nPoints;
-    enum Type
-    {
-        TYPE_DOUBLE,
-        TYPE_ANY
-    } m_eType;
-
-    lcl_Data() :
-            m_nSeries( 10 ),
-            m_nPoints( 10000 ),
-            m_eType( TYPE_DOUBLE )
-    {}
-
-    lcl_Data( int nSeries, int nPoints, Type eType ) :
-            m_nSeries( nSeries ),
-            m_nPoints( nPoints ),
-            m_eType( eType )
-    {}
-};
-
-lcl_Data lcl_parseArgs( const vector< string > & aArgs )
-{
-    lcl_Data aResult;
-
-    if( aArgs.size() > 1 )
-    {
-        aResult.m_eType = ( aArgs[ 1 ] == string( "any" ))
-            ? lcl_Data::TYPE_ANY
-            : lcl_Data::TYPE_DOUBLE;
-    }
-    else
-    {
-        cerr << "Usage: " << aArgs[ 0 ] << " double|any [series] [points-per-series]" << endl;
-        exit( EXIT_FAILURE );
-    }
-
-    if( aArgs.size() > 2 )
-    {
-        stringstream aStrStream;
-        aStrStream << aArgs[ 2 ];
-        aStrStream >> aResult.m_nSeries;
-    }
-    if( aArgs.size() > 3 )
-    {
-        stringstream aStrStream;
-        aStrStream << aArgs[ 3 ];
-        aStrStream >> aResult.m_nPoints;
-    }
-
-    return aResult;
-}
-
-template< typename T >
-    struct lcl_MakeAny : public unary_function< uno::Any, T >
-    {
-        uno::Any operator() ( const T & rVal )
-        {
-            return uno::makeAny( rVal );
-        }
-    };
-
-// ========================================
-//                   MAIN
-// ========================================
-
-int SAL_CALL main( int argc, char* argv[] )
-{
-    // parse arguments
-    // arg0: number of series
-    // arg1: number of points per series
-    vector< string > aArgs( argc );
-    copy( argv, argv + argc, aArgs.begin() );
-
-    lcl_Data aParams( lcl_parseArgs( aArgs ));
-
-    // create data
-    vector< testType > aSeries( aParams.m_nPoints, 23 );
-    vector< vector< testType > > aData( aParams.m_nSeries, aSeries );
-
-    switch( aParams.m_eType )
-    {
-        case lcl_Data::TYPE_DOUBLE:
-#ifdef DBG_OUTPUT
-            cout << "Testing native type: " << endl;
-#endif
-            {
-                uno::Sequence< uno::Sequence< testType > > aSeq;
-                aSeq.realloc( aParams.m_nSeries );
-                uno::Sequence< testType > * pArr = aSeq.getArray();
-
-                for( vector< vector< testType > >::const_iterator aIter = aData.begin();
-                     aIter != aData.end();
-                     ++aIter, ++pArr )
-                {
-                    pArr->realloc( aParams.m_nPoints );
-                    copy( (*aIter).begin(), (*aIter).end(),
-                          pArr->getArray() );
-                }
-            }
-            break;
-        case lcl_Data::TYPE_ANY:
-#ifdef DBG_OUTPUT
-            cout << "Testing Anies" << endl;
-#endif
-            {
-                uno::Sequence< uno::Sequence< uno::Any > > aSeq;
-                aSeq.realloc( aParams.m_nSeries );
-                uno::Sequence< uno::Any > * pArr = aSeq.getArray();
-
-                for( vector< vector< testType > >::const_iterator aIter = aData.begin();
-                     aIter != aData.end();
-                     ++aIter, ++pArr )
-                {
-                    pArr->realloc( aParams.m_nPoints );
-                    transform( (*aIter).begin(), (*aIter).end(),
-                               pArr->getArray(), lcl_MakeAny< testType >() );
-                }
-            }
-            break;
-    }
-
-
-#if 0
-    // output data
-    for( vector< vector< testType > >::const_iterator aIter = aData.begin();
-         aIter != aData.end();
-         ++aIter)
-    {
-        cout << "Series: * ";
-        copy( (*aIter).begin(), (*aIter).end(),
-              ostream_iterator< testType >( cout, " * " ));
-        cout << endl;
-    }
-#endif
-
-    return EXIT_SUCCESS;
-}
diff --git a/chart2/workbench/anyperformance/makefile.mk b/chart2/workbench/anyperformance/makefile.mk
index 222ad762a328..e69de29bb2d1 100644
--- a/chart2/workbench/anyperformance/makefile.mk
+++ b/chart2/workbench/anyperformance/makefile.mk
@@ -1,140 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=anyperformance
-TARGET=	anyperformance
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCROUT=$(OUT)$/inc$/test
-INCPRE+=$(OUT)$/inc$/test
-
-OBJFILES= \
-        $(OBJ)$/anyperformance.obj
-
-APP1TARGET=	anyperformance
-APP1OBJS=	\
-        $(OBJ)$/anyperformance.obj
-
-APP1STDLIBS+=	\
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALHELPERLIB)		\
-        $(SALLIB)
-
-APP1DEF=$(MISC)$/$(APP1TARGET).def
-
-#ALLIDLFILES:= \
-#		cpputest.idl 		\
-#		language_binding.idl	\
-#		alignment.idl
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-#ALL : $(BIN)$/anyperformance.rdb unoheader ALLTAR
-ALL : ALLTAR
-.ELSE
-ALL: 	ALLDEP
-.ENDIF
-
-.IF "$(COM)" == "MSC"
-.IF "$(debug)" != ""
-CFLAGS += /Ob0
-.ENDIF
-.ENDIF
-
-.IF "$(extra_mapping)" != ""
-CFLAGS += -DEXTRA_MAPPING
-.ENDIF
-
-.INCLUDE :  target.mk
-
-CPPUMAKERFLAGS = -C
-.IF "$(COM)" == "MSC"
-CPPUMAKERFLAGS = -L
-.ENDIF
-
-#TYPES:=		-Ttest.XLanguageBindingTest \
-#		-Ttest.XSimpleInterface \
-#		-Ttest.Test1 \
-#		-Ttest.Test2 \
-#		-Ttest.TdTest1 \
-#		-Ttest.Test3 \
-#		-Ttest.Base \
-#		-Ttest.Base1 \
-#		-Ttest.Base2 \
-# 		-Tcom.sun.star.lang.XMultiServiceFactory \
-# 		-Tcom.sun.star.lang.XSingleServiceFactory \
-# 		-Tcom.sun.star.lang.XInitialization \
-# 		-Tcom.sun.star.lang.XServiceInfo \
-# 		-Tcom.sun.star.lang.XEventListener \
-# 		-Tcom.sun.star.lang.XTypeProvider \
-# 		-Tcom.sun.star.registry.XSimpleRegistry \
-# 		-Tcom.sun.star.registry.XRegistryKey \
-# 		-Tcom.sun.star.loader.XImplementationLoader \
-# 		-Tcom.sun.star.registry.XImplementationRegistration \
-# 		-Tcom.sun.star.lang.XComponent \
-# 		-Tcom.sun.star.uno.XComponentContext \
-# 		-Tcom.sun.star.container.XSet \
-# 		-Tcom.sun.star.container.XNameContainer \
-# 		-Tcom.sun.star.uno.TypeClass \
-# 		-Tcom.sun.star.uno.XReference \
-# 		-Tcom.sun.star.uno.XAdapter \
-# 		-Tcom.sun.star.uno.XAggregation \
-# 		-Tcom.sun.star.uno.XWeak \
-# 		-Tcom.sun.star.beans.XPropertySet \
-# 		-Tcom.sun.star.reflection.XIdlClassProvider \
-# 		-Tcom.sun.star.container.XHierarchicalNameAccess \
-# 		-Tcom.sun.star.uno.XCurrentContext
-
-$(BIN)$/anyperformance.rdb: $(ALLIDLFILES)
-    idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $?
-    regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
-    regmerge $@ / $(UNOUCRRDB)
-    touch $@
-
-# 	regcomp -register -r $@ -c javaloader.dll
-# 	regcomp -register -r $@ -c jen.dll
-
-unoheader: $(BIN)$/anyperformance.rdb
-    cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) $(TYPES) $(BIN)$/anyperformance.rdb
-#	cunomaker -BUCR -O$(UNOUCROUT) $(TYPES) $(BIN)$/anyperformance.rdb
-
diff --git a/chart2/workbench/fileformat/chart.mod b/chart2/workbench/fileformat/chart.mod
index a53b34843c16..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/chart.mod
+++ b/chart2/workbench/fileformat/chart.mod
@@ -1,237 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: chart.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-
-<!ENTITY % chart-class "(line|area|circle|ring|scatter|radar|bar|stock|add-in)">
-<!-- xxxx ::: maybe expand this for K-Office: +gantt  and +surface ? for excel -->
-<!ENTITY % chart-solid-type "(cuboid|cylinder|cone|pyramid)">
-
-<!-- Chart element -->
-<!ELEMENT chart:chart ( chart:title?, chart:subtitle?, chart:legend?,
-					    chart:plot-area,
-						table:table? )>
-<!ATTLIST chart:chart
-		  chart:class %chart-class; #REQUIRED
-		  chart:add-in-name %string; #IMPLIED
-		  chart:table-number-list %string; #IMPLIED
-		  draw:name %string; #IMPLIED
-		  %draw-position;
-		  %draw-size;
-		  %draw-style-name;
-		  chart:column-mapping %string; #IMPLIED
-		  chart:row-mapping %string; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED>
-
-<!ATTLIST chart:chart %presentation-class; >
-<!ATTLIST chart:chart %zindex;>
-<!ATTLIST chart:chart %draw-end-position; >
-<!ATTLIST chart:chart draw:id %draw-shape-id; >
-<!ATTLIST chart:chart draw:layer %layerName; #IMPLIED>
-
-<!ATTLIST style:properties
-		  chart:scale-text %boolean; "true"
-		  chart:stock-updown-bars %boolean; "false"
-		  chart:stock-with-volume %boolean; "false"
-		  chart:three-dimensional %boolean; "false"
-		  chart:deep %boolean; "false"
-		  chart:lines %boolean; "false"
-		  chart:percentage %boolean; "false"
-		  chart:solid-type %chart-solid-type; "cuboid"
-		  chart:splines %nonNegativeInteger; "0"
-		  chart:stacked %boolean; "false"
-		  chart:symbol %integer; "-1"
-		  chart:vertical %boolean; "false"
-		  chart:lines-used %nonNegativeInteger; "0"
-		  chart:connect-bars %boolean; "false"
-		  chart:spline-order %nonNegativeInteger; "2"
-		  chart:spline-resolution %nonNegativeInteger; "20"
-          chart:pie-offset %nonNegativeInteger; "0">
-
-<!-- Main/Sub Title -->
-<!-- the cell-address attribute is currently not supported for titles -->
-<!ELEMENT chart:title (text:p)?>
-<!ATTLIST chart:title
-		  table:cell-range %cell-address; #IMPLIED
-		  svg:x %coordinate; #IMPLIED
-		  svg:y %coordinate; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED >
-
-<!ELEMENT chart:subtitle (text:p)?>
-<!ATTLIST chart:subtitle
-		  table:cell-range %cell-address; #IMPLIED
-		  svg:x %coordinate; #IMPLIED
-		  svg:y %coordinate; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED >
-
-<!-- you must specify either a legend-position or both, x and y coordinates -->
-<!ELEMENT chart:legend EMPTY>
-<!ATTLIST chart:legend
-		  chart:legend-position (top|left|bottom|right) "right"
-<!-- xxxx ::: add this for K-Office -->
-		  chart:legend-alignment (center|left-or-top|right-or-bottom)
-		  svg:x %coordinate; #IMPLIED
-		  svg:y %coordinate; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED >
-<!-- Plot-Area specification -->
-<!ELEMENT chart:plot-area (dr3d:light*,
-						   chart:axis*,
-<!-- xxxx ::: for K-Office move categories to axis-->
-						   chart:categories?,
-						   chart:series*,
-						   chart:stock-gain-marker?,
-						   chart:stock-loss-marker?,
-						   chart:stock-range-line?,
-						   chart:wall?,
-						   chart:floor?) >
-<!ATTLIST chart:plot-area
-		  svg:x %coordinate; #IMPLIED
-		  svg:y %coordinate; #IMPLIED
-		  svg:width %length; #IMPLIED
-		  svg:height %length; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED
-		  table:cell-range-address %cell-range-address; #IMPLIED
-		  chart:table-number-list %string; #IMPLIED
-		  chart:data-source-has-labels (none|row|column|both) "none" >
-<!-- 3d scene attributes on plot-area -->
-<!ATTLIST chart:plot-area
-		  dr3d:vrp %vector3D; #IMPLIED
-		  dr3d:vpn %vector3D; #IMPLIED
-		  dr3d:vup %vector3D; #IMPLIED
-		  dr3d:projection (parallel|perspective) #IMPLIED
-		  dr3d:transform CDATA #IMPLIED
-		  dr3d:distance %length; #IMPLIED
-		  dr3d:focal-length %length; #IMPLIED
-		  dr3d:shadow-slant %nonNegativeInteger; #IMPLIED
-		  dr3d:shade-mode (flat|phong|gouraud|draft) #IMPLIED
-		  dr3d:ambient-color %color; #IMPLIED
-		  dr3d:lighting-mode %boolean; #IMPLIED >
-<!ATTLIST style:properties
-		  chart:series-source (columns|rows) "columns" >
-<!ELEMENT chart:wall EMPTY>
-<!ATTLIST chart:wall
-		  svg:width %length; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:floor EMPTY>
-<!ATTLIST chart:floor
-		  svg:width %length; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED >
-<!-- Stock chart elements -->
-<!ELEMENT chart:stock-gain-marker EMPTY>
-<!ATTLIST chart:stock-gain-marker
-		  chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:stock-loss-marker EMPTY>
-<!ATTLIST chart:stock-loss-marker
-		  chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:stock-range-line EMPTY>
-<!ATTLIST chart:stock-range-line
-		  chart:style-name %styleName; #IMPLIED >
-<!-- Axis -->
-<!ELEMENT chart:axis (chart:title?, chart:grid*)>
-<!ATTLIST chart:axis
-		  chart:class (category|value|series|domain) #REQUIRED
-		  chart:name %string; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED >
-<!ATTLIST style:properties
-		  chart:tick-marks-major-inner %boolean; "false"
-		  chart:tick-marks-major-outer %boolean; "true"
-		  chart:tick-marks-minor-inner %boolean; "false"
-		  chart:tick-marks-minor-outer %boolean; "false"
-		  chart:logarithmic %boolean; "false"
-		  chart:maximum %float; #IMPLIED
-		  chart:minimum %float; #IMPLIED
-		  chart:origin %float; #IMPLIED
-		  chart:interval-major %float; #IMPLIED
-		  chart:interval-minor %float; #IMPLIED
-		  chart:gap-width %integer; #IMPLIED
-		  chart:overlap %integer; #IMPLIED
-		  text:line-break %boolean; "true"
-        	  chart:display-label %boolean; "true"
-		  chart:label-arrangement (side-by-side|stagger-even|stagger-odd) "side-by-side"
-		  chart:text-overlap %boolean; "false"
-		  chart:visible %boolean; "true"
-		  chart:link-data-style-to-source %boolean; "true" >
-<!ELEMENT chart:grid EMPTY>
-<!ATTLIST chart:grid
-		  chart:class (major|minor) "major"
-		  chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:categories EMPTY>
-<!ATTLIST chart:categories
-		  table:cell-range-address %cell-range-address; #IMPLIED >
-<!--
-	each series element must have an cell-range-address element that points
-	to the underlying table data.
-	Impl. Note: Internally all href elements are merged to one table range
-	that represents the data for the whole chart
--->
-<!ELEMENT chart:series ( chart:domain*,
-						 chart:data-point* )>
-<!ATTLIST chart:series
-		  chart:values-cell-range-address %cell-range-address; #IMPLIED
-		  chart:label-cell-address %cell-address; #IMPLIED
-		  chart:class %chart-class; #IMPLIED
-   	         chart:attached-axis %string; #IMPLIED
-<!-- xxxx ::: replace? this for K-Office -->
-		  chart:attached-axis-x %string; #IMPLIED
-   	         chart:attached-axis-y %string; #IMPLIED
-		  chart:attached-axis-z %string; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:domain EMPTY>
-<!ATTLIST chart:domain
-		  table:cell-range-address %cell-range-address; #IMPLIED >
-<!ELEMENT chart:data-point EMPTY>
-<!ATTLIST chart:data-point
-		  chart:repeated %nonNegativeInteger; #IMPLIED
-		  chart:style-name %styleName; #IMPLIED >
-<!-- statistical properties -->
-<!ATTLIST style:properties
-		  chart:mean-value %boolean; #IMPLIED
-		  chart:error-category (none|variance|standard-deviation|percentage|error-margin|constant) "none"
-		  chart:error-percentage %float; #IMPLIED
-		  chart:error-margin %float; #IMPLIED
-		  chart:error-lower-limit %float; #IMPLIED
-		  chart:error-upper-limit %float; #IMPLIED
-		  chart:error-upper-indicator %boolean; #IMPLIED
-		  chart:error-lower-indicator %boolean; #IMPLIED
-		  chart:regression-type (none|linear|logarithmic|exponential|power) "none" >
-<!-- data label properties -->
-<!ATTLIST style:properties
-		  chart:data-label-number (none|value|percentage) "none"
-		  chart:data-label-text %boolean; "false"
-		  chart:data-label-symbol %boolean; "false" >
-<!-- general text properties -->
-<!ATTLIST style:properties
-		  text:rotation-angle %integer; "0"
-		  fo:direction (ltr|ttb) #IMPLIED >
-<!-- symbol properties -->
-<!ATTLIST style:properties
-		  chart:symbol-width %nonNegativeLength; #IMPLIED
-		  chart:symbol-height %nonNegativeLength; #IMPLIED
-		  chart:symbol-image-name %string; #IMPLIED >
diff --git a/chart2/workbench/fileformat/chart2.mod b/chart2/workbench/fileformat/chart2.mod
index 20bd17fbc318..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/chart2.mod
+++ b/chart2/workbench/fileformat/chart2.mod
@@ -1,187 +0,0 @@
-<!-- ************************************************************************************************************************ -->
-<!-- a name of a registered UNO service-->
-<!ENTITY % service-name "CDATA">
-<!-- chart2 *************************************************************************************************************** -->
-<!ELEMENT chart2:chart2 (chart2:legend*, chart2:scale*, chart2:increment*, chart2:final-target+, chart2:resident*, table:table?)>
-<!-- title ******************************************************************************************************************* -->
-<!ELEMENT chart2:title EMPTY>
-<!-- create your own name here to identifiy this title object for use in a ... ?-->
-<!ATTLIST chart2:title
-	id ID #REQUIRED
->
-<!-- legend *************************************************************************************************************** -->
-<!ELEMENT chart2:legend EMPTY>
-<!-- create your own name here to identifiy this legend object for use in a plot-container or coordinate-system-->
-<!ATTLIST chart2:legend
-	id ID #REQUIRED
->
-<!-- contains a name of a registered uno component implementing the service ...'legend' ... -->
-<!ATTLIST chart2:legend
-	service %service-name; #REQUIRED
->
-<!-- final-target *********************************************************************************************************** -->
-<!ELEMENT chart2:final-target (chart2:title?, chart2:logic-target)>
-<!-- create your own name here to identifiy this final-target object -->
-<!ATTLIST chart2:final-target
-	id ID #REQUIRED
->
-<!-- choose the id of a legend that should be used as default legend for all data series contained in this final target;
-											the legend has to be described somewhere else in this document -->
-<!ATTLIST chart2:final-target
-	legend IDREF #IMPLIED
->
-<!-- logic-target ********************************************************************************************************** -->
-<!ELEMENT chart2:logic-target (chart2:coordinate-system+, chart2:logic-target*)>
-<!-- create your own name here to identifiy this logic-target object -->
-<!ATTLIST chart2:logic-target
-	id ID #REQUIRED
->
-<!-- choose the id of a legend that should be used as default legend for all data series contained in this logic target;
-											the legend has to be described somewhere else in this document -->
-<!ATTLIST chart2:logic-target
-	legend IDREF #IMPLIED
->
-<!-- coordinatesystem ************************************************************************************************** -->
-<!ELEMENT chart2:coordinate-system (chart2:scaleRef*)>
-<!-- create your own name here to identifiy this coordinatesystem object for use in a renderer-->
-<!ATTLIST chart2:coordinate-system
-	id ID #REQUIRED
->
-<!-- contains a name of a registered uno component implementing the service ...'coordinate-system' ... -->
-<!ATTLIST chart2:coordinate-system
-	service %service-name; #REQUIRED
->
-<!-- choose the id of a legend that should be used for this coordinate system;
-											the legend has to be described somewhere else in this document -->
-<!ATTLIST chart2:coordinate-system
-	legend IDREF #IMPLIED
->
-<!-- scale ***************************************************************************************************************** -->
-<!ELEMENT chart2:scale (chart2:break*)>
-<!-- create your own name here to identifiy this scale object for use in a coordinate system-->
-<!ATTLIST chart2:scale
-	id ID #REQUIRED
->
-<!--  if the maximum value of the scale should be calculated automatically do not set this attribute-->
-<!ATTLIST chart2:scale
-	maximum %float; #IMPLIED
->
-<!--  if the minimum value of the scale should be calculated automatically do not set this attribute-->
-<!ATTLIST chart2:scale
-	minimum %float; #IMPLIED
->
-<!-- choose a name of a registered uno component implementing the service ...scaling' ... e.g. com.sun.star.LogarithmicScaling;
-	if no scaling-service is set a linear scaling will be used-->
-<!ATTLIST chart2:scale
-	scaling-service %service-name; #IMPLIED
->
-<!-- scaleRef ************************************************************************************************************* -->
-<!ELEMENT chart2:scaleRef EMPTY>
-<!-- choose the id of a scale that should be used here -->
-<!ATTLIST chart2:scaleRef
-	scale IDREF #REQUIRED
->
-<!-- choose the direction in which the scale should be applied;
-	if no direction is set the mathematical direction is used -->
-<!-- !!!!!!!!!! .... maybe remove languagedependent here -->
-<!ATTLIST chart2:scaleRef
-	direction (mathematical | reverse | languagedependent) #IMPLIED
->
-<!-- break ***************************************************************************************************************** -->
-<!ELEMENT chart2:break EMPTY>
-<!--  the value where the break starts and ends on the scale -->
-<!ATTLIST chart2:break
-	start %float; #REQUIRED
-	end %float; #REQUIRED
->
-<!-- increment ************************************************************************************************************ -->
-<!ELEMENT chart2:increment (chart2:subincrement*)>
-<!-- create your own name here to identifiy this increment object for use in an axis and/or grid -->
-<!ATTLIST chart2:increment
-	id ID #REQUIRED
->
-<!-- choose the id of a scale that should be used for autocalculation of the values of this increment;
-											the scale has to be described somewhere else in this document -->
-<!ATTLIST chart2:increment
-	scale IDREF #REQUIRED
->
-<!-- an offset (measured in values before scaling) to which ticks are relatively positioned;
-	if this attribute is not set 0 is assumed;
-	if the given value is not valid in the associated scaling(s) the minimum of the scaling(s) is assumed )-->
-<!ATTLIST chart2:increment
-	pre-offset %float; #IMPLIED
->
-<!-- a distance (measured in values before scaling) how far ticks are seperated one from each other;
-	this value is ignored as long as the attribute post-equidistant is true;
-	if attribute post-equidistant is false and this value is missing it will be automatically calculated -->
-<!ATTLIST chart2:increment
-	pre-distance %float; #IMPLIED
->
-<!-- a distance (measured in values after scaling) how far ticks are seperated one from each other
-	this value is ignored as long as the attribute post-equidistant is false;
-	if attribute post-equidistant is true and this value is missing it will be automatically calculated -->
-<!ATTLIST chart2:increment
-	post-distance %float; #IMPLIED
->
-<!-- if the post-equidistant attribute is missing or set to false tickmarks will be positioned equidistant measured in values before scaling otherwise equidistant after scaling;
-	for example lets assume to have a logarithmic scaling - then with post-equidistant=true and post-distance=1 you will get tichmarks at 0, 1, 10, 100 etc.
-	having post-equidistant=false and pre-distance=1 you will have tickmarks at 0,1,2,3,4 etc.-->
-<!ATTLIST chart2:increment
-	post-equidistant %boolean; #IMPLIED
->
-<!-- subincrement ************************************************************************************************************ -->
-<!ELEMENT chart2:subincrement EMPTY>
-<!-- any parent range will be divided into this count of sub-ranges; values lower than 2 have no effect;
-	if no value is set the count will be calculated automatically -->
-<!ATTLIST chart2:subincrement
-	count %integer; #IMPLIED
->
-<!-- if the post-equidistant attribute is missing or set to false the sub-ranges will be equal to each other measured in values before scaling otherwise measured after scaling -->
-<!ATTLIST chart2:subincrement
-	post-equidistant %boolean; #IMPLIED
->
-<!-- resident ************************************************************************************************************** -->
-<!ELEMENT chart2:resident ANY>
-<!-- contained child elements could be for example (chart2:axis|chart2:grid|chart2:renderer) -->
-<!-- create your own name to identifiy this resident object -->
-<!ATTLIST chart2:resident
-	id ID #REQUIRED
->
-<!-- contains a name of a registered UNO component supporting the service ... or interface?...'resident' ...;
-if a child element is contained there are additional requirements to the UNO component:
-axis: the service ... 'axis' needs to be supported
-grid: the service ... 'grid' needs to be supported
-renderer:  the service ... 'datarenderer' needs to be supported
--->
-<!ATTLIST chart2:resident
-	service %service-name; #REQUIRED
->
-<!-- choose the id of a coordinatesystem that should be used;
-											that coordinatesystem has to be described somewhere else in this document -->
-<!ATTLIST chart2:resident
-	coordinate-system IDREF #REQUIRED
->
-<!-- axis ******************************************************************************************************************* -->
-<!ELEMENT chart2:axis EMPTY>
-<!-- state which dimension of the coordinate system the axis should use (e.g. for cartesian coordinates x is dimension 1 and y is dimansion 2)-->
-<!ATTLIST chart2:axis
-	dimension %integer; #REQUIRED
->
-<!-- choose the id of an increment that should be used;
-											that increment has to be described somewhere else in this document -->
-<!ATTLIST chart2:axis
-	increment IDREF #REQUIRED
->
-<!-- grid ******************************************************************************************************************* -->
-<!ELEMENT chart2:grid EMPTY>
-<!-- state which dimension of the coordinate system the axis should use (e.g. for cartesian coordinates x is dimension 1 and y is dimansion 2)-->
-<!ATTLIST chart2:grid
-	dimension %integer; #REQUIRED
->
-<!-- choose the id of an increment that should be used;
-											that increment has to be described somewhere else in this document -->
-<!ATTLIST chart2:grid
-	increment IDREF #REQUIRED
->
-<!-- renderer ************************************************************************************************************* -->
-<!ELEMENT chart2:renderer EMPTY>
diff --git a/chart2/workbench/fileformat/content.xml b/chart2/workbench/fileformat/content.xml
index b476d182b9bf..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/content.xml
+++ b/chart2/workbench/fileformat/content.xml
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE office:document-content PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd"><office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" office:class="chart" office:version="1.0">
-
-<office:automatic-styles>
-    <number:number-style style:name="N0" style:family="data-style">
-            <number:number number:min-integer-digits="1"/>
-            </number:number-style>
-    <style:style style:name="ch1" style:family="chart">
-            <style:properties draw:stroke="none" draw:fill-color="#ffffff"/>
-            </style:style>
-    <style:style style:name="ch2" style:family="chart">
-        <style:properties fo:direction="ltr" draw:stroke="none" draw:fill="none" fo:color="#000000" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="23.2000007629395pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="23.2000007629395pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="23.2000007629395pt"/>
-        </style:style>
-    <style:style style:name="ch3" style:family="chart">
-            <style:properties draw:fill="none" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="10.6999998092651pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="10.6999998092651pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="10.6999998092651pt"/>
-            </style:style>
-    <style:style style:name="ch4" style:family="chart">
-            <style:properties chart:stock-updown-bars="false" chart:stock-with-volume="false" chart:three-dimensional="false" chart:deep="false" chart:lines="false" chart:splines="0" chart:symbol="-3" chart:vertical="false" chart:lines-used="0" chart:connect-bars="false" chart:series-source="columns" chart:mean-value="false" chart:error-margin="0" chart:error-lower-limit="0" chart:error-upper-limit="0" chart:error-category="none" chart:error-percentage="0" chart:regression-type="none" chart:data-label-number="none" chart:data-label-text="false" chart:data-label-symbol="false"/>
-            </style:style>
-    <style:style style:name="ch5" style:family="chart" style:data-style-name="N0">
-            <style:properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:text-overlap="false" text:line-break="true" chart:label-arrangement="side-by-side" chart:visible="true" fo:direction="ltr" draw:stroke="solid" svg:stroke-width="0.051cm" svg:stroke-color="#000000" draw:marker-start-width="0.279cm" draw:marker-end-width="0.279cm" fo:color="#000000" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="10.8999996185303pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="10.8999996185303pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="10.8999996185303pt"/>
-            </style:style>
-    <style:style style:name="ch6" style:family="chart" style:data-style-name="N0">
-            <style:properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:origin="0" chart:gap-width="100" chart:overlap="0" chart:text-overlap="false" text:line-break="false" chart:label-arrangement="side-by-side" chart:visible="true" fo:direction="ltr"
-            draw:stroke="solid" svg:stroke-width="0cm" svg:stroke-color="#000000" fo:color="#000000" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="12.5pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="12.5pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="12.5pt"/>
-            </style:style>
-    <style:style style:name="ch7" style:family="chart" style:data-style-name="N0">
-            <style:properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:text-overlap="false" text:line-break="false" chart:label-arrangement="side-by-side" chart:visible="true" fo:direction="ltr" draw:stroke="solid" svg:stroke-width="0cm" svg:stroke-color="#000000" fo:color="#000000" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="12.5pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="12.5pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="12.5pt"/>
-            </style:style>
-    <style:style style:name="ch8" style:family="chart">
-            <style:properties draw:fill-color="#9999ff" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="10.6999998092651pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="10.6999998092651pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="10.6999998092651pt"/>
-            </style:style>
-    <style:style style:name="ch9" style:family="chart">
-            <style:properties draw:stroke="none" draw:fill="none"/>
-            </style:style>
-    <style:style style:name="ch10" style:family="chart">
-            <style:properties draw:stroke="none" draw:fill-color="#999999"/>
-            </style:style>
-</office:automatic-styles>
-
-<office:body>
- <chart:chart svg:width="20.088cm" svg:height="12.514cm" chart:class="bar" chart:style-name="ch1">
-    <chart:title svg:x="8.318cm" svg:y="0.25cm" chart:style-name="ch2">
-        <text:p>Haupttitel</text:p>
-    </chart:title>
-    <chart:legend chart:legend-position="right" svg:x="17.516cm" svg:y="5.92cm" chart:style-name="ch3"/>
-    <chart:plot-area chart:style-name="ch4" table:cell-range-address="Tabelle1.$A$6:.$A$7" chart:table-number-list="0" svg:x="0.4cm" svg:y="1.656cm" svg:width="16.317cm" svg:height="10.608cm">
-        <chart:axis chart:class="category" chart:name="primary-x" chart:style-name="ch5"/>
-        <chart:axis chart:class="value" chart:name="primary-y" chart:style-name="ch6"/>
-        <chart:axis chart:class="series" chart:name="primary-z" chart:style-name="ch7"/>
-        <chart:series chart:style-name="ch8">
-            <chart:data-point chart:repeated="2"/>
-        </chart:series>
-        <chart:wall chart:style-name="ch9"/>
-        <chart:floor chart:style-name="ch10"/>
-    </chart:plot-area>
-    <table:table table:name="local-table">
-        <table:table-header-columns>
-            <table:table-column/>
-        </table:table-header-columns>
-        <table:table-columns>
-            <table:table-column table:number-columns-repeated="1"/>
-        </table:table-columns>
-        <table:table-header-rows>
-            <table:table-row>
-                <table:table-cell/>
-                <table:table-cell table:value-type="string">
-                    <text:p>Spalte A</text:p>
-                </table:table-cell>
-            </table:table-row>
-        </table:table-header-rows>
-        <table:table-rows>
-            <table:table-row>
-            <table:table-cell table:value-type="string">
-            <text:p>Zeile 6</text:p>
-            </table:table-cell>
-            <table:table-cell table:value-type="float" table:value="-2">
-            <text:p>-2
-            </text:p>
-            </table:table-cell>
-            </table:table-row>
-            <table:table-row>
-            <table:table-cell table:value-type="string">
-            <text:p>Zeile 7
-            </text:p>
-            </table:table-cell>
-            <table:table-cell table:value-type="float" table:value="2">
-            <text:p>2
-            </text:p>
-            </table:table-cell>
-            </table:table-row>
-        </table:table-rows>
-    </table:table>
-</chart:chart>
-</office:body>
-
-</office:document-content>
\ No newline at end of file
diff --git a/chart2/workbench/fileformat/datastyl.mod b/chart2/workbench/fileformat/datastyl.mod
index 46eb6ad36c8a..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/datastyl.mod
+++ b/chart2/workbench/fileformat/datastyl.mod
@@ -1,175 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: datastyl.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!-- data styles -->
-<!ENTITY % any-number "( number:number | number:scientific-number | number:fraction )">
-<!ENTITY % number-style-content "( (number:text,(%any-number;,number:text?)?) | (%any-number;,number:text?) )">
-<!ELEMENT number:number-style ( style:properties?, %number-style-content;, style:map* )>
-<!ELEMENT number:number ( number:embedded-text* )>
-<!ELEMENT number:scientific-number EMPTY>
-<!ELEMENT number:fraction EMPTY>
-
-<!ELEMENT number:embedded-text (#PCDATA)>
-<!ATTLIST number:embedded-text number:position %integer; #REQUIRED>
-
-<!ENTITY % currency-symbol-and-text "number:currency-symbol,number:text?">
-<!ENTITY % number-and-text "number:number,number:text?">
-<!ENTITY % currency-symbol-and-number "((%number-and-text;),(%currency-symbol-and-text;)?) | ((%currency-symbol-and-text;),(%number-and-text;)?)">
-<!ENTITY % currency-style-content "number:text?, (%currency-symbol-and-number;)?">
-
-<!ELEMENT number:currency-style ( style:properties?, (%currency-style-content;), style:map* )>
-<!ELEMENT number:currency-symbol (#PCDATA)>
-<!ATTLIST number:currency-symbol number:language CDATA #IMPLIED>
-<!ATTLIST number:currency-symbol number:country CDATA #IMPLIED>
-
-<!ENTITY % percentage-style-content "( (number:text,(%number-and-text;)?) | (%number-and-text;) )">
-<!ELEMENT number:percentage-style ( style:properties?, %percentage-style-content;, style:map* )>
-
-<!ENTITY % any-date "( number:day | number:month | number:year | number:era | number:day-of-week | number:week-of-year | number:quarter| number:hours | number:am-pm | number:minutes | number:seconds )">
-<!ENTITY % date-style-content "( (number:text,(%any-date;,number:text?)+) | (%any-date;,number:text?)+ )">
-<!ELEMENT number:date-style ( style:properties?, %date-style-content;, style:map* )>
-<!ELEMENT number:day EMPTY>
-<!ATTLIST number:day number:style (short|long) "short">
-<!ATTLIST number:day number:calendar CDATA #IMPLIED>
-<!ELEMENT number:month EMPTY>
-<!ATTLIST number:month number:textual %boolean; "false">
-<!ATTLIST number:month number:style (short|long) "short">
-<!ATTLIST number:month number:calendar CDATA #IMPLIED>
-<!ELEMENT number:year EMPTY>
-<!ATTLIST number:year number:style (short|long) "short">
-<!ATTLIST number:year number:calendar CDATA #IMPLIED>
-<!ELEMENT number:era EMPTY>
-<!ATTLIST number:era number:style (short|long) "short">
-<!ATTLIST number:era number:calendar CDATA #IMPLIED>
-<!ELEMENT number:day-of-week EMPTY>
-<!ATTLIST number:day-of-week number:style (short|long) "short">
-<!ATTLIST number:day-of-week number:calendar CDATA #IMPLIED>
-<!ELEMENT number:week-of-year EMPTY>
-<!ATTLIST number:week-of-year number:calendar CDATA #IMPLIED>
-<!ELEMENT number:quarter EMPTY>
-<!ATTLIST number:quarter number:style (short|long) "short">
-<!ATTLIST number:quarter number:calendar CDATA #IMPLIED>
-
-<!ENTITY % any-time "( number:hours | number:am-pm | number:minutes | number:seconds )">
-<!ENTITY % time-style-content "( (number:text,(%any-time;,number:text?)+) | (%any-time;,number:text?)+)">
-<!ELEMENT number:time-style ( style:properties?, %time-style-content;, style:map* )>
-<!ELEMENT number:hours EMPTY>
-<!ATTLIST number:hours number:style (short|long) "short">
-<!ELEMENT number:minutes EMPTY>
-<!ATTLIST number:minutes number:style (short|long) "short">
-<!ELEMENT number:seconds EMPTY>
-<!ATTLIST number:seconds number:style (short|long) "short">
-<!ATTLIST number:seconds number:decimal-places %integer; "0">
-<!ELEMENT number:am-pm EMPTY>
-
-<!ENTITY % boolean-style-content "( (number:text,(number:boolean,number:text?)?) | (number:boolean,number:text?) )">
-<!ELEMENT number:boolean-style ( style:properties?,%boolean-style-content;, style:map* )>
-<!ELEMENT number:boolean EMPTY>
-
-<!ENTITY % text-style-content "( (number:text,(number:text-content,number:text?)?) | (number:text-content,number:text?) )">
-<!ELEMENT number:text-style ( style:properties?,%text-style-content;, style:map* )>
-<!ELEMENT number:text (#PCDATA)>
-<!ELEMENT number:text-content EMPTY>
-
-<!ATTLIST number:number-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:currency-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:percentage-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:date-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:time-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:boolean-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:text-style style:name %styleName; #REQUIRED>
-
-<!ATTLIST number:number-style style:family CDATA #REQUIRED>
-<!ATTLIST number:currency-style style:family CDATA #REQUIRED>
-<!ATTLIST number:percentage-style style:family CDATA #REQUIRED>
-<!ATTLIST number:date-style style:family CDATA #REQUIRED>
-<!ATTLIST number:time-style style:family CDATA #REQUIRED>
-<!ATTLIST number:boolean-style style:family CDATA #REQUIRED>
-<!ATTLIST number:text-style style:family CDATA #REQUIRED>
-
-<!ATTLIST number:number-style number:language CDATA #IMPLIED>
-<!ATTLIST number:currency-style number:language CDATA #IMPLIED>
-<!ATTLIST number:percentage-style number:language CDATA #IMPLIED>
-<!ATTLIST number:date-style number:language CDATA #IMPLIED>
-<!ATTLIST number:time-style number:language CDATA #IMPLIED>
-<!ATTLIST number:boolean-style number:language CDATA #IMPLIED>
-<!ATTLIST number:text-style number:language CDATA #IMPLIED>
-
-<!ATTLIST number:number-style number:country CDATA #IMPLIED>
-<!ATTLIST number:currency-style number:country CDATA #IMPLIED>
-<!ATTLIST number:percentage-style number:country CDATA #IMPLIED>
-<!ATTLIST number:date-style number:country CDATA #IMPLIED>
-<!ATTLIST number:time-style number:country CDATA #IMPLIED>
-<!ATTLIST number:boolean-style number:country CDATA #IMPLIED>
-<!ATTLIST number:text-style number:country CDATA #IMPLIED>
-
-<!ATTLIST number:number-style number:title CDATA #IMPLIED>
-<!ATTLIST number:currency-style number:title CDATA #IMPLIED>
-<!ATTLIST number:percentage-style number:title CDATA #IMPLIED>
-<!ATTLIST number:date-style number:title CDATA #IMPLIED>
-<!ATTLIST number:time-style number:title CDATA #IMPLIED>
-<!ATTLIST number:boolean-style number:title CDATA #IMPLIED>
-<!ATTLIST number:text-style number:title CDATA #IMPLIED>
-
-<!ATTLIST number:number-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:currency-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:percentage-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:date-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:time-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:boolean-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:text-style style:volatile %boolean; #IMPLIED>
-
-<!ATTLIST number:currency-style number:automatic-order %boolean; "false">
-<!ATTLIST number:date-style number:automatic-order %boolean; "false">
-
-<!ATTLIST number:date-style number:format-source (fixed|language) "fixed">
-<!ATTLIST number:time-style number:format-source (fixed|language) "fixed">
-
-<!ATTLIST number:time-style number:truncate-on-overflow %boolean; "true">
-
-<!ATTLIST number:number number:decimal-places %integer; #IMPLIED>
-<!ATTLIST number:scientific-number number:decimal-places %integer; #IMPLIED>
-
-<!ATTLIST number:number number:min-integer-digits %integer; #IMPLIED>
-<!ATTLIST number:scientific-number number:min-integer-digits %integer; #IMPLIED>
-<!ATTLIST number:fraction number:min-integer-digits %integer; #IMPLIED>
-
-<!ATTLIST number:number number:grouping %boolean; "false">
-<!ATTLIST number:scientific-number number:grouping %boolean; "false">
-<!ATTLIST number:fraction number:grouping %boolean; "false">
-
-<!ATTLIST number:number number:decimal-replacement CDATA #IMPLIED>
-
-<!ATTLIST number:scientific-number number:min-exponent-digits %integer; #IMPLIED>
-
-<!ATTLIST number:fraction number:min-numerator-digits %integer; #IMPLIED>
-
-<!ATTLIST number:fraction number:min-denominator-digits %integer; #IMPLIED>
diff --git a/chart2/workbench/fileformat/drawing.mod b/chart2/workbench/fileformat/drawing.mod
index a149f2fd1be3..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/drawing.mod
+++ b/chart2/workbench/fileformat/drawing.mod
@@ -1,857 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: drawing.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!ENTITY % points "CDATA" >
-<!ENTITY % pathData "CDATA" >
-<!ENTITY % gradient-style "(linear|axial|radial|ellipsoid|square|rectangular)" >
-<!ENTITY % draw-position "svg:x %coordinate; #IMPLIED svg:y %coordinate; #IMPLIED">
-<!ENTITY % draw-end-position "table:end-cell-address %cell-address; #IMPLIED table:end-x %coordinate; #IMPLIED table:end-y %coordinate; #IMPLIED">
-<!ENTITY % draw-size "svg:width %coordinate; #IMPLIED svg:height %coordinate; #IMPLIED">
-<!ENTITY % draw-transform "draw:transform CDATA #IMPLIED">
-<!ENTITY % draw-viewbox "svg:viewBox CDATA #REQUIRED">
-<!ENTITY % draw-style-name "draw:style-name %styleName; #IMPLIED presentation:style-name %styleName; #IMPLIED draw:text-style-name %styleName; #IMPLIED">
-<!ENTITY % draw-shape-id "CDATA #IMPLIED" >
-<!ENTITY % draw-text "(text:p|text:unordered-list|text:ordered-list)*">
-<!ENTITY % zindex "draw:z-index %nonNegativeInteger; #IMPLIED">
-<!ENTITY % distance "CDATA">
-<!ENTITY % rectanglePoint "(top-left|top|top-right|left|center|right|bottom-left|bottom|bottom-right)">
-<!ENTITY % vector3D "CDATA">
-<!ENTITY % text-anchor "text:anchor-type %anchorType; #IMPLIED text:anchor-page-number %positiveInteger; #IMPLIED">
-<!ENTITY % layerName "CDATA">
-<!ENTITY % table-background "table:table-background (true | false) #IMPLIED">
-
-<!-- commont presentation shape attributes -->
-<!ENTITY % presentation-style-name "presentation:style-name %styleName; #IMPLIED">
-<!ENTITY % presentation-classes "(title|outline|subtitle|text|graphic|object|chart|table|orgchart|page|notes)" >
-<!-- ENTITY % presentation-class "presentation:class %presentation-classes; #IMPLIED" -->
-<!ENTITY % presentation-class "presentation:class %presentation-classes; #IMPLIED presentation:placeholder (true|false) #IMPLIED presentation:user-transformed (true|false) #IMPLIED">
-<!ENTITY % presentationEffects "(none|fade|move|stripes|open|close|dissolve|wavyline|random|lines|laser|appear|hide|move-short|checkerboard|rotate|stretch)" >
-<!ENTITY % presentationEffectDirections "(none|from-left|from-top|from-right|from-bottom|from-center|from-upper-left|from-upper-right|from-lower-left|from-lower-right|to-left|to-top|to-right|to-bottom|to-upper-left|to-upper-right|to-lower-right|to-lower-left|path|spiral-inward-left|spiral-inward-right|spiral-outward-left|spiral-outward-right|vertical|horizontal|to-center|clockwise|counter-clockwise)" >
-<!ENTITY % presentationSpeeds "(slow|medium|fast)" >
-
-<!-- Drawing shapes -->
-<!ELEMENT draw:rect ( office:events?, %draw-text; )>
-<!ATTLIST draw:rect %draw-position; >
-<!ATTLIST draw:rect %draw-end-position; >
-<!ATTLIST draw:rect %table-background; >
-<!ATTLIST draw:rect %draw-size; >
-<!ATTLIST draw:rect %draw-style-name; >
-<!ATTLIST draw:rect %draw-transform; >
-<!ATTLIST draw:rect draw:corner-radius %nonNegativeLength; #IMPLIED>
-<!ATTLIST draw:rect %zindex;>
-<!ATTLIST draw:rect draw:id %draw-shape-id;>
-<!ATTLIST draw:rect %text-anchor;>
-<!ATTLIST draw:rect draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:line ( office:events?, %draw-text; )>
-<!ATTLIST draw:line svg:x1 %length; #IMPLIED>
-<!ATTLIST draw:line svg:y1 %length; #IMPLIED>
-<!ATTLIST draw:line svg:x2 %length; #REQUIRED>
-<!ATTLIST draw:line svg:y2 %length; #REQUIRED>
-<!ATTLIST draw:line svg:y %coordinate; #IMPLIED>
-<!ATTLIST draw:line %draw-style-name; >
-<!ATTLIST draw:line %draw-transform; >
-<!ATTLIST draw:line %zindex;>
-<!ATTLIST draw:line %draw-end-position; >
-<!ATTLIST draw:line %table-background; >
-<!ATTLIST draw:line draw:id %draw-shape-id;>
-<!ATTLIST draw:line %text-anchor;>
-<!ATTLIST draw:line draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:polyline ( office:events?, %draw-text; )>
-<!ATTLIST draw:polyline %draw-position; >
-<!ATTLIST draw:polyline %draw-size; >
-<!ATTLIST draw:polyline %draw-viewbox; >
-<!ATTLIST draw:polyline draw:points %points; #REQUIRED>
-<!ATTLIST draw:polyline %draw-style-name; >
-<!ATTLIST draw:polyline %draw-transform; >
-<!ATTLIST draw:polyline %zindex;>
-<!ATTLIST draw:polyline %draw-end-position; >
-<!ATTLIST draw:polyline %table-background; >
-<!ATTLIST draw:polyline draw:id %draw-shape-id;>
-<!ATTLIST draw:polyline %text-anchor;>
-<!ATTLIST draw:polyline draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:polygon ( office:events?, %draw-text; )>
-<!ATTLIST draw:polygon %draw-position; >
-<!ATTLIST draw:polygon %draw-end-position; >
-<!ATTLIST draw:polygon %table-background; >
-<!ATTLIST draw:polygon %draw-size; >
-<!ATTLIST draw:polygon %draw-viewbox; >
-<!ATTLIST draw:polygon draw:points %points; #REQUIRED >
-<!ATTLIST draw:polygon %draw-style-name; >
-<!ATTLIST draw:polygon %draw-transform; >
-<!ATTLIST draw:polygon %zindex;>
-<!ATTLIST draw:polygon draw:id %draw-shape-id;>
-<!ATTLIST draw:polygon %text-anchor;>
-<!ATTLIST draw:polygon draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:path ( office:events?, %draw-text; )>
-<!ATTLIST draw:path %draw-position;>
-<!ATTLIST draw:path %draw-end-position; >
-<!ATTLIST draw:path %table-background; >
-<!ATTLIST draw:path %draw-size; >
-<!ATTLIST draw:path %draw-viewbox; >
-<!ATTLIST draw:path svg:d %pathData; #REQUIRED >
-<!ATTLIST draw:path %draw-style-name; >
-<!ATTLIST draw:path %draw-transform; >
-<!ATTLIST draw:path %zindex;>
-<!ATTLIST draw:path draw:id %draw-shape-id;>
-<!ATTLIST draw:path %text-anchor;>
-<!ATTLIST draw:path draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:circle ( office:events?, %draw-text; )>
-<!ATTLIST draw:circle %draw-position; >
-<!ATTLIST draw:circle %draw-size; >
-<!ATTLIST draw:circle %draw-style-name; >
-<!ATTLIST draw:circle %draw-transform; >
-<!ATTLIST draw:circle %zindex;>
-<!ATTLIST draw:circle %draw-end-position; >
-<!ATTLIST draw:circle %table-background; >
-<!ATTLIST draw:circle draw:id %draw-shape-id;>
-<!ATTLIST draw:circle draw:kind (full|section|cut|arc) "full">
-<!ATTLIST draw:circle draw:start-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:circle draw:end-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:circle %text-anchor;>
-<!ATTLIST draw:circle draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:ellipse ( office:events?, %draw-text; )>
-<!ATTLIST draw:ellipse %draw-position; >
-<!ATTLIST draw:ellipse %draw-size; >
-<!ATTLIST draw:ellipse %draw-style-name; >
-<!ATTLIST draw:ellipse %draw-transform; >
-<!ATTLIST draw:ellipse %zindex;>
-<!ATTLIST draw:ellipse %draw-end-position; >
-<!ATTLIST draw:ellipse %table-background; >
-<!ATTLIST draw:ellipse draw:id %draw-shape-id;>
-<!ATTLIST draw:ellipse draw:kind (full|section|cut|arc) "full">
-<!ATTLIST draw:ellipse draw:start-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:ellipse draw:end-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:ellipse  %text-anchor;>
-<!ATTLIST draw:ellipse draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:connector ( office:events?, %draw-text;)>
-<!ATTLIST draw:connector draw:type (standard|lines|line|curve) "standard">
-<!ATTLIST draw:connector draw:line-skew CDATA #IMPLIED>
-<!ATTLIST draw:connector %draw-style-name;>
-<!ATTLIST draw:connector svg:x1 %coordinate; #REQUIRED>
-<!ATTLIST draw:connector svg:y1 %coordinate; #REQUIRED>
-<!ATTLIST draw:connector svg:x2 %coordinate; #REQUIRED>
-<!ATTLIST draw:connector svg:y2 %coordinate; #REQUIRED>
-<!ATTLIST draw:connector draw:start-shape %draw-shape-id;>
-<!ATTLIST draw:connector draw:start-glue-point %integer; #IMPLIED>
-<!ATTLIST draw:connector draw:end-shape %draw-shape-id;>
-<!ATTLIST draw:connector draw:end-glue-point %integer; #IMPLIED>
-<!ATTLIST draw:connector %zindex;>
-<!ATTLIST draw:connector %draw-end-position; >
-<!ATTLIST draw:connector %table-background; >
-<!ATTLIST draw:connector draw:id %draw-shape-id;>
-<!ATTLIST draw:connector %text-anchor;>
-<!ATTLIST draw:connector draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:control EMPTY>
-<!ATTLIST draw:control %draw-style-name;>
-<!ATTLIST draw:control %draw-position; >
-<!ATTLIST draw:control %draw-size; >
-<!ATTLIST draw:control %control-id; >
-<!ATTLIST draw:control %zindex;>
-<!ATTLIST draw:control %draw-end-position; >
-<!ATTLIST draw:control %table-background; >
-<!ATTLIST draw:control draw:id %draw-shape-id;>
-<!ATTLIST draw:control %text-anchor;>
-<!ATTLIST draw:control draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:g ( office:events?, (%shapes;)* ) >
-<!ATTLIST draw:g svg:y %coordinate; #IMPLIED>
-<!ATTLIST draw:g %draw-transform; >
-<!ATTLIST draw:g %draw-style-name; >
-<!ATTLIST draw:g %zindex;>
-<!ATTLIST draw:g %draw-end-position; >
-<!ATTLIST draw:g %table-background; >
-<!ATTLIST draw:g draw:id %draw-shape-id;>
-<!ATTLIST draw:g %text-anchor;>
-<!ATTLIST draw:g draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:page-thumbnail EMPTY>
-<!ATTLIST draw:page-thumbnail draw:page-number %positiveInteger; #IMPLIED>
-<!ATTLIST draw:page-thumbnail %draw-position; >
-<!ATTLIST draw:page-thumbnail %draw-size; >
-<!ATTLIST draw:page-thumbnail %draw-style-name; >
-<!ATTLIST draw:page-thumbnail %presentation-class; >
-<!ATTLIST draw:page-thumbnail %zindex;>
-<!ATTLIST draw:page-thumbnail %draw-end-position; >
-<!ATTLIST draw:page-thumbnail %table-background; >
-<!ATTLIST draw:page-thumbnail draw:id %draw-shape-id;>
-<!ATTLIST draw:page-thumbnail %text-anchor;>
-<!ATTLIST draw:page-thumbnail draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:caption ( office:events?, %draw-text;)>
-<!ATTLIST draw:caption %draw-position; >
-<!ATTLIST draw:caption %draw-end-position; >
-<!ATTLIST draw:caption %table-background; >
-<!ATTLIST draw:caption %draw-size; >
-<!ATTLIST draw:caption %draw-style-name; >
-<!ATTLIST draw:caption %draw-transform; >
-<!ATTLIST draw:caption draw:caption-point-x %coordinate; #IMPLIED>
-<!ATTLIST draw:caption draw:caption-point-y %coordinate; #IMPLIED>
-<!ATTLIST draw:caption %zindex;>
-<!ATTLIST draw:caption draw:id %draw-shape-id;>
-<!ATTLIST draw:caption  %text-anchor;>
-<!ATTLIST draw:caption draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:caption draw:corner-radius %nonNegativeLength; #IMPLIED>
-
-<!ELEMENT draw:measure ( office:events?, %draw-text;)>
-<!ATTLIST draw:measure svg:x1 %coordinate; #REQUIRED>
-<!ATTLIST draw:measure svg:y1 %coordinate; #REQUIRED>
-<!ATTLIST draw:measure svg:x2 %coordinate; #REQUIRED>
-<!ATTLIST draw:measure svg:y2 %coordinate; #REQUIRED>
-<!ATTLIST draw:measure %draw-end-position; >
-<!ATTLIST draw:measure %table-background; >
-<!ATTLIST draw:measure %draw-style-name; >
-<!ATTLIST draw:measure %draw-transform; >
-<!ATTLIST draw:measure %zindex;>
-<!ATTLIST draw:measure draw:id %draw-shape-id;>
-<!ATTLIST draw:measure %text-anchor;>
-<!ATTLIST draw:measure draw:layer %layerName; #IMPLIED>
-
-<!-- graphic style elements -->
-<!ELEMENT draw:gradient EMPTY >
-<!ATTLIST draw:gradient draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:gradient draw:style %gradient-style; #REQUIRED>
-<!ATTLIST draw:gradient draw:cx %coordinate; #IMPLIED>
-<!ATTLIST draw:gradient draw:cy %coordinate; #IMPLIED>
-<!ATTLIST draw:gradient draw:start-color %color; #IMPLIED>
-<!ATTLIST draw:gradient draw:end-color %color; #IMPLIED>
-<!ATTLIST draw:gradient draw:start-intensity %percentage; #IMPLIED>
-<!ATTLIST draw:gradient draw:end-intensity %percentage; #IMPLIED>
-<!ATTLIST draw:gradient draw:angle %integer; #IMPLIED>
-<!ATTLIST draw:gradient draw:border %percentage; #IMPLIED>
-
-<!ELEMENT draw:hatch EMPTY >
-<!ATTLIST draw:hatch draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:hatch draw:style (single|double|triple) #REQUIRED >
-<!ATTLIST draw:hatch draw:color %color; #IMPLIED>
-<!ATTLIST draw:hatch draw:distance %length; #IMPLIED>
-<!ATTLIST draw:hatch draw:rotation %integer; #IMPLIED>
-
-
-<!ELEMENT draw:fill-image EMPTY >
-<!ATTLIST draw:fill-image draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:fill-image xlink:href %uriReference; #REQUIRED>
-<!ATTLIST draw:fill-image xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:fill-image xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:fill-image xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:fill-image svg:width %length; #IMPLIED>
-<!ATTLIST draw:fill-image svg:height %length; #IMPLIED>
-
-<!ELEMENT draw:transparency EMPTY>
-<!ATTLIST draw:transparency draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:transparency draw:style %gradient-style; #REQUIRED>
-<!ATTLIST draw:transparency draw:cx %coordinate; #IMPLIED>
-<!ATTLIST draw:transparency draw:cy %coordinate; #IMPLIED>
-<!ATTLIST draw:transparency draw:start %percentage; #IMPLIED>
-<!ATTLIST draw:transparency draw:end %percentage; #IMPLIED>
-<!ATTLIST draw:transparency draw:angle %integer; #IMPLIED>
-<!ATTLIST draw:transparency draw:border %percentage; #IMPLIED>
-
-<!ELEMENT draw:marker EMPTY>
-<!ATTLIST draw:marker draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:marker %draw-viewbox; >
-<!ATTLIST draw:marker svg:d %pathData; #REQUIRED>
-
-<!ELEMENT draw:stroke-dash EMPTY>
-<!ATTLIST draw:stroke-dash draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:stroke-dash draw:style (rect|round) #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:dots1 %integer; #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:dots1-length %length; #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:dots2 %integer; #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:dots2-length %length; #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:distance %length; #IMPLIED>
-
-<!-- stroke attributes -->
-<!ATTLIST style:properties draw:stroke (none|dash|solid) #IMPLIED>
-<!ATTLIST style:properties draw:stroke-dash CDATA #IMPLIED>
-<!ATTLIST style:properties svg:stroke-width %length; #IMPLIED>
-<!ATTLIST style:properties svg:stroke-color %color; #IMPLIED>
-<!ATTLIST style:properties draw:marker-start %styleName; #IMPLIED>
-<!ATTLIST style:properties draw:marker-end %styleName; #IMPLIED>
-<!ATTLIST style:properties draw:marker-start-width %length; #IMPLIED>
-<!ATTLIST style:properties draw:marker-end-width %length; #IMPLIED>
-<!ATTLIST style:properties draw:marker-start-center %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:marker-end-center %boolean; #IMPLIED>
-<!ATTLIST style:properties svg:stroke-opacity %floatOrPercentage; #IMPLIED>
-<!ATTLIST style:properties svg:stroke-linejoin (miter|round|bevel|middle|none|inherit) #IMPLIED>
-
-<!-- text attributes -->
-<!ATTLIST style:properties draw:auto-grow-width %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:auto-grow-height %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fit-to-size %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fit-to-contour %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:textarea-horizontal-align ( left | center | right | justify ) #IMPLIED>
-<!ATTLIST style:properties draw:textarea-vertical-align ( top | middle | bottom ) #IMPLIED>
-
-<!-- fill attributes -->
-<!ATTLIST style:properties draw:fill (none|solid|bitmap|gradient|hatch) #IMPLIED>
-<!ATTLIST style:properties draw:fill-color %color; #IMPLIED>
-<!ATTLIST style:properties draw:fill-gradient-name %styleName; #IMPLIED>
-<!ATTLIST style:properties draw:gradient-step-count CDATA #IMPLIED>
-<!ATTLIST style:properties draw:fill-hatch-name %styleName; #IMPLIED>
-<!ATTLIST style:properties draw:fill-hatch-solid %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-name %styleName; #IMPLIED>
-<!ATTLIST style:properties style:repeat (no-repeat|repeat|stretch) #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-ref-point-x %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-ref-point-y %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-ref-point %rectanglePoint; #IMPLIED>
-<!ATTLIST style:properties draw:tile-repeat-offset CDATA #IMPLIED>
-<!ATTLIST style:properties draw:transparency %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:transparency-name %styleName; #IMPLIED>
-
-<!-- graphic attributes -->
-<!ATTLIST style:properties draw:color-mode (greyscale|mono|watermark|standard) #IMPLIED>
-<!ATTLIST style:properties draw:luminance %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:contrast %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:gamma %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:red %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:green %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:blue %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:color-inversion %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:mirror %boolean; #IMPLIED>
-
-<!-- shadow attributes -->
-<!ATTLIST style:properties draw:shadow (visible|hidden) #IMPLIED>
-<!ATTLIST style:properties draw:shadow-offset-x %length; #IMPLIED>
-<!ATTLIST style:properties draw:shadow-offset-y %length; #IMPLIED>
-<!ATTLIST style:properties draw:shadow-color %color; #IMPLIED>
-<!ATTLIST style:properties draw:shadow-transparency CDATA #IMPLIED>
-
-<!-- connector attributes -->
-<!ATTLIST style:properties draw:start-line-spacing-horizontal %distance; #IMPLIED>
-<!ATTLIST style:properties draw:start-line-spacing-vertical %distance; #IMPLIED>
-<!ATTLIST style:properties draw:end-line-spacing-horizontal %distance; #IMPLIED>
-<!ATTLIST style:properties draw:end-line-spacing-vertical %distance; #IMPLIED>
-
-<!-- measure attributes -->
-<!ATTLIST style:properties draw:line-distance %distance; #IMPLIED>
-<!ATTLIST style:properties draw:guide-overhang %distance; #IMPLIED>
-<!ATTLIST style:properties draw:guide-distance %distance; #IMPLIED>
-<!ATTLIST style:properties draw:start-guide %distance; #IMPLIED>
-<!ATTLIST style:properties draw:end-guide %distance; #IMPLIED>
-<!ATTLIST style:properties draw:measure-align (automatic|left-outside|inside|right-outside) #IMPLIED>
-<!ATTLIST style:properties draw:measure-vertical-align (automatic|above|below|center) #IMPLIED>
-<!ATTLIST style:properties draw:unit (automatic|mm|cm|m|km|pt|pc|inch|ft|mi) #IMPLIED>
-<!ATTLIST style:properties draw:show-unit %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:placing (below|above) #IMPLIED>
-<!ATTLIST style:properties draw:parallel %boolean; #IMPLIED>
-
-<!-- frame attributes -->
-<!ATTLIST style:properties draw:frame-display-scrollbar %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:frame-display-border %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:frame-margin-horizontal %nonNegativePixelLength; #IMPLIED>
-<!ATTLIST style:properties draw:frame-margin-vertical %nonNegativePixelLength; #IMPLIED>
-<!ATTLIST style:properties draw:size-protect %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:move-protect %boolean; #IMPLIED>
-
-<!-- ole object attributes -->
-<!ATTLIST style:properties draw:visible-area-left %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties draw:visible-area-top %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties draw:visible-area-width %positiveLength; #IMPLIED>
-<!ATTLIST style:properties draw:visible-area-height %positiveLength; #IMPLIED>
-
-<!-- fontwork attributes -->
-<!ATTLIST style:properties draw:fontwork-style (rotate|upright|slant-x|slant-y|none) #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-adjust (left|right|autosize|center) #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-distance %distance; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-start %distance; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-mirror %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-outline %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow (normal|slant|none) #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow-color %color; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow-offset-x %distance; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow-offset-y %distance; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-form (none|top-circle|bottom-circle|left-circle|right-circle|top-arc|bottom-arc|left-arc|right-arc|button1|button2|button3|button4) #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-hide-form %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow-transparence %percentage; #IMPLIED>
-
-<!-- caption attributes -->
-<!ATTLIST style:properties draw:caption-type (straight-line|angled-line|angled-connector-line) #IMPLIED>
-<!ATTLIST style:properties draw:caption-angle-type (fixed|free) #IMPLIED>
-<!ATTLIST style:properties draw:caption-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties draw:caption-gap %distance; #IMPLIED>
-<!ATTLIST style:properties draw:caption-escape-direction (horizontal|vertical|auto) #IMPLIED>
-<!ATTLIST style:properties draw:caption-escape %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties draw:caption-line-length %distance; #IMPLIED>
-<!ATTLIST style:properties draw:caption-fit-line-length %boolean; #IMPLIED>
-
-<!-- Animations -->
-<!ELEMENT presentation:sound EMPTY>
-<!ATTLIST presentation:sound xlink:href %uriReference; #REQUIRED>
-<!ATTLIST presentation:sound xlink:type (simple) #FIXED "simple">
-<!ATTLIST presentation:sound xlink:show (new|replace) #IMPLIED>
-<!ATTLIST presentation:sound xlink:actuate (onRequest) "onRequest">
-<!ATTLIST presentation:sound presentation:play-full %boolean; #IMPLIED>
-
-<!ELEMENT presentation:show-shape (presentation:sound)?>
-<!ATTLIST presentation:show-shape draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:show-shape presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:show-shape presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:show-shape presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:show-shape presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:show-shape presentation:path-id CDATA #IMPLIED >
-
-<!ELEMENT presentation:show-text (presentation:sound)?>
-<!ATTLIST presentation:show-text draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:show-text presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:show-text presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:show-text presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:show-text presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:show-text presentation:path-id CDATA #IMPLIED >
-
-<!ELEMENT presentation:hide-shape (presentation:sound)?>
-<!ATTLIST presentation:hide-shape draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:hide-shape presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:hide-shape presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:hide-shape presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:hide-shape presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:hide-shape presentation:path-id CDATA #IMPLIED >
-
-<!ELEMENT presentation:hide-text (presentation:sound)?>
-<!ATTLIST presentation:hide-text draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:hide-text presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:hide-text presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:hide-text presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:hide-text presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:hide-text presentation:path-id CDATA #IMPLIED >
-
-<!ELEMENT presentation:dim (presentation:sound)?>
-<!ATTLIST presentation:dim draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:dim draw:color %color; #REQUIRED>
-
-<!ELEMENT presentation:play EMPTY>
-<!ATTLIST presentation:play draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:play presentation:speed %presentationSpeeds; "medium">
-
-<!ELEMENT presentation:animations (presentation:show-shape|presentation:show-text|presentation:hide-shape|presentation:hide-text|presentation:dim|presentation:play)*>
-
-<!ELEMENT presentation:show EMPTY>
-<!ATTLIST presentation:show presentation:name %styleName; #REQUIRED>
-<!ATTLIST presentation:show presentation:pages CDATA #REQUIRED>
-
-<!ELEMENT presentation:settings (presentation:show)*>
-<!ATTLIST presentation:settings presentation:start-page %styleName; #IMPLIED>
-<!ATTLIST presentation:settings presentation:show %styleName; #IMPLIED>
-<!ATTLIST presentation:settings presentation:full-screen %boolean; "true">
-<!ATTLIST presentation:settings presentation:endless %boolean; "false">
-<!ATTLIST presentation:settings presentation:pause %timeDuration; #IMPLIED>
-<!ATTLIST presentation:settings presentation:show-logo %boolean; "false">
-<!ATTLIST presentation:settings presentation:force-manual %boolean; "false">
-<!ATTLIST presentation:settings presentation:mouse-visible %boolean; "true">
-<!ATTLIST presentation:settings presentation:mouse-as-pen %boolean; "false">
-<!ATTLIST presentation:settings presentation:start-with-navigator %boolean; "false">
-<!ATTLIST presentation:settings presentation:animations (enabled|disabled) "enabled">
-<!ATTLIST presentation:settings presentation:stay-on-top %boolean; "false">
-<!ATTLIST presentation:settings presentation:transition-on-click (enabled|disabled) "enabled">
-
-<!-- Drawing page -->
-<!ELEMENT draw:page (office:forms?,(%shapes;)*,presentation:animations?,presentation:notes?)>
-<!ATTLIST draw:page draw:name %string; #IMPLIED>
-<!ATTLIST draw:page draw:style-name %styleName; #IMPLIED>
-<!ATTLIST draw:page draw:master-page-name %styleName; #REQUIRED>
-<!ATTLIST draw:page presentation:presentation-page-layout-name %styleName; #IMPLIED>
-<!ATTLIST draw:page draw:id %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:page xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:page xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:page xlink:show (replace) #IMPLIED>
-<!ATTLIST draw:page xlink:actuate (onRequest) #IMPLIED>
-
-<!-- Presentation notes -->
-<!ELEMENT presentation:notes (%shapes;)*>
-
-
-<!-- presentation page layouts -->
-<!ELEMENT style:presentation-page-layout (presentation:placeholder)* >
-<!ATTLIST style:presentation-page-layout style:name %styleName; #REQUIRED>
-<!ELEMENT presentation:placeholder EMPTY >
-<!ATTLIST presentation:placeholder presentation:object (title|outline|subtitle|text|graphic|object|chart|orgchart|page|notes|handout) #REQUIRED>
-<!ATTLIST presentation:placeholder svg:x %coordinateOrPercentage; #REQUIRED>
-<!ATTLIST presentation:placeholder svg:y %coordinateOrPercentage; #REQUIRED>
-<!ATTLIST presentation:placeholder svg:width %lengthOrPercentage; #REQUIRED>
-<!ATTLIST presentation:placeholder svg:height %lengthOrPercentage; #REQUIRED>
-
-<!-- presentation page attributes -->
-<!ATTLIST style:properties presentation:transition-type (manual|automatic|semi-automatic) #IMPLIED >
-<!ATTLIST style:properties presentation:transition-style (none|fade-from-left|fade-from-top|fade-from-right|fade-from-bottom|fade-to-center|fade-from-center|move-from-left|move-from-top|move-from-right|move-from-bottom|roll-from-top|roll-from-left|roll-from-right|roll-from-bottom|vertical-stripes|horizontal-stripes|clockwise|counterclockwise|fade-from-upperleft|fade-from-upperright|fade-from-lowerleft|fade-from-lowerright|close-vertical|close-horizontal|open-vertical|open-horizontal|spiralin-left|spiralin-right|spiralout-left|spiralout-right|dissolve|wavyline-from-left|wavyline-from-top|wavyline-from-right|wavyline-from-bottom|random|stretch-from-left|stretch-from-top|stretch-from-right|stretch-from-bottom|vertical-lines|horizontal-lines) #IMPLIED >
-<!ATTLIST style:properties presentation:transition-speed %presentationSpeeds; #IMPLIED >
-<!ATTLIST style:properties presentation:duration %timeDuration; #IMPLIED>
-<!ATTLIST style:properties presentation:visibility (visible|hidden) #IMPLIED>
-<!ATTLIST style:properties draw:background-size (full|border) #IMPLIED>
-<!ATTLIST style:properties presentation:background-objects-visible %boolean; #IMPLIED>
-<!ATTLIST style:properties presentation:background-visible %boolean; #IMPLIED>
-
-
-<!-- text boxes -->
-<!ELEMENT draw:text-box (office:events?,draw:image-map?,
-		%sectionText;)>
-<!ATTLIST draw:text-box %draw-style-name;>
-<!ATTLIST draw:text-box %draw-transform; >
-<!ATTLIST draw:text-box draw:name %string; #IMPLIED>
-<!ATTLIST draw:text-box draw:chain-next-name %string; #IMPLIED>
-
-<!ATTLIST draw:text-box %text-anchor;>
-<!ATTLIST draw:text-box %draw-position;>
-<!ATTLIST draw:text-box %draw-end-position; >
-<!ATTLIST draw:text-box %table-background; >
-<!ATTLIST draw:text-box svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:text-box svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:text-box style:rel-width %percentage; #IMPLIED>
-<!ATTLIST draw:text-box style:rel-height %percentage; #IMPLIED>
-<!ATTLIST draw:text-box fo:min-height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:text-box %zindex;>
-<!ATTLIST draw:text-box %presentation-class; >
-<!ATTLIST draw:text-box %draw-transform; >
-<!ATTLIST draw:text-box draw:id %draw-shape-id;>
-<!ATTLIST draw:text-box draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:text-box draw:corner-radius %nonNegativeLength; #IMPLIED>
-
-<!-- image -->
-<!ELEMENT draw:image (office:binary-data?,office:events?,draw:image-map?,svg:desc?,(draw:contour-polygon|draw:contour-path)?)>
-<!ATTLIST draw:image %draw-style-name;>
-<!ATTLIST draw:image draw:name %string; #IMPLIED>
-<!ATTLIST draw:image xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:image xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:image xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:image xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:image draw:filter-name %string; #IMPLIED>
-<!ATTLIST draw:image %text-anchor;>
-<!ATTLIST draw:image %draw-position;>
-<!ATTLIST draw:image %draw-end-position; >
-<!ATTLIST draw:image %table-background; >
-<!ATTLIST draw:image svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:image svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:image %presentation-class; >
-<!ATTLIST draw:image %zindex;>
-<!ATTLIST draw:image draw:id %draw-shape-id;>
-<!ATTLIST draw:image draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:image style:rel-width %percentage; #IMPLIED>
-<!ATTLIST draw:image style:rel-height %percentage; #IMPLIED>
-
-<!-- objects -->
-<!ELEMENT draw:thumbnail EMPTY>
-<!ATTLIST draw:thumbnail xlink:href %uriReference; #REQUIRED>
-<!ATTLIST draw:thumbnail xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:thumbnail xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:thumbnail xlink:actuate (onLoad) #IMPLIED>
-
-<!ELEMENT math:math ANY> <!-- dummy (we have no MathML DTD currently)-->
-<!ELEMENT draw:object (draw:thumbnail?,(office:document|math:math)?,office:events?, draw:image-map?, svg:desc?,(draw:contour-polygon|draw:contour-path)?)>
-<!ATTLIST draw:object %draw-style-name;>
-<!ATTLIST draw:object draw:name %string; #IMPLIED>
-<!ATTLIST draw:object xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:object xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:object xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:object xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:object %text-anchor;>
-<!ATTLIST draw:object %draw-position;>
-<!ATTLIST draw:object %draw-end-position; >
-<!ATTLIST draw:object %table-background; >
-<!ATTLIST draw:object svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:object svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:object %presentation-class; >
-<!ATTLIST draw:object %zindex;>
-<!ATTLIST draw:object draw:id %draw-shape-id;>
-<!ATTLIST draw:object draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:object draw:notify-on-update-of-ranges %string; #IMPLIED>
-<!ATTLIST draw:object style:rel-width %percentage; #IMPLIED>
-<!ATTLIST draw:object style:rel-height %percentage; #IMPLIED>
-
-<!ELEMENT draw:object-ole (office:binary-data?|office:events?|draw:image-map?|svg:desc?|draw:contour-polygon?|draw:contour-path?|draw:thumbnail?)>
-<!ATTLIST draw:object-ole draw:class-id CDATA #IMPLIED>
-<!ATTLIST draw:object-ole %draw-style-name;>
-<!ATTLIST draw:object-ole draw:name %string; #IMPLIED>
-<!ATTLIST draw:object-ole xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:object-ole xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:object-ole xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:object-ole xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:object-ole %text-anchor;>
-<!ATTLIST draw:object-ole %draw-position;>
-<!ATTLIST draw:object-ole %draw-end-position; >
-<!ATTLIST draw:object-ole %table-background; >
-<!ATTLIST draw:object-ole svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:object-ole svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:object-ole %presentation-class; >
-<!ATTLIST draw:object-ole %zindex;>
-<!ATTLIST draw:object-ole draw:id %draw-shape-id;>
-<!ATTLIST draw:object-ole draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:object-ole style:rel-width %percentage; #IMPLIED>
-<!ATTLIST draw:object-ole style:rel-height %percentage; #IMPLIED>
-
-<!ELEMENT svg:desc (#PCDATA)>
-
-<!ELEMENT draw:contour-polygon EMPTY>
-<!ATTLIST draw:contour-polygon svg:width %coordinate; #REQUIRED>
-<!ATTLIST draw:contour-polygon svg:height %coordinate; #REQUIRED>
-<!ATTLIST draw:contour-polygon %draw-viewbox;>
-<!ATTLIST draw:contour-polygon draw:points %points; #REQUIRED>
-<!ATTLIST draw:contour-polygon draw:recreate-on-edit %boolean; #IMPLIED>
-
-<!ELEMENT draw:contour-path EMPTY>
-<!ATTLIST draw:contour-path svg:width %coordinate; #REQUIRED>
-<!ATTLIST draw:contour-path svg:height %coordinate; #REQUIRED>
-<!ATTLIST draw:contour-path %draw-viewbox;>
-<!ATTLIST draw:contour-path svg:d %pathData; #REQUIRED>
-<!ATTLIST draw:contour-path draw:recreate-on-edit %boolean; #IMPLIED>
-
-<!-- hyperlink -->
-<!ELEMENT draw:a (draw:image|draw:text-box)>
-<!ATTLIST draw:a xlink:href %uriReference; #REQUIRED>
-<!ATTLIST draw:a xlink:type (simple) #FIXED "simple">
-<!ATTLIST draw:a xlink:show (new|replace) #IMPLIED>
-<!ATTLIST draw:a xlink:actuate (onRequest) "onRequest">
-<!ATTLIST draw:a office:name %string; #IMPLIED>
-<!ATTLIST draw:a office:target-frame-name %string; #IMPLIED>
-<!ATTLIST draw:a office:server-map %boolean; "false">
-
-<!-- 3d properties -->
-<!ATTLIST style:properties dr3d:horizontal-segments %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties dr3d:vertical-segments %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties dr3d:edge-rounding %percentage; #IMPLIED>
-<!ATTLIST style:properties dr3d:edge-rounding-mode (correct|attractive) #IMPLIED>
-<!ATTLIST style:properties dr3d:back-scale %percentage; #IMPLIED>
-<!ATTLIST style:properties dr3d:end-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties dr3d:depth %length; #IMPLIED>
-<!ATTLIST style:properties dr3d:backface-culling (enabled|disabled) #IMPLIED>
-<!ATTLIST style:properties dr3d:lighting-mode (standard|double-sided) #IMPLIED>
-<!ATTLIST style:properties dr3d:normals-kind (object|flat|sphere) #IMPLIED>
-<!ATTLIST style:properties dr3d:normals-direction (normal|inverse) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-generation-mode-x (object|parallel|sphere) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-generation-mode-y (object|parallel|sphere) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-kind (luminance|intesity|color) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-filter (enabled|disabled) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-mode (replace|modulate|blend) #IMPLIED>
-<!ATTLIST style:properties dr3d:ambient-color %color; #IMPLIED>
-<!ATTLIST style:properties dr3d:emissive-color %color; #IMPLIED>
-<!ATTLIST style:properties dr3d:specular-color %color; #IMPLIED>
-<!ATTLIST style:properties dr3d:diffuse-color %color; #IMPLIED>
-<!ATTLIST style:properties dr3d:shininess %percentage; #IMPLIED>
-<!ATTLIST style:properties dr3d:shadow (visible|hidden) #IMPLIED>
-
-<!ELEMENT dr3d:light EMPTY>
-<!ATTLIST dr3d:light dr3d:diffuse-color %color; #IMPLIED>
-<!ATTLIST dr3d:light dr3d:direction %vector3D; #REQUIRED>
-<!ATTLIST dr3d:light dr3d:enabled %boolean; #IMPLIED>
-<!ATTLIST dr3d:light dr3d:specular %boolean; #IMPLIED>
-
-<!ENTITY % shapes3d "(dr3d:scene|dr3d:extrude|dr3d:sphere|dr3d:rotate|dr3d:cube)">
-
-<!ELEMENT dr3d:cube EMPTY>
-<!ATTLIST dr3d:cube dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:cube dr3d:min-edge %vector3D; #IMPLIED>
-<!ATTLIST dr3d:cube dr3d:max-edge %vector3D; #IMPLIED>
-<!ATTLIST dr3d:cube %zindex;>
-<!ATTLIST dr3d:cube draw:id %draw-shape-id;>
-<!ATTLIST dr3d:cube %draw-end-position; >
-<!ATTLIST dr3d:cube %table-background; >
-<!ATTLIST dr3d:cube %draw-style-name; >
-<!ATTLIST dr3d:cube draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT dr3d:sphere EMPTY>
-<!ATTLIST dr3d:sphere dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:sphere dr3d:center %vector3D; #IMPLIED>
-<!ATTLIST dr3d:sphere dr3d:size %vector3D; #IMPLIED>
-<!ATTLIST dr3d:sphere %zindex;>
-<!ATTLIST dr3d:sphere draw:id %draw-shape-id;>
-<!ATTLIST dr3d:sphere %draw-end-position; >
-<!ATTLIST dr3d:sphere %table-background; >
-<!ATTLIST dr3d:sphere %draw-style-name; >
-<!ATTLIST dr3d:sphere draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT dr3d:extrude EMPTY>
-<!ATTLIST dr3d:extrude dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:extrude %draw-viewbox;>
-<!ATTLIST dr3d:extrude svg:d %pathData; #REQUIRED >
-<!ATTLIST dr3d:extrude %zindex;>
-<!ATTLIST dr3d:extrude draw:id %draw-shape-id;>
-<!ATTLIST dr3d:extrude %draw-end-position; >
-<!ATTLIST dr3d:extrude %table-background; >
-<!ATTLIST dr3d:extrude %draw-style-name; >
-<!ATTLIST dr3d:extrude draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT dr3d:rotate EMPTY>
-<!ATTLIST dr3d:rotate dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:rotate %draw-viewbox;>
-<!ATTLIST dr3d:rotate svg:d %pathData; #REQUIRED >
-<!ATTLIST dr3d:rotate %zindex;>
-<!ATTLIST dr3d:rotate draw:id %draw-shape-id;>
-<!ATTLIST dr3d:rotate %draw-end-position; >
-<!ATTLIST dr3d:rotate %table-background; >
-<!ATTLIST dr3d:rotate %draw-style-name; >
-<!ATTLIST dr3d:rotate draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT dr3d:scene (dr3d:light*,(%shapes3d;)*)>
-<!ATTLIST dr3d:scene %draw-style-name; >
-<!ATTLIST dr3d:scene svg:x %coordinate; #IMPLIED>
-<!ATTLIST dr3d:scene svg:y %coordinate; #IMPLIED>
-<!ATTLIST dr3d:scene svg:width %length; #IMPLIED>
-<!ATTLIST dr3d:scene svg:height %length; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:vrp %vector3D; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:vpn %vector3D; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:vup %vector3D; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:projection (parallel|perspective) #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:distance %length; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:focal-length %length; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:shadow-slant %nonNegativeInteger; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:shade-mode (flat|phong|gouraud|draft) #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:ambient-color %color; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:lighting-mode %boolean; #IMPLIED>
-<!ATTLIST dr3d:scene %zindex;>
-<!ATTLIST dr3d:scene draw:id %draw-shape-id;>
-<!ATTLIST dr3d:scene %draw-end-position; >
-<!ATTLIST dr3d:scene %table-background; >
-
-<!-- layer -->
-
-<!ELEMENT draw:layer-set (draw:layer*)>
-
-<!ELEMENT draw:layer EMPTY>
-<!ATTLIST draw:layer draw:name %layerName; #REQUIRED>
-
-<!-- events -->
-<!ELEMENT presentation:event (presentation:sound)?>
-<!ATTLIST presentation:event %event-name;>
-<!ATTLIST presentation:event presentation:action (none|previous-page|next-page|first-page|last-page|hide|stop|execute|show|verb|fade-out|sound) #REQUIRED>
-<!ATTLIST presentation:event presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:event presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:event presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:event presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:event xlink:href %uriReference; #IMPLIED>
-<!ATTLIST presentation:event xlink:type (simple) #IMPLIED>
-<!ATTLIST presentation:event xlink:show (embed) #IMPLIED>
-<!ATTLIST presentation:event xlink:actuate (onRequest) #IMPLIED>
-<!ATTLIST presentation:event presentation:verb %nonNegativeInteger; #IMPLIED>
-
-<!-- applets -->
-<!ELEMENT draw:applet (draw:thumbnail?, draw:param*, svg:desc?)>
-<!ATTLIST draw:applet xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:applet xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:applet xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:applet xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:applet draw:code CDATA #REQUIRED>
-<!ATTLIST draw:applet draw:object CDATA #IMPLIED>
-<!ATTLIST draw:applet draw:archive CDATA #IMPLIED>
-<!ATTLIST draw:applet draw:may-script %boolean; "false">
-<!ATTLIST draw:applet draw:name CDATA #IMPLIED>
-<!ATTLIST draw:applet %draw-style-name;>
-<!ATTLIST draw:applet svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:applet svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:applet %zindex;>
-<!ATTLIST draw:applet draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:applet %draw-position;>
-<!ATTLIST draw:applet %draw-end-position; >
-
-<!-- plugins -->
-<!ELEMENT draw:plugin (draw:thumbnail?, draw:param*, svg:desc?)>
-<!ATTLIST draw:plugin xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:plugin xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:plugin xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:plugin xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:plugin draw:mime-type CDATA #IMPLIED>
-<!ATTLIST draw:plugin draw:name CDATA #IMPLIED>
-<!ATTLIST draw:plugin %draw-style-name;>
-<!ATTLIST draw:plugin svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:plugin svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:plugin %zindex;>
-<!ATTLIST draw:plugin draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:plugin %draw-position;>
-<!ATTLIST draw:plugin %draw-end-position; >
-
-<!-- Paramaters -->
-<!ELEMENT draw:param EMPTY>
-<!ATTLIST draw:param draw:name CDATA #IMPLIED>
-<!ATTLIST draw:param draw:value CDATA #IMPLIED>
-
-<!-- Floating Frames -->
-<!ELEMENT draw:floating-frame (draw:thumbnail?, svg:desc?)>
-<!ATTLIST draw:floating-frame xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:floating-frame xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:floating-frame xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:floating-frame xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:floating-frame draw:name CDATA #IMPLIED>
-<!ATTLIST draw:floating-frame draw:frame-name CDATA #IMPLIED>
-<!ATTLIST draw:floating-frame %draw-style-name;>
-<!ATTLIST draw:floating-frame svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:floating-frame svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:floating-frame %zindex;>
-<!ATTLIST draw:floating-frame draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:floating-frame %draw-position;>
-<!ATTLIST draw:floating-frame %draw-end-position; >
-
-<!-- Image Maps -->
-<!ELEMENT draw:image-map
-	(draw:area-rectangle|draw:area-circle|draw:area-polygon)*>
-
-<!ELEMENT draw:area-rectangle (svg:desc?,office:events?)>
-<!ATTLIST draw:area-rectangle xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:area-rectangle xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:area-rectangle office:target-frame-name CDATA #IMPLIED>
-<!ATTLIST draw:area-rectangle xlink:show (new|replace) #IMPLIED>
-<!ATTLIST draw:area-rectangle office:name CDATA #IMPLIED>
-<!ATTLIST draw:area-rectangle draw:nohref (nohref) #IMPLIED>
-<!ATTLIST draw:area-rectangle svg:x %coordinate; #REQUIRED>
-<!ATTLIST draw:area-rectangle svg:y %coordinate; #REQUIRED>
-<!ATTLIST draw:area-rectangle svg:width %coordinate; #REQUIRED>
-<!ATTLIST draw:area-rectangle svg:height %coordinate; #REQUIRED>
-
-<!ELEMENT draw:area-circle (svg:desc?,office:events?)>
-<!ATTLIST draw:area-circle xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:area-circle xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:area-circle office:target-frame-name CDATA #IMPLIED>
-<!ATTLIST draw:area-circle xlink:show (new|replace) #IMPLIED>
-<!ATTLIST draw:area-circle office:name CDATA #IMPLIED>
-<!ATTLIST draw:area-circle draw:nohref (nohref) #IMPLIED>
-<!ATTLIST draw:area-circle svg:cx %coordinate; #REQUIRED>
-<!ATTLIST draw:area-circle svg:cy %coordinate; #REQUIRED>
-<!ATTLIST draw:area-circle svg:r %coordinate; #REQUIRED>
-
-<!ELEMENT draw:area-polygon (svg:desc?,office:events?)>
-<!ATTLIST draw:area-polygon xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:area-polygon xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:area-polygon office:target-frame-name CDATA #IMPLIED>
-<!ATTLIST draw:area-polygon xlink:show (new|replace) #IMPLIED>
-<!ATTLIST draw:area-polygon office:name CDATA #IMPLIED>
-<!ATTLIST draw:area-polygon draw:nohref (nohref) #IMPLIED>
-<!ATTLIST draw:area-polygon svg:x %coordinate; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:y %coordinate; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:width %coordinate; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:height %coordinate; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:points %points; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:viewBox CDATA #REQUIRED>
diff --git a/chart2/workbench/fileformat/dtypes.mod b/chart2/workbench/fileformat/dtypes.mod
index ecb66be044c2..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/dtypes.mod
+++ b/chart2/workbench/fileformat/dtypes.mod
@@ -1,147 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: dtypes.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!-- datatypes corresponding to XML Schema Part 2 W3C Working draft of	-->
-<!-- 07 April 2000														-->
-
-<!-- string -->
-<!ENTITY % string				"CDATA">
-<!ENTITY % cString				"#PCDATA">
-
-<!-- boolean (values are "true" and "false" -->
-<!ENTITY % boolean				"CDATA">
-
-<!-- integer ( ..., -2, -1, 0, 1, 2, ...) -->
-<!ENTITY % integer				"CDATA">
-
-<!-- non negative integer ( 0, 1, 2, ...) -->
-<!ENTITY % nonNegativeInteger	"CDATA">
-
-<!-- positive integer ( 1, 2, ...) -->
-<!ENTITY % positiveInteger		"CDATA">
-<!ENTITY % cPositiveInteger		"#PCDATA">
-
-<!ENTITY % positiveNumberOrDefault "CDATA">
-
-<!-- time duration as specified by ISO8601, section 5.5.3.2 -->
-<!ENTITY % timeDuration			"CDATA">
-<!ENTITY % cTimeDuration		"#PCDATA">
-
-<!-- time instance as specified by ISO8601, section 5.4 -->
-<!ENTITY % timeInstance			"CDATA">
-<!ENTITY % cTimeInstance		"#PCDATA">
-
-<!-- date instance as specified by ISO8601, section 5.2.1.1, extended format-->
-<!ENTITY % date					"CDATA">
-<!ENTITY % cDate				"#PCDATA">
-
-<!-- date duration, like timDuration but truncated to full dates -->
-<!ENTITY % dateDuration			"CDATA">
-<!ENTITY % cDateDuration		"#PCDATA">
-
-<!-- URI reference -->
-<!ENTITY % uriReference			"CDATA">
-
-<!-- language code as specified by RFC1766 -->
-<!ENTITY % language				"CDATA">
-<!ENTITY % cLanguage			"#PCDATA">
-
-<!-- float -->
-<!ENTITY % float "CDATA">
-
-<!-- Some other common used data types -->
-
-<!-- a single UNICODE character -->
-<!ENTITY % character			"CDATA">
-
-<!-- a style name -->
-<!ENTITY % styleName			"CDATA">
-
-<!-- a target frame mame -->
-<!ENTITY % targetFrameName			"CDATA">
-
-<!-- a language without a country as specified by ISO639 -->
-<!ENTITY % languageOnly			"CDATA">
-
-<!-- a country as specified by ISO3166 -->
-<!ENTITY % country				"CDATA">
-
-<!-- a color value having the format #rrggbb -->
-<!ENTITY % color				"CDATA">
-<!-- a color value having the format #rrggbb or "transparent" -->
-<!ENTITY % transparentOrColor			"CDATA">
-
-<!-- a percentage -->
-<!ENTITY % percentage 			"CDATA">
-
-<!-- a length (i.e. 1cm or .6inch) -->
-<!ENTITY % length				"CDATA">
-<!ENTITY % positiveLength		"CDATA">
-<!ENTITY % nonNegativeLength	"CDATA">
-<!ENTITY % lengthOrNoLimit "CDATA">
-
-<!-- a length or a percentage -->
-<!ENTITY % lengthOrPercentage	"CDATA">
-<!ENTITY % positiveLengthOrPercentage	"CDATA">
-
-<!-- a pixel length (i.e. 2px) -->
-<!ENTITY % nonNegativePixelLength	"CDATA">
-
-<!-- a float or a percentage -->
-<!ENTITY % floatOrPercentage	"CDATA">
-
-<!-- a text encoding -->
-<!ENTITY % textEncoding	"CDATA">
-
-<!-- cell address and cell range address -->
-<!ENTITY % cell-address "CDATA">
-<!ENTITY % cell-range-address "CDATA">
-<!ENTITY % cell-range-address-list "CDATA">
-
-<!-- value types -->
-<!ENTITY % valueType "(float|time|date|percentage|currency|boolean|string)">
-
-<!-- an svg coordinate in different distance formats -->
-<!ENTITY % coordinate "CDATA">
-
-<!ENTITY % coordinateOrPercentage	"CDATA">
-
-<!ENTITY % shape "draw:rect|draw:line|draw:polyline|draw:polygon|draw:path|
-				   draw:circle|draw:ellipse|draw:g|draw:page-thumbnail|
-				   draw:text-box|draw:image|draw:object|draw:object-ole|
-				   draw:applet|draw:floating-frame|draw:plugin|
-				   draw:measure|draw:caption|draw:connector|
-				   dr3d:scene|draw:control" >
-<!ENTITY % shapes "(%shape;)" >
-
-<!ENTITY % anchorType "(page|frame|paragraph|char|as-char)">
-
-<!ENTITY % control-id "form:id CDATA #REQUIRED">
diff --git a/chart2/workbench/fileformat/form.mod b/chart2/workbench/fileformat/form.mod
index 7c39fe5fd43b..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/form.mod
+++ b/chart2/workbench/fileformat/form.mod
@@ -1,312 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: form.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!ENTITY % controls	"form:text|form:textarea|form:fixed-text|form:file|
-					 form:password|form:formatted-text|form:button|form:image|
-					 form:checkbox|form:radio|form:listbox|form:combobox|form:frame|
-					 form:hidden|form:image-frame|form:grid|form:generic-control">
-
-<!ENTITY % name "form:name CDATA #IMPLIED">
-<!ENTITY % service-name "form:service-name CDATA #IMPLIED">
-
-<!ENTITY % navigation "(none|current|parent)">
-<!ENTITY % cycles "(records|current|page)">
-<!ENTITY % url "CDATA">
-
-
-<!ENTITY % types "(submit|reset|push|url)">
-<!ENTITY % button-type "form:button-type %types; 'push'">
-<!ENTITY % current-selected "form:current-selected %boolean; 'false'">
-<!ENTITY % current-value "form:current-value CDATA #IMPLIED">
-<!ENTITY % value "form:value CDATA #IMPLIED">
-<!ENTITY % disabled "form:disabled %boolean; 'false'">
-<!ENTITY % dropdown "form:dropdown %boolean; 'false'">
-<!ENTITY % for "form:for CDATA #IMPLIED">
-<!ENTITY % image-data "form:image-data %url; #IMPLIED">
-<!ENTITY % label "form:label CDATA #IMPLIED">
-<!ENTITY % max-length "form:max-length CDATA #IMPLIED">
-<!ENTITY % printable "form:printable %boolean; 'true'">
-<!ENTITY % readonly "form:readonly %boolean; 'false'">
-<!ENTITY % size "form:size CDATA #IMPLIED">
-<!ENTITY % selected "form:selected %boolean; 'false'">
-<!ENTITY % size "form:size CDATA #IMPLIED">
-<!ENTITY % tab-index "form:tab-index CDATA #IMPLIED">
-<!ENTITY % target-frame "office:target-frame CDATA '_blank'">
-<!ENTITY % target-location "xlink:href %url; #IMPLIED">
-<!ENTITY % tab-stop "form:tab-stop %boolean; 'true'">
-<!ENTITY % title "form:title CDATA #IMPLIED">
-<!ENTITY % default-value "form:default-value CDATA #IMPLIED">
-<!ENTITY % bound-column "form:bound-column CDATA #IMPLIED">
-<!ENTITY % convert-empty "form:convert-empty-to-null  %boolean; 'false'">
-<!ENTITY % data-field "form:data-field CDATA #IMPLIED">
-<!ENTITY % list-source "form:list-source CDATA #IMPLIED">
-<!ENTITY % list-source-types "(table|query|sql|sql-pass-through|value-list|table-fields)">
-<!ENTITY % list-source-type "form:list-source-type %list-source-types; #IMPLIED">
-
-<!ELEMENT form:control (%controls;)+>
-<!ATTLIST form:control %name;
-                       %service-name;
-                       %control-id;>
-
-<!ELEMENT form:form (form:properties?, office:events?, (form:control|form:form)*)>
-<!ATTLIST form:form %name; %service-name;>
-<!ATTLIST form:form xlink:href %url; #IMPLIED>
-<!ATTLIST form:form form:enctype CDATA "application/x-www-form-urlencoded">
-<!ATTLIST form:form form:method CDATA "get">
-<!ATTLIST form:form office:target-frame CDATA "_blank">
-<!ATTLIST form:form form:allow-deletes %boolean; "true">
-<!ATTLIST form:form form:allow-inserts %boolean; "true">
-<!ATTLIST form:form form:allow-updates %boolean; "true">
-<!ATTLIST form:form form:apply-filter %boolean; "false">
-<!ATTLIST form:form form:command CDATA #IMPLIED>
-<!ATTLIST form:form form:command-type (table|query|command) "command">
-<!ATTLIST form:form form:datasource CDATA #IMPLIED>
-<!ATTLIST form:form form:detail-fields CDATA #IMPLIED>
-<!ATTLIST form:form form:escape-processing %boolean; "true">
-<!ATTLIST form:form form:filter CDATA #IMPLIED>
-<!ATTLIST form:form form:ignore-result %boolean; "false">
-<!ATTLIST form:form form:master-fields CDATA #IMPLIED>
-<!ATTLIST form:form form:navigation-mode %navigation; #IMPLIED>
-<!ATTLIST form:form form:order CDATA #IMPLIED>
-<!ATTLIST form:form form:tab-cycle %cycles; #IMPLIED>
-
-<!ELEMENT office:forms (form:form*)>
-<!ATTLIST office:forms form:automatic-focus %boolean; "false">
-<!ATTLIST office:forms form:apply-design-mode %boolean; "true">
-
-<!ELEMENT form:text (form:properties?, office:events?)>
-<!ATTLIST form:text %current-value;
-                    %disabled;
-                    %max-length;
-                    %printable;
-                    %readonly;
-                    %tab-index;
-                    %tab-stop;
-                    %title;
-                    %value;
-                    %convert-empty;
-                    %data-field;>
-
-<!ELEMENT form:textarea (form:properties?, office:events?)>
-<!ATTLIST form:textarea %current-value;
-                        %disabled;
-                        %max-length;
-                        %printable;
-                        %readonly;
-                        %tab-index;
-                        %tab-stop;
-                        %title;
-                        %value;
-                        %convert-empty;
-                        %data-field;>
-
-<!ELEMENT form:password (form:properties?, office:events?)>
-<!ATTLIST form:password %disabled;
-                        %max-length;
-                        %printable;
-                        %tab-index;
-                        %tab-stop;
-                        %title;
-                        %value;
-						%convert-empty;>
-
-<!ATTLIST form:password form:echo-char CDATA "*">
-
-<!ELEMENT form:file (form:properties?, office:events?)>
-<!ATTLIST form:file %current-value;
-                    %disabled;
-                    %max-length;
-                    %printable;
-                    %readonly;
-                    %tab-index;
-                    %tab-stop;
-                    %title;
-                    %value;>
-
-<!ELEMENT form:formatted-text (form:properties?, office:events?)>
-<!ATTLIST form:formatted-text %current-value;
-                              %disabled;
-                              %max-length;
-                              %printable;
-                              %readonly;
-                              %tab-index;
-                              %tab-stop;
-                              %title;
-                              %value;
-                              %convert-empty;
-                              %data-field;>
-<!ATTLIST form:formatted-text form:max-value CDATA #IMPLIED>
-<!ATTLIST form:formatted-text form:min-value CDATA #IMPLIED>
-<!ATTLIST form:formatted-text form:validation %boolean; "false">
-
-<!ELEMENT form:fixed-text (form:properties?, office:events?)>
-<!ATTLIST form:fixed-text %for;
-                          %disabled;
-                          %label;
-                          %printable;
-                          %title;>
-<!ATTLIST form:fixed-text form:multi-line %boolean; "false">
-
-<!ELEMENT form:combobox (form:properties?, office:events?, form:item*)>
-<!ATTLIST form:combobox %current-value;
-                        %disabled;
-                        %dropdown;
-                        %max-length;
-                        %printable;
-                        %readonly;
-                        %size;
-                        %tab-index;
-                        %tab-stop;
-                        %title;
-                        %value;
-                        %convert-empty;
-                        %data-field;
-                        %list-source;
-                        %list-source-type;>
-<!ATTLIST form:combobox form:auto-complete %boolean; #IMPLIED>
-
-<!ELEMENT form:item (#PCDATA)>
-<!ATTLIST form:item %label;>
-
-<!ELEMENT form:listbox (form:properties?, office:events?, form:option*)>
-<!ATTLIST form:listbox %disabled;
-                       %dropdown;
-                       %printable;
-                       %size;
-                       %tab-index;
-                       %tab-stop;
-                       %title;
-                       %bound-column;
-                       %data-field;
-                       %list-source;
-                       %list-source-type;>
-<!ATTLIST form:listbox form:multiple %boolean; "false">
-
-<!ELEMENT form:option (#PCDATA)>
-<!ATTLIST form:option %current-selected;
-                      %selected;
-                      %label;
-                      %value;>
-
-<!ELEMENT form:button (form:properties?, office:events?)>
-<!ATTLIST form:button %button-type;
-                      %disabled;
-                      %label;
-                      %image-data;
-                      %printable;
-                      %tab-index;
-                      %tab-stop;
-                      %target-frame;
-                      %target-location;
-                      %title;
-                      %value;>
-<!ATTLIST form:button form:default-button %boolean; "false">
-
-<!ELEMENT form:image (form:properties?, office:events?)>
-<!ATTLIST form:image %button-type;
-                     %disabled;
-                     %image-data;
-                     %printable;
-                     %tab-index;
-                     %tab-stop;
-                     %target-frame;
-                     %target-location;
-                     %title;
-                     %value;>
-
-<!ELEMENT form:checkbox (form:properties?, office:events?)>
-<!ATTLIST form:checkbox %disabled;
-                        %label;
-                        %printable;
-                        %tab-index;
-                        %tab-stop;
-                        %title;
-                        %value;
-                        %data-field;>
-<!ENTITY % states "(unchecked|checked|unknown)">
-<!ATTLIST form:checkbox form:current-state %states; #IMPLIED>
-<!ATTLIST form:checkbox form:is-tristate %boolean; "false">
-<!ATTLIST form:checkbox form:state %states; "unchecked">
-
-<!ELEMENT form:radio (form:properties?, office:events?)>
-<!ATTLIST form:radio %current-selected;
-                     %disabled;
-                     %label;
-                     %printable;
-                     %selected;
-                     %tab-index;
-                     %tab-stop;
-                     %title;
-                     %value;
-                     %data-field;>
-
-<!ELEMENT form:frame (form:properties?, office:events?)>
-<!ATTLIST form:frame %disabled;
-                     %for;
-                     %label;
-                     %printable;
-                     %title;>
-
-<!ELEMENT form:image-frame (form:properties?, office:events?)>
-<!ATTLIST form:image-frame %disabled;
-                           %image-data;
-                           %printable;
-                           %readonly;
-                           %title;
-                           %data-field;>
-
-<!ELEMENT form:hidden (form:properties?, office:events?)>
-<!ATTLIST form:hidden %name;
-                      %service-name;
-                      %value;>
-
-<!ELEMENT form:grid (form:properties?, office:events?, form:column*)>
-<!ATTLIST form:grid %disabled;
-                    %printable;
-                    %tab-index;
-                    %tab-stop;
-                    %title;>
-<!ENTITY % column-type "form:text| form:textarea| form:formatted-text|form:checkbox| form:listbox| form:combobox">
-<!ELEMENT form:column (%column-type;)+>
-<!ATTLIST form:column %name;
-                      %service-name;
-                      %label;>
-
-<!ELEMENT form:generic-control (form:properties?, office:events?)>
-
-
-<!ELEMENT form:properties (form:property+)>
-<!ELEMENT form:property (form:property-value*)>
-<!ATTLIST form:property form:property-is-list %boolean; #IMPLIED>
-<!ATTLIST form:property form:property-name CDATA #REQUIRED>
-<!ATTLIST form:property form:property-type (boolean|short|int|long|double|string)  #REQUIRED>
-<!ELEMENT form:property-value (#PCDATA)>
-
diff --git a/chart2/workbench/fileformat/meta.mod b/chart2/workbench/fileformat/meta.mod
index 0bef2535bcbf..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/meta.mod
+++ b/chart2/workbench/fileformat/meta.mod
@@ -1,94 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: meta.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-
-<!ELEMENT meta:generator (%cString;)>
-
-<!ELEMENT dc:title (%cString;)>
-
-<!ELEMENT dc:description (%cString;)>
-
-<!ELEMENT dc:subject (%cString;)>
-
-<!ELEMENT meta:keywords (meta:keyword)*>
-<!ELEMENT meta:keyword (%cString;)>
-
-<!ELEMENT meta:initial-creator (%cString;)>
-
-<!ELEMENT dc:creator (%cString;)>
-
-<!ELEMENT meta:printed-by (%cString;)>
-
-<!ELEMENT meta:creation-date (%cTimeInstance;)>
-
-<!ELEMENT dc:date (%cTimeInstance;)>
-
-<!ELEMENT meta:print-date (%cTimeInstance;)>
-
-<!ELEMENT meta:template EMPTY>
-<!ATTLIST meta:template xlink:type (simple) #FIXED "simple">
-<!ATTLIST meta:template xlink:actuate (onRequest) "onRequest">
-<!ATTLIST meta:template xlink:href %uriReference; #REQUIRED>
-<!ATTLIST meta:template xlink:title %string; #IMPLIED>
-<!ATTLIST meta:template meta:date %timeInstance; #IMPLIED>
-
-<!ELEMENT meta:auto-reload EMPTY>
-<!ATTLIST meta:auto-reload xlink:type (simple) #IMPLIED>
-<!ATTLIST meta:auto-reload xlink:show (replace) #IMPLIED>
-<!ATTLIST meta:auto-reload xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST meta:auto-reload xlink:href %uriReference; #IMPLIED>
-<!ATTLIST meta:auto-reload meta:delay %timeDuration; "P0S">
-
-<!ELEMENT meta:hyperlink-behaviour EMPTY>
-<!ATTLIST meta:hyperlink-behaviour office:target-frame-name %targetFrameName; #IMPLIED>
-<!ATTLIST meta:hyperlink-behaviour xlink:show (new|replace) #IMPLIED>
-
-<!ELEMENT dc:language (%cLanguage;)>
-
-<!ELEMENT meta:editing-cycles (%cPositiveInteger;)>
-
-<!ELEMENT meta:editing-duration (%cTimeDuration;)>
-
-<!ELEMENT meta:user-defined (%cString;)>
-<!ATTLIST meta:user-defined meta:name %string; #REQUIRED>
-
-<!ELEMENT meta:document-statistic EMPTY>
-<!ATTLIST meta:document-statistic meta:page-count %positiveInteger; #IMPLIED
-	meta:table-count %nonNegativeInteger; #IMPLIED
-	meta:draw-count %nonNegativeInteger; #IMPLIED
-	meta:image-count %nonNegativeInteger; #IMPLIED
-	meta:ole-object-count %nonNegativeInteger; #IMPLIED
-	meta:paragraph-count %nonNegativeInteger; #IMPLIED
-	meta:word-count %nonNegativeInteger; #IMPLIED
-	meta:character-count %nonNegativeInteger; #IMPLIED
-	meta:row-count %nonNegativeInteger; #IMPLIED
-	meta:cell-count %nonNegativeInteger; #IMPLIED
-	meta:object-count %positiveInteger; #IMPLIED>
diff --git a/chart2/workbench/fileformat/newchart.xml_hints b/chart2/workbench/fileformat/newchart.xml_hints
index d964dca781e5..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/newchart.xml_hints
+++ b/chart2/workbench/fileformat/newchart.xml_hints
@@ -1,77 +0,0 @@
-/*
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE office:document-content PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd">
-
-	<office:document-content xmlns:office="http://openoffice.org/2000/office"
-							xmlns:style="http://openoffice.org/2000/style"
-							xmlns:text="http://openoffice.org/2000/text"
-							xmlns:table="http://openoffice.org/2000/table"
-							xmlns:draw="http://openoffice.org/2000/drawing"
-							xmlns:fo="http://www.w3.org/1999/XSL/Format"
-							xmlns:xlink="http://www.w3.org/1999/xlink"
-							xmlns:number="http://openoffice.org/2000/datastyle"
-							xmlns:svg="http://www.w3.org/2000/svg"
-							xmlns:chart="http://openoffice.org/2000/chart"
-							xmlns:dr3d="http://openoffice.org/2000/dr3d"
-							xmlns:math="http://www.w3.org/1998/Math/MathML"
-							xmlns:form="http://openoffice.org/2000/form"
-							xmlns:script="http://openoffice.org/2000/script"
-
-							office:class="chart" office:version="1.0">
-
-
-*/
-
-// dtd -----------------------------------------------------
-// <!ELEMENT elementname regel>
-// <!ELEMENT elementname (subelement1,subelement2)> subelemente m�ssen vorhanden sein und 1 muss vor 2 stehen
-// <!ELEMENT elementname (subelement1|subelement2)> subelement 1 oder 2 muss vorhanden sein
-// <!ELEMENT elementname subelement?+*>	?: einmal oder gar nicht;
-										+: mindestens einmal
-										*: keinmal oder mehrmals
-// <!ATTLIST zielelement-name
-//			attribut-name attribut-datentyp defaultwert>
-//
-//										defaultwert: "geeigneter wert"
-//										defaultwert: #REQUIRED
-//										defaultwert: #IMPLIED (kann weggelassen werden)
-//										defaultwert: #FIXED "nicht zu �ndernder wert"
-//										attribut-datentyp: CDATA
-//										attribut-datentyp: enumerated (werte aufz�hlung z.B.)
-//										attribut-datentyp: ENTITY (deklariert in dtd)
-//										attribut-datentyp: ENTITIES (mehrfache durch whitespace getrennte ENTITYs)
-//										attribut-datentyp: ID (eindeutiges elementkennzeichen)
-//										attribut-datentyp: IDREF (wert eines ID-attributes)
-//										attribut-datentyp: IDREFS (mehrfache durch whitespace getrennte IDREFs)
-//										attribut-datentyp: NMTOKEN (xml-namen-token)
-//										attribut-datentyp: NMTOKENS (mehrfache durch whitespace getrennte NMTOKENs)
-//										attribut-datentyp: NOTATION (notation deklariert in dtd)
-
-<!----------------style:style----------------------------------- -->
-
-//<!ELEMENT style:style ( style:properties?,office:events?,style:map*)>
-//<!ELEMENT style:properties ANY>
-//<!ATTLIST style:style style:name %styleName; #REQUIRED>
-//<!ENTITY % styleFamily "(paragraph|text|section|
-//						 table|table-column|table-row|table-cell|table-page|chart|graphics|default|drawing-page|presentation|control|ruby)">
-//<!ATTLIST style:style style:family %styleFamily; #REQUIRED>
-//<!ATTLIST style:style style:parent-style-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:master-page-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:next-style-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:list-style-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:data-style-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:auto-update %boolean; "false">
-//<!ATTLIST style:style style:class %string; #IMPLIED>
-
-//---------------- expand styleFamily??:
-<!ENTITY % styleFamily "(...|chart|chart-axis||...)">
-
-an chart-axis style 'contains':
-number:number-style (as attribute style:data-style-name="name of a number:number-style")
-
-!!!!!!!!!!!!!! add chart2.mod to office.dtd
-
-!!!!!!!!!!!!!! remove chart from shape entity in dtypes.mod
-than add chart and chart2 to body entity in office.mod
-
-?????????legend-service name as style??
\ No newline at end of file
diff --git a/chart2/workbench/fileformat/newchart_test.xml b/chart2/workbench/fileformat/newchart_test.xml
index a26019d5aee0..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/newchart_test.xml
+++ b/chart2/workbench/fileformat/newchart_test.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE office:document-content PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd">
-<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" office:class="chart" office:version="1.0">
-    <office:automatic-styles>
-        <!-- auto-styles ***************************************************************************************************** -->
-        <!-- ******************************************************************************************************************* -->
-    </office:automatic-styles>
-    <office:body>
-        <!-- body ***************************************************************************************************************** -->
-        <chart2:chart2>
-            <chart2:legend id="legend_0" service="com.sun.star.chart2.Legend"/>
-            <chart2:legend id="legend_1" service="com.sun.star.chart2.Legend"/>
-            <chart2:scale id="scale1_x" minimum="0" maximum="10">
-                <chart2:break start="2" end="3"/>
-            </chart2:scale>
-            <chart2:scale id="scale1_y" scaling-service="com.sun.star.LogarithmicScaling"/>
-            <chart2:increment id="increment1_x" scale="scale1_x">
-                <chart2:subincrement count="2"/>
-                <chart2:subincrement count="5"/>
-            </chart2:increment>
-            <chart2:increment id="increment1_y" scale="scale1_y" pre-offset="0" post-equidistant="true" post-distance="1">
-                <chart2:subincrement count="10" post-equidistant="false"/>
-            </chart2:increment>
-            <!-- *************************************** container ***************************************************************-->
-            <chart2:final-target id="final_1">
-                <chart2:title id="title_1"/>
-                <chart2:logic-target id="logic_1">
-                    <chart2:coordinate-system id="coosys_1" service="com.sun.star.chart2.ThreeDimCartesian" legend="legend_1">
-                        <chart2:scaleRef scale="scale1_x" direction="reverse"/>
-                        <chart2:scaleRef scale="scale1_y"/>
-                    </chart2:coordinate-system>
-                </chart2:logic-target>
-            </chart2:final-target>
-            <!-- *************************************** axes ********************************************************************-->
-            <chart2:resident id="axis1_x" service="com.sun.star.chart2.CartesianAxis" coordinate-system="coosys_1">
-                <chart2:axis dimension="1" increment="increment1_x"/>
-            </chart2:resident>
-            <chart2:resident id="axis1_y" service="com.sun.star.chart2.CartesianAxis" coordinate-system="coosys_1">
-                <chart2:axis dimension="2" increment="increment1_y"/>
-            </chart2:resident>
-            <!-- *************************************** grids *******************************************************************-->
-            <chart2:resident id="grid1_x" service="com.sun.star.chart2.CartesianGrid" coordinate-system="coosys_1">
-                <chart2:grid dimension="1" increment="increment1_x"/>
-            </chart2:resident>
-            <chart2:resident id="grid1_y" service="com.sun.star.chart2.CartesianGrid" coordinate-system="coosys_1">
-                <chart2:grid dimension="2" increment="increment1_y"/>
-            </chart2:resident>
-            <!-- *************************************** renderer ***************************************************************-->
-            <chart2:resident id="barchart_1" service="com.sun.star.chart2.BarChart" coordinate-system="coosys_1">
-                <chart2:renderer/>
-            </chart2:resident>
-        </chart2:chart2>
-        <!-- ************************************************************************************************************************ -->
-    </office:body>
-</office:document-content>
diff --git a/chart2/workbench/fileformat/nmspace.mod b/chart2/workbench/fileformat/nmspace.mod
index b3ce73b6c95d..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/nmspace.mod
+++ b/chart2/workbench/fileformat/nmspace.mod
@@ -1,55 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: nmspace.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!ENTITY nFO "http://www.w3.org/1999/XSL/Format">
-<!ENTITY nXLink "http://www.w3.org/1999/xlink">
-<!ENTITY nSVG "http://www.w3.org/2000/svg">
-
-<!-- StarOffice namespace names and prefixes -->
-
-<!ENTITY nOpenOffice "http://openoffice.org/2000">
-<!ENTITY nOpenOffice2001 "http://openoffice.org/2001">
-
-<!ENTITY nOffice "&nOpenOffice;/office">
-<!ENTITY nStyle "&nOpenOffice;/style">
-<!ENTITY nText "&nOpenOffice;/text">
-<!ENTITY nTable "&nOpenOffice;/table">
-<!ENTITY nMeta "&nOpenOffice;/meta">
-<!ENTITY nScript "&nOpenOffice;/script">
-<!ENTITY nDraw "&nOpenOffice;/drawing">
-<!ENTITY nChart "&nOpenOffice;/chart">
-<!ENTITY nChart2 "&nOpenOffice;/chart2">
-<!ENTITY nNumber "&nOpenOffice;/datastyle">
-<!ENTITY nConfig "&nOpenOffice2001;/config">
-
-
-<!-- dublin core namespace name and prefic -->
-<!ENTITY nDC "http://purl.org/dc/elements/1.1/">
diff --git a/chart2/workbench/fileformat/office.dtd b/chart2/workbench/fileformat/office.dtd
index 87546b64abf7..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/office.dtd
+++ b/chart2/workbench/fileformat/office.dtd
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: office.dtd,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-<!ENTITY % dtypes-mod SYSTEM "dtypes.mod">
-%dtypes-mod;
-<!ENTITY % nmspace-mod SYSTEM "nmspace.mod">
-%nmspace-mod;
-<!ENTITY % office-mod SYSTEM "office.mod">
-%office-mod;
-<!ENTITY % style-mod SYSTEM "style.mod">
-%style-mod;
-<!ENTITY % meta-mod SYSTEM "meta.mod">
-%meta-mod;
-<!ENTITY % script-mod SYSTEM "script.mod">
-%script-mod;
-<!ENTITY % drawing-mod SYSTEM "drawing.mod">
-%drawing-mod;
-<!ENTITY % text-mod SYSTEM "text.mod">
-%text-mod;
-<!ENTITY % table-mod SYSTEM "table.mod">
-%table-mod;
-<!ENTITY % chart2-mod SYSTEM "chart2.mod">
-%chart2-mod;
-<!ENTITY % chart-mod SYSTEM "chart.mod">
-%chart-mod;
-<!ENTITY % datastyl-mod SYSTEM "datastyl.mod">
-%datastyl-mod;
-<!ENTITY % form-mod SYSTEM "form.mod">
-%form-mod;
-<!ENTITY % settings-mod SYSTEM "settings.mod">
-%settings-mod;
diff --git a/chart2/workbench/fileformat/office.mod b/chart2/workbench/fileformat/office.mod
index 95e5027fb67a..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/office.mod
+++ b/chart2/workbench/fileformat/office.mod
@@ -1,231 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: office.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!ELEMENT office:document ( office:meta?,
-							office:settings?,
-							office:script?,
-							office:font-decls?,
-							office:styles?,
-							office:automatic-styles?,
-							office:master-styles?,
-							office:body ) >
-
-<!ATTLIST office:document xmlns:office	CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document xmlns:meta	CDATA #FIXED "&nMeta;">
-<!ATTLIST office:document xmlns:script	CDATA #FIXED "&nScript;">
-<!ATTLIST office:document xmlns:style	CDATA #FIXED "&nStyle;">
-<!ATTLIST office:document xmlns:text	CDATA #FIXED "&nText;">
-<!ATTLIST office:document xmlns:table	CDATA #FIXED "&nTable;">
-<!ATTLIST office:document xmlns:draw	CDATA #FIXED "&nDraw;">
-<!ATTLIST office:document xmlns:chart	CDATA #FIXED "&nChart;">
-<!ATTLIST office:document xmlns:number	CDATA #FIXED "&nNumber;">
-<!ATTLIST office:document xmlns:fo		CDATA #FIXED "&nFO;">
-<!ATTLIST office:document xmlns:xlink	CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document xmlns:svg		CDATA #FIXED "&nSVG;">
-<!ATTLIST office:document xmlns:dc		CDATA #FIXED "&nDC;">
-
-<!ATTLIST office:document office:class
-						  (text|text-global|
-						   drawing|presentation|
-						   spreadsheet|chart) #REQUIRED>
-
-<!ATTLIST office:document office:version	%string; #IMPLIED>
-
-<!-- document-styles -->
-<!ELEMENT office:document-styles (
-							office:font-decls?,
-							office:styles?,
-							office:automatic-styles?,
-							office:master-styles? ) >
-
-<!ATTLIST office:document-styles xmlns:office	CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document-styles xmlns:meta	CDATA #FIXED "&nMeta;">
-<!ATTLIST office:document-styles xmlns:script	CDATA #FIXED "&nScript;">
-<!ATTLIST office:document-styles xmlns:style	CDATA #FIXED "&nStyle;">
-<!ATTLIST office:document-styles xmlns:text	CDATA #FIXED "&nText;">
-<!ATTLIST office:document-styles xmlns:table	CDATA #FIXED "&nTable;">
-<!ATTLIST office:document-styles xmlns:draw	CDATA #FIXED "&nDraw;">
-<!ATTLIST office:document-styles xmlns:chart	CDATA #FIXED "&nChart;">
-<!ATTLIST office:document-styles xmlns:number	CDATA #FIXED "&nNumber;">
-<!ATTLIST office:document-styles xmlns:fo		CDATA #FIXED "&nFO;">
-<!ATTLIST office:document-styles xmlns:xlink	CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document-styles xmlns:svg		CDATA #FIXED "&nSVG;">
-<!ATTLIST office:document-styles xmlns:dc		CDATA #FIXED "&nDC;">
-
-<!ATTLIST office:document-styles office:version	%string; #IMPLIED>
-
-<!-- document-content -->
-
-<!ELEMENT office:document-content (
-							office:script?,
-							office:font-decls?,
-							office:automatic-styles?,
-							office:body ) >
-
-<!ATTLIST office:document-content xmlns:office	CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document-content xmlns:meta	CDATA #FIXED "&nMeta;">
-<!ATTLIST office:document-content xmlns:script	CDATA #FIXED "&nScript;">
-<!ATTLIST office:document-content xmlns:style	CDATA #FIXED "&nStyle;">
-<!ATTLIST office:document-content xmlns:text	CDATA #FIXED "&nText;">
-<!ATTLIST office:document-content xmlns:table	CDATA #FIXED "&nTable;">
-<!ATTLIST office:document-content xmlns:draw	CDATA #FIXED "&nDraw;">
-<!ATTLIST office:document-content xmlns:chart	CDATA #FIXED "&nChart;">
-<!ATTLIST office:document-content xmlns:number	CDATA #FIXED "&nNumber;">
-<!ATTLIST office:document-content xmlns:fo		CDATA #FIXED "&nFO;">
-<!ATTLIST office:document-content xmlns:xlink	CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document-content xmlns:svg		CDATA #FIXED "&nSVG;">
-<!ATTLIST office:document-content xmlns:dc		CDATA #FIXED "&nDC;">
-
-<!ATTLIST office:document-content office:class
-						  (text|text-global|
-						   drawing|presentation|
-						   spreadsheet|chart) #REQUIRED>
-
-<!ATTLIST office:document-content office:version	%string; #IMPLIED>
-
-<!-- document-content -->
-
-<!ELEMENT office:document-meta ( office:meta? ) >
-
-<!ATTLIST office:document-meta xmlns:office	CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document-meta xmlns:meta	CDATA #FIXED "&nMeta;">
-<!ATTLIST office:document-meta xmlns:script	CDATA #FIXED "&nScript;">
-<!ATTLIST office:document-meta xmlns:style	CDATA #FIXED "&nStyle;">
-<!ATTLIST office:document-meta xmlns:text	CDATA #FIXED "&nText;">
-<!ATTLIST office:document-meta xmlns:table	CDATA #FIXED "&nTable;">
-<!ATTLIST office:document-meta xmlns:draw	CDATA #FIXED "&nDraw;">
-<!ATTLIST office:document-meta xmlns:chart	CDATA #FIXED "&nChart;">
-<!ATTLIST office:document-meta xmlns:number	CDATA #FIXED "&nNumber;">
-<!ATTLIST office:document-meta xmlns:fo		CDATA #FIXED "&nFO;">
-<!ATTLIST office:document-meta xmlns:xlink	CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document-meta xmlns:svg		CDATA #FIXED "&nSVG;">
-<!ATTLIST office:document-meta xmlns:dc		CDATA #FIXED "&nDC;">
-
-<!ATTLIST office:document-meta office:version	%string; #IMPLIED>
-
-<!ELEMENT office:document-settings (office:settings) >
-<!ATTLIST office:document-settings xmlns:office	CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document-settings xmlns:xlink	CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document-settings xmlns:config	CDATA #FIXED "&nConfig;">
-
-<!ATTLIST office:document-settings office:version	%string; #IMPLIED>
-
-<!ENTITY % meta "(meta:generator?,
-				  dc:title?,
-				  dc:description?,
-				  dc:subject?,
-				  meta:initial-creator?,
-				  meta:creation-date?,
-				  dc:creator?,
-				  dc:date?,
-				  meta:printed-by?,
-				  meta:print-date?,
-				  meta:keywords?,
-				  dc:language?,
-				  meta:editing-cycles?,
-				  meta:editing-duration?,
-				  meta:hyperlink-behaviour?,
-				  meta:auto-reload?,
-				  meta:template?,
-				  meta:user-defined*,
-				  meta:document-statistic?)">
-<!ELEMENT office:meta %meta;>
-
-<!ENTITY % script	"(script:library-embedded |
-					  script:library-linked)*,office:events?">
-<!ELEMENT office:script (%script;)>
-
-<!ELEMENT office:font-decls (style:font-decl)*>
-
-<!ENTITY % styles "(style:default-style|style:style|text:list-style|
-		number:number-style|number:currency-style|number:percentage-style|
-		number:date-style|number:time-style|number:boolean-style|
-		number:text-style|
-		draw:gradient|draw:hatch|draw:fill-image|draw:marker|draw:stroke-dash|
-		style:presentation-page-layout|draw:transparency)">
-
-<!-- Validity constraint: The elements
-		text:outline-style,
-		text:footnotes-configuration,
-		text:endnotes-configuration,
-		text:bibliography-configuration and
-		text:linenumbering-configuration
-	may appear only once!
-	Unfortunatetly, this constraint cannot be easily specified in the DTD.
--->
-<!ELEMENT office:styles (%styles;|text:outline-style|
-		text:footnotes-configuration|text:endnotes-configuration|
-		text:bibliography-configuration|text:linenumbering-configuration)*>
-
-<!ELEMENT office:automatic-styles (%styles;|style:page-master)*>
-
-<!ELEMENT office:master-styles (draw:layer-set?,style:handout-master?,style:master-page*) >
-
-<!ENTITY % text-decls "text:variable-decls?, text:sequence-decls?,
-					   text:user-field-decls?, text:dde-connection-decls?,
-					   text:alphabetical-index-auto-mark-file?" >
-<!ENTITY % change-marks "text:change | text:change-start | text:change-end">
-<!ENTITY % body "(office:forms?,(text:tracked-changes|table:tracked-changes)?,%text-decls;,table:calculation-settings?,table:content-validations?,table:label-ranges?,
-		(text:h|text:p|text:ordered-list|
-		text:unordered-list|table:table|draw:page|
-		draw:a|%shape;|chart:chart|chart2:chart2|text:section|text:table-of-content|
-		text:illustration-index|text:table-index|text:object-index|
-		text:user-index|text:alphabetical-index|text:bibliography|
-		%change-marks;)*,
-		table:named-expressions?,
-		table:database-ranges?,table:data-pilot-tables?,
-		table:consolidation?,
-		table:dde-links?,
-		presentation:settings?)">
-<!ELEMENT office:body %body;>
-<!ATTLIST office:body table:structure-protected %boolean; "false"
-			table:protection-key CDATA #IMPLIED>
-<!ELEMENT office:events (script:event|presentation:event)*>
-<!-- DDE source: for text sections and tables -->
-<!ELEMENT office:dde-source EMPTY>
-<!ATTLIST office:dde-source office:dde-application CDATA #IMPLIED>
-<!ATTLIST office:dde-source office:dde-topic CDATA #IMPLIED>
-<!ATTLIST office:dde-source office:dde-item CDATA #IMPLIED>
-<!ATTLIST office:dde-source office:automatic-update %boolean; "false">
-<!ATTLIST office:dde-source office:name CDATA #IMPLIED>
-<!ATTLIST office:dde-source table:conversion-mode (into-default-style-data-style|into-english-number|let-text) "into-default-style-data-style" >
-<!-- annotations -->
-<!-- limitation: in the current implementation, only plain text inside of
-     paragraphs is supported -->
-<!ELEMENT office:annotation (text:p)*>
-<!ATTLIST office:annotation office:author %string; #IMPLIED>
-<!ATTLIST office:annotation office:create-date %date; #IMPLIED>
-<!ATTLIST office:annotation office:create-date-string %string; #IMPLIED>
-<!ATTLIST office:annotation office:display %boolean; "false">
-<!ELEMENT office:change-info (text:p)*>
-<!ATTLIST office:change-info office:chg-author %string; #REQUIRED>
-<!ATTLIST office:change-info office:chg-date-time %timeInstance; #REQUIRED>
-<!ELEMENT office:binary-data (#PCDATA)>
diff --git a/chart2/workbench/fileformat/script.mod b/chart2/workbench/fileformat/script.mod
index 81220e346f20..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/script.mod
+++ b/chart2/workbench/fileformat/script.mod
@@ -1,55 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: script.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!ELEMENT script:library-embedded (script:module*)>
-<!ATTLIST script:library-embedded script:name %string; #REQUIRED>
-<!ATTLIST script:library-embedded script:password %string; #IMPLIED>
-
-<!ELEMENT script:library-linked EMPTY>
-<!ATTLIST script:library-linked script:name %string; #REQUIRED>
-<!ATTLIST script:library-linked xlink:href %string; #REQUIRED>
-<!ATTLIST script:library-linked xlink:type (simple) #FIXED "simple">
-
-<!ELEMENT script:module (#PCDATA)>
-<!ATTLIST script:module script:name %string; #REQUIRED>
-<!ATTLIST script:module script:language %string; #IMPLIED>
-
-
-<!ENTITY % script-language "script:language %string; #REQUIRED">
-<!ENTITY % event-name "script:event-name %string; #REQUIRED">
-<!ENTITY % location "script:location (document|application) #REQUIRED">
-<!ENTITY % macro-name "script:macro-name %string; #REQUIRED">
-
-<!ELEMENT script:event (#PCDATA)>
-<!ATTLIST script:event %script-language;
-                       %event-name;
-                       %location;
-					   %macro-name;>
diff --git a/chart2/workbench/fileformat/settings.mod b/chart2/workbench/fileformat/settings.mod
index 5ba8f38f3ba6..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/settings.mod
+++ b/chart2/workbench/fileformat/settings.mod
@@ -1,53 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: settings.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!ELEMENT office:settings (config:config-item-set+)>
-
-<!ENTITY % items	"(config:config-item |
-			config:config-item-set |
-			config:config-item-map-named |
-			config:config-item-map-indexed)+">
-
-<!ELEMENT config:config-item-set %items;>
-<!ATTLIST config:config-item-set config:name CDATA #REQUIRED>
-
-<!ELEMENT config:config-item (#PCDATA)>
-<!ATTLIST config:config-item config:name CDATA #REQUIRED
-			config:type (boolean | short | int | long | double | string | datetime | base64Binary) #REQUIRED>
-
-<!ELEMENT config:config-item-map-named (config:config-item-map-entry)+>
-<!ATTLIST config:config-item-map-named config:name CDATA #REQUIRED>
-
-<!ELEMENT config:config-item-map-indexed (config:config-item-map-entry)+>
-<!ATTLIST config:config-item-map-indexed config:name CDATA #REQUIRED>
-
-<!ELEMENT config:config-item-map-entry %items;>
-<!ATTLIST config:config-item-map-entry config:name CDATA #IMPLIED>
diff --git a/chart2/workbench/fileformat/style.mod b/chart2/workbench/fileformat/style.mod
index d167a25b60a8..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/style.mod
+++ b/chart2/workbench/fileformat/style.mod
@@ -1,412 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: style.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!ELEMENT style:font-decl EMPTY>
-<!ATTLIST style:font-decl style:name %string; #REQUIRED>
-<!ATTLIST style:font-decl fo:font-family %string; #REQUIRED>
-<!ATTLIST style:font-decl style:font-style-name %string; #IMPLIED>
-<!ENTITY % fontFamilyGeneric "(roman|swiss|modern|decorative|script|system)">
-<!ATTLIST style:font-decl style:font-family-generic %fontFamilyGeneric;
-						   #IMPLIED>
-<!ENTITY % fontPitch "(fixed|variable)">
-<!ATTLIST style:font-decl style:font-pitch %fontPitch; #IMPLIED>
-<!ATTLIST style:font-decl style:font-charset %textEncoding; #IMPLIED>
-
-<!ELEMENT style:style ( style:properties?,office:events?,style:map*)>
-
-<!ATTLIST style:style style:name %styleName; #REQUIRED>
-
-<!ENTITY % styleFamily "(paragraph|text|section|
-						 table|table-column|table-row|table-cell|table-page|chart|graphics|default|drawing-page|presentation|control|ruby)">
-<!ATTLIST style:style style:family %styleFamily; #REQUIRED>
-
-<!ATTLIST style:style style:parent-style-name %styleName; #IMPLIED>
-<!ATTLIST style:style style:master-page-name %styleName; #IMPLIED>
-<!ATTLIST style:style style:next-style-name %styleName; #IMPLIED>
-<!ATTLIST style:style style:list-style-name %styleName; #IMPLIED>
-<!ATTLIST style:style style:data-style-name %styleName; #IMPLIED>
-
-<!ATTLIST style:style style:auto-update %boolean; "false">
-
-<!ATTLIST style:style style:class %string; #IMPLIED>
-
-<!ELEMENT style:default-style (style:properties?)>
-<!ATTLIST style:default-style style:family %styleFamily; #REQUIRED>
-
-<!ELEMENT style:map EMPTY>
-
-<!ATTLIST style:map style:condition %string; #REQUIRED>
-<!ATTLIST style:map style:apply-style-name %styleName; #REQUIRED>
-<!ATTLIST style:map style:base-cell-address %cell-address; #IMPLIED>
-
-<!ELEMENT style:properties ANY>
-
-<!-- number format properties -->
-<!ATTLIST style:properties style:num-prefix %string; #IMPLIED>
-<!ATTLIST style:properties style:num-suffix %string; #IMPLIED>
-<!ATTLIST style:properties style:num-format %string; #IMPLIED>
-<!ATTLIST style:properties style:num-letter-sync %boolean; #IMPLIED>
-
-<!-- frame properties -->
-<!ATTLIST style:properties fo:width %positiveLength; #IMPLIED>
-<!ATTLIST style:properties fo:height %positiveLength; #IMPLIED>
-<!ATTLIST style:properties style:vertical-pos (top|middle|bottom|from-top|below) #IMPLIED>
-<!ATTLIST style:properties style:vertical-rel (page|page-content|
-											   frame|frame-content|
-											   paragraph|paragraph-content|char|
-											   line|baseline|text) #IMPLIED>
-<!ATTLIST style:properties style:horizontal-pos (left|center|right|from-left|inside|outside|from-inside) #IMPLIED>
-<!ATTLIST style:properties style:horizontal-rel (page|page-content|
-								 page-start-margin|page-end-margin|
-								 frame|frame-content|
-								 frame-start-margin|frame-end-margin|
-								 paragraph|paragraph-content|
-								 paragraph-start-margin|paragraph-end-margin|
-								 char) #IMPLIED>
-<!ATTLIST style:properties svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:min-height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:min-width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:max-height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:max-width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties text:anchor-type %anchorType; #IMPLIED>
-<!ATTLIST style:properties text:anchor-page-number %positiveInteger; #IMPLIED>
-<!ATTLIST style:properties svg:x %coordinate; #IMPLIED>
-<!ATTLIST style:properties svg:y %coordinate; #IMPLIED>
-<!ATTLIST style:properties style:print-content %boolean; #IMPLIED>
-<!ATTLIST style:properties style:protect %boolean; #IMPLIED>
-<!ATTLIST style:properties style:wrap (none|left|right|parallel|dynamic|run-through) #IMPLIED>
-<!ENTITY % noLimitOrPositiveInteger "CDATA">
-<!ATTLIST style:properties style:number-wrapped-paragraphs %noLimitOrPositiveInteger; #IMPLIED>
-<!ATTLIST style:properties style:wrap-contour %boolean; #IMPLIED>
-<!ATTLIST style:properties style:wrap-contour-mode (full|outside) #IMPLIED>
-<!ATTLIST style:properties style:run-through (foreground|background) #IMPLIED>
-<!ATTLIST style:properties style:editable %boolean; #IMPLIED>
-<!ATTLIST style:properties style:mirror CDATA #IMPLIED>
-<!ATTLIST style:properties fo:clip CDATA #IMPLIED>
-<!ATTLIST style:properties text:animation (none|scroll|alternate|slide) #IMPLIED>
-<!ATTLIST style:properties text:animation-direction (left|right|up|down) #IMPLIED>
-<!ATTLIST style:properties text:animation-start-inside %boolean; #IMPLIED>
-<!ATTLIST style:properties text:animation-stop-inside %boolean; #IMPLIED>
-<!ATTLIST style:properties text:animation-repeat %integer; #IMPLIED>
-<!ATTLIST style:properties text:animation-delay %timeDuration; #IMPLIED>
-<!ATTLIST style:properties text:animation-steps %length; #IMPLIED>
-
-<!-- text properties -->
-<!ATTLIST style:properties fo:font-variant (normal|small-caps) #IMPLIED>
-<!ATTLIST style:properties fo:text-transform (none|lowercase|
-											  uppercase|capitalize) #IMPLIED>
-<!ATTLIST style:properties fo:color %color; #IMPLIED>
-<!ATTLIST style:properties style:use-window-font-color %boolean; #IMPLIED>
-<!ATTLIST style:properties style:text-outline %boolean; #IMPLIED>
-<!ATTLIST style:properties style:text-crossing-out
-						   (none|single-line|double-line|thick-line|slash|X)
-						   #IMPLIED>
-<!ATTLIST style:properties style:text-position CDATA #IMPLIED>
-<!ATTLIST style:properties style:text-align (left|right|start|center|end|justify|justified) #IMPLIED>
-
-<!ATTLIST style:properties style:font-name %string; #IMPLIED>
-<!ATTLIST style:properties fo:font-family %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-generic %fontFamilyGeneric;
-						   #IMPLIED>
-<!ATTLIST style:properties style:font-style-name %string; #IMPLIED>
-<!ATTLIST style:properties style:font-pitch %fontPitch; #IMPLIED>
-<!ATTLIST style:properties style:font-charset %textEncoding; #IMPLIED>
-<!ATTLIST style:properties style:font-name-asian %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-asian %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-generic-asian %fontFamilyGeneric;
-						   #IMPLIED>
-<!ATTLIST style:properties style:font-style-name-asian %string; #IMPLIED>
-<!ATTLIST style:properties style:font-pitch-asian %fontPitch; #IMPLIED>
-<!ATTLIST style:properties style:font-charset-asian %textEncoding; #IMPLIED>
-<!ATTLIST style:properties style:font-name-complex %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-complex %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-generic-complex %fontFamilyGeneric;
-						   #IMPLIED>
-<!ATTLIST style:properties style:font-style-name-complex %string; #IMPLIED>
-<!ATTLIST style:properties style:font-pitch-complex %fontPitch; #IMPLIED>
-<!ATTLIST style:properties style:font-charset-complex %textEncoding; #IMPLIED>
-
-<!ATTLIST style:properties fo:font-size %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties style:font-size-rel %length; #IMPLIED>
-<!ATTLIST style:properties style:font-size-asian %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties style:font-size-rel-asian %length; #IMPLIED>
-<!ATTLIST style:properties style:font-size-complex %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties style:font-size-rel-complex %length; #IMPLIED>
-<!ENTITY % normalOrLength "CDATA">
-<!ATTLIST style:properties fo:letter-spacing %normalOrLength; #IMPLIED>
-<!ATTLIST style:properties fo:language %languageOnly; #IMPLIED>
-<!ATTLIST style:properties style:language-asian %languageOnly; #IMPLIED>
-<!ATTLIST style:properties style:language-complex %languageOnly; #IMPLIED>
-<!ATTLIST style:properties fo:country %country; #IMPLIED>
-<!ATTLIST style:properties style:country-asian %country; #IMPLIED>
-<!ATTLIST style:properties style:country-complex %country; #IMPLIED>
-<!ENTITY % fontStyle "(normal|italic|oblique)">
-<!ATTLIST style:properties fo:font-style %fontStyle; #IMPLIED>
-<!ATTLIST style:properties style:font-style-asian %fontStyle; #IMPLIED>
-<!ATTLIST style:properties style:font-style-complex %fontStyle; #IMPLIED>
-<!ENTITY % fontRelief "(none|embossed|engraved)">
-<!ATTLIST style:properties style:font-relief %fontRelief; #IMPLIED>
-<!ATTLIST style:properties fo:text-shadow CDATA #IMPLIED>
-<!ATTLIST style:properties style:text-underline
-						   (none|single|double|dotted|dash|long-dash|dot-dash|
-							dot-dot-dash|wave|bold|bold-dotted|bold-dash|
-							bold-long-dash|bold-dot-dash|bold-dot-dot-dash|
-							bold-wave|double-wave|small-wave) #IMPLIED>
-<!ATTLIST style:properties style:text-autospace (none | ideograph-alpha) #IMPLIED>
-<!ATTLIST style:properties style:punctuation-wrap (simple | hanging) #IMPLIED>
-<!ATTLIST style:properties style:line-break (normal | strict) #IMPLIED>
-<!ENTITY % fontColorOrColor "CDATA">
-<!ATTLIST style:properties style:text-underline-color %fontColorOrColor;
-						   #IMPLIED>
-<!ATTLIST style:properties fo:font-weight CDATA #IMPLIED>
-<!ATTLIST style:properties style:font-weight-asian CDATA #IMPLIED>
-<!ATTLIST style:properties style:font-weight-complex CDATA #IMPLIED>
-<!ATTLIST style:properties fo:score-spaces %boolean; #IMPLIED>
-<!ATTLIST style:properties style:letter-kerning %boolean; #IMPLIED>
-<!ATTLIST style:properties style:text-blinking %boolean; #IMPLIED>
-<!ATTLIST style:properties style:text-background-color %transparentOrColor;
-						   #IMPLIED>
-
-<!ATTLIST style:properties style:text-combine (none|letters|lines) #IMPLIED>
-<!ATTLIST style:properties style:text-combine-start-char %character; #IMPLIED>
-<!ATTLIST style:properties style:text-combine-end-char %character; #IMPLIED>
-<!ATTLIST style:properties style:text-emphasize CDATA #IMPLIED>
-<!ATTLIST style:properties style:text-scale %percentage; #IMPLIED>
-<!ATTLIST style:properties style:text-rotation-angle %integer; #IMPLIED>
-<!ATTLIST style:properties style:text-rotation-scale (fixed|line-height) #IMPLIED>
-
-<!-- paragraph properties -->
-<!ENTITY % nonNegativeLengthOrPercentageOrNormal "CDATA">
-<!ATTLIST style:properties fo:line-height
-						   %nonNegativeLengthOrPercentageOrNormal; #IMPLIED>
-<!ATTLIST style:properties style:line-height-at-least %nonNegativeLength;
-						   #IMPLIED>
-<!ATTLIST style:properties style:line-spacing %length; #IMPLIED>
-<!ATTLIST style:properties fo:text-align (start|end|center|justify) #IMPLIED>
-<!ATTLIST style:properties fo:text-align-last (start|center|justify) #IMPLIED>
-<!ATTLIST style:properties style:text-align-source (fix|value-type) #IMPLIED>
-<!ATTLIST style:properties style:justify-single-word %boolean; #IMPLIED>
-<!ATTLIST style:properties style:break-inside (auto|avoid) #IMPLIED>
-<!ATTLIST style:properties fo:widows %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties fo:orphans %nonNegativeInteger; #IMPLIED>
-
-<!ATTLIST style:properties fo:hyphenate %boolean; #IMPLIED>
-<!ATTLIST style:properties fo:hyphenate-keep (none|page) #IMPLIED>
-<!ATTLIST style:properties fo:hyphenation-remain-char-count %positiveInteger;
-						   #IMPLIED>
-<!ATTLIST style:properties fo:hyphenation-push-char-count %positiveInteger;
-						   #IMPLIED>
-<!ATTLIST style:properties fo:hyphenation-ladder-count
-						   %noLimitOrPositiveInteger;  #IMPLIED>
-<!ATTLIST style:properties style:page-number %positiveInteger; #IMPLIED>
-
-<!ELEMENT style:tab-stops (style:tab-stop)*>
-<!ELEMENT style:tab-stop EMPTY>
-<!ATTLIST style:tab-stop style:position %nonNegativeLength; #REQUIRED>
-<!ATTLIST style:tab-stop style:type (left|center|right|char|default) "left">
-<!ATTLIST style:tab-stop style:char %character; #IMPLIED>
-<!ATTLIST style:tab-stop style:leader-char %character; " ">
-
-<!ELEMENT style:drop-cap EMPTY>
-<!ENTITY % wordOrPositiveInteger "CDATA">
-<!ATTLIST style:drop-cap style:length %wordOrPositiveInteger; "1">
-<!ATTLIST style:drop-cap style:lines %positiveInteger; "1">
-<!ATTLIST style:drop-cap style:distance %length; "0cm">
-<!ATTLIST style:drop-cap style:style-name %styleName; #IMPLIED>
-
-<!ATTLIST style:properties style:register-true %boolean; #IMPLIED>
-<!ATTLIST style:properties style:register-truth-ref-style-name %styleName; #IMPLIED>
-<!ATTLIST style:properties fo:margin-left %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:margin-right %positiveLengthOrPercentage;
-						   #IMPLIED>
-<!ATTLIST style:properties fo:text-indent %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties style:auto-text-indent %boolean; #IMPLIED>
-<!ATTLIST style:properties fo:margin-top %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:margin-bottom %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:break-before (auto|column|page) #IMPLIED>
-<!ATTLIST style:properties fo:break-after (auto|column|page) #IMPLIED>
-<!ATTLIST style:properties fo:background-color %transparentOrColor; #IMPLIED>
-
-<!ELEMENT style:background-image (office:binary-data?)>
-<!ATTLIST style:background-image xlink:type (simple) #IMPLIED>
-<!ATTLIST style:background-image xlink:href %uriReference; #IMPLIED>
-<!ATTLIST style:background-image xlink:show (embed) #IMPLIED>
-<!ATTLIST style:background-image xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST style:background-image style:repeat (no-repeat|repeat|stretch)
-								 "repeat">
-<!ATTLIST style:background-image style:position CDATA "center">
-<!ATTLIST style:background-image style:filter-name %string; #IMPLIED>
-
-<!ELEMENT style:symbol-image (office:binary-data?)>
-<!ATTLIST style:symbol-image xlink:type (simple) #IMPLIED>
-<!ATTLIST style:symbol-image xlink:href %uriReference; #IMPLIED>
-<!ATTLIST style:symbol-image xlink:show (embed) #IMPLIED>
-<!ATTLIST style:symbol-image xlink:actuate (onLoad) #IMPLIED>
-
-<!ATTLIST style:properties fo:border CDATA #IMPLIED>
-<!ATTLIST style:properties fo:border-top CDATA #IMPLIED>
-<!ATTLIST style:properties fo:border-bottom CDATA #IMPLIED>
-<!ATTLIST style:properties fo:border-left CDATA #IMPLIED>
-<!ATTLIST style:properties fo:border-right CDATA #IMPLIED>
-<!ATTLIST style:properties style:border-line-width CDATA #IMPLIED>
-<!ATTLIST style:properties style:border-line-width-top CDATA #IMPLIED>
-<!ATTLIST style:properties style:border-line-width-bottom CDATA #IMPLIED>
-<!ATTLIST style:properties style:border-line-width-left CDATA #IMPLIED>
-<!ATTLIST style:properties style:border-line-width-right CDATA #IMPLIED>
-<!ATTLIST style:properties fo:padding %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties fo:padding-top %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties fo:padding-bottom %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties fo:padding-left %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties fo:padding-right %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties style:shadow CDATA #IMPLIED>
-<!ATTLIST style:properties fo:keep-with-next %boolean; #IMPLIED>
-
-<!ATTLIST style:properties text:number-lines %boolean; "false">
-<!ATTLIST style:properties text:line-number %nonNegativeInteger; #IMPLIED>
-
-<!ATTLIST style:properties style:decimal-places %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties style:tab-stop-distance %nonNegativeLength; #IMPLIED>
-
-<!-- ruby properties -->
-<!ATTLIST style:properties style:ruby-align (left|center|right|distribute-letter|distribute-space) #IMPLIED>
-<!ATTLIST style:properties style:ruby-position (above|below) #IMPLIED>
-
-
-<!-- table properties -->
-<!ATTLIST style:properties style:width %positiveLength; #IMPLIED>
-<!ATTLIST style:properties style:rel-width %percentage; #IMPLIED>
-<!ATTLIST style:properties style:may-break-between-rows %boolean; #IMPLIED>
-<!ATTLIST style:properties table:page-style-name %styleName; #IMPLIED>
-<!ATTLIST style:properties table:display %boolean; #IMPLIED>
-
-<!-- table column properties -->
-<!ATTLIST style:properties style:column-width %positiveLength; #IMPLIED>
-<!ENTITY % relWidth "CDATA">
-<!ATTLIST style:properties style:rel-column-width %relWidth; #IMPLIED>
-<!ATTLIST style:properties style:use-optimal-column-width %boolean; #IMPLIED>
-
-<!-- table row properties -->
-<!ATTLIST style:properties style:row-height %positiveLength; #IMPLIED>
-<!ATTLIST style:properties style:min-row-height %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties style:use-optimal-row-height %boolean; #IMPLIED>
-
-<!-- table cell properties -->
-<!ATTLIST style:properties
-	table:align (left | center | right | margins) #IMPLIED
-	table:border-model (collapsing | separating) #IMPLIED
-	fo:vertical-align (top | middle | bottom | automatic) #IMPLIED
-	fo:direction (ltr | ttb) #IMPLIED
-	style:rotation-angle %nonNegativeInteger; #IMPLIED
-	style:rotation-align (none | bottom | top | center) #IMPLIED
-	style:cell-protect CDATA #IMPLIED
-	fo:wrap-option (no-wrap | wrap) #IMPLIED
->
-<!ELEMENT style:columns (style:column-sep?,style:column*)>
-<!ATTLIST style:columns fo:column-count %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:columns fo:column-gap %positiveLength; #IMPLIED>
-
-<!ELEMENT style:column EMPTY>
-<!ATTLIST style:column style:rel-width CDATA #IMPLIED>
-<!ATTLIST style:column fo:margin-left %positiveLength; #IMPLIED>
-<!ATTLIST style:column fo:margin-right %positiveLength; #IMPLIED>
-
-<!ELEMENT style:column-sep EMPTY>
-<!ATTLIST style:column-sep style:style (none|solid|dotted|dashed|dot-dashed)
-																	"solid">
-<!ATTLIST style:column-sep style:width %length; #REQUIRED>
-<!ATTLIST style:column-sep style:height %percentage; "100%">
-<!ATTLIST style:column-sep style:vertical-align (top|middle|bottom) "top">
-<!ATTLIST style:column-sep style:color %color; "#000000">
-
-<!-- page master properties -->
-<!ELEMENT style:page-master (style:properties?, style:header-style?, style:footer-style?)>
-<!ATTLIST style:page-master style:name %styleName; #REQUIRED>
-<!ATTLIST style:page-master style:page-usage (all|left|right|mirrored) "all">
-
-<!ELEMENT style:header-style (style:properties?)>
-<!ELEMENT style:footer-style (style:properties?)>
-
-<!ATTLIST style:properties fo:page-width %length; #IMPLIED>
-<!ATTLIST style:properties fo:page-height %length; #IMPLIED>
-<!ATTLIST style:properties style:paper-tray-name %string; #IMPLIED>
-<!ATTLIST style:properties style:print-orientation (portrait|landscape) #IMPLIED>
-<!ATTLIST style:properties style:print CDATA #IMPLIED>
-<!ATTLIST style:properties style:print-page-order (ttb|ltr) #IMPLIED>
-<!ATTLIST style:properties style:first-page-number %positiveInteger; #IMPLIED>
-<!ATTLIST style:properties style:scale-to %percentage; #IMPLIED>
-<!ATTLIST style:properties style:scale-to-pages %positiveInteger; #IMPLIED>
-<!ATTLIST style:properties style:table-centering (horizontal | vertical | both | none) #IMPLIED>
-
-<!ATTLIST style:properties style:footnote-max-height %lengthOrNoLimit; #IMPLIED>
-<!ATTLIST style:properties style:vertical-align (top|bottom|middle|basline|auto) #IMPLIED>
-
-<!ELEMENT style:footnote-sep EMPTY>
-<!ATTLIST style:footnote-sep style:width %length; #IMPLIED>
-<!ATTLIST style:footnote-sep style:rel-width %percentage; #IMPLIED>
-<!ATTLIST style:footnote-sep style:color %color; #IMPLIED>
-<!ATTLIST style:footnote-sep style:adjustment (left|center|right) "left">
-<!ATTLIST style:footnote-sep style:distance-before-sep %length; #IMPLIED>
-<!ATTLIST style:footnote-sep style:distance-after-sep %length; #IMPLIED>
-
-<!-- master page -->
-<!ELEMENT style:master-page ( (style:header, style:header-left?)?, (style:footer, style:footer-left?)?,
-								office:forms?,style:style*, (%shapes;)*, presentation:notes? )>
-<!ATTLIST style:master-page style:name %styleName; #REQUIRED>
-<!ATTLIST style:master-page style:page-master-name %styleName; #REQUIRED>
-<!ATTLIST style:master-page style:next-style-name %styleName; #IMPLIED>
-<!ATTLIST style:master-page draw:style-name %styleName; #IMPLIED>
-
-<!-- handout master -->
-<!ELEMENT style:handout-master (%shapes;)*>
-<!ATTLIST style:handout-master presentation:presentation-page-layout-name %styleName; #IMPLIED>
-
-
-<!ENTITY % headerText "(text:h|text:p|text:ordered-list|
-						text:unordered-list|table:table|text:section|
-						text:table-of-content|text:illustration-index|
-						text:table-index|text:object-index|text:user-index|
-						text:alphabetical-index|text:bibliography|
-						text:index-title|%change-marks;)*">
-
-
-<!ENTITY % hd-ft-content "( %headerText; | (style:region-left?, style:region-center?, style:region-right?) )">
-<!ELEMENT style:header %hd-ft-content;>
-<!ELEMENT style:footer %hd-ft-content;>
-<!ELEMENT style:header-left %hd-ft-content;>
-<!ATTLIST style:header-left style:display %boolean; "true">
-<!ELEMENT style:footer-left %hd-ft-content;>
-<!ATTLIST style:footer-left style:display %boolean; "true">
-
-<!ENTITY % region-content "(text:p*)">
-<!ELEMENT style:region-left %region-content;>
-<!ELEMENT style:region-center %region-content;>
-<!ELEMENT style:region-right %region-content;>
diff --git a/chart2/workbench/fileformat/table.mod b/chart2/workbench/fileformat/table.mod
index f0371a6023ae..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/table.mod
+++ b/chart2/workbench/fileformat/table.mod
@@ -1,497 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: table.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-
-<!ELEMENT table:calculation-settings (table:null-date?, table:iteration?)>
-<!ATTLIST table:calculation-settings
-	table:case-sensitive %boolean; "true"
-	table:precision-as-shown %boolean; "false"
-	table:search-criteria-must-apply-to-whole-cell %boolean; "true"
-	table:automatic-find-labels %boolean; "true"
-	table:use-regular-expressions %boolean; "true"
-	table:null-year %positiveInteger; "1930"
->
-<!ELEMENT table:null-date EMPTY>
-<!ATTLIST table:null-date
-	table:value-type %valueType; #FIXED "date"
-	table:date-value %date; "1899-12-30"
->
-<!ELEMENT table:iteration EMPTY>
-<!ATTLIST table:iteration
-	table:status (enable | disable) "disable"
-	table:steps %positiveInteger; "100"
-	table:maximum-difference %float; "0.001"
->
-
-<!ELEMENT table:tracked-changes (table:cell-content-change | table:insertion | table:deletion | table:movement | table:rejection)*>
-<!ATTLIST table:tracked-changes table:track-changes %boolean; "true"
-				table:protected %boolean; "false"
-				table:protection-key CDATA #IMPLIED
->
-
-<!ELEMENT table:dependences (table:dependence)+>
-<!ELEMENT table:dependence EMPTY>
-<!ATTLIST table:dependence
-	table:id CDATA #REQUIRED
->
-<!ELEMENT table:deletions (table:cell-content-deletion | table:change-deletion)+>
-<!ELEMENT table:cell-content-deletion (table:cell-address?, table:change-track-table-cell?)>
-<!ATTLIST table:cell-content-deletion
-	table:id CDATA #IMPLIED
->
-<!ELEMENT table:change-deletion EMPTY>
-<!ATTLIST table:change-deletion
-	table:id CDATA #IMPLIED
->
-<!ELEMENT table:insertion (office:change-info, table:dependences?, table:deletions?)>
-<!ATTLIST table:insertion
-	table:id CDATA #REQUIRED
-	table:acceptance-state (accepted | rejected | pending) "pending"
-	table:rejecting-change-id %positiveInteger; #IMPLIED
-	table:type (row | column | table) #REQUIRED
-	table:position %integer; #REQUIRED
-	table:count %positiveInteger; "1"
-	table:table %integer; #IMPLIED
->
-<!ELEMENT table:deletion (office:change-info, table:dependences?, table:deletions?, table:cut-offs?)>
-<!ATTLIST table:deletion
-	table:id CDATA #REQUIRED
-	table:acceptance-state (accepted | rejected | pending) "pending"
-	table:rejecting-change-id %positiveInteger; #IMPLIED
-	table:type (row | column | table) #REQUIRED
-	table:position %integer; #REQUIRED
-	table:count %positiveInteger; "1"
-	table:table %integer; #IMPLIED
-	table:multi-deletion-spanned %integer; #IMPLIED
->
-<!ELEMENT table:cut-offs (table:movement-cut-off+ | (table:insertion-cut-off, table:movement-cut-off*))>
-<!ELEMENT table:insertion-cut-off EMPTY>
-<!ATTLIST table:insertion-cut-off
-	table:id CDATA #REQUIRED
-	table:position %integer; #REQUIRED
->
-<!ELEMENT table:movement-cut-off EMPTY>
-<!ATTLIST table:movement-cut-off
-	table:id CDATA #REQUIRED
-	table:start-position %integer; #IMPLIED
-	table:end-position %integer; #IMPLIED
-	table:position %integer; #IMPLIED
->
-<!ELEMENT table:movement (table:source-range-address, table:target-range-address, office:change-info, table:dependences?, table:deletions?)>
-<!ATTLIST table:movement
-	table:id CDATA #REQUIRED
-	table:acceptance-state (accepted | rejected | pending) "pending"
-	table:rejecting-change-id %positiveInteger; #IMPLIED
->
-<!ELEMENT table:target-range-address EMPTY>
-<!ATTLIST table:target-range-address
-	table:column %integer; #IMPLIED
-	table:row %integer; #IMPLIED
-	table:table %integer; #IMPLIED
-	table:start-column %integer; #IMPLIED
-	table:start-row %integer; #IMPLIED
-	table:start-table %integer; #IMPLIED
-	table:end-column %integer; #IMPLIED
-	table:end-row %integer; #IMPLIED
-	table:end-table %integer; #IMPLIED
->
-<!ELEMENT table:source-range-address EMPTY>
-<!ATTLIST table:source-range-address
-	table:column %integer; #IMPLIED
-	table:row %integer; #IMPLIED
-	table:table %integer; #IMPLIED
-	table:start-column %integer; #IMPLIED
-	table:start-row %integer; #IMPLIED
-	table:start-table %integer; #IMPLIED
-	table:end-column %integer; #IMPLIED
-	table:end-row %integer; #IMPLIED
-	table:end-table %integer; #IMPLIED
->
-<!ELEMENT table:change-track-table-cell (text:p*)>
-<!ATTLIST table:change-track-table-cell
-	table:cell-address %cell-address; #IMPLIED
-	table:matrix-covered (true | false) "false"
-	table:formula %string; #IMPLIED
-	table:number-matrix-rows-spanned %positiveInteger; #IMPLIED
-	table:number-matrix-columns-spanned %positiveInteger; #IMPLIED
-	table:value-type %valueType; "string"
-	table:value %float; #IMPLIED
-	table:date-value %date; #IMPLIED
-	table:time-value %timeInstance; #IMPLIED
-	table:string-value %string; #IMPLIED
->
-<!ELEMENT table:cell-content-change (table:cell-address, office:change-info, table:dependences?, table:deletions?, table:previous)>
-<!ATTLIST table:cell-content-change
-	table:id CDATA #REQUIRED
-	table:acceptance-state (accepted | rejected | pending) "pending"
-	table:rejecting-change-id %positiveInteger; #IMPLIED
->
-<!ELEMENT table:cell-address EMPTY>
-<!ATTLIST table:cell-address
-	table:column %integer; #IMPLIED
-	table:row %integer; #IMPLIED
-	table:table %integer; #IMPLIED
->
-<!ELEMENT table:previous (table:change-track-table-cell)>
-<!ATTLIST table:previous
-	table:id CDATA #IMPLIED
->
-<!ELEMENT table:rejection (office:change-info, table:dependences?, table:deletions?)>
-<!ATTLIST table:rejection
-	table:id CDATA #REQUIRED
-	table:acceptance-state (accepted | rejected | pending) "pending"
-	table:rejecting-change-id %positiveInteger; #IMPLIED
->
-
-<!ENTITY % table-columns "table:table-columns | ( table:table-column | table:table-column-group )+">
-<!ENTITY % table-header-columns "table:table-header-columns">
-<!ENTITY % table-rows "table:table-rows | ( table:table-row | table:table-row-group )+">
-<!ENTITY % table-header-rows "table:table-header-rows">
-<!ENTITY % table-column-groups "((%table-columns;),(%table-header-columns;,(%table-columns;)?)?) | (%table-header-columns;,(%table-columns;)?)">
-<!ENTITY % table-row-groups "((%table-rows;),(%table-header-rows;,(%table-rows;)?)?) | (%table-header-rows;,(%table-rows;)?)">
-<!ELEMENT table:table (table:table-source?, table:scenario?, office:forms?, table:shapes?, (%table-column-groups;), (%table-row-groups;))>
-<!ATTLIST table:table
-	table:name %string; #IMPLIED
-	table:style-name %styleName; #IMPLIED
-	table:protected %boolean; "false"
-	table:protection-key CDATA #IMPLIED
-	table:print-ranges %cell-range-address-list; #IMPLIED
->
-<!ELEMENT table:table-source EMPTY>
-<!ATTLIST table:table-source
-	table:mode (copy-all | copy-results-only) "copy-all"
-	xlink:type (simple) #FIXED "simple"
-	xlink:actuate (onRequest) "onRequest"
-	xlink:href %uriReference; #REQUIRED
-	table:filter-name CDATA #IMPLIED
-	table:table-name CDATA #IMPLIED
-	table:filter-options CDATA #IMPLIED
-	table:refresh-delay %timeDuration; #IMPLIED
->
-<!ELEMENT table:scenario EMPTY>
-<!ATTLIST table:scenario
-	table:display-border %boolean; "true"
-	table:border-color %color; #IMPLIED
-	table:copy-back %boolean; "true"
-	table:copy-styles %boolean; "true"
-	table:copy-formulas %boolean; "true"
-	table:is-active %boolean; #REQUIRED
-	table:scenario-ranges %cell-range-address-list; #REQUIRED
-	table:comment CDATA #IMPLIED
->
-<!ELEMENT table:shapes %shapes;>
-<!ELEMENT table:table-column-group (table:table-header-columns | table:table-column | table:table-column-group)+>
-<!ATTLIST table:table-column-group
-	table:display %boolean; "true"
->
-<!ELEMENT table:table-header-columns (table:table-column | table:table-column-group)+>
-<!ELEMENT table:table-columns (table:table-column | table:table-column-group)+>
-<!ELEMENT table:table-column EMPTY>
-<!ATTLIST table:table-column
-	table:number-columns-repeated %positiveInteger; "1"
-	table:style-name %styleName; #IMPLIED
-	table:visibility (visible | collapse | filter) "visible"
-	table:default-cell-style-name %styleName; #IMPLIED
->
-<!ELEMENT table:table-row-group (table:table-header-rows | table:table-row | table:table-row-group)+>
-<!ATTLIST table:table-row-group
-	table:display %boolean; "true"
->
-<!ELEMENT table:table-header-rows (table:table-row | table:table-row-group)+>
-<!ELEMENT table:table-rows (table:table-row | table:table-row-group)+>
-<!ENTITY % table-cells "(table:table-cell|table:covered-table-cell)+">
-<!ELEMENT table:table-row %table-cells;>
-<!ATTLIST table:table-row
-	table:number-rows-repeated %positiveInteger; "1"
-	table:style-name %styleName; #IMPLIED
-	table:visibility (visible | collapse | filter) "visible"
-	table:default-cell-style-name %styleName; #IMPLIED
->
-
-<!ENTITY % text-wo-table "(text:h|text:p|text:ordered-list|text:unordered-list|%shapes;)*">
-<!ENTITY % cell-content "(table:cell-range-source?,office:annotation?,table:detective?,(table:sub-table|%text-wo-table;))">
-<!ELEMENT table:table-cell %cell-content;>
-<!ELEMENT table:covered-table-cell %cell-content;>
-<!ATTLIST table:table-cell
-	table:number-columns-repeated %positiveInteger; "1"
-	table:number-rows-spanned %positiveInteger; "1"
-	table:number-columns-spanned %positiveInteger; "1"
-	table:style-name %styleName; #IMPLIED
-	table:validation-name CDATA #IMPLIED
-	table:formula %string; #IMPLIED
-	table:number-matrix-rows-spanned %positiveInteger; #IMPLIED
-	table:number-matrix-columns-spanned %positiveInteger; #IMPLIED
-	table:value-type %valueType; "string"
-	table:value %float; #IMPLIED
-	table:date-value %date; #IMPLIED
-	table:time-value %timeInstance; #IMPLIED
-	table:boolean-value %boolean; #IMPLIED
-	table:string-value %string; #IMPLIED
-	table:currency %string; #IMPLIED
->
-<!ATTLIST table:covered-table-cell
-	table:number-columns-repeated %positiveInteger; "1"
-	table:style-name %styleName; #IMPLIED
-	table:validation-name CDATA #IMPLIED
-	table:formula %string; #IMPLIED
-	table:number-matrix-rows-spanned %positiveInteger; #IMPLIED
-	table:number-matrix-columns-spanned %positiveInteger; #IMPLIED
-	table:value-type %valueType; "string"
-	table:value %float; #IMPLIED
-	table:date-value %date; #IMPLIED
-	table:time-value %timeInstance; #IMPLIED
-	table:boolean-value %boolean; #IMPLIED
-	table:string-value %string; #IMPLIED
-	table:currency %string; #IMPLIED
->
-<!-- cell protection in writer: cell attribute; calc uses format -->
-<!ATTLIST table:table-cell table:protected %boolean; "false">
-
-<!ELEMENT table:cell-range-source EMPTY>
-<!ATTLIST table:cell-range-source
-	table:name %string; #REQUIRED
-	xlink:type (simple) #FIXED "simple"
-	xlink:actuate (onRequest) #FIXED "onRequest"
-	xlink:href %uriReference; #REQUIRED
-	table:filter-name %string; #REQUIRED
-	table:filter-options %string; #IMPLIED
-	table:last-column-spanned %positiveInteger; #REQUIRED
-	table:last-row-spanned %positiveInteger; #REQUIRED
-	table:refresh-delay %timeDuration; #IMPLIED
->
-
-<!ELEMENT table:detective (table:highlighted-range*, table:operation*)>
-<!ELEMENT table:highlighted-range EMPTY>
-<!ATTLIST table:highlighted-range
-	table:cell-range-address %cell-range-address; #IMPLIED
-	table:direction (from-another-table | to-another-table | from-same-table | to-same-table) #REQUIRED
-	table:contains-error %boolean; "false"
->
-<!ELEMENT table:operation EMPTY>
-<!ATTLIST table:operation
-	table:name (trace-dependents | remove-dependents | trace-precedents | remove-precedents | trace-errors) #REQUIRED
-	table:index %nonNegativeInteger; #REQUIRED
->
-
-<!ELEMENT table:content-validations (table:content-validation)+>
-<!ELEMENT table:content-validation (table:help-message?, (table:error-message | (table:error-macro, office:events?))?)>
-<!ATTLIST table:content-validation
-	table:name CDATA #REQUIRED
-	table:condition CDATA #IMPLIED
-	table:base-cell-address %cell-address; #IMPLIED
-	table:allow-empty-cell %boolean; #IMPLIED
->
-<!ELEMENT table:help-message (text:p*)>
-<!ATTLIST table:help-message
-	table:title CDATA #IMPLIED
-	table:display %boolean; #IMPLIED
->
-<!ELEMENT table:error-message (text:p*)>
-<!ATTLIST table:error-message
-	table:title CDATA #IMPLIED
-	table:message-type (stop | warning | information) #IMPLIED
-	table:display %boolean; #IMPLIED
->
-<!ELEMENT table:error-macro EMPTY>
-<!ATTLIST table:error-macro
-	table:name CDATA #IMPLIED
-	table:execute %boolean; #IMPLIED
->
-
-<!ELEMENT table:sub-table ((%table-column-groups;) , (%table-row-groups;))>
-
-<!ELEMENT table:label-ranges (table:label-range)*>
-<!ELEMENT table:label-range EMPTY>
-<!ATTLIST table:label-range
-	table:label-cell-range-address %cell-range-address; #REQUIRED
-	table:data-cell-range-address %cell-range-address; #REQUIRED
-	table:orientation (column | row) #REQUIRED
->
-
-<!ELEMENT table:named-expressions (table:named-range | table:named-expression)*>
-<!ELEMENT table:named-range EMPTY>
-<!ATTLIST table:named-range
-	table:name CDATA #REQUIRED
-	table:cell-range-address %cell-range-address; #REQUIRED
-	table:base-cell-address %cell-address; #IMPLIED
-	table:range-usable-as CDATA "none"
->
-<!ELEMENT table:named-expression EMPTY>
-<!ATTLIST table:named-expression
-	table:name CDATA #REQUIRED
-	table:expression CDATA #REQUIRED
-	table:base-cell-address %cell-address; #IMPLIED
->
-
-<!ELEMENT table:filter (table:filter-condition | table:filter-and | table:filter-or)>
-<!ATTLIST table:filter
-	table:target-range-address %cell-range-address; #IMPLIED
-	table:condition-source-range-address %cell-range-address; #IMPLIED
-	table:condition-source (self | cell-range) "self"
-	table:display-duplicates %boolean; "true"
->
-<!ELEMENT table:filter-and (table:filter-or | table:filter-condition)+>
-<!ELEMENT table:filter-or (table:filter-and | table:filter-condition)+>
-<!ELEMENT table:filter-condition EMPTY>
-<!ATTLIST table:filter-condition
-	table:field-number %nonNegativeInteger; #REQUIRED
-	table:case-sensitive %boolean; "false"
-	table:data-type (text | number) "text"
-	table:value CDATA #REQUIRED
-	table:operator CDATA #REQUIRED
->
-
-<!ELEMENT table:database-ranges (table:database-range)*>
-<!ELEMENT table:database-range ((table:database-source-sql | table:database-source-table | table:database-source-query)?, table:filter?, table:sort?, table:subtotal-rules?)>
-<!ATTLIST table:database-range
-	table:name CDATA #IMPLIED
-	table:is-selection %boolean; "false"
-	table:on-update-keep-styles %boolean; "false"
-	table:on-update-keep-size %boolean; "true"
-	table:has-persistant-data %boolean; "true"
-	table:orientation (row | column) "row"
-	table:contains-header %boolean; "true"
-	table:display-filter-buttons %boolean; "false"
-	table:target-range-address %cell-range-address; #REQUIRED
-	table:refresh-delay %timeDuration; #IMPLIED
->
-<!ELEMENT table:database-source-sql EMPTY>
-<!ATTLIST table:database-source-sql
-	table:database-name CDATA #REQUIRED
-	table:sql-statement CDATA #REQUIRED
-	table:parse-sql-statements %boolean; "false"
->
-<!ELEMENT table:database-source-table EMPTY>
-<!ATTLIST table:database-source-table
-	table:database-name CDATA #REQUIRED
-	table:table-name CDATA #REQUIRED
->
-<!ELEMENT table:database-source-query EMPTY>
-<!ATTLIST table:database-source-query
-	table:database-name CDATA #REQUIRED
-	table:query-name CDATA #REQUIRED
->
-
-<!ELEMENT table:sort (table:sort-by)+>
-<!ATTLIST table:sort
-	table:bind-styles-to-content %boolean; "true"
-	table:target-range-address %cell-range-address; #IMPLIED
-	table:case-sensitive %boolean; "false"
-	table:language CDATA #IMPLIED
-	table:country CDATA #IMPLIED
-	table:algorithm CDATA #IMPLIED
->
-<!ELEMENT table:sort-by EMPTY>
-<!ATTLIST table:sort-by
-	table:field-number %nonNegativeInteger; #REQUIRED
-	table:data-type (text | number | automatic | qname-but-not-ncname) "automatic"
-	table:order (ascending | descending) "ascending"
->
-
-<!ELEMENT table:subtotal-rules (table:sort-groups? | table:subtotal-rule*)?>
-<!ATTLIST table:subtotal-rules
-	table:bind-styles-to-content %boolean; "true"
-	table:case-sensitive %boolean; "false"
-	table:page-breaks-on-group-change %boolean; "false"
->
-<!ELEMENT table:sort-groups EMPTY>
-<!ATTLIST table:sort-groups
-	table:data-type (text | number | automatic | qname-but-not-ncname) "automatic"
-	table:order (ascending | descending) "ascending"
->
-<!ELEMENT table:subtotal-rule (table:subtotal-field)*>
-<!ATTLIST table:subtotal-rule
-	table:group-by-field-number %nonNegativeInteger; #REQUIRED
->
-<!ELEMENT table:subtotal-field EMPTY>
-<!ATTLIST table:subtotal-field
-	table:field-number %nonNegativeInteger; #REQUIRED
-	table:function CDATA #REQUIRED
->
-
-<!ELEMENT table:data-pilot-tables (table:data-pilot-table)*>
-<!ELEMENT table:data-pilot-table ((table:database-source-sql | table:database-source-table | table:database-source-query | table:source-service | table:source-cell-range)?, table:data-pilot-field+)>
-<!ATTLIST table:data-pilot-table
-	table:name CDATA #REQUIRED
-	table:application-data CDATA #IMPLIED
-	table:grand-total (none | row | column | both) "both"
-	table:ignore-empty-rows %boolean; "false"
-	table:identify-categories %boolean; "false"
-	table:target-range-address %cell-range-address; #REQUIRED
-	table:buttons %cell-range-address-list; #REQUIRED
->
-<!ELEMENT table:source-service EMPTY>
-<!ATTLIST table:source-service
-	table:name CDATA #REQUIRED
-	table:source-name CDATA #REQUIRED
-	table:object-name CDATA #REQUIRED
-	table:username CDATA #IMPLIED
-	table:password CDATA #IMPLIED
->
-<!ELEMENT table:source-cell-range (table:filter)?>
-<!ATTLIST table:source-cell-range
-	table:cell-range-address %cell-range-address; #REQUIRED
->
-<!ELEMENT table:data-pilot-field (table:data-pilot-level)?>
-<!ATTLIST table:data-pilot-field
-	table:source-field-name CDATA #REQUIRED
-	table:is-data-layout-field %boolean; "false"
-	table:function CDATA #REQUIRED
-	table:orientation (row | column | data | page | hidden) #REQUIRED
-	table:used-hierarchy %positiveInteger; "1"
->
-<!ELEMENT table:data-pilot-level (table:data-pilot-subtotals?, table:data-pilot-members?)>
-<!ATTLIST table:data-pilot-level
-	table:display-empty %boolean; #IMPLIED
->
-<!ELEMENT table:data-pilot-subtotals (table:data-pilot-subtotal)*>
-<!ELEMENT table:data-pilot-subtotal EMPTY>
-<!ATTLIST table:data-pilot-subtotal
-	table:function CDATA #REQUIRED
->
-<!ELEMENT table:data-pilot-members (table:data-pilot-member)*>
-<!ELEMENT table:data-pilot-member EMPTY>
-<!ATTLIST table:data-pilot-member
-	table:name CDATA #REQUIRED
-	table:display %boolean; #IMPLIED
-	table:display-details %boolean; #IMPLIED
->
-
-<!ELEMENT table:consolidation EMPTY>
-<!ATTLIST table:consolidation
-	table:function CDATA #REQUIRED
-	table:source-cell-range-addresses %cell-range-address-list; #REQUIRED
-	table:target-cell-address %cell-address; #REQUIRED
-	table:use-label (none | column | row | both) "none"
-	table:link-to-source-data %boolean; "false"
->
-
-<!ELEMENT table:dde-links (table:dde-link)+>
-<!ELEMENT table:dde-link (office:dde-source, table:table)>
diff --git a/chart2/workbench/fileformat/text.mod b/chart2/workbench/fileformat/text.mod
index 3523604b42e2..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/text.mod
+++ b/chart2/workbench/fileformat/text.mod
@@ -1,891 +0,0 @@
-<!--
-
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  
-  Copyright 2008 by Sun Microsystems, Inc.
- 
-  OpenOffice.org - a multi-platform office productivity suite
- 
-  $RCSfile: text.mod,v $
- 
-  $Revision: 1.3 $
- 
-  This file is part of OpenOffice.org.
- 
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
- 
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
- 
--->
-<!ENTITY % fields "text:date |
-				   text:time |
-				   text:page-number |
-				   text:page-continuation |
-				   text:sender-firstname |
-				   text:sender-lastname |
-				   text:sender-initials |
-				   text:sender-title |
-				   text:sender-position |
-				   text:sender-email |
-				   text:sender-phone-private |
-				   text:sender-fax |
-				   text:sender-company |
-				   text:sender-phone-work |
-				   text:sender-street |
-				   text:sender-city |
-				   text:sender-postal-code |
-				   text:sender-country |
-				   text:sender-state-or-province |
-				   text:author-name |
-				   text:author-initials |
-				   text:placeholder |
-				   text:variable-set |
-				   text:variable-get |
-				   text:variable-input |
-				   text:user-field-get |
-				   text:user-field-input |
-				   text:sequence |
-				   text:expression |
-				   text:text-input |
-				   text:database-display |
-				   text:database-next |
-				   text:database-row-select |
-				   text:database-row-number |
-				   text:database-name |
-				   text:initial-creator |
-				   text:creation-date |
-				   text:creation-time |
-				   text:description |
-				   text:user-defined |
-				   text:print-time |
-				   text:print-date |
-				   text:printed-by |
-				   text:title |
-				   text:subject |
-				   text:keywords |
-				   text:editing-cycles |
-				   text:editing-duration |
-				   text:modification-time |
-				   text:modification-date |
-				   text:creator |
-				   text:conditional-text |
-				   text:hidden-text |
-				   text:hidden-paragraph |
-				   text:chapter |
-				   text:file-name |
-				   text:template-name |
-				   text:page-variable-set |
-				   text:page-variable-get |
-				   text:execute-macro |
-				   text:dde-connection |
-				   text:reference-ref |
-				   text:sequence-ref |
-				   text:bookmark-ref |
-				   text:footnote-ref |
-				   text:endnote-ref |
-				   text:sheet-name |
-				   text:bibliography-mark |
-				   text:page-count |
-				   text:paragraph-count |
-				   text:word-count |
-				   text:character-count |
-				   text:table-count |
-				   text:image-count |
-				   text:object-count |
-				   office:annotation |
-				   text:script |
-				   text:measure" >
-<!ENTITY % inline-text-elements "
-				 text:span|text:tab-stop|text:s|text:line-break|
-				 text:footnote|text:endnote|text:a|
-				 text:bookmark|text:bookmark-start|text:bookmark-end|
-				 text:reference-mark|text:reference-mark-start|
-				 text:reference-mark-end|%fields;|%shape;|
-				 text:toc-mark-start | text:toc-mark-end |
-				 text:toc-mark | text:user-index-mark-start |
-				 text:user-index-mark-end | text:user-index-mark |
-				 text:alphabetical-index-mark-start |
-				 text:alphabetical-index-mark-end |
-				 text:alphabetical-index-mark |
-				 %change-marks; | draw:a | text:ruby">
-<!ENTITY % inline-text "( #PCDATA | %inline-text-elements; )*">
-<!ELEMENT text:p %inline-text;>
-<!ELEMENT text:h %inline-text;>
-<!ATTLIST text:p text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:p text:cond-style-name %styleName; #IMPLIED>
-<!ATTLIST text:h text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:h text:cond-style-name %styleName; #IMPLIED>
-<!ATTLIST text:h text:level %positiveInteger; "1">
-<!ELEMENT text:span %inline-text;>
-<!ATTLIST text:span text:style-name %styleName; #REQUIRED>
-<!ELEMENT text:a (#PCDATA | office:events | %inline-text-elements;)*>
-<!ATTLIST text:a xlink:href %uriReference; #REQUIRED>
-<!ATTLIST text:a xlink:type (simple) #FIXED "simple">
-<!ATTLIST text:a xlink:actuate (onRequest) "onRequest">
-<!ATTLIST text:a xlink:show (new|replace) "replace">
-<!ATTLIST text:a office:name %string; #IMPLIED>
-<!ATTLIST text:a office:target-frame-name %string; #IMPLIED>
-<!ATTLIST text:a text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:a text:visited-style-name %styleName; #IMPLIED>
-<!ELEMENT text:s EMPTY>
-<!ATTLIST text:s text:c %positiveInteger; "1">
-<!ELEMENT text:tab-stop EMPTY>
-<!ELEMENT text:line-break EMPTY>
-<!ENTITY % list-items "((text:list-header,text:list-item*)|text:list-item+)">
-<!ELEMENT text:ordered-list %list-items;>
-<!ELEMENT text:unordered-list %list-items;>
-<!ATTLIST text:ordered-list text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:unordered-list text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:ordered-list text:continue-numbering %boolean; "false">
-<!ELEMENT text:list-header (text:p)+>
-<!ELEMENT text:list-item (text:p|text:ordered-list|text:unordered-list)+>
-<!ATTLIST text:list-item text:restart-numbering %boolean; "false">
-<!ATTLIST text:list-item text:start-value %positiveInteger; #IMPLIED>
-<!ELEMENT text:list-style (text:list-level-style-number|
-     					   text:list-level-style-bullet|
-     					   text:list-level-style-image)+>
-<!ATTLIST text:list-style style:name %styleName; #IMPLIED>
-<!ATTLIST text:list-style text:consecutive-numbering %boolean; "false">
-<!ELEMENT text:list-level-style-number (style:properties?)>
-<!ATTLIST text:list-level-style-number text:level %positiveInteger;
-									     		 #REQUIRED>
-<!ATTLIST text:list-level-style-number text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:list-level-style-number style:num-format %string; #REQUIRED>
-<!ATTLIST text:list-level-style-number style:num-prefix %string; #IMPLIED>
-<!ATTLIST text:list-level-style-number style:num-suffix %string; #IMPLIED>
-<!ATTLIST text:list-level-style-number style:num-letter-sync %boolean;
-									     					"false">
-<!ATTLIST text:list-level-style-number text:display-levels %positiveInteger;
-									     				  "1">
-<!ATTLIST text:list-level-style-number text:start-value %positiveInteger;
-														   "1">
-<!ELEMENT text:list-level-style-bullet (style:properties?)>
-<!ATTLIST text:list-level-style-bullet text:level %positiveInteger; #REQUIRED>
-<!ATTLIST text:list-level-style-bullet text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:list-level-style-bullet text:bullet-char %character; #REQUIRED>
-<!ATTLIST text:list-level-style-bullet style:num-prefix %string; #IMPLIED>
-<!ATTLIST text:list-level-style-bullet style:num-suffix %string; #IMPLIED>
-<!ELEMENT text:list-level-style-image (style:properties?,office:binary-data?)>
-<!ATTLIST text:list-level-style-image text:level %positiveInteger; #REQUIRED>
-<!ATTLIST text:list-level-style-image xlink:type (simple) #IMPLIED>
-<!ATTLIST text:list-level-style-image xlink:href %uriReference; #IMPLIED>
-<!ATTLIST text:list-level-style-image xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST text:list-level-style-image xlink:show (embed) #IMPLIED>
-<!-- list properties -->
-<!ATTLIST style:properties text:space-before %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties text:min-label-width %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties text:min-label-distance %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties text:enable-numbering %boolean; #IMPLIED>
-<!ATTLIST style:properties style:list-style-name %styleName; #IMPLIED>
-<!ELEMENT text:outline-style (text:outline-level-style)+>
-<!ELEMENT text:outline-level-style (style:properties?)>
-<!ATTLIST text:outline-level-style text:level %positiveInteger;
-													 #REQUIRED>
-<!ATTLIST text:outline-level-style text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:outline-level-style style:num-format %string; #REQUIRED>
-<!ATTLIST text:outline-level-style style:num-prefix %string; #IMPLIED>
-<!ATTLIST text:outline-level-style style:num-suffix %string; #IMPLIED>
-<!ATTLIST text:outline-level-style style:num-letter-sync %boolean;
-																"false">
-<!ATTLIST text:outline-level-style text:display-levels %positiveInteger;
-															  "1">
-<!ATTLIST text:outline-level-style text:start-value %positiveInteger;
-														   "1">
-<!ENTITY % field-declarations "text:variable-decls?,
-							   text:user-field-decls?,
-							   text:sequence-decls?">
-<!ENTITY % variableName "CDATA">
-<!ENTITY % formula "CDATA">
-<!ENTITY % valueAttr "text:value-type %valueType; #IMPLIED
-							 text:currency CDATA #IMPLIED" >
-<!ENTITY % valueAndTypeAttr "%valueAttr;
-		 					 text:value %float; #IMPLIED
-							 text:date-value %date; #IMPLIED
-							 text:time-value %timeInstance; #IMPLIED
-							 text:boolean-value %boolean; #IMPLIED
-							 text:string-value %string; #IMPLIED" >
-<!ENTITY % numFormat 'style:num-format CDATA #IMPLIED
-					   style:num-letter-sync %boolean; "false"'>
-<!ELEMENT text:date (#PCDATA)>
-<!ATTLIST text:date text:date-value %timeInstance; #IMPLIED>
-<!ATTLIST text:date text:date-adjust %dateDuration; #IMPLIED>
-<!ATTLIST text:date text:fixed %boolean; "false">
-<!ATTLIST text:date style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:time (#PCDATA)>
-<!ATTLIST text:time text:time-value %timeInstance; #IMPLIED>
-<!ATTLIST text:time text:time-adjust %timeDuration; #IMPLIED>
-<!ATTLIST text:time text:fixed %boolean; "false">
-<!ATTLIST text:time style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:page-number (#PCDATA)>
-<!ATTLIST text:page-number text:page-adjust %positiveInteger; #IMPLIED>
-<!ATTLIST text:page-number text:select-page (previous|current|next) "current">
-<!ATTLIST text:page-number %numFormat;>
-<!ELEMENT text:page-continuation (#PCDATA)>
-<!ATTLIST text:page-continuation text:select-page (previous|next) #REQUIRED>
-<!ATTLIST text:page-continuation text:string-value %string; #IMPLIED>
-<!ELEMENT text:sender-firstname (#PCDATA)>
-<!ATTLIST text:sender-firstname text:fixed %boolean; "true">
-<!ELEMENT text:sender-lastname (#PCDATA)>
-<!ATTLIST text:sender-lastname text:fixed %boolean; "true">
-<!ELEMENT text:sender-initials (#PCDATA)>
-<!ATTLIST text:sender-initials text:fixed %boolean; "true">
-<!ELEMENT text:sender-title (#PCDATA)>
-<!ATTLIST text:sender-title text:fixed %boolean; "true">
-<!ELEMENT text:sender-position (#PCDATA)>
-<!ATTLIST text:sender-position text:fixed %boolean; "true">
-<!ELEMENT text:sender-email (#PCDATA)>
-<!ATTLIST text:sender-email text:fixed %boolean; "true">
-<!ELEMENT text:sender-phone-private (#PCDATA)>
-<!ATTLIST text:sender-phone-private text:fixed %boolean; "true">
-<!ELEMENT text:sender-fax (#PCDATA)>
-<!ATTLIST text:sender-fax text:fixed %boolean; "true">
-<!ELEMENT text:sender-company (#PCDATA)>
-<!ATTLIST text:sender-company text:fixed %boolean; "true">
-<!ELEMENT text:sender-phone-work (#PCDATA)>
-<!ATTLIST text:sender-phone-work text:fixed %boolean; "true">
-<!ELEMENT text:sender-street (#PCDATA)>
-<!ATTLIST text:sender-street text:fixed %boolean; "true">
-<!ELEMENT text:sender-city (#PCDATA)>
-<!ATTLIST text:sender-city text:fixed %boolean; "true">
-<!ELEMENT text:sender-postal-code (#PCDATA)>
-<!ATTLIST text:sender-postal-code text:fixed %boolean; "true">
-<!ELEMENT text:sender-country (#PCDATA)>
-<!ATTLIST text:sender-country text:fixed %boolean; "true">
-<!ELEMENT text:sender-state-or-province (#PCDATA)>
-<!ATTLIST text:sender-state-or-province text:fixed %boolean; "true">
-<!ELEMENT text:author-name (#PCDATA)>
-<!ATTLIST text:author-name text:fixed %boolean; "true">
-<!ELEMENT text:author-initials (#PCDATA)>
-<!ATTLIST text:author-initials text:fixed %boolean; "true">
-<!ELEMENT text:placeholder (#PCDATA)>
-<!ATTLIST text:placeholder text:placeholder-type (text|table|text-box|image|object) #REQUIRED>
-<!ATTLIST text:placeholder text:description %string; #IMPLIED>
-<!ELEMENT text:variable-decls (text:variable-decl)*>
-<!ELEMENT text:variable-decl EMPTY>
-<!ATTLIST text:variable-decl text:name %variableName; #REQUIRED>
-<!ATTLIST text:variable-decl %valueAndTypeAttr;>
-<!ELEMENT text:variable-set (#PCDATA)>
-<!ATTLIST text:variable-set text:name %variableName; #REQUIRED>
-<!ATTLIST text:variable-set text:formula %formula; #IMPLIED>
-<!ATTLIST text:variable-set %valueAndTypeAttr;>
-<!ATTLIST text:variable-set text:display (value|none) "value">
-<!ATTLIST text:variable-set style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:variable-get (#PCDATA)>
-<!ATTLIST text:variable-get text:name %variableName; #REQUIRED>
-<!ATTLIST text:variable-get text:display (value|formula) "value">
-<!ATTLIST text:variable-get style:data-style-name %styleName; #IMPLIED>
-<!ATTLIST text:variable-get %valueAttr;>
-<!ELEMENT text:variable-input (#PCDATA)>
-<!ATTLIST text:variable-input text:name %variableName; #REQUIRED>
-<!ATTLIST text:variable-input text:description %string; #IMPLIED>
-<!ATTLIST text:variable-input %valueAndTypeAttr;>
-<!ATTLIST text:variable-input text:display (value|none) "value">
-<!ATTLIST text:variable-input style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:user-field-decls (text:user-field-decl)*>
-<!ELEMENT text:user-field-decl EMPTY>
-<!ATTLIST text:user-field-decl text:name %variableName; #REQUIRED>
-<!ATTLIST text:user-field-decl text:formula %formula; #IMPLIED>
-<!ATTLIST text:user-field-decl %valueAndTypeAttr;>
-<!ELEMENT text:user-field-get (#PCDATA)>
-<!ATTLIST text:user-field-get text:name %variableName; #REQUIRED>
-<!ATTLIST text:user-field-get text:display (value|formula|none) "value">
-<!ATTLIST text:user-field-get style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:user-field-input (#PCDATA)>
-<!ATTLIST text:user-field-input text:name %variableName; #REQUIRED>
-<!ATTLIST text:user-field-input text:description %string; #IMPLIED>
-<!ATTLIST text:user-field-input style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:sequence-decls (text:sequence-decl)*>
-<!ELEMENT text:sequence-decl EMPTY>
-<!ATTLIST text:sequence-decl text:name %variableName; #REQUIRED>
-<!ATTLIST text:sequence-decl text:display-outline-level %positiveInteger; "0">
-<!ATTLIST text:sequence-decl text:separation-character %character; ".">
-<!ELEMENT text:sequence (#PCDATA)>
-<!ATTLIST text:sequence text:name %variableName; #REQUIRED>
-<!ATTLIST text:sequence text:formula %formula; #IMPLIED>
-<!ATTLIST text:sequence %numFormat;>
-<!ATTLIST text:sequence text:ref-name ID #IMPLIED>
-<!ELEMENT text:expression (#PCDATA)>
-<!ATTLIST text:expression text:formula %formula; #IMPLIED>
-<!ATTLIST text:expression text:display (value|formula ) "value">
-<!ATTLIST text:expression %valueAndTypeAttr;>
-<!ATTLIST text:expression style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:text-input (#PCDATA)>
-<!ATTLIST text:text-input text:description %string; #IMPLIED>
-<!ENTITY % database-table "text:database-name CDATA #REQUIRED
-						   text:table-name CDATA #REQUIRED">
-<!ELEMENT text:database-display (#PCDATA)>
-<!ATTLIST text:database-display %database-table;>
-<!ATTLIST text:database-display text:column-name %string; #REQUIRED>
-<!ATTLIST text:database-display style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:database-next (#PCDATA)>
-<!ATTLIST text:database-next %database-table;>
-<!ATTLIST text:database-next text:condition %formula; #IMPLIED>
-<!ELEMENT text:database-row-select (#PCDATA)>
-<!ATTLIST text:database-row-select %database-table;>
-<!ATTLIST text:database-row-select text:condition %formula; #IMPLIED>
-<!ATTLIST text:database-row-select text:row-number %integer; #REQUIRED>
-<!ELEMENT text:database-row-number (#PCDATA)>
-<!ATTLIST text:database-row-number %database-table;>
-<!ATTLIST text:database-row-number %numFormat;>
-<!ATTLIST text:database-row-number text:value %integer; #IMPLIED>
-<!ELEMENT text:database-name (#PCDATA)>
-<!ATTLIST text:database-name %database-table;>
-<!ELEMENT text:initial-creator (#PCDATA)>
-<!ATTLIST text:initial-creator text:fixed %boolean; "false">
-<!ELEMENT text:creation-date (#PCDATA)>
-<!ATTLIST text:creation-date text:fixed %boolean; "false">
-<!ATTLIST text:creation-date text:date-value %date; #IMPLIED>
-<!ATTLIST text:creation-date style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:creation-time (#PCDATA)>
-<!ATTLIST text:creation-time text:fixed %boolean; "false">
-<!ATTLIST text:creation-time text:time-value %timeInstance; #IMPLIED>
-<!ATTLIST text:creation-time style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:description (#PCDATA)>
-<!ATTLIST text:description text:fixed %boolean; "false">
-<!ELEMENT text:user-defined (#PCDATA)>
-<!ATTLIST text:user-defined text:fixed %boolean; "false">
-<!ATTLIST text:user-defined text:name %string; #REQUIRED>
-<!ELEMENT text:print-time (#PCDATA)>
-<!ATTLIST text:print-time text:fixed %boolean; "false">
-<!ATTLIST text:print-time text:time-value %timeInstance; #IMPLIED>
-<!ATTLIST text:print-time style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:print-date (#PCDATA)>
-<!ATTLIST text:print-date text:fixed %boolean; "false">
-<!ATTLIST text:print-date text:date-value %date; #IMPLIED>
-<!ATTLIST text:print-date style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:printed-by (#PCDATA)>
-<!ATTLIST text:printed-by text:fixed %boolean; "false">
-<!ELEMENT text:title (#PCDATA)>
-<!ATTLIST text:title text:fixed %boolean; "false">
-<!ELEMENT text:subject (#PCDATA)>
-<!ATTLIST text:subject text:fixed %boolean; "false">
-<!ELEMENT text:keywords (#PCDATA)>
-<!ATTLIST text:keywords text:fixed %boolean; "false">
-<!ELEMENT text:editing-cycles (#PCDATA)>
-<!ATTLIST text:editing-cycles text:fixed %boolean; "false">
-<!ELEMENT text:editing-duration (#PCDATA)>
-<!ATTLIST text:editing-duration text:fixed %boolean; "false">
-<!ATTLIST text:editing-duration text:duration %timeDuration; #IMPLIED>
-<!ATTLIST text:editing-duration style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:modification-time (#PCDATA)>
-<!ATTLIST text:modification-time text:fixed %boolean; "false">
-<!ATTLIST text:modification-time text:time-value %timeInstance; #IMPLIED>
-<!ATTLIST text:modification-time style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:modification-date (#PCDATA)>
-<!ATTLIST text:modification-date text:fixed %boolean; "false">
-<!ATTLIST text:modification-date text:date-value %date; #IMPLIED>
-<!ATTLIST text:modification-date style:data-style-name %styleName; #IMPLIED>
-<!ELEMENT text:creator (#PCDATA)>
-<!ATTLIST text:creator text:fixed %boolean; "false">
-<!ELEMENT text:conditional-text (#PCDATA)>
-<!ATTLIST text:conditional-text text:condition %formula; #REQUIRED>
-<!ATTLIST text:conditional-text text:string-value-if-false %string; #REQUIRED>
-<!ATTLIST text:conditional-text text:string-value-if-true %string; #REQUIRED>
-<!ATTLIST text:conditional-text text:current-value %boolean; "false">
-<!ELEMENT text:hidden-text (#PCDATA)>
-<!ATTLIST text:hidden-text text:condition %formula; #REQUIRED>
-<!ATTLIST text:hidden-text text:string-value %string; #REQUIRED>
-<!ATTLIST text:hidden-text text:is-hidden %boolean; "false">
-<!ELEMENT text:hidden-paragraph EMPTY>
-<!ATTLIST text:hidden-paragraph text:condition %formula; #REQUIRED>
-<!ATTLIST text:hidden-paragraph text:is-hidden %boolean; "false">
-<!ELEMENT text:chapter (#PCDATA)>
-<!ATTLIST text:chapter text:display (name|number|number-and-name|
-									 plain-number-and-name|plain-number)
-									 "number-and-name">
-<!ATTLIST text:chapter text:outline-level %integer; "1">
-<!ELEMENT text:file-name (#PCDATA)>
-<!ATTLIST text:file-name text:display (full|path|name|name-and-extension)
-									  "full">
-<!ATTLIST text:file-name text:fixed %boolean; "false">
-<!ELEMENT text:template-name (#PCDATA)>
-<!ATTLIST text:template-name text:display (full|path|name|name-and-extension|
-										  area|title) "full">
-<!ELEMENT text:page-variable-set EMPTY>
-<!ATTLIST text:page-variable-set text:active %boolean; "true">
-<!ATTLIST text:page-variable-set text:page-adjust %integer; "0">
-<!ELEMENT text:page-variable-get (#PCDATA)>
-<!ATTLIST text:page-variable-get %numFormat;>
-<!ELEMENT text:execute-macro (#PCDATA|office:events)* >
-<!ATTLIST text:execute-macro text:description %string; #IMPLIED>
-<!ELEMENT text:dde-connection-decls (text:dde-connection-decl)*>
-<!ELEMENT text:dde-connection-decl EMPTY>
-<!ATTLIST text:dde-connection-decl text:name %string; #REQUIRED>
-<!ATTLIST text:dde-connection-decl office:dde-application %string; #REQUIRED>
-<!ATTLIST text:dde-connection-decl office:dde-topic %string; #REQUIRED>
-<!ATTLIST text:dde-connection-decl office:dde-item %string; #REQUIRED>
-<!ATTLIST text:dde-connection-decl office:automatic-update %boolean; "false">
-<!ELEMENT text:dde-connection (#PCDATA)>
-<!ATTLIST text:dde-connection text:connection-name %string; #REQUIRED>
-<!ELEMENT text:reference-ref (#PCDATA)>
-<!ATTLIST text:reference-ref text:ref-name %string; #REQUIRED>
-<!ATTLIST text:reference-ref text:reference-format (page|chapter|text|direction) #IMPLIED>
-<!ELEMENT text:sequence-ref (#PCDATA)>
-<!ATTLIST text:sequence-ref text:ref-name %string; #REQUIRED>
-<!ATTLIST text:sequence-ref text:reference-format (page|chapter|text|direction|category-and-value|caption|value) #IMPLIED>
-<!ELEMENT text:bookmark-ref (#PCDATA)>
-<!ATTLIST text:bookmark-ref text:ref-name %string; #REQUIRED>
-<!ATTLIST text:bookmark-ref text:reference-format (page|chapter|text|direction) #IMPLIED>
-<!ELEMENT text:footnote-ref (#PCDATA)>
-<!ATTLIST text:footnote-ref text:ref-name %string; #REQUIRED>
-<!ATTLIST text:footnote-ref text:reference-format (page|chapter|text|direction) #IMPLIED>
-<!ELEMENT text:endnote-ref (#PCDATA)>
-<!ATTLIST text:endnote-ref text:ref-name %string; #REQUIRED>
-<!ATTLIST text:endnote-ref text:reference-format (page|chapter|text|direction) #IMPLIED>
-<!ELEMENT text:sheet-name (#PCDATA)>
-<!ELEMENT text:page-count (#PCDATA)>
-<!ATTLIST text:page-count style:num-format %string; #IMPLIED>
-<!ATTLIST text:page-count style:num-letter-sync %boolean; "false">
-<!ELEMENT text:paragraph-count (#PCDATA)>
-<!ATTLIST text:paragraph-count style:num-format %string; #IMPLIED>
-<!ATTLIST text:paragraph-count style:num-letter-sync %boolean; "false">
-<!ELEMENT text:word-count (#PCDATA)>
-<!ATTLIST text:word-count style:num-format %string; #IMPLIED>
-<!ATTLIST text:word-count style:num-letter-sync %boolean; "false">
-<!ELEMENT text:character-count (#PCDATA)>
-<!ATTLIST text:character-count style:num-format %string; #IMPLIED>
-<!ATTLIST text:character-count style:num-letter-sync %boolean; "false">
-<!ELEMENT text:table-count (#PCDATA)>
-<!ATTLIST text:table-count style:num-format %string; #IMPLIED>
-<!ATTLIST text:table-count style:num-letter-sync %boolean; "false">
-<!ELEMENT text:image-count (#PCDATA)>
-<!ATTLIST text:image-count style:num-format %string; #IMPLIED>
-<!ATTLIST text:image-count style:num-letter-sync %boolean; "false">
-<!ELEMENT text:object-count (#PCDATA)>
-<!ATTLIST text:object-count style:num-format %string; #IMPLIED>
-<!ATTLIST text:object-count style:num-letter-sync %boolean; "false">
-<!ELEMENT text:bibliography-mark (#PCDATA)>
-<!ATTLIST text:bibliography-mark text:bibliography-type
-	( article | book | booklet | conference | custom1 | custom2 | custom3 |
-	  custom4 | custom5 | email | inbook | incollection | inproceedings |
-	  journal | manual | mastersthesis | misc | phdthesis | proceedings |
-	  techreport | unpublished | www ) #REQUIRED >
-<!ATTLIST text:bibliography-mark text:identifier CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:address CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:annote CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:author CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:booktitle CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:chapter CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:edition CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:editor CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:howpublished CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:institution CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:journal CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:month CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:note CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:number CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:organizations CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:pages CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:publisher CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:school CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:series CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:title CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:report-type CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:volume CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:year CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:url CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:custom1 CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:custom2 CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:custom3 CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:custom4 CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:custom5 CDATA #IMPLIED>
-<!ATTLIST text:bibliography-mark text:isbn CDATA #IMPLIED>
-<!ELEMENT text:bookmark EMPTY>
-<!ATTLIST text:bookmark text:name CDATA #REQUIRED>
-<!ELEMENT text:bookmark-start EMPTY>
-<!ATTLIST text:bookmark-start text:name CDATA #REQUIRED>
-<!ELEMENT text:bookmark-end EMPTY>
-<!ATTLIST text:bookmark-end text:name CDATA #REQUIRED>
-<!ELEMENT text:reference-mark EMPTY>
-<!ATTLIST text:reference-mark text:name CDATA #REQUIRED>
-<!ELEMENT text:reference-mark-start EMPTY>
-<!ATTLIST text:reference-mark-start text:name CDATA #REQUIRED>
-<!ELEMENT text:reference-mark-end EMPTY>
-<!ATTLIST text:reference-mark-end text:name CDATA #REQUIRED>
-<!ELEMENT text:footnotes-configuration (text:footnote-continuation-notice-forward?,text:footnote-continuation-notice-backward?)>
-<!ATTLIST text:footnotes-configuration style:num-prefix %string; #IMPLIED>
-<!ATTLIST text:footnotes-configuration style:num-suffix %string; #IMPLIED>
-<!ATTLIST text:footnotes-configuration style:num-format %string; #IMPLIED>
-<!ATTLIST text:footnotes-configuration style:num-letter-sync %string; #IMPLIED>
-<!ATTLIST text:footnotes-configuration text:citation-body-style-name %styleName; #IMPLIED>
-<!ATTLIST text:footnotes-configuration text:citation-style-name %styleName; #IMPLIED>
-<!ATTLIST text:footnotes-configuration text:default-style-name  %styleName; #IMPLIED>
-<!ATTLIST text:footnotes-configuration text:master-page-name %styleName; #IMPLIED>
-<!ATTLIST text:footnotes-configuration text:start-value %integer; #IMPLIED>
-<!ATTLIST text:footnotes-configuration text:footnotes-position (document|page) "page">
-<!ATTLIST text:footnotes-configuration text:start-numbering-at (document|chapter|page) "document">
-<!ELEMENT text:footnote-continuation-notice-forward (#PCDATA)>
-<!ELEMENT text:footnote-continuation-notice-backward (#PCDATA)>
-<!ELEMENT text:endnotes-configuration EMPTY>
-<!ATTLIST text:endnotes-configuration style:num-prefix %string; #IMPLIED>
-<!ATTLIST text:endnotes-configuration style:num-suffix %string; #IMPLIED>
-<!ATTLIST text:endnotes-configuration style:num-format %string; #IMPLIED>
-<!ATTLIST text:endnotes-configuration style:num-letter-sync %string; #IMPLIED>
-<!ATTLIST text:endnotes-configuration text:start-value %integer; #IMPLIED>
-<!ATTLIST text:endnotes-configuration text:citation-style-name %styleName; #IMPLIED>
-<!ATTLIST text:endnotes-configuration text:citation-body-style-name %styleName; #IMPLIED>
-<!ATTLIST text:endnotes-configuration text:default-style-name %styleName; #IMPLIED>
-<!ATTLIST text:endnotes-configuration text:master-page-name %styleName; #IMPLIED>
-<!-- Validity constraint: text:footnote and text:endnote elements may not
-	contain other text:footnote or text:endnote elements, even though the DTD
-	allows this (via the %text; in the foot-/endnote-body).
-	Unfortunatetly, this constraint cannot be easily specified in the DTD.
--->
-<!ELEMENT text:footnote (text:footnote-citation, text:footnote-body)>
-<!ATTLIST text:footnote text:id ID #IMPLIED>
-<!ELEMENT text:footnote-citation (#PCDATA)>
-<!ATTLIST text:footnote-citation text:label %string; #IMPLIED>
-<!ELEMENT text:footnote-body (text:h|text:p|
-							  text:ordered-list|text:unordered-list)*>
-<!ELEMENT text:endnote (text:endnote-citation, text:endnote-body)>
-<!ATTLIST text:endnote text:id ID #IMPLIED>
-<!ELEMENT text:endnote-citation (#PCDATA)>
-<!ATTLIST text:endnote-citation text:label %string; #IMPLIED>
-<!ELEMENT text:endnote-body (text:h|text:p|
-							 text:ordered-list|text:unordered-list)*>
-<!ENTITY % sectionText "(text:h|text:p|text:ordered-list|
-						text:unordered-list|table:table|text:section|
-						text:table-of-content|text:illustration-index|
-						text:table-index|text:object-index|text:user-index|
-						text:alphabetical-index|text:bibliography|
-						text:index-title|%change-marks;)*">
-<!ENTITY % sectionAttr "text:name CDATA #REQUIRED
-                        text:style-name %styleName; #IMPLIED
-                        text:protected %boolean; 'false' ">
-<!ELEMENT text:section ((text:section-source|office:dde-source)?,
-						%sectionText;) >
-<!ATTLIST text:section %sectionAttr;>
-<!ATTLIST text:section text:display (true|none|condition) "true">
-<!ATTLIST text:section text:condition %formula; #IMPLIED>
-<!ATTLIST text:section text:protection-key CDATA #IMPLIED>
-<!ELEMENT text:section-source EMPTY>
-<!ATTLIST text:section-source xlink:href %string; #IMPLIED>
-<!ATTLIST text:section-source xlink:type (simple) #FIXED "simple">
-<!ATTLIST text:section-source xlink:show (embed) #FIXED "embed">
-<!ATTLIST text:section-source text:section-name %string; #IMPLIED>
-<!ATTLIST text:section-source text:filter-name %string; #IMPLIED>
-<!ELEMENT text:table-of-content (text:table-of-content-source,
-								 text:index-body)   >
-<!ATTLIST text:table-of-content %sectionAttr;>
-<!ELEMENT text:table-of-content-source (text:index-title-template? ,
-										text:table-of-content-entry-template*,
-										text:index-source-styles* ) >
-<!ATTLIST text:table-of-content-source text:outline-level %integer; #IMPLIED>
-<!ATTLIST text:table-of-content-source text:use-index-marks %boolean; "true">
-<!ATTLIST text:table-of-content-source text:use-index-source-styles
-															%boolean; "false">
-<!ATTLIST text:table-of-content-source text:index-scope (document|chapter)
-														"document">
-<!ATTLIST text:table-of-content-source text:relative-tab-stop-position
-															%boolean; "true">
-<!ATTLIST text:table-of-content-source fo:language %string; #IMPLIED>
-<!ATTLIST text:table-of-content-source fo:country %string; #IMPLIED>
-<!ATTLIST text:table-of-content-source text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:table-of-content-entry-template (text:index-entry-chapter-number |
-												text:index-entry-page-number |
-												text:index-entry-text |
-												text:index-entry-span |
-												text:index-entry-tab-stop |
-												text:index-entry-link-start |
-												text:index-entry-link-end)* >
-<!ATTLIST text:table-of-content-entry-template text:outline-level
-						%integer; #REQUIRED>
-<!ATTLIST text:table-of-content-entry-template text:style-name
-						%styleName; #REQUIRED>
-<!ELEMENT text:illustration-index
-			(text:illustration-index-source, text:index-body)>
-<!ATTLIST text:illustration-index %sectionAttr;>
-<!ELEMENT text:illustration-index-source (text:index-title-template?,
-									text:illustration-index-entry-template?) >
-<!ATTLIST text:illustration-index-source text:index-scope
-									(document|chapter) "document">
-<!ATTLIST text:illustration-index-source text:relative-tab-stop-position
-									%boolean; "true">
-<!ATTLIST text:illustration-index-source text:use-caption %boolean; "true">
-<!ATTLIST text:illustration-index-source text:caption-sequence-name
-									%string; #IMPLIED>
-<!ATTLIST text:illustration-index-source text:caption-sequence-format
-									(text|category-and-value|caption) "text">
-<!ATTLIST text:illustration-index-source fo:language %string; #IMPLIED>
-<!ATTLIST text:illustration-index-source fo:country %string; #IMPLIED>
-<!ATTLIST text:illustration-index-source text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:illustration-index-entry-template
-								( text:index-entry-page-number |
-								  text:index-entry-text |
-								  text:index-entry-span |
-								  text:index-entry-tab-stop )* >
-<!ATTLIST text:illustration-index-entry-template text:style-name
-									%styleName; #REQUIRED>
-<!ELEMENT text:table-index (text:table-index-source, text:index-body)>
-<!ATTLIST text:table-index %sectionAttr;>
-<!ELEMENT text:table-index-source (text:index-title-template?,
-									text:table-index-entry-template?) >
-<!ATTLIST text:table-index-source text:index-scope
-									(document|chapter) "document">
-<!ATTLIST text:table-index-source text:relative-tab-stop-position
-									%boolean; "true">
-<!ATTLIST text:table-index-source text:use-caption %boolean; "true">
-<!ATTLIST text:table-index-source text:caption-sequence-name
-									%string; #IMPLIED>
-<!ATTLIST text:table-index-source text:caption-sequence-format
-									(text|category-and-value|caption) "text">
-<!ATTLIST text:table-index-source fo:language %string; #IMPLIED>
-<!ATTLIST text:table-index-source fo:country %string; #IMPLIED>
-<!ATTLIST text:table-index-source text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:table-index-entry-template ( text:index-entry-page-number |
-											text:index-entry-text |
-											text:index-entry-span |
-											text:index-entry-tab-stop )* >
-<!ATTLIST text:table-index-entry-template text:style-name
-											%styleName; #REQUIRED>
-<!ELEMENT text:object-index ( text:object-index-source, text:index-body ) >
-<!ATTLIST text:object-index %sectionAttr;>
-<!ELEMENT text:object-index-source ( text:index-title-template?,
-									 text:object-index-entry-template? ) >
-<!ATTLIST text:object-index-source text:index-scope
-									(document|chapter) "document">
-<!ATTLIST text:object-index-source text:relative-tab-stop-position
-									%boolean; "true">
-<!ATTLIST text:object-index-source text:use-spreadsheet-objects
-									%boolean; "false">
-<!ATTLIST text:object-index-source text:use-draw-objects %boolean; "false">
-<!ATTLIST text:object-index-source text:use-chart-objects %boolean; "false">
-<!ATTLIST text:object-index-source text:use-other-objects %boolean; "false">
-<!ATTLIST text:object-index-source text:use-math-objects %boolean; "false">
-<!ATTLIST text:object-index-source fo:language %string; #IMPLIED>
-<!ATTLIST text:object-index-source fo:country %string; #IMPLIED>
-<!ATTLIST text:object-index-source text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:object-index-entry-template ( text:index-entry-page-number |
-											 text:index-entry-text |
-											 text:index-entry-span |
-											 text:index-entry-tab-stop )* >
-<!ATTLIST text:object-index-entry-template text:style-name
-											%styleName; #REQUIRED >
-<!ELEMENT text:user-index (text:user-index-source, text:index-body) >
-<!ATTLIST text:user-index %sectionAttr;>
-<!ELEMENT text:user-index-source ( text:index-title-template?,
-								   text:user-index-entry-template*,
-								   text:index-source-styles* ) >
-<!ATTLIST text:user-index-source text:index-scope
-									(document|chapter) "document">
-<!ATTLIST text:user-index-source text:relative-tab-stop-position
-									%boolean; "true">
-<!ATTLIST text:user-index-source text:use-index-marks %boolean; "false">
-<!ATTLIST text:user-index-source text:use-graphics %boolean; "false">
-<!ATTLIST text:user-index-source text:use-tables %boolean; "false">
-<!ATTLIST text:user-index-source text:use-floating-frames %boolean; "false">
-<!ATTLIST text:user-index-source text:use-objects %boolean; "false">
-<!ATTLIST text:user-index-source text:use-index-source-styles
-													%boolean; "false">
-<!ATTLIST text:user-index-source text:copy-outline-levels %boolean; "false">
-<!ATTLIST text:user-index-source fo:language %string; #IMPLIED>
-<!ATTLIST text:user-index-source fo:country %string; #IMPLIED>
-<!ATTLIST text:user-index-source text:sort-algorithm %string; #IMPLIED>
-<!ATTLIST text:user-index-source text:index-name %string; #IMPLIED>
-<!ELEMENT text:user-index-entry-template ( text:index-entry-chapter |
-										   text:index-entry-page-number |
-										   text:index-entry-text |
-										   text:index-entry-span |
-										   text:index-entry-tab-stop )* >
-<!ATTLIST text:user-index-entry-template text:outline-level %integer; #REQUIRED>
-<!ATTLIST text:user-index-entry-template text:style-name %styleName; #REQUIRED>
-<!ELEMENT text:alphabetical-index (text:alphabetical-index-source,
-									text:index-body)>
-<!ATTLIST text:alphabetical-index %sectionAttr;>
-<!ELEMENT text:alphabetical-index-source ( text:index-title-template?,
-							text:alphabetical-index-entry-template* ) >
-<!ATTLIST text:alphabetical-index-source text:index-scope
-												(document|chapter) "document">
-<!ATTLIST text:alphabetical-index-source text:relative-tab-stop-position
-												%boolean; "true">
-<!ATTLIST text:alphabetical-index-source text:ignore-case %boolean; "false">
-<!ATTLIST text:alphabetical-index-source text:main-entry-style-name
-												%styleName; #IMPLIED>
-<!ATTLIST text:alphabetical-index-source text:alphabetical-separators
-												%boolean; "false">
-<!ATTLIST text:alphabetical-index-source text:combine-entries
-												%boolean; "true">
-<!ATTLIST text:alphabetical-index-source text:combine-entries-with-dash
-												%boolean; "false">
-<!ATTLIST text:alphabetical-index-source text:combine-entries-with-pp
-												%boolean; "true">
-<!ATTLIST text:alphabetical-index-source text:use-keys-as-entries
-												%boolean; "false">
-<!ATTLIST text:alphabetical-index-source text:capitalize-entries
-												%boolean; "false">
-<!ATTLIST text:alphabetical-index-source text:comma-separated
-												%boolean; "false">
-<!ATTLIST text:alphabetical-index-source fo:language %string; #IMPLIED>
-<!ATTLIST text:alphabetical-index-source fo:country %string; #IMPLIED>
-<!ATTLIST text:alphabetical-index-source text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:alphabetical-index-entry-template ( text:index-entry-chapter |
-												text:index-entry-page-number |
-												text:index-entry-text |
-												text:index-entry-span |
-												text:index-entry-tab-stop )* >
-<!ATTLIST text:alphabetical-index-entry-template text:outline-level
-												(1|2|3|separator) #REQUIRED>
-<!ATTLIST text:alphabetical-index-entry-template text:style-name
-												%styleName; #REQUIRED>
-<!ELEMENT text:alphabetical-index-auto-mark-file EMPTY>
-<!ATTLIST text:alphabetical-index-auto-mark-file xlink:href CDATA #IMPLIED>
-<!ATTLIST text:alphabetical-index-auto-mark-file xlink:type (simple) #FIXED "simple">
-<!ELEMENT text:bibliography (text:bibliography-source, text:index-body) >
-<!ATTLIST text:bibliography %sectionAttr;>
-<!ELEMENT text:bibliography-source ( text:index-title-template?,
-									 text:bibliography-entry-template* ) >
-<!ELEMENT text:bibliography-entry-template ( text:index-entry-span |
-											 text:index-entry-tab-stop |
-											 text:index-entry-bibliography )* >
-<!ATTLIST text:bibliography-entry-template text:bibliography-type
-				( article | book | booklet | conference | custom1 | custom2 |
-				  custom3 | custom4 | custom5 | email | inbook | incollection |
-				  inproceedings | journal | manual | mastersthesis | misc |
-				  phdthesis | proceedings | techreport | unpublished | www )
-				#REQUIRED >
-<!ATTLIST text:bibliography-entry-template text:style-name
-													%styleName; #REQUIRED>
-<!ELEMENT text:index-body %sectionText; >
-<!--
-Validity constraint: text:index-title elements may appear only in
-indices, and there may be only one text:index-title element.
--->
-<!ELEMENT text:index-title %sectionText; >
-<!ATTLIST text:index-title text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:index-title text:name %string; #IMPLIED>
-<!ELEMENT text:index-title-template (#PCDATA)>
-<!ATTLIST text:index-title-template text:style-name %styleName; #IMPLIED>
-<!ELEMENT text:index-entry-chapter-number EMPTY>
-<!ATTLIST text:index-entry-chapter-number text:style-name %styleName; #IMPLIED>
-<!ELEMENT text:index-entry-chapter EMPTY>
-<!ATTLIST text:index-entry-chapter text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:index-entry-chapter text:display (name|number|number-and-name)
-															"number-and-name" >
-<!ELEMENT text:index-entry-text EMPTY>
-<!ATTLIST text:index-entry-text text:style-name %styleName; #IMPLIED>
-<!ELEMENT text:index-entry-page-number EMPTY>
-<!ATTLIST text:index-entry-page-number text:style-name %styleName; #IMPLIED>
-<!ELEMENT text:index-entry-span (#PCDATA)>
-<!ATTLIST text:index-entry-span text:style-name %styleName; #IMPLIED>
-<!ELEMENT text:index-entry-bibliography EMPTY>
-<!ATTLIST text:index-entry-bibliography text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:index-entry-bibliography text:bibliography-data-field
-							( address | annote | author | bibliography-type |
-							  booktitle | chapter | custom1 | custom2 |
-							  custom3 | custom4 | custom5 | edition | editor |
-							  howpublished | identifier | institution | isbn |
-							  journal | month | note | number | organizations |
-							  pages | publisher | report-type | school |
-							  series | title | url | volume | year ) #REQUIRED>
-<!ELEMENT text:index-entry-tab-stop EMPTY>
-<!ATTLIST text:index-entry-tab-stop text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:index-entry-tab-stop style:leader-char %character; " ">
-<!ATTLIST text:index-entry-tab-stop style:type (left|right) "left">
-<!ATTLIST text:index-entry-tab-stop style:position %length; #IMPLIED>
-<!ELEMENT text:index-entry-link-start EMPTY>
-<!ATTLIST text:index-entry-link-start text:style-name %styleName; #IMPLIED>
-<!ELEMENT text:index-entry-link-end EMPTY>
-<!ATTLIST text:index-entry-link-end text:style-name %styleName; #IMPLIED>
-<!ELEMENT text:index-source-styles (text:index-source-style)*>
-<!ATTLIST text:index-source-styles text:outline-level %integer; #REQUIRED>
-<!ELEMENT text:index-source-style EMPTY>
-<!ATTLIST text:index-source-style text:style-name %styleName; #REQUIRED>
-<!ELEMENT text:toc-mark-start EMPTY>
-<!ATTLIST text:toc-mark-start text:id %string; #REQUIRED>
-<!ATTLIST text:toc-mark-start text:outline-level %integer; #IMPLIED>
-<!ELEMENT text:toc-mark-end EMPTY>
-<!ATTLIST text:toc-mark-end text:id %string; #REQUIRED>
-<!ELEMENT text:toc-mark EMPTY>
-<!ATTLIST text:toc-mark text:string-value %string; #REQUIRED>
-<!ATTLIST text:toc-mark text:outline-level %integer; #IMPLIED>
-<!ELEMENT text:user-index-mark-start EMPTY>
-<!ATTLIST text:user-index-mark-start text:id %string; #REQUIRED>
-<!ATTLIST text:user-index-mark-start text:outline-level %integer; #IMPLIED>
-<!ATTLIST text:user-index-mark-start text:index-name %string; #IMPLIED>
-<!ELEMENT text:user-index-mark-end EMPTY>
-<!ATTLIST text:user-index-mark-end text:id %string; #REQUIRED>
-<!ELEMENT text:user-index-mark EMPTY>
-<!ATTLIST text:user-index-mark text:string-value %string; #REQUIRED>
-<!ATTLIST text:user-index-mark text:outline-level %integer; #IMPLIED>
-<!ATTLIST text:user-index-mark text:index-name %string; #IMPLIED>
-<!ELEMENT text:alphabetical-index-mark-start EMPTY>
-<!ATTLIST text:alphabetical-index-mark-start text:id %string; #REQUIRED>
-<!ATTLIST text:alphabetical-index-mark-start text:key1 %string; #IMPLIED>
-<!ATTLIST text:alphabetical-index-mark-start text:key2 %string; #IMPLIED>
-<!ATTLIST text:alphabetical-index-mark-start text:main-etry %boolean; "false">
-<!ELEMENT text:alphabetical-index-mark-end EMPTY>
-<!ATTLIST text:alphabetical-index-mark-end text:id %string; #REQUIRED>
-<!ELEMENT text:alphabetical-index-mark EMPTY>
-<!ATTLIST text:alphabetical-index-mark text:string-value %string; #REQUIRED>
-<!ATTLIST text:alphabetical-index-mark text:key1 %string; #IMPLIED>
-<!ATTLIST text:alphabetical-index-mark text:key2 %string; #IMPLIED>
-<!ATTLIST text:alphabetical-index-mark text:main-etry %boolean; "false">
-<!ELEMENT text:bibliography-configuration (text:sort-key)*>
-<!ATTLIST text:bibliography-configuration text:prefix %string; #IMPLIED>
-<!ATTLIST text:bibliography-configuration text:suffix %string; #IMPLIED>
-<!ATTLIST text:bibliography-configuration text:sort-by-position %boolean; "true">
-<!ATTLIST text:bibliography-configuration text:numbered-entries %boolean; "false">
-<!ATTLIST text:bibliography-configuration fo:language %string; #IMPLIED>
-<!ATTLIST text:bibliography-configuration fo:country %string; #IMPLIED>
-<!ATTLIST text:bibliography-configuration text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:sort-key EMPTY>
-<!ATTLIST text:sort-key text:key ( address | annote | author |
-	bibliography-type | booktitle | chapter | custom1 | custom2 |
-	custom3 | custom4 | custom5 | edition | editor | howpublished |
-	identifier | institution | isbn | journal | month | note | number |
-	organizations | pages | publisher | report-type | school | series |
-	title | url | volume | year ) #REQUIRED>
-<!ATTLIST text:sort-key text:sort-ascending %boolean; "true">
-<!ELEMENT text:linenumbering-configuration (text:linenumbering-separator?)>
-<!ATTLIST text:linenumbering-configuration text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:linenumbering-configuration text:number-lines %boolean; "true">
-<!ATTLIST text:linenumbering-configuration text:count-empty-lines %boolean; "true">
-<!ATTLIST text:linenumbering-configuration text:count-in-floating-frames %boolean; "false">
-<!ATTLIST text:linenumbering-configuration text:restart-numbering %boolean; "false">
-<!ATTLIST text:linenumbering-configuration text:offset %nonNegativeLength; #IMPLIED>
-<!ATTLIST text:linenumbering-configuration style:num-format (1|a|A|i|I) "1">
-<!ATTLIST text:linenumbering-configuration style:num-letter-sync %boolean; "false">
-<!ATTLIST text:linenumbering-configuration text:number-position (left|rigth|inner|outer) "left">
-<!ATTLIST text:linenumbering-configuration text:increment %nonNegativeInteger; #IMPLIED>
-<!ELEMENT text:linenumbering-separator (#PCDATA)>
-<!ATTLIST text:linenumbering-separator text:increment %nonNegativeInteger; #IMPLIED>
-<!ELEMENT text:script (#PCDATA)>
-<!ATTLIST text:script script:language CDATA #REQUIRED>
-<!ATTLIST text:script xlink:href CDATA #IMPLIED>
-<!ATTLIST text:script xlink:type (simple) #FIXED "simple">
-<!ELEMENT text:measure (#PCDATA)>
-<!ATTLIST text:measure text:kind (value|unit|gap) #REQUIRED>
-<!ELEMENT text:ruby (text:ruby-base, text:ruby-text)>
-<!ATTLIST text:ruby text:style-name %styleName; #IMPLIED>
-<!ELEMENT text:ruby-base %inline-text;>
-<!ELEMENT text:ruby-text (#PCDATA)>
-<!ATTLIST text:ruby-text text:style-name %styleName; #IMPLIED>
-<!-- elements for change tracking -->
-<!ELEMENT text:change EMPTY>
-<!ATTLIST text:change text:change-id CDATA #REQUIRED>
-<!ELEMENT text:change-start EMPTY>
-<!ATTLIST text:change-start text:change-id CDATA #REQUIRED>
-<!ELEMENT text:change-end EMPTY>
-<!ATTLIST text:change-end text:change-id CDATA #REQUIRED>
-<!ELEMENT text:tracked-changes (text:changed-region)*>
-<!ATTLIST text:tracked-changes text:track-changes %boolean; "true">
-<!ATTLIST text:tracked-changes text:protection-key CDATA #IMPLIED>
-<!ELEMENT text:changed-region (text:insertion |
-							   (text:deletion, text:insertion?) |
-                               text:format-change) >
-<!ATTLIST text:changed-region text:id ID #REQUIRED>
-<!ATTLIST text:changed-region text:merge-last-paragraph %boolean; "true">
-<!ELEMENT text:insertion (office:change-info, %sectionText;)>
-<!ELEMENT text:deletion (office:change-info, %sectionText;)>
-<!ELEMENT text:format-change (office:change-info)>
diff --git a/chart2/workbench/fileformat/xmlSpyProject.spp b/chart2/workbench/fileformat/xmlSpyProject.spp
index b3e4df86b87c..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/xmlSpyProject.spp
+++ b/chart2/workbench/fileformat/xmlSpyProject.spp
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Project>
-	<Folder FolderName="XML Files" ExtStr="xml;cml;math;mtx;rdf;smil;svg;wml">
-		<File FilePath=".\newchart_test.xml" HomeFolder="Yes"/>
-	</Folder>
-	<Folder FolderName="XSL Files" ExtStr="xsl;xslt"/>
-	<Folder FolderName="HTML Files" ExtStr="html;htm;xhtml;asp"/>
-	<Folder FolderName="DTD/Schemas" ExtStr="dtd;dcd;xdr;biz;xsd">
-		<File FilePath=".\chart2.mod" HomeFolder="Yes"/>
-		<File FilePath=".\office.dtd" HomeFolder="Yes"/>
-	</Folder>
-	<Folder FolderName="Entities" ExtStr="ent"/>
-</Project>
diff --git a/chart2/workbench/officeintegration/install.pl b/chart2/workbench/officeintegration/install.pl
index 8ae93e3f9185..e69de29bb2d1 100644
--- a/chart2/workbench/officeintegration/install.pl
+++ b/chart2/workbench/officeintegration/install.pl
@@ -1,146 +0,0 @@
-:
-eval 'exec perl -S $0 ${1+"$@"}'
-    if 0;
-
-# ------------------------------------------------------------------------------
-# This script installs the new chart-libraries and resources.
-# This is done by symbolic linking rather than copying.  Thus this installation
-# is only necessary once after a fresh office installation.
-#
-# It also registers all types in the types.rdb and all components in the
-# services.rdb.  Finally the TypeDetection.xcu is installed, such that you can
-# invoke the new chart with the URL 'private:factory/chart'
-# ------------------------------------------------------------------------------
-
-# With this package you get better readable variable names
-use English;
-
-# determine automatic project path assuming that this script stayed in its
-# default location
-
-$PRJ_PATH = $0;
-if( $OSNAME eq "MSWin32" ) {
-    chomp( $PRJ_PATH = `cd` );
-    $PRJ_PATH =~ s,^(.*)\\workbench\\?.*$,$1,;
-
-    $SVERSION = "$ENV{UserProfile}\\Application Data\\sversion.ini";
-    $PATHSEP = "\\";
-    $LIBPATTERN = "bin\\*mi*.dll";
-    $COPYCMD = "copy";
-} else {
-    chomp( $PRJ_PATH = `pwd` );
-    $PRJ_PATH = $PWD . "/" . $PRJ_PATH if( $PRJ_PATH !~ m,^/, );
-    $PRJ_PATH =~ s,^(.*)/workbench/?.*$,$1,;
-
-    $SVERSION = "$ENV{HOME}/.sversionrc";
-    $PATHSEP = "/";
-    $LIBPATTERN = "lib/lib*.so";
-    $COPYCMD = "cp";
-}
-
-# determine office path according to .sversionrc. Note: this only looks for a
-# prefix 'StarOffice 8', such that 'StarOffice 8 dbg=...' is still found
-# if no 'StarOffice 8' was found, 'OpenOffice.org 2' is searched for
-
-open( SVERSION, "$SVERSION" ) || die( "couldn't find .sversionrc/sversion.ini\n" );
-while( <SVERSION> )
-{
-    if( m,^StarOffice 8.*=file://(.*)$, )
-    {
-        $OFF_PATH = $1,;
-        if( $OSNAME eq "MSWin32" )
-        {
-            # remove first /
-            $OFF_PATH =~ s/^.//;
-            # replace path separators
-            $OFF_PATH =~ s,/,\\,g;
-        }
-        last;
-    }
-    elsif ( m,^OpenOffice.org 2.*=file://(.*)$, )
-    {
-        $OFF_PATH = $1,;
-        if( $OSNAME eq "MSWin32" )
-        {
-            # remove first /
-            $OFF_PATH =~ s/^.//;
-            # replace path separators
-            $OFF_PATH =~ s,/,\\,g;
-        }
-        last;
-    }
-}
-close SVERSION;
-
-$USER_PATH = "$OFF_PATH${PATHSEP}user";
-
-# ================================================================================
-
-print "Chart2 project is in <$PRJ_PATH>\n";
-print "OpenOffice.org 2.0/StarOffice 8 is installed in <$OFF_PATH>\n";
-print "Are these assumptions correct? [y/n] ";
-if( <STDIN> !~ /^y?$/i )
-{
-    print "Enter project path [$PRJ_PATH]: ";
-    chomp( $path = <STDIN> );
-    $PRJ_PATH = $path if( length( $path ) > 0 );
-
-    print "Enter office path [$OFF_PATH]: ";
-    chomp( $path = <STDIN> );
-    $OFF_PATH = $path if( length( $path ) > 0 );
-}
-
-# ----------------------------------------
-
-$MY_OUTPATH = $ENV{OUTPATH};
-$MY_RESPATH = "common";
-
-$REGCOMMAND = "register";
-#$REGCOMMAND = "revoke";
-
-if( $ENV{PROEXT} ) {
-    $MY_OUTPATH .= $ENV{PROEXT};
-    $MY_RESPATH .= $ENV{PROEXT};
-}
-
-chmod 0664, "$OFF_PATH${PATHSEP}program${PATHSEP}types.rdb";
-print "registering types...\n";
-print `regmerge $OFF_PATH${PATHSEP}program${PATHSEP}types.rdb / $PRJ_PATH${PATHSEP}$MY_OUTPATH${PATHSEP}bin${PATHSEP}chart2.rdb`;
-
-print "installing shlibs and registering services...\n";
-@files = glob( "$PRJ_PATH${PATHSEP}$MY_OUTPATH${PATHSEP}${LIBPATTERN}" );
-foreach $dll (@files)
-{
-    if( $OSNAME eq "MSWin32" ) {
-        print `copy "$dll" "$OFF_PATH\\program"`;
-        $dll =~ s,\\,/,g;
-        $dll =~ m,/([^/]*)$,;
-        $copied_dll = "/$dll";
-    } else {
-        $dll =~ m,/([^/]*)$,;
-        $copied_dll = "$OFF_PATH/program/$1";
-        if( -l "$copied_dll" ) {
-            unlink "$copied_dll";
-        }
-        symlink "$dll", "$copied_dll";
-    }
-    chmod 0664, "$OFF_PATH${PATHSEP}program${PATHSEP}services.rdb";
-    print `regcomp -$REGCOMMAND -r $OFF_PATH${PATHSEP}program${PATHSEP}services.rdb -c file://$copied_dll`;
-    print `regcomp -$REGCOMMAND -r $OFF_PATH${PATHSEP}program${PATHSEP}types.rdb -c file://$copied_dll`;
-}
-
-print "installing resources\n";
-@files = glob( "$PRJ_PATH${PATHSEP}$MY_RESPATH${PATHSEP}bin${PATHSEP}*.res" );
-foreach $res (@files)
-{
-    if( $OSNAME eq "MSWin32" ) {
-        print `copy "$res" "$OFF_PATH\\program\\resource"`;
-    } else {
-        $res =~ m,/([^/]*)$,;
-        $copied_res = "$OFF_PATH/program/resource/$1";
-        if( -l "$copied_dll" ) {
-            unlink "$copied_res";
-        }
-        symlink "$res", "$copied_res";
-    }
-}
diff --git a/chart2/workbench/sampledata/12series.chd b/chart2/workbench/sampledata/12series.chd
index 79d96aec44c4..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/12series.chd
+++ b/chart2/workbench/sampledata/12series.chd
@@ -1,18 +0,0 @@
-# -*- coding: utf-8; -*-
-# Series Labels
-∑_⋙_ℕ⊆ℕ₀_∞_⊛×⊚⊝ वरोदलईरऱिोए локализации 賂浪肋論滑串契 გთხოვთ ☺_♢♥♠♣_♘♙_♪♫ נחםקרמ Antonín_Dvořák ঐঊসৈহৃদ্তৣ_দেআজ্ঞ্ „Öko-Müsli“_für_2_€ ເ້ຣທັ່ກັ້ເ໊ ଐଦ୍ରୃ୭ଅବ୍୍
-# categories
-Glucose Lactose Fructose Süßstoff
-# series
-1 3 5 2
-3 1 6 3
-2 2 4 4
-4 4 5 1
-7 3 3 2
-5 1 2 3
-6 2 3 4
-9 2 2 6
-8 1 2 2
-5 3 1 5
-2 2 3 1
-1 0 6 4
diff --git a/chart2/workbench/sampledata/29series.chd b/chart2/workbench/sampledata/29series.chd
index 34f49c6caea3..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/29series.chd
+++ b/chart2/workbench/sampledata/29series.chd
@@ -1,35 +0,0 @@
-# -*- coding: utf-8; -*-
-# Series Labels
-1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
-# categories
-one two three four five random
-# series
-0.1 0.2 0.43478260869565216 0.58823529411764705 1.7 2.119047619047619
-0.2 0.4 0.8695652173913043 0.11764705882352941 2.3 1.8095238095238095
-0.3 0.6 0.13043478260869565 0.17647058823529413 1.6666666666666667 2.3095238095238093
-0.4 0.8 0.17391304347826086 0.23529411764705882 1.25 1.4047619047619047
-0.5 0.10 0.21739130434782608 0.29411764705882354 1.0 1.6428571428571428
-0.6 0.12 0.2608695652173913 0.35294117647058826 0.8333333333333334 0.21428571428571427
-0.7 0.14 0.30434782608695654 0.4117647058823529 0.7142857142857143 0.8333333333333334
-0.8 0.16 0.34782608695652173 0.47058823529411764 0.625 1.1428571428571428
-0.9 0.18 0.391304347826087 0.5294117647058824 0.5555555555555556 2.2142857142857144
-0.10 0.20 0.43478260869565216 0.5882352941176471 0.5 2.1904761904761907
-0.11 0.22 0.4782608695652174 0.6470588235294118 0.45454545454545453 2.0952380952380953
-0.12 0.24 0.5217391304347826 0.7058823529411765 0.4166666666666667 0.21428571428571427
-0.13 0.26 0.5652173913043478 0.7647058823529411 0.38461538461538464 1.4285714285714286
-0.14 0.28 0.6086956521739131 0.8235294117647058 0.35714285714285715 0.07142857142857143
-0.15 0.30 0.6521739130434783 0.8823529411764706 0.3333333333333333 1.3571428571428572
-0.16 0.32 0.6956521739130435 0.9411764705882353 0.3125 1.5476190476190477
-0.17 0.34 0.7391304347826087 1.0 0.29411764705882354 0.8571428571428571
-0.18 0.36 0.782608695652174 1.0588235294117647 0.2777777777777778 1.880952380952381
-0.19 0.38 0.8260869565217391 1.1176470588235294 0.2631578947368421 1.5
-0.20 0.40 0.8695652173913043 1.1764705882352942 0.25 0.3333333333333333
-0.21 0.42 0.9130434782608695 1.2352941176470589 0.23809523809523808 0.5
-0.22 0.44 0.9565217391304348 1.2941176470588236 0.22727272727272727 0.07142857142857143
-0.23 0.46 1.0 1.3529411764705883 0.21739130434782608 1.0714285714285714
-0.24 0.48 1.0434782608695652 1.411764705882353 0.20833333333333334 0.8095238095238095
-0.25 0.50 1.0869565217391304 1.4705882352941178 0.2 1.9761904761904763
-0.26 0.52 1.1304347826086956 1.5294117647058822 0.19230769230769232 1.0714285714285714
-0.27 0.54 1.173913043478261 1.588235294117647 0.18518518518518517 0.40476190476190477
-0.28 0.56 1.2173913043478262 1.6470588235294117 0.17857142857142858 1.3571428571428572
-0.29 0.58 1.2608695652173914 1.7058823529411764 0.1724137931034483 0.7380952380952381
\ No newline at end of file
diff --git a/chart2/workbench/sampledata/big.chd b/chart2/workbench/sampledata/big.chd
index 0af64972dc4c..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/big.chd
+++ b/chart2/workbench/sampledata/big.chd
@@ -1,14 +0,0 @@
-# Labels
-x sin(x) cos(x)
-
-# Categories
-0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999
-
-# x
-0 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.820000000000001 0.830000000000001 0.840000000000001 0.850000000000001 0.860000000000001 0.870000000000001 0.880000000000001 0.890000000000001 0.900000000000001 0.910000000000001 0.920000000000001 0.930000000000001 0.940000000000001 0.950000000000001 0.960000000000001 0.970000000000001 0.980000000000001 0.990000000000001 1 1.01 1.02 1.03 1.04 1.05 1.06 1.07 1.08 1.09 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19 1.2 1.21 1.22 1.23 1.24 1.25 1.26 1.27 1.28 1.29 1.3 1.31 1.32 1.33 1.34 1.35 1.36 1.37 1.38 1.39 1.4 1.41 1.42 1.43 1.44 1.45 1.46 1.47 1.48 1.49 1.5 1.51 1.52 1.53 1.54 1.55 1.56 1.57 1.58 1.59 1.6 1.61 1.62 1.63 1.64 1.65 1.66 1.67 1.68 1.69 1.7 1.71 1.72 1.73 1.74 1.75 1.76 1.77 1.78 1.79 1.8 1.81 1.82 1.83 1.84 1.85 1.86 1.87 1.88 1.89 1.9 1.91 1.92 1.93 1.94 1.95 1.96 1.97 1.98 1.99 2 2.01 2.02 2.03 2.04 2.05 2.06 2.07 2.08 2.09 2.1 2.11 2.12 2.13 2.14 2.15 2.16 2.17 2.18 2.19 2.2 2.21 2.22 2.23 2.24 2.25 2.26 2.27 2.28 2.29 2.29999999999999 2.30999999999999 2.31999999999999 2.32999999999999 2.33999999999999 2.34999999999999 2.35999999999999 2.36999999999999 2.37999999999999 2.38999999999999 2.39999999999999 2.40999999999999 2.41999999999999 2.42999999999999 2.43999999999999 2.44999999999999 2.45999999999999 2.46999999999999 2.47999999999999 2.48999999999999 2.49999999999999 2.50999999999999 2.51999999999999 2.52999999999999 2.53999999999999 2.54999999999999 2.55999999999999 2.56999999999999 2.57999999999999 2.58999999999999 2.59999999999999 2.60999999999999 2.61999999999999 2.62999999999999 2.63999999999999 2.64999999999999 2.65999999999999 2.66999999999999 2.67999999999999 2.68999999999999 2.69999999999999 2.70999999999999 2.71999999999999 2.72999999999999 2.73999999999999 2.74999999999999 2.75999999999999 2.76999999999998 2.77999999999998 2.78999999999998 2.79999999999998 2.80999999999998 2.81999999999998 2.82999999999998 2.83999999999998 2.84999999999998 2.85999999999998 2.86999999999998 2.87999999999998 2.88999999999998 2.89999999999998 2.90999999999998 2.91999999999998 2.92999999999998 2.93999999999998 2.94999999999998 2.95999999999998 2.96999999999998 2.97999999999998 2.98999999999998 2.99999999999998 3.00999999999998 3.01999999999998 3.02999999999998 3.03999999999998 3.04999999999998 3.05999999999998 3.06999999999998 3.07999999999998 3.08999999999998 3.09999999999998 3.10999999999998 3.11999999999998 3.12999999999998 3.13999999999998 3.14999999999998 3.15999999999998 3.16999999999998 3.17999999999998 3.18999999999998 3.19999999999998 3.20999999999998 3.21999999999998 3.22999999999998 3.23999999999997 3.24999999999997 3.25999999999997 3.26999999999997 3.27999999999997 3.28999999999997 3.29999999999997 3.30999999999997 3.31999999999997 3.32999999999997 3.33999999999997 3.34999999999997 3.35999999999997 3.36999999999997 3.37999999999997 3.38999999999997 3.39999999999997 3.40999999999997 3.41999999999997 3.42999999999997 3.43999999999997 3.44999999999997 3.45999999999997 3.46999999999997 3.47999999999997 3.48999999999997 3.49999999999997 3.50999999999997 3.51999999999997 3.52999999999997 3.53999999999997 3.54999999999997 3.55999999999997 3.56999999999997 3.57999999999997 3.58999999999997 3.59999999999997 3.60999999999997 3.61999999999997 3.62999999999997 3.63999999999997 3.64999999999997 3.65999999999997 3.66999999999997 3.67999999999997 3.68999999999997 3.69999999999997 3.70999999999996 3.71999999999996 3.72999999999996 3.73999999999996 3.74999999999996 3.75999999999996 3.76999999999996 3.77999999999996 3.78999999999996 3.79999999999996 3.80999999999996 3.81999999999996 3.82999999999996 3.83999999999996 3.84999999999996 3.85999999999996 3.86999999999996 3.87999999999996 3.88999999999996 3.89999999999996 3.90999999999996 3.91999999999996 3.92999999999996 3.93999999999996 3.94999999999996 3.95999999999996 3.96999999999996 3.97999999999996 3.98999999999996 3.99999999999996 4.00999999999996 4.01999999999996 4.02999999999996 4.03999999999996 4.04999999999996 4.05999999999996 4.06999999999996 4.07999999999996 4.08999999999996 4.09999999999996 4.10999999999996 4.11999999999996 4.12999999999996 4.13999999999996 4.14999999999996 4.15999999999996 4.16999999999996 4.17999999999996 4.18999999999996 4.19999999999995 4.20999999999995 4.21999999999995 4.22999999999995 4.23999999999995 4.24999999999995 4.25999999999995 4.26999999999995 4.27999999999995 4.28999999999995 4.29999999999995 4.30999999999995 4.31999999999995 4.32999999999995 4.33999999999995 4.34999999999995 4.35999999999995 4.36999999999995 4.37999999999995 4.38999999999995 4.39999999999995 4.40999999999995 4.41999999999995 4.42999999999995 4.43999999999995 4.44999999999995 4.45999999999995 4.46999999999995 4.47999999999995 4.48999999999995 4.49999999999995 4.50999999999995 4.51999999999995 4.52999999999995 4.53999999999995 4.54999999999995 4.55999999999995 4.56999999999995 4.57999999999995 4.58999999999995 4.59999999999995 4.60999999999995 4.61999999999995 4.62999999999995 4.63999999999995 4.64999999999995 4.65999999999995 4.66999999999994 4.67999999999994 4.68999999999994 4.69999999999994 4.70999999999994 4.71999999999994 4.72999999999994 4.73999999999994 4.74999999999994 4.75999999999994 4.76999999999994 4.77999999999994 4.78999999999994 4.79999999999994 4.80999999999994 4.81999999999994 4.82999999999994 4.83999999999994 4.84999999999994 4.85999999999994 4.86999999999994 4.87999999999994 4.88999999999994 4.89999999999994 4.90999999999994 4.91999999999994 4.92999999999994 4.93999999999994 4.94999999999994 4.95999999999994 4.96999999999994 4.97999999999994 4.98999999999994 4.99999999999994 5.00999999999994 5.01999999999994 5.02999999999994 5.03999999999994 5.04999999999994 5.05999999999994 5.06999999999994 5.07999999999994 5.08999999999994 5.09999999999994 5.10999999999994 5.11999999999994 5.12999999999994 5.13999999999993 5.14999999999993 5.15999999999993 5.16999999999993 5.17999999999993 5.18999999999993 5.19999999999993 5.20999999999993 5.21999999999993 5.22999999999993 5.23999999999993 5.24999999999993 5.25999999999993 5.26999999999993 5.27999999999993 5.28999999999993 5.29999999999993 5.30999999999993 5.31999999999993 5.32999999999993 5.33999999999993 5.34999999999993 5.35999999999993 5.36999999999993 5.37999999999993 5.38999999999993 5.39999999999993 5.40999999999993 5.41999999999993 5.42999999999993 5.43999999999993 5.44999999999993 5.45999999999993 5.46999999999993 5.47999999999993 5.48999999999993 5.49999999999993 5.50999999999993 5.51999999999993 5.52999999999993 5.53999999999993 5.54999999999993 5.55999999999993 5.56999999999993 5.57999999999993 5.58999999999993 5.59999999999993 5.60999999999992 5.61999999999992 5.62999999999992 5.63999999999992 5.64999999999992 5.65999999999992 5.66999999999992 5.67999999999992 5.68999999999992 5.69999999999992 5.70999999999992 5.71999999999992 5.72999999999992 5.73999999999992 5.74999999999992 5.75999999999992 5.76999999999992 5.77999999999992 5.78999999999992 5.79999999999992 5.80999999999992 5.81999999999992 5.82999999999992 5.83999999999992 5.84999999999992 5.85999999999992 5.86999999999992 5.87999999999992 5.88999999999992 5.89999999999992 5.90999999999992 5.91999999999992 5.92999999999992 5.93999999999992 5.94999999999992 5.95999999999992 5.96999999999992 5.97999999999992 5.98999999999992 5.99999999999992 6.00999999999992 6.01999999999992 6.02999999999992 6.03999999999992 6.04999999999992 6.05999999999992 6.06999999999992 6.07999999999991 6.08999999999991 6.09999999999991 6.10999999999991 6.11999999999991 6.12999999999991 6.13999999999991 6.14999999999991 6.15999999999991 6.16999999999991 6.17999999999991 6.18999999999991 6.19999999999991 6.20999999999991 6.21999999999991 6.22999999999991 6.23999999999991 6.24999999999991 6.25999999999991 6.26999999999991 6.27999999999991 6.28999999999991 6.29999999999991 6.30999999999991 6.31999999999991 6.32999999999991 6.33999999999991 6.34999999999991 6.35999999999991 6.36999999999991 6.37999999999991 6.38999999999991 6.39999999999991 6.40999999999991 6.41999999999991 6.42999999999991 6.43999999999991 6.44999999999991 6.45999999999991 6.46999999999991 6.47999999999991 6.48999999999991 6.49999999999991 6.50999999999991 6.51999999999991 6.52999999999991 6.53999999999991 6.5499999999999 6.5599999999999 6.5699999999999 6.5799999999999 6.5899999999999 6.5999999999999 6.6099999999999 6.6199999999999 6.6299999999999 6.6399999999999 6.6499999999999 6.6599999999999 6.6699999999999 6.6799999999999 6.6899999999999 6.6999999999999 6.7099999999999 6.7199999999999 6.7299999999999 6.7399999999999 6.7499999999999 6.7599999999999 6.7699999999999 6.7799999999999 6.7899999999999 6.7999999999999 6.8099999999999 6.8199999999999 6.8299999999999 6.8399999999999 6.8499999999999 6.8599999999999 6.8699999999999 6.8799999999999 6.8899999999999 6.8999999999999 6.9099999999999 6.9199999999999 6.9299999999999 6.9399999999999 6.9499999999999 6.9599999999999 6.9699999999999 6.9799999999999 6.9899999999999 6.9999999999999 7.00999999999989 7.01999999999989 7.02999999999989 7.03999999999989 7.04999999999989 7.05999999999989 7.06999999999989 7.07999999999989 7.08999999999989 7.09999999999989 7.10999999999989 7.11999999999989 7.12999999999989 7.13999999999989 7.14999999999989 7.15999999999989 7.16999999999989 7.17999999999989 7.18999999999989 7.19999999999989 7.20999999999989 7.21999999999989 7.22999999999989 7.23999999999989 7.24999999999989 7.25999999999989 7.26999999999989 7.27999999999989 7.28999999999989 7.29999999999989 7.30999999999989 7.31999999999989 7.32999999999989 7.33999999999989 7.34999999999989 7.35999999999989 7.36999999999989 7.37999999999989 7.38999999999989 7.39999999999989 7.40999999999989 7.41999999999989 7.42999999999989 7.43999999999989 7.44999999999989 7.45999999999989 7.46999999999989 7.47999999999988 7.48999999999988 7.49999999999988 7.50999999999988 7.51999999999988 7.52999999999988 7.53999999999988 7.54999999999988 7.55999999999988 7.56999999999988 7.57999999999988 7.58999999999988 7.59999999999988 7.60999999999988 7.61999999999988 7.62999999999988 7.63999999999988 7.64999999999988 7.65999999999988 7.66999999999988 7.67999999999988 7.68999999999988 7.69999999999988 7.70999999999988 7.71999999999988 7.72999999999988 7.73999999999988 7.74999999999988 7.75999999999988 7.76999999999988 7.77999999999988 7.78999999999988 7.79999999999988 7.80999999999988 7.81999999999988 7.82999999999988 7.83999999999988 7.84999999999988 7.85999999999988 7.86999999999988 7.87999999999988 7.88999999999988 7.89999999999988 7.90999999999988 7.91999999999988 7.92999999999988 7.93999999999988 7.94999999999987 7.95999999999987 7.96999999999987 7.97999999999987 7.98999999999987 7.99999999999987 8.00999999999987 8.01999999999987 8.02999999999987 8.03999999999987 8.04999999999987 8.05999999999987 8.06999999999987 8.07999999999987 8.08999999999987 8.09999999999987 8.10999999999987 8.11999999999987 8.12999999999987 8.13999999999987 8.14999999999987 8.15999999999987 8.16999999999987 8.17999999999987 8.18999999999987 8.19999999999987 8.20999999999987 8.21999999999987 8.22999999999987 8.23999999999987 8.24999999999987 8.25999999999987 8.26999999999987 8.27999999999987 8.28999999999987 8.29999999999987 8.30999999999987 8.31999999999987 8.32999999999987 8.33999999999987 8.34999999999987 8.35999999999987 8.36999999999987 8.37999999999987 8.38999999999987 8.39999999999987 8.40999999999987 8.41999999999986 8.42999999999986 8.43999999999986 8.44999999999986 8.45999999999986 8.46999999999986 8.47999999999986 8.48999999999986 8.49999999999986 8.50999999999986 8.51999999999986 8.52999999999986 8.53999999999986 8.54999999999986 8.55999999999986 8.56999999999986 8.57999999999986 8.58999999999986 8.59999999999986 8.60999999999986 8.61999999999986 8.62999999999986 8.63999999999986 8.64999999999986 8.65999999999986 8.66999999999986 8.67999999999986 8.68999999999986 8.69999999999986 8.70999999999986 8.71999999999986 8.72999999999986 8.73999999999986 8.74999999999986 8.75999999999986 8.76999999999986 8.77999999999986 8.78999999999986 8.79999999999986 8.80999999999986 8.81999999999986 8.82999999999986 8.83999999999986 8.84999999999986 8.85999999999986 8.86999999999986 8.87999999999986 8.88999999999985 8.89999999999985 8.90999999999985 8.91999999999985 8.92999999999985 8.93999999999985 8.94999999999985 8.95999999999985 8.96999999999985 8.97999999999985 8.98999999999985 8.99999999999985 9.00999999999985 9.01999999999985 9.02999999999985 9.03999999999985 9.04999999999985 9.05999999999985 9.06999999999985 9.07999999999985 9.08999999999985 9.09999999999985 9.10999999999985 9.11999999999985 9.12999999999985 9.13999999999985 9.14999999999985 9.15999999999985 9.16999999999985 9.17999999999985 9.18999999999985 9.19999999999985 9.20999999999985 9.21999999999985 9.22999999999985 9.23999999999985 9.24999999999985 9.25999999999985 9.26999999999985 9.27999999999985 9.28999999999985 9.29999999999985 9.30999999999985 9.31999999999985 9.32999999999985 9.33999999999985 9.34999999999985 9.35999999999984 9.36999999999984 9.37999999999984 9.38999999999984 9.39999999999984 9.40999999999984 9.41999999999984 9.42999999999984 9.43999999999984 9.44999999999984 9.45999999999984 9.46999999999984 9.47999999999984 9.48999999999984 9.49999999999984 9.50999999999984 9.51999999999984 9.52999999999984 9.53999999999984 9.54999999999984 9.55999999999984 9.56999999999984 9.57999999999984 9.58999999999984 9.59999999999984 9.60999999999984 9.61999999999984 9.62999999999984 9.63999999999984 9.64999999999984 9.65999999999984 9.66999999999984 9.67999999999984 9.68999999999984 9.69999999999984 9.70999999999984 9.71999999999984 9.72999999999984 9.73999999999984 9.74999999999984 9.75999999999984 9.76999999999984 9.77999999999984 9.78999999999984 9.79999999999984 9.80999999999984 9.81999999999984 9.82999999999983 9.83999999999983 9.84999999999983 9.85999999999983 9.86999999999983 9.87999999999983 9.88999999999983 9.89999999999983 9.90999999999983 9.91999999999983 9.92999999999983 9.93999999999983 9.94999999999983 9.95999999999983 9.96999999999983 9.97999999999983 9.98999999999983 9.99999999999983 10.0099999999998 10.0199999999998 10.0299999999998 10.0399999999998 10.0499999999998 10.0599999999998 10.0699999999998 10.0799999999998 10.0899999999998 10.0999999999998 10.1099999999998 10.1199999999998 10.1299999999998 10.1399999999998 10.1499999999998 10.1599999999998 10.1699999999998 10.1799999999998 10.1899999999998 10.1999999999998 10.2099999999998 10.2199999999998 10.2299999999998 10.2399999999998 10.2499999999998 10.2599999999998 10.2699999999998 10.2799999999998 10.2899999999998 10.2999999999998 10.3099999999998 10.3199999999998 10.3299999999998 10.3399999999998 10.3499999999998 10.3599999999998 10.3699999999998 10.3799999999998 10.3899999999998 10.3999999999998 10.4099999999998 10.4199999999998 10.4299999999998 10.4399999999998 10.4499999999998 10.4599999999998 10.4699999999998 10.4799999999998 10.4899999999998 10.4999999999998 10.5099999999998 10.5199999999998 10.5299999999998 10.5399999999998 10.5499999999998 10.5599999999998 10.5699999999998 10.5799999999998 10.5899999999998 10.5999999999998 10.6099999999998 10.6199999999998 10.6299999999998 10.6399999999998 10.6499999999998 10.6599999999998 10.6699999999998 10.6799999999998 10.6899999999998 10.6999999999998 10.7099999999998 10.7199999999998 10.7299999999998 10.7399999999998 10.7499999999998 10.7599999999998 10.7699999999998 10.7799999999998 10.7899999999998 10.7999999999998 10.8099999999998 10.8199999999998 10.8299999999998 10.8399999999998 10.8499999999998 10.8599999999998 10.8699999999998 10.8799999999998 10.8899999999998 10.8999999999998 10.9099999999998 10.9199999999998 10.9299999999998 10.9399999999998 10.9499999999998 10.9599999999998 10.9699999999998 10.9799999999998 10.9899999999998 10.9999999999998 11.0099999999998 11.0199999999998 11.0299999999998 11.0399999999998 11.0499999999998 11.0599999999998 11.0699999999998 11.0799999999998 11.0899999999998 11.0999999999998 11.1099999999998 11.1199999999998 11.1299999999998 11.1399999999998 11.1499999999998 11.1599999999998 11.1699999999998 11.1799999999998 11.1899999999998 11.1999999999998 11.2099999999998 11.2199999999998 11.2299999999998 11.2399999999998 11.2499999999998 11.2599999999998 11.2699999999998 11.2799999999998 11.2899999999998 11.2999999999998 11.3099999999998 11.3199999999998 11.3299999999998 11.3399999999998 11.3499999999998 11.3599999999998 11.3699999999998 11.3799999999998 11.3899999999998 11.3999999999998 11.4099999999998 11.4199999999998 11.4299999999998 11.4399999999998 11.4499999999998 11.4599999999998 11.4699999999998 11.4799999999998 11.4899999999998 11.4999999999998 11.5099999999998 11.5199999999998 11.5299999999998 11.5399999999998 11.5499999999998 11.5599999999998 11.5699999999998 11.5799999999998 11.5899999999998 11.5999999999998 11.6099999999998 11.6199999999998 11.6299999999998 11.6399999999998 11.6499999999998 11.6599999999998 11.6699999999998 11.6799999999998 11.6899999999998 11.6999999999998 11.7099999999998 11.7199999999998 11.7299999999998 11.7399999999998 11.7499999999998 11.7599999999998 11.7699999999998 11.7799999999998 11.7899999999998 11.7999999999998 11.8099999999998 11.8199999999998 11.8299999999998 11.8399999999998 11.8499999999998 11.8599999999998 11.8699999999998 11.8799999999998 11.8899999999998 11.8999999999998 11.9099999999998 11.9199999999998 11.9299999999998 11.9399999999998 11.9499999999998 11.9599999999998 11.9699999999998 11.9799999999998 11.9899999999998 11.9999999999998 12.0099999999998 12.0199999999998 12.0299999999998 12.0399999999998 12.0499999999998 12.0599999999998 12.0699999999998 12.0799999999998 12.0899999999998 12.0999999999998 12.1099999999998 12.1199999999998 12.1299999999998 12.1399999999998 12.1499999999998 12.1599999999998 12.1699999999998 12.1799999999998 12.1899999999998 12.1999999999998 12.2099999999998 12.2199999999998 12.2299999999998 12.2399999999998 12.2499999999998 12.2599999999998 12.2699999999998 12.2799999999998 12.2899999999998 12.2999999999998 12.3099999999998 12.3199999999998 12.3299999999998 12.3399999999998 12.3499999999998 12.3599999999998 12.3699999999998 12.3799999999998 12.3899999999998 12.3999999999998 12.4099999999998 12.4199999999998 12.4299999999998 12.4399999999998 12.4499999999998 12.4599999999998 12.4699999999998 12.4799999999998 12.4899999999998 12.4999999999998 12.5099999999998 12.5199999999998 12.5299999999998 12.5399999999998 12.5499999999998 12.5599999999998 12.5699999999998 12.5799999999998 12.5899999999998 12.5999999999998 12.6099999999998 12.6199999999998 12.6299999999998 12.6399999999998 12.6499999999998 12.6599999999998 12.6699999999998 12.6799999999998 12.6899999999998 12.6999999999998 12.7099999999998 12.7199999999998 12.7299999999998 12.7399999999998 12.7499999999998 12.7599999999998 12.7699999999998 12.7799999999998 12.7899999999998 12.7999999999998 12.8099999999998 12.8199999999998 12.8299999999998 12.8399999999998 12.8499999999998 12.8599999999998 12.8699999999998 12.8799999999998 12.8899999999998 12.8999999999998 12.9099999999998 12.9199999999998 12.9299999999998 12.9399999999998 12.9499999999998 12.9599999999998 12.9699999999998 12.9799999999998 12.9899999999998 12.9999999999998 13.0099999999998 13.0199999999998 13.0299999999998 13.0399999999998 13.0499999999998 13.0599999999998 13.0699999999998 13.0799999999998 13.0899999999998 13.0999999999998 13.1099999999998 13.1199999999998 13.1299999999998 13.1399999999998 13.1499999999998 13.1599999999998 13.1699999999998 13.1799999999998 13.1899999999998 13.1999999999998 13.2099999999998 13.2199999999998 13.2299999999998 13.2399999999998 13.2499999999998 13.2599999999998 13.2699999999998 13.2799999999998 13.2899999999998 13.2999999999998 13.3099999999998 13.3199999999998 13.3299999999998 13.3399999999998 13.3499999999998 13.3599999999998 13.3699999999998 13.3799999999998 13.3899999999998 13.3999999999998 13.4099999999998 13.4199999999998 13.4299999999998 13.4399999999998 13.4499999999998 13.4599999999998 13.4699999999998 13.4799999999998 13.4899999999998 13.4999999999998 13.5099999999998 13.5199999999998 13.5299999999998 13.5399999999998 13.5499999999998 13.5599999999998 13.5699999999998 13.5799999999998 13.5899999999998 13.5999999999998 13.6099999999998 13.6199999999998 13.6299999999998 13.6399999999998 13.6499999999998 13.6599999999998 13.6699999999998 13.6799999999998 13.6899999999998 13.6999999999998 13.7099999999998 13.7199999999998 13.7299999999998 13.7399999999998 13.7499999999998 13.7599999999998 13.7699999999998 13.7799999999998 13.7899999999998 13.7999999999998 13.8099999999998 13.8199999999997 13.8299999999997 13.8399999999997 13.8499999999997 13.8599999999997 13.8699999999997 13.8799999999997 13.8899999999997 13.8999999999997 13.9099999999997 13.9199999999997 13.9299999999997 13.9399999999997 13.9499999999997 13.9599999999997 13.9699999999997 13.9799999999997 13.9899999999997 13.9999999999997 14.0099999999997 14.0199999999997 14.0299999999997 14.0399999999997 14.0499999999997 14.0599999999997 14.0699999999997 14.0799999999997 14.0899999999997 14.0999999999997 14.1099999999997 14.1199999999997 14.1299999999997 14.1399999999997 14.1499999999997 14.1599999999997 14.1699999999997 14.1799999999997 14.1899999999997 14.1999999999997 14.2099999999997 14.2199999999997 14.2299999999997 14.2399999999997 14.2499999999997 14.2599999999997 14.2699999999997 14.2799999999997 14.2899999999997 14.2999999999997 14.3099999999997 14.3199999999997 14.3299999999997 14.3399999999997 14.3499999999997 14.3599999999997 14.3699999999997 14.3799999999997 14.3899999999997 14.3999999999997 14.4099999999997 14.4199999999997 14.4299999999997 14.4399999999997 14.4499999999997 14.4599999999997 14.4699999999997 14.4799999999997 14.4899999999997 14.4999999999997 14.5099999999997 14.5199999999997 14.5299999999997 14.5399999999997 14.5499999999997 14.5599999999997 14.5699999999997 14.5799999999997 14.5899999999997 14.5999999999997 14.6099999999997 14.6199999999997 14.6299999999997 14.6399999999997 14.6499999999997 14.6599999999997 14.6699999999997 14.6799999999997 14.6899999999997 14.6999999999997 14.7099999999997 14.7199999999997 14.7299999999997 14.7399999999997 14.7499999999997 14.7599999999997 14.7699999999997 14.7799999999997 14.7899999999997 14.7999999999997 14.8099999999997 14.8199999999997 14.8299999999997 14.8399999999997 14.8499999999997 14.8599999999997 14.8699999999997 14.8799999999997 14.8899999999997 14.8999999999997 14.9099999999997 14.9199999999997 14.9299999999997 14.9399999999997 14.9499999999997 14.9599999999997 14.9699999999997 14.9799999999997 14.9899999999997 14.9999999999997 15.0099999999997 15.0199999999997 15.0299999999997 15.0399999999997 15.0499999999997 15.0599999999997 15.0699999999997 15.0799999999997 15.0899999999997 15.0999999999997 15.1099999999997 15.1199999999997 15.1299999999997 15.1399999999997 15.1499999999997 15.1599999999997 15.1699999999997 15.1799999999997 15.1899999999997 15.1999999999997 15.2099999999997 15.2199999999997 15.2299999999997 15.2399999999997 15.2499999999997 15.2599999999997 15.2699999999997 15.2799999999997 15.2899999999997 15.2999999999997 15.3099999999997 15.3199999999997 15.3299999999997 15.3399999999997 15.3499999999997 15.3599999999997 15.3699999999997 15.3799999999997 15.3899999999997 15.3999999999997 15.4099999999997 15.4199999999997 15.4299999999997 15.4399999999997 15.4499999999997 15.4599999999997 15.4699999999997 15.4799999999997 15.4899999999997 15.4999999999997 15.5099999999997 15.5199999999997 15.5299999999997 15.5399999999997 15.5499999999997 15.5599999999997 15.5699999999997 15.5799999999997 15.5899999999997 15.5999999999997 15.6099999999997 15.6199999999997 15.6299999999997 15.6399999999997 15.6499999999997 15.6599999999997 15.6699999999997 15.6799999999997 15.6899999999997 15.6999999999997 15.7099999999997 15.7199999999997 15.7299999999997 15.7399999999997 15.7499999999997 15.7599999999997 15.7699999999997 15.7799999999997 15.7899999999997 15.7999999999997 15.8099999999997 15.8199999999997 15.8299999999997 15.8399999999997 15.8499999999997 15.8599999999997 15.8699999999997 15.8799999999997 15.8899999999997 15.8999999999997 15.9099999999997 15.9199999999997 15.9299999999997 15.9399999999997 15.9499999999997 15.9599999999997 15.9699999999997 15.9799999999997 15.9899999999997 15.9999999999997 16.0099999999997 16.0199999999997 16.0299999999997 16.0399999999997 16.0499999999997 16.0599999999997 16.0699999999997 16.0799999999997 16.0899999999997 16.0999999999997 16.1099999999997 16.1199999999997 16.1299999999997 16.1399999999997 16.1499999999997 16.1599999999997 16.1699999999997 16.1799999999997 16.1899999999997 16.1999999999997 16.2099999999997 16.2199999999997 16.2299999999997 16.2399999999997 16.2499999999997 16.2599999999997 16.2699999999997 16.2799999999997 16.2899999999997 16.2999999999997 16.3099999999998 16.3199999999998 16.3299999999998 16.3399999999998 16.3499999999998 16.3599999999998 16.3699999999998 16.3799999999998 16.3899999999998 16.3999999999998 16.4099999999998 16.4199999999998 16.4299999999998 16.4399999999998 16.4499999999998 16.4599999999998 16.4699999999998 16.4799999999998 16.4899999999998 16.4999999999998 16.5099999999998 16.5199999999998 16.5299999999998 16.5399999999998 16.5499999999998 16.5599999999998 16.5699999999998 16.5799999999998 16.5899999999998 16.5999999999998 16.6099999999998 16.6199999999998 16.6299999999998 16.6399999999998 16.6499999999998 16.6599999999998 16.6699999999998 16.6799999999998 16.6899999999998 16.6999999999998 16.7099999999998 16.7199999999998 16.7299999999998 16.7399999999998 16.7499999999998 16.7599999999998 16.7699999999998 16.7799999999998 16.7899999999998 16.7999999999998 16.8099999999998 16.8199999999998 16.8299999999998 16.8399999999998 16.8499999999998 16.8599999999998 16.8699999999998 16.8799999999998 16.8899999999998 16.8999999999998 16.9099999999998 16.9199999999998 16.9299999999998 16.9399999999998 16.9499999999999 16.9599999999999 16.9699999999999 16.9799999999999 16.9899999999999 16.9999999999999 17.0099999999999 17.0199999999999 17.0299999999999 17.0399999999999 17.0499999999999 17.0599999999999 17.0699999999999 17.0799999999999 17.0899999999999 17.0999999999999 17.1099999999999 17.1199999999999 17.1299999999999 17.1399999999999 17.1499999999999 17.1599999999999 17.1699999999999 17.1799999999999 17.1899999999999 17.1999999999999 17.2099999999999 17.2199999999999 17.2299999999999 17.2399999999999 17.2499999999999 17.2599999999999 17.2699999999999 17.2799999999999 17.2899999999999 17.2999999999999 17.3099999999999 17.3199999999999 17.3299999999999 17.3399999999999 17.3499999999999 17.3599999999999 17.3699999999999 17.3799999999999 17.3899999999999 17.3999999999999 17.4099999999999 17.4199999999999 17.4299999999999 17.4399999999999 17.4499999999999 17.4599999999999 17.4699999999999 17.4799999999999 17.4899999999999 17.4999999999999 17.5099999999999 17.5199999999999 17.5299999999999 17.5399999999999 17.5499999999999 17.5599999999999 17.5699999999999 17.5799999999999 17.59 17.6 17.61 17.62 17.63 17.64 17.65 17.66 17.67 17.68 17.69 17.7 17.71 17.72 17.73 17.74 17.75 17.76 17.77 17.78 17.79 17.8 17.81 17.82 17.83 17.84 17.85 17.86 17.87 17.88 17.89 17.9 17.91 17.92 17.93 17.94 17.95 17.96 17.97 17.98 17.99 18 18.01 18.02 18.03 18.04 18.05 18.06 18.07 18.08 18.09 18.1 18.11 18.12 18.13 18.14 18.15 18.16 18.17 18.18 18.19 18.2 18.21 18.22 18.2300000000001 18.2400000000001 18.2500000000001 18.2600000000001 18.2700000000001 18.2800000000001 18.2900000000001 18.3000000000001 18.3100000000001 18.3200000000001 18.3300000000001 18.3400000000001 18.3500000000001 18.3600000000001 18.3700000000001 18.3800000000001 18.3900000000001 18.4000000000001 18.4100000000001 18.4200000000001 18.4300000000001 18.4400000000001 18.4500000000001 18.4600000000001 18.4700000000001 18.4800000000001 18.4900000000001 18.5000000000001 18.5100000000001 18.5200000000001 18.5300000000001 18.5400000000001 18.5500000000001 18.5600000000001 18.5700000000001 18.5800000000001 18.5900000000001 18.6000000000001 18.6100000000001 18.6200000000001 18.6300000000001 18.6400000000001 18.6500000000001 18.6600000000001 18.6700000000001 18.6800000000001 18.6900000000001 18.7000000000001 18.7100000000001 18.7200000000001 18.7300000000001 18.7400000000001 18.7500000000001 18.7600000000001 18.7700000000001 18.7800000000001 18.7900000000001 18.8000000000001 18.8100000000001 18.8200000000001 18.8300000000001 18.8400000000001 18.8500000000001 18.8600000000001 18.8700000000002 18.8800000000002 18.8900000000002 18.9000000000002 18.9100000000002 18.9200000000002 18.9300000000002 18.9400000000002 18.9500000000002 18.9600000000002 18.9700000000002 18.9800000000002 18.9900000000002 19.0000000000002 19.0100000000002 19.0200000000002 19.0300000000002 19.0400000000002 19.0500000000002 19.0600000000002 19.0700000000002 19.0800000000002 19.0900000000002 19.1000000000002 19.1100000000002 19.1200000000002 19.1300000000002 19.1400000000002 19.1500000000002 19.1600000000002 19.1700000000002 19.1800000000002 19.1900000000002 19.2000000000002 19.2100000000002 19.2200000000002 19.2300000000002 19.2400000000002 19.2500000000002 19.2600000000002 19.2700000000002 19.2800000000002 19.2900000000002 19.3000000000002 19.3100000000002 19.3200000000002 19.3300000000002 19.3400000000002 19.3500000000002 19.3600000000002 19.3700000000002 19.3800000000002 19.3900000000002 19.4000000000002 19.4100000000002 19.4200000000002 19.4300000000002 19.4400000000002 19.4500000000002 19.4600000000002 19.4700000000002 19.4800000000002 19.4900000000002 19.5000000000002 19.5100000000003 19.5200000000003 19.5300000000003 19.5400000000003 19.5500000000003 19.5600000000003 19.5700000000003 19.5800000000003 19.5900000000003 19.6000000000003 19.6100000000003 19.6200000000003 19.6300000000003 19.6400000000003 19.6500000000003 19.6600000000003 19.6700000000003 19.6800000000003 19.6900000000003 19.7000000000003 19.7100000000003 19.7200000000003 19.7300000000003 19.7400000000003 19.7500000000003 19.7600000000003 19.7700000000003 19.7800000000003 19.7900000000003 19.8000000000003 19.8100000000003 19.8200000000003 19.8300000000003 19.8400000000003 19.8500000000003 19.8600000000003 19.8700000000003 19.8800000000003 19.8900000000003 19.9000000000003 19.9100000000003 19.9200000000003 19.9300000000003 19.9400000000003 19.9500000000003 19.9600000000003 19.9700000000003 19.9800000000003 19.9900000000003 20.0000000000003 20.0100000000003 20.0200000000003 20.0300000000003 20.0400000000003 20.0500000000003 20.0600000000003 20.0700000000003 20.0800000000003 20.0900000000003 20.1000000000003 20.1100000000003 20.1200000000003 20.1300000000003 20.1400000000003 20.1500000000004 20.1600000000004 20.1700000000004 20.1800000000004 20.1900000000004 20.2000000000004 20.2100000000004 20.2200000000004 20.2300000000004 20.2400000000004 20.2500000000004 20.2600000000004 20.2700000000004 20.2800000000004 20.2900000000004 20.3000000000004 20.3100000000004 20.3200000000004 20.3300000000004 20.3400000000004 20.3500000000004 20.3600000000004 20.3700000000004 20.3800000000004 20.3900000000004 20.4000000000004 20.4100000000004 20.4200000000004 20.4300000000004 20.4400000000004 20.4500000000004 20.4600000000004 20.4700000000004 20.4800000000004 20.4900000000004 20.5000000000004 20.5100000000004 20.5200000000004 20.5300000000004 20.5400000000004 20.5500000000004 20.5600000000004 20.5700000000004 20.5800000000004 20.5900000000004 20.6000000000004 20.6100000000004 20.6200000000004 20.6300000000004 20.6400000000004 20.6500000000004 20.6600000000004 20.6700000000004 20.6800000000004 20.6900000000004 20.7000000000004 20.7100000000004 20.7200000000004 20.7300000000004 20.7400000000004 20.7500000000004 20.7600000000004 20.7700000000004 20.7800000000004 20.7900000000005 20.8000000000005 20.8100000000005 20.8200000000005 20.8300000000005 20.8400000000005 20.8500000000005 20.8600000000005 20.8700000000005 20.8800000000005 20.8900000000005 20.9000000000005 20.9100000000005 20.9200000000005 20.9300000000005 20.9400000000005 20.9500000000005 20.9600000000005 20.9700000000005 20.9800000000005 20.9900000000005 21.0000000000005 21.0100000000005 21.0200000000005 21.0300000000005 21.0400000000005 21.0500000000005 21.0600000000005 21.0700000000005 21.0800000000005 21.0900000000005 21.1000000000005 21.1100000000005 21.1200000000005 21.1300000000005 21.1400000000005 21.1500000000005 21.1600000000005 21.1700000000005 21.1800000000005 21.1900000000005 21.2000000000005 21.2100000000005 21.2200000000005 21.2300000000005 21.2400000000005 21.2500000000005 21.2600000000005 21.2700000000005 21.2800000000005 21.2900000000005 21.3000000000005 21.3100000000005 21.3200000000005 21.3300000000005 21.3400000000005 21.3500000000005 21.3600000000005 21.3700000000005 21.3800000000005 21.3900000000005 21.4000000000005 21.4100000000005 21.4200000000005 21.4300000000006 21.4400000000006 21.4500000000006 21.4600000000006 21.4700000000006 21.4800000000006 21.4900000000006 21.5000000000006 21.5100000000006 21.5200000000006 21.5300000000006 21.5400000000006 21.5500000000006 21.5600000000006 21.5700000000006 21.5800000000006 21.5900000000006 21.6000000000006 21.6100000000006 21.6200000000006 21.6300000000006 21.6400000000006 21.6500000000006 21.6600000000006 21.6700000000006 21.6800000000006 21.6900000000006 21.7000000000006 21.7100000000006 21.7200000000006 21.7300000000006 21.7400000000006 21.7500000000006 21.7600000000006 21.7700000000006 21.7800000000006 21.7900000000006 21.8000000000006 21.8100000000006 21.8200000000006 21.8300000000006 21.8400000000006 21.8500000000006 21.8600000000006 21.8700000000006 21.8800000000006 21.8900000000006 21.9000000000006 21.9100000000006 21.9200000000006 21.9300000000006 21.9400000000006 21.9500000000006 21.9600000000006 21.9700000000006 21.9800000000006 21.9900000000006 22.0000000000006 22.0100000000006 22.0200000000006 22.0300000000006 22.0400000000006 22.0500000000006 22.0600000000006 22.0700000000007 22.0800000000007 22.0900000000007 22.1000000000007 22.1100000000007 22.1200000000007 22.1300000000007 22.1400000000007 22.1500000000007 22.1600000000007 22.1700000000007 22.1800000000007 22.1900000000007 22.2000000000007 22.2100000000007 22.2200000000007 22.2300000000007 22.2400000000007 22.2500000000007 22.2600000000007 22.2700000000007 22.2800000000007 22.2900000000007 22.3000000000007 22.3100000000007 22.3200000000007 22.3300000000007 22.3400000000007 22.3500000000007 22.3600000000007 22.3700000000007 22.3800000000007 22.3900000000007 22.4000000000007 22.4100000000007 22.4200000000007 22.4300000000007 22.4400000000007 22.4500000000007 22.4600000000007 22.4700000000007 22.4800000000007 22.4900000000007 22.5000000000007 22.5100000000007 22.5200000000007 22.5300000000007 22.5400000000007 22.5500000000007 22.5600000000007 22.5700000000007 22.5800000000007 22.5900000000007 22.6000000000007 22.6100000000007 22.6200000000007 22.6300000000007 22.6400000000007 22.6500000000007 22.6600000000007 22.6700000000007 22.6800000000007 22.6900000000007 22.7000000000007 22.7100000000008 22.7200000000008 22.7300000000008 22.7400000000008 22.7500000000008 22.7600000000008 22.7700000000008 22.7800000000008 22.7900000000008 22.8000000000008 22.8100000000008 22.8200000000008 22.8300000000008 22.8400000000008 22.8500000000008 22.8600000000008 22.8700000000008 22.8800000000008 22.8900000000008 22.9000000000008 22.9100000000008 22.9200000000008 22.9300000000008 22.9400000000008 22.9500000000008 22.9600000000008 22.9700000000008 22.9800000000008 22.9900000000008 23.0000000000008 23.0100000000008 23.0200000000008 23.0300000000008 23.0400000000008 23.0500000000008 23.0600000000008 23.0700000000008 23.0800000000008 23.0900000000008 23.1000000000008 23.1100000000008 23.1200000000008 23.1300000000008 23.1400000000008 23.1500000000008 23.1600000000008 23.1700000000008 23.1800000000008 23.1900000000008 23.2000000000008 23.2100000000008 23.2200000000008 23.2300000000008 23.2400000000008 23.2500000000008 23.2600000000008 23.2700000000008 23.2800000000008 23.2900000000008 23.3000000000008 23.3100000000008 23.3200000000008 23.3300000000008 23.3400000000008 23.3500000000009 23.3600000000009 23.3700000000009 23.3800000000009 23.3900000000009 23.4000000000009 23.4100000000009 23.4200000000009 23.4300000000009 23.4400000000009 23.4500000000009 23.4600000000009 23.4700000000009 23.4800000000009 23.4900000000009 23.5000000000009 23.5100000000009 23.5200000000009 23.5300000000009 23.5400000000009 23.5500000000009 23.5600000000009 23.5700000000009 23.5800000000009 23.5900000000009 23.6000000000009 23.6100000000009 23.6200000000009 23.6300000000009 23.6400000000009 23.6500000000009 23.6600000000009 23.6700000000009 23.6800000000009 23.6900000000009 23.7000000000009 23.7100000000009 23.7200000000009 23.7300000000009 23.7400000000009 23.7500000000009 23.7600000000009 23.7700000000009 23.7800000000009 23.7900000000009 23.8000000000009 23.8100000000009 23.8200000000009 23.8300000000009 23.8400000000009 23.8500000000009 23.8600000000009 23.8700000000009 23.8800000000009 23.8900000000009 23.9000000000009 23.9100000000009 23.9200000000009 23.9300000000009 23.9400000000009 23.9500000000009 23.9600000000009 23.9700000000009 23.9800000000009 23.990000000001 24.000000000001 24.010000000001 24.020000000001 24.030000000001 24.040000000001 24.050000000001 24.060000000001 24.070000000001 24.080000000001 24.090000000001 24.100000000001 24.110000000001 24.120000000001 24.130000000001 24.140000000001 24.150000000001 24.160000000001 24.170000000001 24.180000000001 24.190000000001 24.200000000001 24.210000000001 24.220000000001 24.230000000001 24.240000000001 24.250000000001 24.260000000001 24.270000000001 24.280000000001 24.290000000001 24.300000000001 24.310000000001 24.320000000001 24.330000000001 24.340000000001 24.350000000001 24.360000000001 24.370000000001 24.380000000001 24.390000000001 24.400000000001 24.410000000001 24.420000000001 24.430000000001 24.440000000001 24.450000000001 24.460000000001 24.470000000001 24.480000000001 24.490000000001 24.500000000001 24.510000000001 24.520000000001 24.530000000001 24.540000000001 24.550000000001 24.560000000001 24.570000000001 24.580000000001 24.590000000001 24.600000000001 24.610000000001 24.620000000001 24.6300000000011 24.6400000000011 24.6500000000011 24.6600000000011 24.6700000000011 24.6800000000011 24.6900000000011 24.7000000000011 24.7100000000011 24.7200000000011 24.7300000000011 24.7400000000011 24.7500000000011 24.7600000000011 24.7700000000011 24.7800000000011 24.7900000000011 24.8000000000011 24.8100000000011 24.8200000000011 24.8300000000011 24.8400000000011 24.8500000000011 24.8600000000011 24.8700000000011 24.8800000000011 24.8900000000011 24.9000000000011 24.9100000000011 24.9200000000011 24.9300000000011 24.9400000000011 24.9500000000011 24.9600000000011 24.9700000000011 24.9800000000011 24.9900000000011 25.0000000000011 25.0100000000011 25.0200000000011 25.0300000000011 25.0400000000011 25.0500000000011 25.0600000000011 25.0700000000011 25.0800000000011 25.0900000000011 25.1000000000011 25.1100000000011 25.1200000000011 25.1300000000011 25.1400000000011 25.1500000000011 25.1600000000011 25.1700000000011 25.1800000000011 25.1900000000011 25.2000000000011 25.2100000000011 25.2200000000011 25.2300000000011 25.2400000000011 25.2500000000011 25.2600000000011 25.2700000000012 25.2800000000012 25.2900000000012 25.3000000000012 25.3100000000012 25.3200000000012 25.3300000000012 25.3400000000012 25.3500000000012 25.3600000000012 25.3700000000012 25.3800000000012 25.3900000000012 25.4000000000012 25.4100000000012 25.4200000000012 25.4300000000012 25.4400000000012 25.4500000000012 25.4600000000012 25.4700000000012 25.4800000000012 25.4900000000012 25.5000000000012 25.5100000000012 25.5200000000012 25.5300000000012 25.5400000000012 25.5500000000012 25.5600000000012 25.5700000000012 25.5800000000012 25.5900000000012 25.6000000000012 25.6100000000012 25.6200000000012 25.6300000000012 25.6400000000012 25.6500000000012 25.6600000000012 25.6700000000012 25.6800000000012 25.6900000000012 25.7000000000012 25.7100000000012 25.7200000000012 25.7300000000012 25.7400000000012 25.7500000000012 25.7600000000012 25.7700000000012 25.7800000000012 25.7900000000012 25.8000000000012 25.8100000000012 25.8200000000012 25.8300000000012 25.8400000000012 25.8500000000012 25.8600000000012 25.8700000000012 25.8800000000012 25.8900000000012 25.9000000000012 25.9100000000013 25.9200000000013 25.9300000000013 25.9400000000013 25.9500000000013 25.9600000000013 25.9700000000013 25.9800000000013 25.9900000000013 26.0000000000013 26.0100000000013 26.0200000000013 26.0300000000013 26.0400000000013 26.0500000000013 26.0600000000013 26.0700000000013 26.0800000000013 26.0900000000013 26.1000000000013 26.1100000000013 26.1200000000013 26.1300000000013 26.1400000000013 26.1500000000013 26.1600000000013 26.1700000000013 26.1800000000013 26.1900000000013 26.2000000000013 26.2100000000013 26.2200000000013 26.2300000000013 26.2400000000013 26.2500000000013 26.2600000000013 26.2700000000013 26.2800000000013 26.2900000000013 26.3000000000013 26.3100000000013 26.3200000000013 26.3300000000013 26.3400000000013 26.3500000000013 26.3600000000013 26.3700000000013 26.3800000000013 26.3900000000013 26.4000000000013 26.4100000000013 26.4200000000013 26.4300000000013 26.4400000000013 26.4500000000013 26.4600000000013 26.4700000000013 26.4800000000013 26.4900000000013 26.5000000000013 26.5100000000013 26.5200000000013 26.5300000000013 26.5400000000013 26.5500000000014 26.5600000000014 26.5700000000014 26.5800000000014 26.5900000000014 26.6000000000014 26.6100000000014 26.6200000000014 26.6300000000014 26.6400000000014 26.6500000000014 26.6600000000014 26.6700000000014 26.6800000000014 26.6900000000014 26.7000000000014 26.7100000000014 26.7200000000014 26.7300000000014 26.7400000000014 26.7500000000014 26.7600000000014 26.7700000000014 26.7800000000014 26.7900000000014 26.8000000000014 26.8100000000014 26.8200000000014 26.8300000000014 26.8400000000014 26.8500000000014 26.8600000000014 26.8700000000014 26.8800000000014 26.8900000000014 26.9000000000014 26.9100000000014 26.9200000000014 26.9300000000014 26.9400000000014 26.9500000000014 26.9600000000014 26.9700000000014 26.9800000000014 26.9900000000014 27.0000000000014 27.0100000000014 27.0200000000014 27.0300000000014 27.0400000000014 27.0500000000014 27.0600000000014 27.0700000000014 27.0800000000014 27.0900000000014 27.1000000000014 27.1100000000014 27.1200000000014 27.1300000000014 27.1400000000014 27.1500000000014 27.1600000000014 27.1700000000014 27.1800000000014 27.1900000000015 27.2000000000015 27.2100000000015 27.2200000000015 27.2300000000015 27.2400000000015 27.2500000000015 27.2600000000015 27.2700000000015 27.2800000000015 27.2900000000015 27.3000000000015 27.3100000000015 27.3200000000015 27.3300000000015 27.3400000000015 27.3500000000015 27.3600000000015 27.3700000000015 27.3800000000015 27.3900000000015 27.4000000000015 27.4100000000015 27.4200000000015 27.4300000000015 27.4400000000015 27.4500000000015 27.4600000000015 27.4700000000015 27.4800000000015 27.4900000000015 27.5000000000015 27.5100000000015 27.5200000000015 27.5300000000015 27.5400000000015 27.5500000000015 27.5600000000015 27.5700000000015 27.5800000000015 27.5900000000015 27.6000000000015 27.6100000000015 27.6200000000015 27.6300000000015 27.6400000000015 27.6500000000015 27.6600000000015 27.6700000000015 27.6800000000015 27.6900000000015 27.7000000000015 27.7100000000015 27.7200000000015 27.7300000000015 27.7400000000015 27.7500000000015 27.7600000000015 27.7700000000015 27.7800000000015 27.7900000000015 27.8000000000015 27.8100000000015 27.8200000000015 27.8300000000016 27.8400000000016 27.8500000000016 27.8600000000016 27.8700000000016 27.8800000000016 27.8900000000016 27.9000000000016 27.9100000000016 27.9200000000016 27.9300000000016 27.9400000000016 27.9500000000016 27.9600000000016 27.9700000000016 27.9800000000016 27.9900000000016 28.0000000000016 28.0100000000016 28.0200000000016 28.0300000000016 28.0400000000016 28.0500000000016 28.0600000000016 28.0700000000016 28.0800000000016 28.0900000000016 28.1000000000016 28.1100000000016 28.1200000000016 28.1300000000016 28.1400000000016 28.1500000000016 28.1600000000016 28.1700000000016 28.1800000000016 28.1900000000016 28.2000000000016 28.2100000000016 28.2200000000016 28.2300000000016 28.2400000000016 28.2500000000016 28.2600000000016 28.2700000000016 28.2800000000016 28.2900000000016 28.3000000000016 28.3100000000016 28.3200000000016 28.3300000000016 28.3400000000016 28.3500000000016 28.3600000000016 28.3700000000016 28.3800000000016 28.3900000000016 28.4000000000016 28.4100000000016 28.4200000000016 28.4300000000016 28.4400000000016 28.4500000000016 28.4600000000016 28.4700000000017 28.4800000000017 28.4900000000017 28.5000000000017 28.5100000000017 28.5200000000017 28.5300000000017 28.5400000000017 28.5500000000017 28.5600000000017 28.5700000000017 28.5800000000017 28.5900000000017 28.6000000000017 28.6100000000017 28.6200000000017 28.6300000000017 28.6400000000017 28.6500000000017 28.6600000000017 28.6700000000017 28.6800000000017 28.6900000000017 28.7000000000017 28.7100000000017 28.7200000000017 28.7300000000017 28.7400000000017 28.7500000000017 28.7600000000017 28.7700000000017 28.7800000000017 28.7900000000017 28.8000000000017 28.8100000000017 28.8200000000017 28.8300000000017 28.8400000000017 28.8500000000017 28.8600000000017 28.8700000000017 28.8800000000017 28.8900000000017 28.9000000000017 28.9100000000017 28.9200000000017 28.9300000000017 28.9400000000017 28.9500000000017 28.9600000000017 28.9700000000017 28.9800000000017 28.9900000000017 29.0000000000017 29.0100000000017 29.0200000000017 29.0300000000017 29.0400000000017 29.0500000000017 29.0600000000017 29.0700000000017 29.0800000000017 29.0900000000017 29.1000000000017 29.1100000000018 29.1200000000018 29.1300000000018 29.1400000000018 29.1500000000018 29.1600000000018 29.1700000000018 29.1800000000018 29.1900000000018 29.2000000000018 29.2100000000018 29.2200000000018 29.2300000000018 29.2400000000018 29.2500000000018 29.2600000000018 29.2700000000018 29.2800000000018 29.2900000000018 29.3000000000018 29.3100000000018 29.3200000000018 29.3300000000018 29.3400000000018 29.3500000000018 29.3600000000018 29.3700000000018 29.3800000000018 29.3900000000018 29.4000000000018 29.4100000000018 29.4200000000018 29.4300000000018 29.4400000000018 29.4500000000018 29.4600000000018 29.4700000000018 29.4800000000018 29.4900000000018 29.5000000000018 29.5100000000018 29.5200000000018 29.5300000000018 29.5400000000018 29.5500000000018 29.5600000000018 29.5700000000018 29.5800000000018 29.5900000000018 29.6000000000018 29.6100000000018 29.6200000000018 29.6300000000018 29.6400000000018 29.6500000000018 29.6600000000018 29.6700000000018 29.6800000000018 29.6900000000018 29.7000000000018 29.7100000000018 29.7200000000018 29.7300000000018 29.7400000000018 29.7500000000019 29.7600000000019 29.7700000000019 29.7800000000019 29.7900000000019 29.8000000000019 29.8100000000019 29.8200000000019 29.8300000000019 29.8400000000019 29.8500000000019 29.8600000000019 29.8700000000019 29.8800000000019 29.8900000000019 29.9000000000019 29.9100000000019 29.9200000000019 29.9300000000019 29.9400000000019 29.9500000000019 29.9600000000019 29.9700000000019 29.9800000000019 29.9900000000019 30.0000000000019 30.0100000000019 30.0200000000019 30.0300000000019 30.0400000000019 30.0500000000019 30.0600000000019 30.0700000000019 30.0800000000019 30.0900000000019 30.1000000000019 30.1100000000019 30.1200000000019 30.1300000000019 30.1400000000019 30.1500000000019 30.1600000000019 30.1700000000019 30.1800000000019 30.1900000000019 30.2000000000019 30.2100000000019 30.2200000000019 30.2300000000019 30.2400000000019 30.2500000000019 30.2600000000019 30.2700000000019 30.2800000000019 30.2900000000019 30.3000000000019 30.3100000000019 30.3200000000019 30.3300000000019 30.3400000000019 30.3500000000019 30.3600000000019 30.3700000000019 30.3800000000019 30.390000000002 30.400000000002 30.410000000002 30.420000000002 30.430000000002 30.440000000002 30.450000000002 30.460000000002 30.470000000002 30.480000000002 30.490000000002 30.500000000002 30.510000000002 30.520000000002 30.530000000002 30.540000000002 30.550000000002 30.560000000002 30.570000000002 30.580000000002 30.590000000002 30.600000000002 30.610000000002 30.620000000002 30.630000000002 30.640000000002 30.650000000002 30.660000000002 30.670000000002 30.680000000002 30.690000000002 30.700000000002 30.710000000002 30.720000000002 30.730000000002 30.740000000002 30.750000000002 30.760000000002 30.770000000002 30.780000000002 30.790000000002 30.800000000002 30.810000000002 30.820000000002 30.830000000002 30.840000000002 30.850000000002 30.860000000002 30.870000000002 30.880000000002 30.890000000002 30.900000000002 30.910000000002 30.920000000002 30.930000000002 30.940000000002 30.950000000002 30.960000000002 30.970000000002 30.980000000002 30.990000000002 31.000000000002 31.010000000002 31.020000000002 31.0300000000021 31.0400000000021 31.0500000000021 31.0600000000021 31.0700000000021 31.0800000000021 31.0900000000021 31.1000000000021 31.1100000000021 31.1200000000021 31.1300000000021 31.1400000000021 31.1500000000021 31.1600000000021 31.1700000000021 31.1800000000021 31.1900000000021 31.2000000000021 31.2100000000021 31.2200000000021 31.2300000000021 31.2400000000021 31.2500000000021 31.2600000000021 31.2700000000021 31.2800000000021 31.2900000000021 31.3000000000021 31.3100000000021 31.3200000000021 31.3300000000021 31.3400000000021 31.3500000000021 31.3600000000021 31.3700000000021 31.3800000000021 31.3900000000021 31.4000000000021 31.4100000000021 31.4200000000021 31.4300000000021 31.4400000000021 31.4500000000021 31.4600000000021 31.4700000000021 31.4800000000021 31.4900000000021 31.5000000000021 31.5100000000021 31.5200000000021 31.5300000000021 31.5400000000021 31.5500000000021 31.5600000000021 31.5700000000021 31.5800000000021 31.5900000000021 31.6000000000021 31.6100000000021 31.6200000000021 31.6300000000021 31.6400000000021 31.6500000000021 31.6600000000021 31.6700000000022 31.6800000000022 31.6900000000022 31.7000000000022 31.7100000000022 31.7200000000022 31.7300000000022 31.7400000000022 31.7500000000022 31.7600000000022 31.7700000000022 31.7800000000022 31.7900000000022 31.8000000000022 31.8100000000022 31.8200000000022 31.8300000000022 31.8400000000022 31.8500000000022 31.8600000000022 31.8700000000022 31.8800000000022 31.8900000000022 31.9000000000022 31.9100000000022 31.9200000000022 31.9300000000022 31.9400000000022 31.9500000000022 31.9600000000022 31.9700000000022 31.9800000000022 31.9900000000022 32.0000000000022 32.0100000000022 32.0200000000022 32.0300000000022 32.0400000000022 32.0500000000022 32.0600000000022 32.0700000000022 32.0800000000022 32.0900000000022 32.1000000000022 32.1100000000022 32.1200000000022 32.1300000000022 32.1400000000022 32.1500000000022 32.1600000000022 32.1700000000022 32.1800000000022 32.1900000000022 32.2000000000022 32.2100000000022 32.2200000000022 32.2300000000022 32.2400000000022 32.2500000000022 32.2600000000022 32.2700000000021 32.2800000000021 32.2900000000021 32.3000000000021 32.3100000000021 32.3200000000021 32.3300000000021 32.3400000000021 32.3500000000021 32.3600000000021 32.3700000000021 32.3800000000021 32.3900000000021 32.4000000000021 32.4100000000021 32.4200000000021 32.4300000000021 32.4400000000021 32.4500000000021 32.4600000000021 32.4700000000021 32.4800000000021 32.4900000000021 32.5000000000021 32.5100000000021 32.5200000000021 32.5300000000021 32.5400000000021 32.5500000000021 32.5600000000021 32.5700000000021 32.5800000000021 32.5900000000021 32.6000000000021 32.6100000000021 32.6200000000021 32.6300000000021 32.6400000000021 32.6500000000021 32.6600000000021 32.6700000000021 32.6800000000021 32.6900000000021 32.7000000000021 32.7100000000021 32.7200000000021 32.7300000000021 32.7400000000021 32.7500000000021 32.7600000000021 32.770000000002 32.780000000002 32.790000000002 32.800000000002 32.810000000002 32.820000000002 32.830000000002 32.840000000002 32.850000000002 32.860000000002 32.870000000002 32.880000000002 32.890000000002 32.900000000002 32.910000000002 32.920000000002 32.930000000002 32.940000000002 32.950000000002 32.960000000002 32.970000000002 32.980000000002 32.990000000002 33.000000000002 33.010000000002 33.020000000002 33.030000000002 33.040000000002 33.050000000002 33.060000000002 33.070000000002 33.080000000002 33.090000000002 33.100000000002 33.110000000002 33.120000000002 33.130000000002 33.140000000002 33.150000000002 33.160000000002 33.170000000002 33.180000000002 33.190000000002 33.200000000002 33.210000000002 33.220000000002 33.230000000002 33.240000000002 33.250000000002 33.260000000002 33.270000000002 33.2800000000019 33.2900000000019 33.3000000000019 33.3100000000019 33.3200000000019 33.3300000000019 33.3400000000019 33.3500000000019 33.3600000000019 33.3700000000019 33.3800000000019 33.3900000000019 33.4000000000019 33.4100000000019 33.4200000000019 33.4300000000019 33.4400000000019 33.4500000000019 33.4600000000019 33.4700000000019 33.4800000000019 33.4900000000019 33.5000000000019 33.5100000000019 33.5200000000019 33.5300000000019 33.5400000000019 33.5500000000019 33.5600000000019 33.5700000000019 33.5800000000019 33.5900000000019 33.6000000000019 33.6100000000019 33.6200000000019 33.6300000000019 33.6400000000019 33.6500000000019 33.6600000000019 33.6700000000019 33.6800000000019 33.6900000000019 33.7000000000019 33.7100000000019 33.7200000000019 33.7300000000019 33.7400000000019 33.7500000000019 33.7600000000019 33.7700000000019 33.7800000000018 33.7900000000018 33.8000000000018 33.8100000000018 33.8200000000018 33.8300000000018 33.8400000000018 33.8500000000018 33.8600000000018 33.8700000000018 33.8800000000018 33.8900000000018 33.9000000000018 33.9100000000018 33.9200000000018 33.9300000000018 33.9400000000018 33.9500000000018 33.9600000000018 33.9700000000018 33.9800000000018 33.9900000000018 34.0000000000018 34.0100000000018 34.0200000000018 34.0300000000018 34.0400000000018 34.0500000000018 34.0600000000018 34.0700000000018 34.0800000000018 34.0900000000018 34.1000000000018 34.1100000000018 34.1200000000018 34.1300000000018 34.1400000000018 34.1500000000018 34.1600000000018 34.1700000000018 34.1800000000018 34.1900000000018 34.2000000000018 34.2100000000018 34.2200000000018 34.2300000000018 34.2400000000018 34.2500000000018 34.2600000000018 34.2700000000018 34.2800000000017 34.2900000000017 34.3000000000017 34.3100000000017 34.3200000000017 34.3300000000017 34.3400000000017 34.3500000000017 34.3600000000017 34.3700000000017 34.3800000000017 34.3900000000017 34.4000000000017 34.4100000000017 34.4200000000017 34.4300000000017 34.4400000000017 34.4500000000017 34.4600000000017 34.4700000000017 34.4800000000017 34.4900000000017 34.5000000000017 34.5100000000017 34.5200000000017 34.5300000000017 34.5400000000017 34.5500000000017 34.5600000000017 34.5700000000017 34.5800000000017 34.5900000000017 34.6000000000017 34.6100000000017 34.6200000000017 34.6300000000017 34.6400000000017 34.6500000000017 34.6600000000017 34.6700000000017 34.6800000000017 34.6900000000017 34.7000000000017 34.7100000000017 34.7200000000017 34.7300000000017 34.7400000000017 34.7500000000017 34.7600000000017 34.7700000000017 34.7800000000016 34.7900000000016 34.8000000000016 34.8100000000016 34.8200000000016 34.8300000000016 34.8400000000016 34.8500000000016 34.8600000000016 34.8700000000016 34.8800000000016 34.8900000000016 34.9000000000016 34.9100000000016 34.9200000000016 34.9300000000016 34.9400000000016 34.9500000000016 34.9600000000016 34.9700000000016 34.9800000000016 34.9900000000016 35.0000000000016 35.0100000000016 35.0200000000016 35.0300000000016 35.0400000000016 35.0500000000016 35.0600000000016 35.0700000000016 35.0800000000016 35.0900000000016 35.1000000000016 35.1100000000016 35.1200000000016 35.1300000000016 35.1400000000016 35.1500000000016 35.1600000000016 35.1700000000016 35.1800000000016 35.1900000000016 35.2000000000016 35.2100000000016 35.2200000000016 35.2300000000016 35.2400000000016 35.2500000000016 35.2600000000016 35.2700000000016 35.2800000000016 35.2900000000015 35.3000000000015 35.3100000000015 35.3200000000015 35.3300000000015 35.3400000000015 35.3500000000015 35.3600000000015 35.3700000000015 35.3800000000015 35.3900000000015 35.4000000000015 35.4100000000015 35.4200000000015 35.4300000000015 35.4400000000015 35.4500000000015 35.4600000000015 35.4700000000015 35.4800000000015 35.4900000000015 35.5000000000015 35.5100000000015 35.5200000000015 35.5300000000015 35.5400000000015 35.5500000000015 35.5600000000015 35.5700000000015 35.5800000000015 35.5900000000015 35.6000000000015 35.6100000000015 35.6200000000015 35.6300000000015 35.6400000000015 35.6500000000015 35.6600000000015 35.6700000000015 35.6800000000015 35.6900000000015 35.7000000000015 35.7100000000015 35.7200000000015 35.7300000000015 35.7400000000015 35.7500000000015 35.7600000000015 35.7700000000015 35.7800000000015 35.7900000000014 35.8000000000014 35.8100000000014 35.8200000000014 35.8300000000014 35.8400000000014 35.8500000000014 35.8600000000014 35.8700000000014 35.8800000000014 35.8900000000014 35.9000000000014 35.9100000000014 35.9200000000014 35.9300000000014 35.9400000000014 35.9500000000014 35.9600000000014 35.9700000000014 35.9800000000014 35.9900000000014 36.0000000000014 36.0100000000014 36.0200000000014 36.0300000000014 36.0400000000014 36.0500000000014 36.0600000000014 36.0700000000014 36.0800000000014 36.0900000000014 36.1000000000014 36.1100000000014 36.1200000000014 36.1300000000014 36.1400000000014 36.1500000000014 36.1600000000014 36.1700000000014 36.1800000000014 36.1900000000014 36.2000000000014 36.2100000000014 36.2200000000014 36.2300000000014 36.2400000000014 36.2500000000014 36.2600000000014 36.2700000000014 36.2800000000014 36.2900000000013 36.3000000000013 36.3100000000013 36.3200000000013 36.3300000000013 36.3400000000013 36.3500000000013 36.3600000000013 36.3700000000013 36.3800000000013 36.3900000000013 36.4000000000013 36.4100000000013 36.4200000000013 36.4300000000013 36.4400000000013 36.4500000000013 36.4600000000013 36.4700000000013 36.4800000000013 36.4900000000013 36.5000000000013 36.5100000000013 36.5200000000013 36.5300000000013 36.5400000000013 36.5500000000013 36.5600000000013 36.5700000000013 36.5800000000013 36.5900000000013 36.6000000000013 36.6100000000013 36.6200000000013 36.6300000000013 36.6400000000013 36.6500000000013 36.6600000000013 36.6700000000013 36.6800000000013 36.6900000000013 36.7000000000013 36.7100000000013 36.7200000000013 36.7300000000013 36.7400000000013 36.7500000000013 36.7600000000013 36.7700000000013 36.7800000000013 36.7900000000012 36.8000000000012 36.8100000000012 36.8200000000012 36.8300000000012 36.8400000000012 36.8500000000012 36.8600000000012 36.8700000000012 36.8800000000012 36.8900000000012 36.9000000000012 36.9100000000012 36.9200000000012 36.9300000000012 36.9400000000012 36.9500000000012 36.9600000000012 36.9700000000012 36.9800000000012 36.9900000000012 37.0000000000012 37.0100000000012 37.0200000000012 37.0300000000012 37.0400000000012 37.0500000000012 37.0600000000012 37.0700000000012 37.0800000000012 37.0900000000012 37.1000000000012 37.1100000000012 37.1200000000012 37.1300000000012 37.1400000000012 37.1500000000012 37.1600000000012 37.1700000000012 37.1800000000012 37.1900000000012 37.2000000000012 37.2100000000012 37.2200000000012 37.2300000000012 37.2400000000012 37.2500000000012 37.2600000000012 37.2700000000012 37.2800000000012 37.2900000000012 37.3000000000011 37.3100000000011 37.3200000000011 37.3300000000011 37.3400000000011 37.3500000000011 37.3600000000011 37.3700000000011 37.3800000000011 37.3900000000011 37.4000000000011 37.4100000000011 37.4200000000011 37.4300000000011 37.4400000000011 37.4500000000011 37.4600000000011 37.4700000000011 37.4800000000011 37.4900000000011 37.5000000000011 37.5100000000011 37.5200000000011 37.5300000000011 37.5400000000011 37.5500000000011 37.5600000000011 37.5700000000011 37.5800000000011 37.5900000000011 37.6000000000011 37.6100000000011 37.6200000000011 37.6300000000011 37.6400000000011 37.6500000000011 37.6600000000011 37.6700000000011 37.6800000000011 37.6900000000011 37.7000000000011 37.7100000000011 37.7200000000011 37.7300000000011 37.7400000000011 37.7500000000011 37.7600000000011 37.7700000000011 37.7800000000011 37.7900000000011 37.800000000001 37.810000000001 37.820000000001 37.830000000001 37.840000000001 37.850000000001 37.860000000001 37.870000000001 37.880000000001 37.890000000001 37.900000000001 37.910000000001 37.920000000001 37.930000000001 37.940000000001 37.950000000001 37.960000000001 37.970000000001 37.980000000001 37.990000000001 38.000000000001 38.010000000001 38.020000000001 38.030000000001 38.040000000001 38.050000000001 38.060000000001 38.070000000001 38.080000000001 38.090000000001 38.100000000001 38.110000000001 38.120000000001 38.130000000001 38.140000000001 38.150000000001 38.160000000001 38.170000000001 38.180000000001 38.190000000001 38.200000000001 38.210000000001 38.220000000001 38.230000000001 38.240000000001 38.250000000001 38.260000000001 38.270000000001 38.280000000001 38.290000000001 38.3000000000009 38.3100000000009 38.3200000000009 38.3300000000009 38.3400000000009 38.3500000000009 38.3600000000009 38.3700000000009 38.3800000000009 38.3900000000009 38.4000000000009 38.4100000000009 38.4200000000009 38.4300000000009 38.4400000000009 38.4500000000009 38.4600000000009 38.4700000000009 38.4800000000009 38.4900000000009 38.5000000000009 38.5100000000009 38.5200000000009 38.5300000000009 38.5400000000009 38.5500000000009 38.5600000000009 38.5700000000009 38.5800000000009 38.5900000000009 38.6000000000009 38.6100000000009 38.6200000000009 38.6300000000009 38.6400000000009 38.6500000000009 38.6600000000009 38.6700000000009 38.6800000000009 38.6900000000009 38.7000000000009 38.7100000000009 38.7200000000009 38.7300000000009 38.7400000000009 38.7500000000009 38.7600000000009 38.7700000000009 38.7800000000009 38.7900000000009 38.8000000000008 38.8100000000008 38.8200000000008 38.8300000000008 38.8400000000008 38.8500000000008 38.8600000000008 38.8700000000008 38.8800000000008 38.8900000000008 38.9000000000008 38.9100000000008 38.9200000000008 38.9300000000008 38.9400000000008 38.9500000000008 38.9600000000008 38.9700000000008 38.9800000000008 38.9900000000008 39.0000000000008 39.0100000000008 39.0200000000008 39.0300000000008 39.0400000000008 39.0500000000008 39.0600000000008 39.0700000000008 39.0800000000008 39.0900000000008 39.1000000000008 39.1100000000008 39.1200000000008 39.1300000000008 39.1400000000008 39.1500000000008 39.1600000000008 39.1700000000008 39.1800000000008 39.1900000000008 39.2000000000008 39.2100000000008 39.2200000000008 39.2300000000008 39.2400000000008 39.2500000000008 39.2600000000008 39.2700000000008 39.2800000000008 39.2900000000008 39.3000000000008 39.3100000000007 39.3200000000007 39.3300000000007 39.3400000000007 39.3500000000007 39.3600000000007 39.3700000000007 39.3800000000007 39.3900000000007 39.4000000000007 39.4100000000007 39.4200000000007 39.4300000000007 39.4400000000007 39.4500000000007 39.4600000000007 39.4700000000007 39.4800000000007 39.4900000000007 39.5000000000007 39.5100000000007 39.5200000000007 39.5300000000007 39.5400000000007 39.5500000000007 39.5600000000007 39.5700000000007 39.5800000000007 39.5900000000007 39.6000000000007 39.6100000000007 39.6200000000007 39.6300000000007 39.6400000000007 39.6500000000007 39.6600000000007 39.6700000000007 39.6800000000007 39.6900000000007 39.7000000000007 39.7100000000007 39.7200000000007 39.7300000000007 39.7400000000007 39.7500000000007 39.7600000000007 39.7700000000007 39.7800000000007 39.7900000000007 39.8000000000007 39.8100000000006 39.8200000000006 39.8300000000006 39.8400000000006 39.8500000000006 39.8600000000006 39.8700000000006 39.8800000000006 39.8900000000006 39.9000000000006 39.9100000000006 39.9200000000006 39.9300000000006 39.9400000000006 39.9500000000006 39.9600000000006 39.9700000000006 39.9800000000006 39.9900000000006 40.0000000000006 40.0100000000006 40.0200000000006 40.0300000000006 40.0400000000006 40.0500000000006 40.0600000000006 40.0700000000006 40.0800000000006 40.0900000000006 40.1000000000006 40.1100000000006 40.1200000000006 40.1300000000006 40.1400000000006 40.1500000000006 40.1600000000006 40.1700000000006 40.1800000000006 40.1900000000006 40.2000000000006 40.2100000000006 40.2200000000006 40.2300000000006 40.2400000000006 40.2500000000006 40.2600000000006 40.2700000000006 40.2800000000006 40.2900000000006 40.3000000000006 40.3100000000005 40.3200000000005 40.3300000000005 40.3400000000005 40.3500000000005 40.3600000000005 40.3700000000005 40.3800000000005 40.3900000000005 40.4000000000005 40.4100000000005 40.4200000000005 40.4300000000005 40.4400000000005 40.4500000000005 40.4600000000005 40.4700000000005 40.4800000000005 40.4900000000005 40.5000000000005 40.5100000000005 40.5200000000005 40.5300000000005 40.5400000000005 40.5500000000005 40.5600000000005 40.5700000000005 40.5800000000005 40.5900000000005 40.6000000000005 40.6100000000005 40.6200000000005 40.6300000000005 40.6400000000005 40.6500000000005 40.6600000000005 40.6700000000005 40.6800000000005 40.6900000000005 40.7000000000005 40.7100000000005 40.7200000000005 40.7300000000005 40.7400000000005 40.7500000000005 40.7600000000005 40.7700000000005 40.7800000000005 40.7900000000005 40.8000000000005 40.8100000000004 40.8200000000004 40.8300000000004 40.8400000000004 40.8500000000004 40.8600000000004 40.8700000000004 40.8800000000004 40.8900000000004 40.9000000000004 40.9100000000004 40.9200000000004 40.9300000000004 40.9400000000004 40.9500000000004 40.9600000000004 40.9700000000004 40.9800000000004 40.9900000000004 41.0000000000004 41.0100000000004 41.0200000000004 41.0300000000004 41.0400000000004 41.0500000000004 41.0600000000004 41.0700000000004 41.0800000000004 41.0900000000004 41.1000000000004 41.1100000000004 41.1200000000004 41.1300000000004 41.1400000000004 41.1500000000004 41.1600000000004 41.1700000000004 41.1800000000004 41.1900000000004 41.2000000000004 41.2100000000004 41.2200000000004 41.2300000000004 41.2400000000004 41.2500000000004 41.2600000000004 41.2700000000004 41.2800000000004 41.2900000000004 41.3000000000004 41.3100000000004 41.3200000000003 41.3300000000003 41.3400000000003 41.3500000000003 41.3600000000003 41.3700000000003 41.3800000000003 41.3900000000003 41.4000000000003 41.4100000000003 41.4200000000003 41.4300000000003 41.4400000000003 41.4500000000003 41.4600000000003 41.4700000000003 41.4800000000003 41.4900000000003 41.5000000000003 41.5100000000003 41.5200000000003 41.5300000000003 41.5400000000003 41.5500000000003 41.5600000000003 41.5700000000003 41.5800000000003 41.5900000000003 41.6000000000003 41.6100000000003 41.6200000000003 41.6300000000003 41.6400000000003 41.6500000000003 41.6600000000003 41.6700000000003 41.6800000000003 41.6900000000003 41.7000000000003 41.7100000000003 41.7200000000003 41.7300000000003 41.7400000000003 41.7500000000003 41.7600000000003 41.7700000000003 41.7800000000003 41.7900000000003 41.8000000000003 41.8100000000003 41.8200000000002 41.8300000000002 41.8400000000002 41.8500000000002 41.8600000000002 41.8700000000002 41.8800000000002 41.8900000000002 41.9000000000002 41.9100000000002 41.9200000000002 41.9300000000002 41.9400000000002 41.9500000000002 41.9600000000002 41.9700000000002 41.9800000000002 41.9900000000002 42.0000000000002 42.0100000000002 42.0200000000002 42.0300000000002 42.0400000000002 42.0500000000002 42.0600000000002 42.0700000000002 42.0800000000002 42.0900000000002 42.1000000000002 42.1100000000002 42.1200000000002 42.1300000000002 42.1400000000002 42.1500000000002 42.1600000000002 42.1700000000002 42.1800000000002 42.1900000000002 42.2000000000002 42.2100000000002 42.2200000000002 42.2300000000002 42.2400000000002 42.2500000000002 42.2600000000002 42.2700000000002 42.2800000000002 42.2900000000002 42.3000000000002 42.3100000000002 42.3200000000001 42.3300000000001 42.3400000000001 42.3500000000001 42.3600000000001 42.3700000000001 42.3800000000001 42.3900000000001 42.4000000000001 42.4100000000001 42.4200000000001 42.4300000000001 42.4400000000001 42.4500000000001 42.4600000000001 42.4700000000001 42.4800000000001 42.4900000000001 42.5000000000001 42.5100000000001 42.5200000000001 42.5300000000001 42.5400000000001 42.5500000000001 42.5600000000001 42.5700000000001 42.5800000000001 42.5900000000001 42.6000000000001 42.6100000000001 42.6200000000001 42.6300000000001 42.6400000000001 42.6500000000001 42.6600000000001 42.6700000000001 42.6800000000001 42.6900000000001 42.7000000000001 42.7100000000001 42.7200000000001 42.7300000000001 42.7400000000001 42.7500000000001 42.7600000000001 42.7700000000001 42.7800000000001 42.7900000000001 42.8000000000001 42.8100000000001 42.8200000000001 42.83 42.84 42.85 42.86 42.87 42.88 42.89 42.9 42.91 42.92 42.93 42.94 42.95 42.96 42.97 42.98 42.99 43 43.01 43.02 43.03 43.04 43.05 43.06 43.07 43.08 43.09 43.1 43.11 43.12 43.13 43.14 43.15 43.16 43.17 43.18 43.19 43.2 43.21 43.22 43.23 43.24 43.25 43.26 43.27 43.28 43.29 43.3 43.31 43.32 43.3299999999999 43.3399999999999 43.3499999999999 43.3599999999999 43.3699999999999 43.3799999999999 43.3899999999999 43.3999999999999 43.4099999999999 43.4199999999999 43.4299999999999 43.4399999999999 43.4499999999999 43.4599999999999 43.4699999999999 43.4799999999999 43.4899999999999 43.4999999999999 43.5099999999999 43.5199999999999 43.5299999999999 43.5399999999999 43.5499999999999 43.5599999999999 43.5699999999999 43.5799999999999 43.5899999999999 43.5999999999999 43.6099999999999 43.6199999999999 43.6299999999999 43.6399999999999 43.6499999999999 43.6599999999999 43.6699999999999 43.6799999999999 43.6899999999999 43.6999999999999 43.7099999999999 43.7199999999999 43.7299999999999 43.7399999999999 43.7499999999999 43.7599999999999 43.7699999999999 43.7799999999999 43.7899999999999 43.7999999999999 43.8099999999999 43.8199999999999 43.8299999999998 43.8399999999998 43.8499999999998 43.8599999999998 43.8699999999998 43.8799999999998 43.8899999999998 43.8999999999998 43.9099999999998 43.9199999999998 43.9299999999998 43.9399999999998 43.9499999999998 43.9599999999998 43.9699999999998 43.9799999999998 43.9899999999998 43.9999999999998 44.0099999999998 44.0199999999998 44.0299999999998 44.0399999999998 44.0499999999998 44.0599999999998 44.0699999999998 44.0799999999998 44.0899999999998 44.0999999999998 44.1099999999998 44.1199999999998 44.1299999999998 44.1399999999998 44.1499999999998 44.1599999999998 44.1699999999998 44.1799999999998 44.1899999999998 44.1999999999998 44.2099999999998 44.2199999999998 44.2299999999998 44.2399999999998 44.2499999999998 44.2599999999998 44.2699999999998 44.2799999999998 44.2899999999998 44.2999999999998 44.3099999999998 44.3199999999998 44.3299999999997 44.3399999999997 44.3499999999997 44.3599999999997 44.3699999999997 44.3799999999997 44.3899999999997 44.3999999999997 44.4099999999997 44.4199999999997 44.4299999999997 44.4399999999997 44.4499999999997 44.4599999999997 44.4699999999997 44.4799999999997 44.4899999999997 44.4999999999997 44.5099999999997 44.5199999999997 44.5299999999997 44.5399999999997 44.5499999999997 44.5599999999997 44.5699999999997 44.5799999999997 44.5899999999997 44.5999999999997 44.6099999999997 44.6199999999997 44.6299999999997 44.6399999999997 44.6499999999997 44.6599999999997 44.6699999999997 44.6799999999997 44.6899999999997 44.6999999999997 44.7099999999997 44.7199999999997 44.7299999999997 44.7399999999997 44.7499999999997 44.7599999999997 44.7699999999997 44.7799999999997 44.7899999999997 44.7999999999997 44.8099999999997 44.8199999999997 44.8299999999997 44.8399999999996 44.8499999999996 44.8599999999996 44.8699999999996 44.8799999999996 44.8899999999996 44.8999999999996 44.9099999999996 44.9199999999996 44.9299999999996 44.9399999999996 44.9499999999996 44.9599999999996 44.9699999999996 44.9799999999996 44.9899999999996 44.9999999999996 45.0099999999996 45.0199999999996 45.0299999999996 45.0399999999996 45.0499999999996 45.0599999999996 45.0699999999996 45.0799999999996 45.0899999999996 45.0999999999996 45.1099999999996 45.1199999999996 45.1299999999996 45.1399999999996 45.1499999999996 45.1599999999996 45.1699999999996 45.1799999999996 45.1899999999996 45.1999999999996 45.2099999999996 45.2199999999996 45.2299999999996 45.2399999999996 45.2499999999996 45.2599999999996 45.2699999999996 45.2799999999996 45.2899999999996 45.2999999999996 45.3099999999996 45.3199999999996 45.3299999999996 45.3399999999995 45.3499999999995 45.3599999999995 45.3699999999995 45.3799999999995 45.3899999999995 45.3999999999995 45.4099999999995 45.4199999999995 45.4299999999995 45.4399999999995 45.4499999999995 45.4599999999995 45.4699999999995 45.4799999999995 45.4899999999995 45.4999999999995 45.5099999999995 45.5199999999995 45.5299999999995 45.5399999999995 45.5499999999995 45.5599999999995 45.5699999999995 45.5799999999995 45.5899999999995 45.5999999999995 45.6099999999995 45.6199999999995 45.6299999999995 45.6399999999995 45.6499999999995 45.6599999999995 45.6699999999995 45.6799999999995 45.6899999999995 45.6999999999995 45.7099999999995 45.7199999999995 45.7299999999995 45.7399999999995 45.7499999999995 45.7599999999995 45.7699999999995 45.7799999999995 45.7899999999995 45.7999999999995 45.8099999999995 45.8199999999995 45.8299999999995 45.8399999999994 45.8499999999994 45.8599999999994 45.8699999999994 45.8799999999994 45.8899999999994 45.8999999999994 45.9099999999994 45.9199999999994 45.9299999999994 45.9399999999994 45.9499999999994 45.9599999999994 45.9699999999994 45.9799999999994 45.9899999999994 45.9999999999994 46.0099999999994 46.0199999999994 46.0299999999994 46.0399999999994 46.0499999999994 46.0599999999994 46.0699999999994 46.0799999999994 46.0899999999994 46.0999999999994 46.1099999999994 46.1199999999994 46.1299999999994 46.1399999999994 46.1499999999994 46.1599999999994 46.1699999999994 46.1799999999994 46.1899999999994 46.1999999999994 46.2099999999994 46.2199999999994 46.2299999999994 46.2399999999994 46.2499999999994 46.2599999999994 46.2699999999994 46.2799999999994 46.2899999999994 46.2999999999994 46.3099999999994 46.3199999999994 46.3299999999994 46.3399999999993 46.3499999999993 46.3599999999993 46.3699999999993 46.3799999999993 46.3899999999993 46.3999999999993 46.4099999999993 46.4199999999993 46.4299999999993 46.4399999999993 46.4499999999993 46.4599999999993 46.4699999999993 46.4799999999993 46.4899999999993 46.4999999999993 46.5099999999993 46.5199999999993 46.5299999999993 46.5399999999993 46.5499999999993 46.5599999999993 46.5699999999993 46.5799999999993 46.5899999999993 46.5999999999993 46.6099999999993 46.6199999999993 46.6299999999993 46.6399999999993 46.6499999999993 46.6599999999993 46.6699999999993 46.6799999999993 46.6899999999993 46.6999999999993 46.7099999999993 46.7199999999993 46.7299999999993 46.7399999999993 46.7499999999993 46.7599999999993 46.7699999999993 46.7799999999993 46.7899999999993 46.7999999999993 46.8099999999993 46.8199999999993 46.8299999999993 46.8399999999993 46.8499999999992 46.8599999999992 46.8699999999992 46.8799999999992 46.8899999999992 46.8999999999992 46.9099999999992 46.9199999999992 46.9299999999992 46.9399999999992 46.9499999999992 46.9599999999992 46.9699999999992 46.9799999999992 46.9899999999992 46.9999999999992 47.0099999999992 47.0199999999992 47.0299999999992 47.0399999999992 47.0499999999992 47.0599999999992 47.0699999999992 47.0799999999992 47.0899999999992 47.0999999999992 47.1099999999992 47.1199999999992 47.1299999999992 47.1399999999992 47.1499999999992 47.1599999999992 47.1699999999992 47.1799999999992 47.1899999999992 47.1999999999992 47.2099999999992 47.2199999999992 47.2299999999992 47.2399999999992 47.2499999999992 47.2599999999992 47.2699999999992 47.2799999999992 47.2899999999992 47.2999999999992 47.3099999999992 47.3199999999992 47.3299999999992 47.3399999999992 47.3499999999991 47.3599999999991 47.3699999999991 47.3799999999991 47.3899999999991 47.3999999999991 47.4099999999991 47.4199999999991 47.4299999999991 47.4399999999991 47.4499999999991 47.4599999999991 47.4699999999991 47.4799999999991 47.4899999999991 47.4999999999991 47.5099999999991 47.5199999999991 47.5299999999991 47.5399999999991 47.5499999999991 47.5599999999991 47.5699999999991 47.5799999999991 47.5899999999991 47.5999999999991 47.6099999999991 47.6199999999991 47.6299999999991 47.6399999999991 47.6499999999991 47.6599999999991 47.6699999999991 47.6799999999991 47.6899999999991 47.6999999999991 47.7099999999991 47.7199999999991 47.7299999999991 47.7399999999991 47.7499999999991 47.7599999999991 47.7699999999991 47.7799999999991 47.7899999999991 47.7999999999991 47.8099999999991 47.8199999999991 47.8299999999991 47.8399999999991 47.849999999999 47.859999999999 47.869999999999 47.879999999999 47.889999999999 47.899999999999 47.909999999999 47.919999999999 47.929999999999 47.939999999999 47.949999999999 47.959999999999 47.969999999999 47.979999999999 47.989999999999 47.999999999999 48.009999999999 48.019999999999 48.029999999999 48.039999999999 48.049999999999 48.059999999999 48.069999999999 48.079999999999 48.089999999999 48.099999999999 48.109999999999 48.119999999999 48.129999999999 48.139999999999 48.149999999999 48.159999999999 48.169999999999 48.179999999999 48.189999999999 48.199999999999 48.209999999999 48.219999999999 48.229999999999 48.239999999999 48.249999999999 48.259999999999 48.269999999999 48.279999999999 48.289999999999 48.299999999999 48.309999999999 48.319999999999 48.329999999999 48.339999999999 48.3499999999989 48.3599999999989 48.3699999999989 48.3799999999989 48.3899999999989 48.3999999999989 48.4099999999989 48.4199999999989 48.4299999999989 48.4399999999989 48.4499999999989 48.4599999999989 48.4699999999989 48.4799999999989 48.4899999999989 48.4999999999989 48.5099999999989 48.5199999999989 48.5299999999989 48.5399999999989 48.5499999999989 48.5599999999989 48.5699999999989 48.5799999999989 48.5899999999989 48.5999999999989 48.6099999999989 48.6199999999989 48.6299999999989 48.6399999999989 48.6499999999989 48.6599999999989 48.6699999999989 48.6799999999989 48.6899999999989 48.6999999999989 48.7099999999989 48.7199999999989 48.7299999999989 48.7399999999989 48.7499999999989 48.7599999999989 48.7699999999989 48.7799999999989 48.7899999999989 48.7999999999989 48.8099999999989 48.8199999999989 48.8299999999989 48.8399999999989 48.8499999999989 48.8599999999988 48.8699999999988 48.8799999999988 48.8899999999988 48.8999999999988 48.9099999999988 48.9199999999988 48.9299999999988 48.9399999999988 48.9499999999988 48.9599999999988 48.9699999999988 48.9799999999988 48.9899999999988 48.9999999999988 49.0099999999988 49.0199999999988 49.0299999999988 49.0399999999988 49.0499999999988 49.0599999999988 49.0699999999988 49.0799999999988 49.0899999999988 49.0999999999988 49.1099999999988 49.1199999999988 49.1299999999988 49.1399999999988 49.1499999999988 49.1599999999988 49.1699999999988 49.1799999999988 49.1899999999988 49.1999999999988 49.2099999999988 49.2199999999988 49.2299999999988 49.2399999999988 49.2499999999988 49.2599999999988 49.2699999999988 49.2799999999988 49.2899999999988 49.2999999999988 49.3099999999988 49.3199999999988 49.3299999999988 49.3399999999988 49.3499999999988 49.3599999999987 49.3699999999987 49.3799999999987 49.3899999999987 49.3999999999987 49.4099999999987 49.4199999999987 49.4299999999987 49.4399999999987 49.4499999999987 49.4599999999987 49.4699999999987 49.4799999999987 49.4899999999987 49.4999999999987 49.5099999999987 49.5199999999987 49.5299999999987 49.5399999999987 49.5499999999987 49.5599999999987 49.5699999999987 49.5799999999987 49.5899999999987 49.5999999999987 49.6099999999987 49.6199999999987 49.6299999999987 49.6399999999987 49.6499999999987 49.6599999999987 49.6699999999987 49.6799999999987 49.6899999999987 49.6999999999987 49.7099999999987 49.7199999999987 49.7299999999987 49.7399999999987 49.7499999999987 49.7599999999987 49.7699999999987 49.7799999999987 49.7899999999987 49.7999999999987 49.8099999999987 49.8199999999987 49.8299999999987 49.8399999999987 49.8499999999987 49.8599999999986 49.8699999999986 49.8799999999986 49.8899999999986 49.8999999999986 49.9099999999986 49.9199999999986 49.9299999999986 49.9399999999986 49.9499999999986 49.9599999999986 49.9699999999986 49.9799999999986 49.9899999999986
-
-# sin(x)
-0 0.00999983333416666 0.0199986666933331 0.0299955002024957 0.0399893341866342 0.0499791692706783 0.0599640064794446 0.0699428473375328 0.0799146939691727 0.089878549198011 0.0998334166468281 0.109778300837175 0.119712207288919 0.129634142619695 0.139543114644236 0.149438132473599 0.159318206614246 0.169182349066996 0.179029573425824 0.188858894976501 0.198669330795061 0.2084598998461 0.218229623080869 0.227977523535188 0.237702626427135 0.247403959254523 0.257080551892155 0.266731436688831 0.276355648564114 0.285952225104836 0.29552020666134 0.305058636443444 0.314566560616118 0.324043028394868 0.333487092140815 0.342897807455452 0.35227423327509 0.361615431964962 0.370920469412983 0.380188415123162 0.389418342308651 0.398609327984423 0.40776045305957 0.416870802429211 0.425939465066 0.43496553411123 0.44394810696552 0.452886285379068 0.461779175541483 0.470625888171158 0.479425538604203 0.488177246882908 0.496880137843737 0.505533341204847 0.514135991653113 0.522687228930659 0.531186197920884 0.53963204873397 0.548023936791874 0.556361022912784 0.564642473395036 0.572867460100482 0.581035160537305 0.58914475794227 0.597195441362392 0.60518640573604 0.613116851973434 0.62098598703656 0.628793024018469 0.636537182221968 0.644217687237691 0.651833771021537 0.659384671971473 0.666869635003698 0.674287911628145 0.681638760023334 0.688921445110552 0.696135238627357 0.70327941920041 0.710353272417608 0.717356090899523 0.724287174370143 0.731145829726896 0.737931371109963 0.74464311997086 0.751280405140293 0.757842562895277 0.764328937025505 0.77073887889897 0.777071747526824 0.783326909627484 0.789503739689951 0.795601620036366 0.801619940883778 0.807558100405115 0.813415504789374 0.819191568300999 0.82488571333845 0.830497370491971 0.836025978600521 0.841470984807897 0.846831844618016 0.852108021949363 0.857298989188604 0.862404227243339 0.867423225594017 0.872355482344987 0.877200504274682 0.881957806884948 0.886626914449488 0.891207360061436 0.895698685680048 0.900100442176505 0.904412189378826 0.908633496115884 0.912763940260521 0.916803108771767 0.920750597736136 0.924606012408021 0.928368967249167 0.932039085967227 0.935616001553386 0.939099356319068 0.942488801931698 0.945783999449539 0.948984619355587 0.952090341590516 0.955100855584692 0.958015860289225 0.960835064206073 0.963558185417193 0.966184951612734 0.968715100118265 0.971148377921045 0.97348454169532 0.975723357826659 0.977864602435316 0.979908061398614 0.98185353037236 0.983700814811277 0.98544972998846 0.98710010101385 0.98865176285172 0.990104560337178 0.991458348191687 0.992712991037589 0.993868363411645 0.994924349777581 0.99588084453764 0.996737752043144 0.997494986604055 0.998152472497548 0.998710143975583 0.999167945271476 0.999525830605479 0.999783764189357 0.999941720229966 0.999999682931835 0.99995764649874 0.999815615134291 0.999573603041505 0.999231634421391 0.998789743470524 0.998247974377632 0.997606381319174 0.996865028453919 0.996023989916537 0.99508334981018 0.994043202198076 0.992903651094118 0.991664810452468 0.990326804156158 0.988889766004701 0.987353839700716 0.985719178835553 0.983985946873937 0.982154317137618 0.980224472788045 0.978196606808044 0.976070921982524 0.973847630878195 0.971526955822315 0.969109128880456 0.966594391833297 0.963982996152448 0.9612752029753 0.958471283078914 0.955571516852944 0.952576194271595 0.94948561486463 0.946300087687414 0.94301993129001 0.939645473685324 0.936177052316306 0.9326150140222 0.928959715003869 0.925211520788168 0.921370806191395 0.917437955281809 0.913413361341225 0.909297426825681 0.9050905633252 0.900793191522627 0.89640574115156 0.891928650953379 0.887362368633375 0.882707350815974 0.877964062999078 0.873132979507517 0.868214583445613 0.863209366648874 0.858117829634809 0.852940481552877 0.847677840133571 0.842330431636647 0.836898790798499 0.831383460778684 0.825784993105609 0.820103947621376 0.814340892425798 0.808496403819592 0.802571066246749 0.796565472236089 0.790480222342007 0.784315925084422 0.778073196887924 0.771752662020128 0.765354952529256 0.758880708180925 0.752330576394174 0.745705212176724 0.739005278059474 0.732231444030255 0.725384387466824 0.71846479306913 0.711473352790849 0.704410765770181 0.697277738259943 0.690074983556941 0.682803221930645 0.675463180551156 0.668055593416497 0.660581201279206 0.653040751572271 0.645434998334377 0.63776470213451 0.630030629995899 0.622233555319312 0.614374257805719 0.606453523378322 0.598472144103964 0.590430918113921 0.58233064952409 0.574172148354581 0.565956230448711 0.557683717391426 0.549355436427136 0.540972220376998 0.53253490755563 0.524044341687286 0.515501371821474 0.506906852248063 0.498261642411849 0.48956660682661 0.480822614988659 0.472030541289894 0.463191264930357 0.454305669830318 0.445374644541883 0.436399082160138 0.427379880233842 0.418317940675671 0.40921416967203 0.400069477592433 0.390884778898466 0.381660992052345 0.372399039425069 0.363099847204182 0.353764345301157 0.344393467258405 0.33498815015592 0.325549334517575 0.316077964217069 0.306574986383539 0.297041351306848 0.287478012342561 0.277885925816603 0.268266050929635 0.258619349661128 0.24894678667317 0.239249329214 0.229527947021282 0.219783612225135 0.210017299250917 0.200229984721789 0.190422647361046 0.180596267894252 0.170751828951165 0.160890314967475 0.151012712086364 0.141120008059887 0.131213192150204 0.12129325503065 0.11136118868667 0.101417986316623 0.091464642232458 0.0815021517602904 0.071531511140865 0.0615537174299349 0.0515697683985564 0.0415806624333127 0.0315873984364761 0.0215909757261186 0.0115923939361809 0.00159265291650992 -0.00840724736712553 -0.0184063069330303 -0.0284035258835803 -0.0383979045052114 -0.0483884433683902 -0.0583741434275557 -0.0683540061210234 -0.0783270334708405 -0.0882922281825828 -0.0982485937450835 -0.108195134530083 -0.118130855891792 -0.128054764266354 -0.137965867271201 -0.147863173804293 -0.157745694143222 -0.167612440044192 -0.177462424840834 -0.187294663542877 -0.197108172934643 -0.206901971673373 -0.216675080387353 -0.226426521773856 -0.23615532069687 -0.245860504284609 -0.255541102026804 -0.265196145871746 -0.274824670323096 -0.284425712536434 -0.29399831241554 -0.303541512708401 -0.313054359102942 -0.32253590032245 -0.331985188220706 -0.341401277876792 -0.350783227689591 -0.36013009947194 -0.369440958544448 -0.378714873828969 -0.387950917941701 -0.397148167285931 -0.406305702144388 -0.415422606771217 -0.424497969483553 -0.433530882752688 -0.442520443294823 -0.451465752161394 -0.460365914828969 -0.469220041288698 -0.478027246135313 -0.48678664865567 -0.495497372916815 -0.504158547853582 -0.512769307355694 -0.521328790354377 -0.529836140908464 -0.538290508289988 -0.546691047069257 -0.555036917199394 -0.56332728410034 -0.571561318742314 -0.579738197728713 -0.587857103378453 -0.595917223807735 -0.603917753011231 -0.61185789094269 -0.619736843594934 -0.627553823079264 -0.635308047704247 -0.64299874205388 -0.650625137065138 -0.658186470104876 -0.66568198504609 -0.673110932343533 -0.680472569108665 -0.687766159183945 -0.694990973216444 -0.702146288730777 -0.709231390201358 -0.716245569123943 -0.723188124086484 -0.730058360839272 -0.736855592364356 -0.743579138944247 -0.750228328229892 -0.756802495307901 -0.763300982767047 -0.769723140763998 -0.776068327088306 -0.782335907226627 -0.788525254426169 -0.794635749757372 -0.800666782175792 -0.806617748583215 -0.812488053887959 -0.818277111064386 -0.823984341211601 -0.829609173611347 -0.83515104578507 -0.840609403550171 -0.845983701075423 -0.851273400935551 -0.856477974164978 -0.861596900310718 -0.866629667484422 -0.871575772413566 -0.87643472049178 -0.881206025828304 -0.885889211296581 -0.890483808581968 -0.894989358228563 -0.899405409685157 -0.903731521350286 -0.907967260616386 -0.912112203913061 -0.916165936749436 -0.920128053755605 -0.92399815872317 -0.927775864644858 -0.931460793753225 -0.935052577558432 -0.938550856885091 -0.941955281908185 -0.945265512188047 -0.94848121670441 -0.951602073889501 -0.954627771660202 -0.957558007449257 -0.960392488235529 -0.963130930573303 -0.965773060620626 -0.968318614166695 -0.970767336658276 -0.973118983225162 -0.975373318704655 -0.977530117665086 -0.979589164428357 -0.981550253091506 -0.983413187547301 -0.98517778150385 -0.986843858503228 -0.988411251939122 -0.989879805073496 -0.99124937105226 -0.992519812919957 -0.993691003633458 -0.99476282607467 -0.99573517306224 -0.996607947362281 -0.997381061698089 -0.998054438758876 -0.998628011207496 -0.999101721687182 -0.999475522827282 -0.999749377247993 -0.9999232575641 -0.999997146387718 -0.999971036330025 -0.999844930002005 -0.999618840014187 -0.99929278897538 -0.998866809490417 -0.998340944156891 -0.997715245560897 -0.996989776271774 -0.996164608835846 -0.995239825769168 -0.994215519549278 -0.993091792605942 -0.99186875731092 -0.990546535966721 -0.989125260794379 -0.987605073920225 -0.98598612736168 -0.984268583012052 -0.982452612624344 -0.980538397794081 -0.978526129941151 -0.976416010290663 -0.974208249852823 -0.971903069401835 -0.969500699453824 -0.967001380243782 -0.964405361701547 -0.96171290342681 -0.958924274663156 -0.956039754271136 -0.953059630700387 -0.94998420196078 -0.946813775592629 -0.943548668635927 -0.94018920759865 -0.936735728424101 -0.933188576457321 -0.929548106410549 -0.925814682327757 -0.921988677548241 -0.918070474669293 -0.914060465507933 -0.909959051061738 -0.905766641468732 -0.901483655966383 -0.897110522849671 -0.892647679428264 -0.888095571982785 -0.883454655720184 -0.878725394728222 -0.873908261929055 -0.869003739031949 -0.864012316485108 -0.858934493426627 -0.853770777634579 -0.84852168547624 -0.843187741856454 -0.837769480165135 -0.832267442223939 -0.826682178232075 -0.821014246711287 -0.815264214450004 -0.80943265644666 -0.803520155852197 -0.797527303911747 -0.791454699905509 -0.785302951088824 -0.779072672631447 -0.772764487556032 -0.76637902667583 -0.759916928531607 -0.753378839327793 -0.74676541286786 -0.740077310488943 -0.733315200995705 -0.726479760593463 -0.719571672820558 -0.712591628480013 -0.705540325570444 -0.698418469216266 -0.69122677159718 -0.683965951876954 -0.676636736131511 -0.669239857276317 -0.661776054993093 -0.654246075655848 -0.64665067225624 -0.638990604328281 -0.631266637872379 -0.623479545278744 -0.615630105250146 -0.607719102724046 -0.599747328794104 -0.591715580631071 -0.583624661403069 -0.57547538019528 -0.567268551929032 -0.559004997280313 -0.550685542597702 -0.542311019819735 -0.53388226639171 -0.525400125181946 -0.516865444397496 -0.508279077499326 -0.49964188311697 -0.49095472496267 -0.482218471745001 -0.473433997082005 -0.464602179413827 -0.455723901914876 -0.446800052405502 -0.437831523263219 -0.428819211333468 -0.419764017839932 -0.410666848294415 -0.401528612406289 -0.392350223991528 -0.383132600881326 -0.373876664830312 -0.364583341424377 -0.355253559988119 -0.345888253491905 -0.336488358458582 -0.327054814869819 -0.317588566072113 -0.308090558682457 -0.298561742493673 -0.289003070379441 -0.279415498199006 -0.269799984701597 -0.26015749143055 -0.250488982627157 -0.240795425134241 -0.231077788299474 -0.221337043878442 -0.211574165937468 -0.201790130756212 -0.191985916730039 -0.18216250427218 -0.172320875715695 -0.162462015215239 -0.152586908648646 -0.142696543518344 -0.132791908852603 -0.122873995106636 -0.112943794063554 -0.103002298735184 -0.0930505032627764 -0.083089402817584 -0.0731199935013508 -0.0631432722467005 -0.0531602367174448 -0.0431718852088174 -0.0331792165476456 -0.0231832299924682 -0.013184925133611 -0.0031853017932277 0.00681464007468047 0.01681390048426 0.0268114795178027 0.0368063774257364 0.0467975947265994 0.0567841323069876 0.0667649915214651 0.0767391742924277 0.0867056832099102 0.0966635216313262 0.106611693781132 0.116549204850402 0.126475061096311 0.136388269941506 0.146287840073364 0.15617278154312 0.166042105864865 0.175894826114392 0.185729957027886 0.195546515100452 0.205343518684462 0.215119988087724 0.224874945671442 0.234607415947988 0.244316425678446 0.254001003969931 0.263660182372687 0.273292994976921 0.282898478509401 0.292475672429778 0.302023619026641 0.311541363513287 0.321027954123198 0.33048244220522 0.339903882318422 0.349291332326644 0.358643853492709 0.367960510572294 0.377240371907454 0.386482509519789 0.39568599920324 0.404849920616508 0.413973357375088 0.423055397142908 0.432095131723557 0.441091657151113 0.450044073780529 0.458951486377602 0.467813004208496 0.476627741128811 0.485394815672203 0.494113351138521 0.502782475681485 0.511401322395865 0.519969029404172 0.528484739942845 0.536947602447926 0.545356770640216 0.553711403609906 0.562010665900659 0.570253727593162 0.578439764388116 0.586567957688663 0.594637494682246 0.60264756842189 0.610597377906897 0.618486128162942 0.626313030321575 0.634077301699101 0.641778165874853 0.649414852768832 0.65698659871871 0.664492646556204 0.671932245682784 0.679304652144737 0.686609128707562 0.693844944929688 0.701011377235523 0.708107708987809 0.715133230559283 0.722087239403645 0.728969040125803 0.735777944551421 0.74251327179573 0.749174348331618 0.755760508056983 0.762271092361341 0.768705450191686 0.775062938117599 0.781342920395582 0.787544769032644 0.793667863849087 0.799711592540533 0.805675350739149 0.811558542074084 0.817360578231109 0.823080879011443 0.828718872389774 0.834273994571462 0.83974569004892 0.845133411657158 0.850436620628506 0.855654786646486 0.860787387898845 0.865833911129734 0.870793851691036 0.875666713592828 0.880452009552981 0.885149261045886 0.889757998350308 0.894277760596358 0.898708095811577 0.903048560966136 0.907298722017136 0.911458153952014 0.915526440831044 0.919503175828926 0.923387961275475 0.927180408695384 0.930880138847071 0.934486781760605 0.937999976774699 0.941419372572779 0.944744627218116 0.947975408188015 0.951111392407073 0.95415226627948 0.957097725720383 0.959947476186293 0.962701232704538 0.965358719901761 0.967919672031457 0.970383833000546 0.972750956394986 0.97502080550441 0.977193153345798 0.979267782686176 0.981244486064339 0.983123065811597 0.98490333407154 0.986585112818826 0.988168233876982 0.989652538935221 0.991037879564274 0.992324117231232 0.993511123313402 0.994598779111164 0.995586975859843 0.99647561474059 0.997264606890257 0.997953873410285 0.998543345374598 0.999032963836491 0.999422679834524 0.999712454397423 0.999902258547973 0.999992073305918 0.999981889689856 0.999871708718141 0.999661541408777 0.999351408778321 0.998941341839778 0.998431381599498 0.997821579053083 0.997111995180276 0.996302700938876 0.995393777257632 0.994385315028154 0.993277415095824 0.992070188249714 0.990763755211501 0.9893582466234 0.9878538030351 0.986250574889705 0.984548722508693 0.982748416075885 0.980849835620424 0.978853170998774 0.976758621875731 0.974566397704464 0.972276717705562 0.969889810845117 0.967405915811827 0.964825280993125 0.962148164450342 0.959374833892901 0.956505566651547 0.953540649650613 0.950480379379329 0.947325061862171 0.944075012628262 0.940730556679817 0.937292028459643 0.933759771817698 0.930134139976701 0.926415495496816 0.922604210239391 0.918700665329777 0.914705251119211 0.910618367145785 0.90644042209449 0.902171833756351 0.897813028986643 0.893364443662212 0.888826522637882 0.884199719701975 0.879484497530928 0.87468132764303 0.869790690351266 0.86481307471529 0.859748978492517 0.854598908088351 0.849363378505539 0.844042913292676 0.838638044491852 0.833149312585441 0.82757726644206 0.82192246326168 0.816185468519907 0.810366855911435 0.804467207292675 0.798487112623573 0.792427169908612 0.786287985137014 0.78007017222214 0.7737743529401 0.767401156867576 0.760951221318864 0.754425191282144 0.747823719354982 0.741147465679068 0.734397097874207 0.727573290971555 0.720676727346114 0.713708096648501 0.706668095735977 0.699557428602768 0.692376806309662 0.685126946912903 0.67780857539239 0.670422423579176 0.662969230082288 0.655449740214865 0.647864705919626 0.64021488569368 0.632501044512676 0.624723953754303 0.616884391121157 0.608983140562966 0.601020992198204 0.592998742235071 0.584917192891878 0.576777152316826 0.568579434507188 0.560324859227914 0.552014251929653 0.543648443666209 0.535228271011438 0.526754575975587 0.5182282059211 0.509650013477876 0.501020856458011 0.492341597770016 0.483613105332527 0.474836251987515 0.466011915413 0.457140978035285 0.448224326940717 0.439262853786973 0.430257454713902 0.421209030253906 0.412118485241891 0.402986728724783 0.393814673870623 0.384603237877254 0.375353341880599 0.36606591086255 0.356741873558468 0.347382162364314 0.337987713243408 0.328559465632833 0.319098362349494 0.309605349495833 0.300081376365227 0.290527395347052 0.280944361831447 0.271333234113778 0.261694973298808 0.252030543204587 0.24234091026607 0.232627043438477 0.222889914100395 0.213130495956644 0.203349764940905 0.19354869911813 0.183728278586733 0.173889485380584 0.164033303370804 0.154160718167381 0.144272717020608 0.13437028872236 0.124454423507215 0.114526112953431 0.104586349883789 0.0946361282663139 0.0846764431148754 0.0747082903896889 0.0647326668977201 0.0547505701930053 0.0447629984768964 0.0347709504982423 0.024775425453514 0.0147774228868865 0.00477794259028483 -0.0052220154965943 -0.0152214513862754 -0.0252193651435025 -0.0352147569852312 -0.0452066273806069 -0.0551939771509167 -0.0651758075695061 -0.0751511204616517 -0.0851189183043767 -0.0950782043262036 -0.105027982606829 -0.114967258176718 -0.124895037116594 -0.134810326656837 -0.144712135276756 -0.154599472803741 -0.164471350512278 -0.174326781222822 -0.184164779400516 -0.19398436125374 -0.203784544832492 -0.213564350126581 -0.223322799163626 -0.233058916106857 -0.242771727352693 -0.252460261628102 -0.262123550087731 -0.271760626410787 -0.281370526897668 -0.290952290566334 -0.300504959248403 -0.310027577684968 -0.319519193622119 -0.328978857906173 -0.338405624578584 -0.347798550970542 -0.357156697797233 -0.366479129251775 -0.375764913098789 -0.38501312076763 -0.394222827445238 -0.403393112168618 -0.412523057916942 -0.421611751703242 -0.430658284665714 -0.4396617521586 -0.448621253842654 -0.457535893775173 -0.466404780499593 -0.475227027134633 -0.48400175146298 -0.492728076019515 -0.501405128179053 -0.510032040243609 -0.518607949529166 -0.527131998451943 -0.535603334614149 -0.544021110889228 -0.552384485506568 -0.560692622135676 -0.568944689969813 -0.577139863809072 -0.585277324142898 -0.59335625723204 -0.60137585518992 -0.609335316063426 -0.617233843913103 -0.625070648892749 -0.632844947328396 -0.640555961796679 -0.648202921202578 -0.655785060856523 -0.663301622550869 -0.670751854635709 -0.678135012094044 -0.685450356616279 -0.69269715667406 -0.699874687593419 -0.706982231627246 -0.71401907802706 -0.720984523114085 -0.727877870349617 -0.734698430404677 -0.741445521228944 -0.748118468118956 -0.754716603785587 -0.761239268420767 -0.76768580976347 -0.774055583164932 -0.780347951653122 -0.786562285996434 -0.792697964766613 -0.798754374400895 -0.804730909263363 -0.810626971705511 -0.81644197212601 -0.822175329029661 -0.827826469085554 -0.833394827184391 -0.838879846495003 -0.84428097852003 -0.84959768315077 -0.854829428721191 -0.859975692061095 -0.865035958548436 -0.870009722160784 -0.874896485525922 -0.879695759971585 -0.884407065574328 -0.889029931207517 -0.893563894588441 -0.898008502324541 -0.902363309958746 -0.906627882013922 -0.910801792036417 -0.914884622638707 -0.918875965541135 -0.922775421612737 -0.926582600911154 -0.930297122721629 -0.933918615595078 -0.93744671738523 -0.940881075284846 -0.944221345860999 -0.947467195089414 -0.950618298387873 -0.953674340648673 -0.956635016270135 -0.959500029187162 -0.962269092900851 -0.964941930507139 -0.967518274724491 -0.969997867920634 -0.972380462138313 -0.974665819120093 -0.976853710332179 -0.978943916987275 -0.980936230066455 -0.982830450340073 -0.98462638838768 -0.986323864616967 -0.987922709281727 -0.989422762498824 -0.990823874264188 -0.992125904467809 -0.993328722907752 -0.994432209303175 -0.995436253306359 -0.99634075451374 -0.997145622475951 -0.997850776706866 -0.99845614669165 -0.998961671893808 -0.999367301761243 -0.999672995731305 -0.999878723234851 -0.999984463699304 -0.999990206550704 -0.999895951214772 -0.999701707116962 -0.999407493681522 -0.999013340329551 -0.998519286476056 -0.997925381526009 -0.997231684869412 -0.996438265875351 -0.995545203885065 -0.994552588204009 -0.993460518092924 -0.99226910275791 -0.990978461339509 -0.989588722900786 -0.988100026414428 -0.986512520748842 -0.984826364653273 -0.983041726741924 -0.981158785477099 -0.979177729151357 -0.977098755868678 -0.974922073524658 -0.972647899785718 -0.970276462067337 -0.967807997511311 -0.965242752962037 -0.962580984941833 -0.959822959625283 -0.95696895281262 -0.954019249902148 -0.950974145861699 -0.947833945199139 -0.944598961931919 -0.941269519555668 -0.937845951011851 -0.934328598654468 -0.930717814215824 -0.927013958771355 -0.923217402703517 -0.919328525664754 -0.915347716539529 -0.911275373405438 -0.907111903493399 -0.902857723146935 -0.898513257780536 -0.894078941837117 -0.889555218744578 -0.884942540871457 -0.8802413694817 -0.875452174688526 -0.870575435407424 -0.865611639308258 -0.860561282766503 -0.855424870813603 -0.850202917086473 -0.844895943776134 -0.839504481575496 -0.834029069626285 -0.828470255465133 -0.822828594968824 -0.817104652298706 -0.811298999844277 -0.805412218165944 -0.799444895936969 -0.793397629884601 -0.787271024730408 -0.781065693129799 -0.774782255610763 -0.768421340511815 -0.761983583919166 -0.755469629603108 -0.748880128953646 -0.742215740915354 -0.735477131921481 -0.728664975827311 -0.721779953842778 -0.714822754464341 -0.707794073406142 -0.700694613530428 -0.693525084777272 -0.686286204093574 -0.678978695361369 -0.671603289325442 -0.66416072352025 -0.656651742196172 -0.649077096245082 -0.641437543125263 -0.633733846785661 -0.62596677758949 -0.618137112237198 -0.610245633688794 -0.602293131085558 -0.594280399671123 -0.586208240711953 -0.578077461417216 -0.569888874858068 -0.561643299886339 -0.553341561052656 -0.544984488523985 -0.536572918000613 -0.528107690632584 -0.51958965293558 -0.511019656706272 -0.502398558937142 -0.493727221730783 -0.485006512213688 -0.476237302449543 -0.467420469352015 -0.458556894597069 -0.449647464534792 -0.440693070100766 -0.431694606726974 -0.422652974252253 -0.413569076832317 -0.404443822849337 -0.395278124821107 -0.386072899309793 -0.376829066830274 -0.367547551758095 -0.358229282237029 -0.348875190086263 -0.339486210707217 -0.330063282990004 -0.320607349219543 -0.311119354981333 -0.30160024906689 -0.292050983378873 -0.282472512835893 -0.272865795277023 -0.263231791366012 -0.253571464495223 -0.243885780689294 -0.234175708508534 -0.224442218952068 -0.214686285360742 -0.204908883319784 -0.195110990561252 -0.185293586866255 -0.175457653966982 -0.165604175448527 -0.15573413665053 -0.145848524568645 -0.135948327755844 -0.126034536223558 -0.116108141342677 -0.106170135744419 -0.0962215132210608 -0.0862632686265651 -0.0762963977770924 -0.0663218973514222 -0.056340764791285 -0.046353998201619 -0.0363625962507611 -0.0263675580705802 -0.0163698831565652 -0.00637057126787595 0.00362937767263125 0.0136289636783957 0.0236271867991497 0.033623047220913 0.0436155453659734 0.0536036819928433 0.0635864582961835 0.0735628760066827 0.0835319374908834 0.0934926458509447 0.103444005024331 0.113385019883418 0.123314696335004 0.133232041419719 0.143136063411317 0.153025771915855 0.162900177970721 0.172758294143541 0.18259913463091 0.192421715356983 0.20222505407187 0.21200817044987 0.221770086187499 0.231509825101316 0.241226413225547 0.250918878909478 0.260586252914615 0.270227568511616 0.279841861576955 0.289428170689336 0.298985537225838 0.308513005457771 0.318009622646252 0.327474439137475 0.336906508457679 0.346304887407791 0.35566863615775 0.364996818340482 0.374288501145543 0.383542755412395 0.392758655723324 0.401935280495979 0.411071712075529 0.42016703682643 0.429220345223786 0.438230731944303 0.447197295956816 0.456119140612396 0.464995373734014 0.473825107705752 0.482607459561574 0.49134155107361 0.500026508839989 0.508661464372172 0.5172455541818 0.525777919867047 0.534257708198454 0.542684071204254 0.551056166255169 0.559373156148671 0.5676342091927 0.575838499288837 0.583985206014909 0.592073514707033 0.600102616541078 0.608071708613553 0.615979994021892 0.623826681944143 0.631610987718054 0.639332132919534 0.646989345440497 0.654581859566071 0.662108916051173 0.669569762196424 0.676963651923429 0.684289845849376 0.691547611360978 0.698736222687732 0.705854960974495 0.712903114353371 0.719879978014895 0.726784854278516 0.733617052662362 0.740375889952286 0.747060690270193 0.753670785141622 0.760205513562594 0.766664222065711 0.773046264785507 0.779351003523027 0.785577807809652 0.791726054970142 0.797795130184905 0.803784426551476 0.80969334514521 0.815521295079172 0.821267693563225 0.826931965962309 0.832513545853904 0.838011875084673 0.843426403826274 0.848756590630346 0.854001902482649 0.85916181485637 0.864235811764572 0.86922338581179 0.874124038244779 0.878937279002377 0.88366262676452 0.888299609000369 0.892847762015566 0.897306630998599 0.901675770066284 0.905954742308357 0.910143119831159 0.914240483800428 0.918246424483182 0.92216054128869 0.925982442808533 0.929711746855746 0.933348080503029 0.936891080120051 0.9403403914098 0.943695669444022 0.94695657869771 0.950122793082657 0.953193995980062 0.956169880272194 0.959050148373105 0.961834512258384 0.964522693493963 0.96711442326396 0.969609442397555 0.972007501394917 0.974308360452142 0.976511789485243 0.978617568153153 0.980625485879759 0.982535341874963 0.984346945154755 0.986060114560319 0.987674678776141 0.989190476347144 0.990607355694836 0.991925175132461 0.993143802879175 0.994263117073217 0.995283005784103 0.996203367023809 0.99702410875698 0.997745148910126 0.998366415379833 0.998887846039971 0.999309388747908 0.999631001349726 0.999852651684432 0.999974317587177 0.999995986891473 0.999917657430406 0.999739337036859 0.999461043542721 0.999082804777111 0.998604658563589 0.998026652716378 0.997348845035582 0.996571303301403 0.995694105267368 0.994717338652548 0.993641101132792 0.992465500330953 0.991190653806134 0.989816689041923 0.988343743433652 0.986771964274656 0.985101508741539 0.983332543878463 0.98146524658044 0.979499803575644 0.977436411406738 0.975275276411218 0.973016614700785 0.970660652139725 0.968207624322333 0.965657776549346 0.963011363803416 0.960268650723612 0.957429911578957 0.954495430241 0.951465500155429 0.948340424312727 0.945120515217876 0.9418060948591 0.938397494675675 0.934895055524777 0.931299127647403 0.927610070633345 0.923828253385229 0.919954054081629 0.915987860139246 0.91193006817417 0.907781083962216 0.903541322398348 0.899211207455188 0.894791172140623 0.890281658454501 0.885683117344432 0.880996008660695 0.876220801110254 0.871357972209883 0.86640800823842 0.861371404188138 0.856248663715243 0.851040299089516 0.845746831143077 0.840368789218311 0.834906711114928 0.829361143036187 0.823732639534274 0.818021763454849 0.812229085880762 0.806355186074941 0.800400651422474 0.794366077371862 0.788252067375483 0.782059232829241 0.77578819301143 0.769439575020806 0.763014013713877 0.75651215164142 0.749934638984223 0.743282133488071 0.73655530039797 0.729754812391624 0.722881349512165 0.715935599100154 0.708918255724844 0.701830021114725 0.694671604087351 0.687443720478459 0.680147093070387 0.672782451519796 0.665350532284703 0.657852078550838 0.650287840157326 0.642658573521703 0.634965041564275 0.627208013631827 0.619388265420687 0.61150657889916 0.60356374222933 0.595560549688246 0.587497801588491 0.579376304198157 0.571196869660216 0.562960315911304 0.554667466599934 0.546319151004124 0.537916203948479 0.529459465720701 0.520949781987565 0.512388003710355 0.503774987059761 0.495111593330273 0.486398688854043 0.477637144914259 0.468827837658013 0.45997164800869 0.451069461577875 0.442122168576791 0.433130663727284 0.424095846172345 0.415018619386201 0.405899891083966 0.396740573130871 0.38754158145108 0.378303835936093 0.369028260352765 0.359715782250924 0.350367332870621 0.340983847049002 0.33156626312683 0.32211552285465 0.312632571298613 0.303118356745973 0.293573830610256 0.283999947336122 0.27439766430392 0.264767941733952 0.255111742590449 0.24543003248528 0.235723779581387 0.225993954495971 0.216241530203434 0.206467481938076 0.196672787096581 0.186858425140269 0.177025377497159 0.167174627463819 0.157307160107044 0.147423962165348 0.137526021950288 0.127614329247638 0.117689875218408 0.10775365229973 0.0978066541056171 0.0878498753275988 0.0778843116352557 0.0679109595766525 0.0579308164786839 0.0479448803473429 0.0379541497679211 0.0279596238051509 0.0179623019032998 0.00796318378622688 -0.00203673064258869 -0.0120364414000373 -0.0220349485233762 -0.0320312521702252 -0.0420243527185497 -0.0520132508666226 -0.0619969477329531 -0.0719744449561742 -0.0819447447948782 -0.0919068502273898 -0.101859765051467 -0.111802493983923 -0.121734042760148 -0.131653418233542 -0.141559628474824 -0.151451682871224 -0.161328592225546 -0.171189368855086 -0.181033026690397 -0.1908585813739 -0.200665050358314 -0.210451453004912 -0.220216810681585 -0.229960146860704 -0.239680487216769 -0.249376859723846 -0.259048294752764 -0.268693825168079 -0.278312486424788 -0.287903316664781 -0.297465356813026 -0.306997650673479 -0.316499245024695 -0.325969189715157 -0.335406537758287 -0.344810345427146 -0.354179672348803 -0.363513581598374 -0.372811139792713 -0.382071417183746 -0.391293487751454 -0.400476429296463 -0.409619323532271 -0.418721256177075 -0.427781317045194 -0.436798600138092 -0.445772203734973 -0.454701230482957 -0.463584787486809 -0.472421986398231 -0.481211943504698 -0.489953779817822 -0.498646621161258 -0.507289598258116 -0.515881846817887 -0.524422507622877 -0.532910726614122 -0.541345654976796 -0.549726449225092 -0.55805227128657 -0.566322288585961 -0.574535674128427 -0.582691606582258 -0.590789270361006 -0.598827855705041 -0.606806558762526 -0.614724581669806 -0.622581132631187 -0.630375425998121 -0.638106682347767 -0.645774128560931 -0.653376997899383 -0.660914530082524 -0.668385971363416 -0.675790574604159 -0.683127599350599 -0.690396311906374 -0.697595985406287 -0.704725899888987 -0.711785342368968 -0.718773606907865 -0.725689994685047 -0.7325338140675 -0.739304380678989 -0.746001017468495 -0.752623054777919 -0.75916983040905 -0.765640689689779 -0.772034985539571 -0.778352078534169 -0.784591336969538 -0.790752136925035 -0.796833862325796 -0.802835905004351 -0.808757664761434 -0.814598549426002 -0.820357974914458 -0.826035365289052 -0.831630152815477 -0.837141778019644 -0.842569689743624 -0.847913345200769 -0.853172210029986 -0.858345758349175 -0.863433472807814 -0.868434844638698 -0.873349373708812 -0.878176568569343 -0.882915946504828 -0.887567033581424 -0.892129364694299 -0.896602483614143 -0.900985943032791 -0.905279304607955 -0.909482139007056 -0.913594025950155 -0.917614554251984 -0.921543321863065 -0.92537993590991 -0.929124012734311 -0.932775177931706 -0.936333066388617 -0.939797322319165 -0.943167599300643 -0.946443560308161 -0.949624877748348 -0.952711233492112 -0.955702318906451 -0.958597834885314 -0.961397491879518 -0.964101009925695 -0.966708118674295 -0.969218557416615 -0.971632075110873 -0.97394843040731 -0.976167391672327 -0.978288737011648 -0.980312254292505 -0.982237741164857 -0.984065005081621 -0.985793863317928 -0.987424142989396 -0.988955681069415 -0.990388324405454 -0.991721929734374 -0.992956363696752 -0.994091502850222 -0.995127233681813 -0.996063452619306 -0.996900066041587 -0.997636990288012 -0.998274151666769 -0.998811486462251 -0.999248940941427 -0.999586471359214 -0.999824043962851 -0.999961634995276 -0.999999230697499 -0.999936827309983 -0.999774431073013 -0.999512058226079 -0.999149735006246 -0.998687497645534 -0.998125392367295 -0.997463475381587 -0.996701812879558 -0.995840481026823 -0.99487956595585 -0.993819163757344 -0.992659380470643 -0.991400332073107 -0.990042144468529 -0.988584953474536 -0.987028904809014 -0.985374154075532 -0.983620866747785 -0.981769218153045 -0.979819393454627 -0.977771587633378 -0.975626005468172 -0.973382861515438 -0.971042380087702 -0.968604795231157 -0.966070350702256 -0.963439299943341 -0.960711906057295 -0.957888441781234 -0.954969189459233 -0.951954441014091 -0.94884449791814 -0.945639671163098 -0.94234028122897 -0.938946658052001 -0.935459140991679 -0.931878078796804 -0.928203829570612 -0.924436760734964 -0.920577248993604 -0.916625680294489 -0.912582449791198 -0.908447961803409 -0.904222629776478 -0.899906876240086 -0.895501132765989 -0.891005839924865 -0.88642144724225 -0.881748413153593 -0.876987204958408 -0.872138298773548 -0.86720217948559 -0.86217934070235 -0.857070284703519 -0.851875522390441 -0.846595573235018 -0.841230965227766 -0.835782234825014 -0.830249926895262 -0.824634594664693 -0.818936799661852 -0.813157111661489 -0.807296108627588 -0.801354376655569 -0.795332509913678 -0.78923111058357 -0.783050788800094 -0.776792162590279 -0.770455857811529 -0.764042508089042 -0.757552754752446 -0.750987246771667 -0.744346640692031 -0.737631600568613 -0.730842797899829 -0.723980911560288 -0.717046627732907 -0.710040639840289 -0.702963648475386 -0.695816361331437 -0.688599493131199 -0.681313765555479 -0.673959907170963 -0.666538653357362 -0.659050746233871 -0.651496934584965 -0.643877973785512 -0.636194625725244 -0.628447658732564 -0.620637847497715 -0.612765972995313 -0.604832822406247 -0.596839189038967 -0.588785872250147 -0.580673677364756 -0.572503415595521 -0.564275903961811 -0.555991965207933 -0.54765242772086 -0.53925812544739 -0.530809897810755 -0.52230858962668 -0.513755051018898 -0.505150137334141 -0.496494709056608 -0.487789631721913 -0.479035775830537 -0.470234016760772 -0.461385234681192 -0.45249031446263 -0.443550145589696 -0.434565622071826 -0.425537642353887 -0.416467109226325 -0.407354929734895 -0.398202015089954 -0.389009280575337 -0.379777645456836 -0.370508032890269 -0.36120136982917 -0.351858586932087 -0.342480618469526 -0.333068402230517 -0.323622879428841 -0.314144994608908 -0.3046356955513 -0.295095933177999 -0.285526661457292 -0.275928837308379 -0.266303420505674 -0.256651373582837 -0.246973661736518 -0.237271252729835 -0.227545116795605 -0.217796226539316 -0.208025556841869 -0.198234084762092 -0.188422789439033 -0.178592651994048 -0.168744655432691 -0.158879784546411 -0.148999025814076 -0.139103367303324 -0.129193798571762 -0.119271310568003 -0.10933689553258 -0.0993915468987174 -0.0894362591929909 -0.0794720279358752 -0.0694998495421923 -0.0595207212214715 -0.049535640878229 -0.0395456070121783 -0.0295516186183809 -0.0195546750873479 -0.00955577610510173 0.000444078446791853 0.0104438885912108 0.0204426543554739 0.0304393758713369 0.0404330534749788 0.0504226878069673 0.0604072799121939 0.0703858313397685 0.0803573442428638 0.0903208214784991 0.100275266707254 0.1102196844929 0.120153080401946 0.130074461103079 0.139982834466498 0.149877209663121 0.159756597263675 0.169620009337633 0.179466459552007 0.189294963269981 0.199104537649372 0.208894201740919 0.21866297658637 0.22840988531638 0.2381339532482 0.247834207983139 0.257509679503807 0.267159400271116 0.27678240532103 0.286377732361063 0.295944421866508 0.305481517176385 0.314988064589111 0.324463113457868 0.333905716285664 0.343314928820086 0.35268981014772 0.362029422788246 0.371332832788184 0.380599109814286 0.389827327246572 0.399016562270987 0.408165895971689 0.41727441342293 0.426341203780557 0.435365360373088 0.444345980792386 0.453282166983891 0.462173025336432 0.471017666771582 0.479815206832569 0.488564765772716 0.497265468643423 0.505916445381651 0.514516830896937 0.523065765157896 0.531562393278226 0.540005865602195 0.548395337789607 0.556729970900235 0.565008931477713 0.573231391632883 0.58139652912658 0.58950352745186 0.597551575915646 0.605539869719799 0.613467610041594 0.621334004113607 0.629138265302985 0.636879613190113 0.644557273646652 0.652170478912957 0.659718467674844 0.667200485139726 0.674615783112094 0.681963620068328 0.689243261230856 0.696453978641629 0.703595051234914 0.710665764909402 0.71766541259962 0.724593294346629 0.73144871736803 0.738230996127233 0.744939452402013 0.751573415352333 0.758132221587428 0.764615215232139 0.771021747992503 0.777351179220584 0.783602875978534 0.789776213101886 0.795870573262073 0.801885347028156 0.807819932927772 0.813673737507277 0.81944617539109 0.825136669340233 0.830744650310054 0.836269557507129 0.841710838445341 0.847067949001133 0.852340353467912 0.857527524609626 0.862628943713483 0.867644100641823 0.872572493883133 0.877413630602196 0.882167026689375 0.886832206809022 0.891408704447011 0.895896061957395 0.90029383060816 0.904601570626106 0.908818851240823 0.912945250727761 0.916980356450412 0.920923764901565 0.924775081743663 0.928533921848229 0.932199909334386 0.93577267760644 0.939251869390542 0.942637136770411 0.945928141222132 0.949124553648002 0.952226054409441 0.955232333358959 0.958143089871164 0.960958032872833 0.96367688087201 0.966299361986161 0.96882521396936 0.971254184238514 0.973586029898619 0.975820517767054 0.977957424396893 0.979996536099254 0.981937648964667 0.983780568883461 0.985525111565182 0.987171102557014 0.98871837726123 0.990166780951649 0.99151616878911 0.992766405835952 0.993917367069513 0.994968937394629 0.995921011655143 0.996773494644423 0.997526301114881 0.998179355786496 0.998732593354346 0.999185958495135 0.999539405872726 0.999792900142677 0.999946415955772 0.999999937960557 0.999953460804876 0.999806989136406 0.999560537602193 0.999214130847183 0.998767803511765 0.998221600228299 0.997575575616659 0.996829794278767 0.995984330792136 0.99503926970241 0.993994705514911 0.992850742685185 0.991607495608565 0.99026508860872 0.988823655925233 0.98728334170017 0.98564429996367 0.983906694618541 0.98207069942387 0.980136497977646 0.978104283698402 0.975974259805873 0.973746639300672 0.971421644942993 0.968999509230336 0.966480474374252 0.963864792276129 0.961152724501996 0.958344542256371 0.955440526355138 0.952440967197467 0.949346164736774 0.946156428450727 0.942872077310296 0.939493439747858 0.936020853624354 0.932454666195502 0.928795234077073 0.92504292320923 0.921198108819933 0.917261175387416 0.913232516601743 0.909112535325433 0.904901643553182 0.900600262370658 0.896208821912395 0.891727761318779 0.887157528692135 0.882498581051917 0.877751384289006 0.872916413119124 0.867994151035358 0.862985090259815 0.857889731694397 0.852708584870715 0.847442167899135 0.842091007416964 0.836655638535791 0.831136604787976 0.825534458072293 0.819849758598746 0.814083074832545 0.808234983437261 0.802306069217161 0.796296925058724 0.790208151871361 0.784040358527314 0.77779416180078 0.771470186306226 0.76506906443593 0.758591436296746 0.75203794964609 0.745409259827165 0.73870602970343 0.731928929592311 0.725078637198172 0.718155837544543 0.71116122290562 0.70409549273704 0.69695935360593 0.689753519120256 0.682478709857464 0.675135653292416 0.66772508372465 0.660247742204947 0.652704376461228 0.645095740823782 0.637422596149831 0.629685709747449 0.621885855298828 0.614023812782915 0.606100368397407 0.598116314480142 0.590072449429857 0.581969577626355 0.573808509350063 0.565590060701008 0.557315053517207 0.548984315292482 0.540598679093712 0.532158983477531 0.523666072406466 0.515120795164548 0.506524006272379 0.497876565401685 0.489179337289346 0.480433191650926 0.471639003093701 0.462797651029198 0.453910019585255 0.444976997517611 0.435999478121028 0.426978359139964 0.417914542678801 0.408808935111631 0.399662446991622 0.390475992959965 0.381250491654408 0.371986865617393 0.362686041203804 0.353348948488333 0.343976521172469 0.334569696491133 0.325129415118956 0.315656621076207 0.306152261634397 0.29661728722155 0.28705265132716 0.277459310406848 0.26783822378671 0.258190353567391 0.248516664527874 0.238818124029 0.229095701916737 0.219350370425196 0.209583104079403 0.199794879597855 0.189986675794841 0.18015947348257 0.170314255373083 0.160452005979987 0.150573711520003 0.140680359814344 0.130772940189937 0.120852443380488 0.11091986142741 0.100976187580624 0.0910224161992252 0.0810595426520586 0.0710885632181762 0.0611104749872123 0.0511262757596749 0.0411369639471666 0.0311435384725442 0.0211469986700275 0.0111483441852662 0.00114857487537662 -0.00885130929104334 -0.0188503083339103 -0.0288474223616523 -0.0388416516711977 -0.0488319968479438 -0.0588174588656984 -0.0687970391865808 -0.0787697398608752 -0.0887345636268247 -0.0986905140103567 -0.10863659542473 -0.11857181327009 -0.128495174032933 -0.138405685385452 -0.14830235628477 -0.158184197072044 -0.168050219571431 -0.177899437188902 -0.187730865010903 -0.197543519902845 -0.207336420607416 -0.217108587842705 -0.226859044400134 -0.236586815242171 -0.246290927599839 -0.255970411069989 -0.26562429771234 -0.275251622146272 -0.284851421647365 -0.294422736243669 -0.3039646088117 -0.313476085172153 -0.322956214185318 -0.332404047846193 -0.341818641379287 -0.35119905333309 -0.360544345674225 -0.369853583881245 -0.379125837038087 -0.388360177927163 -0.397555683122078 -0.406711433079977 -0.415826512233492 -0.424900009082305 -0.433931016284292 -0.442918630746258 -0.451861953714248 -0.460760090863416 -0.469612152387464 -0.478417253087614 -0.487174512461136 -0.495883054789389 -0.504542009225398 -0.513150509880934 -0.521707695913107 -0.530212711610442 -0.53866470647846 -0.547062835324715 -0.555406258343322 -0.563694141198931 -0.571925655110164 -0.580099976932489 -0.588216289240536 -0.596273780409838 -0.604271644697992 -0.612209082325234 -0.620085299554415 -0.627899508770378 -0.635650928558711 -0.643338783783896 -0.650962305666816 -0.658520731861636 -0.666013306532036 -0.673439280426791 -0.680797910954701 -0.688088462258846 -0.69531020529017 -0.702462417880388 -0.709544384814201 -0.716555397900818 -0.723494756044772 -0.730361765316032 -0.737155739019394 -0.743875997763147 -0.750521869527019 -0.757092689729371 -0.763587801293659 -0.770006554714138 -0.776348308120816 -0.782612427343636 -0.788798285975897 -0.79490526543689 -0.800932755033758 -0.806880152022564 -0.812746861668566 -0.818532297305688 -0.824235880395188 -0.829857040583508 -0.835395215759316 -0.840849852109708 -0.846220404175595 -0.851506334906245 -0.856707115712991 -0.861822226522087 -0.866851155826712 -0.871793400738129 -0.876648467035963 -0.881415869217632 -0.88609513054689 -0.890685783101504 -0.895187367820043 -0.899599434547787 -0.90392154208174 -0.90815325821475 -0.91229415977873 -0.916343832686975 -0.920301871975569 -0.924167881843881 -0.927941475694145 -0.931622276170122 -0.935209915194832 -0.938704034007361 -0.94210428319874 -0.945410322746883 -0.948621822050591 -0.95173845996261 -0.954759924821745 -0.957685914484028 -0.960516136352932 -0.963250307408627 -0.965888154236288 -0.96842941305343 -0.970873829736288 -0.973221159845231 -0.975471168649204 -0.977623631149202 -0.979678332100769 -0.981635066035522 -0.983493637281698 -0.985253859983721 -0.986915558120787 -0.988478565524469 -0.989942725895327 -0.991307892818545 -0.992573929778569 -0.993740710172757 -0.994808117324042 -0.995776044492598 -0.996644394886516 -0.997413081671479 -0.99808202797945 -0.998651166916356 -0.999120441568776 -0.999489805009637 -0.999759220302902 -0.999928660507267 -0.999998108678852 -0.999967557872898 -0.999837011144461 -0.999606481548103 -0.999275992136594 -0.998845575958598 -0.998315276055375 -0.997685145456472 -0.996955247174426 -0.996125654198455 -0.995196449487167 -0.994167725960257 -0.993039586489221 -0.991812143887067 -0.990485520897032 -0.989059850180308 -0.987535274302781 -0.985911945720766 -0.98419002676577 -0.982369689628253 -0.980451116340411 -0.978434498757976 -0.976320038541024 -0.974107947133815 -0.971798445743646 -0.969391765318733 -0.966888146525111 -0.964287839722575 -0.961591104939636 -0.958798211847527 -0.955909439733229 -0.952925077471546 -0.949845423496218 -0.946670785770075 -0.943401481754244 -0.940037838376404 -0.936580191998088 -0.933028888381053 -0.929384282652702 -0.925646739270569 -0.921816631985879 -0.917894343806169 -0.913880266956987 -0.909774802842674 -0.90557836200622 -0.901291364088211 -0.896914237784867 -0.892447420805171 -0.887891359827097 -0.883246510452948 -0.87851333716379 -0.873692313273008 -0.868783920878973 -0.863788650816834 -0.858707002609434 -0.853539484417361 -0.848286612988126 -0.842948913604496 -0.83752692003196 -0.832021174465358 -0.826432227474658 -0.820760637949901 -0.815006973045315 -0.809171808122594 -0.803255726693369 -0.797259320360851 -0.791183188760678 -0.785027939500947 -0.778794188101452 -0.772482557932141 -0.76609368015077 -0.759628193639793 -0.753086744942473 -0.746469988198229 -0.739778585077222 -0.733013204714187 -0.726174523641522 -0.719263225721637 -0.712280002078564 -0.705225551028848 -0.698100578011715 -0.690905795518529 -0.683641923021544 -0.676309686901957 -0.668909820377269 -0.661443063427966 -0.653910162723521 -0.646311871547728 -0.63864894972337 -0.630922163536246 -0.623132285658536 -0.615280095071534 -0.607366376987757 -0.599391922772418 -0.591357529864294 -0.583264001695979 -0.575112147613546 -0.566902782795611 -0.558636728171813 -0.550314810340728 -0.541937861487202 -0.533506719299141 -0.525022226883737 -0.516485232683163 -0.507896590389722 -0.499257158860489 -0.490567802031416 -0.481829388830944 -0.473042793093113 -0.464208893470173 -0.455328573344726 -0.446402720741384 -0.437432228237968 -0.428417992876255 -0.419360916072267 -0.410261903526138 -0.401121865131541 -0.391941714884698 -0.382722370792983 -0.373464754783123 -0.364169792609004 -0.354838413759098 -0.345471551363514 -0.336070142100686 -0.326635126103705 -0.317167446866308 -0.307668051148531 -0.298137888882028 -0.288577913075083 -0.278989079717313 -0.26937234768406 -0.259728678640516 -0.250059036945547 -0.240364389555265 -0.230645705926331 -0.220903957919008 -0.21114011969998 -0.201355167644931 -0.191550080240913 -0.181725837988495 -0.171883423303716 -0.162023820419843 -0.152148015288946 -0.142256995483311 -0.132351750096674 -0.122433269645321 -0.11250254596903 -0.102560572131894 -0.0926083423230121 -0.082646851757071 -0.0726770965748263 -0.0627000737434883 -0.0527167809570257 -0.0427282165363979 -0.0327353793297233 -0.022739268612395 -0.0127408839871548 -0.00274122528413334 0.00725870753913224 0.0172579144976928 0.0272553956791852 0.0372501513438223 0.0472411820243668 0.0572274886260764 0.0672080725266128 0.077181935675903 0.0871480806959437 0.097105510980538 0.107053230794955 0.116990245375504 0.126915561029006 0.136828185232168 0.14672712673083 0.156611395639091 0.166480003538298 0.176331963575883 0.186166290564054 0.195982001078306 0.205778113555768 0.215553648393356 0.225307628045732 0.235039077123059 0.244747022488539 0.254430493355725 0.2640885213856 0.27372014078341 0.283324388395241 0.292900303804335 0.302446929427132 0.311963310609024 0.321448495719823 0.330901536248924 0.34032148690015 0.349707405686286 0.359058354023276 0.368373396824077 0.377651602592173 0.386892043514718 0.396093795555321 0.405255938546445 0.414377556281427 0.423457736606094 0.432495571509981 0.441490157217128 0.450440594276461 0.459345987651733 0.468205446811026 0.477018085815808 0.485783023409522 0.494499383105713 0.503166293275674 0.511782887235612 0.520348303333311 0.528861685034299 0.5373221810075 0.545728945210367 0.554081136973485 0.562377921084639 0.570618467872331 0.57880195328875 0.586927558992173 0.594994472428801 0.603001886914014 0.610949001713035 0.618835022121008 0.626659159542462 0.634420631570176 0.642118662063416 0.649752481225546 0.657321325681012 0.664824438551676 0.672261069532503 0.679630474966593 0.686931917919543 0.694164668253142 0.701328002698385 0.708421204927795 0.715443565627062 0.722394382565968 0.72927296066861 0.73607861208291 0.742810656249399 0.74946841996927 0.756051237471699 0.762558450480421 0.768989408279558 0.77534346777869 0.781619993577161 0.787818358027623 0.793937941298795 0.799978131437449 0.805938324429606 0.811817924260933 0.817616342976347 0.823333000738807 0.828967325887303 0.834518754994013 0.839986732920654 0.845370712873989 0.85067015646051 0.855884533740275 0.8610133232799 0.866056012204706 0.871012096250003 0.875881079811515 0.880662475994945 0.885355806664658 0.889960602491498 0.894476402999721 0.898902756613039 0.903239220699778 0.907485361617144 0.911640754754583 0.915704984576245 0.919677644662535 0.923558337750753 0.927346675774826 0.931042279904108 0.934644780581265 0.938153817559232 0.941569039937236 0.944890106195883 0.948116684231318 0.951248451388423 0.954285094493094 0.957226309883551 0.960071803440705 0.962821290617572 0.965474496467726 0.968031155672793 0.970491012568982 0.972853821172654 0.975119345204917 0.977287358115257 0.979357643104188 0.981329993144938 0.983204211004146 0.984980109261587 0.986657510328916 0.988236246467424 0.989716159804813 0.991097102350982 0.992378936012827 0.99356153260805 0.994644773877978 0.995628551499386 0.996512767095332 0.997297332244993 0.997982168492507 0.998567207354822 0.999052390328537 0.99943766889576 0.999723004528956 0.999908368694798 0.999993742857026 0.999979118478292 0.999864497021024 0.999649889947272 0.999335318717563 0.99892081478876 0.998406419610909 0.997792184623099 0.997078171248318 0.996264450887307 0.995351104911425 0.994338224654509 0.99322591140374 0.992014276389515 0.990703440774328 0.989293535640646 0.987784701977809 0.986177090667925 0.984470862470786 0.98266618800779 0.980763247744878 0.978762231974492 0.976663340796541 0.974466784098394 0.972172781533889 0.969781562501373 0.967293366120755 0.9647084412096 0.962027046258245 0.959249449403951 0.956375928404088 0.953406770608362 0.950342272930078 0.94718274181645 0.943928493217957 0.940579852556747 0.937137154694095 0.933600743896918 0.92997097380335 0.926248207387375 0.922432816922532 0.918525183944688 0.914525699213884 0.910434762675261 0.906252783419064 0.901980179639733 0.897617378594086 0.893164816558591 0.888622938785742 0.883992199459531 0.879273061650032 0.874465997267093 0.869571487013146 0.864590020335139 0.859522095375587 0.854368218922764 0.849128906360019 0.843804681614244 0.838396077103475 0.832903633683657 0.827327900594554 0.82166943540483 0.815928803956288 0.810106580307288 0.804203346675344 0.7982196933789 0.792156218778298 0.786013529215947 0.779792238955684 0.773492970121349 0.767116352634577 0.760663024151804 0.754133630000499 0.747528823114637 0.740849263969402 0.734095620515142 0.727268568110574 0.720368789455251 0.713396974521288 0.706353820484368 0.699240031654026 0.692056319403216 0.684803402097178 0.677482005021598 0.670092860310082 0.662636706870944 0.655114290313314 0.647526362872579 0.639873683335161 0.632157016962635 0.624377135415209 0.616534816674554 0.608630844966009 0.600666010680158 0.592641110293792 0.584556946290263 0.576414327079233 0.56821406691584 0.559956985819265 0.551643909490737 0.543275669230962 0.534853101856992 0.526377049618546 0.517848360113784 0.50926788620455 0.500636485931083 0.491955022426219 0.483224363829074 0.474445383198231 0.465618958424439 0.456745972142818 0.447827311644603 0.438863868788413 0.429856539911062 0.420806225737932 0.411713831292899 0.402580265807831 0.393406442631664 0.384193279139072 0.374941696638726 0.365652620281166 0.356326978966288 0.346965705250451 0.337569735253227 0.328140008563784 0.318677468146934 0.309183060248833 0.299657734302358 0.290102442832168 0.280518141359445 0.270905788306351 0.26126634490018 0.25160077507724 0.241910045386459 0.232195124892731 0.222456985080009 0.212696599754158 0.202914944945579 0.193112998811601 0.183291741538668 0.173452155244325 0.163595223878999 0.153721933127615 0.143833270311019 0.133930224287253 0.124013785352666 0.114084945142888 0.104144696533667 0.0941940335415788 0.0842339512246314 0.0742654455827564 0.0642895134582107 0.0543071524358936 0.0443193607435887 0.0343271371521422 0.0243314808755863 0.014333391471219 0.00433386873964898 -0.00566608737518342 -0.015665476886 -0.0256632998621825 -0.0356585565297649 -0.0456502473714096 -0.0556373732263589 -0.0656189353903499 -0.0755939357154841 -0.0855613767100415 -0.0955202616382288 -0.105469594619852 -0.115408380729905 -0.125335626098058 -0.135250338008047 -0.145151524996943 -0.155038196954299 -0.164909365221158 -0.174764042688918 -0.184601243898046 -0.194419985136618 -0.204219284538692 -0.213998162182494 -0.22375564018841 -0.233490742816769 -0.243202496565421 -0.252889930267085 -0.262552075186464 -0.272187965117116 -0.281796636478079 -0.291377128410223 -0.300928482872341 -0.310449744736944 -0.31993996188578 -0.329398185305044 -0.338823469180275 -0.348214870990939 -0.357571451604683 -0.366892275371241 -0.376176410216005 -0.385422927733226 -0.394630903278859 -0.403799416063022 -0.412927549242077 -0.422014390010313 -0.431059029691225 -0.440060563828383 -0.449018092275874 -0.457930719288318 -0.466797553610441 -0.475617708566199 -0.484390302147447 -0.493114457102138 -0.501789301022046 -0.510413966430008 -0.518987590866671 -0.527509316976735 -0.535978292594691 -0.544393670830035 -0.552754610151956 -0.561060274473488 -0.569309833235122 -0.577502461487856 -0.585637339975691 -0.593713655217559 -0.601730599588664 -0.609687371401251 -0.617583174984769 -0.625417220765439 -0.633188725345212 -0.640896911580106 -0.648541008657921 -0.656120252175319 -0.663633884214264 -0.671081153417815 -0.678461315065256 -0.685773631146573 -0.693017370436252 -0.7001918085664 -0.707296228099182 -0.714329918598565 -0.721292176701362 -0.728182306187564 -0.734999618049963 -0.741743430563055 -0.748413069351208 -0.755007867456101 -0.76152716540342 -0.767970311268802 -0.774336660743031 -0.780625577196463 -0.786836431742695 -0.792968603301448 -0.799021478660676 -0.804994452537886 -0.810886927640669 -0.816698314726425 -0.822428032661287 -0.828075508478238 -0.833640177434402 -0.83912148306752 -0.844518877251597 -0.849831820251712 -0.855059780777993 -0.860202236038744 -0.865258671792723 -0.870228582400569 -0.875111470875364 -0.879906848932328 -0.884614237037652 -0.889233164456448 -0.893763169299824 -0.89820379857107 -0.902554608210959 -0.906815163142154 -0.910985037312711 -0.915063813738689 -0.919051084545843 -0.922946451010416 -0.926749523599008 -0.930459922007528 -0.934077275199228 -0.937601221441804 -0.941031408343567 -0.944367492888685 -0.947609141471485 -0.95075602992981 -0.953807843577436 -0.956764277235541 -0.959625035263223 -0.962389831587064 -0.965058389729735 -0.967630442837646 -0.970105733707629 -0.972484014812659 -0.97476504832661 -0.976948606148029 -0.979034469922954 -0.981022431066746 -0.982912290784948 -0.984703860093162 -0.98639695983595 -0.987991420704749 -0.989487083254802 -0.990883797921098 -0.992181425033337 -0.993379834829887 -0.994478907470768 -0.995478533049631 -0.996378611604752 -0.997179053129025 -0.997879777578965 -0.998480714882711 -0.998981804947033 -0.999382997663343 -0.999684252912702 -0.999885540569838 -0.999986840506151 -0.999988142591734 -0.999889446696378 -0.999690762689591 -0.999392110439608 -0.998993519811404 -0.998495030663712 -0.997896692845029 -0.99719856618864 -0.996400720506628 -0.995503235582896 -0.994506201165189 -0.993409716956118 -0.99221389260319 -0.990918847687844 -0.989524711713492 -0.98803162409257 -0.986439734132596 -0.984749201021238 -0.9829601938104 -0.981072891399312 -0.979087482516642 -0.977004165701624 -0.974823149284202 -0.972544651364203 -0.970168899789518 -0.967696132133325 -0.96512659567033 -0.962460547352037 -0.959698253781057 -0.956839991184445 -0.953886045386078 -0.950836711778074 -0.947692295291255 -0.944453110364647 -0.941119480914044 -0.937691740299613 -0.93417023129256 -0.93055530604085 -0.926847326033996 -0.923046662066908 -0.919153694202817 -0.915168811735265 -0.911092413149177 -0.906924906081015 -0.902666707278014 -0.898318242556504 -0.893879946759335 -0.889352263712387 -0.884735646180192 -0.880030555820657 -0.875237463138896 -0.870356847440183 -0.865389196782021 -0.860335007925336 -0.855194786284801 -0.849969045878299 -0.844658309275513 -0.83926310754568 -0.833783980204475 -0.828221475160068 -0.822576148658327 -0.816848565227198 -0.811039297620251 -0.805148926759406 -0.79917804167684 -0.793127239456086 -0.786997125172324 -0.780788311831873 -0.774501420310893 -0.768137079293298 -0.761695925207886 -0.755178602164698 -0.748585761890606 -0.741918063664145 -0.73517617424958 -0.728360767830235 -0.721472525941072 -0.714512137400541 -0.707480298241694 -0.700377711642587 -0.693205087855963 -0.685963144138222 -0.678652604677701 -0.671274200522254 -0.663828669506149 -0.656316756176281 -0.648739211717725 -0.641096793878611 -0.633390266894355 -0.625620401411232 -0.617787974409318 -0.609893769124783 -0.60193857497158 -0.593923187462493 -0.585848408129594 -0.577715044444087 -0.569523909735564 -0.561275823110669 -0.552971609371191 -0.544612098931584 -0.536198127735926 -0.527730537174324 -0.519210173998779 -0.510637890238508 -0.502014543114743 -0.493340994955011 -0.484618113106899 -0.475846769851324 -0.467027842315301 -0.458162212384235 -0.449250766613731 -0.44029439614094 -0.431293996595446 -0.422250468009703 -0.413164714729033 -0.404037645321193 -0.394870172485518 -0.385663212961651 -0.376417687437874 -0.367134520459033 -0.35781464033409 -0.348458979043292 -0.339068472144971 -0.329644058681991 -0.320186681087846 -0.310697285092414 -0.301176819627385 -0.291626236731374 -0.282046491454711 -0.27243854176394 -0.262803348446024 -0.253141875012266 -0.243455087601957 -0.233743954885767 -0.224009447968874 -0.214252540293858 -0.204474207543355 -0.194675427542493 -0.184857180161106 -0.17502044721575 -0.165166212371522 -0.155295461043695 -0.145409180299176 -0.135508358757801 -0.125593986493474 -0.115667054935158 -0.105728556767738 -0.0957794858327482 -0.0858208370289909 -0.0758536062130477 -0.0658787900996944 -0.0558973861622299 -0.0459103925327302 -0.0359188079022358 -0.0259236314208833 -0.0159258625979918 -0.00592650120211189 0.00407345283894945 0.0140729995381214 0.0240711389490671 0.034066871266177 0.0440591969245493 0.054047116699945 0.0640296318087098 0.0740057440076516 0.0839744556938638 0.0939347700044852 0.103885690916385 0.113826223345764 0.123755373247663 0.133672147715367 0.143575555079692 0.153464605008156 0.163338308604005 0.173195678505108 0.183035728982691 0.192857476039904 0.202659937510227 0.212442133155682 0.222203084764856 0.231941816250722 0.241657353748247 0.251348725711778 0.261014963012194 0.270655099033821 0.28026816977109 0.289853213924937 0.299409272998935 0.308935391395141 0.318430616509652 0.32789399882787 0.33732459201945 0.34672145303293 0.356083642190041 0.365410223279668 0.374700263651475 0.383952834309165 0.393167010003384 0.402341869324242 0.41147649479345 0.420569972956075 0.429621394471878 0.438629854206251 0.447594451320726 0.456514289363064 0.465388476356893 0.474216124890908 0.482996352207613 0.491728280291593 0.500411035957316 0.509043750936451 0.517625561964694 0.526155610868093 0.534633044648868 0.543057015570704 0.551426681243528 0.559741204707746 0.567999754517943 0.576201504826019 0.584345635463779 0.592431332024946 0.600457785946601 0.608424194590042 0.616329761321042 0.624173695589517 0.631955213008575 0.639673535432961 0.647327891036863 0.654917514391099 0.662441646539658 0.669899535075597 0.677290434216276 0.68461360487794 0.691868314749626 0.699053838366392 0.706169457181864 0.71321445964009 0.720188141246696 0.727089804639332 0.733918759657411 0.74067432341112 0.747355820349716 0.75396258232907 0.760493948678492 0.766949266266789 0.773327889567581 0.779629180723855 0.785852509611744 0.791997253903548 0.798062799129957 0.804048538741503 0.809953874169213 0.815778214884465 0.821520978458043 0.827181590618372 0.832759485308956 0.838254104744973 0.843664899469058 0.848991328406248 0.854232858918087 0.859388966855894 0.864459136613169 0.869442861177164 0.874339642179574 0.879148989946381 0.883870423546814 0.888503470841449 0.893047668529418 0.897502562194737 0.901867706351753 0.906142664489687 0.910327009116289 0.914420321800583 0.918422193214711 0.922332223174868 0.926150020681314 0.929875203957481 0.933507400488146 0.937046247056682 0.940491389781383 0.943842484150845 0.947099195058425 0.950261196835746 0.953328173285265 0.956299817711892 0.959175832953663 0.961955931411449 0.964639835077721 0.967227275564349 0.969717994129441 0.972111741703216 0.97440827891291 0.976607376106718 0.978708813376752 0.980712380581036 0.982617877364519 0.984425113179112 0.986133907302738 0.98774408885741 0.989255496826313 0.990667980069911 0.991981397341055 0.993195617299114 0.994310518523103 0.99532598952383 0.996241928755039 0.997058244623572 0.997774855498522 0.998391689719398 0.998908685603292 0.999325791451047 0.999642965552426 0.999860176190283 0.999977401643735 0.999994630190334 0.999911860107241 0.999729099671393 0.999446367158684 0.999063690842128 0.998581108989038 0.997998669857197 0.997316431690033 0.996534462710795 0.995652841115728 0.994671655066258 0.993591002680171 0.992410992021806 0.991131741091245 0.989753377812516 0.988276040020797 0.986699875448637 0.985025041711179 0.983251706290401 0.981380046518368 0.979410249559498 0.977342512391844 0.9751770417874 0.972914054291422 0.970553776200774 0.968096443541298 0.965542302044213 0.962891607121539 0.96014462384056 0.957301626897314 0.954362900589128 0.951328738786183 0.94819944490213 0.944975331863751 0.941656722079662 0.938243947408077 0.934737349123618 0.931137277883192 0.927444093690923 0.923658165862152 0.919779872986508 0.915809602890046 0.911747752596467 0.907594728287415 0.903350945261862 0.899016827894572 0.894592809593671 0.890079332757302 0.885476848729387 0.880785817754495 0.876006708931813 0.871140000168241 0.8661861781306 0.861145738196965 0.85601918440713 0.850807029412201 0.845509794423334 0.840128009159614 0.834662211795082 0.829112948904921 0.823480775410794 0.817766254525358 0.811969957695939 0.80609246454739 0.800134362824127 0.794096248331359 0.787978724875502 0.781782404203804 0.77550790594317 0.769155857538195 0.762726894188427 0.756221658784845 0.749640801845566 0.742984981450802 0.736254863177045 0.729451120030513 0.722574432379853 0.715625487888098 0.708604981443907 0.701513615092073 0.694352097963323 0.687121146203402 0.679821482901459 0.672453838017743 0.665018948310601 0.657517557262808 0.649950415007219 0.642318278251752 0.634621910203724 0.626862080493525 0.619039565097661 0.611155146261151 0.603209612419309 0.595203758118898 0.587138383938677 0.579014296409343 0.570832307932878 0.562593236701311 0.554297906614901 0.545947147199743 0.537541793524819 0.529082686118492 0.520570670884455 0.512006599017136 0.503391326916587 0.494725716102837 0.486010633129748 0.477246949498352 0.468435541569712 0.459577290477276 0.450673082038772 0.441723806667624 0.432730359283911 0.423693639224877 0.414614550154998 0.405493999975614 0.396332900734143 0.387132168532875 0.377892723437363 0.368615489384416 0.35930139408971 0.349951368955011 0.340566348975043 0.331147272643981 0.32169508186161 0.312210721839131 0.302695141004643 0.293149290908299 0.283574126127155 0.27397060416971 0.264339685380155 0.254682332842345 0.244999512283485 0.235292191977562 0.225561342648518 0.215807937373176 0.206032951483936 0.196237362471241 0.18642214988583 0.176588295240782 0.166736781913365 0.156868595046705 0.146984721451263 0.137086149506163 0.12717386906035 0.117248871333609 0.107312148817442 0.0973646951758194 0.0874075051458163 0.0774415744381381 0.0674678996375504 0.0574874781032221 0.0475013078689895 0.0375103875435543 0.0275157162106233 0.0175182933290009 0.00751911863264421 -0.00248080796930988 -0.0124804864925344 -0.02247891697751 -0.0324750995895202 -0.042468034718634 -0.0524567230796658 -0.0624401658121035 -0.0724173645799932 -0.0823873216717725 -0.0923490401000406 -0.102301523701256 -0.112243777235352 -0.122174806485261 -0.132093618356333 -0.141999220975648 -0.151890623791197 -0.161766837670942 -0.171626875001725 -0.18146974978803 -0.19129447775058 -0.201100076424767 -0.210885565258894 -0.220649965712233 -0.230392301352875 -0.240111597955375 -0.249806883598171 -0.259477188760779 -0.269121546420742 -0.27873899215033 -0.288328564212984 -0.29788930365949 -0.30742025442387 -0.316920463418991 -0.326388980631869 -0.335824859218675 -0.345227155599411 -0.354594929552276 -0.36392724430768 -0.373223166641925 -0.382481766970525 -0.391702119441161 -0.40088330202627 -0.410024396615245 -0.419124489106244 -0.428182669497602 -0.437198031978828 -0.446169675021187 -0.45509670146785 -0.463978218623612 -0.47281333834416 -0.481601177124883 -0.490340856189226 -0.499031501576566 -0.507672244229607 -0.516262220081284 -0.52480057014117 -0.533286440581374 -0.541718982821924 -0.550097353615622 -0.558420715132372 -0.566688235042958 -0.574899086602278 -0.583052448732019 -0.591147506102763 -0.599183449215517 -0.607159474482667 -0.615074784308334 -0.622928587168131 -0.630720097688316 -0.638448536724331 -0.646113131438712 -0.653713115378375 -0.66124772855126 -0.668716217502327 -0.676117835388906 -0.683451842055375 -0.69071750410718 -0.697914094984171 -0.705040895033256 -0.71209719158037 -0.719082279001739 -0.72599545879444 -0.732836039646257 -0.739603337504803 -0.746296675645933 -0.75291538474141 -0.759458802925841 -0.765926275862859 -0.772317156810561 -0.778630806686177 -0.784866594129982 -0.791023895568426 -0.797102095276499 -0.803100585439293 -0.809018766212792 -0.814856045783849 -0.820611840429373 -0.826285574574695 -0.831876680851128 -0.837384600152704 -0.842808781692083 -0.848148683055632 -0.853403770257663 -0.858573517793836 -0.863657408693705 -0.868654934572416 -0.873565595681548 -0.87838890095908 -0.883124368078504 -0.887771523497055 -0.892329902503064 -0.896799049262428 -0.901178516864196 -0.905467867365257 -0.909666671834136 -0.913774510393885 -0.91779097226407 -0.921715655801852 -0.925548168542148 -0.929288127236877 -0.932935157893287 -0.936488895811351 -0.939948985620238 -0.943315081313852 -0.946586846285428 -0.949763953361195 -0.952846084833093 -0.955832932490544 -0.95872419765127 -0.961519591191166 -0.964218833573206 -0.966821654875402 -0.969327794817792 -0.971737002788471 -0.97404903786865 -0.976263668856746 -0.978380674291507 -0.980399842474154 -0.98232097148955 -0.984143869226396 -0.985868353396436 -0.98749425155269 -0.989021401106699 -0.990449649344779 -0.991778853443296 -0.993008880482948 -0.994139607462057 -0.995170921308867 -0.996102718892852 -0.996934907035031 -0.997667402517282 -0.998300132090669 -0.998833032482761 -0.999266050403962 -0.999599142552842 -0.999832275620464 -0.999965426293714 -0.999998581257636 -0.999931737196762 -0.999764900795442 -0.999498088737178 -0.999131327702952 -0.998664654368562 -0.998098115400953 -0.99743176745355 -0.996665677160592 -0.99579992113047 -0.994834585938066 -0.993769768116093 -0.992605574145448 -0.991342120444557 -0.989979533357737 -0.988517949142562 -0.986957513956234 -0.985298383840973 -0.983540724708407 -0.981684712322985 -0.979730532284398 -0.977678380009023 -0.975528460710376 -0.973280989378595 -0.970936190758941 -0.968494299329323 -0.965955559276847 -0.963320224473404 -0.960588558450278 -0.957760834371795 -0.954837335008006 -0.951818352706411 -0.948704189362725 -0.945495156390687 -0.94219157469092 -0.938793774618841 -0.935302095951626 -0.931716887854231 -0.928038508844479 -0.924267326757205 -0.920403718707476 -0.916448071052877 -0.912400779354877 -0.908262248339273 -0.904032891855717 -0.899713132836334 -0.895303403253426 -0.890804144076277 -0.886215805227054 -0.881538845535819 -0.876773732694644 -0.871920943210842 -0.866980962359317 -0.861954284134038 -0.856841411198639 -0.851642854836152 -0.846359134897881 -0.840990779751417 -0.835538326227802 -0.830002319567843 -0.824383313367594 -0.818681869522992 -0.812898558173671 -0.807033957645945 -0.801088654394981 -0.795063242946149 -0.788958325835573 -0.782774513549876 -0.776512424465135 -0.770172684785038 -0.763755928478271 -0.757262797215118 -0.750693940303294 -0.744050014623015 -0.737331684561314 -0.730539621945598 -0.723674505976468 -0.7167370231598 -0.709727867238096 -0.702647739121105 -0.695497346815741 -0.688277405355274 -0.680988636727834 -0.67363176980421 -0.666207540264964 -0.658716690526862 -0.651159969668636 -0.643538133356075 -0.635851943766458 -0.62810216951234 -0.620289585564687 -0.612414973175384 -0.604479119799107 -0.596482819014582 -0.588426870445222 -0.580312079679172 -0.572139258188746 -0.563909223249282 -0.555622797857417 -0.547280810648782 -0.538884095815149 -0.530433493021003 -0.521929847319581 -0.513374009068368 -0.504766833844058 -0.496109182357001 -0.487401920365131 -0.478645918587392 -0.469842052616664 -0.460991202832209 -0.452094254311628 -0.44315209674236 -0.43416562433271 -0.42513573572243 -0.416063333892857 -0.406949326076612 -0.397794623666884 -0.388600142126283 -0.379366800895302 -0.370095523300369 -0.360787236461518 -0.351442871199676 -0.342063361943582 -0.332649646636346 -0.323202666641653 -0.313723366649631 -0.304212694582379 -0.294671601499178 -0.285101041501386 -0.275501971637028 -0.26587535180509 -0.256222144659534 -0.24654331551303 -0.236839832240426 -0.227112665181964 -0.217362787046244 -0.207591172812955 -0.197798799635376 -0.187986646742665 -0.178155695341935 -0.168306928520134 -0.158441331145736 -0.148559889770257 -0.138663592529601 -0.128753429045244 -0.118830390325277 -0.108895468665303 -0.0989496575492077 -0.0889939515498155 -0.0790293462294297 -0.0690568380402786 -0.0590774242248705 -0.0490921027162711 -0.0391018720383099 -0.0291077312057297 -0.0191106796242853 -0.00911171699080393 0.000888156806783406 0.0108879417894302 0.0208866379869713 0.0308832455381192 0.0408767647904492 0.050866196400364 0.0608505414330272 0.0708288014622557 0.0807999786703617 0.0907630759479338 0.100717096993547 0.110661046413391 0.120593929820811 0.130514753935744 0.140422526684045 0.150316257296696 0.16019495640888 0.170057636158919 0.179903310287057 0.189730994234084 0.199539705239797 0.209328462441268 0.219096286970935 0.228842202054485 0.23856523310853 0.248264407838068 0.257938756333709 0.267587311168665 0.277209107495492 0.286803183142577 0.296368578710349 0.305904337667223 0.31540950644525 0.324883134535473 0.334324274582977 0.343731982481626 0.353105317468469 0.362443342217819 0.371745122934981 0.381009729449637 0.390236235308855 0.399423717869738 0.408571258391687 0.41767794212827 0.426742858418705 0.435765100778916 0.444743766992185 0.453677959199374 0.462566783988706 0.471409352485111 0.480204780439107 0.488952188315228 0.497650701379977 0.506299449789295 0.514897568675549 0.523444198234015 0.53193848380886 0.540379575978605 0.548766630641067 0.557098809097769 0.565375278137808 0.573595210121178 0.581757783061531 0.589862180708374 0.597907592628696 0.60589321428801 0.613818247130805 0.6216818986604 0.629483382518195 0.637221918562307 0.644896732945579 0.652507058192968 0.660052133278292 0.66753120370033 0.674943521558273 0.68228834562651 0.689564941428757 0.696772581311496 0.703910544516746 0.710978117254134 0.717974592772277 0.724899271429453 0.731751460763567 0.738530475561395 0.745235637927107 0.751866277350054 0.758421730771819 0.764901342652523 0.771304465036378 0.77763045761648 0.783878687798844 0.790048530765659 0.796139369537768 0.802150595036371 0.808081606143927 0.813931809764267 0.819700620881906 0.825387462620538 0.830991766300728 0.836512971496779 0.841950526092773 0.84730388633778 0.852572516900238 0.85775589092148 0.862853490068425 0.867864804585404 0.872789333345144 0.877626583898871 0.882376072525562 0.887037324280311 0.891609873041827 0.896093261559044 0.900487041496848 0.904790773480906 0.909004027141605 0.913126381157091 0.917157423295397 0.921096750455669 0.924943968708474 0.928698693335192 0.93236054886649 0.935929169119865 0.939404197236267 0.942785285715779 0.946072096452372 0.94926430076771 0.952361579444023 0.955363622756023 0.958270130501881 0.961080812033245 0.963795386284304 0.966413581799894 0.968935136762647 0.971359799019166 0.973687326105247 0.975917485270122 0.978050053499731 0.980084817539029 0.982021573913308 0.983860128948544 0.985600298790766 0.98724190942444 0.988784796689871 0.990228806299617 0.991573793853921 0.992819624855148 0.993966174721237 0.995013328798156 0.995960982371371 0.996809040676313 0.997557418907859 0.998206042228809 0.998754845777372 0.99920377467365 0.999552784025128 0.999801838931161 0.999950914486467 0.999999995783614 0.999949077914513 0.999798165970908 0.999547275043869 0.999196430222279 0.998745666590328 0.998195029224003 0.997544573186582 0.996794363523126 0.995944475253978 0.994994993367255 0.993946012810356 0.992797638480461 0.991549985214046 0.990203177775399 0.988757350844141 0.987212649001761 0.985569226717154 0.983827248331181 0.981986888040229 0.980048329878792 0.978011767701071 0.975877405161587 0.973645455694816 0.971316142493844 0.96888969848805 0.966366366319812 0.963746398320245 0.961030056483966 0.958217612442894 0.955309347439089 0.952305552296629 0.949206527392525 0.946012582626685 0.942724037390923 0.939341220537023 0.93586447034385 0.932294134483528 0.928630569986667 0.924874143206663 0.921025229783065 0.917084214604007 0.913051491767723 0.908927464543135 0.904712545329531 0.900407155615318 0.89601172593588 0.891526695830523 0.88695251379852 0.882289637254261 0.877538532481515 0.872699674586802 0.867773547451876 0.862760643685348 0.857661464573417 0.852476520029743 0.847206328544461 0.841851417132328 0.836412321280022 0.830889584892596 0.825283760239086 0.819595407897287 0.813825096697692 0.807973403666613 0.802040913968475 0.796028220847307 0.789935925567408 0.78376463735323 0.777514973328452 0.771187558454268 0.764783025466893 0.758302014814288 0.751745174592118 0.745113160478941 0.738406635670642 0.731626270814113 0.724772743940188 0.717846740395846 0.710848952775667 0.703780080852582 0.696640831507894 0.689431918660588 0.682154063195939 0.674807992893432 0.667394442353973 0.659914152926438 0.652367872633538 0.644756356097013 0.637080364462173 0.629340665321785 0.621538032639314 0.613673246671526 0.605747093890463 0.597760366904799 0.589713864380576 0.581608390961342 0.573444757187684 0.565223779416176 0.556946279737745 0.548613085895461 0.540225031201763 0.53178295445513 0.523287699856204 0.514740116923363 0.506141060407779 0.497491390207936 0.488791971283648 0.480043673569557 0.471247371888144 0.462403945862246 0.453514279827098 0.444579262741895 0.435599788100899 0.426576753844091 0.417511062267379 0.408403619932364 0.399255337575692 0.390067130017973 0.380839916072308 0.371574618452401 0.362272163680293 0.35293348199371 0.343559507253037 0.334151176847938 0.324709431603613 0.315235215686717 0.305729476510948 0.296193164642302 0.286627233704018 0.277032640281219 0.267410343825252 0.257761306557743 0.248086493374379 0.238386871748416 0.228663411633933 0.218917085368838 0.209148867577638 0.199359735073969 0.189550666762926 0.179722643543164 0.169876648208817 0.160013665351213 0.150134681260417 0.140240683826607 0.130332662441282 0.120411607898322 0.110478512294916 0.100534368932345 0.0905801722166588 0.0806169175592345 0.0706456012772348 0.0606672204939785 0.0506827730392287 0.0406932573494105 0.0306996723677683 0.0207030174444722 0.0107042922366842 0.000704496608592712 -0.00929536946857255 -0.0192943060165371 -0.0292913131499785 -0.0392853911765142 -0.04927554069667 -0.059260762703819 -0.0692400586840814 -0.0792124307161752 -0.0891768815712076 -0.0991324148123967 -0.109078034894715 -0.119012747264441 -0.128935558458618 -0.138845476204395 -0.148741509518256 -0.158622668805116 -0.16848796595728 -0.178336414453255 -0.188167029456398 -0.197978827913401 -0.207770828652594 -0.217542052482063 -0.227291522287569 -0.237018263130255 -0.246721302344142 -0.256399669633396 -0.266052397169352 -0.2756785196873 -0.285277074583011 -0.294847102008994 -0.304387644970481 -0.313897749421127 -0.323376464358411 -0.332822841918739 -0.342235937472226 -0.351614809717162 -0.360958520774138 -0.370266136279834 -0.379536725480456 -0.388769361324809 -0.397963120557003 -0.407117083808777 -0.416230335691433 -0.425301964887377 -0.43433106424125 -0.443316730850639 -0.452258066156373 -0.461154176032372 -0.470004170875062 -0.478807165692333 -0.487562280192039 -0.496268638870027 -0.504925371097684 -0.513531611209 -0.522086498587138 -0.530589177750487 -0.539038798438217 -0.547434515695301 -0.55577548995701 -0.564060887132867 -0.57228987869006 -0.580461641736291 -0.588575359102065 -0.596630219422407 -0.604625417217996 -0.612560152975717 -0.620433633228605 -0.628245070635197 -0.63599368405826 -0.643678698642911 -0.651299345894095 -0.658854863753438 -0.666344496675448 -0.673767495703077 -0.681123118542606 -0.688410629637882 -0.695629300243867 -0.702778408499518 -0.709857239499965 -0.716865085368008 -0.723801245324899 -0.730665025760424 -0.737455740302259 -0.744172709884607 -0.750815262816109 -0.757382734847007 -0.76387446923557 -0.77028981681377 -0.776628136052194 -0.782888793124201 -0.789071161969301 -0.795174624355761 -0.801198569942429 -0.807142396339766 -0.813005509170086 -0.81878732212699 -0.824487257034003 -0.830104743902383 -0.835639220988124 -0.84109013484813 -0.846456940395557 -0.851739100954323 -0.856936088312774 -0.862047382776505 -0.867072473220329 -0.872010857139389 -0.876862040699408 -0.881625538786073 -0.886300875053544 -0.890887581972093 -0.895385200874848 -0.899793282003667 -0.904111384554111 -0.908339076719524 -0.912475935734211 -0.916521547915719 -0.920475508706201 -0.924337422712873 -0.928106903747552 -0.931783574865276 -0.935367068401997 -0.938857026011348 -0.942253098700477 -0.945554946864943 -0.948762240322683 -0.951874658347023 -0.954891889698755 -0.957813632657258 -0.96063959505067 -0.963369494285108 -0.966003057372922 -0.968540020959999 -0.970980131352094 -0.973323144540201 -0.975568826224955 -0.977716951840057 -0.979767306574736 -0.981719685395228 -0.983573893065278 -0.985329744165663 -0.986987063112737 -0.988545684175987 -0.990005451494604 -0.991366219093073 -0.99262785089577 -0.993790220740563 -0.994853212391439 -0.995816719550116 -0.996680645866684 -0.997444904949229 -0.99810942037248 -0.99867412568545 -0.999138964418077 -0.999503890086874 -0.999768866199581 -0.999933866258805 -0.999998873764679 -0.999963882216506 -0.999828895113412 -0.999593925953995 -0.999258998234975 -0.998824145448844 -0.998289411080519 -0.997654848602991 -0.996920521471979 -0.996086503119584 -0.995152876946947 -0.994119736315906 -0.992987184539664 -0.991755334872454 -0.990424310498218 -0.988994244518283 -0.987465279938054 -0.985837569652718 -0.984111276431944 -0.982286572903617 -0.98036364153657 -0.978342674622335 -0.976223874255922 -0.9740074523156 -0.971693630441716 -0.969282640014531 -0.966774722131077 -0.964170127581053 -0.961469116821743 -0.958671959951972 -0.955778936685098 -0.952790336321034 -0.949706457717328 -0.946527609259269 -0.943254108829055 -0.939886283774 -0.936424470873804 -0.932869016306872 -0.929220275615698 -0.925478613671309 -0.921644404636783 -0.917718031929828 -0.913699888184442 -0.909590375211653 -0.905389903959331 -0.901098894471102 -0.89671777584434 -0.892246986187256 -0.887686972575089 -0.883038191005402 -0.878301106352477 -0.873476192320832 -0.868563931397849 -0.863564814805528 -0.858479342451361 -0.853308022878345 -0.84805137321413 -0.8427099191193 -0.837284194734815 -0.83177474262859 -0.826182113741246 -0.820506867331011 -0.814749570917796 -0.808910800226445 -0.802991139129162 -0.796991179587122 -0.790911521591281 -0.784752773102372 -0.778515549990111 -0.772200475971612 -0.765808182549014 -0.759339308946332 -0.752794502045537 -0.746174416321863 -0.739479713778368 -0.732711063879725 -0.725869143485285 -0.718954636781386 -0.711968235212935 -0.704910637414268 -0.697782549139283 -0.690584683190868 -0.683317759349619 -0.675982504301865 -0.668579651566997 -0.661109941424121 -0.653574120838025 -0.645972943384489 -0.638307169174923 -0.630577564780361 -0.6227849031548 -0.61492996355791 -0.607013531477104 -0.599036398548993 -0.590999362480222 -0.582903226967701 -0.574748801618235 -0.566536901867562 -0.558268348898816 -0.549943969560401 -0.541564596283316 -0.533131066997904 -0.524644225050068 -0.516104919116928 -0.507514003121962 -0.498872336149612 -0.490180782359372 -0.481440210899379 -0.472651495819494 -0.463815515983903 -0.454933154983225 -0.446005301046158 -0.437032846950657 -0.428016689934653 -0.418957731606335 -0.409856877853987 -0.4007150387554 -0.391533128486865 -0.382312065231759 -0.373052771088721 -0.363756171979451 -0.354423197556112 -0.345054781108369 -0.33565185947006 -0.326215372925513 -0.316746265115518 -0.307245482942967 -0.297713976478158 -0.288152698863796 -0.278562606219673 -0.268944657547063 -0.259299814632819 -0.249629041953194 -0.239933306577397 -0.230213578070885 -0.220470828398411 -0.210706031826822 -0.200920164827639 -0.191114205979405 -0.181289135869835 -0.171445936997751 -0.161585593674839 -0.151709091927214 -0.141817419396819 -0.131911565242666 -0.121992520041915 -0.112061275690819 -0.102118825305538 -0.0921661631228261 -0.0822042844006063 -0.0722341853184498 -0.0622568628779564 -0.0522733148030557 -0.0422845394402358 -0.0322915356587087 -0.0222953027505254 -0.0122968403306463 -0.00229714823698153 0.00770277356959267 0.0177019251052289 0.0276993064631061 0.0376939179134197 0.0476847600033534 0.057670833657024 0.0676511402753878 0.0776246818360998 0.0875904609933152 0.097547481177423 0.107494746694702 0.117431262826891 0.127356035930656 0.137268073536958 0.147166384450295 0.157049978847826 0.166917868378347 0.176769066261127 0.186602587384589 0.196417448404813 0.206212667843878 0.215987266188002 0.225740265985496 0.235470691944507 0.245177571030549 0.254859932563802 0.264516808316181 0.274147232608159 0.283750242405331 0.29332487741472 0.302870180180804 0.312385196181261 0.32186897392242 0.331320565034411 0.340739024365997 0.350123410079095 0.359472783742954 0.368786210427998 0.37806275879932 0.387301501209813 0.396501513792935 0.405661876555096 0.414781673467651 0.423859992558509 0.432895926003327 0.441888570216291 0.450837025940472 0.459740398337755 0.46859779707832 0.477408336429674 0.486171135345224 0.494885317552381 0.503550011640186 0.51216435114645 0.520727474644402 0.529238525828828 0.537696653601701 0.546101012157294 0.554450761066753 0.562745065362146 0.570983095619956 0.579164028044022 0.587287044547918 0.595351332836764 0.60335608648845 0.611300505034283 0.619183794039028 0.627005165180353 0.634763836327664 0.642459031620309 0.650089981545174 0.657655923013623 0.665156099437816 0.672589760806361 0.679956163759314 0.687254571662519 0.694484254681269 0.701644489853285 0.708734561161018 0.715753759603245 0.722701383265971 0.72957673739262 0.736379134453508 0.743107894214598 0.749762343805522 0.756341817786864 0.762845658216711 0.769273214716438 0.775623844535753 0.781896912616965 0.788091791658494 0.794207862177599 0.800244512572323 0.806201139182658 0.812077146350908 0.81787194648125 0.823584960098503 0.829215615906064 0.834763350843045 0.840227610140576 0.84560784737728 0.850903524533917 0.856114112047185 0.861239088862674 0.866277942486973 0.87123016903892 0.876095273299986 0.880872768763799 0.885562177684794 0.890163031125986 0.894674869005866 0.899097240144405 0.903429702308175 0.907671822254569 0.911823175775129 0.915883347737962 0.919851932129254 0.923728532093874 0.927512759975056 0.931204237353166 0.934802595083541 0.938307473333407 0.94171852161786 0.945035398834914 0.948257773299612 0.951385322777192 0.954417734515313 0.957354705275328 0.960195941362608 0.962941158655912 0.9655900826358 0.968142448412079 0.9705980007503 0.972956494097275 0.975217692605635 0.977381370157412 0.979447310386656 0.981415306701065 0.983285162302647 0.9850566902074 0.98672971326401 0.988304064171566 0.989779585496289 0.991156129687276 0.992433559091255 0.99361174596635 0.994690572494856 0.995669930795018 0.996549722931823 0.997329860926789 0.998010266766769 0.998590872411745 0.999071619801636 0.999452460862103 0.999733357509359 0.999914281653972 0.999995215203679 0.999976150065192 0.999857088145009 0.999638041349223 0.999319031582331 0.998900090745045 0.998381260731097 0.997762593423059 0.997044150687144 0.996226004367027 0.99530823627666 0.994290938192086 0.993174211842266 0.991958168898903 0.99064293096528 0.989228629564094 0.987715406124306 0.986103411966998 0.984392808290245 0.982583766152986 0.98067646645793 0.978671099933455 0.976567867114544 0.974366978322725 0.972068653645044 0.969673122912053 0.967180625674829 0.964591411181018 0.961905738349913 0.959123875746559 0.956246101554897 0.953272703549948 0.950203979069036 0.947040234982051 0.943781787660766 0.940428962947197 0.936982096121021 0.933441531866049 0.929807624235756 0.926080736617876 0.922261241698066 0.918349521422635 0.91434596696035 0.910250978663321 0.906064966026967 0.901788347649061 0.897421551187878 0.892965013319425 0.888419179693776 0.883784504890503 0.879061452373227 0.874250494443262 0.869352112192392 0.864366795454761 0.859295042757887 0.854137361272815 0.848894266763394 0.843566283534706 0.838153944380635 0.832657790530585 0.82707837159536 0.821416245512206 0.815671978489013 0.809846144947694 0.803939327466751 0.797952116723008 0.79188511143255 0.785738918290852 0.779514151912104 0.773211434767759 0.766831397124277 0.760374676980107 0.753841920001883 0.747233779459858 0.740550916162579 0.733793998390808 0.726963701830691 0.720060709506193 0.713085711710792 0.706039405938456 0.69892249681389 0.691735696022077 0.684479722237106 0.677155301050309 0.669763164897701 0.662304052986738 0.654778711222394 0.647187892132575 0.639532354792865 0.631812864750617 0.624030193948403 0.616185120646817 0.608278429346653 0.600310910710451 0.592283361483435 0.584196584413839 0.576051388172631 0.567848587272646 0.55958900198714 0.551273458267758 0.542902787661942 0.534477827229777 0.525999419460286 0.517468412187181 0.508885658504079 0.500252016679196 0.491568350069521 0.482835527034478 0.474054420849093 0.465225909616667 0.456350876180967 0.447430208037939 0.438464797246966 0.429455540341653 0.420403338240185 0.411309096155228 0.402173723503411 0.392998133814388 0.383783244639481 0.374529977459929 0.365239257594737 0.355912014108151 0.346549179716747 0.337151690696161 0.327720486787465 0.318256511103189 0.308760710033015 0.299234033149138 0.289677433111308 0.280091865571563 0.270478289078669 0.260837664982266 0.251170957336729 0.241479132804767 0.231763160560755 0.222024012193824 0.212262661610692 0.202480084938284 0.192677260426115 0.182855168348468 0.173014790906364 0.163157112129348 0.153283117777083 0.143393795240776 0.133490133444439 0.123573122746 0.113643754838263 0.103703022649744 0.0937519202453802 0.0837914427271178 0.0738225861344087 0.0638463473446048 0.0538637239732715 0.0438757142744272 0.0338833170407184 0.0238875315035415 0.0138893572331205 0.00388979403855066 -0.0061101581321816 -0.0161094992921924 -0.0261072295156986 -0.0361023490380091 -0.046093858355501 -0.0560807583255688 -0.0660620502665378 -0.0760367360575317 -0.0860038182382836 -0.0959623001088813 -0.105911185829436 -0.115849480519668 -0.125776190358388 -0.135690322682885 -0.145590886088189 -0.15547689052621 -0.165347347404742 -0.175201269686322 -0.185037671986934 -0.194855570674545 -0.204653983967467 -0.214431932032538 -0.224188437083097 -0.233922523476772 -0.243633217813033 -0.253319549030541 -0.262980548504244 -0.272615250142247 -0.282222690482413 -0.291801908788717 -0.301351947147309 -0.310871850562312 -0.320360667051318 -0.329817447740585 -0.339241246959925 -0.348631122337269 -0.357986134892905 -0.367305349133372 -0.376587833145012 -0.38583265868716 -0.395038901284966 -0.404205640321841 -0.41333195913152 -0.422416945089729 -0.431459689705442 -0.440459288711733 -0.449414842156201 -0.458325454490964 -0.467190234662215 -0.476008296199323 -0.484778757303484 -0.493500740935896 -0.502173374905463 -0.510795791956016 -0.519367129853035 -0.527886531469873 -0.536353144873469 -0.544766123409536 -0.553124625787233 -0.561427816163287 -0.56967486422558 -0.577864945276177 -0.5859972403138 -0.59407093611572 -0.602085225319086 -0.610039306501657 -0.617932384261942 -0.625763669298742 -0.633532378490081 -0.641237734971512 -0.64887896821381 -0.656455314100016 -0.663966015001857 -0.671410319855501 -0.678787484236667 -0.686096770435062 -0.69333744752816 -0.700508791454285 -0.707610085085019 -0.714640618296918 -0.721599688042519 -0.728486598420647 -0.735300660746003 -0.742041193618033 -0.748707522989067 -0.755298982231723 -0.76181491220557 -0.768254661323039 -0.774617585614586 -0.780903048793085 -0.787110422317454 -0.793239085455515 -0.799288425346061 -0.805257837060144 -0.811146723661567 -0.816954496266577 -0.822680574102753 -0.828324384567084 -0.833885363283227 -0.839362954157943 -0.84475660943671 -0.850065789758495 -0.855289964209691 -0.860428610377204 -0.865481214400701 -0.87044727102399 -0.875326283645548 -0.880117764368176 -0.884821234047797 -0.889436222341362 -0.893962267753887 -0.898398917684603 -0.902745728472213 -0.907002265439262 -0.9111681029356 -0.915242824380949 -0.919226022306559 -0.923117298395958 -0.926916263524779 -0.930622537799675 -0.934235750596308 -0.937755540596408 -0.941181555823909 -0.944513453680143 -0.947750900978101 -0.950893573975751 -0.953941158408412 -0.95689334952018 -0.959749852094405 -0.96251038048321 -0.965174658636055 -0.967742420127347 -0.970213408183075 -0.972587375706493 -0.974864085302828 -0.977043309303016 -0.979124829786474 -0.981108438602888 -0.98299393739303 -0.984781137608591 -0.986469860531039 -0.98805993728949 -0.989551208877593 -0.990943526169431 -0.992236749934435 -0.993430750851308 -0.994525409520951 -0.995520616478411 -0.996416272203821 -0.997212287132355 -0.997908581663183 -0.998505086167432 -0.99900174099515 -0.999398496481266 -0.999695312950564 -0.999892160721644 -0.999989020109892 -0.99998588142945 -0.999882744994185 -0.999679621117653 -0.999376530112073 -0.998973502286292 -0.998470577942758 -0.997867807373486 -0.99716525085503 -0.996362978642458 -0.99546107096232 -0.994459618004635 -0.993358719913863 -0.992158486778895 -0.990859038622046 -0.989460505387048 -0.987963026926058 -0.986366752985676 -0.984671843191965 -0.982878467034492 -0.980986803849378 -0.978997042801366 -0.976909382864901 -0.974724032804239 -0.972441211152564 -0.970061146190138 -0.967584075921475 -0.965010248051537 -0.962339919960966 -0.959573358680347 -0.956710840863502 -0.953752652759826 -0.950699090185666 -0.947550458494734 -0.944307072547576 -0.940969256680082 -0.937537344671059 -0.934011679708847 -0.930392614357006 -0.926680510519053 -0.922875739402279 -0.918978681480626 -0.914989726456637 -0.910909273222492 -0.906737729820113 -0.902475513400365 -0.898123050181337 -0.893680775405724 -0.889149133297302 -0.884528577016506 -0.879819568615113 -0.875022578990038 -0.870138087836248 -0.865166583598787 -0.860108563423936 -0.854964533109497 -0.849735007054215 -0.844420508206339 -0.839021568011322 -0.833538726358688 -0.82797253152803 -0.822323540134195 -0.816592317071613 -0.810779435457816 -0.80488547657612 -0.798911029817503 -0.79285669262166 -0.786723070417268 -0.780510776561434 -0.774220432278367 -0.767852666597254 -0.761408116289356 -0.754887425804334 -0.748291247205803 -0.741620240106125 -0.734875071600451 -0.728056416200011 -0.721164955764662 -0.714201379434706 -0.707166383561973 -0.700060671640186 -0.692884954234618 -0.685639948911028 -0.678326380163912 -0.67094497934405 -0.663496484585372 -0.655981640731148 -0.6484011992595 -0.640755918208259 -0.633046562099158 -0.625273901861384 -0.617438714754485 -0.60954178429064 -0.601583900156316 -0.593565858133295 -0.585488460019097 -0.577352513546803 -0.569158832304279 -0.560908235652823 -0.552601548645223 -0.544239601943258 -0.535823231734631 -0.527353279649348 -0.51883059267556 -0.510256023074861 -0.501630428297067 -0.492954670894467 -0.484229618435573 -0.475456143418357 -0.466635123183013 -0.457767439824211 -0.448853980102898 -0.439895635357619 -0.430893301415383 -0.421847878502081 -0.412760271152469 -0.403631388119706 -0.39446214228449 -0.385253450563763 -0.376006233819024 -0.366721416764239 -0.357399927873379 -0.348042699287563 -0.338650666721854 -0.32922476937168 -0.319765949818922 -0.310275153937653 -0.300753330799551 -0.291201432578997 -0.281620414457852 -0.272011234529945
-
-# cos(x)
-1 0.999950000416665 0.999800006666578 0.999550033748988 0.999200106660978 0.998750260394966 0.998200539935204 0.99755100025328 0.996801706302619 0.995952733011994 0.995004165278026 0.993956097956697 0.992808635853866 0.991561893714788 0.990215996212637 0.988771077936042 0.987227283375627 0.985584766909561 0.983843692788121 0.98200423511727 0.980066577841242 0.978030914724148 0.975897449330606 0.973666395005375 0.97133797485203 0.968912421710645 0.966389978134513 0.963770896365891 0.961055438310771 0.958243875512697 0.955336489125606 0.952333569885713 0.949235418082441 0.946042343528387 0.942754665528346 0.939372712847379 0.935896823677935 0.932327345606034 0.92866463557651 0.924909059857313 0.921060994002885 0.917120822816605 0.913088940312308 0.908965749674885 0.904751663219963 0.900447102352677 0.896052497525525 0.891568288195329 0.886994922779284 0.882332858610121 0.877582561890373 0.872744507645751 0.86781917967765 0.862807070514761 0.857708681363824 0.852524522059506 0.847255111013416 0.841900975162269 0.836462649915187 0.830940679100163 0.825335614909678 0.819648017845479 0.813878456662534 0.808027508312152 0.802095757884292 0.796083798549056 0.789992231497365 0.783821665880849 0.777572718750928 0.771246014997106 0.764842187284488 0.758361875990508 0.751805729140895 0.74517440234487 0.738468558729588 0.731688868873821 0.724836010740905 0.717910669610943 0.710913538012277 0.703845315652236 0.696706709347165 0.689498432951747 0.682221207287613 0.674875760071267 0.667462825841308 0.659983145884982 0.652437468164051 0.644826547240001 0.63715114419858 0.629412026573696 0.621609968270664 0.613745749488811 0.605820156643462 0.597833982287298 0.589788025031098 0.581683089463883 0.573519986072456 0.565299531160354 0.557022546766217 0.548689860581587 0.540302305868139 0.531860721374355 0.523365951251649 0.514818844969955 0.506220257232778 0.497571047891726 0.488872081860527 0.480124229028533 0.471328364173739 0.4624853668753 0.453596121425577 0.444661516741706 0.435682446276711 0.426659807930157 0.417594503958357 0.408487440884157 0.399339529406272 0.390151684308229 0.380924824366881 0.371659872260532 0.362357754476673 0.35301940121933 0.343645746316046 0.334237727124502 0.324796284438775 0.315322362395268 0.305816908378288 0.296280872925318 0.286715209631955 0.277120875056557 0.267498828624587 0.257850032532669 0.248175451652372 0.238476053433722 0.228752807808459 0.219006687093041 0.209238665891418 0.199449720997572 0.189640831297833 0.179812977672998 0.16996714290024 0.16010431155483 0.150225469911685 0.140331605846736 0.130423708738144 0.120502769367366 0.110569779820068 0.100625733386931 0.0906716244643086 0.0807084484547995 0.0707372016677018 0.0607588812193848 0.0507744849335781 0.0407850112415899 0.030791459082465 0.0207948278030913 0.0107961170582663 0.000796326710732153 -0.00920354326880945 -0.0192024929016938 -0.0291995223012899 -0.0391936317729888 -0.0491838219141717 -0.0591690937141495 -0.0691484486540633 -0.0791208888067352 -0.0890854169364603 -0.0990410365987293 -0.108986752239872 -0.118921569296614 -0.128844494295526 -0.138754534952379 -0.148650700271365 -0.158532000644199 -0.168397447949078 -0.178246055649493 -0.188076838892881 -0.19788881460911 -0.207681001608785 -0.217452420681366 -0.227202094693088 -0.236929048684676 -0.246632309968835 -0.256310908227524 -0.265963875608982 -0.275590246824514 -0.285189059245022 -0.294759352997262 -0.304300171059835 -0.313810559358884 -0.323289566863505 -0.332736245680847 -0.3421496511509 -0.351528841940961 -0.360872880139769 -0.370180831351288 -0.379451764788156 -0.388684753364753 -0.397878873789917 -0.407033206659267 -0.416146836547144 -0.425218852098153 -0.434248346118301 -0.44323441566571 -0.452176162140912 -0.461072691376713 -0.469923113727602 -0.47872654415872 -0.487482102334359 -0.496188912705998 -0.504846104599857 -0.513452812303959 -0.522008175154706 -0.530511337622944 -0.53896144939951 -0.54735766548027 -0.555699146250611 -0.563985057569408 -0.572214570852435 -0.58038686315522 -0.588501117255343 -0.596556521734157 -0.604552271057927 -0.612487565658382 -0.620361612012677 -0.628173622722736 -0.635922816593999 -0.643608418713537 -0.651229660527542 -0.658785779918184 -0.66627602127982 -0.673699635594557 -0.681055880507149 -0.688344020399234 -0.695563326462898 -0.70271307677355 -0.709792556362116 -0.716801057286538 -0.723737878702564 -0.730602326933832 -0.737393715541241 -0.744111365391588 -0.750754604725486 -0.757322769224539 -0.763815202077769 -0.770231254047302 -0.776570283533288 -0.78283165663806 -0.789014747229526 -0.795118937003779 -0.801143615546928 -0.80708818039614 -0.812952037099884 -0.818734599277376 -0.824435288677216 -0.830053535235216 -0.835588777131402 -0.841040460846196 -0.84640804121577 -0.85169098148656 -0.856888753368941 -0.862000837090058 -0.867026721445797 -0.871965903851911 -0.876817890394275 -0.88158219587828 -0.886258343877346 -0.890845866780571 -0.895344305839486 -0.899753211213935 -0.904072142017055 -0.908300666359364 -0.912438361391952 -0.916484813348764 -0.920439617587975 -0.924302378632458 -0.928072710209327 -0.931750235288567 -0.935334586120733 -0.938825404273731 -0.942222340668653 -0.945525055614691 -0.948733218843102 -0.951846509540237 -0.954864616379622 -0.957787237553085 -0.960614080800948 -0.963344863441239 -0.96597931239797 -0.968517164228442 -0.970958165149586 -0.973302071063344 -0.975548647581079 -0.977697670047009 -0.979748923560681 -0.98170220299845 -0.983557313034003 -0.98531406815788 -0.986972292696034 -0.988531820827393 -0.989992496600443 -0.991354173948823 -0.992616716705935 -0.993779998618553 -0.994843903359457 -0.995808324539059 -0.996673165716045 -0.997438340407017 -0.998103772095144 -0.998669394237812 -0.999135150273279 -0.999500993626327 -0.999766887712928 -0.999932805943894 -0.99999873172754 -0.999964658471342 -0.999830589582599 -0.999596538468086 -0.999262528532722 -0.99882859317722 -0.998294775794754 -0.997661129766619 -0.996927718456889 -0.996094615206083 -0.995161903323833 -0.994129676080549 -0.992998036698096 -0.991767098339468 -0.990436984097477 -0.989007826982437 -0.987479769908869 -0.985852965681208 -0.984127576978519 -0.982303776338237 -0.980381746138904 -0.97836167858194 -0.976243775672416 -0.974028249198858 -0.971715320712069 -0.969305221502968 -0.966798192579468 -0.964194484642373 -0.961494358060307 -0.958698082843677 -0.955805938617675 -0.952818214594314 -0.949735209543505 -0.946557231763186 -0.943284599048486 -0.939917638659948 -0.936456687290807 -0.932902091033315 -0.929254205344135 -0.925513395008796 -0.921680034105216 -0.917754505966288 -0.913737203141558 -0.909628527357958 -0.905428889479643 -0.901138709466903 -0.896758416334162 -0.892288448107083 -0.887729251778765 -0.883081283265042 -0.87834500735889 -0.873520897683954 -0.868609436647182 -0.863611115390583 -0.858526433742119 -0.853355900165717 -0.848100031710427 -0.842759353958712 -0.837334400973899 -0.831825715246765 -0.826233847641292 -0.820559357339581 -0.814802811785933 -0.808964786630107 -0.803045865669753 -0.797046640792034 -0.790967711914439 -0.784809686924791 -0.778573181620456 -0.772258819646768 -0.765867232434662 -0.759399059137533 -0.75285494656732 -0.746235549129829 -0.739541528759284 -0.732773554852147 -0.725932304200167 -0.719018460922709 -0.712032716398338 -0.704975769195686 -0.697848325003592 -0.690651096560537 -0.683384803583366 -0.676050172695322 -0.668647937353382 -0.661178837774911 -0.653643620863643 -0.64604304013499 -0.638377855640691 -0.630648833892808 -0.622856747787074 -0.615002376525607 -0.607086505538988 -0.599109926407719 -0.591073436783066 -0.582977840307294 -0.574823946533304 -0.56661257084368 -0.558344534369146 -0.550020663906461 -0.541641791835735 -0.533208756037192 -0.524722399807384 -0.516183571774863 -0.507593125815316 -0.49895192096618 -0.490260821340739 -0.481520696041713 -0.47273241907435 -0.463896869259021 -0.455014930143346 -0.446087489913834 -0.437115441307069 -0.428099681520436 -0.419041112122398 -0.409940638962349 -0.400799172080019 -0.391617625614479 -0.382396917712725 -0.373137970437862 -0.363841709676903 -0.354509065048177 -0.345140969808369 -0.335738360759197 -0.32630217815373 -0.316833365602365 -0.307332869978467 -0.297801641323681 -0.288240632752929 -0.278650800359102 -0.269033103117448 -0.259388502789675 -0.24971796382778 -0.240022453277599 -0.230302940682109 -0.220560397984469 -0.21079579943083 -0.201010121472911 -0.191204342670352 -0.181379443592863 -0.171536406722163 -0.161676216353738 -0.151799858498407 -0.141908320783726 -0.132002592355223 -0.122083663777486 -0.112152526935108 -0.102210174933496 -0.0922576019995656 -0.0822958033823164 -0.0723257752533085 -0.0623485146070466 -0.0523650191612809 -0.0423762872572365 -0.0323833177597798 -0.0223871099575331 -0.0123886634629465 -0.00238897811233749 0.00761094613409195 0.0176101092922504 0.0276075114541547 0.0376021528879198 0.047593034137731 0.0575791561237893 0.0675595202422176 0.0775331284649211 0.0874989834393889 0.0974560885884283 0.107403448209822 0.117340067575897 0.127264953032998 0.137177112100849 0.147075553571804 0.156959287609965 0.166827325850163 0.176678681496799 0.186512369422516 0.196327406266718 0.206122810533899 0.215897602691795 0.225650805269336 0.235381442954392 0.245088542691302 0.254771133778184 0.264428247963996 0.274058919545368 0.283662185463167 0.293237085398804 0.302782661870264 0.312297960327856 0.321782029249662 0.331233920236694 0.34065268810773 0.350037390993831 0.35938709043253 0.368700851461674 0.377977742712921 0.387216836504877 0.396417208935863 0.405577939976301 0.414698113560723 0.423776817679369 0.432813144469393 0.441806190305646 0.45075505589104 0.459658846346473 0.468516671300318 0.477327644977463 0.486090886287882 0.494805518914746 0.503470671402056 0.512085477241783 0.520649074960522 0.529160608205638 0.537619225830899 0.546024081981591 0.554374336179104 0.562669153404976 0.570907704184397 0.579089164669154 0.587212716720017 0.59527754798855 0.603282851998348 0.61122782822568 0.619111682179544 0.626933625481114 0.63469287594258 0.64238865764536 0.650020201017698 0.657586742911615 0.665087526679229 0.672521802248413 0.679888826197804 0.687187861831148 0.694418179250964 0.701579055431534 0.708669774291209 0.71568962676401 0.722637910870541 0.729513931788182 0.736317001920569 0.743046440966361 0.749701575987258 0.756281741475307 0.76278627941944 0.769214539371285 0.775565878510202 0.781839661707572 0.788035261590301 0.794152058603565 0.80018944107276 0.806146805264671 0.812023555447841 0.817819103952151 0.823532871227579 0.829164285902159 0.834712784839117 0.840177813193183 0.845558824466076 0.850855280561151 0.856066651837215 0.861192417161481 0.866232063961689 0.871185088277359 0.876050994810186 0.880829296973572 0.885519516941282 0.890121185695229 0.894633843072372 0.899057037810733 0.903390327594525 0.90763327909838 0.911785468030683 0.915846479176003 0.919815906436607 0.923693352873079 0.927478430744005 0.931170761544753 0.93476997604532 0.938275714327254 0.94168762581965 0.9450053693342 0.948228613099319 0.951357034793317 0.954390321576629 0.957328170123107 0.960170286650343 0.962916386949053 0.965566196411496 0.968119450058934 0.970575892568129 0.972935278296878 0.975197371308574 0.977361945395801 0.979428784102954 0.981397680747884 0.983268438442569 0.985040870112797 0.986714798516878 0.988290056263367 0.989766485827802 0.991143939568457 0.992422279741106 0.993601378512797 0.994681117974634 0.995661390153572 0.99654209702321 0.997323150513595 0.998004472520028 0.998585994910877 0.999067659534386 0.999449418224497 0.999731232805656 0.999913075096641 0.999994926913375 0.999976780070744 0.999858636383417 0.999640507665664 0.999322415730176 0.99890439238588 0.998386479434764 0.99776872866769 0.997051201859221 0.996233970761438 0.995317117096772 0.994300732549825 0.993184918758203 0.991969787302358 0.99065545969442 0.989242067366057 0.987729751655323 0.986118663792528 0.984408964885117 0.982600825901556 0.980694427654236 0.978689960781393 0.976587625728044 0.974387632725942 0.972090201772555 0.969695562609064 0.967203954697388 0.964615627196243 0.961930838936222 0.959149858393914 0.956272963665056 0.953300442436722 0.950232591958559 0.947069719013059 0.943812139884879 0.940460180329218 0.937014175539238 0.933474470112547 0.929841418016737 0.926115382553991 0.92229673632475 0.918385861190455 0.914383148235359 0.910288997727424 0.906103819078287 0.901828030802326 0.897462060474806 0.893006344689121 0.888461329013137 0.883827467944634 0.879105224865856 0.874295071997177 0.869397490349875 0.864412969678033 0.859342008429566 0.854185113696372 0.848942801163626 0.843615595058214 0.838204028096307 0.832708641430091 0.827129984593654 0.82146861544803 0.815725100125416 0.809900012972559 0.803993936493318 0.798007461290421 0.791941186006399 0.785795717263725 0.779571669604153 0.77326966542726 0.766890334928215 0.760434316034749 0.753902254343374 0.747294803054813 0.740612622908691 0.733856382117453 0.727026756299548 0.720124428411867 0.713150088681447 0.706104434536448 0.698988170536414 0.691802008301814 0.684546666442884 0.677222870487764 0.669831352809945 0.662372852555036 0.654848115566847 0.647257894312806 0.639602947808714 0.631884041542842 0.624101947399383 0.616257443581268 0.608351314532341 0.600384350858919 0.592357349250729 0.584271112401244 0.576126448927409 0.567924173288786 0.559665105706102 0.551350072079233 0.542979903904614 0.534555438192086 0.5260775173812 0.517546989256972 0.508964706865107 0.50033152842669 0.491648317252373 0.482915941656036 0.474135274867962 0.465307194947512 0.456432584695323 0.447512331565023 0.438547327574492 0.429538469216659 0.420486657369852 0.411392797207712 0.402257798108678 0.393082573565046 0.383868041091626 0.374615122133985 0.365324741976309 0.355997829648872 0.346635317835134 0.337238142778474 0.327807244188567 0.318343565147414 0.30884805201503 0.299321654334818 0.289765324738606 0.280180018851391 0.270566695195773 0.260926315096107 0.251259842582369 0.241568244293756 0.231852489382019 0.222113549414554 0.212352398277241 0.202570012077061 0.19276736904448 0.182945449435634 0.173105235434299 0.163247711053674 0.153373862037983 0.143484675763899 0.133581141141809 0.123664248516922 0.113734989570237 0.103794357219373 0.0938433455192826 0.0838829495628426 0.0739141653813487 0.0639379898449115 0.0539554205627713 0.0439674557835375 0.0339750942953648 0.023979335326075 0.0139811784432353 0.00398162345420231 -0.00601832969385814 -0.0160176810139645 -0.0260154305793174 -0.0360105786232919 -0.0460021256394127 -0.0559890724813046 -0.0659704204626058 -0.0759451714568359 -0.0859123279972077 -0.0958708933763732 -0.105819871746093 -0.115758268216821 -0.125685088957193 -0.135599341293406 -0.145500033808489 -0.15538617644144 -0.165256780586236 -0.175110859190686 -0.184947426855143 -0.194765499931036 -0.20456409661924 -0.214342237068252 -0.224098943472175 -0.233833240168499 -0.243544153735667 -0.253230713090414 -0.262891949584877 -0.272526897103457 -0.282134592159432 -0.291714073991302 -0.301264384658868 -0.31078456913902 -0.320273675421245 -0.329730754602822 -0.339154860983713 -0.348545052161133 -0.357900389123791 -0.367219936345786 -0.376502761880162 -0.385747937452101 -0.39495453855175 -0.404121644526672 -0.413248338673908 -0.422333708331649 -0.431376844970501 -0.440376844284335 -0.44933280628072 -0.45824383537092 -0.467109040459451 -0.475927535033192 -0.484698437250036 -0.493420870027068 -0.50209396112828 -0.51071684325179 -0.51928865411657 -0.527808536548678 -0.53627563856697 -0.5446891134683 -0.55304811991219 -0.56135182200496 -0.569599389383321 -0.577789997297408 -0.585922826693256 -0.593997064294702 -0.602011902684714 -0.609966540386133 -0.617860181941817 -0.625692037994188 -0.633461325364169 -0.641167267129495 -0.648809092702413 -0.656386037906734 -0.66389734505425 -0.671342263020506 -0.678720047319911 -0.686029960180181 -0.693271270616124 -0.700443254502729 -0.707545194647584 -0.714576380862594 -0.721536110034996 -0.728423686197672 -0.735238420598746 -0.741979631770457 -0.748646645597306 -0.755238795383464 -0.761755421919448 -0.768195873548034 -0.774559506229427 -0.78084568360566 -0.787053777064236 -0.793183165800981 -0.79923323688213 -0.805203385305616 -0.811093014061572 -0.81690153419203 -0.822628364849819 -0.828272933356643 -0.833834675260357 -0.839313034391405 -0.84470746291844 -0.850017421403102 -0.85524237885397 -0.860381812779653 -0.865435209241039 -0.870402062902696 -0.875281877083394 -0.880074163805783 -0.884778443845185 -0.889394246777515 -0.893921111026326 -0.898358583908967 -0.902706221681846 -0.90696358958481 -0.911130261884616 -0.915205821917506 -0.919189862130874 -0.923081984124017 -0.92688179868798 -0.930588925844474 -0.934202994883871 -0.93772364440228 -0.941150522337682 -0.94448328600514 -0.947721602131064 -0.950865146886541 -0.953913605919714 -0.95686667438722 -0.959724056984674 -0.962485467976196 -0.96515063122299 -0.967719280210951 -0.970191158077321 -0.972566017636373 -0.97484362140413 -0.977023741622114 -0.979106160280119 -0.981090669138016 -0.982977069746571 -0.984765173467297 -0.986454801491311 -0.988045784857219 -0.989537964468009 -0.990931191106966 -0.992225325452584 -0.993420238092509 -0.994515809536473 -0.995511930228243 -0.996408500556581 -0.9972054308652 -0.997902641461735 -0.998500062625707 -0.998997634615497 -0.99939530767432 -0.999693042035203 -0.999890807924956 -0.999988585567157 -0.999986365184123 -0.999884146997889 -0.999681941230189 -0.999379768101432 -0.998977657828678 -0.99847565062262 -0.99787379668356 -0.99717215619639 -0.996370799324575 -0.995469806203134 -0.994469266930627 -0.99336928156015 -0.992169960089321 -0.990871422449289 -0.989473798492735 -0.987977227980891 -0.98638186056956 -0.984687855794155 -0.98289538305374 -0.981004621594097 -0.979015760489796 -0.97692899862529 -0.974744544675025 -0.972462617082578 -0.970083444038805 -0.967607263459029 -0.965034322959243 -0.962364879831354 -0.95959920101745 -0.956737563083108 -0.953780252189736 -0.950727564065959 -0.947579803978045 -0.944337286699382 -0.941000336478993 -0.937569287009121 -0.934044481391853 -0.930426272104814 -0.926715020965917 -0.922911099097183 -0.919014886887629 -0.91502677395523 -0.910947159107956 -0.90677645030389 -0.902515064610439 -0.89816342816262 -0.893721976120452 -0.889191152625437 -0.884571410756151 -0.879863212482928 -0.875067028621675 -0.87018333878678 -0.865212631343156 -0.860155403357406 -0.855012160548114 -0.849783417235275 -0.844469696288863 -0.839071529076544 -0.833589455410542 -0.828024023493654 -0.822375789864435 -0.81664531934154 -0.810833184967247 -0.804939967950148 -0.798966257607036 -0.792912651303966 -0.786779754396524 -0.78056818016929 -0.774278549774511 -0.767911492169984 -0.761467644056164 -0.754947649812493 -0.748352161432961 -0.741681838460911 -0.734937347923081 -0.728119364262904 -0.721228569273065 -0.714265652027321 -0.707231308811593 -0.700126243054342 -0.692951165256222 -0.685706792919033 -0.678393850473973 -0.671013069209192 -0.663565187196666 -0.656050949218389 -0.648471106691898 -0.640826417595128 -0.633117646390619 -0.625345563949068 -0.617510947472241 -0.609614580415257 -0.601657252408242 -0.593639759177366 -0.585562902465271 -0.577427489950896 -0.569234335168714 -0.560984257427376 -0.55267808172778 -0.544316638680575 -0.535900764423098 -0.527431300535761 -0.518909093957894 -0.510334996903055 -0.501709866773804 -0.493034566075965 -0.484309962332379 -0.47553692799615 -0.466716340363402 -0.457849081485545 -0.44893603808108 -0.439978101446919 -0.430976167369261 -0.421931136034011 -0.412843911936766 -0.403715403792362 -0.394546524444008 -0.385338190771997 -0.376091323602023 -0.366806847613097 -0.357485691245081 -0.348128786605844 -0.338737069378053 -0.329311478725605 -0.319852957199709 -0.310362450644636 -0.300840908103134 -0.291289281721521 -0.281708526654476 -0.272099600969522 -0.26246346555122 -0.252801084005081 -0.243113422561209 -0.233401449977675 -0.223666137443643 -0.213908458482255 -0.204129388853276 -0.194329906455518 -0.184510991229055 -0.174673625057229 -0.164818791668457 -0.154947476537868 -0.145060666788746 -0.13515935109383 -0.125244519576436 -0.115317163711455 -0.105378276226201 -0.0954288510011381 -0.0854698829704992 -0.075502368022788 -0.0655273029011929 -0.0555456851039136 -0.0455585127844118 -0.0355667846515969 -0.0255714998699557 -0.015573657959637 -0.00557425869650037 0.00442569798786072 0.0144252121061111 0.0244232837151718 0.0344189130162137 0.0444111004546363 0.0543988468200225 0.064381153346059 0.0743570218104117 0.0843254546345473 0.0942854549834904 0.104236026865506 0.114176175231698 0.124104906075514 0.134021226532142 0.143924144977801 0.153812671128899 0.163685816141061 0.173542592708013 0.183382015160312 0.193203099563914 0.203004863818561 0.212786327755996 0.222546513237977 0.232284444254089 0.241999147019346 0.251689650071565 0.261354984368519 0.27099418338483 0.280606283208631 0.290190322637948 0.299745343276827 0.309270389631164 0.318764509204263 0.328226752592078 0.337656173578155 0.347051829228253 0.356412779984638 0.365738089760033 0.375026826031234 0.384278059932352 0.393490866347708 0.402664324004337 0.411797515564118 0.420889527715506 0.429939451264863 0.438946381227375 0.447909416917552 0.456827662039293 0.465700224775519 0.47452621787735 0.48330475875283 0.492034969555188 0.500715977270617 0.509346913805582 0.51792691607362 0.526455126081656 0.534930691015794 0.543352763326605 0.551720500813876 0.560033066710831 0.568289629767807 0.57648936433538 0.584631450446925 0.592715073900617 0.600739426340847 0.608703705339057 0.616607114473984 0.624448863411302 0.63222816798265 0.639944250264056 0.64759633865372 0.655183667949181 0.662705479423831 0.670161020902792 0.677549546838128 0.684870318383403 0.692122603467563 0.699305676868143 0.70641882028379 0.713461322406088 0.720432478990695 0.727331592927761 0.734157974311642 0.740910940509888 0.747589816231506 0.754193933594491 0.76072263219261 0.767175259161442 0.77355116924367 0.779849724853596 0.78607029614091 0.792212261053666 0.798275005400491 0.804257922912004 0.810160415301437 0.815981892324472 0.821721771838258 0.827379479859625 0.832954450622487 0.838446126634413 0.843853958732379 0.84917740613768 0.854415936510013 0.859569026000707 0.864636159305105 0.8696168297141 0.874510539164803 0.879316798290345 0.884035126468819 0.888665051871341 0.893206111509227 0.897657851280298 0.902019826014286 0.906291599517354 0.910472744615711 0.914562843198331 0.918561486258764 0.922468273936036 0.926282815554637 0.930004729663581 0.93363364407456 0.937169195899158 0.940611031585137 0.943958806951797 0.947212187224393 0.950370847067606 0.953434470618086 0.95640275151603 0.959275392935822 0.962052107615714 0.964732617886552 0.967316655699543 0.969803962653058 0.972194290018475 0.974487398765049 0.976683059583817 0.978781052910527 0.980781168947593 0.98268320768508 0.984486978920698 0.986192302278827 0.987799007228553 0.989306933100718 0.990715929103994 0.992025854339952 0.993236577817163 0.994347978464286 0.995359945142183 0.99627237665503 0.997085181760435 0.997798279178566 0.998411597600275 0.998925075694231 0.999338662113052 0.999652315498441 0.999866004485321 0.999979707704972 0.999993413787166 0.999907121361306 0.999720839056563 0.999434585501012 0.999048389319771 0.998562289132135 0.997976333547719 0.997290581161592 0.996505100548421 0.995619970255614 0.994635278795462 0.99355112463629 0.992367616192611 0.991084871814283 0.989703019774675 0.98822219825784 0.986642555344694 0.984964248998213 0.983187447047633 0.981312327171669 0.979339076880745 0.977267893498246 0.975098984140784 0.972832565697488 0.970468864808314 0.96800811784138 0.965450570869333 0.962796479644738 0.960046109574506 0.957199735693353 0.954257642636294 0.951220124610184 0.948087485364293 0.944860038159936 0.941538105739144 0.938122020292391 0.934612123425374 0.931008766124855 0.927312308723562 0.923523120864154 0.91964158146226 0.915668078668585 0.911603009830098 0.907446781450294 0.903199809148548 0.898862517618552 0.894435340585843 0.889918720764435 0.885313109812548 0.880618968287438 0.875836765599346 0.870966979964556 0.866010098357572 0.860966616462426 0.855837038623103 0.850621877793113 0.845321655484192 0.839936901714156 0.834468154953893 0.828915962073523 0.823280878287707 0.817563467100127 0.811764300247137 0.805883957640591 0.799923027309848 0.793882105342975 0.787761795827133 0.781562710788175 0.775285470129438 0.768930701569758 0.762499040580693 0.755991130322985 0.749407621582234 0.74274917270383 0.736016449527111 0.729210125318784 0.722330880705598 0.715379403606283 0.708356389162754 0.701262539670604 0.69409856450887 0.686865180069099 0.679563109683707 0.672193083553647 0.664755838675391 0.657252118767228 0.649682674194898 0.642048261896548 0.634349645307047 0.626587594281638 0.618762885018955 0.610876299983405 0.602928627826918 0.594920663310088 0.586853207222692 0.578727066303616 0.570543053160181 0.562301986186881 0.554004689483546 0.545651992772931 0.537244731317748 0.528783745837135 0.52026988242259 0.51170399245336 0.503086932511303 0.494419564295232 0.485702754534747 0.476937374903559 0.468124301932328 0.459264416921006 0.45035860585071 0.441407759295127 0.432412772331453 0.423374544450889 0.414293979468691 0.405171985433789 0.396009474537987 0.386807363024737 0.377566571097524 0.368288022827838 0.358972646062775 0.349621372332249 0.34023513675584 0.330814877949283 0.32136153793061 0.311876062025944 0.302359398774972 0.292812499836087 0.283236319891228 0.273631816550409 0.263999950255962 0.254341684186488 0.244657984160545 0.234949818540068 0.225218158133528 0.215463976098855 0.205688247846126 0.195891950940018 0.186076065002059 0.176241571612662 0.166389454212972 0.156520698006518 0.146636289860696 0.136737218208085 0.126824472947601 0.116899045345508 0.106961927936297 0.0970141144234263 0.0870565995799583 0.0770903791490792 0.067116449744527 0.0571358087509305 0.0471494542240719 0.037158384791082 0.0271635995505782 0.0171660979727557 0.00716687979944085 -0.00283305505588154 -0.0128327066080592 -0.02283107490027 -0.0328271601040165 -0.0428199626191085 -0.0528084831736218 -0.0627917229238247 -0.0727686835540614 -0.0827383673765831 -0.0926997774313156 -0.102651917585554 -0.112593792633578 -0.122524408396166 -0.132442771820017 -0.142347891077055 -0.152238775663608 -0.162114436499461 -0.171973886026758 -0.181816138308763 -0.191640209128451 -0.201445116086925 -0.211229878701661 -0.220993518504551 -0.230735059139752 -0.240453526461317 -0.250147948630613 -0.259817356213502 -0.269460782277283 -0.279077262487387 -0.288665835203805 -0.298225541577258 -0.307755425645072 -0.317254534426785 -0.326721918019432 -0.336156629692545 -0.345557725982819 -0.354924266788458 -0.364255315463187 -0.373549938909915 -0.382807207674042 -0.392026196036408 -0.401205982105857 -0.410345647911432 -0.41944427949417 -0.428500966998494 -0.437514804763202 -0.446484891412027 -0.455410329943781 -0.464290227822048 -0.47312369706444 -0.481909854331393 -0.490647821014504 -0.499336723324386 -0.507975692378047 -0.516563864285782 -0.525100380237557 -0.533584386588891 -0.542015034946218 -0.550391482251728 -0.55871289086767 -0.566978428660119 -0.575187269082182 -0.583338591256658 -0.591431580058122 -0.599465426194438 -0.607439326287688 -0.615352482954507 -0.623204104885822 -0.630993406925983 -0.638719610151279 -0.646381941947823 -0.653979636088823 -0.661511932811195 -0.668978078891544 -0.676377327721484 -0.683708939382297 -0.690972180718928 -0.698166325413295 -0.705290654056924 -0.712344454222888 -0.719327020537048 -0.726237654748591 -0.733075665799856 -0.739840369895435 -0.746531090570556 -0.753147158758727 -0.759687912858642 -0.766152698800343 -0.772540870110623 -0.778851787977673 -0.785084821314966 -0.791239346824363 -0.797314749058442 -0.803310420482042 -0.809225761533016 -0.81506018068219 -0.82081309449251 -0.826483927677389 -0.832072113158235 -0.837577092121157 -0.842998314072845 -0.848335236895621 -0.853587326901652 -0.858754058886313 -0.863834916180712 -0.868829390703352 -0.873736983010944 -0.878557202348347 -0.883289566697644 -0.887933602826343 -0.892488846334701 -0.896954841702165 -0.901331142332918 -0.905617310600544 -0.909812917891789 -0.91391754464942 -0.917930780414181 -0.921852223865841 -0.925681482863321 -0.929418174483914 -0.933061925061571 -0.936612370224271 -0.940069154930457 -0.943431933504537 -0.946700369671458 -0.949874136590326 -0.952952916887094 -0.955936402686298 -0.958824295641845 -0.961616306966845 -0.964312157462492 -0.966911577545984 -0.969414307277479 -0.971820096386088 -0.974128704294906 -0.976339900145066 -0.978453462818825 -0.980469180961678 -0.982386853003489 -0.984206287178653 -0.985927301545268 -0.987549724003332 -0.989073392311951 -0.990498154105564 -0.991823866909178 -0.993050398152619 -0.994177625183784 -0.995205435280909 -0.996133725663842 -0.996962403504316 -0.997691385935239 -0.998320600058976 -0.998849982954637 -0.999279481684376 -0.999609053298676 -0.999838664840651 -0.999968293349338 -0.999997925861994 -0.999927559415393 -0.99975720104612 -0.999486867789871 -0.999116586679746 -0.998646394743548 -0.998076339000077 -0.997406476454435 -0.996636874092316 -0.995767608873316 -0.994798767723232 -0.993730447525371 -0.992562755110865 -0.99129580724798 -0.989929730630447 -0.98846466186479 -0.986900747456665 -0.985238143796208 -0.983477017142401 -0.981617543606441 -0.979659909134132 -0.97760430948729 -0.975450950224167 -0.973200046678895 -0.970851823939952 -0.968406516827656 -0.96586436987068 -0.963225637281601 -0.960490582931479 -0.95765948032347 -0.954732612565476 -0.951710272341832 -0.948592761884044 -0.945380392940558 -0.942073486745593 -0.938672373987012 -0.935177394773256 -0.931588898599335 -0.927907244311875 -0.924132800073238 -0.920265943324702 -0.916307060748718 -0.912256548230247 -0.908114810817163 -0.903882262679758 -0.899559327069318 -0.8951464362758 -0.890644031584608 -0.886052563232459 -0.881372490362361 -0.876604280977701 -0.871748411895444 -0.866805368698453 -0.861775645686927 -0.856659745828976 -0.851458180710323 -0.846171470483145 -0.84080014381406 -0.835344737831257 -0.82980579807079 -0.824183878422018 -0.818479541072221 -0.812693356450381 -0.806825903170139 -0.800877767971931 -0.794849545664323 -0.788741839064521 -0.782555258938094 -0.776290423937901 -0.769947960542221 -0.763528502992108 -0.757032693227967 -0.750461180825362 -0.743814622930057 -0.737093684192301 -0.73029903670037 -0.723431359913349 -0.716491340593194 -0.709479672736053 -0.70239705750287 -0.695244203149266 -0.688021824954715 -0.680730645151018 -0.67337139285008 -0.665944803970998 -0.65845162116647 -0.650892593748534 -0.643268477613632 -0.635580035167023 -0.627828035246546 -0.620013253045733 -0.612136470036291 -0.604198473889958 -0.596200058399732 -0.588142023400498 -0.580025174689041 -0.571850323943468 -0.563618288642041 -0.555329891981429 -0.546985962794393 -0.538587335466898 -0.530134849854677 -0.521629351199248 -0.513071690043389 -0.504462722146084 -0.495803308396949 -0.487094314730142 -0.478336612037772 -0.469531076082812 -0.460678587411517 -0.451780031265379 -0.442836297492596 -0.433848280459093 -0.424816878959084 -0.415742996125191 -0.406627539338137 -0.397471420136004 -0.388275554123083 -0.379040860878312 -0.369768263863318 -0.360458690330078 -0.351113071228186 -0.341732341111764 -0.332317438046008 -0.322869303513376 -0.313388882319451 -0.30387712249845 -0.294334975218429 -0.284763394686165 -0.275163338051734 -0.265535765312799 -0.255881639218613 -0.246201925173739 -0.236497591141515 -0.226769607547257 -0.217018947181219 -0.207246585101311 -0.197453498535598 -0.187640666784576 -0.177809071123241 -0.167959694702969 -0.158093522453191 -0.148211540982913 -0.138314738482045 -0.128404104622592 -0.118480630459678 -0.108545308332453 -0.0985991317648484 -0.088643095366233 -0.0786781947319499 -0.0687054263437586 -0.0587257874701873 -0.0487402760668069 -0.0387498906764366 -0.0287556303292902 -0.0187584944430737 -0.00875948272304495 0.00124040493795654 0.0112401685594979 0.0212388081735501 0.0312353239244839 0.0412287161690546 0.0512179855763655 0.0612021332278003 0.071180160716914 0.0811510702492725 0.0911138647422318 0.101067547924645 0.111011124436488 0.120943599928397 0.130863981161098 0.140771276104737 0.150664494038074 0.16054264564756 0.170404743126267 0.180249800272665 0.190076832589243 0.199884857380959 0.209672893853507 0.219439963211397 0.229185088755831 0.238907295982377 0.248605612678413 0.258279069020353 0.267926697670621 0.277547533874395 0.28714061555607 0.296704983415472 0.306239681023786 0.315743754919196 0.325216254702234 0.334656233130813 0.344062746214959 0.353434853311202 0.362771617216641 0.372072104262668 0.381335384408327 0.390560531333324 0.399746622530653 0.408892739398851 0.417997967333851 0.427061395820448 0.436082118523347 0.445059233377794 0.453991842679785 0.462879053175833 0.471719976152294 0.480513727524239 0.489259427923858 0.4979562027884 0.506603182447625 0.515199502210773 0.523744302453032 0.532236728701497 0.540675931720621 0.549061067597135 0.557391297824439 0.565665789386451 0.573883714840911 0.582044252402122 0.590146586023128 0.598189905477319 0.606173406439452 0.614096290566084 0.621957765575405 0.629757045326464 0.637493349897786 0.645165905665362 0.652773945380007 0.660316708244091 0.667793439987612 0.675203392943627 0.682545826123016 0.689820005288578 0.69702520302846 0.704160698828891 0.711225779146238 0.718219737478357 0.725141874435242 0.731991497808966 0.7387679226429 0.745470471300208 0.75209847353161 0.758651266542404 0.765128195058752 0.771528611393198 0.777851875509444 0.784097355086346 0.790264425581152 0.796352470291951 0.802360880419346 0.808289055127331 0.814136401603375 0.819902335117703 0.825586279081769 0.831187665105913 0.836705933056201 0.842140531110436 0.847490915813341 0.852756552130905 0.857936913503883 0.863031481900457 0.868039747868031 0.872961210584182 0.87779537790674 0.882541766423 0.887199901498068 0.891769317322316 0.896249556957971 0.900640172384802 0.904940724544926 0.90915078338671 0.913269927907778 0.917297746197111 0.921233835476237 0.925077802139508 0.92882926179346 0.932487839295254 0.93605316879019 0.939524893748288 0.942902666999946 0.946186150770653 0.94937501671477 0.952468945948358 0.955467629081073 0.958370766247099 0.961178067135141 0.963889251017449 0.966504046777893 0.969022192939076 0.971443437688482 0.973767538903652 0.975994264176401 0.978123390836059 0.980154705971734 0.982088006453604 0.983923098953233 0.985659799962899 0.98729793581395 0.988837342694164 0.990277866664138 0.991619363672674 0.99286169957119 0.99400475012713 0.995048401036392 0.995992547934754 0.996837096408315 0.997581962002929 0.998227070232658 0.998772356587217 0.999217766538425 0.999563255545658 0.999808789060302 0.999954342529212 0.999999901397162 0.999945461108302 0.999791027106616 0.999536614835376 0.999182249735597 0.998727967243494 0.998173812786936 0.997519841780909 0.996766119621967 0.995912721681699 0.994959733299187 0.993907249772475 0.99275537634904 0.991504228215263 0.990153930484915 0.988704618186644 0.987156436250472 0.985509539493303 0.983764092603439 0.981920270124116 0.979978256436044 0.977938245738975 0.975800442032278 0.973565059094541 0.971232320462197 0.968802459407164 0.966275718913523 0.963652351653218 0.960932619960788 0.958116795807137 0.955205160772333 0.952198006017453 0.949095632255468 0.945898349721167 0.94260647814014 0.939220346696801 0.935740294001474 0.932166668056528 0.928499826221579 0.924740135177755 0.920887970891028 0.916943718574615 0.912907772650463 0.908780536709799 0.904562423472778 0.90025385474721 0.895855261386376 0.891367083245947 0.886789769139997 0.882123776796122 0.877369572809668 0.872527632597072 0.86759844034832 0.862582488978529 0.857480280078657 0.852292323865342 0.847019139129881 0.841661253186354 0.836219201818891 0.830693529228092 0.825084787976613 0.819393538933905 0.813620351220129 0.807765802149246 0.801830477171283 0.795814969813793 0.789719881622499 0.783545822101141 0.777293408650524 0.770963266506785 0.764556028678863 0.758072335885201 0.751512836489674 0.744878186436758 0.738169049185928 0.731386095645317 0.724530004104629 0.717601460167303 0.71060115668196 0.703529793673114 0.696388078271173 0.689176724641727 0.681896453914129 0.674547994109384 0.66713208006735 0.659649453373251 0.65210086228352 0.644487061650977 0.636808812849339 0.629066883697089 0.621262048380689 0.613395087377168 0.605466787376071 0.597477941200789 0.589429347729284 0.581321811814196 0.573156144202359 0.564933161453731 0.556653685859733 0.548318545361026 0.539928573464713 0.531484609160993 0.522987496839259 0.514438086203663 0.505837232188143 0.497185794870934 0.488484639388558 0.479734635849312 0.470936659246259 0.462091589369727 0.453200310719334 0.444263712415533 0.43528268811071 0.42625813589981 0.417190958230535 0.408082061813094 0.398932357529539 0.389742760342673 0.380514189204558 0.371247566964616 0.36194382027735 0.352603879509675 0.343228678647885 0.333819155204252 0.324376250123281 0.314900907687611 0.305394075423588 0.295856704006516 0.286289747165591 0.276694161588523 0.267070906825874 0.257420945195101 0.247745241684325 0.238044763855834 0.228320481749327 0.218573367784913 0.208804396665863 0.19901454528115 0.189204792607753 0.179376119612766 0.169529509155298 0.159665945888188 0.149786416159543 0.139891907914105 0.129983410594451 0.120061915042056 0.110128413398209 0.100183899004796 0.0902293663049677 0.0802658107437002 0.0702942286682464 0.060315617228504 0.0503309742773016 0.0403412982706138 0.0303475881677167 0.0203508433312923 0.0103520634274937 0.000352248325979116 -0.00964760200007455 -0.0196464875739678 -0.0296434085154758 -0.0396373651408349 -0.049627358062711 -0.0596123882901367 -0.0695914573284103 -0.0795635672789438 -0.0895277209390521 -0.0994829219016727 -0.109428174655005 -0.119362484682062 -0.129284858560119 -0.139194304060057 -0.149089830245584 -0.158970447572328 -0.168835167986789 -0.178683005025147 -0.188512973911905 -0.198324091658364 -0.208115377160928 -0.217885851299205 -0.227634537033922 -0.237360459504631 -0.247062646127189 -0.256740126691019 -0.26639193345613 -0.276017101249887 -0.285614667563533 -0.295183672648434 -0.304723159612056 -0.314232174513651 -0.323709766459655 -0.33315498769877 -0.342566893716743 -0.351944543330816 -0.361286998783841 -0.37059332583806 -0.379862593868522 -0.389093875956149 -0.398286248980423 -0.407438793711703 -0.416550594903144 -0.425620741382218 -0.434648326141837 -0.443632446431048 -0.452572203845308 -0.461466704416325 -0.470315058701456 -0.479116381872644 -0.487869793804907 -0.496574419164346 -0.50522938749568 -0.513833833309287 -0.522386896167756 -0.53088772077193 -0.539335457046431 -0.547729260224673 -0.556068290933331 -0.564351715276285 -0.572578704918003 -0.580748437166376 -0.588860095054988 -0.59691286742481 -0.604905949005315 -0.612838540495006 -0.620709848641344 -0.628519086320075 -0.636265472613938 -0.643948232890759 -0.651566598880912 -0.659119808754148 -0.666607107195773 -0.674027745482183 -0.681380981555732 -0.688666080098942 -0.695882312608027 -0.703028957465752 -0.710105300013586 -0.717110632623171 -0.724044254767084 -0.730905473088888 -0.73769360147247 -0.744407961110646 -0.75104788057305 -0.757612695873267 -0.764101750535239 -0.770514395658906 -0.776849989985101 -0.78310789995967 -0.789287499796831 -0.795388171541749 -0.801409305132335 -0.807350298460246 -0.813210557431101 -0.818989496023886 -0.824686536349557 -0.83030110870883 -0.835832651649147 -0.841280612020825 -0.846644445032365 -0.851923614304936 -0.857117591926011 -0.862225858502155 -0.867247903210969 -0.872183223852165 -0.877031326897794 -0.881791727541589 -0.886463949747454 -0.891047526297062 -0.895541998836577 -0.899946917922491 -0.904261843066566 -0.908486342779884 -0.912619994615993 -0.916662385213154 -0.920613110335677 -0.924471774914341 -0.928237993085904 -0.931911388231688 -0.935491593015239 -0.938978249419062 -0.942371008780422 -0.945669531826211 -0.948873488706873 -0.951982559029389 -0.954996431889318 -0.957914805901886 -0.960737389232123 -0.963463899624049 -0.966094064428897 -0.968627620632377 -0.971064314880981 -0.973403903507315 -0.975646152554465 -0.977790837799395 -0.979837744775368 -0.981786668793392 -0.98363741496269 -0.985389798210187 -0.987043643299018 -0.988598784846052 -0.990055067338432 -0.991412345149121 -0.992670482551469 -0.993829353732784 -0.994888842806915 -0.995848843825836 -0.996709260790246 -0.997470007659165 -0.998131008358541 -0.998692196788853 -0.999153516831728 -0.999514922355544 -0.999776377220051 -0.99993785527998 -0.99999934038766 -0.999960826394631 -0.999822317152261 -0.999583826511358 -0.999245378320787 -0.998807006425086 -0.998268754661079 -0.997630676853494 -0.996892836809579 -0.996055308312725 -0.995118175115082 -0.994081530929191 -0.992945479418605 -0.991710134187529 -0.990375618769456 -0.988942066614817 -0.987409621077632 -0.985778435401178 -0.984048672702663 -0.982220505956915 -0.980294117979086 -0.978269701406368 -0.976147458678732 -0.973927602018681 -0.971610353410032 -0.969195944575714 -0.9666846169546 -0.964076621677357 -0.961372219541342 -0.958571680984513 -0.955675286058393 -0.95268332440006 -0.949596095203187 -0.946413907188122 -0.943137078571013 -0.939765937031992 -0.936300819682404 -0.932742073031095 -0.929090052949766 -0.925345124637381 -0.92150766258365 -0.917578050531582 -0.913556681439106 -0.909443957439781 -0.905240289802579 -0.900946098890761 -0.896561814119841 -0.89208787391464 -0.887524725665452 -0.8828728256833 -0.878132639154303 -0.873304640093166 -0.868389311295771 -0.863387144290902 -0.85829863929109 -0.853124305142596 -0.847864659274522 -0.842520227647073 -0.837091544698956 -0.831579153293943 -0.825983604666581 -0.82030545836707 -0.814545282205308 -0.808703652194111 -0.802781152491612 -0.796778375342845 -0.790695921020524 -0.784534397765013 -0.778294421723501 -0.771976616888393 -0.765581615034908 -0.759110055657902 -0.75256258590792 -0.74593986052648 -0.739242541780602 -0.73247129939658 -0.725626810493009 -0.718709759513075 -0.711720838156113 -0.704660745308433 -0.697530186973439 -0.69032987620102 -0.683060533016254 -0.675722884347401 -0.668317663953215 -0.660845612349562 -0.653307476735378 -0.645704010917941 -0.638035975237497 -0.630304136491224 -0.622509267856553 -0.614652148813853 -0.60673356506848 -0.59875430847221 -0.590715176944053 -0.582616974390462 -0.574460510624945 -0.566246601287081 -0.557976067760958 -0.549649737093038 -0.541268441909449 -0.532833020332724 -0.524344315897992 -0.515803177468622 -0.50721045915134 -0.498567020210817 -0.489873724983744 -0.481131442792399 -0.472341047857716 -0.463503419211864 -0.454619440610343 -0.445690000443608 -0.436715991648236 -0.427698311617628 -0.418637862112273 -0.40953554916957 -0.400392283013228 -0.391208977962244 -0.381986552339471 -0.372725928379784 -0.363428032137864 -0.354093793395585 -0.344724145569044 -0.335320025615215 -0.325882373938257 -0.316412134295473 -0.306910253702935 -0.297377682340785 -0.287815373458214 -0.278224283278143 -0.268605370901597 -0.258959598211798 -0.249287929777977 -0.239591332758917 -0.22987077680624 -0.22012723396744 -0.210361678588683 -0.200575087217367 -0.190768438504476 -0.180942713106707 -0.171098893588412 -0.16123796432334 -0.151360911396201 -0.141468722504056 -0.13156238685755 -0.121642895081994 -0.111711239118298 -0.101768412123783 -0.0918154083728617 -0.0818532231576161 -0.0718828526882655 -0.0619052939935483 -0.0519215448210192 -0.0419326035372759 -0.0319394690281226 -0.0219431405986826 -0.0119446178734686 -0.00194490069642107 0.00805501096907534 0.0180541171401873 0.0280514179146304 0.038045913570658 0.0480366046670334 0.0580224921429725 0.0680025774180492 0.0779758624920527 0.0879413500447867 0.0978980435358004 0.107844947304042 0.117781066667424 0.127705408022289 0.137616978942773 0.147514788280043 0.157397846261414 0.167265164589323 0.17711575654016 0.18694863706294 0.196762822877803 0.206557332574346 0.216331186709763 0.226083407906784 0.235813020951417 0.245519052890464 0.255200533128822 0.264856493526532 0.274485968495603 0.284087995096562 0.293661613134751 0.303205865256343 0.312719797044081 0.322202457112713 0.331652897204134 0.341070172282212 0.350453340627286 0.35980146393034 0.369113607386835 0.378388839790185 0.387626233624879 0.396824865159232 0.405983814537754 0.415102165873142 0.424179007337859 0.433213431255324 0.442204534190674 0.451151417041107 0.460053185125794 0.468908948275345 0.477717820920824 0.486478922182308 0.495191375956972 0.503854311006698 0.512466861045201 0.521028164824653 0.529537366221812 0.537993614323628 0.546396063512338 0.554743873550025 0.563036209662643 0.571272242623489 0.579451148836132 0.587572110416766 0.595634315275999 0.603636957200065 0.611579235931441 0.61946035724887 0.627279533046791 0.635035981414137 0.642728926712537 0.650357599653872 0.657921237377204 0.665419083525064 0.672850388319085 0.680214408634982 0.687510408076858 0.69473765705085 0.701895432838083 0.708983019666943 0.715999708784654 0.722944798528151 0.729817594394247 0.736617409109082 0.743343562696853 0.749995382547804 0.756572203485495 0.763073367833312 0.769498225480239 0.775846133945863 0.782116458444629 0.788308571949312 0.794421855253722 0.800455697034623 0.806409493912864 0.812282650513719 0.818074579526423 0.823784701762901 0.829412446215688 0.834957250115028 0.840418558985151 0.845795826699723 0.851088515536452 0.856296096230865 0.861418048029233 0.866453858740644 0.871403024788224 0.876265051259491 0.881039451955851 0.885725749441212 0.890323475089732 0.894832169132676 0.899251380704398 0.903580667887423 0.907819597756641 0.911967746422597 0.916024699073881 0.919990050018609 0.923863402724991 0.927644369860984 0.931332573333025 0.934927644323841 0.938429223329329 0.941836960194505 0.945150514148523 0.948369553838749 0.951493757363896 0.954522812306216 0.957456415762738 0.960294274375562 0.96303610436119 0.96568163153891 0.968230591358208 0.970682728925227 0.973037799028252 0.975295566162236 0.977455804552348 0.979518298176549 0.981482840787194 0.98334923593166 0.985117296971988 0.986786847103547 0.988357719372715 0.989829756693575 0.99120281186362 0.992476747578479 0.993651436445641 0.994726760997199 0.995702613701593 0.996578896974366 0.997355523187922 0.998032414680285 0.998609503762872 0.999086732727254 0.999464053850932 0.99974142940211 0.999918831643462 0.999996242834913 0.999973655235407 0.999851071103687 0.999628502698063 0.99930597227519 0.998883512087841 0.998361164381684 0.997738981391054 0.997017025333731 0.996195368404719 0.995274092769026 0.994253290553449 0.993133063837359 0.991913524642492 0.990594794921754 0.989177006547016 0.987660301295934 0.986044830837771 0.984330756718225 0.98251825034328 0.980607492962063 0.97859867564872 0.976491999283309 0.97428767453171 0.971985921824561 0.969586971335215 0.967091062956722 0.96449844627784 0.961809380558076 0.959024134701762 0.956142987231161 0.95316622625862 0.950094149457756 0.946927064033689 0.943665286692322 0.94030914360867 0.936858970394246 0.933315112063496 0.929677922999299 0.925947766917532 0.922125016830693 0.918210055010606 0.91420327295019 0.910105071324313 0.905915859949722 0.901636057744063 0.89726609268399 0.892806401762369 0.888257430944574 0.883619635123896 0.878893478076054 0.874079432412812 0.869177979534727 0.864189609583 0.859114821390471 0.853954122431729 0.84870802877237 0.843377065017388 0.837961764258716 0.832462668021918 0.826880326212034 0.821215297058593 0.81546814705979 0.809639450925836 0.803729791521487 0.797739759807757 0.791669954782828 0.785520983422144 0.779293460617716 0.772988009116635 0.766605259458797 0.760145849913848 0.753610426417361 0.746999642506239 0.740314159253364 0.733554645201489 0.726721776296389 0.719816235819258 0.71283871431839 0.70578990954012 0.698670526359052 0.691481276707572 0.684222879504654 0.676896060583969 0.669501552621304 0.662040095061293 0.654512434043474 0.646919322327676 0.639261519218743 0.631539790490603 0.623754908309697 0.615907651157753 0.607998803753948 0.600029156976432 0.59199950778324 0.583910659132602 0.575763419902641 0.567558604810491 0.559297034330824 0.550979534613803 0.542606937402468 0.534180079949565 0.525699804933814 0.517166960375653 0.508582399552424 0.499946980913058 0.491261567992221 0.482527029323969 0.473744238354889 0.464914073356758 0.456037417338719 0.447115157958976 0.438148187436032 0.429137402459467 0.420083704100269 0.410987997720729 0.401851192883906 0.39267420326267 0.383457946548335 0.374203344358892 0.364911322146849 0.355582809106682 0.346218738081923 0.33682004547187 0.327387671137953 0.317922558309743 0.308425653490638 0.298897906363204 0.289340269694214 0.279753699239371 0.270139153647731 0.260497594365842 0.250829985541597 0.241137293927822 0.231420488785601 0.221680541787351 0.211918426919656 0.202135120385867 0.192331600508484 0.182508847631327 0.172667844021497 0.162809573771154 0.152935022699108 0.143045178252237 0.133141029406745 0.123223566569264 0.113293781477811 0.103352667102621 0.0934012175468481 0.0834404279471546 0.0734712943741999 0.0634948137330336 0.0535119836634061 0.0435238024400055 0.0335312688726306 0.0235353822063111 0.0135371420213837 0.00353754813353505 -0.00646239950617898 -0.0164617009113277 -0.0264593561601034 -0.0364543654953124 -0.0464457294243504 -0.0564324488191506 -0.0664135250160958 -0.0763879599158838 -0.0863547560833367 -0.0963129168471432 -0.106261446399526 -0.116199349895819 -0.126125633553955 -0.13603930475384 -0.145939372136616 -0.155824845703793 -0.165694736916254 -0.175548058793101 -0.185383826010359 -0.195201054999502 -0.204998764045812 -0.214775973386549 -0.224531705308927 -0.234264984247883 -0.243974836883634 -0.253660292239009 -0.263320381776542 -0.272954139495331 -0.282560602027631 -0.292138808735195 -0.301687801805334 -0.311206626346698 -0.320694330484765 -0.330149965457028 -0.339572585707869 -0.348961248983116 -0.358315016424264 -0.367632952662365 -0.376914125911559 -0.386157608062257 -0.395362474773945 -0.404527805567623 -0.41365268391785 -0.422736197344394 -0.431777437503483 -0.440775500278635 -0.449729485871071 -0.458638498889693 -0.467501648440623 -0.476318048216293 -0.485086816584071 -0.493807076674429 -0.502477956468624 -0.511098588885902 -0.519668111870206 -0.528185668476378 -0.536650406955855 -0.545061480841844 -0.553418049033966 -0.561719275882364 -0.569964331271271 -0.578152390702021 -0.586282635375492 -0.594354252273992 -0.602366434242559 -0.610318380069672 -0.618209294567375 -0.626038388650794 -0.633804879417044 -0.641507990223522 -0.649146950765566 -0.656720997153487 -0.664229371988958 -0.671671324440754 -0.679046110319829 -0.686352992153742 -0.693591239260399 -0.70076012782112 -0.707858940953024 -0.714886968780713 -0.721843508507262 -0.728727864484494 -0.735539348282548 -0.742277278758722 -0.748940982125582 -0.755529792018345 -0.762043049561512 -0.768480103434757 -0.774840309938056 -0.781123033056059 -0.787327644521691 -0.793453523878974 -0.799500058545079 -0.805466643871577 -0.811352683204908 -0.817157587946043 -0.822880777609346 -0.828521679880619 -0.834079730674337 -0.839554374190052 -0.844945062967974 -0.850251257943718 -0.855472428502207 -0.860608052530738 -0.865657616471187 -0.870620615371367 -0.875496552935525 -0.880284941573968 -0.884985302451821 -0.889597165536914 -0.894120069646782 -0.898553562494784 -0.902897200735327 -0.907150550008209 -0.911313184982047 -0.915384689396811 -0.919364656105454 -0.92325268711462 -0.92704839362445 -0.930751396067455 -0.934361324146477 -0.937877816871716 -0.941300522596831 -0.9446290990541 -0.947863213388651 -0.951002542191748 -0.954046771533124 -0.956995596992384 -0.959848723689438 -0.962605866313994 -0.965266749154088 -0.967831106123652 -0.970298680789128 -0.972669226395103 -0.974942505888995 -0.977118291944747 -0.979196366985567 -0.981176523205682 -0.983058562591121 -0.984842296939514 -0.986527547878913 -0.988114146885626 -0.989601935301077 -0.990990764347663 -0.992280495143638 -0.993470998716995 -0.994562156018371 -0.995553857932944 -0.996446005291349 -0.997238508879593 -0.997931289447979 -0.998524277719027 -0.999017414394404 -0.999410650160853 -0.999703945695125 -0.999897271667911 -0.999990608746776 -0.999983947598089 -0.999877288887959 -0.999670643282168 -0.999364031445105 -0.998957484037699 -0.99845104171435 -0.99784475511887 -0.997138684879412 -0.996332901602412 -0.995427485865527 -0.994422528209576 -0.993318129129486 -0.992114399064245 -0.990811458385857 -0.989409437387304 -0.987908476269518 -0.986308725127358 -0.984610343934607 -0.982813502527969 -0.980918380590086 -0.978925167631574 -0.976834062972066 -0.974645275720287 -0.972359024753138 -0.96997553869381 -0.967495055888922 -0.964917824384689 -0.962244101902113 -0.959474155811214 -0.956608263104293 -0.953646710368232 -0.950589793755838 -0.947437818956223 -0.944191101164242 -0.940849965048968 -0.937414744721227 -0.933885783700191 -0.93026343487902 -0.926548060489579 -0.922740032066209 -0.91883973040858 -0.914847545543607 -0.910763876686451 -0.906589132200593 -0.902323729557003 -0.897968095292392 -0.893522664966555 -0.888987883118822 -0.884364203223597 -0.879652087645018 -0.874852007590715 -0.869964443064694 -0.864989882819335 -0.859928824306516 -0.854781773627871 -0.849549245484179 -0.844231763123894 -0.838829858290821 -0.833344071170942 -0.827774950338396 -0.822123052700627 -0.816388943442687 -0.810573195970726 -0.804676391854642 -0.798699120769935 -0.792641980438731 -0.786505576570016 -0.780290522799063 -0.773997440626069 -0.767626959354009 -0.761179716025701 -0.754656355360104 -0.74805752968785 -0.741383898886006 -0.734636130312091 -0.727814898737339 -0.720920886279225 -0.713954782333247 -0.706917283503997 -0.699809093535492 -0.692630923240806 -0.685383490430986 -0.678067519843274 -0.670683743068632 -0.663232898478584 -0.655715731151381 -0.648132992797491 -0.64048544168443 -0.632773842560936 -0.624998966580496 -0.617161591224229 -0.609262500223139 -0.601302483479744 -0.593282336989084 -0.585202862759126 -0.57706486873056 -0.568869168696006 -0.560616582218638 -0.552307934550228 -0.543944056548617 -0.535525784594637 -0.527053960508467 -0.518529431465457 -0.509953049911407 -0.501325673477325 -0.492648164893665 -0.483921391904054 -0.47514622717852 -0.466323548226221 -0.457454237307702 -0.448539181346662 -0.43957927184127 -0.430575404775007 -0.421528480527079 -0.412439403782371 -0.403309083440983 -0.394138432527341 -0.384928368098893 -0.375679811154408 -0.366393686541873 -0.357070922866011 -0.347712452395421 -0.33831921096935 -0.328892137904114 -0.319432175899164 -0.309940270942816 -0.300417372217657 -0.290864432005623 -0.281282405592774 -0.271672251173768 -0.262034929756036 -0.252371405063691 -0.242682643441149 -0.232969613756497 -0.22323328730461 -0.21347463771002 -0.203694640829553 -0.193894274654749 -0.184074519214057 -0.174236356474839 -0.16438077024517 -0.15450874607546 -0.144621271159899 -0.134719334237739 -0.124803925494422 -0.114876036462557 -0.104936659922777 -0.0949867898044507 -0.0850274210862996 -0.0750595496968958 -0.0650841724150717 -0.0551022867702427 -0.0451148909426552 -0.035122983663569 -0.0251275641153854 -0.01512963183173 -0.00513018659749929 0.004869771651116 0.0148692429266243 0.0248672272902309 0.0348627249518312 0.0448547363699884 0.0548422623518874 0.064824304153253 0.0747998635782233 0.0847679430791689 0.0947275458564462 0.104677675958077 0.114617338379344 0.124545539162286 0.1344612854951 0.144363585811415 0.154251449889451 0.164123888951041 0.173979915760506 0.183818544723377 0.193638791984957 0.203439675528704 0.213220215274431 0.222979433176313 0.232716353320693 0.24243000202367 0.25211940792847 0.261783602102575 0.271421618134623 0.281032492231041 0.290615263312428 0.300168973109664 0.309692666259728 0.319185390401242 0.328646196269703 0.338074137792409 0.347468272183062 0.356827660036053 0.366151365420396 0.375438455973322 0.384688002993515 0.393899081533981 0.403070770494541 0.412202152713944 0.421292315061575 0.430340348528776 0.43934534831974 0.448306413941992 0.457222649296437 0.46609316276697 0.474917067309637 0.483693480541334 0.492421524828055 0.501100327372642 0.509729020302075 0.51830674075425 0.52683263096427 0.53530583835022 0.543725515598421 0.552090820748165 0.560400917275909 0.568654974178925 0.5768521660584 0.584991673201978 0.593072681665726 0.601094383355534 0.609055976107917 0.616956663770234 0.624795656280303 0.632572169745405 0.640285426520674 0.64793465528686 0.655519091127462 0.663037975605214 0.670490556837936 0.677876089573715 0.685193835265431 0.692443062144613 0.699623045294615 0.706733066723105 0.713772415433864 0.720740387497889 0.727636286123778 0.734459421727417 0.741209112000931 0.747884681980916 0.754485464115939 0.761010798333286 0.767460032104973 0.773832520512997 0.780127626313828 0.786344720002133 0.792483179873722 0.798542392087724 0.804521750727967 0.810420657863569 0.816238523608734 0.821974766181734 0.827628811963093 0.833200095552944 0.83868805982757 0.844092155995119 0.849411843650475 0.854646590829307 0.85979587406126 0.8648591784223 0.869835997586212 0.874725833875226 0.879528198309788 0.884242610657457 0.888868599480926 0.893405702185169 0.897853465063696 0.902211443343924 0.906479201231659 0.910656311954667 0.914742357805358 0.918736930182551 0.922639629632337 0.926450065888024 0.93016785790916 0.933792633919644 0.937324031444893 0.940761697348098 0.944105287865534 0.947354468640936 0.950508914758932 0.953568310777541 0.95653235075971 0.95940073830391 0.962173186573778 0.964849418326796 0.967429165942021 0.969912171446839 0.972298186542771 0.974586972630293 0.976778300832706 0.978871952019015 0.980867716825846 0.982765395678381 0.984564798810316 0.986265746282839 0.987868068002619 0.989371603738818 0.990776203139118 0.992081725744748 0.993288041004535 0.994395028287959 0.995402576897214 0.996310586078279 0.997118965030992 0.997827632918131 0.998436518873499 0.998945562009007 0.999354711420766 0.999663926194176 0.999873175408016 0.999982438137541 0.999991703456568 0.999900970438573 0.999710248156782 0.999419555683264 0.999028922087025 0.998538386431099 0.997947997768642 0.997257815138028 0.996467907556946 0.995578354015496 0.99458924346829 0.993500674825559 0.992312756943259 0.99102560861219 0.989639358546111 0.988154145368874 0.98657011760056 0.984887433642625 0.983106261762062 0.981226780074575 0.979249176526767 0.977173648877344 0.975000404677343 0.972729661249371 0.97036164566588 0.967896594726454 0.965334754934133 0.962676382470762 0.959921743171371 0.957071112497595 0.954124775510126 0.951083026840208 0.947946170660171 0.944714520653022 0.941388399981066 0.9379681412536 0.934454086493646 0.930846587103752 0.92714600383085 0.923352706730185 0.919467075128304 0.915489497585131 0.911420371855104 0.907260104847406 0.903009112585271 0.898667820164383 0.894236661710365 0.889716080335371 0.885106528093771 0.880408465936948 0.875622363667203 0.870748699890774 0.865787961969977 0.860740645974471 0.855607256631648 0.850388307276166 0.845084319798611 0.839695824593311 0.834223360505296 0.828667474776415 0.823028722990612 0.817307669018364 0.811504884960301 0.805620951089995 0.799656455795928 0.79361199552266 0.787488174711181 0.781285605738468 0.775004908856251 0.768646712128984 0.76221165137104 0.755700370083134 0.749113519387967 0.742451757965121 0.735715751985186 0.728906175043148 0.722023708091024 0.715069039369776 0.70804286434048 0.700945885614784 0.693778812884646 0.686542362851366 0.679237259153919 0.671864232296585 0.664424019575906 0.656917365006954 0.649345019248932 0.641707739530103 0.634006289572076 0.626241439513429 0.618413965832696 0.610524651270724 0.602574284752393 0.594563661307731 0.586493581992406 0.578364853807624 0.570178289619432 0.561934708077424 0.553634933532886 0.545279795956355 0.536870130854627 0.528406779187204 0.5198905872822 0.511322406751709 0.502703094406643 0.494033512171054 0.485314526995941 0.476547010772556 0.467731840245215 0.458869896923624 0.449962066994732 0.441009241234107 0.432012314916866 0.422972187728141 0.41388976367312 0.404765950986639 0.395601662042362 0.386397813261548 0.377155325021406 0.367875121563056 0.358558130899111 0.349205284720874 0.339817518305168 0.330395770420813 0.320940983234744 0.311454102217801 0.301936076050181 0.292387856526569 0.282810398460959 0.273204659591178 0.263571600483108 0.253912184434631 0.244227377379304 0.234518147789762 0.224785466580871 0.215030307012643 0.205253644592905 0.195456456979752 0.185639723883781 0.17580442697012 0.165951549760266 0.156082077533728 0.146196997229505 0.136297297347389 0.12638396784912 0.116458000059385 0.106520386566692 0.0965721211241089 0.0866141985498901 0.0766476146279946 0.0666733660085091 0.0566924501079837 0.046705865009691 0.0367146093638188 0.0267196822876056 0.01672208326543 0.00672281204886293 -0.00327713144330675 -0.013276747225063 -0.0232750353431607 -0.0332709959771199 -0.0432636295392071 -0.0532519367743933 -0.0632349188602785 -0.0732115775069733 -0.0831809150569268 -0.0931419345846919 -0.103093639996616 -0.113035036130453 -0.122965128854871 -0.132882925168875 -0.142787433301097 -0.152677662808978 -0.162552624677809 -0.172411331419633 -0.18225279717199 -0.192076037796507 -0.201880070977307 -0.211663916319242 -0.221426595445931 -0.231167132097598 -0.240884552228693 -0.250577884105301 -0.260246158402314 -0.269888408300357 -0.279503669582477 -0.289090980730557 -0.298649383021472 -0.308177920622959 -0.317675640689198 -0.327141593456097 -0.336574832336267 -0.345974414013682 -0.355339398538006 -0.364668849418592 -0.373961833718125 -0.383217422145921 -0.392434689150849 -0.40161271301389 -0.410750575940305 -0.419847364151417 -0.428902167975986 -0.437914081941175 -0.446882204863096 -0.455805639936932 -0.464683494826611 -0.473514881754043 -0.482298917587893 -0.491034723931899 -0.499721427212706 -0.508358158767225 -0.516944054929498 -0.525478257117063 -0.533959911916814 -0.542388171170338 -0.550762192058733 -0.55908113718689 -0.567344174667227 -0.575550478202883 -0.583699227170343 -0.591789606701499 -0.599820807765142 -0.607792027247858 -0.61570246803434 -0.623551339087103 -0.631337855525582 -0.639061238704621 -0.646720716292339 -0.654315522347359 -0.661844897395407 -0.66930808850525 -0.676704349363997 -0.684032940351727 -0.691293128615447 -0.698484188142381 -0.70560539983257 -0.712656051570777 -0.719635438297706 -0.726542862080499 -0.733377632182534 -0.740139065132497 -0.746826484792728 -0.753439222426832 -0.759976616766558 -0.766438014077919 -0.772822768226568 -0.779130240742412 -0.785359800883454 -0.791510825698873 -0.797582700091312 -0.803574816878391 -0.809486576853426 -0.815317388845346 -0.821066669777811 -0.826733844727517 -0.832318346981693 -0.837819618094768 -0.843237107944213 -0.84857027478556 -0.853818585306568 -0.858981514680558 -0.864058546618895 -0.869049173422617 -0.873952896033203 -0.878769224082476 -0.883497675941647 -0.888137778769469 -0.892689068559526 -0.897151090186633 -0.901523397452344 -0.905805553129577 -0.909997129006333 -0.914097705928517 -0.918106873841853 -0.922024231832892 -0.925849388169098 -0.929581960338026 -0.933221575085569 -0.936767868453286 -0.940220485814795 -0.943579081911237 -0.946843320885801 -0.95001287631731 -0.953087431252862 -0.956066678239526 -0.958950319355085 -0.961738066237832 -0.9644296401154 -0.967024771832646 -0.96952320187856 -0.971924680412219 -0.974228967287772 -0.97643583207845 -0.978545054099615 -0.980556422430821 -0.982469735936912 -0.984284803288131 -0.986001442979256 -0.987619483347748 -0.989138762590919 -0.990559128782111 -0.991880439885887 -0.993102563772239 -0.994225378229797 -0.99524877097805 -0.996172639678577 -0.996996891945277 -0.99772144535361 -0.99834622744884 -0.998871175753278 -0.99929623777253 -0.999621371000749 -0.999846542924883 -0.999971731027927 -0.999996922791175 -0.999922115695472 -0.999747317221466 -0.999472544848857 -0.999097826054655 -0.998623198310425 -0.998048709078548 -0.997374415807468 -0.99660038592595 -0.995726696836336 -0.994753435906809 -0.993680700462649 -0.992508597776507 -0.991237245057676 -0.989866769440367 -0.988397307971001 -0.986829007594499 -0.985162025139592 -0.983396527303137 -0.981532690633446 -0.979570701512633 -0.977510756137975 -0.975353060502293 -0.973097830373353 -0.970745291272287 -0.968295678451045 -0.965749236868869 -0.963106221167794 -0.960366895647189 -0.957531534237322 -0.954600420471971 -0.951573847460071 -0.948452117856401 -0.945235543831319 -0.941924447039548 -0.938519158588007 -0.935020019002704 -0.931427378194681 -0.927741595425027 -0.923963039268945 -0.920092087578902 -0.916129127446843 -0.912074555165478 -0.907928776188656 -0.903692205090819 -0.899365265525548 -0.894948390183193 -0.890442020747607 -0.88584660785198 -0.88116261103377 -0.876390498688757 -0.871530748024197 -0.866583845011109 -0.86155028433567 -0.856430569349754 -0.851225212020593 -0.845934732879581 -0.840559660970225 -0.835100533795237 -0.829557897262783 -0.823932305631899 -0.81822432145706 -0.812434515531926 -0.806563466832266 -0.800611762458057 -0.794579997574776 -0.788468775353886 -0.782278706912515 -0.77601041125235 -0.769664515197732 -0.76324165333298 -0.756742467938928 -0.750167608928698 -0.743517733782713 -0.736793507482945 -0.729995602446422 -0.723124698457982 -0.716181482602298 -0.70916664919517 -0.702080899714092 -0.694924942728109 -0.687699493826955 -0.680405275549499 -0.673043017311491 -0.665613455332619 -0.65811733256289 -0.650555398608334 -0.642928409656045 -0.635237128398562 -0.627482323957602 -0.619664771807146 -0.611785253695895 -0.603844557569094 -0.595843477489739 -0.587782813559168 -0.57966337183706 -0.571485964260818 -0.563251408564388 -0.554960528196476 -0.546614152238209 -0.538213115320229 -0.529758257539227 -0.521250424373934 -0.512690466600578 -0.504079240207802 -0.495417606311071 -0.486706431066555 -0.477946585584519 -0.469138945842213 -0.46028439259627 -0.451383811294637 -0.442438091988026 -0.433448129240914 -0.424414822042083 -0.415339073714725 -0.406221791826111 -0.397063888096832 -0.387866278309628 -0.378629882217814 -0.369355623453302 -0.360044429434241 -0.350697231272271 -0.341314963679422 -0.331898564874632 -0.322448976489937 -0.312967143476299 -0.303454014009118 -0.293910539393414 -0.284337673968696 -0.274736375013527 -0.265107602649804 -0.255452319746738 -0.245771491824573 -0.236066086958035 -0.226337075679522 -0.216585430882055 -0.206812127721987 -0.19701814352149 -0.187204457670822 -0.177372051530389 -0.167521908332614 -0.157655013083606 -0.147772352464669 -0.137874914733628 -0.127963689626009 -0.118039668256064 -0.10810384301766 -0.0981572074850393 -0.088200756313468 -0.0782354851397657 -0.0682623904827454 -0.058282469643562 -0.0482967206059829 -0.0383061419365903 -0.0283117326849256 -0.0183144922835856 -0.00831542044827918 0.00168448292214256 0.0116842178456758 0.0216827843571613 0.03167918260828 0.0416724129675371 0.0516614761202244 0.0616453731683507 0.0716231057305312 0.0815936760418243 0.0915560870535078 0.101509342532782 0.111452447162395 0.121384406640167 0.131304227778429 0.141210918603333 0.151103488454052 0.160980948081845 0.17084230974898 0.180686587327508 0.190512796397875 0.200319954347362 0.210107080468348 0.219873196056375 0.229617324508024 0.239338491418569 0.24903572467942 0.258708054575333 0.268354513881377 0.277974137959661 0.287565964855793 0.297129035395078 0.306662393278429 0.316165085178004 0.325636160832531 0.335074673142338 0.344479678264058 0.353850235705017 0.36318540841728 0.372484262891355 0.381745869249543 0.390969301338927 0.400153636823984 0.409297957278818 0.418401348279005 0.427462899493031 0.436481704773325 0.445456862246876 0.454387474405415 0.463272648195168 0.472111495106161 0.480903131261068 0.489646677503601 0.49834125948642 0.506986007758574 0.51558005785244 0.524122550370168 0.532612631069627 0.541049450949821 0.549432166335794 0.557759938962991 0.566031936061091 0.574247330437276 0.582405300558955 0.590505030635915 0.598545710701897 0.606526536695595 0.614446710541061 0.62230544022751 0.630101939888522 0.637835429880629 0.645505136861275 0.653110293866154 0.660650140385904 0.668123922442155 0.67553089266293 0.682870310357379 0.690141441589849 0.697343559253277 0.704475943141896 0.711537880023263 0.718528663709573 0.725447595128285 0.732293982392021 0.739067140867762 0.745766393245302 0.752391069604989 0.758940507484705 0.765414051946121 0.771811055640185 0.778130878871859 0.784372889664086 0.790536463820989 0.796620984990288 0.802625844724936 0.808550442543965 0.814394185992529 0.820156490701153 0.825836780444169 0.831434487197336 0.836949051194642 0.842379920984284 0.847726553483809 0.852988414034422 0.858164976454453 0.863255723091973 0.868260144876562 0.873177741370211 0.878008020817368 0.882750500194115 0.887404705256465 0.891970170587791 0.896446439645365 0.90083306480601 0.905129607410866 0.909335637809253 0.913450735401637 0.917474488681687 0.921406495277428 0.925246361991478 0.928993704840364 0.932648149092926 0.936209329307783 0.93967688936988 0.943050482526102 0.946329771419945 0.94951442812525 0.952604134179003 0.955598580613172 0.95849746798561 0.961300506409994 0.964007415584818 0.96661792482142 0.969131773071053 0.971548708950986 0.973868490769644 0.976090886550781 0.978215674056668 0.980242640810327 0.982171584116772 0.984002311083278 0.985734638638675 0.987368393551651 0.988903412448076 0.99033954182734 0.991676638077701 0.992914567490649 0.994053206274274 0.995092440565646 0.996032166442203 0.99687228993214 0.997612727023808 0.998253403674115 0.998794255815929 0.999235229364487 0.999576280222803 0.999817374286073 0.999958487445094 0.999999605588666 0.999940724605009 0.999781850382173 0.999522998807447 0.999164195765774 0.998705477137159 0.998146888793081 0.997488486591911 0.996730336373319 0.995872513951695 0.994915105108568 0.993858205584023 0.992701921067131 0.991446367185382 0.990091669493118 0.988637963458977 0.987085394452353 0.985434117728852 0.98368429841477 0.981836111490582 0.979889741773438 0.977845383898689 0.975703242300419 0.973463531191002 0.971126474539682 0.968692306050179 0.966161269137311 0.963533616902661 0.960809612109263 0.957989527155326 0.955073644046996 0.952062254370153 0.948955659261255 0.945754169377225 0.942458104864384 0.939067795326435 0.935583579791507 0.932005806678251 0.928334833760996 0.924571028133974 0.920714766174613 0.916766433505893 0.912726424957793 0.9085951445278 0.904373005340514 0.900060429606336 0.895657848579245 0.891165702513675 0.886584440620489 0.881914521022059 0.877156410706454 0.872310585480739 0.867377529923399 0.862357737335879 0.857251709693255 0.852059957594035 0.846783000209104 0.841421365229801 0.835975588815158 0.830446215538278 0.82483379833188 0.819138898433008 0.813362085326906 0.807503936690071 0.801565038332484 0.795545984139034 0.789447376010122 0.783269823801479 0.777013945263179 0.770680365977863 0.76426971929818 0.757782646283457 0.751219795635588 0.744581823634171 0.737869394070873 0.731083178183057 0.724223854586657 0.717292109208316 0.710288635216796 0.703214132953659 0.696069309863237 0.688854880421884 0.681571566066533 0.67422009512255 0.666801202730902 0.659315630774648 0.651764127804743 0.644147448965194 0.636466355917535 0.628721616764672 0.620914005974065 0.613044304300288 0.605113298706949 0.597121782287999 0.589070554188419 0.580960419524312 0.572792189302384 0.564566680338851 0.556284715177755 0.54794712200871 0.539554734584086 0.53110839213563 0.52260893929055 0.514057225987047 0.505454107389325 0.496800443802074 0.488097100584442 0.479344948063498 0.4705448614472 0.461697720736877 0.452804410639227 0.443865820477849 0.43488284410431 0.425856379808762 0.416787330230112 0.407676602265761 0.398525106980912 0.389333759517469 0.380103479002518 0.370835188456418 0.361529814700501 0.352188288264387 0.342811543292937 0.333400517452833 0.323956151838816 0.314479390879578 0.304971182243317 0.295432476742973 0.285864228241149 0.276267393554719 0.266642932359157 0.25699180709256 0.247314982859412 0.237613427334075 0.227888110664014 0.218140005372793 0.208370086262817 0.198579330317856 0.188768716605346 0.178939226178482 0.169091841978116 0.159227548734461 0.149347332868622 0.139452182393952 0.129543086817252 0.119621037039823 0.109687025258373 0.0997420448658034 0.0897870903518652 0.0798231572037141 0.0698512418063618 0.059872341343038 0.0498874536954733 0.0398975773441119 0.0299037112682638 0.0199068548462087 0.00990800775525791 -9.18301282117572e-05 -0.0100916588287451 -0.0200904783718053 -0.0300872888837703 -0.0400810906919196 -0.0500708844244005 -0.0600556711101646 -0.0700344522788638 -0.0800062300606971 -0.0899700072861959 -0.0999247875859408 -0.109869575490198 -0.119803376528463 -0.129725197328911 -0.139634045717731 -0.14952893081834 -0.159408863150474 -0.169272854729133 -0.17911991916338 -0.188949071754977 -0.198759329596855 -0.208549711671405 -0.21831923894858 -0.228066934483791 -0.23779182351561 -0.247492933563236 -0.257169294523749 -0.266819938769117 -0.276443901242957 -0.286040219557042 -0.295607934087537 -0.305146088070963 -0.314653727699869 -0.324129902218216 -0.333573664016448 -0.342984068726256 -0.35236017531501 -0.361701046179865 -0.371005747241519 -0.380273348037619 -0.389502921815809 -0.398693545626402 -0.407844300414676 -0.416954271112777 -0.426022546731228 -0.435048220450024 -0.444030389709313 -0.452968156299656 -0.461860626451841 -0.470706910926263 -0.479506125101847 -0.488257389064508 -0.496959827695143 -0.50561257075714 -0.514214752983403 -0.522765514162879 -0.531263999226575 -0.539709358333067 -0.548100746953483 -0.556437325955951 -0.564718261689521 -0.572942726067519 -0.58110989665036 -0.589218956727793 -0.597269095400568 -0.605259507661525 -0.613189394476097 -0.621057962862211 -0.628864425969586 -0.636608003158415 -0.644287920077434 -0.65190340874135 -0.659453707607642 -0.666938061652717 -0.674355722447407 -0.681705948231813 -0.688988003989482 -0.696201161520907 -0.703344699516345 -0.710417903627951 -0.717420066541207 -0.724350488045657 -0.731208475104925 -0.737993341926022 -0.744704410027918 -0.751341008309397 -0.75790247311616 -0.764388148307195 -0.770797385320387 -0.777129543237376 -0.783383988847647 -0.789560096711852 -0.795657249224349 -0.80167483667497 -0.807612257309984 -0.813468917392274 -0.819244231260714 -0.824937621388729 -0.830548518442051 -0.83607636133565 -0.841520597289843 -0.846880681885573 -0.852156079118845 -0.857346261454334 -0.862450709878129 -0.867468913949644 -0.872400371852652 -0.877244590445473 -0.882001085310283 -0.886669380801562 -0.891249010093649 -0.895739515227431 -0.900140447156138 -0.904451365790244 -0.908671840041478 -0.912801447865932 -0.916839776306264 -0.920786421532997 -0.924640988884896 -0.928403092908437 -0.932072357396355 -0.935648415425258 -0.939130909392322 -0.942519491051054 -0.945813821546111 -0.949013571447189 -0.952118420781964 -0.955128059068091 -0.958042185344248 -0.960860508200236 -0.963582745806119 -0.966208625940405 -0.968737886017267 -0.971170273112807 -0.973505543990341 -0.975743465124729 -0.97788381272572 -0.97992637276034 -0.981870940974286 -0.983717322912358 -0.9854653339379 -0.987114799251268 -0.988665553907302 -0.990117442831832 -0.991470320837173 -0.992724052636653 -0.993878512858137 -0.994933586056564 -0.995889166725495 -0.996745159307658 -0.997501478204508 -0.998158047784786 -0.998714802392081 -0.999171686351397 -0.999528653974718 -0.999785669565579 -0.999942707422636 -0.999999751842233 -0.999956797119977 -0.999813847551303 -0.999570917431049 -0.999228031052026 -0.998785222702584 -0.998242536663191 -0.997600027201997 -0.996857758569413 -0.996015804991685 -0.995074250663468 -0.994033189739411 -0.992892726324738 -0.99165297446484 -0.99031405813387 -0.988876111222346 -0.987339277523761 -0.985703710720203 -0.983969574366991 -0.982137041876313 -0.980206296499893 -0.978177531310659 -0.976050949183438 -0.973826762774673 -0.97150519450115 -0.969086476517762 -0.966570850694291 -0.963958568591224 -0.961249891434594 -0.95844509008986 -0.955544445034818 -0.952548246331557 -0.94945679359745 -0.946270395975195 -0.942989372101899 -0.939614050077215 -0.936144767430531 -0.932581871087223 -0.928925717333955 -0.925176671783056 -0.921335109335957 -0.917401414145701 -0.913375979578529 -0.909259208174543 -0.905051511607453 -0.90075331064341 -0.896365035098928 -0.891887123797904 -0.887320024527737 -0.882664193994548 -0.877920097777511 -0.873088210282294 -0.86816901469362 -0.863163002926948 -0.858070675579284 -0.852892541879118 -0.847629119635506 -0.842280935186285 -0.836848523345445 -0.831332427349641 -0.825733198803877 -0.820051397626341 -0.814287591992417 -0.808442358277864 -0.802516281001184 -0.796509952765164 -0.790423974197624 -0.784258953891349 -0.778015508343232 -0.771694261892624 -0.765295846658903 -0.758820902478262 -0.752270076839721 -0.745644024820385 -0.738943409019936 -0.732168899494369 -0.725321173688991 -0.718400916370676 -0.71140881955939 -0.704345582458987 -0.697211911387291 -0.690008519705464 -0.682736127746671 -0.675395462744049 -0.66798725875798 -0.660512256602689 -0.652971203772163 -0.645364854365401 -0.637693969011005 -0.629959314791118 -0.622161665164715 -0.614301799890263 -0.606380504947738 -0.598398572460034 -0.590356800613747 -0.582255993579362 -0.57409696143083 -0.565880520064568 -0.557607491117865 -0.549278701886721 -0.54089498524312 -0.532457179551739 -0.523966128586115 -0.51542268144427 -0.506827692463797 -0.498182021136434 -0.489486532022107 -0.480742094662482 -0.471949583494008 -0.463109877760474 -0.454223861425088 -0.445292423082078 -0.436316455867836 -0.427296857371603 -0.418234529545712 -0.409130378615394 -0.399985314988156 -0.390800253162739 -0.381576111637671 -0.372313812819419 -0.363014282930145 -0.353678451915089 -0.344307253349572 -0.334901624345643 -0.325462505458362 -0.315990840591754 -0.306487576904411 -0.296953664714784 -0.287390057406145 -0.277797711331257 -0.268177585716733 -0.258530642567118 -0.248857846568687 -0.239160164992981 -0.229438567600075 -0.219694026541607 -0.209927516263562 -0.200140013408831 -0.190332496719541 -0.180505946939189 -0.170661346714564 -0.160799680497485 -0.150921934446356 -0.14102909632755 -0.131122155416635 -0.121202102399447 -0.11126992927302 -0.10132662924639 -0.0913731966412743 -0.0814106267926385 -0.0714399159491654 -0.0614620611736304 -0.0514780602431964 -0.0414889115496362 -0.031495613999495 -0.0214991669142002 -0.0115005699301299 -0.00150082289865029 0.00849907421386848 0.0184981214260484 0.0284953188415008 0.038489666748815 0.048480165721529 0.0584658167180708 0.0684456211816621 0.0784185811401732 0.0883836993059188 0.0983399791753867 0.108286425128887 0.118222042530112 0.128145837825603 0.138056818644099 0.147953993895777 0.157836373871361 0.167702970341087 0.177552796653531 0.18738486783427 0.197198200684379 0.206991813878751 0.216764728064227 0.226515965957534 0.236244552443008 0.245949514670107 0.255629882150697 0.265284686856096 0.274912963313878 0.284513748704423 0.294086082957192 0.303629008846736 0.313141572088418 0.322622821433842 0.332071808765974 0.341487589193955 0.350869221147589 0.360215766471498 0.369526290518939 0.378799862245265 0.388035554301032 0.397232443124732 0.406389609035144 0.41550613632331 0.424581113344098 0.433613632607368 0.44260279086872 0.45154768921982 0.460447433178287 0.46930113277714 0.478107902653799 0.486866862138615 0.495577135342937 0.504237851246705 0.512848143785545 0.521407151937379 0.529914019808523 0.538367896719281 0.546767937289004 0.555113301520638 0.563403154884711 0.571636668402798 0.579813018730407 0.587931388239318 0.595990965099347 0.603990943359524 0.611930523028688 0.619808910155491 0.627625316907783 0.635378961651404 0.64306906902834 0.650694870034263 0.658255602095427 0.665750509144925 0.673178841698299 0.680539856928484 0.687832818740091 0.695056997843015 0.702211671825368 0.709296125225713 0.716309649604613 0.723251543615476 0.730121113074684 0.736917671031018 0.743640537834344 0.750289041203585 0.756862516293945 0.763360305763392 0.769781759838395 0.776126236378896 0.782393100942529 0.788581726848059 0.794691495238055 0.800721795140767 0.806672023531231 0.812541585391567 0.818329893770479 0.824036369841953 0.829660442963138 0.835201550731408 0.840659139040604 0.846032662136443 0.851321582671093 0.856525371756908 0.861643509019316 0.866675482648857 0.871620789452359 0.876478934903265 0.881249433191077 0.885931807269942 0.890525588906354 0.895030318725978 0.899445546259585 0.903770829988102 0.90800573738676 0.912149844968348 0.916202738325562 0.920164012172443 0.924033270384907 0.927810126040359 0.931494201456379 0.935085128228495 0.938582547267024 0.941986108832976 0.94529547257303 0.948510307553571 0.951630292293779 0.95465511479778 0.957584472585845 0.960418072724636 0.963155631856499 0.965796876227805 0.968341541716315 0.970789373857603 0.973140127870493 0.975393568681544 0.977549470948552 0.979607619083087 0.981567807272051 0.983429839498258 0.985193529560037 0.986858701089852 0.988425187571938 0.989892832358951 0.991261488687637 0.992531019693502 0.993701298424504 0.994772207853746 0.995743640891177 0.996615500394302 0.997387699177897 0.998060160022729 0.998632815683272 0.999105608894439 0.999478492377301 0.999751428843821 0.999924391000581 0.999997361551508 0.999970333199608 0.999843308647694 0.999616300598116 0.999289331751488 0.998862434804424 0.998335652446262 0.997709037354799 0.996982652191022 0.996156569592842 0.99523087216783 0.994205652484958 0.99308101306534 0.99185706637198 0.990533934798527 0.989111750657037 0.987590656164738 0.985970803429812 0.984252354436183 0.982435481027318 0.980520364889043 0.978507197531378 0.976396180269379 0.974187524203014 0.971881450196049 0.969478188853963 0.966977980500887 0.964381075155574 0.961687732506393 0.958898221885366 0.956012822241229 0.953031822111543 0.949955519593836 0.946784222315797 0.94351824740451 0.940157921454746 0.936703580496299 0.933155569960385 0.929514244645103 0.925779968679949 0.921953115489408 0.918034067755609 0.914023217380061 0.909920965444458 0.905727722170576 0.901443906879248 0.897069947948432 0.892606282770377 0.888053357707882 0.883411628049657 0.878681557964802 0.873863620456382 0.868958297314134 0.863966079066284 0.858887464930497 0.853722962763954 0.848473089012568 0.843138368659339 0.837719335171858 0.832216530448956 0.826630504766521 0.820961816722466 0.815211033180871 0.809378729215299 0.803465488051285 0.797471901008018 0.791398567439208 0.785246094673151 0.779015097951996 0.772706200370223 0.766320032812333 0.759857233889759 0.753318449877009 0.746704334647034 0.740015549605846 0.733252763626375 0.726416652981584 0.71950790127684 0.712527199381556 0.705475245360104 0.69835274440201 0.691160408751435 0.683898957635951 0.676569117194616 0.669171620405367 0.66170720701172 0.654176623448792 0.646580622768664 0.638919964565075 0.631195414897461 0.623407746214352 0.615557737276126 0.607646173077136 0.599673844767208 0.591641549572529 0.583550090715927 0.575400277336543 0.567192924408924 0.558928852661524 0.55060888849463 0.542233863897725 0.533804616366291 0.525321988818056 0.516786829508706 0.50819999194706 0.499562334809717 0.490874721855194 0.482138021837546 0.473353108419495 0.464520860085062 0.45564216005172 0.446717896182073 0.437748960895071 0.42873625107677 0.41968066799064 0.410583117187443 0.40144450841468 0.39226575552561 0.383047776387876 0.373791492791708 0.364497830357753 0.355167718444509 0.345802090055392 0.336401881745438 0.326968033527643 0.317501488778968 0.308003194145999 0.298474099450283 0.288915157593351 0.27932732446142 0.269711558829816 0.260068822267087 0.250400079038855 0.240706296011385 0.230988442554902 0.221247490446653 0.211484413773732 0.20170018883567 0.191895794046807 0.182072209838453 0.17223041856084 0.162371404384897 0.152496153203824 0.14260565253451 0.132700891418781 0.122782860324493 0.112852551046492 0.10291095660743 0.0929590711584653 0.0829978898798508 0.0730284088814129 0.0630516251029437 0.0530685362145071 0.0430801405166726 0.0330874368406865 0.0230914244485891 0.0130931029332896 0.00309347211860763 -0.00690646804070828 -0.0169057175589755 -0.0269032765195749 -0.0368981451749416 -0.0468893240465392 -0.0568758140248064 -0.0668566164690675 -0.0768307333073954 -0.086797167136418 -0.0967549213210576 -0.106703000094194 -0.11664040865624 -0.12656615327462 -0.136479241383144 -0.146378681681262 -0.156263484233194 -0.166132660566922 -0.175985223773037 -0.185820188603428 -0.195636571569808 -0.205433391042061 -0.215209667346404 -0.224964422863353 -0.234696682125486 -0.244405471914986 -0.254089821360965 -0.263748762036549 -0.273381328055719 -0.2829865561699 -0.292563485864286 -0.302111159453888 -0.311628622179302 -0.321114922302189 -0.33056911120044 -0.339990243463044 -0.349377376984626 -0.358729573059657 -0.368045896476322 -0.377325415610043 -0.38656720251664 -0.395770333025124 -0.404933886830113 -0.414056947583862 -0.4231386029879 -0.432177944884253 -0.441174069346265 -0.450126076768986 -0.459033071959133 -0.467894164224612 -0.476708467463578 -0.485475100253054 -0.494193185937065 -0.502861852714309 -0.511480233725332 -0.520047467139215 -0.528562696239755 -0.537025069511139 -0.545433740723091 -0.553787869015497 -0.56208661898249 -0.570329160755989 -0.578514670088685 -0.586642328436466 -0.59471132304027 -0.602720847007362 -0.610670099392018 -0.618558285275626 -0.626384615846169 -0.634148308477113 -0.641848586805665 -0.649484680810408 -0.657055826888305 -0.664561267931059 -0.672000253400819 -0.679372039405236 -0.686675888771855 -0.693911071121825 -0.70107686294294 -0.708172547661989 -0.715197415716414 -0.722150764625264 -0.729031899059441 -0.735840130911236 -0.742574779363139 -0.749235170955916 -0.755820639655957 -0.762330526921882 -0.768764181770388 -0.775120960841351 -0.781400228462162 -0.787601356711292 -0.793723725481083 -0.79976672253976 -0.805729743592653 -0.811612192342626 -0.817413480549706 -0.823133028089907 -0.828770263013241 -0.834324621600913 -0.839795548421693 -0.845182496387459 -0.850484926807902 -0.855702309444399 -0.860834122563035 -0.865879852986774 -0.870838996146779 -0.875711056132865 -0.880495545743095 -0.885191986532495 -0.889799908860899 -0.894318851939914 -0.898748363878999 -0.90308800173065 -0.907337331534699 -0.911495928361707 -0.915563376355456 -0.919539268774536 -0.923423208033019 -0.927214805740215 -0.930913682739514 -0.934519469146298 -0.938031804384931 -0.941450337224816 -0.944774725815518 -0.948004637720948 -0.951139749952607 -0.954179749001885 -0.95712433087141 -0.959973201105448 -0.962726074819352 -0.965382676728042 -0.967942741173542 -0.970406012151542 -0.972772243336995 -0.975041198108755 -0.977212649573236 -0.979286380587101 -0.981262183778977 -0.983139861570191 -0.984919226194528 -0.986600099717009 -0.988182314051682 -0.989665710978433 -0.991050142158804 -0.992335469150832 -0.993521563422889 -0.994608306366535 -0.995595589308382 -0.996483313520958 -0.997271390232582 -0.99795974063624 -0.998548295897465 -0.999036997161221 -0.999425795557788 -0.999714652207652 -0.999903538225388 -0.999992434722552 -0.999981332809568 -0.999870233596618 -0.99965914819353 -0.99934809770867 -0.998937113246826 -0.998426235906103 -0.997815516773808 -0.997105016921346 -0.99629480739811 -0.995384969224376 -0.994375593383206 -0.99326678081134 -0.992058642389113 -0.99075129892936 -0.989344881165338 -0.98783952973765 -0.986235395180185 -0.984532637905062 -0.982731428186591 -0.98083194614424 -0.978834381724633 -0.976738934682545 -0.974545814560936 -0.972255240669989 -0.969867442065186 -0.967382657524396 -0.964801135524004 -0.962123134214057 -0.959348921392456 -0.95647877447817 -0.953512980483499 -0.950451835985371 -0.947295647095686 -0.944044729430702 -0.940699408079475 -0.937260017571355 -0.933726901842524 -0.930100414201613 -0.926380917294362 -0.922568783067364 -0.918664392730864 -0.914668136720642 -0.910580414658969 -0.906401635314644 -0.90213221656212 -0.897772585339714 -0.893323177606916 -0.88878443830079 -0.884156821291486 -0.879440789336848 -0.87463681403614 -0.869745375782891 -0.864766963716849 -0.859702075675072 -0.854551218142143 -0.849314906199524 -0.843993663474045 -0.838588022085545 -0.833098522593656 -0.827525713943755 -0.821870153412063 -0.816132406549918 -0.810313047127227 -0.804412657075081 -0.79843182642757 -0.792371153262773 -0.786231243642958 -0.780012711553969 -0.773716178843832 -0.767342275160573 -0.760891637889248 -0.754364912088207 -0.747762750424594 -0.741085813109071 -0.734334767829807 -0.727510289685704 -0.720613061118889 -0.713643771846471 -0.706603118791569 -0.699491806013622 -0.692310544637982 -0.685060052784801 -0.677741055497224 -0.670354284668879 -0.662900478970694 -0.655380383777027 -0.647794751091131 -0.640144339469953 -0.63242991394828 -0.624652245962235 -0.616812113272136 -0.608910299884718 -0.600947595974735 -0.592924797805943 -0.584842707651473 -0.576702133713604 -0.568503890042948 -0.560248796457039 -0.551937678458358 -0.543571367151776 -0.535150699161454 -0.526676516547174 -0.518149666720134 -0.509571002358213 -0.500941381320696 -0.492261666562498 -0.48353272604786 -0.474755432663559 -0.465930664131621 -0.457059302921544 -0.448142236162056 -0.439180355552402 -0.430174557273176 -0.4211257418967 -0.412034814296971 -0.402902683559174 -0.393730262888772 -0.384518469520188 -0.375268224625084 -0.365980453220239 -0.356656084075056 -0.347296049618677 -0.337901285846748 -0.328472732227819 -0.319011331609393 -0.309518030123648 -0.299993777092822 -0.29043952493428 -0.280856229065277 -0.271244847807413 -0.261606342290806 -0.251941676357974 -0.242251816467456 -0.232537731597168 -0.222800393147501 -0.213040774844186 -0.20325985264092 -0.193458604621772 -0.183638010903377 -0.173799053536923 -0.163942716409947 -0.154069985147949 -0.144181847015827 -0.134279290819154 -0.124363306805299 -0.114434886564399 -0.104495022930205 -0.0945447098807964 -0.0845849424391868 -0.0746167165738206 -0.0646410290989774 -0.0546588775750916 -0.0446712602089973 -0.034679175754108 -0.0246836234105424 -0.0146856027252055 -0.00468611349183397 0.00531384434898165 0.0153132708097906 0.0253111659562795 0.0353065300072654 0.0452983634346726 0.0552856670634848 0.0652674421716619 0.0752426905900112 0.0852104148020035 0.0951696180435241 0.105119304402548 0.115058478918731 0.124986147682904 0.134901317936463 0.144802998170646 0.154690198225681 0.164561929389801 0.174417204498116 0.18425503803133 0.194074446214285 0.203874447114347 0.213654060739592 0.223412309136808 0.233148216489287 0.242860809214406 0.252549116060987 0.262212168206419 0.27184899935354 0.281458645827265 0.291040146670956 0.300592543742512 0.310114881810187 0.319606208648109 0.329065575131505 0.338492035331607 0.347884646610252 0.357242469714139 0.366564568868755 0.375850011871954 0.385097870187173 0.394307219036288 0.403477137492087 0.412606708570366 0.421695019321627 0.430741160922366 0.439744228765963 0.448703322553136 0.457617546381972 0.466486008837516 0.475307823080914 0.484082106938092 0.492807982987977 0.501484578650234 0.51011102627253 0.518686463217289 0.527210031947963 0.535680880114783 0.544098160639991 0.552461031802549 0.560768657322309 0.569020206443642 0.577214854018513 0.585351780588993 0.593430172469206 0.601449221826695 0.609408126763208 0.617306091394882 0.625142325931838 0.63291604675715 0.640626476505215 0.648272844139483 0.655854385029563 0.663370341027683 0.670819960544507 0.678202498624292 0.685517217019381 0.69276338426403 0.699940275747554 0.707047173786785 0.714083367697842 0.721048153867196 0.727940835822035 0.734760724299907 0.741507137317648 0.748179400239577 0.754776845844963 0.761298814394744 0.767744653697498 0.774113719174668 0.780405373925013 0.786618988788302 0.792753942408225 0.798809621294533 0.804785419884385 0.8106807406029 0.81649499392292 0.822227598423958 0.827877980850341 0.833445576168535 0.838929827623648 0.844330186795105 0.849646113651488 0.854877076604542 0.860022552562331 0.865082026981546 0.870054993918963 0.874940956082032 0.879739424878607 0.884449920465808 0.889071971798002 0.893605116673907 0.898048901782813 0.902402882749912 0.906666624180737 0.910839699704696 0.914921692017715 0.918912192923965 0.92281080337668 0.926617133518064 0.930330802718275 0.933951439613486 0.937478682143027 0.940912177585583 0.944251582594472 0.947496563231974 0.950646795002732 0.953701962886192 0.956661761368113 0.959525894471112 0.962294075784266
\ No newline at end of file
diff --git a/chart2/workbench/sampledata/circle.chd b/chart2/workbench/sampledata/circle.chd
index be62d4f9f4c4..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/circle.chd
+++ b/chart2/workbench/sampledata/circle.chd
@@ -1,13 +0,0 @@
-# -*- coding: utf-8; -*-
-# Series Labels
-Cosine Sine
-
-# categories
-# x-values
-0.0 0.1 0.2 0.30000000000000004 0.4 0.5 0.6 0.7 0.7999999999999999 0.8999999999999999 0.9999999999999999 1.0999999999999999 1.2 1.3 1.4000000000000001 1.5000000000000002 1.6000000000000003 1.7000000000000004 1.8000000000000005 1.9000000000000006 2.0000000000000004 2.1000000000000005 2.2000000000000006 2.3000000000000007 2.400000000000001 2.500000000000001 2.600000000000001 2.700000000000001 2.800000000000001 2.9000000000000012 3.0000000000000013 3.1000000000000014 3.2000000000000015 3.3000000000000016 3.4000000000000017 3.5000000000000018 3.600000000000002 3.700000000000002 3.800000000000002 3.900000000000002 4.000000000000002 4.100000000000001 4.200000000000001 4.300000000000001 4.4 4.5 4.6 4.699999999999999 4.799999999999999 4.899999999999999 4.999999999999998 5.099999999999998 5.1999999999999975 5.299999999999997 5.399999999999997 5.4999999999999964 5.599999999999996 5.699999999999996 5.799999999999995 5.899999999999995 5.999999999999995 6.099999999999994 6.199999999999994 6.299999999999994 6.399999999999993 6.499999999999993
-
-# cosine
-1.0 0.9950041652780258 0.9800665778412416 0.955336489125606 0.9210609940028851 0.8775825618903728 0.8253356149096783 0.7648421872844885 0.6967067093471655 0.6216099682706645 0.5403023058681398 0.4535961214255775 0.3623577544766736 0.26749882862458735 0.16996714290024081 0.07073720166770268 -0.029199522301289037 -0.12884449429552508 -0.22720209469308753 -0.32328956686350396 -0.4161468365471428 -0.5048461045998579 -0.5885011172553463 -0.6662760212798248 -0.737393715541246 -0.8011436155469343 -0.8568887533689478 -0.9040721420170617 -0.9422223406686585 -0.9709581651495908 -0.9899924966004456 -0.9991351502732795 -0.998294775794753 -0.9874797699088647 -0.9667981925794605 -0.9364566872907957 -0.8967584163341462 -0.8481000317104072 -0.7909677119144155 -0.7259323042001387 -0.6536436208636106 -0.5748239465332677 -0.49026082134069865 -0.4007991720799746 -0.30733286997841935 -0.2107957994307797 -0.11215252693505487 -0.012388663462891447 0.08749898343944551 0.18651236942257401 0.2836621854632246 0.37797774271297857 0.4685166713003748 0.5543743361791585 0.6346928759426319 0.7086697742912575 0.7755658785102473 0.8347127848391573 0.8855195169413168 0.9274784307440339 0.9601702866503645 0.9832684384425836 0.9965420970232169 0.9998586363834152 0.9931849187581935 0.976587625728025
-
-# sine
-0.0 0.09983341664682815 0.19866933079506122 0.2955202066613396 0.3894183423086505 0.479425538604203 0.5646424733950354 0.644217687237691 0.7173560908995227 0.7833269096274833 0.8414709848078964 0.8912073600614353 0.9320390859672263 0.963558185417193 0.9854497299884603 0.9974949866040544 0.9995736030415051 0.9916648104524686 0.973847630878195 0.9463000876874142 0.9092974268256815 0.8632093666488735 0.8084964038195899 0.7457052121767197 0.6754631805511503 0.5984721441039558 0.5155013718214634 0.42737988023382895 0.33498815015590383 0.23924932921398112 0.1411200080598659 0.04158066243328916 -0.05837414342758142 -0.15774569414324996 -0.25554110202683294 -0.3507832276896215 -0.44252044329485407 -0.5298361409084948 -0.6118578909427207 -0.6877661591839753 -0.7568024953079294 -0.8182771110644114 -0.8715757724135886 -0.9161659367494552 -0.951602073889516 -0.977530117665097 -0.9936910036334644 -0.9999232575641008 -0.9961646088358408 -0.9824526126243328 -0.958924274663139 -0.9258146823277331 -0.8834546557201545 -0.8322674422239027 -0.7727644875559894 -0.7055403255703945 -0.6312666378723243 -0.5506855425976414 -0.4646021794137613 -0.37387666483024096 -0.27941549819893097 -0.18216250427210112 -0.0830894028175026 0.016813900484343496 0.11654920485048659 0.21511998808780858
diff --git a/chart2/workbench/sampledata/data.chd b/chart2/workbench/sampledata/data.chd
index 2edd14f5c8b0..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/data.chd
+++ b/chart2/workbench/sampledata/data.chd
@@ -1,35 +0,0 @@
-# -*-  coding: utf-8; -*-
-#
-# Simple File-Data Format:
-#  all empty lines and lines beginning with a hash '#' are ignored
-#  then the following is read:
-#    - labels, one for each series
-#    - categories, for each element of all series
-#    - the series data
-#
-
-# Series Labels
-
-Müsli Brot Milch Marmelade
-
-# Categories
-
-Morgens Mittags Nachmittags Abends Nachts
-
-# Data
-
-# Series Müsli
-
-1 10 30
-
-# Series Brot
-
-1 1 2 2 1
-
-# Series Milch
-
--3.5 6 4 1
-
-# Series Marmelade
-
--5 2 3 4 5 6 7 8 9 10
diff --git a/chart2/workbench/sampledata/default.chd b/chart2/workbench/sampledata/default.chd
index 01888e4c19ff..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/default.chd
+++ b/chart2/workbench/sampledata/default.chd
@@ -1,14 +0,0 @@
-# Series Labels
-Column_1 Column_2 Column_3
-
-# Categories
-Row_1 Row_2 Row_3 Row_4
-
-# Column 1
-9.1 2.4 3.1 4.3
-
-# Column 2
-3.2 8.8 1.5 9.02
-
-# Column 3
-4.54 9.65 3.7 6.2
diff --git a/chart2/workbench/sampledata/manyseries.chd b/chart2/workbench/sampledata/manyseries.chd
index ea7b0c293078..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/manyseries.chd
+++ b/chart2/workbench/sampledata/manyseries.chd
@@ -1,1006 +0,0 @@
-# -*- coding: utf-8; -*-
-# Series Labels
-empty
-# categories
-0
-# series
-0 0 1
-0,01 0,00999983333416667 0,999950000416665
-0,02 0,0199986666933331 0,999800006666578
-0,03 0,0299955002024957 0,999550033748988
-0,04 0,0399893341866342 0,999200106660978
-0,05 0,0499791692706783 0,998750260394966
-0,06 0,0599640064794446 0,998200539935204
-0,07 0,0699428473375328 0,99755100025328
-0,08 0,0799146939691727 0,996801706302619
-0,09 0,089878549198011 0,995952733011994
-0,1 0,0998334166468282 0,995004165278026
-0,11 0,109778300837175 0,993956097956697
-0,12 0,119712207288919 0,992808635853866
-0,13 0,129634142619695 0,991561893714788
-0,14 0,139543114644237 0,990215996212637
-0,15 0,149438132473599 0,988771077936042
-0,16 0,159318206614246 0,987227283375627
-0,17 0,169182349066996 0,985584766909561
-0,18 0,179029573425824 0,983843692788122
-0,19 0,188858894976501 0,98200423511727
-0,2 0,198669330795061 0,980066577841242
-0,21 0,2084598998461 0,978030914724148
-0,22 0,218229623080869 0,975897449330606
-0,23 0,227977523535188 0,973666395005375
-0,24 0,237702626427135 0,97133797485203
-0,25 0,247403959254523 0,968912421710645
-0,26 0,257080551892155 0,966389978134513
-0,27 0,266731436688831 0,963770896365891
-0,28 0,276355648564114 0,961055438310771
-0,29 0,285952225104836 0,958243875512697
-0,3 0,29552020666134 0,955336489125606
-0,31 0,305058636443443 0,952333569885713
-0,32 0,314566560616118 0,949235418082441
-0,33 0,324043028394868 0,946042343528387
-0,34 0,333487092140814 0,942754665528346
-0,35 0,342897807455451 0,939372712847379
-0,36 0,35227423327509 0,935896823677935
-0,37 0,361615431964962 0,932327345606035
-0,38 0,370920469412983 0,92866463557651
-0,39 0,380188415123161 0,924909059857313
-0,4 0,389418342308651 0,921060994002885
-0,41 0,398609327984423 0,917120822816605
-0,42 0,40776045305957 0,913088940312308
-0,43 0,416870802429211 0,908965749674885
-0,44 0,425939465066 0,904751663219963
-0,45 0,43496553411123 0,900447102352677
-0,46 0,44394810696552 0,896052497525525
-0,47 0,452886285379068 0,891568288195329
-0,48 0,461779175541483 0,886994922779284
-0,49 0,470625888171158 0,882332858610121
-0,5 0,479425538604203 0,877582561890373
-0,51 0,488177246882908 0,872744507645751
-0,52 0,496880137843737 0,86781917967765
-0,53 0,505533341204847 0,862807070514761
-0,54 0,514135991653113 0,857708681363824
-0,55 0,522687228930659 0,852524522059506
-0,56 0,531186197920883 0,847255111013416
-0,57 0,539632048733969 0,841900975162269
-0,58 0,548023936791874 0,836462649915187
-0,59 0,556361022912784 0,830940679100164
-0,6 0,564642473395035 0,825335614909678
-0,61 0,572867460100481 0,81964801784548
-0,62 0,581035160537305 0,813878456662534
-0,63 0,58914475794227 0,808027508312152
-0,64 0,597195441362392 0,802095757884293
-0,65 0,60518640573604 0,796083798549056
-0,66 0,613116851973434 0,789992231497365
-0,67 0,62098598703656 0,783821665880849
-0,68 0,628793024018469 0,777572718750928
-0,69 0,636537182221968 0,771246014997107
-0,7 0,644217687237691 0,764842187284488
-0,71 0,651833771021537 0,758361875990508
-0,72 0,659384671971473 0,751805729140895
-0,73 0,666869635003698 0,74517440234487
-0,74 0,674287911628145 0,738468558729588
-0,75 0,681638760023334 0,731688868873821
-0,76 0,688921445110551 0,724836010740905
-0,77 0,696135238627357 0,717910669610943
-0,78 0,70327941920041 0,710913538012277
-0,79 0,710353272417608 0,703845315652236
-0,8 0,717356090899523 0,696706709347165
-0,81 0,724287174370143 0,689498432951747
-0,82 0,731145829726896 0,682221207287614
-0,83 0,737931371109963 0,674875760071267
-0,84 0,744643119970859 0,667462825841308
-0,85 0,751280405140293 0,659983145884982
-0,86 0,757842562895277 0,652437468164052
-0,87 0,764328937025505 0,644826547240001
-0,88 0,770738878898969 0,63715114419858
-0,89 0,777071747526824 0,629412026573697
-0,9 0,783326909627483 0,621609968270664
-0,91 0,789503739689951 0,613745749488812
-0,92 0,795601620036366 0,605820156643463
-0,93 0,801619940883777 0,597833982287298
-0,94 0,807558100405114 0,589788025031098
-0,95 0,813415504789374 0,581683089463883
-0,96 0,819191568300998 0,573519986072457
-0,97 0,82488571333845 0,565299531160354
-0,98 0,830497370491971 0,557022546766217
-0,99 0,836025978600521 0,548689860581588
-1 0,841470984807897 0,54030230586814
-1,01 0,846831844618015 0,531860721374355
-1,02 0,852108021949363 0,52336595125165
-1,03 0,857298989188603 0,514818844969955
-1,04 0,862404227243338 0,506220257232778
-1,05 0,867423225594017 0,497571047891727
-1,06 0,872355482344986 0,488872081860528
-1,07 0,877200504274682 0,480124229028534
-1,08 0,881957806884948 0,47132836417374
-1,09 0,886626914449487 0,462485366875301
-1,1 0,891207360061435 0,453596121425577
-1,11 0,895698685680048 0,444661516741707
-1,12 0,900100442176505 0,435682446276712
-1,13 0,904412189378826 0,426659807930157
-1,14 0,908633496115883 0,417594503958358
-1,15 0,912763940260521 0,408487440884157
-1,16 0,916803108771767 0,399339529406273
-1,17 0,920750597736136 0,39015168430823
-1,18 0,92460601240802 0,380924824366882
-1,19 0,928368967249167 0,371659872260533
-1,2 0,932039085967226 0,362357754476674
-1,21 0,935616001553386 0,35301940121933
-1,22 0,939099356319068 0,343645746316047
-1,23 0,942488801931697 0,334237727124503
-1,24 0,945783999449539 0,324796284438776
-1,25 0,948984619355586 0,315322362395269
-1,26 0,952090341590516 0,305816908378289
-1,27 0,955100855584692 0,296280872925319
-1,28 0,958015860289225 0,286715209631955
-1,29 0,960835064206073 0,277120875056558
-1,3 0,963558185417193 0,267498828624587
-1,31 0,966184951612734 0,25785003253267
-1,32 0,968715100118265 0,248175451652373
-1,33 0,971148377921045 0,238476053433723
-1,34 0,973484541695319 0,228752807808459
-1,35 0,975723357826659 0,219006687093041
-1,36 0,977864602435316 0,209238665891419
-1,37 0,979908061398614 0,199449720997573
-1,38 0,98185353037236 0,189640831297834
-1,39 0,983700814811277 0,179812977672999
-1,4 0,98544972998846 0,169967142900241
-1,41 0,98710010101385 0,160104311554831
-1,42 0,98865176285172 0,150225469911686
-1,43 0,990104560337178 0,140331605846737
-1,44 0,991458348191686 0,130423708738146
-1,45 0,992712991037589 0,120502769367367
-1,46 0,993868363411645 0,11056977982007
-1,47 0,994924349777581 0,100625733386932
-1,48 0,99588084453764 0,0906716244643097
-1,49 0,996737752043143 0,0807084484548006
-1,5 0,997494986604055 0,0707372016677029
-1,51 0,998152472497548 0,0607588812193859
-1,52 0,998710143975583 0,0507744849335792
-1,53 0,999167945271476 0,040785011241591
-1,54 0,999525830605479 0,0307914590824661
-1,55 0,999783764189357 0,0207948278030924
-1,56 0,999941720229966 0,0107961170582674
-1,57 0,999999682931835 0,000796326710733263
-1,58 0,99995764649874 -0,00920354326880834
-1,59 0,999815615134291 -0,0192024929016927
-1,6 0,999573603041505 -0,0291995223012888
-1,61 0,99923163442139 -0,0391936317729877
-1,62 0,998789743470524 -0,0491838219141706
-1,63 0,998247974377632 -0,0591690937141484
-1,64 0,997606381319174 -0,0691484486540622
-1,65 0,996865028453919 -0,0791208888067341
-1,66 0,996023989916537 -0,0890854169364592
-1,67 0,99508334981018 -0,099041036598728
-1,68 0,994043202198076 -0,108986752239871
-1,69 0,992903651094118 -0,118921569296612
-1,7 0,991664810452469 -0,128844494295525
-1,71 0,990326804156158 -0,138754534952378
-1,72 0,988889766004701 -0,148650700271364
-1,73 0,987353839700717 -0,158532000644198
-1,74 0,985719178835554 -0,168397447949077
-1,75 0,983985946873937 -0,178246055649492
-1,76 0,982154317137618 -0,18807683889288
-1,77 0,980224472788045 -0,197888814609109
-1,78 0,978196606808045 -0,207681001608784
-1,79 0,976070921982524 -0,217452420681365
-1,8 0,973847630878195 -0,227202094693087
-1,81 0,971526955822315 -0,236929048684675
-1,82 0,969109128880456 -0,246632309968834
-1,83 0,966594391833297 -0,256310908227523
-1,84 0,963982996152448 -0,26596387560898
-1,85 0,9612752029753 -0,275590246824513
-1,86 0,958471283078914 -0,285189059245021
-1,87 0,955571516852944 -0,294759352997261
-1,88 0,952576194271595 -0,304300171059833
-1,89 0,94948561486463 -0,313810559358882
-1,9 0,946300087687414 -0,323289566863504
-1,91 0,94301993129001 -0,332736245680845
-1,92 0,939645473685325 -0,342149651150898
-1,93 0,936177052316306 -0,35152884194096
-1,94 0,932615014022201 -0,360872880139767
-1,95 0,928959715003869 -0,370180831351287
-1,96 0,925211520788168 -0,379451764788155
-1,97 0,921370806191396 -0,388684753364752
-1,98 0,91743795528181 -0,397878873789916
-1,99 0,913413361341225 -0,407033206659266
-2 0,909297426825682 -0,416146836547142
-2,01 0,905090563325201 -0,425218852098153
-2,02 0,900793191522627 -0,434248346118301
-2,03 0,89640574115156 -0,443234415665709
-2,04 0,89192865095338 -0,452176162140912
-2,05 0,887362368633375 -0,461072691376713
-2,06 0,882707350815974 -0,469923113727602
-2,07 0,877964062999078 -0,47872654415872
-2,08 0,873132979507517 -0,487482102334359
-2,09 0,868214583445613 -0,496188912705999
-2,1 0,863209366648874 -0,504846104599858
-2,11 0,858117829634809 -0,513452812303959
-2,12 0,852940481552876 -0,522008175154707
-2,13 0,84767784013357 -0,530511337622945
-2,14 0,842330431636646 -0,538961449399512
-2,15 0,836898790798498 -0,547357665480271
-2,16 0,831383460778683 -0,555699146250613
-2,17 0,825784993105608 -0,56398505756941
-2,18 0,820103947621374 -0,572214570852437
-2,19 0,814340892425796 -0,580386863155222
-2,2 0,80849640381959 -0,588501117255346
-2,21 0,802571066246747 -0,59655652173416
-2,22 0,796565472236087 -0,60455227105793
-2,23 0,790480222342005 -0,612487565658385
-2,24 0,78431592508442 -0,62036161201268
-2,25 0,778073196887921 -0,628173622722739
-2,26 0,771752662020126 -0,635922816594003
-2,27 0,765354952529254 -0,643608418713541
-2,28 0,758880708180922 -0,651229660527546
-2,29 0,752330576394171 -0,658785779918188
-2,3 0,74570521217672 -0,666276021279824
-2,31 0,739005278059471 -0,673699635594561
-2,32 0,732231444030251 -0,681055880507152
-2,33 0,72538438746682 -0,688344020399238
-2,34 0,718464793069126 -0,695563326462902
-2,35 0,711473352790844 -0,702713076773554
-2,36 0,704410765770176 -0,709792556362121
-2,37 0,697277738259938 -0,716801057286543
-2,38 0,690074983556936 -0,723737878702569
-2,39 0,68280322193064 -0,730602326933837
-2,4 0,675463180551151 -0,737393715541245
-2,41 0,668055593416491 -0,744111365391593
-2,42 0,660581201279201 -0,750754604725491
-2,43 0,653040751572265 -0,757322769224544
-2,44 0,645434998334371 -0,763815202077774
-2,45 0,637764702134504 -0,770231254047307
-2,46 0,630030629995892 -0,776570283533293
-2,47 0,622233555319305 -0,782831656638065
-2,48 0,614374257805712 -0,789014747229531
-2,49 0,606453523378315 -0,795118937003784
-2,5 0,598472144103957 -0,801143615546934
-2,51 0,590430918113913 -0,807088180396146
-2,52 0,582330649524082 -0,81295203709989
-2,53 0,574172148354572 -0,818734599277382
-2,54 0,565956230448703 -0,824435288677222
-2,55 0,557683717391417 -0,830053535235222
-2,56 0,549355436427127 -0,835588777131408
-2,57 0,540972220376989 -0,841040460846202
-2,58 0,532534907555621 -0,846408041215776
-2,59 0,524044341687276 -0,851690981486566
-2,6 0,515501371821464 -0,856888753368947
-2,61 0,506906852248053 -0,862000837090064
-2,62 0,498261642411839 -0,867026721445802
-2,63 0,4895666068266 -0,871965903851917
-2,64 0,480822614988648 -0,876817890394281
-2,65 0,472030541289883 -0,881582195878286
-2,66 0,463191264930345 -0,886258343877352
-2,67 0,454305669830306 -0,890845866780576
-2,68 0,445374644541871 -0,895344305839492
-2,69 0,436399082160126 -0,899753211213941
-2,7 0,42737988023383 -0,904072142017061
-2,71 0,418317940675659 -0,90830066635937
-2,72 0,409214169672017 -0,912438361391958
-2,73 0,40006947759242 -0,916484813348769
-2,74 0,390884778898452 -0,920439617587981
-2,75 0,381660992052332 -0,924302378632464
-2,76 0,372399039425055 -0,928072710209333
-2,77 0,363099847204168 -0,931750235288572
-2,78 0,353764345301143 -0,935334586120739
-2,79 0,34439346725839 -0,938825404273736
-2,8 0,334988150155905 -0,942222340668658
-2,81 0,32554933451756 -0,945525055614696
-2,82 0,316077964217054 -0,948733218843107
-2,83 0,306574986383523 -0,951846509540242
-2,84 0,297041351306832 -0,954864616379626
-2,85 0,287478012342544 -0,95778723755309
-2,86 0,277885925816587 -0,960614080800952
-2,87 0,268266050929618 -0,963344863441243
-2,88 0,258619349661111 -0,965979312397975
-2,89 0,248946786673153 -0,968517164228447
-2,9 0,239249329213982 -0,970958165149591
-2,91 0,229527947021264 -0,973302071063349
-2,92 0,219783612225117 -0,975548647581083
-2,93 0,210017299250899 -0,977697670047013
-2,94 0,200229984721771 -0,979748923560684
-2,95 0,190422647361027 -0,981702202998454
-2,96 0,180596267894233 -0,983557313034006
-2,97 0,170751828951145 -0,985314068157884
-2,98 0,160890314967456 -0,986972292696038
-2,99 0,151012712086344 -0,988531820827396
-3 0,141120008059867 -0,989992496600445
-3,01 0,131213192150184 -0,991354173948826
-3,02 0,12129325503063 -0,992616716705937
-3,03 0,11136118868665 -0,993779998618556
-3,04 0,101417986316602 -0,994843903359459
-3,05 0,0914646422324368 -0,995808324539061
-3,06 0,0815021517602691 -0,996673165716047
-3,07 0,0715315111408433 -0,997438340407019
-3,08 0,0615537174299131 -0,998103772095146
-3,09 0,0515697683985346 -0,998669394237814
-3,1 0,0415806624332905 -0,999135150273279
-3,11 0,0315873984364539 -0,999500993626328
-3,12 0,021590975726096 -0,999766887712928
-3,13 0,0115923939361583 -0,999932805943894
-3,14 0,00159265291648683 -0,999998731727539
-3,15 -0,00840724736714862 -0,999964658471342
-3,16 -0,0184063069330538 -0,999830589582598
-3,17 -0,0284035258836038 -0,999596538468086
-3,18 -0,0383979045052354 -0,999262528532721
-3,19 -0,0483884433684142 -0,998828593177219
-3,2 -0,0583741434275801 -0,998294775794753
-3,21 -0,0683540061210478 -0,997661129766618
-3,22 -0,0783270334708653 -0,996927718456887
-3,23 -0,0882922281826076 -0,996094615206081
-3,24 -0,0982485937451087 -0,99516190332383
-3,25 -0,108195134530108 -0,994129676080546
-3,26 -0,118130855891818 -0,992998036698093
-3,27 -0,12805476426638 -0,991767098339465
-3,28 -0,137965867271227 -0,990436984097473
-3,29 -0,147863173804319 -0,989007826982433
-3,3 -0,157745694143249 -0,987479769908865
-3,31 -0,167612440044218 -0,985852965681203
-3,32 -0,177462424840861 -0,984127576978515
-3,33 -0,187294663542903 -0,982303776338232
-3,34 -0,19710817293467 -0,980381746138899
-3,35 -0,2069019716734 -0,978361678581934
-3,36 -0,21667508038738 -0,97624377567241
-3,37 -0,226426521773883 -0,974028249198852
-3,38 -0,236155320696897 -0,971715320712062
-3,39 -0,245860504284637 -0,969305221502961
-3,4 -0,255541102026831 -0,966798192579461
-3,41 -0,265196145871773 -0,964194484642366
-3,42 -0,274824670323124 -0,961494358060299
-3,43 -0,284425712536462 -0,958698082843669
-3,44 -0,293998312415568 -0,955805938617666
-3,45 -0,303541512708429 -0,952818214594305
-3,46 -0,31305435910297 -0,949735209543496
-3,47 -0,322535900322479 -0,946557231763176
-3,48 -0,331985188220734 -0,943284599048476
-3,49 -0,341401277876821 -0,939917638659938
-3,5 -0,35078322768962 -0,936456687290796
-3,51 -0,360130099471969 -0,932902091033304
-3,52 -0,369440958544477 -0,929254205344123
-3,53 -0,378714873828998 -0,925513395008784
-3,54 -0,38795091794173 -0,921680034105203
-3,55 -0,39714816728596 -0,917754505966276
-3,56 -0,406305702144417 -0,913737203141545
-3,57 -0,415422606771246 -0,909628527357944
-3,58 -0,424497969483583 -0,90542888947963
-3,59 -0,433530882752718 -0,901138709466889
-3,6 -0,442520443294853 -0,896758416334147
-3,61 -0,451465752161423 -0,892288448107068
-3,62 -0,460365914828998 -0,88772925177875
-3,63 -0,469220041288727 -0,883081283265026
-3,64 -0,478027246135343 -0,878345007358874
-3,65 -0,486786648655699 -0,873520897683938
-3,66 -0,495497372916845 -0,868609436647165
-3,67 -0,504158547853612 -0,863611115390566
-3,68 -0,512769307355724 -0,858526433742102
-3,69 -0,521328790354407 -0,8533559001657
-3,7 -0,529836140908493 -0,848100031710408
-3,71 -0,538290508290018 -0,842759353958694
-3,72 -0,546691047069287 -0,83733440097388
-3,73 -0,555036917199424 -0,831825715246746
-3,74 -0,56332728410037 -0,826233847641272
-3,75 -0,571561318742344 -0,820559357339561
-3,76 -0,579738197728743 -0,814802811785912
-3,77 -0,587857103378483 -0,808964786630085
-3,78 -0,595917223807764 -0,803045865669731
-3,79 -0,603917753011261 -0,797046640792012
-3,8 -0,611857890942719 -0,790967711914417
-3,81 -0,619736843594963 -0,784809686924768
-3,82 -0,627553823079294 -0,778573181620432
-3,83 -0,635308047704276 -0,772258819646744
-3,84 -0,642998742053909 -0,765867232434637
-3,85 -0,650625137065167 -0,759399059137508
-3,86 -0,658186470104905 -0,752854946567295
-3,87 -0,665681985046119 -0,746235549129803
-3,88 -0,673110932343562 -0,739541528759259
-3,89 -0,680472569108694 -0,732773554852121
-3,9 -0,687766159183974 -0,72593230420014
-3,91 -0,694990973216472 -0,719018460922681
-3,92 -0,702146288730805 -0,71203271639831
-3,93 -0,709231390201386 -0,704975769195658
-3,94 -0,716245569123971 -0,697848325003564
-3,95 -0,723188124086512 -0,690651096560508
-3,96 -0,7300583608393 -0,683384803583336
-3,97 -0,736855592364383 -0,676050172695292
-3,98 -0,743579138944275 -0,668647937353351
-3,99 -0,750228328229919 -0,66117883777488
-4 -0,756802495307928 -0,653643620863612
-4,01 -0,763300982767073 -0,646043040134959
-4,02 -0,769723140764024 -0,638377855640659
-4,03 -0,776068327088332 -0,630648833892775
-4,04 -0,782335907226653 -0,622856747787042
-4,05 -0,788525254426195 -0,615002376525574
-4,06 -0,794635749757397 -0,607086505538955
-4,07 -0,800666782175818 -0,599109926407685
-4,08 -0,806617748583241 -0,591073436783031
-4,09 -0,812488053887984 -0,582977840307259
-4,1 -0,81827711106441 -0,574823946533269
-4,11 -0,823984341211626 -0,566612570843644
-4,12 -0,829609173611371 -0,55834453436911
-4,13 -0,835151045785094 -0,550020663906425
-4,14 -0,840609403550195 -0,541641791835699
-4,15 -0,845983701075447 -0,533208756037154
-4,16 -0,851273400935574 -0,524722399807346
-4,17 -0,856477974165001 -0,516183571774825
-4,18 -0,861596900310741 -0,507593125815277
-4,19 -0,866629667484444 -0,49895192096614
-4,2 -0,871575772413588 -0,490260821340699
-4,21 -0,876434720491801 -0,481520696041674
-4,22 -0,881206025828325 -0,47273241907431
-4,23 -0,885889211296603 -0,46389686925898
-4,24 -0,890483808581988 -0,455014930143305
-4,25 -0,894989358228584 -0,446087489913793
-4,26 -0,899405409685178 -0,437115441307028
-4,27 -0,903731521350306 -0,428099681520393
-4,28 -0,907967260616405 -0,419041112122356
-4,29 -0,91211220391308 -0,409940638962306
-4,3 -0,916165936749455 -0,400799172079975
-4,31 -0,920128053755624 -0,391617625614435
-4,32 -0,923998158723188 -0,38239691771268
-4,33 -0,927775864644875 -0,373137970437818
-4,34 -0,931460793753243 -0,363841709676858
-4,35 -0,935052577558449 -0,354509065048131
-4,36 -0,938550856885108 -0,345140969808323
-4,37 -0,941955281908201 -0,335738360759151
-4,38 -0,945265512188063 -0,326302178153683
-4,39 -0,948481216704426 -0,316833365602319
-4,4 -0,951602073889516 -0,307332869978419
-4,41 -0,954627771660216 -0,297801641323633
-4,42 -0,957558007449271 -0,288240632752882
-4,43 -0,960392488235543 -0,278650800359055
-4,44 -0,963130930573317 -0,269033103117399
-4,45 -0,965773060620639 -0,259388502789626
-4,46 -0,968318614166707 -0,249717963827731
-4,47 -0,970767336658288 -0,24002245327755
-4,48 -0,973118983225174 -0,230302940682059
-4,49 -0,975373318704667 -0,220560397984419
-4,5 -0,977530117665097 -0,21079579943078
-4,51 -0,979589164428367 -0,20101012147286
-4,52 -0,981550253091516 -0,191204342670301
-4,53 -0,983413187547311 -0,181379443592811
-4,54 -0,98517778150386 -0,171536406722112
-4,55 -0,986843858503237 -0,161676216353687
-4,56 -0,988411251939131 -0,151799858498355
-4,57 -0,989879805073504 -0,141908320783673
-4,58 -0,991249371052267 -0,13200259235517
-4,59 -0,992519812919963 -0,122083663777433
-4,6 -0,993691003633465 -0,112152526935054
-4,61 -0,994762826074676 -0,102210174933442
-4,62 -0,995735173062245 -0,0922576019995117
-4,63 -0,996607947362286 -0,0822958033822624
-4,64 -0,997381061698093 -0,0723257752532545
-4,65 -0,99805443875888 -0,0623485146069917
-4,66 -0,998628011207499 -0,0523650191612259
-4,67 -0,999101721687185 -0,0423762872571815
-4,68 -0,999475522827284 -0,0323833177597247
-4,69 -0,999749377247994 -0,0223871099574771
-4,7 -0,999923257564101 -0,0123886634628906
-4,71 -0,999997146387718 -0,00238897811228154
-4,72 -0,999971036330025 0,0076109461341479
-4,73 -0,999844930002004 0,0176101092923073
-4,74 -0,999618840014185 0,0276075114542115
-4,75 -0,999292788975378 0,0376021528879766
-4,76 -0,998866809490414 0,0475930341377878
-4,77 -0,998340944156888 0,0575791561238469
-4,78 -0,997715245560893 0,0675595202422752
-4,79 -0,99698977627177 0,0775331284649787
-4,8 -0,996164608835841 0,0874989834394464
-4,81 -0,995239825769163 0,0974560885884866
-4,82 -0,994215519549271 0,10740344820988
-4,83 -0,993091792605935 0,117340067575955
-4,84 -0,991868757310913 0,127264953033056
-4,85 -0,990546535966713 0,137177112100908
-4,86 -0,98912526079437 0,147075553571863
-4,87 -0,987605073920215 0,156959287610023
-4,88 -0,98598612736167 0,166827325850222
-4,89 -0,984268583012042 0,176678681496857
-4,9 -0,982452612624332 0,186512369422576
-4,91 -0,980538397794069 0,196327406266778
-4,92 -0,978526129941139 0,206122810533958
-4,93 -0,97641601029065 0,215897602691854
-4,94 -0,974208249852809 0,225650805269396
-4,95 -0,971903069401821 0,235381442954451
-4,96 -0,969500699453809 0,245088542691362
-4,97 -0,967001380243766 0,254771133778243
-4,98 -0,96440536170153 0,264428247964056
-4,99 -0,961712903426793 0,274058919545427
-5 -0,958924274663139 0,283662185463226
-5,01 -0,956039754271118 0,293237085398863
-5,02 -0,953059630700368 0,302782661870324
-5,03 -0,949984201960761 0,312297960327916
-5,04 -0,946813775592609 0,321782029249722
-5,05 -0,943548668635907 0,331233920236754
-5,06 -0,940189207598628 0,34065268810779
-5,07 -0,936735728424079 0,350037390993891
-5,08 -0,933188576457298 0,35938709043259
-5,09 -0,929548106410525 0,368700851461733
-5,1 -0,925814682327732 0,377977742712981
-5,11 -0,921988677548216 0,387216836504937
-5,12 -0,918070474669267 0,396417208935922
-5,13 -0,914060465507907 0,405577939976361
-5,14 -0,909959051061711 0,414698113560782
-5,15 -0,905766641468705 0,423776817679428
-5,16 -0,901483655966355 0,432813144469452
-5,17 -0,897110522849643 0,441806190305706
-5,18 -0,892647679428235 0,450755055891099
-5,19 -0,888095571982754 0,459658846346532
-5,2 -0,883454655720153 0,468516671300377
-5,21 -0,87872539472819 0,477327644977522
-5,22 -0,873908261929022 0,48609088628794
-5,23 -0,869003739031916 0,494805518914805
-5,24 -0,864012316485074 0,503470671402114
-5,25 -0,858934493426592 0,512085477241841
-5,26 -0,853770777634543 0,52064907496058
-5,27 -0,848521685476204 0,529160608205696
-5,28 -0,843187741856417 0,537619225830956
-5,29 -0,837769480165098 0,546024081981648
-5,3 -0,832267442223901 0,554374336179161
-5,31 -0,826682178232036 0,562669153405033
-5,32 -0,821014246711247 0,570907704184454
-5,33 -0,815264214449963 0,57908916466921
-5,34 -0,809432656446619 0,587212716720073
-5,35 -0,803520155852155 0,595277547988607
-5,36 -0,797527303911704 0,603282851998404
-5,37 -0,791454699905466 0,611227828225735
-5,38 -0,785302951088781 0,619111682179599
-5,39 -0,779072672631403 0,626933625481169
-5,4 -0,772764487555987 0,634692875942635
-5,41 -0,766379026675784 0,642388657645414
-5,42 -0,759916928531561 0,650020201017752
-5,43 -0,753378839327747 0,657586742911669
-5,44 -0,746765412867812 0,665087526679283
-5,45 -0,740077310488894 0,672521802248466
-5,46 -0,733315200995657 0,679888826197857
-5,47 -0,726479760593413 0,687187861831201
-5,48 -0,719571672820508 0,694418179251016
-5,49 -0,712591628479962 0,701579055431586
-5,5 -0,705540325570392 0,70866977429126
-5,51 -0,698418469216214 0,715689626764061
-5,52 -0,691226771597126 0,722637910870592
-5,53 -0,683965951876901 0,729513931788232
-5,54 -0,676636736131457 0,736317001920619
-5,55 -0,669239857276262 0,74304644096641
-5,56 -0,661776054993037 0,749701575987308
-5,57 -0,654246075655791 0,756281741475356
-5,58 -0,646650672256183 0,762786279419489
-5,59 -0,638990604328224 0,769214539371333
-5,6 -0,631266637872321 0,77556587851025
-5,61 -0,623479545278685 0,781839661707619
-5,62 -0,615630105250086 0,788035261590348
-5,63 -0,607719102723986 0,794152058603611
-5,64 -0,599747328794044 0,800189441072806
-5,65 -0,591715580631009 0,806146805264716
-5,66 -0,583624661403007 0,812023555447886
-5,67 -0,575475380195217 0,817819103952195
-5,68 -0,567268551928969 0,823532871227622
-5,69 -0,559004997280249 0,829164285902202
-5,7 -0,550685542597638 0,83471278483916
-5,71 -0,54231101981967 0,840177813193225
-5,72 -0,533882266391644 0,845558824466117
-5,73 -0,525400125181879 0,850855280561193
-5,74 -0,516865444397429 0,856066651837255
-5,75 -0,508279077499258 0,861192417161521
-5,76 -0,499641883116902 0,866232063961728
-5,77 -0,490954724962601 0,871185088277398
-5,78 -0,482218471744932 0,876050994810224
-5,79 -0,473433997081935 0,880829296973609
-5,8 -0,464602179413757 0,885519516941319
-5,81 -0,455723901914805 0,890121185695266
-5,82 -0,44680005240543 0,894633843072407
-5,83 -0,437831523263147 0,899057037810768
-5,84 -0,428819211333396 0,903390327594559
-5,85 -0,419764017839859 0,907633279098414
-5,86 -0,410666848294341 0,911785468030717
-5,87 -0,401528612406215 0,915846479176035
-5,88 -0,392350223991454 0,919815906436639
-5,89 -0,383132600881251 0,92369335287311
-5,9 -0,373876664830236 0,927478430744036
-5,91 -0,364583341424301 0,931170761544783
-5,92 -0,355253559988043 0,934769976045349
-5,93 -0,345888253491829 0,938275714327282
-5,94 -0,336488358458504 0,941687625819678
-5,95 -0,327054814869741 0,945005369334228
-5,96 -0,317588566072035 0,948228613099346
-5,97 -0,308090558682378 0,951357034793342
-5,98 -0,298561742493594 0,954390321576654
-5,99 -0,289003070379361 0,957328170123131
-6 -0,279415498198926 0,960170286650366
-6,01 -0,269799984701516 0,962916386949076
-6,02 -0,260157491430468 0,965566196411518
-6,03 -0,250488982627075 0,968119450058955
-6,04 -0,240795425134159 0,970575892568149
-6,05 -0,231077788299392 0,972935278296897
-6,06 -0,221337043878359 0,975197371308593
-6,07 -0,211574165937385 0,977361945395819
-6,08 -0,201790130756129 0,979428784102971
-6,09 -0,191985916729955 0,981397680747901
-6,1 -0,182162504272095 0,983268438442585
-6,11 -0,17232087571561 0,985040870112812
-6,12 -0,162462015215154 0,986714798516892
-6,13 -0,152586908648561 0,98829005626338
-6,14 -0,142696543518258 0,989766485827815
-6,15 -0,132791908852517 0,991143939568469
-6,16 -0,12287399510655 0,992422279741117
-6,17 -0,112943794063467 0,993601378512807
-6,18 -0,103002298735098 0,994681117974643
-6,19 -0,0930505032626889 0,995661390153581
-6,2 -0,0830894028174964 0,996542097023218
-6,21 -0,0731199935012631 0,997323150513601
-6,22 -0,0631432722466128 0,998004472520034
-6,23 -0,0531602367173561 0,998585994910881
-6,24 -0,0431718852087287 0,99906765953439
-6,25 -0,0331792165475568 0,999449418224499
-6,26 -0,0231832299923794 0,999731232805658
-6,27 -0,0131849251335213 0,999913075096642
-6,28 -0,00318530179313799 0,999994926913375
-6,29 0,00681464007477018 0,999976780070743
-6,3 0,0168139004843497 0,999858636383415
-6,31 0,0268114795178932 0,999640507665662
-6,32 0,0368063774258269 0,999322415730173
-6,33 0,0467975947266899 0,998904392385876
-6,34 0,0567841323070781 0,998386479434759
-6,35 0,0667649915215564 0,997768728667684
-6,36 0,0767391742925189 0,997051201859214
-6,37 0,0867056832100013 0,996233970761431
-6,38 0,0966635216314172 0,995317117096764
-6,39 0,106611693781224 0,994300732549815
-6,4 0,116549204850494 0,993184918758193
-6,41 0,126475061096403 0,991969787302346
-6,42 0,136388269941598 0,990655459694407
-6,43 0,146287840073455 0,989242067366043
-6,44 0,156172781543212 0,987729751655308
-6,45 0,166042105864957 0,986118663792513
-6,46 0,175894826114484 0,984408964885101
-6,47 0,185729957027978 0,982600825901539
-6,48 0,195546515100544 0,980694427654217
-6,49 0,205343518684555 0,978689960781373
-6,5 0,215119988087816 0,976587625728024
-6,51 0,224874945671534 0,974387632725921
-6,52 0,234607415948081 0,972090201772533
-6,53 0,244316425678538 0,96969556260904
-6,54 0,254001003970023 0,967203954697364
-6,55 0,263660182372778 0,964615627196218
-6,56 0,273292994977013 0,961930838936196
-6,57 0,282898478509493 0,959149858393887
-6,58 0,29247567242987 0,956272963665028
-6,59 0,302023619026732 0,953300442436693
-6,6 0,311541363513379 0,950232591958529
-6,61 0,32102795412329 0,947069719013028
-6,62 0,330482442205311 0,943812139884847
-6,63 0,339903882318513 0,940460180329185
-6,64 0,349291332326736 0,937014175539204
-6,65 0,3586438534928 0,933474470112512
-6,66 0,367960510572385 0,929841418016702
-6,67 0,377240371907544 0,926115382553954
-6,68 0,386482509519879 0,922296736324713
-6,69 0,395685999203331 0,918385861190416
-6,7 0,404849920616598 0,914383148235319
-6,71 0,413973357375178 0,910288997727383
-6,72 0,423055397142997 0,906103819078245
-6,73 0,432095131723647 0,901828030802283
-6,74 0,441091657151202 0,897462060474762
-6,75 0,450044073780618 0,893006344689077
-6,76 0,45895148637769 0,888461329013092
-6,77 0,467813004208584 0,883827467944587
-6,78 0,476627741128899 0,879105224865808
-6,79 0,48539481567229 0,874295071997128
-6,8 0,494113351138608 0,869397490349825
-6,81 0,502782475681573 0,864412969677982
-6,82 0,511401322395952 0,859342008429514
-6,83 0,519969029404259 0,854185113696319
-6,84 0,528484739942931 0,848942801163572
-6,85 0,536947602448012 0,843615595058159
-6,86 0,545356770640302 0,838204028096251
-6,87 0,553711403609991 0,832708641430035
-6,88 0,562010665900743 0,827129984593597
-6,89 0,570253727593247 0,821468615447972
-6,9 0,5784397643882 0,815725100125357
-6,91 0,586567957688746 0,809900012972498
-6,92 0,594637494682329 0,803993936493257
-6,93 0,602647568421972 0,798007461290359
-6,94 0,610597377906979 0,791941186006336
-6,95 0,618486128163024 0,785795717263661
-6,96 0,626313030321656 0,779571669604088
-6,97 0,634077301699181 0,773269665427194
-6,98 0,641778165874934 0,766890334928147
-6,99 0,649414852768911 0,760434316034681
-7 0,656986598718789 0,753902254343305
-7,01 0,664492646556282 0,747294803054744
-7,02 0,671932245682862 0,74061262290862
-7,03 0,679304652144815 0,733856382117381
-7,04 0,686609128707639 0,727026756299476
-7,05 0,693844944929764 0,720124428411794
-7,06 0,701011377235599 0,713150088681372
-7,07 0,708107708987884 0,706104434536373
-7,08 0,715133230559358 0,698988170536338
-7,09 0,722087239403718 0,691802008301737
-7,1 0,728969040125877 0,684546666442806
-7,11 0,735777944551494 0,677222870487685
-7,12 0,742513271795802 0,669831352809865
-7,13 0,749174348331689 0,662372852554955
-7,14 0,755760508057054 0,654848115566765
-7,15 0,762271092361411 0,647257894312724
-7,16 0,768705450191756 0,639602947808631
-7,17 0,775062938117667 0,631884041542758
-7,18 0,78134292039565 0,624101947399299
-7,19 0,787544769032711 0,616257443581182
-7,2 0,793667863849153 0,608351314532255
-7,21 0,799711592540598 0,600384350858831
-7,22 0,805675350739213 0,592357349250641
-7,23 0,811558542074149 0,584271112401154
-7,24 0,817360578231173 0,576126448927319
-7,25 0,823080879011506 0,567924173288695
-7,26 0,828718872389835 0,559665105706011
-7,27 0,834273994571523 0,551350072079141
-7,28 0,83974569004898 0,542979903904521
-7,29 0,845133411657217 0,534555438191992
-7,3 0,850436620628564 0,526077517381105
-7,31 0,855654786646544 0,517546989256876
-7,32 0,860787387898902 0,50896470686501
-7,33 0,86583391112979 0,500331528426593
-7,34 0,870793851691091 0,491648317252276
-7,35 0,875666713592883 0,482915941655937
-7,36 0,880452009553034 0,474135274867862
-7,37 0,885149261045938 0,465307194947413
-7,38 0,88975799835036 0,456432584695223
-7,39 0,894277760596409 0,447512331564921
-7,4 0,898708095811627 0,43854732757439
-7,41 0,903048560966185 0,429538469216557
-7,42 0,907298722017184 0,420486657369749
-7,43 0,911458153952061 0,411392797207609
-7,44 0,91552644083109 0,402257798108573
-7,45 0,919503175828971 0,393082573564941
-7,46 0,923387961275519 0,38386804109152
-7,47 0,927180408695427 0,374615122133879
-7,48 0,930880138847114 0,365324741976202
-7,49 0,934486781760646 0,355997829648764
-7,5 0,937999976774739 0,346635317835026
-7,51 0,941419372572818 0,337238142778366
-7,52 0,944744627218154 0,327807244188457
-7,53 0,947975408188053 0,318343565147303
-7,54 0,951111392407109 0,30884805201492
-7,55 0,954152266279515 0,299321654334707
-7,56 0,957097725720417 0,289765324738494
-7,57 0,959947476186326 0,280180018851278
-7,58 0,96270123270457 0,27056669519566
-7,59 0,965358719901792 0,260926315095994
-7,6 0,967919672031487 0,251259842582255
-7,61 0,970383833000575 0,241568244293641
-7,62 0,972750956395014 0,231852489381904
-7,63 0,975020805504436 0,222113549414439
-7,64 0,977193153345823 0,212352398277125
-7,65 0,9792677826862 0,202570012076944
-7,66 0,981244486064362 0,192767369044364
-7,67 0,983123065811619 0,182945449435517
-7,68 0,984903334071561 0,173105235434182
-7,69 0,986585112818846 0,163247711053556
-7,7 0,988168233877 0,153373862037864
-7,71 0,989652538935238 0,14348467576378
-7,72 0,99103787956429 0,13358114114169
-7,73 0,992324117231247 0,123664248516802
-7,74 0,993511123313416 0,113734989570117
-7,75 0,994598779111176 0,103794357219253
-7,76 0,995586975859855 0,0938433455191623
-7,77 0,996475614740601 0,0838829495627214
-7,78 0,997264606890266 0,0739141653812273
-7,79 0,997953873410293 0,06393798984479
-7,8 0,998543345374605 0,0539554205626498
-7,81 0,999032963836496 0,043967455783415
-7,82 0,999422679834528 0,0339750942952423
-7,83 0,999712454397426 0,0239793353259525
-7,84 0,999902258547975 0,0139811784431128
-7,85 0,999992073305919 0,00398162345407885
-7,86 0,999981889689856 -0,0060183296939816
-7,87 0,999871708718139 -0,0160176810140879
-7,88 0,999661541408774 -0,0260154305794408
-7,89 0,999351408778317 -0,0360105786234161
-7,9 0,998941341839772 -0,046002125639537
-7,91 0,998431381599491 -0,0559890724814288
-7,92 0,997821579053074 -0,0659704204627299
-7,93 0,997111995180267 -0,0759451714569607
-7,94 0,996302700938866 -0,0859123279973325
-7,95 0,99539377725762 -0,0958708933764978
-7,96 0,99438531502814 -0,105819871746218
-7,97 0,99327741509581 -0,115758268216946
-7,98 0,992070188249698 -0,125685088957318
-7,99 0,990763755211484 -0,135599341293531
-8 0,989358246623382 -0,145500033808614
-8,01 0,98785380303508 -0,155386176441565
-8,02 0,986250574889684 -0,16525678058636
-8,03 0,984548722508671 -0,17511085919081
-8,04 0,982748416075862 -0,184947426855268
-8,05 0,980849835620399 -0,194765499931161
-8,06 0,978853170998747 -0,204564096619365
-8,07 0,976758621875704 -0,214342237068377
-8,08 0,974566397704435 -0,2240989434723
-8,09 0,972276717705532 -0,233833240168624
-8,1 0,969889810845086 -0,243544153735791
-8,11 0,967405915811795 -0,253230713090538
-8,12 0,964825280993091 -0,262891949585002
-8,13 0,962148164450306 -0,272526897103582
-8,14 0,959374833892864 -0,282134592159557
-8,15 0,956505566651509 -0,291714073991427
-8,16 0,953540649650574 -0,301264384658992
-8,17 0,950480379379289 -0,310784569139144
-8,18 0,94732506186213 -0,320273675421368
-8,19 0,94407501262822 -0,329730754602944
-8,2 0,940730556679773 -0,339154860983835
-8,21 0,937292028459598 -0,348545052161256
-8,22 0,933759771817651 -0,357900389123914
-8,23 0,930134139976653 -0,367219936345908
-8,24 0,926415495496766 -0,376502761880283
-8,25 0,92260421023934 -0,385747937452222
-8,26 0,918700665329725 -0,394954538551871
-8,27 0,914705251119158 -0,404121644526792
-8,28 0,91061836714573 -0,413248338674028
-8,29 0,906440422094434 -0,42233370833177
-8,3 0,902171833756293 -0,431376844970621
-8,31 0,897813028986585 -0,440376844284454
-8,32 0,893364443662152 -0,449332806280839
-8,33 0,888826522637821 -0,458243835371038
-8,34 0,884199719701913 -0,467109040459569
-8,35 0,879484497530865 -0,47592753503331
-8,36 0,874681327642965 -0,484698437250152
-8,37 0,869790690351199 -0,493420870027185
-8,38 0,864813074715222 -0,502093961128397
-8,39 0,859748978492448 -0,510716843251906
-8,4 0,854598908088281 -0,519288654116686
-8,41 0,849363378505467 -0,527808536548793
-8,42 0,844042913292604 -0,536275638567084
-8,43 0,838638044491778 -0,544689113468413
-8,44 0,833149312585366 -0,553048119912302
-8,45 0,827577266441984 -0,561351822005071
-8,46 0,821922463261602 -0,569599389383433
-8,47 0,816185468519828 -0,57778999729752
-8,48 0,810366855911355 -0,585922826693367
-8,49 0,804467207292594 -0,593997064294812
-8,5 0,79848711262349 -0,602011902684824
-8,51 0,792427169908528 -0,609966540386242
-8,52 0,786287985136929 -0,617860181941925
-8,53 0,780070172222054 -0,625692037994295
-8,54 0,773774352940012 -0,633461325364276
-8,55 0,767401156867487 -0,641167267129602
-8,56 0,760951221318774 -0,648809092702519
-8,57 0,754425191282054 -0,656386037906838
-8,58 0,74782371935489 -0,663897345054353
-8,59 0,741147465678975 -0,671342263020609
-8,6 0,734397097874113 -0,678720047320013
-8,61 0,72757329097146 -0,686029960180282
-8,62 0,720676727346017 -0,693271270616225
-8,63 0,713708096648402 -0,700443254502829
-8,64 0,706668095735878 -0,707545194647683
-8,65 0,699557428602668 -0,714576380862692
-8,66 0,69237680630956 -0,721536110035093
-8,67 0,685126946912801 -0,728423686197768
-8,68 0,677808575392287 -0,735238420598841
-8,69 0,670422423579072 -0,741979631770551
-8,7 0,662969230082182 -0,7486466455974
-8,71 0,655449740214757 -0,755238795383558
-8,72 0,647864705919518 -0,76175542191954
-8,73 0,640214885693571 -0,768195873548125
-8,74 0,632501044512566 -0,774559506229517
-8,75 0,624723953754192 -0,780845683605749
-8,76 0,616884391121045 -0,787053777064324
-8,77 0,608983140562854 -0,793183165801068
-8,78 0,60102099219809 -0,799233236882215
-8,79 0,592998742234955 -0,805203385305701
-8,8 0,584917192891762 -0,811093014061656
-8,81 0,576777152316708 -0,816901534192113
-8,82 0,56857943450707 -0,8226283648499
-8,83 0,560324859227795 -0,828272933356724
-8,84 0,552014251929533 -0,833834675260437
-8,85 0,543648443666088 -0,839313034391484
-8,86 0,535228271011316 -0,844707462918517
-8,87 0,526754575975463 -0,850017421403179
-8,88 0,518228205920975 -0,855242378854046
-8,89 0,50965001347775 -0,860381812779727
-8,9 0,501020856457885 -0,865435209241112
-8,91 0,492341597769889 -0,870402062902767
-8,92 0,4836131053324 -0,875281877083465
-8,93 0,474836251987387 -0,880074163805853
-8,94 0,466011915412871 -0,884778443845253
-8,95 0,457140978035154 -0,889394246777582
-8,96 0,448224326940585 -0,893921111026392
-8,97 0,439262853786841 -0,898358583909032
-8,98 0,430257454713769 -0,90270622168191
-8,99 0,421209030253772 -0,906963589584873
-9 0,412118485241757 -0,911130261884677
-9,01 0,402986728724648 -0,915205821917566
-9,02 0,393814673870488 -0,919189862130932
-9,03 0,384603237877118 -0,923081984124074
-9,04 0,375353341880461 -0,926881798688036
-9,05 0,366065910862411 -0,930588925844529
-9,06 0,356741873558329 -0,934202994883924
-9,07 0,347382162364174 -0,937723644402332
-9,08 0,337987713243268 -0,941150522337732
-9,09 0,328559465632692 -0,944483286005189
-9,1 0,319098362349352 -0,947721602131112
-9,11 0,309605349495691 -0,950865146886587
-9,12 0,300081376365083 -0,953913605919759
-9,13 0,290527395346907 -0,956866674387264
-9,14 0,280944361831302 -0,959724056984716
-9,15 0,271333234113633 -0,962485467976237
-9,16 0,261694973298663 -0,965150631223029
-9,17 0,252030543204441 -0,967719280210989
-9,18 0,242340910265924 -0,970191158077357
-9,19 0,23262704343833 -0,972566017636408
-9,2 0,222889914100246 -0,974843621404164
-9,21 0,213130495956494 -0,977023741622146
-9,22 0,203349764940756 -0,97910616028015
-9,23 0,19354869911798 -0,981090669138045
-9,24 0,183728278586583 -0,982977069746599
-9,25 0,173889485380434 -0,984765173467324
-9,26 0,164033303370654 -0,986454801491336
-9,27 0,15416071816723 -0,988045784857242
-9,28 0,144272717020457 -0,989537964468031
-9,29 0,134370288722207 -0,990931191106986
-9,3 0,124454423507062 -0,992225325452603
-9,31 0,114526112953277 -0,993420238092527
-9,32 0,104586349883635 -0,994515809536489
-9,33 0,0946361282661601 -0,995511930228257
-9,34 0,0846764431147214 -0,996408500556594
-9,35 0,0747082903895348 -0,997205430865212
-9,36 0,0647326668975659 -0,997902641461745
-9,37 0,0547505701928492 -0,998500062625716
-9,38 0,0447629984767403 -0,998997634615504
-9,39 0,0347709504980861 -0,999395307674326
-9,4 0,0247754254533578 -0,999693042035207
-9,41 0,0147774228867302 -0,999890807924959
-9,42 0,00477794259012851 -0,999988585567158
-9,43 -0,00522201549675062 -0,999986365184122
-9,44 -0,0152214513864317 -0,999884146997886
-9,45 -0,0252193651436605 -0,999681941230185
-9,46 -0,0352147569853892 -0,999379768101426
-9,47 -0,0452066273807649 -0,998977657828671
-9,48 -0,0551939771510745 -0,998475650622611
-9,49 -0,0651758075696639 -0,99787379668355
-9,5 -0,0751511204618093 -0,997172156196378
-9,51 -0,0851189183045343 -0,996370799324562
-9,52 -0,0950782043263609 -0,995469806203119
-9,53 -0,105027982606987 -0,994469266930611
-9,54 -0,114967258176876 -0,993369281560131
-9,55 -0,124895037116752 -0,992169960089301
-9,56 -0,134810326656996 -0,990871422449267
-9,57 -0,144712135276915 -0,989473798492712
-9,58 -0,154599472803899 -0,987977227980866
-9,59 -0,164471350512435 -0,986381860569534
-9,6 -0,17432678122298 -0,984687855794127
-9,61 -0,184164779400673 -0,982895383053711
-9,62 -0,193984361253899 -0,981004621594066
-9,63 -0,203784544832651 -0,979015760489763
-9,64 -0,213564350126739 -0,976928998625255
-9,65 -0,223322799163784 -0,974744544674989
-9,66 -0,233058916107014 -0,97246261708254
-9,67 -0,242771727352849 -0,970083444038766
-9,68 -0,252460261628258 -0,967607263458988
-9,69 -0,262123550087887 -0,965034322959201
-9,7 -0,271760626410944 -0,96236487983131
-9,71 -0,281370526897825 -0,959599201017404
-9,72 -0,290952290566491 -0,95673756308306
-9,73 -0,300504959248559 -0,953780252189686
-9,74 -0,310027577685123 -0,950727564065908
-9,75 -0,319519193622274 -0,947579803977993
-9,76 -0,328978857906327 -0,944337286699328
-9,77 -0,338405624578738 -0,941000336478938
-9,78 -0,347798550970695 -0,937569287009064
-9,79 -0,357156697797388 -0,934044481391794
-9,8 -0,366479129251928 -0,930426272104753
-9,81 -0,375764913098942 -0,926715020965855
-9,82 -0,385013120767783 -0,922911099097119
-9,83 -0,394222827445389 -0,919014886887564
-9,84 -0,40339311216877 -0,915026773955164
-9,85 -0,412523057917093 -0,910947159107888
-9,86 -0,421611751703392 -0,906776450303821
-9,87 -0,430658284665865 -0,902515064610367
-9,88 -0,43966175215875 -0,898163428162546
-9,89 -0,448621253842803 -0,893721976120377
-9,9 -0,457535893775321 -0,889191152625361
-9,91 -0,466404780499741 -0,884571410756073
-9,92 -0,47522702713478 -0,879863212482849
-9,93 -0,484001751463126 -0,875067028621594
-9,94 -0,49272807601966 -0,870183338786697
-9,95 -0,501405128179199 -0,865212631343071
-9,96 -0,510032040243754 -0,86015540335732
-9,97 -0,518607949529311 -0,855012160548026
-9,98 -0,527131998452086 -0,849783417235186
-9,99 -0,535603334614291 -0,844469696288772
diff --git a/chart2/workbench/sampledata/numbers.chd b/chart2/workbench/sampledata/numbers.chd
index 7e5537904237..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/numbers.chd
+++ b/chart2/workbench/sampledata/numbers.chd
@@ -1,22 +0,0 @@
-# -*- coding: utf-8; -*-
-# Series Labels
-
-Series1 Series2 Series3
-
-# Categories
-
-a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö ü
-
-# Data
-
-# Series 1
-
-5 8 -1 6 4 2 7 5 9 8 -3 1 5 10 2 4 5 9 1 11 5 7 6 9 5 9 12 5 -1
-
-# Series 2
-
-5 4 2 0 1 6 5 9 8 8 9 -4 5 1 2 3 10 2 5 6 7 8 4 5 1 5 4 11 5
-
-# Series 3
-
-5 8 4 5 8 5 5 4 5 1 2 -1 4 5 7 5 8 9 6 -4 5 1 2 3 5 6 1 1 3
diff --git a/chart2/workbench/sampledata/pie.chd b/chart2/workbench/sampledata/pie.chd
index 16b9d9e64fd1..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/pie.chd
+++ b/chart2/workbench/sampledata/pie.chd
@@ -1,17 +0,0 @@
-# -*- coding: utf-8; -*-
-# Series Labels
-Bach Beethoven Mozart Dvořák Brahms Penderecki
-
-# categories
-Pie_Chart
-
-# x-values (ignored)
-#0 1 2 3 4 5
-0
-
-# series
-3
-1
-4
-1
-5
diff --git a/chart2/workbench/sampledata/regtest.chd b/chart2/workbench/sampledata/regtest.chd
index febcdf9c3676..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/regtest.chd
+++ b/chart2/workbench/sampledata/regtest.chd
@@ -1,26 +0,0 @@
-# -*- coding: utf-8; -*-
-# Series Labels
-x constant linear logarithm exponential power
-
-# categories
-0 1 2 3 4 5 6  7  8  9 10 11
-
-# x-values
-3 4 5 6 7 8 9 10 11 12 13 14
-
-# series
-
-# f(x) == 3.41
-3.41 3.41 3.41 3.41 3.41 3.41 3.41 3.41 3.41 3.41 3.41 3.41
-
-# f(x) = 0.5*x + 1.7
-3.2 3.7 4.2 4.7 5.2 5.7 6.2 6.7 7.2 7.7 8.2 8.7
-
-# f(x) = log(x) - 1.2
--0.10138771133189017 0.18629436111989062 0.4094379124341003 0.591759469228055 0.7459101490553133 0.8794415416798358 0.9972245773362196 1.102585092994046 1.1978952727983707 1.2849066497880004 1.3649493574615368 1.4390573296152585
-
-# f(x) = 1.3 * 1.1^x
-1.7303000000000006 1.9033300000000006 2.0936630000000007 2.3030293000000013 2.533332230000002 2.786665453000002 3.0653319983000027 3.371865198130003 3.7090517179430034 4.079956889737304 4.4879525787110355 4.936747836582139
-
-# f(x) = 0.6 * x^1.4
-2.793322033047647 4.178642703821395 5.710961816147635 7.371621039885188 9.147206982827674 11.027504207971534 13.004413300515735 15.071318589057476 17.22269099284056 19.453824554696826 21.760653999934863 24.139623950636345
diff --git a/chart2/workbench/sampledata/stock.chd b/chart2/workbench/sampledata/stock.chd
index c17f2f01b98b..e69de29bb2d1 100644
--- a/chart2/workbench/sampledata/stock.chd
+++ b/chart2/workbench/sampledata/stock.chd
@@ -1,20 +0,0 @@
-# -*- coding: utf-8; -*-
-
-# Series Labels
-Volume_SUNW Open_SUNW High_SUNW Low_SUNW Close_SUNW Volume_MSFT Open_MSFT High_MSFT Low_MSFT Close_MSFT Close_Average
-
-# categories
-12-Feb-04 11-Feb-04 10-Feb-04 9-Feb-04 6-Feb-04 5-Feb-04 4-Feb-04 3-Feb-04 2-Feb-04 30-Jan-04 29-Jan-04 28-Jan-04 27-Jan-04 26-Jan-04 23-Jan-04 22-Jan-04 21-Jan-04 20-Jan-04
-
-# series
-62906700 70058896 41212200 47222300 35676900 43524800 47122100 33783800 51108900 34089600 70289800 51586100 39508900 40327800 42174400 68806704 62386200 63614900
-5.76 5.61 5.59 5.43 5.30 5.19 5.32 5.47 5.31 5.24 5.47 5.60 5.58 5.42 5.44 5.73 5.59 5.40
-5.93 5.78 5.67 5.60 5.45 5.36 5.37 5.53 5.59 5.35 5.52 5.68 5.66 5.70 5.56 5.75 5.74 5.60
-5.72 5.54 5.50 5.40 5.27 5.15 5.12 5.41 5.26 5.17 5.06 5.37 5.51 5.41 5.41 5.42 5.46 5.39
-5.77 5.74 5.54 5.52 5.41 5.31 5.12 5.48 5.49 5.29 5.23 5.47 5.55 5.61 5.45 5.52 5.66 5.59
-44537000 51515300 37790600 48108500 47209600 55527500 60648000 47993800 62891800 40528700 63748400 71336000 63196200 58299600 127259104 78425200 53570600 63068500
-27.0 26.9 26.8 27.1 27.0 27.0 27.2 27.4 27.6 27.8 27.8 28.3 28.6 28.4 28.2 28.3 28.1 27.9
-27.1 27.2 27.1 27.2 27.1 27.1 27.4 27.5 27.8 27.9 27.9 28.4 28.7 28.8 28.7 28.4 28.3 28.2
-26.9 26.8 26.8 26.8 26.9 26.8 27.0 27.1 27.2 27.5 27.5 27.4 28.2 28.3 28.2 27.9 27.8 27.9
-26.9 27.1 27.0 26.9 27.0 26.9 27.0 27.2 27.4 27.6 27.9 27.7 28.2 28.8 28.4 28.0 28.3 28.1
-16.34 16.42 16.27 16.21 16.21 16.11 16.06 16.34 16.45 16.45 16.57 16.59 16.88 17.21 16.93 16.76 16.98 16.85
diff --git a/chart2/workbench/stub/newCHxx.cxx b/chart2/workbench/stub/newCHxx.cxx
index 62e8855db4b5..e69de29bb2d1 100644
--- a/chart2/workbench/stub/newCHxx.cxx
+++ b/chart2/workbench/stub/newCHxx.cxx
@@ -1,45 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: newCHxx.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include ".hxx"
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
-
-//.............................................................................
-} //namespace chart
-//.............................................................................
diff --git a/chart2/workbench/stub/newCHxx.hxx b/chart2/workbench/stub/newCHxx.hxx
index f05d0ede5050..e69de29bb2d1 100644
--- a/chart2/workbench/stub/newCHxx.hxx
+++ b/chart2/workbench/stub/newCHxx.hxx
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: newCHxx.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CHART2__HXX
-#define
-CHART2__HXX
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-
-//-----------------------------------------------------------------------------
-/**
-*/
-
-class
-{
-};
-
-//.............................................................................
-} //namespace chart
-//.............................................................................
-#endif
diff --git a/chart2/workbench/stub/newUNOcomponent.cxx b/chart2/workbench/stub/newUNOcomponent.cxx
index d3a381e01e34..e69de29bb2d1 100644
--- a/chart2/workbench/stub/newUNOcomponent.cxx
+++ b/chart2/workbench/stub/newUNOcomponent.cxx
@@ -1,78 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: newUNOcomponent.cxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-//replace XXXX and YYYY and ...
-#ifndef _CHART2_XXXX_HXX
-#include "XXXX.hxx"
-#endif
-#ifndef _CHART2_SERVICENAMES_CHARTTYPES_HXX
-#include "servicenames_ ... .hxx"
-#endif
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-
-XXXX::XXXX(
-        uno::Reference<uno::XComponentContext> const & xContext)
-{
-    m_xMCF = xContext->getServiceManager();
-}
-
-XXXX::~XXXX()
-{
-}
-
-//-----------------------------------------------------------------
-// lang::XServiceInfo
-//-----------------------------------------------------------------
-
-APPHELPER_XSERVICEINFO_IMPL(XXXX,CHART2_VIEW_XXXX_SERVICE_IMPLEMENTATION_NAME)
-
-    uno::Sequence< rtl::OUString > XXXX
-::getSupportedServiceNames_Static()
-{
-    uno::Sequence< rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = CHART2_VIEW_XXXX_SERVICE_NAME;
-    return aSNS;
-}
-
-//-----------------------------------------------------------------
-// chart2::YYYY
-//-----------------------------------------------------------------
-
-
-//.............................................................................
-} //namespace chart
-//.............................................................................
diff --git a/chart2/workbench/stub/newUNOcomponent.hxx b/chart2/workbench/stub/newUNOcomponent.hxx
index 8b3cc8f3c405..e69de29bb2d1 100644
--- a/chart2/workbench/stub/newUNOcomponent.hxx
+++ b/chart2/workbench/stub/newUNOcomponent.hxx
@@ -1,58 +0,0 @@
-//replace XXXX and YYYY
-#ifndef _CHART2_XXXX_HXX
-#define _CHART2_XXXX_HXX
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-/*
-#include <com/sun/star/lang/XComponent.hpp>
-*/
-
-//----
-#include "ServiceMacros.hxx"
-
-//---- chart2
-#include <com/sun/star/chart2/YYYY.hpp>
-
-//----
-#include <cppuhelper/implbase2.hxx>
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-
-class XXXX : public ::cppu::WeakImplHelper2<
-    ::com::sun::star::chart2::YYYY
-        , ::com::sun::star::lang::XServiceInfo
-        //::com::sun::star::lang::XComponent ???
-        //::com::sun::star::uno::XWeak          // implemented by WeakImplHelper(optional interface)
-        //::com::sun::star::uno::XInterface     // implemented by WeakImplHelper(optional interface)
-        //::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
-        >
-{
-private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory > m_xMCF;
-
-    //no default constructor
-    XXXX(){};
-public:
-    XXXX(::com::sun::star::uno::Reference<
-               ::com::sun::star::uno::XComponentContext > const & xContext);
-    virtual ~XXXX();
-
-    //-------------------------------------------------------------------------
-    // ::com::sun::star::lang::XServiceInfo
-    //-------------------------------------------------------------------------
-
-    APPHELPER_XSERVICEINFO_DECL()
-    APPHELPER_SERVICE_FACTORY_HELPER(XXXX)
-
-    //-------------------------------------------------------------------------
-    // chart2::YYYY
-    //-------------------------------------------------------------------------
-};
-//.............................................................................
-} //namespace chart
-//.............................................................................
-#endif
diff --git a/chart2/workbench/stub/xserviceinfo.cxx b/chart2/workbench/stub/xserviceinfo.cxx
index 3f99fbcb8861..e69de29bb2d1 100644
--- a/chart2/workbench/stub/xserviceinfo.cxx
+++ b/chart2/workbench/stub/xserviceinfo.cxx
@@ -1,135 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: xserviceinfo.cxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-// Sample implementation of the service XServiceInfo
-// -------------------------------------------------
-//
-// CLASSNAME:  Replace this with your classes name
-//
-// m_aMutex:   This is the mutex member of your class
-//
-
-// --------------------
-
-#include <vector>
-#include <algorithm>
-
-// --------------------
-
-using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-using ::com::sun::star::uno::RuntimeException;
-
-// --------------------
-
-// this should be a private method of your class
-const ::std::vector< OUString > & CLASSNAME::GetServiceNames()
-{
-    static ::std::vector< OUString > aServices;
-
-    // /--
-    MutexGuard aGuard( m_aMutex );
-
-    if( aServices.size() == 0 )
-    {
-        aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sample.Service1" )));
-        aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sample.Service2" )));
-        aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sample.Service3" )));
-        // ...
-    }
-
-    return aServices;
-    // \--
-}
-
-// --------------------
-
-// Alternative using double-checked-locking pattern
-// (untested!)
-
-// #ifndef INCLUDED_OSL_DOUBLECHECKEDLOCKING_H
-// #include <osl/doublecheckedlocking.h>
-// #endif
-
-// this should be a private method of your class
-// const ::std::vector< OUString > & CLASSNAME::GetServiceNames()
-// {
-//     static ::std::vector< OUString > aServices;
-//     static bool bIsInitialized = false;
-
-//     if( ! bIsInitialized )
-//     {
-//         // /--
-//         MutexGuard aGuard( m_aMutex );
-
-//         if( ! bIsInitialized )
-//         {
-//             aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sample.Service1" )));
-//             aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sample.Service2" )));
-//             aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sample.Service3" )));
-//             // ...
-//             OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-//             bIsInitialized = true;
-//         }
-//         // \--
-//     }
-//     else
-//         OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-
-//     return aServices;
-// }
-
-// ------------------------------------
-// ::com::sun::star::lang::XServiceInfo
-// ------------------------------------
-
-OUString SAL_CALL CLASSNAME::getImplementationName()
-    throw (RuntimeException)
-{
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sample.CLASSNAME" ));
-}
-
-sal_Bool SAL_CALL CLASSNAME::supportsService( const ::rtl::OUString& ServiceName )
-    throw (RuntimeException)
-{
-    const ::std::vector< OUString > & rServices = GetServiceNames();
-    return ( rServices.end() != ::std::find( rServices.begin(), rServices.end(), ServiceName ) );
-}
-
-Sequence< OUString > SAL_CALL CLASSNAME::getSupportedServiceNames()
-    throw (RuntimeException)
-{
-    const ::std::vector< OUString > & rServices = GetServiceNames();
-    return Sequence< OUString >( &(* rServices.begin()), rServices.size() );
-}