chartpositioning: #i100778# chart positioning excluding labels

8 files changed, 184 insertions, 49 deletions

diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 608adb49290b..9bce64ad7395 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -124,10 +124,12 @@ bool PiePositionHelper::getInnerAndOuterRadius( double fCategoryX
 //-----------------------------------------------------------------------------
 
 PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel
-                   , sal_Int32 nDimensionCount )
+                   , sal_Int32 nDimensionCount
+                   , bool bExcludingPositioning )
         : VSeriesPlotter( xChartTypeModel, nDimensionCount )
         , m_pPosHelper( new PiePositionHelper( NormalAxis_Z, (m_nDimension==3)?0.0:90.0 ) )
         , m_bUseRings(false)
+        , m_bSizeExcludesLabelsAndExplodedSegments(bExcludingPositioning)
 {
     PlotterBase::m_pPosHelper = m_pPosHelper;
     VSeriesPlotter::m_pMainPosHelper = m_pPosHelper;
@@ -182,6 +184,11 @@ bool PieChart::keepAspectRatio() const
     return true;
 }
 
+bool PieChart::shouldSnapRectToUsedArea()
+{
+    return true;
+}
+
 //-----------------------------------------------------------------
 // lang::XServiceInfo
 //-----------------------------------------------------------------
@@ -289,7 +296,7 @@ double PieChart::getMaxOffset() const
 }
 double PieChart::getMaximumX()
 {
-    double fMaxOffset = getMaxOffset();
+    double fMaxOffset = m_bSizeExcludesLabelsAndExplodedSegments ? 0.0 : getMaxOffset();
     if( m_aZSlots.size()>0 && m_bUseRings)
         return m_aZSlots[0].size()+0.5+fMaxOffset;
     return 1.5+fMaxOffset;
@@ -392,7 +399,8 @@ void PieChart::createShapes()
         for( nPointIndex = 0; nPointIndex < nPointCount; nPointIndex++ )
         {
             double fLogicInnerRadius, fLogicOuterRadius;
-            bool bIsVisible = m_pPosHelper->getInnerAndOuterRadius( fSlotX+1.0, fLogicInnerRadius, fLogicOuterRadius, m_bUseRings, getMaxOffset() );
+            double fOffset = m_bSizeExcludesLabelsAndExplodedSegments ? 0.0 : getMaxOffset();
+            bool bIsVisible = m_pPosHelper->getInnerAndOuterRadius( fSlotX+1.0, fLogicInnerRadius, fLogicOuterRadius, m_bUseRings, fOffset );
             if( !bIsVisible )
                 continue;
 
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index e65cfdcc5626..b358e6b21fdb 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -49,7 +49,7 @@ class PieChart : public VSeriesPlotter
 public:
     PieChart( const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartType >& xChartTypeModel
-            , sal_Int32 nDimensionCount );
+            , sal_Int32 nDimensionCount, bool bExcludingPositioning );
     virtual ~PieChart();
 
     //-------------------------------------------------------------------------
@@ -75,6 +75,7 @@ public:
     //-------------------
     virtual ::com::sun::star::drawing::Direction3D  getPreferredDiagramAspectRatio() const;
     virtual bool keepAspectRatio() const;
+    virtual bool shouldSnapRectToUsedArea();
 
     //MinimumAndMaximumSupplier
     virtual double getMinimumX();
@@ -116,6 +117,7 @@ struct PieLabelInfo;
 private: //member
     PiePositionHelper*    m_pPosHelper;
     bool                  m_bUseRings;
+    bool                  m_bSizeExcludesLabelsAndExplodedSegments;
 
     struct PieLabelInfo
     {
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index c8f473d226d0..63933c6254cc 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1731,6 +1731,13 @@ bool VSeriesPlotter::WantToPlotInFrontOfAxisLine()
     return ChartTypeHelper::isSeriesInFrontOfAxisLine( m_xChartTypeModel );
 }
 
+bool VSeriesPlotter::shouldSnapRectToUsedArea()
+{
+    if( m_nDimension == 3 )
+        return false;
+    return true;
+}
+
 Sequence< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntries(
               LegendExpansion eLegendExpansion
             , const Reference< beans::XPropertySet >& xTextProperties
@@ -2053,7 +2060,8 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForCh
 //static
 VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
     const uno::Reference<XChartType>& xChartTypeModel
-    , sal_Int32 nDimensionCount )
+    , sal_Int32 nDimensionCount
+    , bool bExcludingPositioning )
 {
     rtl::OUString aChartType = xChartTypeModel->getChartType();
 
@@ -2072,7 +2080,7 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
     else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
         pRet = new BubbleChart(xChartTypeModel,nDimensionCount);
     else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
-        pRet = new PieChart(xChartTypeModel,nDimensionCount);
+        pRet = new PieChart(xChartTypeModel,nDimensionCount, bExcludingPositioning );
     else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
         pRet = new AreaChart(xChartTypeModel,nDimensionCount,true,true,new PolarPlottingPositionHelper(),true,true,false,1,drawing::Direction3D(1,1,1) );
     else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) )
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 5e0db2644cc5..65d603aaf05f 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -52,6 +52,8 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 // header for class SvxShape
 #include <svx/unoshape.hxx>
