[Libreoffice-commits] core.git: 3 commits - include/tools rsc/source sot/source

[Michael Stahl]

 include/tools/b3dtrans.hxx   |   10 +++++-----
 rsc/source/parser/rsclex.cxx |    3 ++-
 sot/source/sdstor/stg.cxx    |    2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 5f4a9d91fc2323a38ac2aed54e2074a358ec168e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 4 20:07:53 2013 +0200

    warning C4305 truncation from int to bool
    
    Change-Id: Id4323cdb5201875200e83e7fe8377f0262f07a4e

diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 4606aa1..2fcf0d5 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -949,7 +949,7 @@ void Storage::SetClass( const SvGlobalName & rClass,
             SetError( aCompObj.GetError() );
         else
         {
-            StgOleStream aOle( *this, STREAM_WRITE );
+            StgOleStream aOle(*this, true);
             if( !aOle.Store() )
                 SetError( aOle.GetError() );
         }
commit f9075eb5ccb79c4338fb6230dd898f98a02934fd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 4 19:58:12 2013 +0200

    warning C4805 unsafe mixture of type int and type bool
    
    It is a mystery what this is supposed to do, but rsc is sort of going
    away in the mid-term anyway so who cares...
    
    Change-Id: If1c1b8216c0429909c0571b3360b6dca97f265c4

diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 0f24556..b4a23f0 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -151,7 +151,8 @@ int MakeToken( YYSTYPE * pTokenVal )
             break;
     };
 
-    if( c == pFI->IsEof() )
+    // FIXME: wtf is this supposed to do?
+    if( (c != 0) == pFI->IsEof() )
     {
         return( 0 );
     }
commit 33ff399d7211417f9991161579acbca8d8a2c67f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 4 19:57:22 2013 +0200

    warning C4389 != signed/unsigned mismatch
    
    Change-Id: I1cc4be1e7068ce3c40340e88fcde75fc7862a18a

diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 5dace97..dd21aae 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -106,11 +106,11 @@ private:
     Base3DRatio           meRatio;
 
     // Flags
-    unsigned              mbPerspective              : 1;
-    unsigned              mbWorldToViewValid         : 1;
-    unsigned              mbInvTransObjectToEyeValid : 1;
-    unsigned              mbObjectToDeviceValid      : 1;
-    unsigned              mbProjectionValid          : 1;
+    bool mbPerspective              : 1;
+    bool mbWorldToViewValid         : 1;
+    bool mbInvTransObjectToEyeValid : 1;
+    bool mbObjectToDeviceValid      : 1;
+    bool mbProjectionValid          : 1;
 
 public:
     B3dTransformationSet();