summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-11 21:03:18 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 19:55:32 -0500
commit300c90d630edcfef8699058148177889bfd5a8a6 (patch)
treed63aa0eb5b9ac2806f9c5d715c9576ddc9a4593e
parent2afa8c18599b5f10f528ec408a0bc60e075bbe72 (diff)
merge vosremoval-timer.diff
-rw-r--r--connectivity/inc/pch/precompiled_connectivity.hxx5
-rw-r--r--connectivity/source/cpool/ZConnectionPool.cxx20
-rw-r--r--connectivity/source/cpool/ZConnectionPool.hxx22
-rw-r--r--connectivity/source/cpool/makefile.mk3
-rw-r--r--framework/inc/helper/timerhelper.hxx2
-rw-r--r--framework/inc/pch/precompiled_framework.hxx2
-rw-r--r--framework/util/makefile.mk1
-rw-r--r--svx/source/fmcomp/trace.cxx2
8 files changed, 30 insertions, 27 deletions
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx
index dd15bc3c63..b95cd05a90 100644
--- a/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/connectivity/inc/pch/precompiled_connectivity.hxx
@@ -308,6 +308,8 @@
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.hxx"
+#include "salhelper/timer.hxx"
+
#include "sys/types.h"
#include "tools/diagnose_ex.h"
@@ -326,9 +328,8 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
-#include "vos/timer.hxx"
//---MARKER---
#endif
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 74994d9d86..0bab54ee67 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -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
@@ -68,7 +68,7 @@ namespace
static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Timeout");
return s_sNodeName;
}
-
+
}
//==========================================================================
//= OConnectionPool
@@ -94,8 +94,8 @@ OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
OPoolCollection::getNodeValue(getTimeoutNodeName(),m_xDriverNode) >>= m_nALiveCount;
calculateTimeOuts();
-
- m_xInvalidator = new OPoolTimer(this,::vos::TTimeValue(m_nTimeOut,0));
+
+ m_xInvalidator = new OPoolTimer(this,::salhelper::TTimeValue(m_nTimeOut,0));
m_xInvalidator->start();
}
// -----------------------------------------------------------------------------
@@ -110,7 +110,7 @@ struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::v
OConnectionPool* m_pConnectionPool;
sal_Bool m_bDispose;
- TRemoveEventListenerFunctor(OConnectionPool* _pConnectionPool,sal_Bool _bDispose = sal_False)
+ TRemoveEventListenerFunctor(OConnectionPool* _pConnectionPool,sal_Bool _bDispose = sal_False)
: m_pConnectionPool(_pConnectionPool)
,m_bDispose(_bDispose)
{
@@ -144,7 +144,7 @@ struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type
{
OConnectionPool* m_pConnectionPool;
- TConnectionPoolFunctor(OConnectionPool* _pConnectionPool)
+ TConnectionPoolFunctor(OConnectionPool* _pConnectionPool)
: m_pConnectionPool(_pConnectionPool)
{
OSL_ENSURE(m_pConnectionPool,"No connection pool!");
@@ -196,7 +196,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const
if ( !xConnection.is() )
xConnection = createNewConnection(_rURL,_rInfo);
-
+
return xConnection;
}
//--------------------------------------------------------------------------
@@ -239,7 +239,7 @@ Reference< XConnection> OConnectionPool::createNewConnection(const ::rtl::OUStri
TConnectionMap::key_type nId;
OConnectionWrapper::createUniqueId(_rURL,aInfo,nId.m_pBuffer);
TConnectionPool aPack;
-
+
// insert the new connection and struct into the active connection map
aPack.nALiveCount = m_nALiveCount;
TActiveConnectionInfo aActiveInfo;
@@ -260,7 +260,7 @@ void OConnectionPool::invalidatePooledConnections()
TConnectionMap::iterator aIter = m_aPool.begin();
for (; aIter != m_aPool.end(); )
{
- if(!(--(aIter->second.nALiveCount))) // connections are invalid
+ if(!(--(aIter->second.nALiveCount))) // connections are invalid
{
::std::for_each(aIter->second.aConnections.begin(),aIter->second.aConnections.end(),TRemoveEventListenerFunctor(this,sal_True));
@@ -303,7 +303,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite
Reference< XComponent > xComponent(xConnection, UNO_QUERY);
if (xComponent.is())
xComponent->addEventListener(this);
-
+
TActiveConnectionInfo aActiveInfo;
aActiveInfo.aPos = _rIter;
aActiveInfo.xPooledConnection = xPooledConnection;
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 284beb968e..47e8bb821d 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -1,7 +1,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
@@ -37,7 +37,7 @@
#include <cppuhelper/implbase1.hxx>
#include <comphelper/stl_types.hxx>
#include <osl/mutex.hxx>
-#include <vos/timer.hxx>
+#include <salhelper/timer.hxx>
#include <vos/ref.hxx>
#include <rtl/digest.h>
@@ -47,12 +47,12 @@ namespace connectivity
//==========================================================================
/// OPoolTimer - Invalidates the connection pool
//==========================================================================
- class OPoolTimer : public ::vos::OTimer
+ class OPoolTimer : public ::salhelper::Timer
{
OConnectionPool* m_pPool;
public:
- OPoolTimer(OConnectionPool* _pPool,const ::vos::TTimeValue& _Time)
- : ::vos::OTimer(_Time)
+ OPoolTimer(OConnectionPool* _pPool,const ::salhelper::TTimeValue& _Time)
+ : ::salhelper::Timer(_Time)
,m_pPool(_pPool)
{}
protected:
@@ -69,7 +69,7 @@ namespace connectivity
typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPooledConnection> > TPooledConnections;
// contains the currently pooled connections
- typedef struct
+ typedef struct
{
TPooledConnections aConnections;
sal_Int32 nALiveCount; // will be decremented everytime a time says to, when will reach zero the pool will be deleted
@@ -82,20 +82,20 @@ namespace connectivity
{
m_pBuffer[0] = 0;
}
-
+
};
// typedef TDigestHolder
struct TDigestLess : public ::std::binary_function< TDigestHolder, TDigestHolder, bool>
{
- bool operator() (const TDigestHolder& x, const TDigestHolder& y) const
- {
+ bool operator() (const TDigestHolder& x, const TDigestHolder& y) const
+ {
sal_uInt32 i;
for(i=0;i < RTL_DIGEST_LENGTH_SHA1 && (x.m_pBuffer[i] >= y.m_pBuffer[i]); ++i)
;
return i < RTL_DIGEST_LENGTH_SHA1;
- }
+ }
};
typedef ::std::map< TDigestHolder,TConnectionPool,TDigestLess> TConnectionMap;
@@ -123,7 +123,7 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory;
sal_Int32 m_nTimeOut;
sal_Int32 m_nALiveCount;
-
+
private:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const ::rtl::OUString& _rURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo);
diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
index 1f6e49c6cb..5ed3341d28 100644
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -63,7 +63,8 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(DBTOOLSLIB) \
- $(SALLIB)
+ $(SALLIB) \
+ $(SALHELPERLIB)
SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx
index 58ff489b51..a296db7d8f 100644
--- a/framework/inc/helper/timerhelper.hxx
+++ b/framework/inc/helper/timerhelper.hxx
@@ -29,7 +29,7 @@
#define __FRAMEWORK_HELPER_TIMERHELPER_HXX_
#include <threadhelp/threadhelpbase.hxx>
-#include <vos/timer.hxx>
+#include <salhelper/timer.hxx>
#include <osl/mutex.hxx>
//........................................................................
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index 07e54531de..a7296fd95c 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -371,6 +371,7 @@
#include "sal/main.h"
#include "salhelper/singletonref.hxx"
+#include "salhelper/timer.hxx"
#include "sot/exchange.hxx"
#include "sot/filelist.hxx"
@@ -488,7 +489,6 @@
#include "vos/process.hxx"
#include "vos/ref.hxx"
#include "vos/thread.hxx"
-#include "vos/timer.hxx"
//---MARKER---
#endif
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 544c543254..85dff0aab6 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -354,6 +354,7 @@ SHL4STDLIBS= \
$(CPPULIB) \
$(SALLIB) \
$(UCBHELPERLIB) \
+ $(SALHELPERLIB) \
$(I18NISOLANGLIB)
SHL4DEF= $(MISC)$/$(SHL4TARGET).def
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index 95355d78a4..c6c33095c5 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -37,7 +37,7 @@
//------------------------------------------------------------------------------
::vos::OMutex Tracer::s_aMapSafety;
-::std::map< ::oslThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > >
+::std::map< ::oslThreadIdentifier, INT32, ::std::less< ::osl::ThreadIdentifier > >
Tracer::s_aThreadIndents;
//------------------------------------------------------------------------------