+// header for GetSdrObjectFromXShape
+#include <svx/unoapi.hxx>
 // header for class E3dScene
 #include <svx/scene3d.hxx>
 #include <rtl/math.hxx>
@@ -182,6 +184,8 @@ void VDiagram::createShapes_2d()
     uno::Reference< drawing::XShapes > xOuterGroup_Shapes = m_pShapeFactory->createGroup2D(m_xLogicTarget);
     m_xOuterGroupShape = uno::Reference<drawing::XShape>( xOuterGroup_Shapes, uno::UNO_QUERY );
 
+    uno::Reference< drawing::XShapes > xGroupForWall( m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,C2U("PlotAreaExcludingAxes")) );
+
     //create independent group shape as container for datapoints and such things
     {
         uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,C2U("testonly;CooContainer=XXX_CID"));
@@ -198,8 +202,7 @@ void VDiagram::createShapes_2d()
             "com.sun.star.drawing.RectangleShape" ) ), uno::UNO_QUERY );
         //m_xWall2D->setPosition(m_aAvailablePosIncludingAxes);
         //m_xWall2D->setSize(m_aAvailableSizeIncludingAxes);
-        uno::Reference< drawing::XShapes > xShapes( m_xCoordinateRegionShape, uno::UNO_QUERY );
-        xShapes->add(m_xWall2D);
+        xGroupForWall->add(m_xWall2D);
         uno::Reference< beans::XPropertySet > xProp( m_xWall2D, uno::UNO_QUERY );
         if( xProp.is())
         {
@@ -521,6 +524,7 @@ void VDiagram::createShapes_3d()
     m_xOuterGroupShape = uno::Reference< drawing::XShape >(
             m_xShapeFactory->createInstance( C2U(
             "com.sun.star.drawing.Shape3DSceneObject" ) ), uno::UNO_QUERY );
+    ShapeFactory::setShapeName( m_xOuterGroupShape, C2U("PlotAreaExcludingAxes") );
     m_xLogicTarget->add(m_xOuterGroupShape);
 
     uno::Reference< drawing::XShapes > xOuterGroup_Shapes =
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index e94ef6c68687..3fddf7bb8d96 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -267,7 +267,8 @@ public:
 
     static VSeriesPlotter* createSeriesPlotter( const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::chart2::XChartType >& xChartTypeModel
-                                , sal_Int32 nDimensionCount );
+                                , sal_Int32 nDimensionCount
+                                , bool bExcludingPositioning = false /*for pie and donut charts labels and exploded segments are excluded from the given size*/);
 
     sal_Int32 getPointCount() const;
 
