diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-11 14:32:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-07-11 14:32:07 +0200 |
| commit | f541b99855bd70781f8d7d655ab259ff9eb596f0 (patch) | |
| tree | 162ea1823d835f484f08aaaf2390a9130a23d5e9 /desktop | |
| parent | 545d5157f26b7fd3c5648ae6e727b1e1addca68f (diff) | |
loplugin:nullptr: Better heuristic to determine code shared between C and C++
Change-Id: I51e1c5fa4639e51fac90f92adf3d87d12960d589
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/inc/dp_misc.h | 2 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_shared.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h index 59956e2bd98c..16cd44273712 100644 --- a/desktop/source/deployment/inc/dp_misc.h +++ b/desktop/source/deployment/inc/dp_misc.h @@ -97,7 +97,7 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC css::uno::Reference< css::uno::XInterface> resolveUnoURL( OUString const & connectString, css::uno::Reference< css::uno::XComponentContext> const & xLocalContext, - AbortChannel * abortChannel = NULL ); + AbortChannel * abortChannel = nullptr ); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool office_is_running(); diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index a11a29beda43..aba49127b30f 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -74,7 +74,7 @@ inline bool readOption( bool * flag, OptionInfo const * option_info, sal_uInt32 * pIndex ) { if (isOption( option_info, pIndex )) { - OSL_ASSERT( flag != NULL ); + OSL_ASSERT( flag != nullptr ); *flag = true; return true; } |