diff options
| -rw-r--r-- | cppu/source/threadpool/thread.hxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/docundomanager.cxx | 2 | ||||
| -rw-r--r-- | svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx index 4f1b6da93b33..cc669759cf7e 100644 --- a/cppu/source/threadpool/thread.hxx +++ b/cppu/source/threadpool/thread.hxx @@ -32,7 +32,6 @@ namespace cppu_threadpool { // private thread class for the threadpool - // independent from vos class ORequestThread: public salhelper::SimpleReferenceObject, public osl::Thread diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0332f9093461..3f8cd6c7272f 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2873,10 +2873,8 @@ void Desktop::CheckFirstRun( ) { if (officecfg::Office::Common::Misc::FirstRun::get()) { - // this has once been done using a vos timer. this could lead to problems when - // the timer would trigger when the app is already going down again, since VCL would - // 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#) + // use VCL timer, which won't trigger during shutdown if the + // application exits before timeout m_firstRunTimer.SetTimeout(3000); // 3 sec. m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun)); m_firstRunTimer.Start(); diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index b816e5139159..3b448f028954 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -161,7 +161,7 @@ namespace sfx2 //= 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 { diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index bcf602e75149..1a28f111e641 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -639,7 +639,6 @@ void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException, s sal_Int32 SvxPixelCtlAccessibleChild::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - //::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); return mrParentWindow.GetControlForeground().GetColor(); @@ -647,7 +646,6 @@ sal_Int32 SvxPixelCtlAccessibleChild::getForeground( ) sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - //::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); |