summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-02-15 22:29:32 +0200
committerTor Lillqvist <tml@collabora.com>2016-02-15 22:31:03 +0200
commit4c251ee490523675211afa0f967de2830067f9bc (patch)
treec76c52f75ba25575e5c9790ef447b3baa73e44d9 /desktop
parent8d7f29a933b62ffd754c6a0f05d25e55b8646e74 (diff)
loplugin:nullptr
Change-Id: I768b45818eaa0138d033bfcf6fd6e94459e44c0b
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f69bdd5dafb6..75c17b412ab6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1849,7 +1849,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
static bool bPreInited = false;
// What stage are we at ?
- if (pThis == NULL)
+ if (pThis == nullptr)
eStage = PRE_INIT;
else if (bPreInited)
eStage = SECOND_INIT;
@@ -2019,7 +2019,7 @@ LibreOfficeKit *libreofficekit_hook(const char* install_path)
SAL_JNI_EXPORT
int lok_preinit(const char* install_path, const char* user_profile_path)
{
- return lo_initialize(NULL, install_path, user_profile_path);
+ return lo_initialize(nullptr, install_path, user_profile_path);
}
static void lo_destroy(LibreOfficeKit* pThis)