Kaydet (Commit) b70fb7d7 authored tarafından Michael Stahl's avatar Michael Stahl

everything is independent from vos these days...

Change-Id: Iccb94dcc31d6de8c9e4e7a31b3c2e36d4198b295
üst 6797610b
...@@ -32,7 +32,6 @@ namespace cppu_threadpool { ...@@ -32,7 +32,6 @@ namespace cppu_threadpool {
// private thread class for the threadpool // private thread class for the threadpool
// independent from vos
class ORequestThread: class ORequestThread:
public salhelper::SimpleReferenceObject, public osl::Thread public salhelper::SimpleReferenceObject, public osl::Thread
......
...@@ -2873,10 +2873,8 @@ void Desktop::CheckFirstRun( ) ...@@ -2873,10 +2873,8 @@ void Desktop::CheckFirstRun( )
{ {
if (officecfg::Office::Common::Misc::FirstRun::get()) if (officecfg::Office::Common::Misc::FirstRun::get())
{ {
// this has once been done using a vos timer. this could lead to problems when // use VCL timer, which won't trigger during shutdown if the
// the timer would trigger when the app is already going down again, since VCL would // application exits before timeout
// no longer be available. Since the old handler would do a postUserEvent to the main
// thread anyway, we can use a vcl timer here to prevent the race contition (#107197#)
m_firstRunTimer.SetTimeout(3000); // 3 sec. m_firstRunTimer.SetTimeout(3000); // 3 sec.
m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun)); m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun));
m_firstRunTimer.Start(); m_firstRunTimer.Start();
......
...@@ -161,7 +161,7 @@ namespace sfx2 ...@@ -161,7 +161,7 @@ namespace sfx2
//= SolarMutexFacade //= SolarMutexFacade
/** a facade for the SolarMutex, implementing ::framework::IMutex (as opposed to ::vos::IMutex) /** a facade for the SolarMutex, implementing ::framework::IMutex
*/ */
class SolarMutexFacade : public ::framework::IMutex class SolarMutexFacade : public ::framework::IMutex
{ {
......
...@@ -639,7 +639,6 @@ void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException, s ...@@ -639,7 +639,6 @@ void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException, s
sal_Int32 SvxPixelCtlAccessibleChild::getForeground( ) sal_Int32 SvxPixelCtlAccessibleChild::getForeground( )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (::com::sun::star::uno::RuntimeException, std::exception)
{ {
//::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive(); ThrowExceptionIfNotAlive();
return mrParentWindow.GetControlForeground().GetColor(); return mrParentWindow.GetControlForeground().GetColor();
...@@ -647,7 +646,6 @@ sal_Int32 SvxPixelCtlAccessibleChild::getForeground( ) ...@@ -647,7 +646,6 @@ sal_Int32 SvxPixelCtlAccessibleChild::getForeground( )
sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) sal_Int32 SvxPixelCtlAccessibleChild::getBackground( )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (::com::sun::star::uno::RuntimeException, std::exception)
{ {
//::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive(); ThrowExceptionIfNotAlive();
......
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