diff options
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfparse.cxx | 6 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 2 |
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 |