[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - chart2/source

[Andras Timar]

 chart2/source/controller/dialogs/tp_RangeChooser.cxx |   18 ++++++++++++++++++
 chart2/source/controller/dialogs/tp_RangeChooser.hxx |    3 +++
 2 files changed, 21 insertions(+)

New commits:
commit c9f19f9194025b1af17ca03752cfa2f5b9a49905
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Tue Jun 2 09:02:35 2015 +0200

    Time based charting -> experimental
    
    Change-Id: I1c190be0ef226d1f14d083f292cf2ea15a6d1645
    Reviewed-on: https://gerrit.libreoffice.org/16023
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    (cherry picked from commit 7e5c1101cb200f95128ad7dc7d2a5e6bb4489306)
    Reviewed-on: https://gerrit.libreoffice.org/16025
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx 
b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 8118925..2c9cd5d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <svtools/miscopt.hxx>
 
 namespace
 {
@@ -88,8 +89,11 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* 
pParent
     get(m_pCB_FirstRowAsLabel, "CB_FIRST_ROW_ASLABELS");
     get(m_pCB_FirstColumnAsLabel, "CB_FIRST_COLUMN_ASLABELS");
     get(m_pFTTitle, "STR_PAGE_DATA_RANGE");// OH:remove later with dialog title
+    get(m_pFL_TimeBased, "separator1");
     get(m_pCB_TimeBased, "CB_TIME_BASED");
+    get(m_pFT_TimeStart, "label1");
     get(m_pEd_TimeStart, "ED_TIME_BASED_START");
+    get(m_pFT_TimeEnd, "label2");
     get(m_pEd_TimeEnd, "ED_TIME_BASED_END");
 
     m_pFT_Caption->Show(!bHideDescription);
@@ -120,6 +124,17 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* 
pParent
     m_pCB_TimeBased->SetToggleHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
     m_pEd_TimeStart->SetModifyHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
     m_pEd_TimeEnd->SetModifyHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
+
+    SvtMiscOptions aOpts;
+    if ( !aOpts.IsExperimentalMode() )
+    {
+        m_pFL_TimeBased->Hide();
+        m_pCB_TimeBased->Hide();
+        m_pFT_TimeStart->Hide();
+        m_pEd_TimeStart->Hide();
+        m_pFT_TimeEnd->Hide();
+        m_pEd_TimeEnd->Hide();
+    }
 }
 
 RangeChooserTabPage::~RangeChooserTabPage()
@@ -138,8 +153,11 @@ void RangeChooserTabPage::dispose()
     m_pCB_FirstRowAsLabel.clear();
     m_pCB_FirstColumnAsLabel.clear();
     m_pFTTitle.clear();
+    m_pFL_TimeBased.clear();
     m_pCB_TimeBased.clear();
+    m_pFT_TimeStart.clear();
     m_pEd_TimeStart.clear();
+    m_pFT_TimeEnd.clear();
     m_pEd_TimeEnd.clear();
     m_pParentDialog.clear();
     OWizardPage::dispose();
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx 
b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 5bcda35..8d6ad51 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -89,8 +89,11 @@ protected: //member
     VclPtr<CheckBox>        m_pCB_FirstColumnAsLabel;
     VclPtr<FixedText>       m_pFTTitle;
 
+    VclPtr<FixedLine>       m_pFL_TimeBased;
     VclPtr<CheckBox>        m_pCB_TimeBased;
+    VclPtr<FixedText>       m_pFT_TimeStart;
     VclPtr<Edit>            m_pEd_TimeStart;
+    VclPtr<FixedText>       m_pFT_TimeEnd;
     VclPtr<Edit>            m_pEd_TimeEnd;
 
     sal_Int32       m_nChangingControlCalls;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits