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

Caolán McNamara caolanm at redhat.com
Tue Feb 14 12:58:57 UTC 2017


 scaddins/source/pricing/pricing.cxx |    3 +--
 scaddins/source/pricing/pricing.hxx |    1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ded409b97f657a589f1305ec80bc20815832afe9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 14 12:58:03 2017 +0000

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

diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index be52c92..9f9c543 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -70,13 +70,12 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rResMgr ) :
     aIntName( OUString::createFromAscii( rBaseData.pIntName ) ),
     nUINameID( rBaseData.nUINameID ),
     nDescrID( rBaseData.nDescrID ),
-    nCompListID( rBaseData.nCompListID ),
     nParamCount( rBaseData.nParamCount ),
     eCat( rBaseData.eCat ),
     bDouble( rBaseData.bDouble ),
     bWithOpt( rBaseData.bWithOpt )
 {
-    ScaResStringArrLoader aArrLoader( RID_PRICING_DEFFUNCTION_NAMES, nCompListID, rResMgr );
+    ScaResStringArrLoader aArrLoader(RID_PRICING_DEFFUNCTION_NAMES, rBaseData.nCompListID, rResMgr);
     const ResStringArray& rArr = aArrLoader.GetStringArray();
 
     for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 05f580a..b9c4a23 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -130,7 +130,6 @@ private:
     OUString             aIntName;           // internal name (get***)
     sal_uInt16                  nUINameID;          // resource ID to UI name
     sal_uInt16                  nDescrID;           // leads also to parameter descriptions!
-    sal_uInt16                  nCompListID;        // resource ID to list of valid names
     sal_uInt16                  nParamCount;        // num of parameters
     std::vector<OUString>       aCompList;          // list of all valid names
     ScaCategory                 eCat;               // function category


More information about the Libreoffice-commits mailing list