@@ -297,6 +298,7 @@ public:
     virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize );
 
     bool WantToPlotInFrontOfAxisLine();
+    virtual bool shouldSnapRectToUsedArea();
 
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index f3024a10e958..2810ad1e8d89 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -41,6 +41,7 @@
 #include <svx/sizeitem.hxx>
 // header for class SfxStringItem
 #include <svtools/stritem.hxx>
+#include <svtools/rectitem.hxx>
 //SfxIntegerListItem
 #include <svtools/ilstitem.hxx>
 #define _SVSTDARR_ULONGS
@@ -69,6 +70,13 @@ ChartItemPool::ChartItemPool():
     ppPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE    - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE);
 
     ppPoolDefaults[SCHATTR_LEGEND_POS               - SCHATTR_START] = new SvxChartLegendPosItem( CHLEGEND_RIGHT, SCHATTR_LEGEND_POS );
+    ppPoolDefaults[SCHATTR_DIAGRAM_POS_MODE         - SCHATTR_START] = new SfxInt32Item( SCHATTR_DIAGRAM_POS_MODE,0 );
+    ppPoolDefaults[SCHATTR_DIAGRAM_RECT_TO_USE      - SCHATTR_START] = new SfxRectangleItem( SCHATTR_DIAGRAM_RECT_TO_USE, Rectangle(0,0,100,100) );
+    ppPoolDefaults[SCHATTR_DIAGRAM_RECT_INCLUDING   - SCHATTR_START] = new SfxRectangleItem( SCHATTR_DIAGRAM_RECT_INCLUDING, Rectangle(0,0,100,100) );
+    ppPoolDefaults[SCHATTR_DIAGRAM_RECT_EXCLUDING   - SCHATTR_START] = new SfxRectangleItem( SCHATTR_DIAGRAM_RECT_EXCLUDING, Rectangle(0,0,100,100) );
+    ppPoolDefaults[SCHATTR_DIAGRAM_RECT_MAX         - SCHATTR_START] = new SfxRectangleItem( SCHATTR_DIAGRAM_RECT_MAX, Rectangle(0,0,100,100) );
+    ppPoolDefaults[SCHATTR_DIAGRAM_UI_SCALE         - SCHATTR_START] = new SvxDoubleItem(1.0, SCHATTR_DIAGRAM_UI_SCALE);
+
 //  ppPoolDefaults[SCHATTR_TEXT_ORIENT              - SCHATTR_START] = new SvxChartTextOrientItem;
     ppPoolDefaults[SCHATTR_TEXT_STACKED             - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_STACKED,FALSE);
     ppPoolDefaults[SCHATTR_TEXT_ORDER               - SCHATTR_START] = new SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE, SCHATTR_TEXT_ORDER);
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index dfd57f9bce92..fddb8edc95c4 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -170,6 +170,7 @@ ChartView::ChartView(
     , m_nScaleYNumerator(1)
     , m_nScaleYDenominator(1)
     , m_bSdrViewIsInEditMode(sal_False)
+    , m_aResultingDiagramRectangleExcludingAxes(0,0,0,0)
 {
 }
 
@@ -678,7 +679,8 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
             if(nT==0)
                 m_bShiftXAxisTicks = ChartTypeHelper::shiftTicksAtXAxisPerDefault( xChartType );
 
-            VSeriesPlotter* pPlotter = VSeriesPlotter::createSeriesPlotter( xChartType, nDimensionCount );
+            bool bExcludingPositioning = DiagramPositioningMode_EXCLUDING == DiagramHelper::getDiagramPositioningMode( xDiagram );
+            VSeriesPlotter* pPlotter = VSeriesPlotter::createSeriesPlotter( xChartType, nDimensionCount, bExcludingPositioning );
             if( !pPlotter )
                 continue;
             m_aSeriesPlotterList.push_back( pPlotter );
@@ -1161,7 +1163,7 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio()
 namespace
 {
 
-bool lcl_resizeAfterCompleteCreation( const uno::Reference< XDiagram >& xDiagram )
+bool lcl_IsPieOrDonut( const uno::Reference< XDiagram >& xDiagram )
 {
     //special treatment for pie charts
     //the size is checked after complete creation to get the datalabels into the given space
@@ -1319,16 +1321,23 @@ sal_Int16 lcl_getDefaultWritingModeFromPool( ::boost::shared_ptr< DrawModelWrapp
 } //end anonymous namespace
 
 //------------ create complete diagram shape (inclusive axis and series)
-void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlotterContainer
+
+awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlotterContainer
             , const uno::Reference< drawing::XShapes>& xDiagramPlusAxes_Shapes
             , const awt::Point& rAvailablePos
             , const awt::Size& rAvailableSize
-            , const awt::Size& rPageSize )
+            , const awt::Size& rPageSize
+            , bool bUseFixedInnerSize
+            , const uno::Reference< drawing::XShape>& xDiagram_MarkHandles /*needs to be resized to fit the result*/
+            )
 {
+    //return the used rectangle
+    awt::Rectangle aUsedOuterRect( rAvailablePos.X, rAvailablePos.Y, 0, 0 );
+
 //     sal_Int32 nDiagramIndex = 0;//todo if more than one diagam is supported
     uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) );
     if( !xDiagram.is())
