diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-21 14:18:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-21 14:19:10 +0200 |
| commit | 19277d02fb996058e896725bae7500f356f08af0 (patch) | |
| tree | 243a2fc5bbba794f03a865527407304aa2de4554 /embeddedobj | |
| parent | bcce27d2832a2b098a42cbbd365df35948b9d0ac (diff) | |
osl_getThreadIdentifier(0) -> osl::Thread::getCurrentIdentifier()
Change-Id: Ida9785c4b9fda0459769957734952e69d7a9de44
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/olepersist.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index f352fdd32c24..7ccfe37021a3 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -41,7 +41,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/classids.hxx> - +#include <osl/thread.hxx> #include <olecomponent.hxx> #include <closepreventer.hxx> @@ -212,7 +212,7 @@ void VerbExecutionController::StartControlExecution() if ( !m_bVerbExecutionInProgress && !m_bWasEverActive ) { m_bVerbExecutionInProgress = sal_True; - m_nVerbExecutionThreadIdentifier = osl_getThreadIdentifier( NULL ); + m_nVerbExecutionThreadIdentifier = osl::Thread::getCurrentIdentifier(); m_bChangedOnVerbExecution = sal_False; } } @@ -223,7 +223,7 @@ sal_Bool VerbExecutionController::EndControlExecution_WasModified() osl::MutexGuard aGuard( m_aVerbExecutionMutex ); sal_Bool bResult = sal_False; - if ( m_bVerbExecutionInProgress && m_nVerbExecutionThreadIdentifier == osl_getThreadIdentifier( NULL ) ) + if ( m_bVerbExecutionInProgress && m_nVerbExecutionThreadIdentifier == osl::Thread::getCurrentIdentifier() ) { bResult = m_bChangedOnVerbExecution; m_bVerbExecutionInProgress = sal_False; @@ -237,7 +237,7 @@ void VerbExecutionController::ModificationNotificationIsDone() { osl::MutexGuard aGuard( m_aVerbExecutionMutex ); - if ( m_bVerbExecutionInProgress && osl_getThreadIdentifier( NULL ) == m_nVerbExecutionThreadIdentifier ) + if ( m_bVerbExecutionInProgress && osl::Thread::getCurrentIdentifier() == m_nVerbExecutionThreadIdentifier ) m_bChangedOnVerbExecution = sal_True; } #endif |