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

[Markus Mohrhard]

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

New commits:
commit bdd87b2acddb2e244569dcc8f228e270614dc59e
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date:   Mon Jun 23 00:32:12 2014 +0200

    XY chart needs to set the X value property
    
    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 )
     {
commit 4e4890c35f871a7fd2f81691f470a3e5843ae1b3
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date:   Sun Jun 22 23:57:00 2014 +0200

    remove comments
    
    Change-Id: I674e1443ce4e856206eeec7ea62083fcf0422f51

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index c23d2be..f92797c 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -46,7 +46,6 @@
 #include <svx/charthelper.hxx>
 #include <scmod.hxx>
 
-// BM/IHA --
 #include <cppuhelper/component_context.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -65,12 +64,8 @@
 #include <cppuhelper/bootstrap.hxx>
 
 using namespace ::com::sun::star;
-// BM/IHA --
 
-// erAck
 #include "chart2uno.hxx"
-// erAck
-
 #include "fuinsert.hxx"
 #include "tabvwsh.hxx"
 #include "sc.hrc"
commit ca843915505ed6fe6eee2639840cb1ad03a83992
Author: Markus Mohrhard <markus.mohrh...@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 52af12f..c23d2be 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits