package: sal_Bool->bool

Change-Id: I05dd5070d0618ef7539b26c7edcaf01b0a84732c

11 files changed, 56 insertions, 56 deletions

diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index a98b04ac68de..55b1c183ecd9 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -25,7 +25,7 @@
 
 struct eqFunc
 {
-    sal_Bool operator()( const OUString &r1,
+    bool operator()( const OUString &r1,
                          const OUString &r2) const
     {
         return r1 == r2;
diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx
index e84339c3ff84..f9f517a4a45e 100644
--- a/package/inc/ZipEnumeration.hxx
+++ b/package/inc/ZipEnumeration.hxx
@@ -27,7 +27,7 @@ protected:
     EntryHash       &rEntryHash;
     EntryHash::const_iterator aIterator;
 public:
-    sal_Bool SAL_CALL hasMoreElements();
+    bool SAL_CALL hasMoreElements();
     const ZipEntry * SAL_CALL nextElement();
     ZipEnumeration( EntryHash &rNewEntryHash );
     ~ZipEnumeration();
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 976c43f94f27..a5a96e02c83e 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -66,19 +66,19 @@ protected:
     const ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
     ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XProgressHandler > xProgressHandler;
 
-    sal_Bool bRecoveryMode;
+    bool bRecoveryMode;
 
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream >  createMemoryStream(
             ZipEntry & rEntry,
             const ::rtl::Reference < EncryptionData > &rData,
-            sal_Bool bRawStream,
-            sal_Bool bDecrypt );
+            bool bRawStream,
+            bool bDecrypt );
 
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream >  createFileStream(
             ZipEntry & rEntry,
             const ::rtl::Reference < EncryptionData > &rData,
-            sal_Bool bRawStream,
-            sal_Bool bDecrypt );
+            bool bRawStream,
+            bool bDecrypt );
 
     // aMediaType parameter is used only for raw stream header creation
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream >  createUnbufferedStream(
@@ -86,12 +86,12 @@ protected:
             ZipEntry & rEntry,
             const ::rtl::Reference < EncryptionData > &rData,
             sal_Int8 nStreamMode,
-            sal_Bool bDecrypt,
+            bool bDecrypt,
             const OUString& aMediaType = OUString() );
 
-    sal_Bool hasValidPassword ( ZipEntry & rEntry, const rtl::Reference < EncryptionData > &rData );
+    bool hasValidPassword ( ZipEntry & rEntry, const rtl::Reference < EncryptionData > &rData );
 
-    sal_Bool checkSizeAndCRC( const ZipEntry& aEntry );
+    bool checkSizeAndCRC( const ZipEntry& aEntry );
 
     sal_Int32 getCRC( sal_Int64 nOffset, sal_Int64 nSize );
 
@@ -101,14 +101,14 @@ public:
 
     ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput,
              const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > &rxContext,
-             sal_Bool bInitialise
+             bool bInitialise
              )
         throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
 
     ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput,
              const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > &rxContext,
-             sal_Bool bInitialise,
-             sal_Bool bForceRecover,
+             bool bInitialise,
+             bool bForceRecover,
              ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XProgressHandler > xProgress
              )
         throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
@@ -121,7 +121,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData(
             ZipEntry& rEntry,
             const ::rtl::Reference < EncryptionData > &rData,
-            sal_Bool bDecrypt,
+            bool bDecrypt,
             SotMutexHolderRef aMutexHolder )
         throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
 
@@ -139,7 +139,7 @@ public:
                                     const OUString& aMediaType,
                                     sal_Int8 * & pHeader );
 
-    static sal_Bool StaticFillData ( ::rtl::Reference < BaseEncryptionData > & rData,
+    static bool StaticFillData ( ::rtl::Reference < BaseEncryptionData > & rData,
                                      sal_Int32 &rEncAlgorithm,
                                      sal_Int32 &rChecksumAlgorithm,
                                      sal_Int32 &rDerivedKeySize,
@@ -156,7 +156,7 @@ public:
                 ::com::sun::star::packages::zip::ZipIOException,
                 ::com::sun::star::uno::RuntimeException );
 
-    static sal_Bool StaticHasValidPassword (
+    static bool StaticHasValidPassword (
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
             const ::com::sun::star::uno::Sequence< sal_Int8 > &aReadBuffer,
             const ::rtl::Reference < EncryptionData > &rData );
@@ -164,14 +164,14 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(
             ZipEntry& rEntry,
             const ::rtl::Reference < EncryptionData > &rData,
-            sal_Bool bDecrypt,
+            bool bDecrypt,
             SotMutexHolderRef aMutexHolder )
         throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getDataStream(
             ZipEntry& rEntry,
             const ::rtl::Reference < EncryptionData > &rData,
-            sal_Bool bDecrypt,
+            bool bDecrypt,
             SotMutexHolderRef aMutexHolder )
         throw ( ::com::sun::star::packages::WrongPasswordException,
                 ::com::sun::star::io::IOException,
@@ -190,7 +190,7 @@ public:
 
     ZipEnumeration * SAL_CALL entries(  );
 protected:
-    sal_Bool        readLOC ( ZipEntry &rEntry)
+    bool        readLOC ( ZipEntry &rEntry)
         throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
     sal_Int32       readCEN()
         throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 3f237eb23877..f2f9ce1f6171 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -58,7 +58,7 @@ protected:
     ByteChucker         aChucker;
     ZipEntry            *pCurrentEntry;
     sal_Int16           nMethod, nLevel, mnDigested;
-    sal_Bool            bFinished, bEncryptCurrentEntry;
+    bool            bFinished, bEncryptCurrentEntry;
     ZipPackageStream*   m_pCurrentStream;
 
 public:
@@ -80,7 +80,7 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL putNextEntry( ZipEntry& rEntry,
             ZipPackageStream* pStream,
-            sal_Bool bEncrypt = sal_False )
+            bool bEncrypt = false )
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     void SAL_CALL closeEntry(  )
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 9e0eb133747d..1ac84f1ea5ea 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -86,15 +86,15 @@ protected:
     sal_Int32         m_nStartKeyGenerationID;
     sal_Int32         m_nChecksumDigestID;
     sal_Int32         m_nCommonEncryptionID;
-    sal_Bool          m_bHasEncryptedEntries;
-    sal_Bool          m_bHasNonEncryptedEntries;
+    bool          m_bHasEncryptedEntries;
+    bool          m_bHasNonEncryptedEntries;
 
-    sal_Bool          m_bInconsistent;
-    sal_Bool          m_bForceRecovery;
+    bool          m_bInconsistent;
+    bool          m_bForceRecovery;
 
-    sal_Bool          m_bMediaTypeFallbackUsed;
+    bool          m_bMediaTypeFallbackUsed;
     sal_Int32         m_nFormat;
-    sal_Bool          m_bAllowRemoveOnInsert;
+    bool          m_bAllowRemoveOnInsert;
 
     InitialisationMode m_eMode;
 
@@ -107,7 +107,7 @@ protected:
     ZipPackageFolder *m_pRootFolder;
     ZipFile          *m_pZipFile;
 
-    sal_Bool isLocalFile() const;
+    bool isLocalFile() const;
 
     void parseManifest();
     void parseContentType();
@@ -191,7 +191,7 @@ public:
     static OUString static_getImplementationName();
     static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames();
     static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
-    sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName);
+    bool SAL_CALL static_supportsService(OUString const & rServiceName);
 };
 #endif
 
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index 5519aac50e84..bdffcb729156 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -34,7 +34,7 @@ class ZipPackageBuffer : public ::cppu::WeakImplHelper3
 protected:
     com::sun::star::uno::Sequence < sal_Int8 > m_aBuffer;
     sal_Int64 m_nBufferSize, m_nEnd, m_nCurrent;
-    sal_Bool m_bMustInitBuffer;
+    bool m_bMustInitBuffer;
 public:
     ZipPackageBuffer(sal_Int64 nNewBufferSize);
     virtual ~ZipPackageBuffer(void);
diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx
index d7746361f45b..c8cf1fa0a732 100644
--- a/package/inc/ZipPackageEntry.hxx
+++ b/package/inc/ZipPackageEntry.hxx
@@ -53,7 +53,7 @@ public:
 
     OUString & GetMediaType () { return sMediaType; }
     void SetMediaType ( const OUString & sNewType) { sMediaType = sNewType; }
-    void doSetParent ( ZipPackageFolder * pNewParent, sal_Bool bInsert );
+    void doSetParent ( ZipPackageFolder * pNewParent, bool bInsert );
     bool IsFolder ( ) { return mbIsFolder; }
     ZipPackageFolder* GetParent ( ) { return pParent; }
     void SetFolder ( bool bSetFolder ) { mbIsFolder = bSetFolder; }
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 51dff1feaf50..b885e3bf6339 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -57,17 +57,17 @@ private:
 public:
 
     ZipPackageFolder( sal_Int32 nFormat,
-                      sal_Bool bAllowRemoveOnInsert );
+                      bool bAllowRemoveOnInsert );
     virtual ~ZipPackageFolder();
 
     OUString& GetVersion() { return m_sVersion; }
     void SetVersion( const OUString& aVersion ) { m_sVersion = aVersion; }
 
-    sal_Bool LookForUnexpectedODF12Streams( const OUString& aPath );
+    bool LookForUnexpectedODF12Streams( const OUString& aPath );
 
     void setChildStreamsTypeByExtension( const ::com::sun::star::beans::StringPair& aPair );
 
-    void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent )
+    void doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     com::sun::star::packages::ContentInfo & doGetByName( const OUString& aName )
@@ -77,7 +77,7 @@ public:
     static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId();
 
     void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
-    void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; }
+    void setRemoveOnInsertMode_Impl( bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; }
 
     bool saveChild(const OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence < sal_Int8 >& rEncryptionKey, rtlRandomPool & rRandomPool);
 
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 9a1dbb4ccc79..cabc62004d39 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -50,7 +50,7 @@ private:
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream;
     const ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
     ZipPackage          &rZipPackage;
-    sal_Bool            bToBeCompressed, bToBeEncrypted, bHaveOwnKey, bIsEncrypted;
+    bool            bToBeCompressed, bToBeEncrypted, bHaveOwnKey, bIsEncrypted;
 
     ::rtl::Reference< BaseEncryptionData > m_xBaseEncryptionData;
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aStorageEncryptionKeys;
@@ -65,25 +65,25 @@ private:
     sal_uInt32  m_nMagicalHackPos;
     sal_uInt32  m_nMagicalHackSize;
 
-    sal_Bool m_bHasSeekable;
+    bool m_bHasSeekable;
 
-    sal_Bool m_bCompressedIsSetFromOutside;
+    bool m_bCompressedIsSetFromOutside;
 
-    sal_Bool m_bFromManifest;
+    bool m_bFromManifest;
 
     bool m_bUseWinEncoding;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetOwnSeekStream();
 
 public:
-    sal_Bool HasOwnKey () const  { return bHaveOwnKey;}
-    sal_Bool IsToBeCompressed () const { return bToBeCompressed;}
-    sal_Bool IsToBeEncrypted () const { return bToBeEncrypted;}
-    sal_Bool IsEncrypted () const    { return bIsEncrypted;}
-    sal_Bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
+    bool HasOwnKey () const  { return bHaveOwnKey;}
+    bool IsToBeCompressed () const { return bToBeCompressed;}
+    bool IsToBeEncrypted () const { return bToBeEncrypted;}
+    bool IsEncrypted () const    { return bIsEncrypted;}
+    bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
 
-    sal_Bool IsFromManifest() const { return m_bFromManifest; }
-    void SetFromManifest( sal_Bool bValue ) { m_bFromManifest = bValue; }
+    bool IsFromManifest() const { return m_bFromManifest; }
+    void SetFromManifest( bool bValue ) { m_bFromManifest = bValue; }
 
     ::rtl::Reference< EncryptionData > GetEncryptionData( bool bWinEncoding = false );
 
