summaryrefslogtreecommitdiff
path: root/io/source/stm
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-22 12:52:39 +0200
committerNoel Grandin <noel@peralex.com>2014-04-23 11:11:49 +0200
commit1f2a47a6d39be654847c2bdde7605e08ad2fb78a (patch)
tree92ea9da2d9147091594302fe86128b36221a9ce4 /io/source/stm
parente4f690b0389263c35f83fa8b58382c6518d00f62 (diff)
io: sal_Bool->bool
Change-Id: I136c98cbe15d1c6629028392a9573066320b3a04
Diffstat (limited to 'io/source/stm')
-rw-r--r--io/source/stm/odata.cxx32
-rw-r--r--io/source/stm/omark.cxx4
-rw-r--r--io/source/stm/opipe.cxx12
-rw-r--r--io/source/stm/opump.cxx10
4 files changed, 29 insertions, 29 deletions
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 7c2cc270c3ff..556c985b2fb3 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -59,7 +59,7 @@ class ODataInputStream :
{
public:
ODataInputStream( )
- : m_bValidStream( sal_False )
+ : m_bValidStream( false )
{
}
@@ -116,7 +116,7 @@ protected:
Reference < XConnectable > m_pred;
Reference < XConnectable > m_succ;
Reference < XInputStream > m_input;
- sal_Bool m_bValidStream;
+ bool m_bValidStream;
};
ODataInputStream::~ODataInputStream()
@@ -199,7 +199,7 @@ void ODataInputStream::closeInput(void )
setInputStream( Reference< XInputStream > () );
setPredecessor( Reference < XConnectable >() );
setSuccessor( Reference < XConnectable >() );
- m_bValidStream = sal_False;
+ m_bValidStream = false;
}
else
{
@@ -510,7 +510,7 @@ class ODataOutputStream :
{
public:
ODataOutputStream()
- : m_bValidStream( sal_False )
+ : m_bValidStream( false )
{
}
virtual ~ODataOutputStream();
@@ -564,7 +564,7 @@ protected:
Reference < XConnectable > m_succ;
Reference < XConnectable > m_pred;
Reference< XOutputStream > m_output;
- sal_Bool m_bValidStream;
+ bool m_bValidStream;
};
ODataOutputStream::~ODataOutputStream()
@@ -929,7 +929,7 @@ class OObjectOutputStream:
public:
OObjectOutputStream()
: m_nMaxId(0) ,
- m_bValidMarkable(sal_False)
+ m_bValidMarkable(false)
{
}
@@ -998,7 +998,7 @@ private:
ObjectContainer_Impl m_mapObject;
sal_Int32 m_nMaxId;
Reference< XMarkableStream > m_rMarkable;
- sal_Bool m_bValidMarkable;
+ bool m_bValidMarkable;
};
OObjectOutputStream::~OObjectOutputStream()
@@ -1009,7 +1009,7 @@ void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj
{
connectToMarkable();
- sal_Bool bWriteObj = sal_False;
+ bool bWriteObj = false;
// create Mark to write length of info
sal_uInt32 nInfoLenMark = m_rMarkable->createMark();
@@ -1029,7 +1029,7 @@ void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj
m_mapObject[ rX ] = ++m_nMaxId;
ODataOutputStream::writeLong( m_nMaxId );
ODataOutputStream::writeUTF( xPObj->getServiceName() );
- bWriteObj = sal_True;
+ bWriteObj = true;
}
else
{
@@ -1096,7 +1096,7 @@ void OObjectOutputStream::connectToMarkable(void)
Reference < XActiveDataSource > source( rTry , UNO_QUERY );
rTry = source;
}
- m_bValidMarkable = sal_True;
+ m_bValidMarkable = true;
}
}
@@ -1197,7 +1197,7 @@ public:
OObjectInputStream( const Reference < XComponentContext > &r)
: m_rSMgr( r->getServiceManager() )
, m_rCxt( r )
- , m_bValidMarkable(sal_False)
+ , m_bValidMarkable(false)
{
}
virtual ~OObjectInputStream();
@@ -1273,7 +1273,7 @@ private:
private:
Reference < XMultiComponentFactory > m_rSMgr;
Reference < XComponentContext > m_rCxt;
- sal_Bool m_bValidMarkable;
+ bool m_bValidMarkable;
Reference < XMarkableStream > m_rMarkable;
vector < Reference< XPersistObject > > m_aPersistVector;
@@ -1316,7 +1316,7 @@ Reference< XPersistObject > OObjectInputStream::readObject() throw (::com::sun:
// skip data of new version
skipBytes( nLen - m_rMarkable->offsetToMark( nMark ) );
- sal_Bool bLoadSuccesfull = sal_True;
+ bool bLoadSuccesfull = true;
if( nId )
{
if( !aName.isEmpty() )
@@ -1341,14 +1341,14 @@ Reference< XPersistObject > OObjectInputStream::readObject() throw (::com::sun:
else
{
// no service with this name could be instantiated
- bLoadSuccesfull = sal_False;
+ bLoadSuccesfull = false;
}
}
else {
if( m_aPersistVector.size() < nId )
{
// id unknown, load failure !
- bLoadSuccesfull = sal_False;
+ bLoadSuccesfull = false;
}
else
{
@@ -1394,7 +1394,7 @@ void OObjectInputStream::connectToMarkable()
Reference < XActiveDataSink > sink( rTry , UNO_QUERY );
rTry = sink;
}
- m_bValidMarkable = sal_True;
+ m_bValidMarkable = true;
}
}
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index ec7f5991939b..bd026b498255 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -136,7 +136,7 @@ private:
Reference< XConnectable > m_pred;
Reference< XOutputStream > m_output;
- sal_Bool m_bValidStream;
+ bool m_bValidStream;
IRingBuffer *m_pBuffer;
map<sal_Int32,sal_Int32,less< sal_Int32 > > m_mapMarks;
@@ -551,7 +551,7 @@ private:
Reference < XConnectable > m_pred;
Reference< XInputStream > m_input;
- sal_Bool m_bValidStream;
+ bool m_bValidStream;
IRingBuffer *m_pBuffer;
map<sal_Int32,sal_Int32,less< sal_Int32 > > m_mapMarks;
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 2e1e86320725..a6871c43abce 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -115,8 +115,8 @@ private:
sal_Int32 m_nBytesToSkip;
- sal_Bool m_bOutputStreamClosed;
- sal_Bool m_bInputStreamClosed;
+ bool m_bOutputStreamClosed;
+ bool m_bInputStreamClosed;
oslCondition m_conditionBytesAvail;
Mutex m_mutexAccess;
@@ -129,8 +129,8 @@ OPipeImpl::OPipeImpl()
{
m_nBytesToSkip = 0;
- m_bOutputStreamClosed = sal_False;
- m_bInputStreamClosed = sal_False;
+ m_bOutputStreamClosed = false;
+ m_bInputStreamClosed = false;
m_pFIFO = new MemFIFO;
m_conditionBytesAvail = osl_createCondition();
@@ -264,7 +264,7 @@ void OPipeImpl::closeInput(void)
{
MutexGuard guard( m_mutexAccess );
- m_bInputStreamClosed = sal_True;
+ m_bInputStreamClosed = true;
delete m_pFIFO;
m_pFIFO = 0;
@@ -356,7 +356,7 @@ void OPipeImpl::closeOutput(void)
{
MutexGuard guard( m_mutexAccess );
- m_bOutputStreamClosed = sal_True;
+ m_bOutputStreamClosed = true;
osl_setCondition( m_conditionBytesAvail );
setPredecessor( Reference < XConnectable > () );
return;
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index ef8678a39129..d5c010e66356 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -64,7 +64,7 @@ namespace io_stm {
Reference< XInputStream > m_xInput;
Reference< XOutputStream > m_xOutput;
OInterfaceContainerHelper m_cnt;
- sal_Bool m_closeFired;
+ bool m_closeFired;
void run();
static void static_run( void* pObject );
@@ -107,7 +107,7 @@ namespace io_stm {
Pump::Pump() : m_aThread( 0 ),
m_cnt( m_aMutex ),
- m_closeFired( sal_False )
+ m_closeFired( false )
{
}
@@ -139,13 +139,13 @@ void Pump::fireError( const Any & exception )
void Pump::fireClose()
{
- sal_Bool bFire = sal_False;
+ bool bFire = false;
{
MutexGuard guard( m_aMutex );
if( ! m_closeFired )
{
- m_closeFired = sal_True;
- bFire = sal_True;
+ m_closeFired = true;
+ bFire = true;
}
}