Skip to content

C
core
Kaydet (Commit) 548517c1 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

merge vosremoval-timer.diff

üst d57d662a
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 26 deletions
svl/inc/pch/precompiled_svl.hxx
Dosyayı görüntüle @ 548517c1
......@@ -395,8 +395,7 @@
#include <rtl/ustring.hxx>
#include <rtl/uuid.h>
#include "unotools/configitem.hxx"
#include "unotools/configmgr.hxx"
#include <salhelper/timer.hxx>
#include <sot/clsids.hxx>
......@@ -419,13 +418,13 @@
#include <unotools/numberformatcodewrapper.hxx>
#include <unotools/processfactory.hxx>
#include <vos/mutex.hxx>
#include <vos/process.hxx>
#include <vos/ref.hxx>
#include <vos/refernce.hxx>
#include <vos/security.hxx>
#include <vos/thread.hxx>
#include <vos/timer.hxx>
//---MARKER---
......
svtools/inc/pch/precompiled_svtools.hxx
Dosyayı görüntüle @ 548517c1
......@@ -395,8 +395,7 @@
#include <rtl/ustring.hxx>
#include <rtl/uuid.h>
#include "unotools/configitem.hxx"
#include "unotools/configmgr.hxx"
#include <salhelper/timer.hxx>
#include <sot/clsids.hxx>
......@@ -428,7 +427,6 @@
#include <vos/process.hxx>
#include <vos/ref.hxx>
#include <vos/refernce.hxx>
#include <vos/timer.hxx>
//---MARKER---
......
svtools/source/contnr/fileview.cxx
Dosyayı görüntüle @ 548517c1
......@@ -72,7 +72,7 @@
#include <tools/config.hxx>
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
#include <vos/timer.hxx>
#include <salhelper/timer.hxx>
#include <vcl/svapp.hxx>
#include <vcl/sound.hxx>
#include <unotools/ucbhelper.hxx>
......@@ -90,7 +90,6 @@ using namespace ::com::sun::star::beans;
using namespace ::comphelper;
using ::svt::SortingData_Impl;
using ::svt::FolderDescriptor;
using ::vos::TTimeValue;
using ::rtl::OUString;
#define ALL_FILES_FILTER "*.*"
......@@ -120,7 +119,7 @@ namespace
//====================================================================
//= CallbackTimer
//====================================================================
class CallbackTimer : public ::vos::OTimer
class CallbackTimer : public ::salhelper::Timer
{
protected:
ITimeoutHandler* m_pTimeoutHandler;
......@@ -534,7 +533,7 @@ protected:
m_pContentEnumerator;
Link m_aCurrentAsyncActionHandler;
::osl::Condition m_aAsyncActionFinished;
::rtl::Reference< ::vos::OTimer > m_pCancelAsyncTimer;
::rtl::Reference< ::salhelper::Timer > m_pCancelAsyncTimer;
::svt::EnumerationResult m_eAsyncActionResult;
bool m_bRunningAsyncAction;
bool m_bAsyncActionCancelled;
......@@ -2019,7 +2018,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
"SvtFileView_Impl::GetFolderContent_Impl: invalid maximum timeout!" );
if ( nMaxTimeout <= nMinTimeout )
nMaxTimeout = nMinTimeout + 5000;
m_pCancelAsyncTimer->setRemainingTime( TTimeValue( nMaxTimeout - nMinTimeout ) );
m_pCancelAsyncTimer->setRemainingTime( salhelper::TTimeValue( nMaxTimeout - nMinTimeout ) );
// we already waited for nMinTimeout milliseconds, so take this into account
m_pCancelAsyncTimer->start();
......
svtools/source/graphic/grfcache.cxx
Dosyayı görüntüle @ 548517c1
......@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
#include <vos/timer.hxx>
#include <salhelper/timer.hxx>
#include <tools/debug.hxx>
#include <vcl/outdev.hxx>
#include <tools/poly.hxx>
......@@ -410,7 +410,7 @@ class GraphicDisplayCacheEntry
{
private:
::vos::TTimeValue maReleaseTime;
::salhelper::TTimeValue maReleaseTime;
const GraphicCacheEntry* mpRefCacheEntry;
GDIMetaFile* mpMtf;
BitmapEx* mpBmpEx;
......@@ -463,8 +463,8 @@ public:
ULONG GetOutDevDrawMode() const { return mnOutDevDrawMode; }
USHORT GetOutDevBitCount() const { return mnOutDevBitCount; }
void SetReleaseTime( const ::vos::TTimeValue& rReleaseTime ) { maReleaseTime = rReleaseTime; }
const ::vos::TTimeValue& GetReleaseTime() const { return maReleaseTime; }
void SetReleaseTime( const ::salhelper::TTimeValue& rReleaseTime ) { maReleaseTime = rReleaseTime; }
const ::salhelper::TTimeValue& GetReleaseTime() const { return maReleaseTime; }
BOOL Matches( OutputDevice* pOut, const Point& /*rPtPixel*/, const Size& rSzPixel,
const GraphicCacheEntry* pCacheEntry, const GraphicAttr& rAttr ) const
......@@ -802,12 +802,12 @@ void GraphicCache::SetCacheTimeout( ULONG nTimeoutSeconds )
if( mnReleaseTimeoutSeconds != nTimeoutSeconds )
{
GraphicDisplayCacheEntry* pDisplayEntry = (GraphicDisplayCacheEntry*) maDisplayCache.First();
::vos::TTimeValue aReleaseTime;
::salhelper::TTimeValue aReleaseTime;
if( ( mnReleaseTimeoutSeconds = nTimeoutSeconds ) != 0 )
{
osl_getSystemTime( &aReleaseTime );
aReleaseTime.addTime( ::vos::TTimeValue( nTimeoutSeconds, 0 ) );
aReleaseTime.addTime( ::salhelper::TTimeValue( nTimeoutSeconds, 0 ) );
}
while( pDisplayEntry )
......@@ -898,10 +898,10 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt,
if( GetCacheTimeout() )
{
::vos::TTimeValue aReleaseTime;
::salhelper::TTimeValue aReleaseTime;
osl_getSystemTime( &aReleaseTime );
aReleaseTime.addTime( ::vos::TTimeValue( GetCacheTimeout(), 0 ) );
aReleaseTime.addTime( ::salhelper::TTimeValue( GetCacheTimeout(), 0 ) );
pNewEntry->SetReleaseTime( aReleaseTime );
}
......@@ -932,10 +932,10 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt,
if( GetCacheTimeout() )
{
::vos::TTimeValue aReleaseTime;
::salhelper::TTimeValue aReleaseTime;
osl_getSystemTime( &aReleaseTime );
aReleaseTime.addTime( ::vos::TTimeValue( GetCacheTimeout(), 0 ) );
aReleaseTime.addTime( ::salhelper::TTimeValue( GetCacheTimeout(), 0 ) );
pNewEntry->SetReleaseTime( aReleaseTime );
}
......@@ -962,7 +962,7 @@ BOOL GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, co
{
if( pDisplayCacheEntry->Matches( pOut, aPtPixel, aSzPixel, pCacheEntry, rAttr ) )
{
::vos::TTimeValue aReleaseTime;
::salhelper::TTimeValue aReleaseTime;
// put found object at last used position
maDisplayCache.Insert( maDisplayCache.Remove( pDisplayCacheEntry ), LIST_APPEND );
......@@ -970,7 +970,7 @@ BOOL GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, co
if( GetCacheTimeout() )
{
osl_getSystemTime( &aReleaseTime );
aReleaseTime.addTime( ::vos::TTimeValue( GetCacheTimeout(), 0 ) );
aReleaseTime.addTime( ::salhelper::TTimeValue( GetCacheTimeout(), 0 ) );
}
pDisplayCacheEntry->SetReleaseTime( aReleaseTime );
......@@ -1037,14 +1037,14 @@ IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer )
{
pTimer->Stop();
::vos::TTimeValue aCurTime;
::salhelper::TTimeValue aCurTime;
GraphicDisplayCacheEntry* pDisplayEntry = (GraphicDisplayCacheEntry*) maDisplayCache.First();
osl_getSystemTime( &aCurTime );
while( pDisplayEntry )
{
const ::vos::TTimeValue& rReleaseTime = pDisplayEntry->GetReleaseTime();
const ::salhelper::TTimeValue& rReleaseTime = pDisplayEntry->GetReleaseTime();
if( !rReleaseTime.isEmpty() && ( rReleaseTime < aCurTime ) )
{
......
svtools/util/makefile.mk
Dosyayı görüntüle @ 548517c1
......@@ -122,6 +122,7 @@ SHL1STDLIBS+= \
$(CPPULIB) \
$(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(ICUUCLIB) \
$(JVMFWKLIB) \
$(BASEGFXLIB)
......
tools/inc/pch/precompiled_tools.hxx
Dosyayı görüntüle @ 548517c1
......@@ -82,13 +82,14 @@
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "salhelper/timer.hxx"
#include "sys/stat.h"
#include "sys/types.h"
#include "vos/macros.hxx"
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/timer.hxx"
//---MARKER---
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment