|
 |
f325b2 |
From 4c85fb2dfb79b09598d8196d134398a8bb688b20 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
f325b2 |
Date: Tue, 10 Nov 2015 10:09:37 +0100
|
|
|
f325b2 |
Subject: [PATCH 291/398] loplugin:nullptr (automatic rewrite)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ifbab1c3bdf0bb481477e600978c640cdc052be74
|
|
|
f325b2 |
(cherry picked from commit ebc194c696e5c9b1acf320cfc582b4ab56c14900)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
include/LibreOfficeKit/LibreOfficeKit.hxx | 20 ++++++++++----------
|
|
|
f325b2 |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
|
|
|
f325b2 |
index c51339fa3ba8..dde371ddc95b 100644
|
|
|
f325b2 |
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
|
|
|
f325b2 |
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
|
|
|
f325b2 |
@@ -47,7 +47,7 @@ public:
|
|
|
f325b2 |
* @param pFormat the format to use while exporting, when omitted, then deducted from pURL's extension
|
|
|
f325b2 |
* @param pFilterOptions options for the export filter, e.g. SkipImages.
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
- inline bool saveAs(const char* pUrl, const char* pFormat = NULL, const char* pFilterOptions = NULL)
|
|
|
f325b2 |
+ inline bool saveAs(const char* pUrl, const char* pFormat = nullptr, const char* pFilterOptions = nullptr)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
return mpDoc->pClass->saveAs(mpDoc, pUrl, pFormat, pFilterOptions) != 0;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -220,7 +220,7 @@ public:
|
|
|
f325b2 |
* @param pCommand uno command to be posted to the document, like ".uno:Bold"
|
|
|
f325b2 |
* @param pArguments arguments of the uno command.
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
- inline void postUnoCommand(const char* pCommand, const char* pArguments = 0, bool bNotifyWhenFinished = false)
|
|
|
f325b2 |
+ inline void postUnoCommand(const char* pCommand, const char* pArguments = nullptr, bool bNotifyWhenFinished = false)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
mpDoc->pClass->postUnoCommand(mpDoc, pCommand, pArguments, bNotifyWhenFinished);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -243,7 +243,7 @@ public:
|
|
|
f325b2 |
* @param pMimeType suggests the return format, for example text/plain;charset=utf-8.
|
|
|
f325b2 |
* @param pUsedMimeType output parameter to inform about the determined format (suggested one or plain text).
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
- inline char* getTextSelection(const char* pMimeType, char** pUsedMimeType = 0)
|
|
|
f325b2 |
+ inline char* getTextSelection(const char* pMimeType, char** pUsedMimeType = nullptr)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
return mpDoc->pClass->getTextSelection(mpDoc, pMimeType, pUsedMimeType);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -361,17 +361,17 @@ public:
|
|
|
f325b2 |
* @param pUrl the URL of the document to load
|
|
|
f325b2 |
* @param pFilterOptions options for the import filter, e.g. SkipImages.
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
- inline Document* documentLoad(const char* pUrl, const char* pFilterOptions = NULL)
|
|
|
f325b2 |
+ inline Document* documentLoad(const char* pUrl, const char* pFilterOptions = nullptr)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- LibreOfficeKitDocument* pDoc = NULL;
|
|
|
f325b2 |
+ LibreOfficeKitDocument* pDoc = nullptr;
|
|
|
f325b2 |
|
|
|
f325b2 |
if (LIBREOFFICEKIT_HAS(mpThis, documentLoadWithOptions))
|
|
|
f325b2 |
pDoc = mpThis->pClass->documentLoadWithOptions(mpThis, pUrl, pFilterOptions);
|
|
|
f325b2 |
else
|
|
|
f325b2 |
pDoc = mpThis->pClass->documentLoad(mpThis, pUrl);
|
|
|
f325b2 |
|
|
|
f325b2 |
- if (pDoc == NULL)
|
|
|
f325b2 |
- return NULL;
|
|
|
f325b2 |
+ if (pDoc == nullptr)
|
|
|
f325b2 |
+ return nullptr;
|
|
|
f325b2 |
|
|
|
f325b2 |
return new Document(pDoc);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -405,11 +405,11 @@ public:
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
/// Factory method to create a lok::Office instance.
|
|
|
f325b2 |
-inline Office* lok_cpp_init(const char* pInstallPath, const char* pUserProfilePath = NULL)
|
|
|
f325b2 |
+inline Office* lok_cpp_init(const char* pInstallPath, const char* pUserProfilePath = nullptr)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LibreOfficeKit* pThis = lok_init_2(pInstallPath, pUserProfilePath);
|
|
|
f325b2 |
- if (pThis == NULL || pThis->pClass->nSize == 0)
|
|
|
f325b2 |
- return NULL;
|
|
|
f325b2 |
+ if (pThis == nullptr || pThis->pClass->nSize == 0)
|
|
|
f325b2 |
+ return nullptr;
|
|
|
f325b2 |
return new ::lok::Office(pThis);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|