sal_Bool->bool in svl::OFSInputStreamContainer and OFSStreamContainer

Also make OFSInputStreamContainer's member variables private,
there is no reason for them to be protected

Change-Id: Ic5717b5a3740e27adfc0ee55e7677a8727b8cbae

4 files changed, 16 insertions, 17 deletions

diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index e8a53c772b17..d43b02101c10 100644
--- a/svl/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.cxx
@@ -27,8 +27,8 @@ using namespace ::com::sun::star;
 OFSInputStreamContainer::OFSInputStreamContainer( const uno::Reference< io::XInputStream >& xStream )
 : m_xInputStream( xStream )
 , m_xSeekable( xStream, uno::UNO_QUERY )
-, m_bSeekable( sal_False )
-, m_bDisposed( sal_False )
+, m_bSeekable( false )
+, m_bDisposed( false )
 , m_pListenersContainer( NULL )
 {
     m_bSeekable = m_xSeekable.is();
@@ -302,7 +302,7 @@ void SAL_CALL OFSInputStreamContainer::dispose(  )
         m_pListenersContainer->disposeAndClear( aSource );
     }
 
-    m_bDisposed = sal_True;
+    m_bDisposed = true;
 }
 
 //-----------------------------------------------
diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index f3f8fe1a8233..6bc2e4a843fb 100644
--- a/svl/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.hxx
@@ -34,15 +34,14 @@ class OFSInputStreamContainer : public cppu::WeakImplHelper2 < ::com::sun::star:
                                                             ,::com::sun::star::embed::XExtendedStorageStream >
                             , public ::com::sun::star::io::XSeekable
 {
-protected:
     ::osl::Mutex m_aMutex;
 
     ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInputStream;
     ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable;
 
-    sal_Bool m_bSeekable;
+    bool m_bSeekable;
 
-    sal_Bool m_bDisposed;
+    bool m_bDisposed;
 
     ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
 
diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index f439d8966498..081eb5986557 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -25,9 +25,9 @@ using namespace ::com::sun::star;
 
 //-----------------------------------------------
 OFSStreamContainer::OFSStreamContainer( const uno::Reference < io::XStream >& xStream )
-: m_bDisposed( sal_False )
-, m_bInputClosed( sal_False )
-, m_bOutputClosed( sal_False )
+: m_bDisposed( false )
+, m_bInputClosed( false )
+, m_bOutputClosed( false )
 , m_pListenersContainer( NULL )
 , m_pTypeCollection( NULL )
 {
@@ -261,13 +261,13 @@ void SAL_CALL OFSStreamContainer::dispose()
     if ( m_xInputStream.is() && !m_bInputClosed )
     {
         m_xInputStream->closeInput();
-        m_bInputClosed = sal_True;
+        m_bInputClosed = true;
     }
 
     if ( m_xOutputStream.is() && !m_bOutputClosed )
     {
         m_xOutputStream->closeOutput();
-        m_bOutputClosed = sal_True;
+        m_bOutputClosed = true;
     }
 
     if ( m_pListenersContainer )
@@ -276,7 +276,7 @@ void SAL_CALL OFSStreamContainer::dispose()
         m_pListenersContainer->disposeAndClear( aSource );
     }
 
-    m_bDisposed = sal_True;
+    m_bDisposed = true;
 }
 
 //-----------------------------------------------
@@ -448,7 +448,7 @@ void SAL_CALL OFSStreamContainer::closeInput()
     if ( m_xInputStream.is() )
     {
         m_xInputStream->closeInput();
-        m_bInputClosed = sal_True;
+        m_bInputClosed = true;
     }
 
     if ( m_bOutputClosed )
@@ -510,7 +510,7 @@ void SAL_CALL OFSStreamContainer::closeOutput()
     if ( m_xOutputStream.is() )
     {
         m_xOutputStream->closeOutput();
-        m_bOutputClosed = sal_True;
+        m_bOutputClosed = true;
     }
 
     if ( m_bInputClosed )
diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index a8770940c364..fef3edc41d6d 100644
--- a/svl/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
@@ -52,9 +52,9 @@ class OFSStreamContainer : public cppu::OWeakObject,
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate >             m_xTruncate;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XAsyncOutputMonitor >   m_xAsyncOutputMonitor;
 
-    sal_Bool m_bDisposed;
-    sal_Bool m_bInputClosed;
-    sal_Bool m_bOutputClosed;
+    bool m_bDisposed;
+    bool m_bInputClosed;
+    bool m_bOutputClosed;
 
     ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
     ::cppu::OTypeCollection* m_pTypeCollection;