diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 20:57:51 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:29 -0500 |
| commit | 9db5fb9aa736977261247a8cb58d5ffde234dc28 (patch) | |
| tree | 9cc9f32f894b4773c5bde9c8c721b6135e6389f8 /extensions | |
| parent | c2abeee82654e11cc6f15ff71609d32e816a5243 (diff) | |
merge vosremoval-timer.diff
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/inc/pch/precompiled_extensions.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 18 | ||||
| -rw-r--r-- | extensions/source/plugin/util/makefile.mk | 3 |
3 files changed, 12 insertions, 11 deletions
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx index d8d607a58..39cdf91a1 100644 --- a/extensions/inc/pch/precompiled_extensions.hxx +++ b/extensions/inc/pch/precompiled_extensions.hxx @@ -498,6 +498,7 @@ #include "rtl/uuid.h" #include "salhelper/simplereferenceobject.hxx" +#include "salhelper/timer.hxx" #include "sane/sane.h" @@ -542,7 +543,6 @@ #include "vos/pipe.hxx" #include "vos/ref.hxx" #include "vos/refernce.hxx" -#include "vos/timer.hxx" #include "xmloff/nmspmap.hxx" //---MARKER--- diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index c9f355aa0..610cc8dd1 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.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 @@ -44,7 +44,7 @@ #include <tools/urlobj.hxx> #include <tools/string.hxx> #include <vcl/svapp.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <osl/file.hxx> #ifdef UNX @@ -63,7 +63,7 @@ using namespace com::sun::star::plugin; using namespace rtl; using namespace osl; -class PluginDisposer : public vos::OTimer +class PluginDisposer : public salhelper::Timer { private: XPlugin_Impl* m_pPlugin; @@ -71,8 +71,8 @@ private: virtual void SAL_CALL onShot(); public: PluginDisposer( XPlugin_Impl* pPlugin ) : - OTimer( vos::TTimeValue( 2, 0 ), - vos::TTimeValue( 2, 0 ) ), + salhelper::Timer( salhelper::TTimeValue( 2, 0 ), + salhelper::TTimeValue( 2, 0 ) ), m_pPlugin( pPlugin ) { start(); } ~PluginDisposer() {} @@ -285,7 +285,7 @@ void XPlugin_Impl::prependArg( const char* pName, const char* pValue ) { const char** pNewNames = new const char*[m_nArgs+1]; const char** pNewValues = new const char*[m_nArgs+1]; - + pNewNames[0] = strdup( pName ); pNewValues[0] = strdup( pValue ); for( int nIndex = 0; nIndex < m_nArgs; ++nIndex ) @@ -325,7 +325,7 @@ void XPlugin_Impl::handleSpecialArgs() { } } - + if( aURL.getLength() ) { // set new args, old args need not be freed as there were none set @@ -358,7 +358,7 @@ void XPlugin_Impl::handleSpecialArgs() m_aPluginMode = PluginMode::FULL; // see if we have a TYPE tag - int nIndex; + int nIndex; for( nIndex = 0; nIndex < m_nArgs; ++nIndex ) if( m_pArgn[nIndex][0] == 'T' && m_pArgn[nIndex][1] == 'Y' && @@ -883,7 +883,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, m_aNPWindow.clipRect.left = 0; m_aNPWindow.clipRect.right = ::sal::static_int_cast< uint16, sal_Int32 >( nWidth_ ); m_aNPWindow.clipRect.bottom = ::sal::static_int_cast< uint16, sal_Int32 >( nHeight_ ); - + if( getPluginComm() ) getPluginComm()->NPP_SetWindow( this ); } diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk index 7a8c46c01..60655f123 100644 --- a/extensions/source/plugin/util/makefile.mk +++ b/extensions/source/plugin/util/makefile.mk @@ -91,7 +91,8 @@ SHL1STDLIBS+= \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(SALLIB) + $(SALLIB) \ + $(SALHELPERLIB) .IF "$(GUIBASE)"=="unx" SHL1STDLIBS+=$(X11LINK_DYNAMIC) |