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

[Caolán McNamara]

 scaddins/source/analysis/analysishelper.cxx |    6 +-----
 scaddins/source/analysis/analysishelper.hxx |    1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 40c618ccb62b49c8d1d29518e77b5299eb6c1bd6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 14 13:01:39 2017 +0000

    don't need to store this data
    
    Change-Id: I797c0fc9cc293b0538392362e2e582e9821da530

diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 355217c..b6e7aea 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1388,7 +1388,6 @@ public:
     const ResStringArray&   GetStringArray() const { return aStrArray; }
 };
 
-
 FuncData::FuncData( const FuncDataBase& r, ResMgr& rResMgr ) :
     aIntName( OUString::createFromAscii( r.pIntName ) ),
     nUINameID( r.nUINameID ),
@@ -1396,13 +1395,12 @@ FuncData::FuncData( const FuncDataBase& r, ResMgr& rResMgr ) :
     bDouble( r.bDouble ),
     bWithOpt( r.bWithOpt ),
     nParam( r.nNumOfParams ),
-    nCompID( r.nCompListID ),
     eCat( r.eCat )
 {
     if (r.pSuffix)
         aSuffix = OUString::createFromAscii( r.pSuffix);
 
-    AnalysisRscStrArrLoader aArrLoader( RID_ANALYSIS_DEFFUNCTION_NAMES, nCompID, rResMgr );
+    AnalysisRscStrArrLoader aArrLoader(RID_ANALYSIS_DEFFUNCTION_NAMES, r.nCompListID, rResMgr);
     const ResStringArray&   rArr = aArrLoader.GetStringArray();
 
     sal_uInt16              nCount = sal::static_int_cast<sal_uInt16>( rArr.Count() );
@@ -1412,12 +1410,10 @@ FuncData::FuncData( const FuncDataBase& r, ResMgr& rResMgr ) :
         aCompList[n] = rArr.GetString( n );
 }
 
-
 FuncData::~FuncData()
 {
 }
 
-
 sal_uInt16 FuncData::GetStrIndex( sal_uInt16 nParamNum ) const
 {
     if( !bWithOpt )
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 670f5c5..a5bf08d 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -222,7 +222,6 @@ private:
     bool                    bWithOpt;           // has internal parameter on first position
 
     sal_uInt16              nParam;             // num of parameters
-    sal_uInt16              nCompID;
     std::vector<OUString>   aCompList;          // list of all valid names
     FDCategory              eCat;               // function category
     OUString                aSuffix;            // if bDouble and not empty, append a suffix other than "_ADD" for UI