[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - chart2/source sc/source

[Markus Mohrhard]

 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |    1 +
 sc/source/ui/drawfunc/fuins2.cxx                               |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c2291931213ae990d599b6889d3dd01ce4feb53f
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 22 23:54:44 2014 +0200

    accept also one cell chart ranges for external data provider, fdo#79772
    
    Change-Id: I2078205b0aecdea13e342c4a625b82a70df0fb4f

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 6af4fc8..866d537 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -112,7 +112,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
         {
             PutInOrder( nCol1, nCol2 );
             PutInOrder( nRow1, nRow2 );
-            if ( nCol2>nCol1 || nRow2>nRow1 )
+            if (nCol2 >= nCol1 || nRow2 >= nRow1)
             {
                 ScDocument* pDoc = pViewData->GetDocument();
                 pDoc->LimitChartArea( nTab1, nCol1,nRow1, nCol2,nRow2 );
commit 081df814982da742c8372bef3ffc93e391aa2ce9
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Jun 23 00:32:12 2014 +0200

    XY chart needs to set the X value property, fdo#79144
    
    Change-Id: Ib17b564c187dfec8abb7a17b2602f814362dd34f

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index ee1d899..b0d96fd 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -867,6 +867,7 @@ void XYChartDialogController::adjustParameterToSubType( ChartTypeParameter& rPar
 {
     rParameter.eStackMode=GlobalStackMode_NONE;
     rParameter.b3DLook = false;
+    rParameter.bXAxisWithValues = true;
 
     switch( rParameter.nSubTypeIndex )
     {