[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - oox/source svx/source

[Markus Mohrhard]

 oox/source/export/chartexport.cxx |    6 +++---
 svx/source/engine3d/camera3d.cxx  |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 7855cd6704c864911d97b73f8c46d712975ec9b5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon May 27 02:08:56 2013 +0200

    respect element order in OOXML chart export, related fdo#63114
    
    Change-Id: I591a63c38ab18b03a2f86428defbdac0cb96a1c0
    (cherry picked from commit 54fbbc20b8397a8362f5a0878744c3a082464713)

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index c52a3b1..b654001 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1530,15 +1530,15 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                         }
                     }
 
+                    // export data points
+                    exportDataPoints( uno::Reference< beans::XPropertySet >( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength );
+
                     // export data labels
                     // Excel does not like our current data label export
                     // for scatter charts
                     if( eChartType != chart::TYPEID_SCATTER && eChartType != chart::TYPEID_BAR )
                         exportDataLabels( uno::Reference< beans::XPropertySet >( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength );
 
-                    // export data points
-                    exportDataPoints( uno::Reference< beans::XPropertySet >( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength );
-
                     //export error bars here
                     Reference< XPropertySet > xSeriesPropSet( xSource, uno::UNO_QUERY );
                     Reference< XPropertySet > xErrorBarYProps;
commit 6b715afe5fac84078677ce2227d2cc783f9ab243
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon May 27 13:00:40 2013 +0200

    reintroduce removed line, fdo#62402
    
    This line was removed with dd3e879cfdacbc8b9fff7556ae2d8698a22e9235 but
    is needed. Special thanks to Joren for bibisecting and bisecting.
    
    Change-Id: Id2b3de4098db75571006e6e62b77efe8c491b06f
    (cherry picked from commit 17f21e6bcc5283c5485cc42344610e8125547c0f)

diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 115e384..533b456 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -117,6 +117,8 @@ void Camera3D::SetBankAngle(double fAngle)
     }
 
     // Calculate from aDiff to uppwards pointing View-Up-Vector
+    // duplicated line is intentional!
+    aPrj = aPrj.getPerpendicular(aDiff);
     aPrj = aPrj.getPerpendicular(aDiff);
     aDiff.normalize();