[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - 2 commits - chart2/inc chart2/source

[Markus Mohrhard]

 chart2/inc/ChartView.hxx              |    3 +++
 chart2/source/tools/AxisHelper.cxx    |    1 -
 chart2/source/view/main/ChartView.cxx |   14 ++++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit b0ecb84453326a6f830cd053a14216d9d37da0cf
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Oct 22 19:03:23 2013 +0200

    dbgutil build fix
    
    Change-Id: I54abcc2a9fbe7d30bdf64d194df1a435d21f24ac

diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index cb8c9ef..6bbf472 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -98,7 +98,6 @@ bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
 
 chart2::ScaleData AxisHelper::getDateCheckedScale( const Reference< chart2::XAxis >& xAxis, ChartModel& rModel )
 {
-    OSL_ENSURE(xChartModel.is(),"missing chart model");
     ScaleData aScale = xAxis->getScaleData();
     Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( rModel ) );
     if( aScale.AutoDateAxis && aScale.AxisType == AxisType::CATEGORY )
commit 1d1890a32e4cb04956396ff07bd7ea417be0b319
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Oct 22 19:02:46 2013 +0200

    we need to init manually now
    
    Change-Id: I1374814e549dcbb33de75ffa118d1eccfd168893

diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 916b02a..8997bd0 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 8017109..f501aa9 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