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

[Tomaž Vajngerl]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx |   17 ++++++++++++++--
 sc/source/core/opencl/opencl_device_selection.h         |    3 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 0a3432850458f3c4e880f087f774f376761b521b
Author: Tomaž Vajngerl <quikee at gmail.com>
Date:   Wed Dec 11 08:08:56 2013 +0100

    WaE: : ignoring return value -Werror=unused-result
    
    Change-Id: Ia75ccbe4ffd1e44585a590c7931b920168a6c703

diff --git a/sc/source/core/opencl/opencl_device_selection.h b/sc/source/core/opencl/opencl_device_selection.h
index b4c60b9..d6f775a 100644
--- a/sc/source/core/opencl/opencl_device_selection.h
+++ b/sc/source/core/opencl/opencl_device_selection.h
@@ -365,7 +365,8 @@ inline ds_status readProFile(const char* fileName, char** content, size_t* conte
     {
         return DS_FILE_ERROR;
     }
-    fread(binary, sizeof(char), size, input);
+    size_t bytesRead = fread(binary, sizeof(char), size, input);
+    (void) bytesRead; // avoid warning
     fclose(input);
 
     *contentSize = size;
commit 2300cdcb637face2bd63935ac923817565370466
Author: Tomaž Vajngerl <quikee at gmail.com>
Date:   Tue Dec 10 21:55:15 2013 +0100

    Show name of the trendline in tooltip (at hovering).
    
    Change-Id: Iaaef26fdb5f1f46b6e0ffece484cf884cc29c84c

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 39a776f..1ceba06 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -615,8 +615,21 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
         }
         else
         {
-            // non-verbose
-            aRet = ObjectNameProvider::getName( eObjectType, false );
+            Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID(rObjectCID , xChartModel));
+            Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY );
+            aRet += getName(eObjectType, false);
+
+            if( xCurveCnt.is())
+            {
+                sal_Int32 nCurveIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
+                Reference< chart2::XRegressionCurve > xCurve( RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) );
+                if( xCurve.is())
+                {
+                    aRet += " (";
+                    aRet += RegressionCurveHelper::getRegressionCurveName(xCurve);
+                    aRet += " )";
+                }
+            }
         }
     }
     else if( OBJECTTYPE_DATA_AVERAGE_LINE == eObjectType )