Merge branch 'master' into feature/killsdf

Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx

21 files changed, 27 insertions, 274 deletions

diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index be78baa95a4c..96044b994e3e 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -180,7 +180,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
     chart2/source/controller/main/ChartDropTargetHelper \
     chart2/source/controller/main/ChartFrameloader \
     chart2/source/controller/main/ChartModelClone \
-    chart2/source/controller/main/ChartRenderer \
     chart2/source/controller/main/ChartTransferable \
     chart2/source/controller/main/ChartWindow \
     chart2/source/controller/main/CommandDispatchContainer \
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index e3c44018d4bb..034eb4763d04 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -45,7 +45,6 @@
 #include "AreaWrapper.hxx"
 #include "WrappedAddInProperty.hxx"
 #include "WrappedIgnoreProperty.hxx"
-#include "ChartRenderer.hxx"
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
@@ -1343,12 +1342,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
 
         bServiceFound = true;
     }
-    else if( aServiceSpecifier.equals( CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ) )
-    {
-        Reference< lang::XUnoTunnel > xChartRenderer( new ChartRenderer( m_spChart2ModelContact->getChartModel() ) );
-        xResult.set( xChartRenderer );
-        bServiceFound = true;
-    }
     else if( aServiceSpecifier == "com.sun.star.comp.chart2.DataSeriesWrapper" )
     {
         Reference< beans::XPropertySet > xDataSeries( new DataSeriesPointWrapper( m_spChart2ModelContact ) );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 080ad76c8f24..bb5ef2ae63a2 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -77,7 +77,7 @@ void lcl_UpdateCurrentRange(
     SvTabListBox & rOutListBox,
     const OUString & rRole, const OUString & rRange )
 {
-    SvLBoxEntry * pEntry = rOutListBox.FirstSelected();
+    SvTreeListEntry * pEntry = rOutListBox.FirstSelected();
     if( pEntry )
         rOutListBox.SetEntryText( lcl_GetRoleLBEntry( rRole, rRange ), pEntry );
 }
@@ -106,7 +106,7 @@ bool lcl_UpdateCurrentSeriesName(
 OUString lcl_GetSelectedRole( const SvTabListBox & rRoleListBox, bool bUITranslated = false )
 {
     OUString aResult;
-    SvLBoxEntry * pEntry = rRoleListBox.FirstSelected();
+    SvTreeListEntry * pEntry = rRoleListBox.FirstSelected();
     if( pEntry )
         aResult = OUString( rRoleListBox.GetEntryText( pEntry,
                                                        bUITranslated ? 1 : 0 ));
@@ -116,7 +116,7 @@ OUString lcl_GetSelectedRole( const SvTabListBox & rRoleListBox, bool bUITransla
 OUString lcl_GetSelectedRolesRange( const SvTabListBox & rRoleListBox )
 {
     OUString aResult;
-    SvLBoxEntry * pEntry = rRoleListBox.FirstSelected();
+    SvTreeListEntry * pEntry = rRoleListBox.FirstSelected();
     if( pEntry )
         aResult = OUString( rRoleListBox.GetEntryText( pEntry, 2 ));
     return aResult;
@@ -459,7 +459,7 @@ void DataSourceTabPage::fillSeriesListBox()
         xSelected.set( pEntry->m_xDataSeries );
 
     bool bHasSelectedEntry = (pEntry != 0);
-    SvLBoxEntry * pSelectedEntry = 0;
+    SvTreeListEntry * pSelectedEntry = 0;
     m_apLB_SERIES->Clear();
 
     ::std::vector< DialogModel::tSeriesWithChartTypeByName > aSeries(
@@ -511,7 +511,7 @@ void DataSourceTabPage::fillRoleListBox()
     SeriesEntry * pSeriesEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected());
     bool bHasSelectedEntry = (pSeriesEntry != 0);
 
-    SvLBoxEntry * pRoleEntry =  m_aLB_ROLE.FirstSelected();
+    SvTreeListEntry * pRoleEntry =  m_aLB_ROLE.FirstSelected();
     sal_uLong nRoleIndex = SAL_MAX_UINT32;
     if( pRoleEntry )
         nRoleIndex = m_aLB_ROLE.GetModel()->GetAbsPos( pRoleEntry );
@@ -549,14 +549,14 @@ void DataSourceTabPage::fillRoleListBox()
 
 void DataSourceTabPage::updateControlState()
 {
-    SvLBoxEntry * pSeriesEntry = m_apLB_SERIES->FirstSelected();
+    SvTreeListEntry * pSeriesEntry = m_apLB_SERIES->FirstSelected();
     bool bHasSelectedSeries = (pSeriesEntry != 0);
     bool bHasValidRole = false;
     bool bHasRangeChooser = m_rDialogModel.getRangeSelectionHelper()->hasRangeSelection();
 
     if( bHasSelectedSeries )
     {
-        SvLBoxEntry * pRoleEntry =  m_aLB_ROLE.FirstSelected();
+        SvTreeListEntry * pRoleEntry =  m_aLB_ROLE.FirstSelected();
         bHasValidRole = (pRoleEntry != 0);
     }
 
@@ -601,7 +601,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl)
 IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
 {
     m_rDialogModel.startControllerLockTimer();
-    SvLBoxEntry * pEntry = m_aLB_ROLE.FirstSelected();
+    SvTreeListEntry * pEntry = m_aLB_ROLE.FirstSelected();
     if( pEntry )
     {
         OUString aRange( m_aEDT_RANGE.GetText());
@@ -712,10 +712,10 @@ IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl)
 
     fillSeriesListBox();
     // note the box was cleared and refilled, so pEntry is invalid now
-    SvLBoxEntry * pSelEntry = m_apLB_SERIES->FirstSelected();
+    SvTreeListEntry * pSelEntry = m_apLB_SERIES->FirstSelected();
     if( pSelEntry )
     {
-        SvLBoxEntry * pNextEntry = m_apLB_SERIES->Next( pSelEntry );
+        SvTreeListEntry * pNextEntry = m_apLB_SERIES->Next( pSelEntry );
         if( pNextEntry )
             m_apLB_SERIES->Select( pNextEntry );
     }
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index fe1f1fd07e20..602831e464ce 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -39,7 +39,7 @@ SeriesListBox::SeriesListBox( Window* pParent, const ResId & rResId ) :
 SeriesListBox::~SeriesListBox()
 {}
 
-SvLBoxEntry* SeriesListBox::CreateEntry() const
+SvTreeListEntry* SeriesListBox::CreateEntry() const
 {
     return new SeriesEntry();
 }
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index c2f0b798aaf0..47142817410f 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -31,7 +31,7 @@
 namespace chart
 {
 
-class SeriesEntry : public ::SvLBoxEntry
+class SeriesEntry : public ::SvTreeListEntry
 {
 public:
     virtual ~SeriesEntry();
@@ -53,7 +53,7 @@ public:
     explicit SeriesListBox( Window* pParent, const ResId & rResId );
     ~SeriesListBox( );
 
-    virtual SvLBoxEntry* CreateEntry() const;
+    virtual SvTreeListEntry* CreateEntry() const;
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 63b1f3fc7e8a..d4827cee52a9 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -187,7 +187,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co
     if( pSymbolShapeProperties )
         pObj->SetMergedItemSet(*pSymbolShapeProperties);
 
-    GDIMetaFile aMeta(pView->GetAllMarkedMetaFile());
+    GDIMetaFile aMeta(pView->GetMarkedObjMetaFile());
 
     Graphic aGraph(aMeta);
     Size aSize = pObj->GetSnapRect().GetSize();
diff --git a/chart2/source/controller/inc/ChartRenderer.hxx b/chart2/source/controller/inc/ChartRenderer.hxx
deleted file mode 100644
index ab049db05026..000000000000
--- a/chart2/source/controller/inc/ChartRenderer.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef CHART_RENDERER_HXX
-#define CHART_RENDERER_HXX
-
-#include <svtools/chartprettypainter.hxx>
-#include "ServiceMacros.hxx"
-
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/weakref.hxx>
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-
-//#i82893#, #i75867#: charts must be painted resolution dependent!!
-class ChartRenderer : public ::cppu::WeakImplHelper2<
-          ::com::sun::star::lang::XServiceInfo
-        , ::com::sun::star::lang::XUnoTunnel
-        >, public ChartPrettyPainter
-{
-public:
-    ChartRenderer( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
-    virtual ~ChartRenderer();
-
-    // ___lang::XServiceInfo___
-    APPHELPER_XSERVICEINFO_DECL()
-
-    // ____ XUnoTunnel ___
-    virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier )
-            throw (::com::sun::star::uno::RuntimeException);
-
-    // ____ ChartPrettyPainter ___
-    virtual bool DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObjectRect) const;
-
-private:
-    ChartRenderer();
-    ChartRenderer( const ChartRenderer& );
-
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xChartModel;
-};
-
-//.............................................................................
-}  // namespace chart
-//.............................................................................
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartRenderer.cxx b/chart2/source/controller/main/ChartRenderer.cxx
deleted file mode 100644
index 93d66e9c3121..000000000000
--- a/chart2/source/controller/main/ChartRenderer.cxx
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "ChartRenderer.hxx"
-#include "servicenames.hxx"
-#include "chartview/ExplicitValueProvider.hxx"
-#include "chartview/DrawModelWrapper.hxx"
-#include "DrawViewWrapper.hxx"
-#include "macros.hxx"
-#include "ChartModelHelper.hxx"
-#include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/util/XUpdatable.hpp>
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-
-using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using rtl::OUString;
-
-ChartRenderer::ChartRenderer( const Reference< frame::XModel >& xChartModel )
-    : m_xChartModel( uno::WeakReference< frame::XModel >(xChartModel) )
-{
-}
-
-ChartRenderer::~ChartRenderer()
-{
-}
-
-// ____ ChartPrettyPainter ___
-bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObjectRect /*in given output dev map units*/ ) const
-{
-    if(!pOutDev)
-        return false;
-
-    Reference<frame::XModel> xModel(m_xChartModel);
-    uno::Reference< lang::XMultiServiceFactory > xFact( xModel, uno::UNO_QUERY );
-    if( !xFact.is() )
-        return false;
-
-    //#i84323# ensure that the size the container has of the chart and size that chart has itself are the same
-    //maybe remove this workaround somewhere in future again
-    {
-        if( MAP_100TH_MM == pOutDev->GetMapMode().GetMapUnit() )//no problem for writer in issue #i84323#; but writer uses twips instead of 100thmm which causes small differences in size always when converting to 100thmm and back
-        {
-            awt::Size aChartSize( ChartModelHelper::getPageSize(xModel) );
-            awt::Size aContainerChartSize( rLogicObjectRect.GetWidth(), rLogicObjectRect.GetHeight() );
-            if( aContainerChartSize.Width != aChartSize.Width
-                || aContainerChartSize.Height != aChartSize.Height )
-            {
-                OSL_FAIL("chart size does not equal size assumed by the container");
-                //correct the state here on the fly -> let the container size win
-                ChartModelHelper::setPageSize( aContainerChartSize, xModel );
-            }
-        }
-    }
-
-    // get the chart view
-    Reference< lang::XUnoTunnel > xChartView( xFact->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
-
-    try
-    {
-        //better performance for big data
-        uno::Reference< beans::XPropertySet > xProp( xChartView, uno::UNO_QUERY );
-        if( xProp.is() )
-        {
-            awt::Size aResolution(1000,1000);
-            {
-                SolarMutexGuard aGuard;
-                Rectangle aPixelRect( pOutDev->LogicToPixel( rLogicObjectRect ) );
-                aResolution.Width = aPixelRect.GetWidth();
-                aResolution.Height = aPixelRect.GetHeight();
-            }
-            xProp->setPropertyValue( C2U("Resolution"), uno::makeAny( aResolution ));
-        }
-        //
-
-        uno::Reference< util::XUpdatable > xUpdatable( xChartView, uno::UNO_QUERY );
-        if( xUpdatable.is() )
-            xUpdatable->update();
-
-        SolarMutexGuard aGuard;
-        ExplicitValueProvider* pProvider = ExplicitValueProvider::getExplicitValueProvider( xChartView );
-        if( !pProvider )
-            return false;
-        ::boost::shared_ptr< DrawModelWrapper > pDrawModelWrapper = pProvider->getDrawModelWrapper();
-        if( !pDrawModelWrapper.get() )
-            return false;
-        ::boost::shared_ptr< DrawViewWrapper > pDrawViewWrapper( new DrawViewWrapper(&pDrawModelWrapper->getSdrModel(),pOutDev,false) );
-        pDrawViewWrapper->attachParentReferenceDevice( xModel );
-
-        MapMode aOldMapMode( pOutDev->GetMapMode()  );
-        Point aOldOrigin( aOldMapMode.GetOrigin() );
-        MapMode aMapMode( aOldMapMode  );
-        Point aOldOriginMM( OutputDevice::LogicToLogic( aOldOrigin, aOldMapMode.GetMapUnit(), MAP_100TH_MM ) );
-        Point aObjectTopLeftMM( OutputDevice::LogicToLogic( rLogicObjectRect.TopLeft(), aOldMapMode.GetMapUnit(), MAP_100TH_MM ) );
-        aMapMode.SetOrigin( aOldOriginMM + aObjectTopLeftMM );
-        aMapMode.SetMapUnit( MAP_100TH_MM );
-        pOutDev->SetMapMode(aMapMode);
-
-        Rectangle aPaintRect( OutputDevice::LogicToLogic( rLogicObjectRect, aOldMapMode, aMapMode ) );
-        pDrawViewWrapper->CompleteRedraw(pOutDev, Region(aPaintRect) );
-
-        pOutDev->SetMapMode(aOldMapMode);
-    }
-    catch( const uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-    }
-    catch( ... )
-    {
-    }
-
-    return true;
-}
-
-//-----------------------------------------------------------------
-// ____ XUnoTunnel ___
-::sal_Int64 SAL_CALL ChartRenderer::getSomething( const Sequence< ::sal_Int8 >& aIdentifier )
-        throw( uno::RuntimeException)
-{
-    if( aIdentifier.getLength() == 16 && 0 == memcmp(
-            ChartPrettyPainter::getUnoTunnelId().getConstArray(),
-                aIdentifier.getConstArray(), 16 ) )
-    {
-        ChartPrettyPainter* pPaintableObject = this;
-        return reinterpret_cast<sal_Int64>(pPaintableObject);
-    }
-    return 0;
-}
-
-//-----------------------------------------------------------------
-// lang::XServiceInfo
-
-APPHELPER_XSERVICEINFO_IMPL(ChartRenderer,CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME)
-
-Sequence< OUString > ChartRenderer::getSupportedServiceNames_Static()
-{
-    Sequence< OUString > aSNS;
-    return aSNS;
-}
-
-//.............................................................................
-} //namespace chart
-//.............................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx
index f15b80839e48..c19ce8b76586 100644
--- a/chart2/source/inc/CloneHelper.hxx
+++ b/chart2/source/inc/CloneHelper.hxx
@@ -24,6 +24,7 @@
 #include <map>
 #include <functional>
 #include <algorithm>
+#include <iterator>
 
 namespace chart
 {
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index d96f96b2215d..9c7074f2b89b 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -52,8 +52,6 @@ namespace chart
 #define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.AccessibleTextComponent" ))
 #define CHART_ACCESSIBLE_TEXT_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleTextComponent" ))
 
-#define CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartRenderer" ))
-
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 5f72dde8dcf5..10a565a7338e 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -38,6 +38,7 @@
 #include <sot/storage.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
+#include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
@@ -590,10 +591,7 @@ sal_Int32 XMLFilter::impl_Export(
         if( ! xServiceFactory.is())
             return ERRCODE_SFX_GENERAL;
 
-        uno::Reference< io::XActiveDataSource > xSaxWriter( xServiceFactory->createInstance(
-                C2U("com.sun.star.xml.sax.Writer")), uno::UNO_QUERY );
-        if ( !xSaxWriter.is() )
-            return ERRCODE_SFX_GENERAL;
+        uno::Reference< xml::sax::XWriter > xSaxWriter = xml::sax::Writer::create(m_xContext);
 
         bool bOasis = true;
         isOasisFormat( rMediaDescriptor, bOasis );
@@ -716,7 +714,7 @@ sal_Int32 XMLFilter::impl_ExportStream(
     const OUString & rStreamName,
     const OUString & rServiceName,
     const Reference< embed::XStorage > & xStorage,
-    const uno::Reference< io::XActiveDataSource >& xActiveDataSource,
+    const uno::Reference< xml::sax::XWriter >& xActiveDataSource,
     const Reference< lang::XMultiServiceFactory >& xServiceFactory,
     const Sequence< uno::Any > & rFilterProperties )
 {
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 984e894cf337..98500446a2c2 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/xml/sax/XWriter.hpp>
 #include <osl/mutex.hxx>
 
 // for APPHELPER_... macros
@@ -138,7 +139,7 @@ private:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::embed::XStorage > & xStorage,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::io::XActiveDataSource >& xActiveDataSource,
+            ::com::sun::star::xml::sax::XWriter >& xActiveDataSource,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::lang::XMultiServiceFactory > & xFactory,
         const ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 27b4644ec644..cb937f2be7cc 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/chart2/AxisType.hpp>
 
 #include <algorithm>
+#include <iterator>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <rtl/math.hxx>
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index b9b0c8e983ff..db2031d52918 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -21,6 +21,7 @@
 #include "CloneHelper.hxx"
 
 #include <algorithm>
+#include <iterator>
 #include <functional>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 169ef0453420..a60706481a7f 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -25,6 +25,7 @@
 
 #include <rtl/math.hxx>
 #include <algorithm>
+#include <iterator>
 
 using ::com::sun::star::uno::Sequence;
 using ::rtl::OUString;
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index fbaee8fb83e7..c333832e7c63 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -25,6 +25,7 @@
 
 #include <vector>
 #include <algorithm>
+#include <iterator>
 #include <functional>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index b088d72c5dc2..fa0ec3dd1857 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -660,7 +660,6 @@ void AreaChart::createShapes()
 
             //for the area chart there should be at most one x slot (no side by side stacking available)
             //attention different: xSlots are always interpreted as independent areas one behind the other: @todo this doesn't work why not???
-            aXSlotIter = aZSlotIter->begin();
             for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
             {
                 std::vector<VDataSeries*>& rSeriesList = aXSlotIter->m_aSeriesVector;
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 37b23ca0b8b7..5058bc644896 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -553,7 +553,6 @@ void BarChart::createShapes()
 
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
                 const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
-                aSeriesIter = pSeriesList->begin();
     //=============================================================================
                 //iterate through all series in this x slot
                 for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
@@ -882,7 +881,6 @@ void BarChart::createShapes()
 
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
                 const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
-                aSeriesIter = pSeriesList->begin();
 //=============================================================================
                 //iterate through all series in this x slot
                 for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index ad84a1516df1..9177babffce6 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -238,13 +238,11 @@ void BubbleChart::createShapes()
         ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator             aZSlotIter = m_aZSlots.begin();
         const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator  aZSlotEnd = m_aZSlots.end();
 
-        aZSlotIter = m_aZSlots.begin();
         for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
         {
             ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
             const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
 
-            aXSlotIter = aZSlotIter->begin();
             for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 7fa8a47c934f..5a9787f7b5d5 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -187,7 +187,6 @@ void CandleStickChart::createShapes()
 
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
                 const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
-                aSeriesIter = pSeriesList->begin();
     //=============================================================================
                 //iterate through all series in this x slot
                 for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index d88e0e7dec9f..311a60b6b177 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -27,6 +27,9 @@
             <menu:menuitem menu:id=".uno:Save" menu:helpid="5505" menu:label="" />
             <menu:menuitem menu:id=".uno:SaveAs" menu:helpid="5502" menu:label="" />
             <menu:menuitem menu:id=".uno:SaveAll" menu:helpid="5309" menu:label="" />
+            <menu:menuitem menu:id=".uno:CheckOut"/>
+            <menu:menuitem menu:id=".uno:CancelCheckOut"/>
+            <menu:menuitem menu:id=".uno:CheckIn"/>
             <menu:menuitem menu:id=".uno:Reload" menu:helpid="5508" menu:label="" />
             <menu:menuitem menu:id=".uno:VersionDialog" menu:helpid="6583" menu:label="" />
             <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />