summaryrefslogtreecommitdiff
path: root/io/source/connector/connector.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:23:21 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:23:21 +0200
commit5847d2ab92aa35223e03e1adab486d7c73e2349c (patch)
tree66781e290f2adf8d25ca68681b1e95b93435ac81 /io/source/connector/connector.hxx
parentb8867927e2fee37ed60b1b8773bcc0dc7e2b91cd (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit dc53bbdbf2e1d0cbb53bb4619188955698f8a5c2 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:09 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit e4601251b90e2555b032eadbdaa56dcfb91b5aae Author: Noel Power <noel.power@novell.com> Date: Wed Apr 13 18:52:58 2011 +0100 fix for fdo#35108 allow dot net clients to bootstrap libreoffice Signed-off-by: Petr Mladek <pmladek@suse.cz> cli_ure/source/native/native_bootstrap.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1818bf1dbc330974c749ca17b4d7b79796587fae Author: Jani Monoses <jani.monoses@canonical.com> Date: Mon Mar 14 19:10:04 2011 +0100 prefer gcc __sync functions over pthread Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> sal/osl/unx/interlck.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
Notes
split repo tag: ure_libreoffice-3.3.3.1 split repo tag: ure_libreoffice-3.3.4.1
Diffstat (limited to 'io/source/connector/connector.hxx')
-rw-r--r--io/source/connector/connector.hxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index ed4015ded0a5..fd53b5120df5 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
namespace stoc_connector
{
extern rtl_StandardModuleCount g_moduleCount;
-
+
template<class T>
struct ReferenceHash
{
@@ -53,26 +53,26 @@ namespace stoc_connector
template<class T>
struct ReferenceEqual
{
- sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1,
+ sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1,
const ::com::sun::star::uno::Reference<T> & op2) const
{
return op1.get() == op2.get();
}
};
- typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
- ReferenceHash< ::com::sun::star::io::XStreamListener>,
+ typedef ::std::hash_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;
class PipeConnection :
public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection >
-
+
{
public:
PipeConnection( const ::rtl::OUString &sConnectionDescription );
virtual ~PipeConnection();
-
+
virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
sal_Int32 nBytesToRead )
throw(::com::sun::star::io::IOException,
@@ -96,12 +96,12 @@ namespace stoc_connector
class SocketConnection :
public ::cppu::WeakImplHelper2< ::com::sun::star::connection::XConnection, ::com::sun::star::connection::XConnectionBroadcaster >
-
+
{
public:
SocketConnection( const ::rtl::OUString & sConnectionDescription );
virtual ~SocketConnection();
-
+
virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
sal_Int32 nBytesToRead )
throw(::com::sun::star::io::IOException,
@@ -120,14 +120,14 @@ namespace stoc_connector
// XConnectionBroadcaster
- virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
+ virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
+ virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
throw(::com::sun::star::uno::RuntimeException);
public:
void completeConnectionString();
-
+
::osl::ConnectorSocket m_socket;
::osl::SocketAddr m_addr;
oslInterlockedCount m_nStatus;