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

[Caolán McNamara]

 chart2/source/controller/dialogs/tp_DataSource.cxx |   15 ++++++++++-----
 chart2/uiconfig/ui/datarangedialog.ui              |    4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 32372b8541b665f9c5127c3d0e21742abdf6d829
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 10 20:20:06 2014 +0000

    fix title of dialog
    
    Change-Id: Id252755104f5dd8f5590511a267935b1fc434561

diff --git a/chart2/uiconfig/ui/datarangedialog.ui b/chart2/uiconfig/ui/datarangedialog.ui
index e234b37..c4473ac 100644
--- a/chart2/uiconfig/ui/datarangedialog.ui
+++ b/chart2/uiconfig/ui/datarangedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Jan  7 09:24:43 2014 -->
+<!-- Generated with glade 3.16.0 on Fri Jan 10 20:18:05 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="DataRangeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Customize</property>
+    <property name="title" translatable="yes">Data Ranges</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
commit 7b2d1ee5051efd6381485ff66cff3cce91e290a4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 10 20:15:31 2014 +0000

    Resolves: fdo#72814 Fix Chart Data Ranges Dialog
    
    revert part of b193123b8e658d2eb25af5debe9de9e1b2386ef8
    
    That "hidden" column conatined data which is important to make the dialog work.
    If the hidden data is causing a11y problems then it needs to be reworked in a
    different way rather than removed in one place but still being looked for in
    another
    
    Change-Id: I2990ac940a52d97da193af2147f2b61281e11020

diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 891ab40..42f9eed 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -58,11 +58,16 @@ const OUString lcl_aLabelRole( "label" );
 OUString lcl_GetRoleLBEntry(
     const OUString & rRole, const OUString & rRange )
 {
-    OUStringBuffer aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI(rRole));
+    OUStringBuffer aEntry( rRole );
     aEntry.append( "\t" );
-    aEntry.append(rRange);
+    aEntry.append( OUString(
+        ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole )) );
+    aEntry.append( "\t" );
+    aEntry.append(OUString( rRange ));
 
-    return aEntry.makeStringAndClear();
+    OUString sFoo = aEntry.makeStringAndClear();
+    fprintf(stderr, "ConvertRoleFromInternalToUI :%s:\n", OUStringToOString(sFoo, RTL_TEXTENCODING_UTF8).getStr());
+    return sFoo;
 }
 
 void lcl_UpdateCurrentRange(
@@ -126,8 +131,8 @@ OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry )
 }
 
 static long lcl_pRoleListBoxTabs[] =
-    {   2,        // Number of Tabs
-        0, 75
+    {   3,        // Number of Tabs
+        0, 0, 75
     };
 
 void lcl_ShowChooserButton(