[Libreoffice-commits] core.git: 5 commits - chart2/source

[Markus Mohrhard]

 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |    2 +-
 chart2/source/inc/chartview/ExplicitScaleValues.hxx           |    1 -
 chart2/source/view/axes/VAxisBase.cxx                         |    2 +-
 chart2/source/view/axes/VAxisBase.hxx                         |    2 +-
 chart2/source/view/axes/VCoordinateSystem.cxx                 |    4 ++--
 chart2/source/view/charttypes/VSeriesPlotter.cxx              |    4 ++--
 chart2/source/view/inc/PlotterBase.hxx                        |    4 ----
 7 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit e7f65a0a989385a887f8b4e91336202e3e96eec5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Mar 20 18:13:35 2015 +0100

    fix y-axis position on x-axis handling
    
    Change-Id: I870541c44babdcdbf3c4ca3da6da624d7850b0e2

diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 76f7d68..bdbff59 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -805,7 +805,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
 
                     sal_Int32 nDimensionIndex=0;
                     sal_Int32 nAxisIndex=0;
-                    if( AxisHelper::getIndicesForAxis( m_xAxis, xCooSys, nDimensionIndex, nAxisIndex ) && nAxisIndex==0 && nDimensionIndex==0 )
+                    if( AxisHelper::getIndicesForAxis( m_xAxis, xCooSys, nDimensionIndex, nAxisIndex ) && nAxisIndex==0 )
                     {
                         Reference< chart2::XAxis > xCrossingMainAxis( AxisHelper::getCrossingMainAxis( m_xAxis, xCooSys ) );
                         if( xCrossingMainAxis.is() )
commit 47bb6bb78975f0183391a9f40c73238a855cfb67
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Mar 20 10:53:14 2015 +0100

    someone did not understand c++
    
    Change-Id: I39de4c5a2abb1cc414dd5ff6610269c510da8e85

diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index b7515c4..8cf01a9 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -67,10 +67,6 @@ public:
 
     static bool isValidPosition( const ::com::sun::star::drawing::Position3D& rPos );
 
-private: //methods
-    //no default constructor
-    PlotterBase();
-
 protected: //methods
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
         createGroupShape( const ::com::sun::star::uno::Reference<
commit 0d315e93ef0c42048f727ba67152c5773e7214a1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Mar 20 10:39:14 2015 +0100

    fix typo
    
    Change-Id: I6f70a7abc6a468011ca72fd222741768b9c1bb8d

diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index f97655f..f34cb43 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -111,7 +111,7 @@ sal_Int32 VAxisBase::estimateMaximumAutoMainIncrementCount()
     return 10;
 }
 
-void VAxisBase::setExrtaLinePositionAtOtherAxis( double fCrossingAt )
+void VAxisBase::setExtraLinePositionAtOtherAxis( double fCrossingAt )
 {
     m_aAxisProperties.m_pfExrtaLinePositionAtOtherAxis.reset(fCrossingAt);
 }
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index ab0e4093..509709a 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -62,7 +62,7 @@ public:
     virtual sal_Int32 estimateMaximumAutoMainIncrementCount();
     virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos );
 
-    void setExrtaLinePositionAtOtherAxis( double fCrossingAt );
+    void setExtraLinePositionAtOtherAxis( double fCrossingAt );
 
 protected: //methods
     size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels );
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index d2adf54..5bd7329 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -514,13 +514,13 @@ void VCoordinateSystem::createAxesShapes()
                 if( aFullAxisIndex.first == 0 )
                 {
                     if( AxisType::CATEGORY!=m_aExplicitScales[1].AxisType )
-                        pVAxis->setExrtaLinePositionAtOtherAxis(
+                        pVAxis->setExtraLinePositionAtOtherAxis(
                             m_aExplicitScales[1].Origin );
                 }
                 else if( aFullAxisIndex.first == 1 )
                 {
                     if( AxisType::CATEGORY!=m_aExplicitScales[0].AxisType )
-                        pVAxis->setExrtaLinePositionAtOtherAxis(
+                        pVAxis->setExtraLinePositionAtOtherAxis(
                             m_aExplicitScales[0].Origin );
                 }
             }
commit ad287ab7c35851d78ac5a218c9cef0e289bee9c3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Mar 20 10:37:39 2015 +0100

    remove whitespace
    
    Change-Id: Ib818d255c01ba47592e50a12d3adf5868b897960

diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
index 966f8fd..11b8682 100644
--- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx
+++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
@@ -33,7 +33,6 @@ namespace chart
 /** This structure contains the explicit values for a scale like Minimum and Maximum.
     See also ::com::sun::star::chart2::ScaleData.
 */
-
 struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData
 {
     ExplicitScaleData();
commit 7b4ef419604d4aba79fa81a119dd9cfa7b0bb86e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Mar 19 20:08:27 2015 +0100

    no need for explicit this
    
    Change-Id: I1abefe731eec68ad6f0952cc99cdc69c42e308e3

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 5fdd37b..471c6c9 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1297,13 +1297,13 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis()
 double VSeriesPlotter::getMinimumX()
 {
     double fMinimum, fMaximum;
-    this->getMinimumAndMaximiumX( fMinimum, fMaximum );
+    getMinimumAndMaximiumX( fMinimum, fMaximum );
     return fMinimum;
 }
 double VSeriesPlotter::getMaximumX()
 {
     double fMinimum, fMaximum;
-    this->getMinimumAndMaximiumX( fMinimum, fMaximum );
+    getMinimumAndMaximiumX( fMinimum, fMaximum );
     return fMaximum;
 }