summaryrefslogtreecommitdiff
path: root/svx/source/form/fmscriptingenv.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:25:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:50 +0100
commit6cd7bf2043146a630925a2e49336f02c802f707a (patch)
tree786cecd8ab993e25cda497d45b68007050c30d61 /svx/source/form/fmscriptingenv.cxx
parent28f4bee7bd7378141d8569186162e1a3166eb012 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'svx/source/form/fmscriptingenv.cxx')
-rw-r--r--svx/source/form/fmscriptingenv.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index ba7c924d621c..f12265025ff6 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -736,7 +736,7 @@ namespace svxform
if ( !impl_allowAsynchronousCall_nothrow( _rEvent.ListenerType.getTypeName(), _rEvent.MethodName ) )
{
- impl_doFireScriptEvent_nothrow( aGuard, _rEvent, NULL );
+ impl_doFireScriptEvent_nothrow( aGuard, _rEvent, nullptr );
return;
}
@@ -766,14 +766,14 @@ namespace svxform
void SAL_CALL FormScriptListener::dispose()
{
::osl::MutexGuard aGuard( m_aMutex );
- m_pScriptExecutor = NULL;
+ m_pScriptExecutor = nullptr;
}
IMPL_LINK_TYPED( FormScriptListener, OnAsyncScriptEvent, void*, p, void )
{
ScriptEvent* _pEvent = static_cast<ScriptEvent*>(p);
- OSL_PRECOND( _pEvent != NULL, "FormScriptListener::OnAsyncScriptEvent: invalid event!" );
+ OSL_PRECOND( _pEvent != nullptr, "FormScriptListener::OnAsyncScriptEvent: invalid event!" );
if ( !_pEvent )
return;
@@ -781,7 +781,7 @@ namespace svxform
::osl::ClearableMutexGuard aGuard( m_aMutex );
if ( !impl_isDisposed_nothrow() )
- impl_doFireScriptEvent_nothrow( aGuard, *_pEvent, NULL );
+ impl_doFireScriptEvent_nothrow( aGuard, *_pEvent, nullptr );
}
delete _pEvent;
@@ -790,7 +790,7 @@ namespace svxform
}
FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel )
- :m_pScriptListener( NULL )
+ :m_pScriptListener( nullptr )
,m_rFormModel( _rModel )
,m_bDisposed( false )
{
@@ -893,7 +893,7 @@ namespace svxform
}
catch( Exception& ) {}
}
- m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : 0 );
+ m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : nullptr );
}
}
@@ -979,7 +979,7 @@ namespace svxform
{
// object shells are not thread safe, so guard the destruction
SolarMutexGuard aSolarGuarsReset;
- xObjectShell = NULL;
+ xObjectShell = nullptr;
}
#endif
}