loplugin:nullptr (automatic rewrite)

Change-Id: I61e494952df8cc40fff3ccad0936adf06035dbeb

6 files changed, 24 insertions, 24 deletions

diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 76ddbde5e6b6..883496556a97 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -102,7 +102,7 @@ FlashExporter::FlashExporter(
     , mxSelectedDrawPage(rxSelectedDrawPage)
     , mbExportSelection(false)
 
-    , mpWriter(NULL)
+    , mpWriter(nullptr)
     , mnDocWidth(0)
     , mnDocHeight(0)
     , mnJPEGcompressMode(nJPEGCompressMode)
@@ -127,7 +127,7 @@ FlashExporter::~FlashExporter()
 void FlashExporter::Flush()
 {
     delete mpWriter;
-    mpWriter = NULL;
+    mpWriter = nullptr;
 
     maPagesMap.clear();
 }
@@ -290,7 +290,7 @@ bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Reference< X
 
     try
     {
-        if( NULL == mpWriter )
+        if( nullptr == mpWriter )
         {
             xPropSet->getPropertyValue( "Width" ) >>= mnDocWidth;
             xPropSet->getPropertyValue( "Height" ) >>= mnDocHeight;
@@ -324,7 +324,7 @@ sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, R
     if( !xDrawPage.is() || !xPropSet.is() )
         return 0;
 
-    if( NULL == mpWriter )
+    if( nullptr == mpWriter )
     {
         xPropSet->getPropertyValue( "Width" ) >>= mnDocWidth;
         xPropSet->getPropertyValue( "Height" ) >>= mnDocHeight;
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index c72256516e43..2975e08c4812 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -369,7 +369,7 @@ bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& a
 
     fullpath = swfdirpath + STR("/backgroundconfig.txt");
 
-    oslFileHandle xBackgroundConfig( 0 );
+    oslFileHandle xBackgroundConfig( nullptr );
 
     // AS: Only export the background config if we're exporting all of the pages, otherwise we'll
     //  screw it up.
@@ -454,7 +454,7 @@ bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& a
 
 bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDescriptor)
 {
-    Reference < XOutputStream > xOutputStream = findPropertyValue<Reference<XOutputStream> >(aDescriptor, "OutputStream", 0);
+    Reference < XOutputStream > xOutputStream = findPropertyValue<Reference<XOutputStream> >(aDescriptor, "OutputStream", nullptr);
     Sequence< PropertyValue > aFilterData;
 
     if (!xOutputStream.is() )
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index f09ca4bd36b1..9956662cdf0f 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -36,7 +36,7 @@ extern "C"
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     if( pServiceManager )
     {
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index c705cab74981..fe1e67f29256 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -42,9 +42,9 @@ static sal_Int32 map100thmm( sal_Int32 n100thMM )
 
 
 Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nJPEGcompressMode )
-:   mpClipPolyPolygon( NULL ),
-    mpTag( NULL ),
-    mpSprite( NULL ),
+:   mpClipPolyPolygon( nullptr ),
+    mpTag( nullptr ),
+    mpSprite( nullptr ),
     mnNextId( 1 ),
     mnGlobalTransparency(0),
     mnJPEGCompressMode(nJPEGcompressMode)
@@ -208,7 +208,7 @@ void Writer::endSprite()
             mvSpriteStack.pop();
         }
         else
-            mpSprite = NULL;
+            mpSprite = nullptr;
     }
 }
 
@@ -222,7 +222,7 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int
 
     aBits.writeUB( sal_uInt32(nClip != 0), 1 ); // Has Clip Actions?
     aBits.writeUB( 0, 1 );              // reserved
-    aBits.writeUB( sal_uInt32(pName != NULL), 1 ); // has a name
+    aBits.writeUB( sal_uInt32(pName != nullptr), 1 ); // has a name
     aBits.writeUB( 0, 1 );              // no ratio
     aBits.writeUB( 0, 1 );              // no color transform
     aBits.writeUB( 1, 1 );              // has a matrix
@@ -261,7 +261,7 @@ void Writer::removeShape( sal_uInt16 nDepth )
 
 void Writer::startTag( sal_uInt8 nTagId )
 {
-    DBG_ASSERT( mpTag == NULL, "Last tag was not ended");
+    DBG_ASSERT( mpTag == nullptr, "Last tag was not ended");
 
     mpTag = new Tag( nTagId );
 }
@@ -275,13 +275,13 @@ void Writer::endTag()
     if( mpSprite && ( (nTag == TAG_END) || (nTag == TAG_SHOWFRAME) || (nTag == TAG_DOACTION) || (nTag == TAG_STARTSOUND) || (nTag == TAG_PLACEOBJECT) || (nTag == TAG_PLACEOBJECT2) || (nTag == TAG_REMOVEOBJECT2) || (nTag == TAG_FRAMELABEL) ) )
     {
         mpSprite->addTag( mpTag );
-        mpTag = NULL;
+        mpTag = nullptr;
     }
     else
     {
         mpTag->write( *mpMovieStream );
         delete mpTag;
-        mpTag = NULL;
+        mpTag = nullptr;
     }
 }
 
