strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i109781# charts should be bigger by default

Browse source
This commit is contained in:
Ingrid Halama 2010-03-03 17:43:12 +01:00
parent 65b6070a18
commit 0e83843e55
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chart2/source/inc/ChartModelHelper.hxx
View file

@ -93,6 +93,8 @@ public:
, const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >& xGivenDataSeries );
static ::com::sun::star::awt::Size getDefaultPageSize();
static ::com::sun::star::awt::Size getPageSize(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModel );

3
chart2/source/model/main/ChartModel.cxx
View file

@ -98,8 +98,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
, m_aControllers( m_aModelMutex )
, m_nControllerLockCount(0)
, m_xContext( xContext )
// default visual area is 8 x 7 cm
, m_aVisualAreaSize( 8000, 7000 )
, m_aVisualAreaSize( ChartModelHelper::getDefaultPageSize() )
{
OSL_TRACE( "ChartModel: CTOR called" );

7
chart2/source/tools/ChartModelHelper.cxx
View file

@ -140,9 +140,14 @@ uno::Reference< XChartType > ChartModelHelper::getChartTypeOfSeries(
return DiagramHelper::getChartTypeOfSeries( ChartModelHelper::findDiagram( xModel ), xGivenDataSeries );
}
awt::Size ChartModelHelper::getDefaultPageSize()
{
return awt::Size( 16000, 9000 );
}
awt::Size ChartModelHelper::getPageSize( const uno::Reference< frame::XModel >& xModel )
{
awt::Size aPageSize( 8000, 7000 );
awt::Size aPageSize( ChartModelHelper::getDefaultPageSize() );
uno::Reference< embed::XVisualObject > xVisualObject(xModel,uno::UNO_QUERY);
DBG_ASSERT(xVisualObject.is(),"need xVisualObject for page size");
if( xVisualObject.is() )

5
chart2/source/view/axes/VAxisProperties.cxx
View file

@ -33,6 +33,7 @@
#include "CommonConverters.hxx"
#include "AxisHelper.hxx"
#include "DiagramHelper.hxx"
#include "ChartModelHelper.hxx"
#include <tools/color.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@ -378,8 +379,8 @@ void AxisProperties::init( bool bCartesian )
//-----------------------------------------------------------------------------
AxisLabelProperties::AxisLabelProperties()
: m_aFontReferenceSize( 8000, 7000 )
, m_aMaximumSpaceForLabels( 0 , 0, 8000, 7000 )
: m_aFontReferenceSize( ChartModelHelper::getDefaultPageSize() )
, m_aMaximumSpaceForLabels( 0 , 0, m_aFontReferenceSize.Width, m_aFontReferenceSize.Height )
, nNumberFormatKey(0)
, eStaggering( SIDE_BY_SIDE )
, bLineBreakAllowed( false )