From 0f50845dbd751140612b09a1210922eb70af729e Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 28 Jan 2014 20:01:11 +0100
Subject: bool improvements

Change-Id: I5dfdb3a11737a2cb805ff44652c9ca502e5fc81b
---
 package/inc/ZipPackageEntry.hxx                | 2 +-
 package/source/manifest/ManifestImport.cxx     | 2 +-
 package/source/zipapi/ZipFile.cxx              | 2 +-
 package/source/zippackage/ZipPackage.cxx       | 2 +-
 package/source/zippackage/ZipPackageEntry.cxx  | 2 +-
 package/source/zippackage/ZipPackageFolder.cxx | 2 +-
 package/source/zippackage/ZipPackageStream.cxx | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'package')

diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx
index 6d3bf070a48b..94c1e80a5627 100644
--- a/package/inc/ZipPackageEntry.hxx
+++ b/package/inc/ZipPackageEntry.hxx
@@ -48,7 +48,7 @@ protected:
     ZipPackageFolder * pParent;
 public:
     ZipEntry aEntry;
-    ZipPackageEntry ( bool bNewFolder = sal_False );
+    ZipPackageEntry ( bool bNewFolder = false );
     virtual ~ZipPackageEntry( void );
 
     OUString & GetMediaType () { return sMediaType; }
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 00829a535f22..b90ad7237bd8 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -240,7 +240,7 @@ void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs)
             else if ( !nDerivedKeySize )
                 nDerivedKeySize = 16;
             else if ( nDerivedKeySize != 16 )
-                OSL_ENSURE( sal_False, "Default derived key length differs from the expected one!" );
+                OSL_ENSURE( false, "Default derived key length differs from the expected one!" );
 
             aSequence[PKG_MNFST_DERKEYSIZE].Name = sDerivedKeySizeProperty;
             aSequence[PKG_MNFST_DERKEYSIZE].Value <<= nDerivedKeySize;
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 5c80be490de6..9c4b2bbfbda8 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -188,7 +188,7 @@ uno::Reference< xml::crypto::XCipherContext > ZipFile::StaticGetCipher( const un
     }
     catch( ... )
     {
-        OSL_ENSURE( sal_False, "Can not create cipher context!" );
+        OSL_ENSURE( false, "Can not create cipher context!" );
     }
 
     return xResult;
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index c3b56ed10e0f..f1261571acd1 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1737,7 +1737,7 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const
             }
             else
             {
-                OSL_ENSURE( sal_False, "Unexpected encryption algorithm is provided!" );
+                OSL_ENSURE( false, "Unexpected encryption algorithm is provided!" );
                 throw IllegalArgumentException(THROW_WHERE "unexpected algorithms list is provided.", uno::Reference< uno::XInterface >(), 2 );
             }
         }
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index 8087c3b98452..72bfefa4edae 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star::packages::zip::ZipConstants;
 
 ZipPackageEntry::ZipPackageEntry ( bool bNewFolder )
 : mbIsFolder ( bNewFolder )
-, mbAllowRemoveOnInsert( sal_True )
+, mbAllowRemoveOnInsert( true )
 , pParent ( NULL )
 {
 }
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 047dbc08afd7..7dbd7406a895 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -65,7 +65,7 @@ ZipPackageFolder::ZipPackageFolder ( sal_Int32 nFormat,
 {
     this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
 
-    SetFolder ( sal_True );
+    SetFolder ( true );
     aEntry.nVersion     = -1;
     aEntry.nFlag        = 0;
     aEntry.nMethod      = STORED;
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 37c0e6dde7a7..a1544e12104b 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -92,7 +92,7 @@ ZipPackageStream::ZipPackageStream ( ZipPackage & rNewPackage,
 
     this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
 
-    SetFolder ( sal_False );
+    SetFolder ( false );
     aEntry.nVersion     = -1;
     aEntry.nFlag        = 0;
     aEntry.nMethod      = -1;
-- 
cgit