[Libreoffice-commits] core.git: sdext/source

[Stephan Bergmann]

 sdext/source/pdfimport/sax/emitcontext.cxx      |    8 ++++----
 sdext/source/pdfimport/tree/genericelements.hxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b9a25b254b93568607285f9396c87f4286d7132e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 8 17:08:34 2016 +0100

    Various loplugin warnings
    
    Change-Id: I7a405bc22d6ff337d53ad2c187f2ae1726798bb5

diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index f816510..5261646 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -29,7 +29,7 @@
 
 #if OSL_DEBUG_LEVEL > 0
 #include <osl/file.hxx>
-static osl::File* pStream = NULL;
+static osl::File* pStream = nullptr;
 static int nIndent = 0;
 #endif
 
@@ -58,7 +58,7 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc
         osl_getFileURLFromSystemPath( aStr.pData, &aFileURL.pData );
         OUStringBuffer aBuf( 256 );
         aBuf.append( aFileURL );
-        aBuf.appendAscii( "/pdfimport.xml" );
+        aBuf.append( "/pdfimport.xml" );
         pStream = new osl::File( aBuf.makeStringAndClear() );
         if( pStream->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ) )
         {
@@ -67,7 +67,7 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc
         }
     }
     else
-        pStream = 0;
+        pStream = nullptr;
 #endif
 }
 
@@ -85,7 +85,7 @@ SaxEmitter::~SaxEmitter()
     {
         pStream->close();
         delete pStream;
-        pStream = 0;
+        pStream = nullptr;
     }
 #endif
 }
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index 6fac290..fbed71e 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -218,7 +218,7 @@ namespace pdfi
         void updateGeometry();
 
 #if OSL_DEBUG_LEVEL > 0
-        virtual void emitStructure( int nLevel );
+        virtual void emitStructure( int nLevel ) override;
 #endif
 
         basegfx::B2DPolyPolygon PolyPoly;