summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-14 16:53:39 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-16 14:18:10 +0000
commit6ac0e9f4d121584c75961bc5b1be739f9fa91f3b (patch)
treed0baf036a0b7855d7c0392f293dc0de9bc43cd36 /sdext
parent83d6099b7d89f91695d34a18b314f16092972efb (diff)
clang-cl loplugin: sdext
Change-Id: I9f5e73b6f561ccb635217227787c6e8a574bdc97 Reviewed-on: https://gerrit.libreoffice.org/29854 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx6
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 6b9b0f869720..7b2b44c79407 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -570,7 +570,7 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen )
#endif
}
- PDFEntry* pRet = NULL;
+ PDFEntry* pRet = nullptr;
unsigned int nEntries = aGrammar.m_aObjectStack.size();
if( nEntries == 1 )
{
@@ -597,14 +597,14 @@ PDFEntry* PDFReader::read( const char* pFileName )
So for the time being bite the bullet and read the whole file.
FIXME: give Spirit 2.x another try when we upgrade boost again.
*/
- PDFEntry* pRet = NULL;
+ PDFEntry* pRet = nullptr;
FILE* fp = fopen( pFileName, "rb" );
if( fp )
{
fseek( fp, 0, SEEK_END );
unsigned int nLen = (unsigned int)ftell( fp );
fseek( fp, 0, SEEK_SET );
- char* pBuf = (char*)rtl_allocateMemory( nLen );
+ char* pBuf = static_cast<char*>(rtl_allocateMemory( nLen ));
if( pBuf )
{
fread( pBuf, 1, nLen, fp );
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 7d4806cb778d..16db05afe870 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
globalParams = new GlobalParams();
globalParams->setErrQuiet(gTrue);
#if defined(_MSC_VER)
- globalParams->setupBaseFonts(NULL);
+ globalParams->setupBaseFonts(nullptr);
#endif
// try to read a possible open password form stdin