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

[Markus Mohrhard]

 chart2/source/controller/main/ChartController.cxx       |    3 +--
 chart2/source/controller/sidebar/ChartElementsPanel.cxx |    7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 9d31c61103e91ecd4e24d9fb7838f49481ac2f0f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Sep 26 06:47:56 2015 +0200

    enable z axis objects when changing chart type, tdf#94290
    
    Change-Id: I4c1e3ff061692a9457557a4fecea55371f2aadb5

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index acfa73d..6f0d25f 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -401,7 +401,12 @@ void ChartElementsPanel::updateData()
     mpCB2ndXAxis->Check(isAxisVisible(mxModel, AxisType::X_SECOND));
     mpCB2ndYAxis->Check(isAxisVisible(mxModel, AxisType::Y_SECOND));
 
-    if (nDimension != 3)
+    if (nDimension == 3)
+    {
+        mpCBZAxis->Enable();
+        mpCBZAxisTitle->Enable();
+    }
+    else
     {
         mpCBZAxis->Disable();
         mpCBZAxisTitle->Disable();
commit dfbf87785607b809f8bd507fd7f6ff2301bf34a0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Sep 26 06:40:33 2015 +0200

    gcc3 is not supported anymore, so remove that
    
    Change-Id: Iddc481e13d40a6399a4a23a45c812b34a3a109f6

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 8683b94..4b31bb2 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1366,8 +1366,7 @@ void SAL_CALL ChartController::releaseContextMenuInterceptor(
 
 void ChartController::executeDispatch_ChartType()
 {
-    // using assignment for broken gcc 3.3
-    UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
+    UndoLiveUpdateGuard aUndoGuard(
         SCH_RESSTR( STR_ACTION_EDIT_CHARTTYPE ), m_xUndoManager );
 
     SolarMutexGuard aSolarGuard;