summaryrefslogtreecommitdiff
path: root/io/source
diff options
context:
space:
mode:
Diffstat (limited to 'io/source')
-rw-r--r--io/source/TextInputStream/TextInputStream.cxx2
-rw-r--r--io/source/TextOutputStream/TextOutputStream.cxx2
-rw-r--r--io/source/acceptor/acc_pipe.cxx11
-rw-r--r--io/source/acceptor/acc_socket.cxx6
-rw-r--r--io/source/acceptor/acceptor.cxx4
-rw-r--r--io/source/acceptor/acceptor.hxx2
-rw-r--r--io/source/acceptor/acceptor.xml2
-rw-r--r--io/source/connector/connector.cxx14
-rw-r--r--io/source/connector/connector.hxx6
-rw-r--r--io/source/connector/connectr.xml2
-rw-r--r--io/source/connector/ctr_pipe.cxx4
-rw-r--r--io/source/connector/ctr_socket.cxx2
-rw-r--r--io/source/stm/factreg.cxx3
-rw-r--r--io/source/stm/factreg.hxx3
-rw-r--r--io/source/stm/odata.cxx10
-rw-r--r--io/source/stm/omark.cxx17
-rw-r--r--io/source/stm/opipe.cxx21
-rw-r--r--io/source/stm/opump.cxx11
-rw-r--r--io/source/stm/stm.xml2
-rw-r--r--io/source/stm/streamhelper.cxx19
-rw-r--r--io/source/stm/streamhelper.hxx31
21 files changed, 98 insertions, 76 deletions
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 5829fe43cce3..b564b12f01d8 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -529,3 +530,4 @@ void * SAL_CALL component_getFactory(
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index b504941afea7..a50cc712bfbd 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -327,3 +328,4 @@ void * SAL_CALL component_getFactory(
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 63f688d32dca..199a7baf1591 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,7 +84,7 @@ namespace io_acceptor
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
// make it unique
- m_sDescription += OUString::createFromAscii( ",uniqueValue=" );
+ m_sDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(",uniqueValue="));
m_sDescription += OUString::valueOf(
sal::static_int_cast<sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_pipe)),
@@ -172,7 +173,7 @@ namespace io_acceptor
m_pipe = Pipe( m_sPipeName.pData , osl_Pipe_CREATE , osl::Security() );
if( ! m_pipe.is() )
{
- OUString error = OUString::createFromAscii( "io.acceptor: Couldn't setup pipe " );
+ OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: Couldn't setup pipe "));
error += m_sPipeName;
throw ConnectionSetupException( error, Reference< XInterface > () );
}
@@ -187,7 +188,7 @@ namespace io_acceptor
}
if( ! pipe.is() )
{
- OUString error = OUString::createFromAscii( "io.acceptor: pipe already closed" );
+ OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: pipe already closed"));
error += m_sPipeName;
throw ConnectionSetupException( error, Reference< XInterface > () );
}
@@ -207,7 +208,7 @@ namespace io_acceptor
}
else
{
- OUString error = OUString::createFromAscii( "io.acceptor: Couldn't setup pipe " );
+ OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: Couldn't setup pipe "));
error += m_sPipeName;
throw ConnectionSetupException( error, Reference< XInterface > ());
}
@@ -228,3 +229,5 @@ namespace io_acceptor
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index ecdf59495f3d..c3ae4a775e4c 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
#include "precompiled_io.hxx"
#include "acceptor.hxx"
-#include <hash_set>
+#include <boost/unordered_set.hpp>
#include <algorithm>
#include <rtl/ustrbuf.hxx>
@@ -67,7 +68,7 @@ namespace io_acceptor {
};
- typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
+ typedef ::boost::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
ReferenceHash< ::com::sun::star::io::XStreamListener>,
ReferenceEqual< ::com::sun::star::io::XStreamListener> >
XStreamListener_hash_set;
@@ -414,3 +415,4 @@ namespace io_acceptor {
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 2d15aa340694..9b50048abca3 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -307,7 +308,7 @@ namespace io_acceptor
if( !pNames )
{
static Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
+ seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
pNames = &seqNames;
}
}
@@ -375,3 +376,4 @@ void * SAL_CALL component_getFactory(
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx
index 11b01e6dac7d..963adc1f1460 100644
--- a/io/source/acceptor/acceptor.hxx
+++ b/io/source/acceptor/acceptor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,4 @@ namespace io_acceptor {
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acceptor.xml b/io/source/acceptor/acceptor.xml
index 82a25d3d5926..2a2d3a76afb2 100644
--- a/io/source/acceptor/acceptor.xml
+++ b/io/source/acceptor/acceptor.xml
@@ -35,10 +35,8 @@
</component-description>
<project-build-dependency> cppuhelper </project-build-dependency>
<project-build-dependency> cppu </project-build-dependency>
- <project-build-dependency> vos </project-build-dependency>
<project-build-dependency> sal </project-build-dependency>
<runtime-module-dependency> cppuhelper </runtime-module-dependency>
<runtime-module-dependency> cppu2 </runtime-module-dependency>
- <runtime-module-dependency> vos2MSC </runtime-module-dependency>
<runtime-module-dependency> sal2 </runtime-module-dependency>
</module-description>
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 2b0e8d66ad34..076a246c79f8 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,11 +119,11 @@ namespace stoc_connector
}
else
{
- OUString sMessage = OUString::createFromAscii( "Connector : couldn't connect to pipe " );
+ OUString sMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Connector : couldn't connect to pipe "));
sMessage += aName;
- sMessage += OUString::createFromAscii( "(" );
+ sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("("));
sMessage += OUString::valueOf( (sal_Int32 ) pConn->m_pipe.getError() );
- sMessage += OUString::createFromAscii( ")" );
+ sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
delete pConn;
throw NoConnectException( sMessage ,Reference< XInterface > () );
}
@@ -152,10 +153,10 @@ namespace stoc_connector
SocketAddr AddrTarget( aHost.pData, nPort );
if(pConn->m_socket.connect(AddrTarget) != osl_Socket_Ok)
{
- OUString sMessage = OUString::createFromAscii( "Connector : couldn't connect to socket (" );
+ OUString sMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Connector : couldn't connect to socket ("));
OUString sError = pConn->m_socket.getErrorAsString();
sMessage += sError;
- sMessage += OUString::createFromAscii( ")" );
+ sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
delete pConn;
throw NoConnectException( sMessage, Reference < XInterface > () );
}
@@ -210,7 +211,7 @@ namespace stoc_connector
if( !pNames )
{
static Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
+ seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
pNames = &seqNames;
}
}
@@ -287,3 +288,4 @@ void * SAL_CALL component_getFactory(
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index a68206b61b9f..6ed0e91619c8 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
#include <com/sun/star/connection/XConnection.hpp>
#include <com/sun/star/connection/XConnectionBroadcaster.hpp>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
# include <osl/socket.hxx>
# include <osl/pipe.hxx>
@@ -59,7 +60,7 @@ namespace stoc_connector
}
};
- typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
+ typedef ::boost::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
ReferenceHash< ::com::sun::star::io::XStreamListener>,
ReferenceEqual< ::com::sun::star::io::XStreamListener> >
XStreamListener_hash_set;
@@ -142,3 +143,4 @@ namespace stoc_connector
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/connector/connectr.xml b/io/source/connector/connectr.xml
index bffd94566841..cdeb0df7edec 100644
--- a/io/source/connector/connectr.xml
+++ b/io/source/connector/connectr.xml
@@ -35,10 +35,8 @@
</component-description>
<project-build-dependency> cppuhelper </project-build-dependency>
<project-build-dependency> cppu </project-build-dependency>
- <project-build-dependency> vos </project-build-dependency>
<project-build-dependency> sal </project-build-dependency>
<runtime-module-dependency> cppuhelper2 </runtime-module-dependency>
<runtime-module-dependency> cppu2 </runtime-module-dependency>
- <runtime-module-dependency> vos2 </runtime-module-dependency>
<runtime-module-dependency> sal2 </runtime-module-dependency>
</module-description>
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index 913ff5700971..3069d0523794 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,7 +46,7 @@ namespace stoc_connector {
{
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
// make it unique
- m_sDescription += OUString::createFromAscii( ",uniqueValue=" );
+ m_sDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(",uniqueValue="));
m_sDescription += OUString::valueOf(
sal::static_int_cast< sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_pipe)),
@@ -116,3 +117,4 @@ namespace stoc_connector {
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index dd532a9b5984..1fdd69429190 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -253,3 +254,4 @@ namespace stoc_connector {
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index 364374dc6726..bbaa4dc60478 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,5 @@ void * SAL_CALL component_getFactory(
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/factreg.hxx b/io/source/stm/factreg.hxx
index c8b88895846e..56c097671c89 100644
--- a/io/source/stm/factreg.hxx
+++ b/io/source/stm/factreg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ OUString OPumpImpl_getImplementationName();
Sequence<OUString> OPumpImpl_getSupportedServiceNames(void);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 9388ba368b0e..338df98b7e7b 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
// streams
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include <com/sun/star/io/XObjectInputStream.hpp>
@@ -807,16 +808,13 @@ void ODataOutputStream::writeUTF(const OUString& Value)
writeByte(sal_Int8(0xE0 | ((c >> 12) & 0x0F)));
writeByte(sal_Int8(0x80 | ((c >> 6) & 0x3F)));
writeByte(sal_Int8(0x80 | ((c >> 0) & 0x3F)));
- //written += 2;
}
else
{
writeByte(sal_Int8(0xC0 | ((c >> 6) & 0x1F)));
writeByte(sal_Int8(0x80 | ((c >> 0) & 0x3F)));
- //written += 1;
}
}
- //written += strlen + 2;
}
// XActiveDataSource
@@ -950,7 +948,7 @@ struct hashObjectContainer_Impl
}
};
-typedef hash_map
+typedef boost::unordered_map
<
Reference< XInterface >,
sal_Int32,
@@ -1662,3 +1660,5 @@ Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void)
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 67d4023387a3..a8317d3918a0 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -405,7 +406,7 @@ void OMarkableOutputStream::checkMarksAndFlush() throw( NotConnectedExceptio
// find the smallest mark
sal_Int32 nNextFound = m_nCurrentPos;
- for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
+ for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) {
if( (*ii).second <= nNextFound ) {
nNextFound = (*ii).second;
}
@@ -414,7 +415,7 @@ void OMarkableOutputStream::checkMarksAndFlush() throw( NotConnectedExceptio
if( nNextFound ) {
// some data must be released !
m_nCurrentPos -= nNextFound;
- for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
+ for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) {
(*ii).second -= nNextFound;
}
@@ -729,15 +730,13 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
{
if ( nBytesToSkip < 0 )
throw BufferSizeExceededException(
- ::rtl::OUString::createFromAscii( "precondition not met: XInputStream::skipBytes: non-negative integer required!" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("precondition not met: XInputStream::skipBytes: non-negative integer required!")),
*this
);
// this method is blocking
- sal_Int32 nRead;
Sequence<sal_Int8> seqDummy( nBytesToSkip );
-
- nRead = readBytes( seqDummy , nBytesToSkip );
+ readBytes( seqDummy , nBytesToSkip );
}
sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, RuntimeException)
@@ -938,7 +937,7 @@ void OMarkableInputStream::checkMarksAndFlush()
// find the smallest mark
sal_Int32 nNextFound = m_nCurrentPos;
- for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
+ for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) {
if( (*ii).second <= nNextFound ) {
nNextFound = (*ii).second;
}
@@ -947,7 +946,7 @@ void OMarkableInputStream::checkMarksAndFlush()
if( nNextFound ) {
// some data must be released !
m_nCurrentPos -= nNextFound;
- for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
+ for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) {
(*ii).second -= nNextFound;
}
@@ -1013,3 +1012,5 @@ Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void)
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 63afcf8766c4..79c3da328eaa 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -119,9 +120,6 @@ public: // XServiceInfo
private:
- // DEBUG
- inline void checkInvariant();
-
Reference < XConnectable > m_succ;
Reference < XConnectable > m_pred;
@@ -134,7 +132,7 @@ private:
oslCondition m_conditionBytesAvail;
Mutex m_mutexAccess;
- IFIFO *m_pFIFO;
+ I_FIFO *m_pFIFO;
};
@@ -159,12 +157,6 @@ OPipeImpl::~OPipeImpl()
}
-// These invariants must hold when entering a guarded method or leaving a guarded method.
-void OPipeImpl::checkInvariant()
-{
-
-}
-
sal_Int32 OPipeImpl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
throw( NotConnectedException, BufferSizeExceededException,RuntimeException )
{
@@ -277,7 +269,6 @@ sal_Int32 OPipeImpl::available(void)
OUString( RTL_CONSTASCII_USTRINGPARAM( "Pipe::available NotConnectedException" ) ),
*this );
}
- checkInvariant();
return m_pFIFO->getSize();
}
@@ -306,7 +297,6 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
RuntimeException)
{
MutexGuard guard( m_mutexAccess );
- checkInvariant();
if( m_bOutputStreamClosed )
{
@@ -346,13 +336,13 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
}
m_nBytesToSkip = 0;
}
- catch ( IFIFO_OutOfBoundsException & )
+ catch ( I_FIFO_OutOfBoundsException & )
{
throw BufferSizeExceededException(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Pipe::writeBytes BufferSizeExceededException" )),
*this );
}
- catch ( IFIFO_OutOfMemoryException & )
+ catch ( I_FIFO_OutOfMemoryException & )
{
throw BufferSizeExceededException(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Pipe::writeBytes BufferSizeExceededException" )),
@@ -361,8 +351,6 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
// readBytes may check again if enough bytes are available
osl_setCondition( m_conditionBytesAvail );
-
- checkInvariant();
}
@@ -490,3 +478,4 @@ Sequence<OUString> OPipeImpl_getSupportedServiceNames(void)
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 384c080ca52a..21f03b6169b5 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,13 +53,16 @@
using namespace osl;
using namespace std;
-using namespace rtl;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
using namespace com::sun::star::io;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
#include "factreg.hxx"
namespace io_stm {
@@ -279,7 +283,7 @@ void Pump::run()
if( ! rInput.is() )
{
NotConnectedException exception(
- OUString::createFromAscii( "no input stream set" ) , Reference<XInterface>((OWeakObject*)this) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("no input stream set")) , Reference<XInterface>((OWeakObject*)this) );
throw exception;
}
Sequence< sal_Int8 > aData;
@@ -288,7 +292,7 @@ void Pump::run()
if( ! rOutput.is() )
{
NotConnectedException exception(
- OUString::createFromAscii( "no output stream set" ) , Reference<XInterface>( (OWeakObject*)this) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("no output stream set")) , Reference<XInterface>( (OWeakObject*)this) );
throw exception;
}
rOutput->writeBytes( aData );
@@ -502,3 +506,4 @@ Sequence<OUString> OPumpImpl_getSupportedServiceNames(void)
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/stm.xml b/io/source/stm/stm.xml
index 6909ee93236e..64e76dc8d2c7 100644
--- a/io/source/stm/stm.xml
+++ b/io/source/stm/stm.xml
@@ -269,12 +269,10 @@
<project-build-dependency> cppuhelper </project-build-dependency>
<project-build-dependency> cppu </project-build-dependency>
- <project-build-dependency> vos </project-build-dependency>
<project-build-dependency> sal </project-build-dependency>
<runtime-module-dependency> cppuhelper </runtime-module-dependency>
<runtime-module-dependency> cppu2 </runtime-module-dependency>
- <runtime-module-dependency> vos2MSC </runtime-module-dependency>
<runtime-module-dependency> sal2 </runtime-module-dependency>
</module-description>
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index 408581f6667d..8791c016db7d 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,8 +44,8 @@ using namespace ::com::sun::star::uno;
namespace io_stm {
void MemFIFO::write( const Sequence< sal_Int8 > &seq )
- throw ( IFIFO_OutOfMemoryException,
- IFIFO_OutOfBoundsException )
+ throw ( I_FIFO_OutOfMemoryException,
+ I_FIFO_OutOfBoundsException )
{
try
{
@@ -52,15 +53,15 @@ void MemFIFO::write( const Sequence< sal_Int8 > &seq )
}
catch( IRingBuffer_OutOfMemoryException & )
{
- throw IFIFO_OutOfMemoryException();
+ throw I_FIFO_OutOfMemoryException();
}
catch( IRingBuffer_OutOfBoundsException & )
{
- throw IFIFO_OutOfBoundsException();
+ throw I_FIFO_OutOfBoundsException();
}
}
-void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (IFIFO_OutOfBoundsException)
+void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (I_FIFO_OutOfBoundsException)
{
try
{
@@ -69,11 +70,11 @@ void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (IFIF
}
catch ( IRingBuffer_OutOfBoundsException & )
{
- throw IFIFO_OutOfBoundsException();
+ throw I_FIFO_OutOfBoundsException();
}
}
-void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( IFIFO_OutOfBoundsException )
+void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( I_FIFO_OutOfBoundsException )
{
try
{
@@ -81,7 +82,7 @@ void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( IFIFO_OutOfBoundsException
}
catch( IRingBuffer_OutOfBoundsException & )
{
- throw IFIFO_OutOfBoundsException();
+ throw I_FIFO_OutOfBoundsException();
}
}
@@ -242,3 +243,5 @@ void MemRingBuffer::shrink() throw ()
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 6143c30f9eae..6a792732d4ef 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,30 +42,30 @@
namespace io_stm {
-class IFIFO_OutOfBoundsException :
+class I_FIFO_OutOfBoundsException :
public Exception
{};
-class IFIFO_OutOfMemoryException :
+class I_FIFO_OutOfMemoryException :
public Exception
{};
-class IFIFO
+class I_FIFO
{
public:
- virtual void write( const Sequence<sal_Int8> &) throw( IFIFO_OutOfMemoryException,
- IFIFO_OutOfBoundsException )=0;
+ virtual void write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException,
+ I_FIFO_OutOfBoundsException )=0;
virtual void read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
- throw( IFIFO_OutOfBoundsException )=0;
+ throw( I_FIFO_OutOfBoundsException )=0;
virtual void skip( sal_Int32 nBytesToSkip )
- throw( IFIFO_OutOfBoundsException )=0;
+ throw( I_FIFO_OutOfBoundsException )=0;
virtual sal_Int32 getSize() const throw( ) =0;
virtual void shrink() throw() = 0;
- virtual ~IFIFO() {};
+ virtual ~I_FIFO() {};
};
@@ -136,15 +137,15 @@ private:
class MemFIFO :
- public IFIFO,
- private MemRingBuffer
+ public I_FIFO,
+ private MemRingBuffer
{
public:
- virtual void write( const Sequence<sal_Int8> &) throw( IFIFO_OutOfMemoryException,
- IFIFO_OutOfBoundsException );
+ virtual void write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException,
+ I_FIFO_OutOfBoundsException );
virtual void read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
- throw( IFIFO_OutOfBoundsException );
- virtual void skip( sal_Int32 nBytesToSkip ) throw( IFIFO_OutOfBoundsException );
+ throw( I_FIFO_OutOfBoundsException );
+ virtual void skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException );
virtual sal_Int32 getSize() const throw( )
{ return MemRingBuffer::getSize(); }
virtual void shrink() throw()
@@ -160,3 +161,5 @@ public:
#endif
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-07-11 20:18:13 +0000