summaryrefslogtreecommitdiff
path: root/sot/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-02-04 16:25:59 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-02-04 16:25:59 +0100
commitbde184dcf74e988f711606b66dc660724e270565 (patch)
treeedab8799a994ee8a650cd309966f526caada5ae3 /sot/source
parent50685e3caf8d27d624a9006d578f686dfbe020c5 (diff)
warning C4805: '!=' unsafe mix of type 'bool' and type 'sal_Bool'
Change-Id: Iaf8de7c729b3cefed8620dec7fe4dd1427305e50
Diffstat (limited to 'sot/source')
-rw-r--r--sot/source/sdstor/stg.cxx4
-rw-r--r--sot/source/sdstor/storage.cxx2
-rw-r--r--sot/source/sdstor/ucbstorage.cxx6
3 files changed, 6 insertions, 6 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 2f69c5a2cf21..f95b241d4a0f 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 dbfeefc36424..55c74cbf141a 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 bc8fc9029c20..36ce40f8a5f6 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 );