diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-09-19 16:31:24 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-09-19 18:43:50 -0400 |
| commit | 21c92bb25cb67c589adb3799d07a9703c6ce83d3 (patch) | |
| tree | 74a3c4e46ab90622daca7601ddaf7fca97fbf10c /chart2 | |
| parent | 133b7b935ccf09afbe40649c5781c225ee3ac757 (diff) | |
Move the "PlotAreaIncludingAxes" shape object to CreateShapeParam2D.
Change-Id: I6c88611e837f651af92406952df273693d651121
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/main/ChartView.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index cebc415f2e3c..a40799f92530 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -142,6 +142,7 @@ struct CreateShapeParam2D boost::shared_ptr<VTitle> mpVTitleSecondY; css::uno::Reference<css::drawing::XShape> mxMarkHandles; + css::uno::Reference<css::drawing::XShape> mxPlotAreaWithAxes; bool mbAutoPosTitleX; bool mbAutoPosTitleY; @@ -3030,9 +3031,9 @@ void ChartView::createShapes2D( const awt::Size& rPageSize ) xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0)); AbstractShapeFactory::setShapeName(aParam.mxMarkHandles, "MarkHandles"); - uno::Reference< drawing::XShape > xDiagram_OuterRect( pShapeFactory->createInvisibleRectangle( - xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0) ) ); - AbstractShapeFactory::setShapeName( xDiagram_OuterRect, "PlotAreaIncludingAxes" ); + aParam.mxPlotAreaWithAxes = pShapeFactory->createInvisibleRectangle( + xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0, 0)); + AbstractShapeFactory::setShapeName(aParam.mxPlotAreaWithAxes, "PlotAreaIncludingAxes"); uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( pShapeFactory->createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) ); @@ -3093,10 +3094,10 @@ void ChartView::createShapes2D( const awt::Size& rPageSize ) awt::Rectangle aUsedOuterRect = impl_createDiagramAndContent( aSeriesPlotterContainer, xDiagramPlusAxes_Shapes, aParam, rPageSize); - if( xDiagram_OuterRect.is() ) + if (aParam.mxPlotAreaWithAxes.is()) { - xDiagram_OuterRect->setPosition( awt::Point( aUsedOuterRect.X, aUsedOuterRect.Y ) ); - xDiagram_OuterRect->setSize( awt::Size( aUsedOuterRect.Width, aUsedOuterRect.Height ) ); + aParam.mxPlotAreaWithAxes->setPosition(awt::Point(aUsedOuterRect.X, aUsedOuterRect.Y)); + aParam.mxPlotAreaWithAxes->setSize(awt::Size(aUsedOuterRect.Width, aUsedOuterRect.Height)); } //correct axis title position |