Kaydet (Commit) c474fd56 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in sc

Change-Id: I5c9e92f5aff6d8fcae7e6affe2977f5804133ea9
Reviewed-on: https://gerrit.libreoffice.org/65053
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 3cfdac90
......@@ -125,8 +125,6 @@ class ScDPGroupTableData : public ScDPTableData
std::unique_ptr<ScDPNumGroupDimension[]>
pNumGroups; // array[nSourceCount]
ScDocument* const pDoc;
std::unordered_set< OUString >
aGroupNames;
void FillGroupValues(std::vector<SCROW>& rItems, const std::vector<long>& rDims);
virtual long GetSourceDim( long nDim ) override;
......
......@@ -485,7 +485,6 @@ void ScDPGroupTableData::AddGroupDimension( const ScDPGroupDimension& rGroup )
ScDPGroupDimension aNewGroup( rGroup );
aNewGroup.SetGroupDim( GetColumnCount() ); // new dimension will be at the end
aGroups.push_back( aNewGroup );
aGroupNames.insert(aNewGroup.GetName());
}
void ScDPGroupTableData::SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup )
......
......@@ -1277,8 +1277,6 @@ ErrCode ImportExcel8::Read()
GetDoc().SetCodeName( *it, sTmpName );
// Record newly used codename
aCodeNames.push_back(sTmpName);
// Record those we have created so they can be created in basic
maAutoGeneratedCodeNames.push_back( sTmpName );
break;
}
}
......
......@@ -56,9 +56,6 @@ public:
virtual void PostDocLoad() override;
private:
// represents codename ( and associated modules )
// not specified directly in the binary format
std::vector<OUString> maAutoGeneratedCodeNames;
ExcScenarioList maScenList;
};
......
......@@ -87,18 +87,17 @@ inline bool LotusRange::IsSingle() const
class LotusRangeList
{
private:
LOTUS_ROOT* m_pLotRoot;
LR_ID nIdCnt;
ScComplexRefData aComplRef;
std::vector<LotusRange*> maRanges;
public:
LotusRangeList(LOTUS_ROOT* pLotRoot);
LotusRangeList();
~LotusRangeList();
inline sal_uInt16 GetIndex( SCCOL nCol, SCROW nRow );
inline sal_uInt16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
sal_uInt16 GetIndex( const LotusRange& );
void Append( LotusRange* pLR, const OUString& rName );
void Append( LotusRange* pLR );
};
inline LR_ID LotusRangeList::GetIndex( SCCOL nCol, SCROW nRow )
......
......@@ -91,14 +91,13 @@ private:
}
};
LOTUS_ROOT* m_pLotRoot;
std::unique_ptr<ScTokenArray>
pScTokenArray;
sal_uInt16 nIntCount;
std::vector<Entry> maEntries;
public:
RangeNameBufferWK3(LOTUS_ROOT* pLotRoot);
RangeNameBufferWK3();
~RangeNameBufferWK3();
void Add( const OUString& rName, const ScComplexRefData& rCRD );
inline void Add( const OUString& rName, const ScRange& aScRange );
......
......@@ -86,7 +86,6 @@ struct LOTUS_ROOT
{
ScDocument* pDoc;
LotusRangeList maRangeNames;
ScRangeName* pScRangeName;
rtl_TextEncoding const eCharsetQ;
Lotus123Typ eFirstType;
Lotus123Typ eActType;
......
......@@ -43,12 +43,11 @@
LOTUS_ROOT::LOTUS_ROOT( ScDocument* pDocP, rtl_TextEncoding eQ )
:
pDoc( pDocP),
maRangeNames( this ),
pScRangeName( pDocP->GetRangeName()),
maRangeNames(),
eCharsetQ( eQ),
eFirstType( Lotus123Typ::X),
eActType( Lotus123Typ::X),
pRngNmBffWK3( new RangeNameBufferWK3(this)),
pRngNmBffWK3( new RangeNameBufferWK3() ),
maAttrTable( this )
{
}
......
......@@ -227,7 +227,7 @@ void OP_NamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/)
aTmp = ScfTools::ConvertToScDefinedName( aTmp );
rContext.pLotusRoot->maRangeNames.Append( pRange, aTmp );
rContext.pLotusRoot->maRangeNames.Append( pRange );
}
}
......@@ -265,7 +265,7 @@ void OP_SymphNamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/)
OUString aTmp( cBuf, strlen(cBuf), rContext.pLotusRoot->eCharsetQ );
aTmp = ScfTools::ConvertToScDefinedName( aTmp );
rContext.pLotusRoot->maRangeNames.Append( pRange, aTmp );
rContext.pLotusRoot->maRangeNames.Append( pRange );
}
}
......
......@@ -369,8 +369,7 @@ LotusRange::LotusRange( const LotusRange& rCpy )
Copy( rCpy );
}
LotusRangeList::LotusRangeList(LOTUS_ROOT* pLotRoot)
: m_pLotRoot(pLotRoot)
LotusRangeList::LotusRangeList()
{
aComplRef.InitFlags();
......@@ -409,7 +408,7 @@ LR_ID LotusRangeList::GetIndex( const LotusRange &rRef )
return ID_FAIL;
}
void LotusRangeList::Append( LotusRange* pLR, const OUString& rName )
void LotusRangeList::Append( LotusRange* pLR )
{
SAL_WARN_IF( !pLR, "sc.filter", "*LotusRangeList::Append(): no pointer!" );
maRanges.push_back(pLR);
......@@ -431,19 +430,13 @@ void LotusRangeList::Append( LotusRange* pLR, const OUString& rName )
aTokArray.AddDoubleReference( aComplRef );
}
ScRangeData* pData = new ScRangeData(
m_pLotRoot->pDoc, rName, aTokArray );
m_pLotRoot->pScRangeName->insert( pData );
pLR->SetId( nIdCnt );
nIdCnt++;
}
RangeNameBufferWK3::RangeNameBufferWK3(LOTUS_ROOT* pLotRoot)
: m_pLotRoot(pLotRoot)
, pScTokenArray( new ScTokenArray )
RangeNameBufferWK3::RangeNameBufferWK3()
: pScTokenArray( new ScTokenArray )
{
nIntCount = 1;
}
......@@ -475,14 +468,10 @@ void RangeNameBufferWK3::Add( const OUString& rOrgName, const ScComplexRefData&
aInsert.bSingleRef = false;
}
ScRangeData* pData = new ScRangeData( m_pLotRoot->pDoc, aScName, *pScTokenArray );
aInsert.nRelInd = nIntCount;
pData->SetIndex( nIntCount );
nIntCount++;
maEntries.push_back( aInsert );
m_pLotRoot->pScRangeName->insert( pData );
}
bool RangeNameBufferWK3::FindRel( const OUString& rRef, sal_uInt16& rIndex )
......@@ -536,13 +525,8 @@ bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex )
pScTokenArray->AddDoubleReference( itr->aScComplexRefDataRel );
}
ScRangeData* pData = new ScRangeData( m_pLotRoot->pDoc, itr->aScAbsName, *pScTokenArray );
rIndex = itr->nAbsInd = nIntCount;
pData->SetIndex( rIndex );
nIntCount++;
m_pLotRoot->pScRangeName->insert( pData );
}
return true;
......
......@@ -268,7 +268,6 @@ class ScXMLImport: public SvXMLImport
std::unique_ptr<ScMyImpDetectiveOpArray> pDetectiveOpArray;
std::unique_ptr<SolarMutexGuard> pSolarMutexGuard;
std::vector<OUString> aTableStyles;
std::unique_ptr<XMLNumberFormatAttributesExportHelper> pNumberFormatAttributesExportHelper;
std::unique_ptr<ScMyStyleNumberFormats> pStyleNumberFormats;
css::uno::Reference <css::util::XNumberFormats> xNumberFormats;
......@@ -388,7 +387,6 @@ public:
virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override;
virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override;
void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); }
ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper.get(); }
sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency);
bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol);
......
......@@ -120,7 +120,6 @@ void ScMyTables::NewSheet(const OUString& sTableName, const OUString& sStyleName
else
pDoc->SetTabNameOnLoad(maCurrentCellPos.Tab(), sTableName);
rImport.SetTableStyle(sStyleName);
xCurrentSheet = getCurrentSheet(rImport.GetModel(), maCurrentCellPos.Tab());
if (xCurrentSheet.is())
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment