diff options
| author | Eike Rathke <erack@redhat.com> | 2018-01-26 20:44:07 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-01-26 20:44:59 +0100 |
| commit | f8bcf01803f9a14ea326b6853eccd37eb3d7cfb9 (patch) | |
| tree | aa1df1db5fe5c2a13a221e2f57349ae12c1c90cc | |
| parent | 3482a706cb9cfb1505590a5a27345594a2b95571 (diff) | |
Consistent naming
Change-Id: I4fdf47abe54895909f6a28655bda67700f30d392
| -rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 4fa17cdf3633..5c01b7e82c8c 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -668,7 +668,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) } } - ::std::unique_ptr< ScTokenArray > pTokArr2; + ::std::unique_ptr< ScTokenArray > xTokArr2; if( nFmlaSize2 > 0 ) { const ScTokenArray* pTokArr = nullptr; @@ -677,8 +677,8 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) // formula converter owns pTokArr -> create a copy of the token array if( pTokArr ) { - pTokArr2.reset( pTokArr->Clone() ); - GetDocRef().CheckLinkFormulaNeedingCheck( *pTokArr2); + xTokArr2.reset( pTokArr->Clone() ); + GetDocRef().CheckLinkFormulaNeedingCheck( *xTokArr2); } } @@ -694,7 +694,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) mxScCondFmt->SetRange(maRanges); } - ScCondFormatEntry* pEntry = new ScCondFormatEntry(eMode, xTokArr1.get(), pTokArr2.get(), &GetDocRef(), aPos, aStyleName); + ScCondFormatEntry* pEntry = new ScCondFormatEntry(eMode, xTokArr1.get(), xTokArr2.get(), &GetDocRef(), aPos, aStyleName); mxScCondFmt->AddEntry( pEntry ); ++mnCondIndex; } |