[Libreoffice-commits] .: basic/source

Tor Lillqvist tml at kemper.freedesktop.org
Thu Jan 19 06:20:25 PST 2012


 basic/source/sbx/sbxvalue.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 35b5cc9522a1c496a432b49534b1b202f99113e0
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Jan 19 16:16:57 2012 +0200

    Fix SvStream::operator>> problem that showed up with the Android gcc 4.4.3

diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index c6c95dc..e67335c 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1566,8 +1566,11 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
             // Match the Int on this system?
             if( n > SAL_TYPES_SIZEOFINT )
                 r >> aData.nLong, aData.eType = SbxLONG;
-            else
-                r >> aData.nInt;
+            else {
+                sal_Int32 nInt;
+                r >> nInt;
+                aData.nInt = nInt;
+            }
             break;
         }
         case SbxUINT:


More information about the Libreoffice-commits mailing list