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

Caolán McNamara caolanm at redhat.com
Fri Dec 19 02:21:26 PST 2014


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

New commits:
commit e52bbff12c7a9f898a753229370fa0b621ba9003
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 19 10:20:34 2014 +0000

    WaE: -Werror=unused-but-set-variable
    
    Change-Id: I885ff40b554774d47fbbda89e4ddaaa0ca2fda4d

diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 4b5a04e..8bba050 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -2844,12 +2844,9 @@ OUString FormulaParser::importOleTargetLink( SequenceInputStream& rStrm )
     sal_Int64 nFmlaEndPos = rStrm.tell() + ::std::max< sal_Int32 >( nFmlaSize, 0 );
     if( (nFmlaSize == 7) && (rStrm.getRemaining() >= 7) )
     {
-        sal_uInt8 nToken;
-        sal_Int16 nRefId;
-        sal_Int32 nNameId;
-        nToken = rStrm.readuChar();
-        nRefId = rStrm.readInt16();
-        nNameId = rStrm.readInt32();
+        sal_uInt8 nToken = rStrm.readuChar();
+        sal_Int16 nRefId = rStrm.readInt16();
+        rStrm.skip(4); //nNameId
         if( nToken == (BIFF_TOKCLASS_VAL|BIFF_TOKID_NAMEX) )
             aTargetLink = mxImpl->resolveOleTarget( nRefId, true );
     }


More information about the Libreoffice-commits mailing list