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

[Eike Rathke]

 sc/source/filter/excel/xicontent.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f8bcf01803f9a14ea326b6853eccd37eb3d7cfb9
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 26 20:44:07 2018 +0100

    Consistent naming
    
    Change-Id: I4fdf47abe54895909f6a28655bda67700f30d392

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;
 }