-        return;
+        return aUsedOuterRect;
 
     sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram );
     if(!nDimensionCount)
@@ -1384,7 +1393,8 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
         aVDiagram.init(xDiagramPlusAxes_Shapes,xDiagramPlusAxes_Shapes,m_xShapeFactory);
         aVDiagram.createShapes(rAvailablePos,rAvailableSize);
         xSeriesTargetInFrontOfAxis = aVDiagram.getCoordinateRegion();
-        aVDiagram.reduceToMimimumSize();
+        if( !bUseFixedInnerSize )
+            aVDiagram.reduceToMimimumSize();
     }
 
     uno::Reference< drawing::XShapes > xTextTargetShapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxes_Shapes) );
@@ -1405,19 +1415,21 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
 
     //calculate resulting size respecting axis label layout and fontscaling
 
+    uno::Reference< drawing::XShape > xBoundingShape( xDiagramPlusAxes_Shapes, uno::UNO_QUERY );
+    ::basegfx::B2IRectangle aConsumedOuterRect;
+
     //use first coosys only so far; todo: calculate for more than one coosys if we have more in future
     //todo: this is just a workaround at the moment for pie and donut labels
-    if( !lcl_resizeAfterCompleteCreation(xDiagram) && rVCooSysList.size() > 0 )
+    bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
+    if( !bIsPieOrDonut && rVCooSysList.size() > 0 )
     {
-        uno::Reference< drawing::XShape > xBoundingShape( xDiagramPlusAxes_Shapes, uno::UNO_QUERY );
-
-        ::basegfx::B2IRectangle aFirstConsumedOuterRect( ShapeFactory::getRectangleOfShape(xBoundingShape) );
-
         VCoordinateSystem* pVCooSys = rVCooSysList[0];
         pVCooSys->createMaximumAxesLabels();
 
-        ::basegfx::B2IRectangle aConsumedOuterRect( ShapeFactory::getRectangleOfShape(xBoundingShape) );
-        ::basegfx::B2IRectangle aNewInnerRect( aVDiagram.adjustInnerSize( aConsumedOuterRect ) );
+        aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) );
+        ::basegfx::B2IRectangle aNewInnerRect( aVDiagram.getCurrentRectangle() );
+        if( !bUseFixedInnerSize )
+            aNewInnerRect = aVDiagram.adjustInnerSize( aConsumedOuterRect );
 
         pVCooSys->setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix(
             createTransformationSceneToScreen( aNewInnerRect ) ));
@@ -1440,13 +1452,13 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
                 bLessSpaceConsumedThanExpected = true;
         }
 
-        if( bLessSpaceConsumedThanExpected )
+        if( bLessSpaceConsumedThanExpected && !bUseFixedInnerSize )
         {
             aVDiagram.adjustInnerSize( aConsumedOuterRect );
             pVCooSys->setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix(
                 createTransformationSceneToScreen( aVDiagram.getCurrentRectangle() ) ));
-            pVCooSys->updatePositions();
         }
+        pVCooSys->updatePositions();//todo: logically this belongs to the condition above, but it seems also to be neccessary to give the axes group shapes the right bounding rects for hit test -  probably caused by bug i106183 -> check again if fixed
     }
 
     //create axes and grids for the final size
@@ -1476,7 +1488,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
         else
         {
             xSeriesTarget = xSeriesTargetBehindAxis;
-            DBG_ASSERT( !lcl_resizeAfterCompleteCreation(xDiagram), "not implemented yet! - during a complete recreation this shape is destroyed so no series can be created anymore" );
+            DBG_ASSERT( !bIsPieOrDonut, "not implemented yet! - during a complete recreation this shape is destroyed so no series can be created anymore" );
         }
         pSeriesPlotter->initPlotter( xSeriesTarget,xTextTargetShapes,m_xShapeFactory,aCID );
         pSeriesPlotter->setPageReferenceSize( rPageSize );
@@ -1495,15 +1507,15 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
         m_bPointsWereSkipped = m_bPointsWereSkipped || pSeriesPlotter->PointsWereSkipped();
     }
 
-    //recreate with corrected sizes if requested
-    if( lcl_resizeAfterCompleteCreation(xDiagram) )
+    //recreate all with corrected sizes if requested
+    if( bIsPieOrDonut )
     {
         m_bPointsWereSkipped = false;
 
-        uno::Reference< drawing::XShape > xBoundingShape( xDiagramPlusAxes_Shapes, uno::UNO_QUERY );
-        ::basegfx::B2IRectangle aConsumedOuterRect( ShapeFactory::getRectangleOfShape(xBoundingShape) );
-
-        ::basegfx::B2IRectangle aNewInnerRect( aVDiagram.adjustInnerSize( aConsumedOuterRect ) );
+        aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) );
+        ::basegfx::B2IRectangle aNewInnerRect( aVDiagram.getCurrentRectangle() );
+        if( !bUseFixedInnerSize )
+            aNewInnerRect = aVDiagram.adjustInnerSize( aConsumedOuterRect );
 
         for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
         {
@@ -1560,6 +1572,53 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
             pSeriesPlotter->rearrangeLabelToAvoidOverlapIfRequested( rPageSize );
         }
     }
+
+    if( bUseFixedInnerSize )
+    {
+        //if( !bIsPieOrDonut )
+        //    aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) );
+        aUsedOuterRect = awt::Rectangle( aConsumedOuterRect.getMinX(), aConsumedOuterRect.getMinY(), aConsumedOuterRect.getWidth(), aConsumedOuterRect.getHeight() );
+    }
+    else
+        aUsedOuterRect = awt::Rectangle( rAvailablePos.X, rAvailablePos.Y, rAvailableSize.Width, rAvailableSize.Height );
+
+    bool bSnapRectToUsedArea = false;
+    for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+    {
+        VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
+        bSnapRectToUsedArea = pSeriesPlotter->shouldSnapRectToUsedArea();
+        if(bSnapRectToUsedArea)
+            break;
+    }
+    if(bSnapRectToUsedArea)
+    {
+        if( bUseFixedInnerSize )
+            m_aResultingDiagramRectangleExcludingAxes = getRectangleOfObject( C2U("PlotAreaExcludingAxes") );
+        else
+        {
+            ::basegfx::B2IRectangle aConsumedInnerRect = aVDiagram.getCurrentRectangle();
+            m_aResultingDiagramRectangleExcludingAxes = awt::Rectangle( aConsumedInnerRect.getMinX(), aConsumedInnerRect.getMinY(), aConsumedInnerRect.getWidth(), aConsumedInnerRect.getHeight() );
+        }
+    }
+    else
+    {
+        m_aResultingDiagramRectangleExcludingAxes = awt::Rectangle( rAvailablePos.X, rAvailablePos.Y, rAvailableSize.Width, rAvailableSize.Height );
+    }
+
+    if( xDiagram_MarkHandles.is() )
+    {
+        awt::Point aPos(rAvailablePos);
+        awt::Size  aSize(rAvailableSize);
+        if( bUseFixedInnerSize )
+        {
+            aPos = awt::Point( m_aResultingDiagramRectangleExcludingAxes.X, m_aResultingDiagramRectangleExcludingAxes.Y );
+            aSize = awt::Size( m_aResultingDiagramRectangleExcludingAxes.Width, m_aResultingDiagramRectangleExcludingAxes.Height );
+        }
+        xDiagram_MarkHandles->setPosition( aPos );
+        xDiagram_MarkHandles->setSize( aSize );
+    }
+
+    return aUsedOuterRect;
 }
 
 //-------------------------------------------------------------
