[Libreoffice-commits] core.git: sot/inc sot/source

[Stephan Bergmann]

 sot/inc/sot/stg.hxx              |    6 +++---
 sot/source/sdstor/stg.cxx        |    4 ++--
 sot/source/sdstor/storage.cxx    |    2 +-
 sot/source/sdstor/ucbstorage.cxx |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit bde184dcf74e988f711606b66dc660724e270565
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 4 16:25:59 2013 +0100

    warning C4805: '!=' unsafe mix of type 'bool' and type 'sal_Bool'
    
    Change-Id: Iaf8de7c729b3cefed8620dec7fe4dd1427305e50

diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index 98a09ce..61a0476 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -116,7 +116,7 @@ public:
                                   sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ) = 0;
     virtual BaseStorage*        OpenStorage( const String & rEleName,
                                    StreamMode = STREAM_STD_READWRITE,
-                                   sal_Bool bDirect = sal_False ) = 0;
+                                   bool bDirect = false ) = 0;
     virtual BaseStorage*        OpenUCBStorage( const String & rEleName,
                                    StreamMode = STREAM_STD_READWRITE,
                                    sal_Bool bDirect = sal_False ) = 0;
@@ -216,7 +216,7 @@ public:
                                   sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 );
     virtual BaseStorage*        OpenStorage( const String & rEleName,
                                        StreamMode = STREAM_STD_READWRITE,
-                                       sal_Bool bDirect = sal_False );
+                                       bool bDirect = false );
     virtual BaseStorage*        OpenUCBStorage( const String & rEleName,
                                    StreamMode = STREAM_STD_READWRITE,
                                    sal_Bool bDirect = sal_False );
@@ -332,7 +332,7 @@ public:
                                   sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 );
     virtual BaseStorage*        OpenStorage( const String & rEleName,
                                        StreamMode = STREAM_STD_READWRITE,
-                                       sal_Bool bDirect = sal_False );
+                                       bool bDirect = false );
     virtual BaseStorage*        OpenUCBStorage( const String & rEleName,
                                    StreamMode = STREAM_STD_READWRITE,
                                    sal_Bool bDirect = sal_False );
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 2f69c5a..f95b241 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -578,12 +578,12 @@ BaseStorage* Storage::OpenOLEStorage( const String& rName, StreamMode m, sal_Boo
     return OpenStorage( rName, m, bDirect );
 }
 
-BaseStorage* Storage::OpenStorage( const String& rName, StreamMode m, sal_Bool bDirect )
+BaseStorage* Storage::OpenStorage( const String& rName, StreamMode m, bool bDirect )
 {
     if( !Validate() || !ValidateMode( m ) )
         return new Storage( pIo, NULL, m );
     if( bDirect && !pEntry->bDirect )
-        bDirect = sal_False;
+        bDirect = false;
 
     StgDirEntry* p = pIo->pTOC->Find( *pEntry, rName );
     if( !p )
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index dbfeefc..55c74cb 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -910,7 +910,7 @@ SotStorage * SotStorage::OpenSotStorage( const String & rEleName,
         nMode |= STREAM_SHARE_DENYALL;
         ErrCode nE = m_pOwnStg->GetError();
         BaseStorage * p = m_pOwnStg->OpenStorage( rEleName, nMode,
-                        (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True );
+                        (nStorageMode & STORAGE_TRANSACTED) ? false : true );
         if( p )
         {
             pStor = new SotStorage( p );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index bc8fc90..36ce40f 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -504,7 +504,7 @@ public:
     sal_Int16                   Commit();
     sal_Bool                        Revert();
     sal_Bool                        Insert( ::ucbhelper::Content *pContent );
-    UCBStorage_Impl*            OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, sal_Bool bDirect );
+    UCBStorage_Impl*            OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect );
     UCBStorageStream_Impl*      OpenStream( UCBStorageElement_Impl*, StreamMode, sal_Bool, const rtl::OString* pKey=0 );
     void                        SetProps( const Sequence < Sequence < PropertyValue > >& rSequence, const String& );
     void                        GetProps( sal_Int32&, Sequence < Sequence < PropertyValue > >& rSequence, const String& );
@@ -2785,7 +2785,7 @@ BaseStorage* UCBStorage::OpenOLEStorage( const String& rEleName, StreamMode nMod
     return OpenStorage_Impl( rEleName, nMode, bDirect, sal_False );
 }
 
-BaseStorage* UCBStorage::OpenStorage( const String& rEleName, StreamMode nMode, sal_Bool bDirect )
+BaseStorage* UCBStorage::OpenStorage( const String& rEleName, StreamMode nMode, bool bDirect )
 {
     if( !rEleName.Len() )
         return NULL;
@@ -2906,7 +2906,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const String& rEleName, StreamMode nM
     return NULL;
 }
 
-UCBStorage_Impl* UCBStorage_Impl::OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, sal_Bool bDirect )
+UCBStorage_Impl* UCBStorage_Impl::OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect )
 {
     UCBStorage_Impl* pRet = NULL;
     String aName( m_aURL );