diff options
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/deployment/dp_log.cxx | 6 | ||||
-rw-r--r-- | desktop/source/deployment/registry/dp_registry.cxx | 4 | ||||
-rw-r--r-- | desktop/source/splash/unxsplash.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index 4191403b54f5..a11b0d9560e8 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -106,10 +106,10 @@ ProgressLogImpl::ProgressLogImpl( // write log stamp OStringBuffer buf; buf.append( "###### Progress log entry " ); - TimeValue m_start_time, tLocal; + TimeValue aStartTime, tLocal; oslDateTime date_time; - if (osl_getSystemTime( &m_start_time ) && - osl_getLocalTimeFromSystemTime( &m_start_time, &tLocal ) && + if (osl_getSystemTime( &aStartTime ) && + osl_getLocalTimeFromSystemTime( &aStartTime, &tLocal ) && osl_getDateTimeFromTimeValue( &tLocal, &date_time )) { char ar[ 128 ]; diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 8d02f77504dd..02419477b926 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -201,10 +201,10 @@ void PackageRegistryImpl::insertBackend( const OUString mediaType( normalizeMediaType( xPackageType->getMediaType() ) ); - ::std::pair<t_string2registry::iterator, bool> mb_insertion( + ::std::pair<t_string2registry::iterator, bool> a_insertion( m_mediaType2backend.insert( t_string2registry::value_type( mediaType, xBackend ) ) ); - if (mb_insertion.second) + if (a_insertion.second) { // add parameterless media-type, too: sal_Int32 semi = mediaType.indexOf( ';' ); diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx index 7bc5f549047a..cd08acc23a27 100644 --- a/desktop/source/splash/unxsplash.cxx +++ b/desktop/source/splash/unxsplash.cxx @@ -135,10 +135,10 @@ static uno::Reference< uno::XInterface > m_xINSTANCE; uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & ) throw( uno::Exception ) { - static osl::Mutex m_aMutex; + static osl::Mutex s_aMutex; if ( !m_xINSTANCE.is() ) { - osl::MutexGuard guard( m_aMutex ); + osl::MutexGuard guard( s_aMutex ); if ( !m_xINSTANCE.is() ) m_xINSTANCE = static_cast<cppu::OWeakObject*>(new UnxSplashScreen); } |