diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-22 19:02:46 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-19 13:47:39 +0100 |
| commit | 73fcf2ad125c867618a97ea4f341279821091a01 (patch) | |
| tree | 4c3e92e00c76b567686220dccc37be14cf937dc5 /chart2 | |
| parent | 1ccab525dbb71ca26c0d280319ce4ff829be6ed6 (diff) | |
we need to init manually now
Change-Id: I1374814e549dcbb33de75ffa118d1eccfd168893
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/inc/ChartView.hxx | 3 | ||||
| -rw-r--r-- | chart2/source/view/main/ChartView.cxx | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index d56fe1433085..2731d2d2fcd3 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -76,6 +76,9 @@ class ChartView : public ::cppu::WeakImplHelper10< , public ExplicitValueProvider , private SfxListener { +private: + void init(); + public: ChartView(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 8017109b5901..f501aa956d75 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -165,15 +165,11 @@ ChartView::ChartView( , m_bSdrViewIsInEditMode(sal_False) , m_aResultingDiagramRectangleExcludingAxes(0,0,0,0) { + init(); } -void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw ( uno::Exception, uno::RuntimeException) +void ChartView::init() { - OSL_PRECOND(aArguments.getLength() >= 1,"need 1 argument to initialize the view: xModel"); - if( !(aArguments.getLength() >= 1) ) - return; - if( !m_pDrawModelWrapper.get() ) { SolarMutexGuard aSolarGuard; @@ -184,6 +180,12 @@ void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& aArguments } } +void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& ) + throw ( uno::Exception, uno::RuntimeException) +{ + init(); +} + ChartView::~ChartView() { // #i120831#. In ChartView::initialize(), m_xShapeFactory is created from SdrModel::getUnoModel() and indirectly |