@@ -292,7 +292,7 @@ void Writer::showFrame()
     startTag( TAG_SHOWFRAME );
     endTag();
 
-    if(NULL == mpSprite)
+    if(nullptr == mpSprite)
         mnFrames++;
 }
 
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 2ef8ba2f51e4..b362082ef7d5 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -301,7 +301,7 @@ public:
     // control tags
 
     /** inserts a place shape tag into the movie stream or the current sprite */
-    void placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y, sal_uInt16 nClipDepth = 0, const char* pName = NULL );
+    void placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y, sal_uInt16 nClipDepth = 0, const char* pName = nullptr );
 
     /** inserts a remove shape tag into the movie stream or the current sprite */
     void removeShape( sal_uInt16 nDepth );
@@ -348,7 +348,7 @@ private:
     void Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth );
     void Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor );
     void Impl_writeGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient );
-    void Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL );
+    void Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = nullptr );
     void Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY );
     void Impl_writeEllipse( const Point& rCenter, long nRadX, long nRadY );
     bool Impl_writeFilling( SvtGraphicFill& rFilling );
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index c7cf0383fa32..28bae703090e 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -351,7 +351,7 @@ void Writer::Impl_writeGradientEx( const tools::PolyPolygon& rPolyPoly, const Gr
                 Impl_writeActions( aTmpMtf );
             }
 
-            setClipping( NULL );
+            setClipping( nullptr );
         }
     }
 }
@@ -839,7 +839,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
     }
 
     // Figure out JPEG size
-    const sal_uInt8* pJpgData = NULL;;
+    const sal_uInt8* pJpgData = nullptr;;
     sal_uInt32 nJpgDataLength = 0xffffffff;
 
     Graphic aGraphic( bmpSource );
@@ -1624,7 +1624,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
 
                 if( pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN") )
                 {
-                    const MetaGradientExAction* pGradAction = NULL;
+                    const MetaGradientExAction* pGradAction = nullptr;
                     bool                    bDone = false;
 
                     while( !bDone && ( ++i < nCount ) )
@@ -1764,14 +1764,14 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
             case( MetaActionType::TEXT ):
             {
                 const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction);
-                Impl_writeText( pA->GetPoint(),  pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), NULL, 0);
+                Impl_writeText( pA->GetPoint(),  pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), nullptr, 0);
             }
             break;
 
             case( MetaActionType::TEXTRECT ):
             {
                 const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction);
-                Impl_writeText( pA->GetRect().TopLeft(), pA->GetText(), NULL, 0  );
+                Impl_writeText( pA->GetRect().TopLeft(), pA->GetText(), nullptr, 0  );
             }
             break;
 
@@ -1785,7 +1785,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
             case( MetaActionType::STRETCHTEXT ):
             {
                 const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction);
-                Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), NULL, pA->GetWidth() );
+                Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), nullptr, pA->GetWidth() );
             }
             break;