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

[Kohei Yoshida]

 chart2/source/controller/dialogs/DataBrowserModel.cxx |   26 ++++++------------
 chart2/source/inc/DataSeriesHelper.hxx                |    5 +--
 chart2/source/tools/DataSeriesHelper.cxx              |    2 -
 chart2/source/tools/DataSourceHelper.cxx              |    2 -
 4 files changed, 13 insertions(+), 22 deletions(-)

New commits:
commit 9af5c13851482e95ff17f7cf4a46a5660f8588af
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Jun 24 22:02:24 2014 -0400

    Re-use DataSeriesHelper::getRole().
    
    Change-Id: Ia880bc03400d4cbf4c3033e01affafccc0a384fb

diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 87c916e..15e0cdd 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -33,6 +33,7 @@
 
 #include "ChartModel.hxx"
 #include <unonames.hxx>
+#include <DataSeriesHelper.hxx>
 
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
@@ -81,19 +82,10 @@ OUString lcl_getRole(
     return aResult;
 }
 
-OUString lcl_getRole(
-    const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
-{
-    OUString aResult;
-    if( xLSeq.is())
-        aResult = lcl_getRole( xLSeq->getValues());
-    return aResult;
-}
-
 OUString lcl_getUIRoleName(
     const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
 {
-    OUString aResult( lcl_getRole( xLSeq ));
+    OUString aResult = ::chart::DataSeriesHelper::getRole(xLSeq);
     if( !aResult.isEmpty())
         aResult = ::chart::DialogModel::ConvertRoleFromInternalToUI( aResult );
     return aResult;
@@ -123,7 +115,7 @@ bool lcl_SequenceOfSeriesIsShared(
         Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq( xSource->getDataSequences());
         for( sal_Int32 i=0; i<aLSeq.getLength(); ++i )
             if( aLSeq[i].is() &&
-                lcl_getRole( aLSeq[i] ).equals( aValuesRole ))
+                ::chart::DataSeriesHelper::getRole(aLSeq[i]).equals( aValuesRole ))
             {
                 // getValues().is(), because lcl_getRole checked that already
                 bResult = (aValuesRep == aLSeq[i]->getValues()->getSourceRangeRepresentation());
@@ -204,11 +196,11 @@ private:
 struct lcl_RolesOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
 {
     lcl_RolesOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) :
-            m_aRole( lcl_getRole( xLSeq ))
-    {}
+        m_aRole(::chart::DataSeriesHelper::getRole(xLSeq)) {}
+
     bool operator() ( const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
     {
-        return lcl_getRole( xLSeq ).equals( m_aRole );
+        return ::chart::DataSeriesHelper::getRole(xLSeq).equals(m_aRole);
     }
 private:
     OUString m_aRole;
@@ -269,8 +261,8 @@ struct DataBrowserModel::implColumnLess : public ::std::binary_function<
     {
         if( rLeft.m_xLabeledDataSequence.is() && rRight.m_xLabeledDataSequence.is())
         {
-            return DialogModel::GetRoleIndexForSorting( lcl_getRole( rLeft.m_xLabeledDataSequence )) <
-                DialogModel::GetRoleIndexForSorting( lcl_getRole( rRight.m_xLabeledDataSequence ));
+            return DialogModel::GetRoleIndexForSorting(DataSeriesHelper::getRole(rLeft.m_xLabeledDataSequence)) <
+                DialogModel::GetRoleIndexForSorting(DataSeriesHelper::getRole(rRight.m_xLabeledDataSequence));
         }
         return true;
     }
@@ -885,7 +877,7 @@ void DataBrowserModel::updateFromModel()
                         for( ; nSeqIdx<aLSeqs.getLength(); ++nSeqIdx )
                         {
                             sal_Int32 nSequenceNumberFormatKey = nYAxisNumberFormatKey;
-                            OUString aRole = lcl_getRole( aLSeqs[nSeqIdx] );
+                            OUString aRole = DataSeriesHelper::getRole(aLSeqs[nSeqIdx]);
 
                             if( aRole.equals( aRoleForDataLabelNumberFormat ) )
                             {
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index 2755d3b..9792b71 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -39,9 +39,8 @@ namespace chart
 namespace DataSeriesHelper
 {
 
-OUString GetRole(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence );
+OOO_DLLPUBLIC_CHARTTOOLS OUString
+    getRole( const css::uno::Reference<css::chart2::data::XLabeledDataSequence>& xLabeledDataSequence );
 
 /** Retrieves the data sequence in the given data source that matches the
     given role.  If more than one sequences match the role, the first match
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 11c6dd0..a3b6cd5 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -192,7 +192,7 @@ namespace chart
 namespace DataSeriesHelper
 {
 
-OUString GetRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xLabeledDataSequence )
+OUString getRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xLabeledDataSequence )
 {
     OUString aRet;
     if( xLabeledDataSequence.is() )
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 611d1e5..aad3aae 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -254,7 +254,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
     //add all other sequences now without x-values
     for( sal_Int32 nN=0; nN<aDataSeqences.getLength(); nN++ )
     {
-        OUString aRole( DataSeriesHelper::GetRole( aDataSeqences[nN] ) );
+        OUString aRole = DataSeriesHelper::getRole(aDataSeqences[nN]);
         if( !aRole.equals("values-x") )
             aResultVector.push_back( aDataSeqences[nN] );
     }