@@ -108,13 +108,13 @@ public:
     sal_Int32 GetEncryptionAlgorithm() const;
     sal_Int32 GetBlockSize() const;
 
-    void SetToBeCompressed (sal_Bool bNewValue) { bToBeCompressed = bNewValue;}
-    void SetIsEncrypted (sal_Bool bNewValue) { bIsEncrypted = bNewValue;}
+    void SetToBeCompressed (bool bNewValue) { bToBeCompressed = bNewValue;}
+    void SetIsEncrypted (bool bNewValue) { bIsEncrypted = bNewValue;}
     void SetImportedStartKeyAlgorithm( sal_Int32 nAlgorithm ) { m_nImportedStartKeyAlgorithm = nAlgorithm; }
     void SetImportedEncryptionAlgorithm( sal_Int32 nAlgorithm ) { m_nImportedEncryptionAlgorithm = nAlgorithm; }
     void SetImportedChecksumAlgorithm( sal_Int32 nAlgorithm ) { m_nImportedChecksumAlgorithm = nAlgorithm; }
     void SetImportedDerivedKeySize( sal_Int32 nSize ) { m_nImportedDerivedKeySize = nSize; }
-    void SetToBeEncrypted (sal_Bool bNewValue)
+    void SetToBeEncrypted (bool bNewValue)
     {
         bToBeEncrypted  = bNewValue;
         if ( bToBeEncrypted && !m_xBaseEncryptionData.is())
@@ -122,7 +122,7 @@ public:
         else if ( !bToBeEncrypted && m_xBaseEncryptionData.is() )
             m_xBaseEncryptionData.clear();
     }
-    void SetPackageMember (sal_Bool bNewValue);
+    void SetPackageMember (bool bNewValue);
 
     void setKey (const com::sun::star::uno::Sequence < sal_Int8 >& rNewKey )
     { m_aEncryptionKey = rNewKey; m_aStorageEncryptionKeys.realloc( 0 ); }
@@ -142,14 +142,14 @@ public:
 
     ZipPackageStream ( ZipPackage & rNewPackage,
                         const ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& xContext,
-                        sal_Bool bAllowRemoveOnInsert );
+                        bool bAllowRemoveOnInsert );
     virtual ~ZipPackageStream( void );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRawEncrStreamNoHeaderCopy();
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > TryToGetRawFromDataStream(
-                                                                                    sal_Bool bAddHeaderForEncr );
+                                                                                    bool bAddHeaderForEncr );
 
-    sal_Bool ParsePackageRawStream();
+    bool ParsePackageRawStream();
 
     void setZipEntryOnLoading( const ZipEntry &rInEntry);
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData()
diff --git a/package/inc/mutexholder.hxx b/package/inc/mutexholder.hxx
index b4255187a22c..4b2e47f208dc 100644
--- a/package/inc/mutexholder.hxx
+++ b/package/inc/mutexholder.hxx
@@ -113,7 +113,7 @@ public:
         return m_pHolder;
     }
 
-    sal_Bool Is() const
+    bool Is() const
     {
         return m_pHolder != NULL;
     }
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 3280e866cc20..af3258e88839 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -50,7 +50,7 @@ class OZipFileAccess : public ::cppu::WeakImplHelper4<
 
     ::cppu::OInterfaceContainerHelper* m_pListenersContainer;
 
-    sal_Bool m_bDisposed;
+    bool m_bDisposed;
     bool m_bOwnContent;
 
 public:
@@ -60,7 +60,7 @@ public:
 
     ::com::sun::star::uno::Sequence< OUString > GetPatternsFromString_Impl( const OUString& aString );
 
-    sal_Bool StringGoodForPattern_Impl( const OUString& aString,
+    bool StringGoodForPattern_Impl( const OUString& aString,
                                         const ::com::sun::star::uno::Sequence< OUString >& aPattern );
 
     static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();