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

Jochen Nitschke j.nitschke+logerrit at ok.de
Wed Jul 13 17:36:19 UTC 2016


 sc/source/filter/lotus/filter.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 87c7d2902f419041b76bb7b5af8e38d5acbac733
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Wed Jul 13 18:15:14 2016 +0200

    sc: fix build breaker
    
    in commit 17722af09e527641db7c080013a94ea13f904377
    nBOF changed to a static member but call was not adjusted
    
    Change-Id: Ibed65161f6825e5bf8d62a689352a2780670cb09
    Reviewed-on: https://gerrit.libreoffice.org/27192
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index d833dd8..5ca3f52 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -106,7 +106,7 @@ generate_Opcodes(LotusContext &rContext, SvStream& aStream,
     return eERR_OK;
 }
 
-WKTYP ScanVersion(LotusContext &rContext, SvStream& aStream)
+WKTYP ScanVersion(SvStream& aStream)
 {
     // PREC:    pWKFile:   pointer to open file
     // POST:    return:     type of file
@@ -114,7 +114,7 @@ WKTYP ScanVersion(LotusContext &rContext, SvStream& aStream)
 
     // first byte has to be 0 because of BOF!
     aStream.ReadUInt16( nOpcode );
-    if (nOpcode != rContext.nBOF)
+    if (nOpcode != LotusContext::nBOF)
         return eWK_UNKNOWN;
 
     aStream.ReadUInt16( nRecLen ).ReadUInt16( nVersNr );
@@ -182,7 +182,7 @@ FltError ScImportLotus123old(LotusContext& rContext, SvStream& aStream, ScDocume
     ScfStreamProgressBar aPrgrsBar( aStream, pDocument->GetDocumentShell() );
 
     // detect file type
-    rContext.eTyp = ScanVersion(rContext, aStream);
+    rContext.eTyp = ScanVersion(aStream);
     rContext.aLotusPatternPool.clear();
 
     return generate_Opcodes(rContext, aStream, aPrgrsBar);


More information about the Libreoffice-commits mailing list