[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source

[Michael Stahl]

 sc/source/filter/excel/tokstack.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 4d306525ebc362c6937862fbce871eb5dab8df6c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 27 18:10:33 2012 +0200

    warning: statement has no effect
    
    Change-Id: I06a26ebd1703e1d753e35daeed610671fc451a8f
    (cherry picked from commit 114ccd28e09f0fd13c8ff4e61e82e3f13198febf)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 7bce9de..61a0a16 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -524,7 +524,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
                     pScToken->AddExternalSingleReference(r.mnFileId, r.maTabName, r.maRef);
                 }
                 else
-                    bRet - false;
+                    bRet = false;
             }
             break;
             case T_ExtRefA:
@@ -536,7 +536,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
                     pScToken->AddExternalDoubleReference(r.mnFileId, r.maTabName, r.maRef);
                 }
                 else
-                    bRet - false;
+                    bRet = false;
             }
             break;
             default:
commit 20b30ff65c51709cfa6bd3e754351c10a0bede34
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jul 27 19:20:50 2012 +0200

    added back a missing else
    
    c75e2ed27d5da71891ed7a148ff9603c58eaa58e (merge of OOo filter rework)
    omitted an else of a condition.
    
    Change-Id: I6f342a48938aaf4090fc738afc6cf551a083b4fc
    (cherry picked from commit b06d679eb3d8190a470f7640740571f388106605)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 8d3e762..7bce9de 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -477,7 +477,8 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
                         else
                             pScToken->AddExternal( p->aText, p->eId );
                     }
-                    bRet = false;
+                    else
+                        bRet = false;
                 }
                 break;
             case T_Nlf: