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

[Katarina Behrens]

 sc/source/ui/condformat/colorformat.cxx |    3 +++
 sc/source/ui/inc/colorformat.hxx        |    2 ++
 sc/uiconfig/scalc/ui/databaroptions.ui  |   21 +++++++++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 1627f39768be588368744f9addc7745092ca4e50
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Thu Apr 9 10:38:17 2015 +0200

    tdf#89199: UI option to show data bar only (no values)
    
    Change-Id: I13cbde947d6252c1157ec79a5f2190df24cca978

diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index 0376889..26c2040 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -87,6 +87,7 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBar
     get( mpEdMax, "max_value" );
     get( mpLenMin, "min_length" );
     get( mpLenMax, "max_length" );
+    get( mpCbOnlyBar, "only_bar");
 
     maStrWarnSameValue = get<FixedText>("str_same_value")->GetText();
 
@@ -116,6 +117,7 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBar
     mpLenMin->SetText(convertNumberToString(rData.mnMinLength, mpDoc));
     mpLenMax->SetText(convertNumberToString(rData.mnMaxLength, mpDoc));
     mpLbAxisCol->SelectEntry(rData.maAxisColor);
+    mpCbOnlyBar->Check(rData.mbOnlyBar);
 
     TypeSelectHdl(NULL);
     PosSelectHdl(NULL);
@@ -208,6 +210,7 @@ ScDataBarFormatData* ScDataBarSettingsDlg::GetData()
     pData->mpUpperLimit.reset(new ScColorScaleEntry());
     pData->mpLowerLimit.reset(new ScColorScaleEntry());
     pData->maAxisColor = mpLbAxisCol->GetSelectEntryColor();
+    pData->mbOnlyBar = mpCbOnlyBar->IsChecked();
 
     ::GetType(*mpLbTypeMin, *mpEdMin, pData->mpLowerLimit.get(), mpNumberFormatter, mpDoc, maPos);
     ::GetType(*mpLbTypeMax, *mpEdMax, pData->mpUpperLimit.get(), mpNumberFormatter, mpDoc, maPos);
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx
index 672ce74..a300375 100644
--- a/sc/source/ui/inc/colorformat.hxx
+++ b/sc/source/ui/inc/colorformat.hxx
@@ -40,6 +40,8 @@ private:
     Edit* mpLenMin;
     Edit* mpLenMax;
 
+    CheckBox *mpCbOnlyBar;
+
     OUString maStrWarnSameValue;
     SvNumberFormatter* mpNumberFormatter;
 
diff --git a/sc/uiconfig/scalc/ui/databaroptions.ui b/sc/uiconfig/scalc/ui/databaroptions.ui
index 84503e5..f474559 100644
--- a/sc/uiconfig/scalc/ui/databaroptions.ui
+++ b/sc/uiconfig/scalc/ui/databaroptions.ui
@@ -465,7 +465,7 @@
                           </packing>
                         </child>
                         <child>
-                            <object class="GtkEntry" id="max_length">
+                          <object class="GtkEntry" id="max_length">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="invisible_char">●</property>
@@ -495,6 +495,23 @@
                 <property name="fill">True</property>
                 <property name="position">3</property>
               </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="only_bar">
+                <property name="label" translatable="yes">Show Bar Only</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkLabel" id="str_same_value">
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Min value must be smaller than max value!</property>
@@ -503,7 +520,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">4</property>
+                <property name="position">5</property>
               </packing>
             </child>
           </object>