@@ -1617,6 +1676,12 @@ uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString
     return 0;
 }
 
+awt::Rectangle ChartView::getDiagramRectangleExcludingAxes()
+{
+    impl_updateView();
+    return m_aResultingDiagramRectangleExcludingAxes;
+}
+
 awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect )
 {
     impl_updateView();
@@ -1640,7 +1705,10 @@ awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID,
                     SdrObjList* pRootList = pRootSdrObject->GetSubList();
                     if( pRootList )
                     {
-                        SdrObject* pShape = DrawModelWrapper::getNamedSdrObject( C2U("MarkHandles"), pRootList );
+                        OUString aShapeName = C2U("MarkHandles");
+                        if( eObjectType == OBJECTTYPE_DIAGRAM )
+                            aShapeName = C2U("PlotAreaIncludingAxes");
+                        SdrObject* pShape = DrawModelWrapper::getNamedSdrObject( aShapeName, pRootList );
                         if( pShape )
                             xShape = uno::Reference< drawing::XShape >( pShape->getUnoShape(), uno::UNO_QUERY);
                     }
@@ -1927,12 +1995,12 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe
 }
 
 //static
-awt::Rectangle ExplicitValueProvider::calculateDiagramPositionAndSizeInclusiveTitle(
+awt::Rectangle ExplicitValueProvider::calculateDiagramPositionAndSizeIncludingTitle(
             const Reference< frame::XModel >& xChartModel
             , const Reference< uno::XInterface >& xChartView
-            , const awt::Rectangle& rExclusivePositionAndSize )
+            , const awt::Rectangle& rExcludingPositionAndSize )
 {
-    awt::Rectangle aRet(rExclusivePositionAndSize);
+    awt::Rectangle aRet(rExcludingPositionAndSize);
 
     //add axis title sizes to the diagram size
     uno::Reference< chart2::XTitle > xTitle_Height( TitleHelper::getTitle( TitleHelper::TITLE_AT_STANDARD_X_AXIS_POSITION, xChartModel ) );
@@ -2005,8 +2073,11 @@ bool getAvailablePosAndSizeForDiagram(
     , const awt::Size & rPageSize
     , const uno::Reference< XDiagram > & xDiagram
     , VTitle* pXTitle, VTitle* pYTitle
-    , VTitle* pSecondXTitle, VTitle* pSecondYTitle )
+    , VTitle* pSecondXTitle, VTitle* pSecondYTitle
+    , bool& bUseFixedInnerSize )
 {
+    bUseFixedInnerSize = false;
+
     //@todo: we need a size dependent on the axis labels
     awt::Rectangle aRemainingSpace(rSpaceLeft);
     {
@@ -2023,6 +2094,9 @@ bool getAvailablePosAndSizeForDiagram(
     uno::Reference< beans::XPropertySet > xProp(xDiagram, uno::UNO_QUERY);
 
     bool bMakeRoomForTitle = false;
+    bool bPosSizeExcludeAxes = false;
+    if( xProp.is() )
+        xProp->getPropertyValue( C2U( "PosSizeExcludeAxes" ) ) >>= bPosSizeExcludeAxes;
 
     //size:
     ::com::sun::star::chart2::RelativeSize aRelativeSize;
@@ -2030,7 +2104,8 @@ bool getAvailablePosAndSizeForDiagram(
     {
         rOutAvailableDiagramSize.Height = static_cast<sal_Int32>(aRelativeSize.Secondary*rPageSize.Height);
         rOutAvailableDiagramSize.Width = static_cast<sal_Int32>(aRelativeSize.Primary*rPageSize.Width);
-        bMakeRoomForTitle = true;
+        bMakeRoomForTitle = !bPosSizeExcludeAxes;
+        bUseFixedInnerSize = bPosSizeExcludeAxes;
     }
     else
         rOutAvailableDiagramSize = awt::Size(aRemainingSpace.Width,aRemainingSpace.Height);
@@ -2048,7 +2123,8 @@ bool getAvailablePosAndSizeForDiagram(
         rOutPos = RelativePositionHelper::getUpperLeftCornerOfAnchoredObject(
                     awt::Point(static_cast<sal_Int32>(fX),static_cast<sal_Int32>(fY))
                     , rOutAvailableDiagramSize, aRelativePosition.Anchor );
-        bMakeRoomForTitle = true;
+        bMakeRoomForTitle = !bPosSizeExcludeAxes;
+        bUseFixedInnerSize = bPosSizeExcludeAxes;
     }
     else
         rOutPos = awt::Point(aRemainingSpace.X,aRemainingSpace.Y);
@@ -2148,6 +2224,19 @@ void changePositionOfAxisTitle( VTitle* pVTitle, TitleAlignment eAlignment
         break;
     }
 
+    sal_Int32 nMaxY = rPageSize.Height - aTitleSize.Height/2;
+    sal_Int32 nMaxX = rPageSize.Width - aTitleSize.Width/2;
+    sal_Int32 nMinX = aTitleSize.Width/2;
+    sal_Int32 nMinY = aTitleSize.Height/2;
+    if( aNewPosition.Y > nMaxY )
+        aNewPosition.Y = nMaxY;
+    if( aNewPosition.X > nMaxX )
+        aNewPosition.X = nMaxX;
+    if( aNewPosition.Y < nMinY )
+        aNewPosition.Y = nMinY;
+    if( aNewPosition.X < nMinX )
+        aNewPosition.X = nMinX;
+
     pVTitle->changePosition( aNewPosition );
 }
 
@@ -2421,6 +2510,7 @@ void ChartView::createShapes()
     if( impl_AddInDrawsAllByItself() )
         return;
 
+    m_aResultingDiagramRectangleExcludingAxes = awt::Rectangle(0,0,0,0);
     impl_deleteCoordinateSystems();
     if( m_pDrawModelWrapper )
     {
@@ -2460,9 +2550,15 @@ void ChartView::createShapes()
         uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) );
         rtl::OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible
         uno::Reference< drawing::XShapes > xDiagramPlusAxesPlusMarkHandlesGroup_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xPageShapes,aDiagramCID) );
-        uno::Reference< drawing::XShape > xDiagramPlusAxes_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle(
+
+        uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle(
                     xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0) ) );
-        ShapeFactory::setShapeName( xDiagramPlusAxes_MarkHandles, C2U("MarkHandles") );
+        ShapeFactory::setShapeName( xDiagram_MarkHandles, C2U("MarkHandles") );
+
+        uno::Reference< drawing::XShape > xDiagram_OuterRect( ShapeFactory(m_xShapeFactory).createInvisibleRectangle(
+                    xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0) ) );
+        ShapeFactory::setShapeName( xDiagram_OuterRect, C2U("PlotAreaIncludingAxes") );
+
         uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) );
 
         //------------ create some titles
@@ -2547,21 +2643,22 @@ void ChartView::createShapes()
         //------------ create complete diagram shape (inclusive axis and series)
         awt::Point aAvailablePosDia;
         awt::Size  aAvailableSizeForDiagram;
+        bool bUseFixedInnerSize = false;
         if( getAvailablePosAndSizeForDiagram( aAvailablePosDia, aAvailableSizeForDiagram, aRemainingSpace, aPageSize, ChartModelHelper::findDiagram( m_xChartModel )
-                , apVTitle_X.get(), apVTitle_Y.get(), apVTitle_SecondX.get(), apVTitle_SecondY.get() ) )
+                , apVTitle_X.get(), apVTitle_Y.get(), apVTitle_SecondX.get(), apVTitle_SecondY.get(), bUseFixedInnerSize ) )
         {
-            impl_createDiagramAndContent( aSeriesPlotterContainer
+            awt::Rectangle aUsedOuterRect = impl_createDiagramAndContent( aSeriesPlotterContainer
                         , xDiagramPlusAxes_Shapes
-                        , aAvailablePosDia ,aAvailableSizeForDiagram, aPageSize );
+                        , aAvailablePosDia ,aAvailableSizeForDiagram, aPageSize, bUseFixedInnerSize, xDiagram_MarkHandles );
 
-            if(xDiagramPlusAxes_MarkHandles.is())
+            if( xDiagram_OuterRect.is() )
             {
-                xDiagramPlusAxes_MarkHandles->setPosition( aAvailablePosDia );
-                xDiagramPlusAxes_MarkHandles->setSize( aAvailableSizeForDiagram );
+                xDiagram_OuterRect->setPosition( awt::Point( aUsedOuterRect.X, aUsedOuterRect.Y ) );
+                xDiagram_OuterRect->setSize( awt::Size( aUsedOuterRect.Width, aUsedOuterRect.Height ) );
             }
 
             //correct axis title position
-            awt::Rectangle aDiagramPlusAxesRect(aAvailablePosDia.X,aAvailablePosDia.Y,aAvailableSizeForDiagram.Width,aAvailableSizeForDiagram.Height);
+            awt::Rectangle aDiagramPlusAxesRect( aUsedOuterRect );
             if(bAutoPosition_XTitle)
                 changePositionOfAxisTitle( apVTitle_X.get(), ALIGN_BOTTOM, aDiagramPlusAxesRect, aPageSize );
             if(bAutoPosition_YTitle)
diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx
index b536998fd5bd..78d1e20760db 100644
--- a/chart2/source/view/main/ChartView.hxx
+++ b/chart2/source/view/main/ChartView.hxx
@@ -112,6 +112,8 @@ public:
 
     virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false );
 
+    virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes();
+
     ::boost::shared_ptr< DrawModelWrapper > getDrawModelWrapper();
 
     // ___XTransferable___
@@ -189,11 +191,13 @@ private: //methods
 
     void impl_updateView();
 
-    void impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlotterContainer
+    ::com::sun::star::awt::Rectangle impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlotterContainer
         , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes>& xDiagramPlusAxes_Shapes
         , const ::com::sun::star::awt::Point& rAvailablePos
         , const ::com::sun::star::awt::Size& rAvailableSize
-        , const ::com::sun::star::awt::Size& rPageSize );
+        , const ::com::sun::star::awt::Size& rPageSize
+        , bool bUseFixedInnerSize
+        , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xDiagram_MarkHandles );
 
 
 private: //member
@@ -232,6 +236,8 @@ private: //member
     sal_Int32 m_nScaleYDenominator;
 
     sal_Bool m_bSdrViewIsInEditMode;
+
+    ::com::sun::star::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes;
 };
 
 //.............................................................................