summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngrid Halama <iha@openoffice.org>2010-04-06 18:41:51 +0200
committerIngrid Halama <iha@openoffice.org>2010-04-06 18:41:51 +0200
commit5c4de21a30e1ae06345a735c321bc66db1e004f6 (patch)
treedbeb61ad842c60f359a742bb91441b157baf4c37
parent058b9b0e5f358c95ffa12f9d18f747fac3cbc9eb (diff)
chartpositioning: #i100778# do only calculate inner rectangle if necessary
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx15
1 files changed, 11 insertions, 4 deletions
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 69e11198095a..ffc1e95ca796 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -234,10 +234,17 @@ awt::Rectangle Chart2ModelContact::GetDiagramRectangleIncludingAxes() const
awt::Rectangle Chart2ModelContact::GetDiagramRectangleExcludingAxes() const
{
- awt::Rectangle aRect;
- ExplicitValueProvider* pProvider( getExplicitValueProvider() );
- if( pProvider )
- aRect = pProvider->getDiagramRectangleExcludingAxes();
+ awt::Rectangle aRect(0,0,0,0);
+ uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) );
+
+ if( DiagramPositioningMode_EXCLUDING == DiagramHelper::getDiagramPositioningMode( xDiagram ) )
+ aRect = DiagramHelper::getDiagramRectangleFromModel(m_xChartModel);
+ else
+ {
+ ExplicitValueProvider* pProvider( getExplicitValueProvider() );
+ if( pProvider )
+ aRect = pProvider->getDiagramRectangleExcludingAxes();
+ }
return aRect;
}