loplugin:nullptr (automatic rewrite)

Change-Id: I8690de2cb68dcfedc9f2239ce66cea06fd94bc16

25 files changed, 163 insertions, 163 deletions

diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index de9fda1e593a..76f9dbeb24ad 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -138,7 +138,7 @@ XMLBitmapStyleContext::~XMLBitmapStyleContext()
 
 SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
     if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) )
     {
         OUString sURL;
@@ -168,7 +168,7 @@ void XMLBitmapStyleContext::EndElement()
     if( sURL.isEmpty() && mxBase64Stream.is() )
     {
         sURL = GetImport().ResolveGraphicObjectURLFromBase64( mxBase64Stream );
-        mxBase64Stream = 0;
+        mxBase64Stream = nullptr;
         maAny <<= sURL;
     }
 
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 864eedf889a8..ba2a7f4f71b7 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -57,7 +57,7 @@ bool XMLMarkerStyleImport::importXML(
     bool bHasPathData   = false;
     OUString aDisplayName;
 
-    SdXMLImExViewBox* pViewBox = NULL;
+    SdXMLImExViewBox* pViewBox = nullptr;
 
     SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
     SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
@@ -97,7 +97,7 @@ bool XMLMarkerStyleImport::importXML(
     {
         basegfx::B2DPolyPolygon aPolyPolygon;
 
-        if(basegfx::tools::importFromSvgD(aPolyPolygon, strPathData, rImport.needFixPositionAfterZ(), 0))
+        if(basegfx::tools::importFromSvgD(aPolyPolygon, strPathData, rImport.needFixPositionAfterZ(), nullptr))
         {
             if(aPolyPolygon.count())
             {
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index 33ea04d9577a..382a1908cc4e 100644
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@@ -40,15 +40,15 @@ using ::std::sort;
 
 MultiPropertySetHelper::MultiPropertySetHelper(
     const sal_Char** pNames ) :
-        pPropertyNames( NULL ),
+        pPropertyNames( nullptr ),
         nLength( 0 ),
         aPropertySequence(),
-        pSequenceIndex( NULL ),
+        pSequenceIndex( nullptr ),
         aValues(),
-        pValues( NULL )
+        pValues( nullptr )
 {
     // first count the elements
-    for( const sal_Char** pPtr = pNames; *pPtr != NULL; pPtr++ )
+    for( const sal_Char** pPtr = pNames; *pPtr != nullptr; pPtr++ )
         nLength++;
 
     // allocate array and create strings
@@ -60,7 +60,7 @@ MultiPropertySetHelper::MultiPropertySetHelper(
 
 MultiPropertySetHelper::~MultiPropertySetHelper()
 {
-    pValues = NULL; // memory 'owned' by aValues
+    pValues = nullptr; // memory 'owned' by aValues
 
     delete[] pSequenceIndex;
     delete[] pPropertyNames;
@@ -73,7 +73,7 @@ void MultiPropertySetHelper::hasProperties(
     DBG_ASSERT( rInfo.is(), "I'd really like an XPropertySetInfo here." );
 
     // allocate sequence index
-    if ( NULL == pSequenceIndex )
+    if ( nullptr == pSequenceIndex )
         pSequenceIndex = new sal_Int16[nLength] ;
 
     // construct pSequenceIndex
@@ -106,7 +106,7 @@ void MultiPropertySetHelper::hasProperties(
 
 bool MultiPropertySetHelper::checkedProperties()
 {
-    return (NULL != pSequenceIndex);
+    return (nullptr != pSequenceIndex);
 }
 
 
diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx
index 155338cb335b..3a0526eeea07 100644
--- a/xmloff/source/style/PageHeaderFooterContext.cxx
+++ b/xmloff/source/style/PageHeaderFooterContext.cxx
@@ -54,7 +54,7 @@ SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPre
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
 
     if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLName, XML_HEADER_FOOTER_PROPERTIES ) )
     {
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 8dd4b0266576..f556c0d42b72 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -101,29 +101,29 @@ struct XMLPropertyStateBuffer
 };
 
 XMLPropertyStateBuffer::XMLPropertyStateBuffer()
-    :   pPMMarginAll( NULL )
-    ,   pPMMarginTop( NULL )
-    ,   pPMMarginBottom( NULL )
-    ,   pPMMarginLeft( NULL )
-    ,   pPMMarginRight( NULL )
+    :   pPMMarginAll( nullptr )
+    ,   pPMMarginTop( nullptr )
+    ,   pPMMarginBottom( nullptr )
+    ,   pPMMarginLeft( nullptr )
+    ,   pPMMarginRight( nullptr )
     ,
-        pPMBorderAll( NULL ),
-        pPMBorderTop( NULL ),
-        pPMBorderBottom( NULL ),
-        pPMBorderLeft( NULL ),
-        pPMBorderRight( NULL ),
-
-        pPMBorderWidthAll( NULL ),
-        pPMBorderWidthTop( NULL ),
-        pPMBorderWidthBottom( NULL ),
-        pPMBorderWidthLeft( NULL ),
-        pPMBorderWidthRight( NULL ),
-
-        pPMPaddingAll( NULL ),
-        pPMPaddingTop( NULL ),
-        pPMPaddingBottom( NULL ),
-        pPMPaddingLeft( NULL ),
-        pPMPaddingRight( NULL )
+        pPMBorderAll( nullptr ),
+        pPMBorderTop( nullptr ),
+        pPMBorderBottom( nullptr ),
+        pPMBorderLeft( nullptr ),
+        pPMBorderRight( nullptr ),
+
+        pPMBorderWidthAll( nullptr ),
+        pPMBorderWidthTop( nullptr ),
+        pPMBorderWidthBottom( nullptr ),
+        pPMBorderWidthLeft( nullptr ),
+        pPMBorderWidthRight( nullptr ),
+
+        pPMPaddingAll( nullptr ),
+        pPMPaddingTop( nullptr ),
+        pPMPaddingBottom( nullptr ),
+        pPMPaddingLeft( nullptr ),
+        pPMPaddingRight( nullptr )
 {
 }
 
@@ -263,8 +263,8 @@ void XMLPageMasterExportPropMapper::handleElementItem(
                 default:
                     assert(false);
                 }
-                const Any*  pPos    = NULL;
-                const Any*  pFilter = NULL;
+                const Any*  pPos    = nullptr;
+                const Any*  pFilter = nullptr;
                 sal_uInt32 nIndex(nIdx - 1);
                 const XMLPropertyState& rFilter = (*pProperties)[nIndex];
                 if (getPropertySetMapper()->GetEntryContextId(rFilter.mnIndex) == nFilter)
@@ -279,7 +279,7 @@ void XMLPageMasterExportPropMapper::handleElementItem(
                     --nIndex;
                 }
                 sal_uInt32 nPropIndex = rProperty.mnIndex;
-                pThis->aBackgroundImageExport.exportXML( rProperty.maValue, pPos, pFilter, NULL,
+                pThis->aBackgroundImageExport.exportXML( rProperty.maValue, pPos, pFilter, nullptr,
                     getPropertySetMapper()->GetEntryNameSpace( nPropIndex ),
                     getPropertySetMapper()->GetEntryXMLName( nPropIndex ) );
             }
@@ -313,33 +313,33 @@ void XMLPageMasterExportPropMapper::ContextFilter(
     XMLPropertyStateBuffer  aHeaderBuffer;
     XMLPropertyStateBuffer  aFooterBuffer;
 
-    XMLPropertyState*       pPMHeaderHeight     = NULL;
-    XMLPropertyState*       pPMHeaderMinHeight  = NULL;
-    XMLPropertyState*       pPMHeaderDynamic    = NULL;
+    XMLPropertyState*       pPMHeaderHeight     = nullptr;
+    XMLPropertyState*       pPMHeaderMinHeight  = nullptr;
+    XMLPropertyState*       pPMHeaderDynamic    = nullptr;
 
-    XMLPropertyState*       pPMFooterHeight     = NULL;
-    XMLPropertyState*       pPMFooterMinHeight  = NULL;
-    XMLPropertyState*       pPMFooterDynamic    = NULL;
+    XMLPropertyState*       pPMFooterHeight     = nullptr;
+    XMLPropertyState*       pPMFooterMinHeight  = nullptr;
+    XMLPropertyState*       pPMFooterDynamic    = nullptr;
 
-    XMLPropertyState*       pPMScaleTo          = NULL;
-    XMLPropertyState*       pPMScaleToPages     = NULL;
-    XMLPropertyState*       pPMScaleToX         = NULL;
-    XMLPropertyState*       pPMScaleToY         = NULL;
-    XMLPropertyState*       pPMStandardMode     = NULL;
-    XMLPropertyState*       pPMGridBaseWidth    = NULL;
+    XMLPropertyState*       pPMScaleTo          = nullptr;
+    XMLPropertyState*       pPMScaleToPages     = nullptr;
+    XMLPropertyState*       pPMScaleToX         = nullptr;
+    XMLPropertyState*       pPMScaleToY         = nullptr;
+    XMLPropertyState*       pPMStandardMode     = nullptr;
+    XMLPropertyState*       pPMGridBaseWidth    = nullptr;
     // same as pPMGridSnapTo but for backward compatibility only
-    XMLPropertyState*       pPMGridSnapToChars  = NULL;
-    XMLPropertyState*       pPMGridSnapTo       = NULL;
+    XMLPropertyState*       pPMGridSnapToChars  = nullptr;
+    XMLPropertyState*       pPMGridSnapTo       = nullptr;
 
-    XMLPropertyState*       pPrint              = NULL;
+    XMLPropertyState*       pPrint              = nullptr;
 
     //UUUU
-    XMLPropertyState* pRepeatOffsetX = NULL;
-    XMLPropertyState* pRepeatOffsetY = NULL;
-    XMLPropertyState* pHeaderRepeatOffsetX = NULL;
-    XMLPropertyState* pHeaderRepeatOffsetY = NULL;
-    XMLPropertyState* pFooterRepeatOffsetX = NULL;
-    XMLPropertyState* pFooterRepeatOffsetY = NULL;
+    XMLPropertyState* pRepeatOffsetX = nullptr;
+    XMLPropertyState* pRepeatOffsetY = nullptr;
+    XMLPropertyState* pHeaderRepeatOffsetX = nullptr;
+    XMLPropertyState* pHeaderRepeatOffsetY = nullptr;
+    XMLPropertyState* pFooterRepeatOffsetX = nullptr;
+    XMLPropertyState* pFooterRepeatOffsetY = nullptr;
 
     rtl::Reference < XMLPropertySetMapper > aPropMapper(getPropertySetMapper());
 
diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index 99462120f2ae..bee90cb2b2ff 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
@@ -49,7 +49,7 @@ public:
                             SvXMLExport& rExport,
                             const XMLPropertyState& rProperty,
                             SvXmlExportFlags nFlags,
-                            const ::std::vector< XMLPropertyState >* pProperties = 0,
+                            const ::std::vector< XMLPropertyState >* pProperties = nullptr,
                             sal_uInt32 nIdx = 0
                             ) const override;
     virtual void        handleSpecialItem(
@@ -57,7 +57,7 @@ public:
                             const XMLPropertyState& rProperty,
                             const SvXMLUnitConverter& rUnitConverter,
                             const SvXMLNamespaceMap& rNamespaceMap,
-                            const ::std::vector< XMLPropertyState >* pProperties = 0,
+                            const ::std::vector< XMLPropertyState >* pProperties = nullptr,
                             sal_uInt32 nIdx = 0
                             ) const override;
 };
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index 08385cdbea35..f1f6fa31da4e 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -285,7 +285,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
                             aSeq[0] = sStyleName;
                             GetImport().SetError(
                                 XMLERROR_STYLE_PROP_VALUE | XMLERROR_FLAG_WARNING,
-                                aSeq,e.Message,NULL);
+                                aSeq,e.Message,nullptr);
                         }
                         break;
                     }
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index b408c6a2c261..c6078c0b4d78 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -85,44 +85,44 @@ bool PageMasterImportPropertyMapper::handleSpecialItem(
 void PageMasterImportPropertyMapper::finished(std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const
 {
     SvXMLImportPropertyMapper::finished(rProperties, nStartIndex, nEndIndex);
-    XMLPropertyState* pAllPaddingProperty = NULL;
-    XMLPropertyState* pPadding[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pNewPadding[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pAllBorderProperty = NULL;
-    XMLPropertyState* pBorders[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pNewBorders[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pAllBorderWidthProperty = NULL;
-    XMLPropertyState* pBorderWidths[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pAllHeaderPaddingProperty = NULL;
-    XMLPropertyState* pHeaderPadding[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pHeaderNewPadding[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pAllHeaderBorderProperty = NULL;
-    XMLPropertyState* pHeaderBorders[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pHeaderNewBorders[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pAllHeaderBorderWidthProperty = NULL;
-    XMLPropertyState* pHeaderBorderWidths[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pAllFooterPaddingProperty = NULL;
-    XMLPropertyState* pFooterPadding[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pFooterNewPadding[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pAllFooterBorderProperty = NULL;
-    XMLPropertyState* pFooterBorders[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pFooterNewBorders[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pAllFooterBorderWidthProperty = NULL;
-    XMLPropertyState* pFooterBorderWidths[4] = { NULL, NULL, NULL, NULL };
-    XMLPropertyState* pHeaderHeight = NULL;
-    XMLPropertyState* pHeaderMinHeight = NULL;
+    XMLPropertyState* pAllPaddingProperty = nullptr;
+    XMLPropertyState* pPadding[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pNewPadding[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pAllBorderProperty = nullptr;
+    XMLPropertyState* pBorders[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pNewBorders[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pAllBorderWidthProperty = nullptr;
+    XMLPropertyState* pBorderWidths[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pAllHeaderPaddingProperty = nullptr;
+    XMLPropertyState* pHeaderPadding[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pHeaderNewPadding[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pAllHeaderBorderProperty = nullptr;
+    XMLPropertyState* pHeaderBorders[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pHeaderNewBorders[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pAllHeaderBorderWidthProperty = nullptr;
+    XMLPropertyState* pHeaderBorderWidths[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pAllFooterPaddingProperty = nullptr;
+    XMLPropertyState* pFooterPadding[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pFooterNewPadding[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pAllFooterBorderProperty = nullptr;
+    XMLPropertyState* pFooterBorders[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pFooterNewBorders[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pAllFooterBorderWidthProperty = nullptr;
+    XMLPropertyState* pFooterBorderWidths[4] = { nullptr, nullptr, nullptr, nullptr };
+    XMLPropertyState* pHeaderHeight = nullptr;
+    XMLPropertyState* pHeaderMinHeight = nullptr;
     std::unique_ptr<XMLPropertyState> xHeaderDynamic;
-    XMLPropertyState* pFooterHeight = NULL;
-    XMLPropertyState* pFooterMinHeight = NULL;
+    XMLPropertyState* pFooterHeight = nullptr;
+    XMLPropertyState* pFooterMinHeight = nullptr;
     std::unique_ptr<XMLPropertyState> xFooterDynamic;
-    XMLPropertyState* pAllMarginProperty = NULL;
-    XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL };
+    XMLPropertyState* pAllMarginProperty = nullptr;
+    XMLPropertyState* pMargins[4] = { nullptr, nullptr, nullptr, nullptr };
     std::unique_ptr<XMLPropertyState> pNewMargins[4];
-    XMLPropertyState* pAllHeaderMarginProperty = NULL;
-    XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL };
+    XMLPropertyState* pAllHeaderMarginProperty = nullptr;
+    XMLPropertyState* pHeaderMargins[4] = { nullptr, nullptr, nullptr, nullptr };
     std::unique_ptr<XMLPropertyState> pNewHeaderMargins[4];
-    XMLPropertyState* pAllFooterMarginProperty = NULL;
-    XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL };
+    XMLPropertyState* pAllFooterMarginProperty = nullptr;
+    XMLPropertyState* pFooterMargins[4] = { nullptr, nullptr, nullptr, nullptr };
     std::unique_ptr<XMLPropertyState> pNewFooterMargins[4];
 
     std::vector< XMLPropertyState >::iterator aEnd = rProperties.end();
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index 02c248d5249a..c904decfb8a3 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -269,7 +269,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
     HFMAP( "FooterFillBitmapOffsetX",             XML_NAMESPACE_DRAW,     XML_TILE_REPEAT_OFFSET,     XML_SW_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY,   CTF_PM_FOOTERREPEAT_OFFSET_X ),
     HFMAP( "FooterFillBitmapOffsetY",             XML_NAMESPACE_DRAW,     XML_TILE_REPEAT_OFFSET,     XML_SW_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY,   CTF_PM_FOOTERREPEAT_OFFSET_Y ),
 
-    { 0L, 0, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFVER_010, false } // index 190
+    { nullptr, 0, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFVER_010, false } // index 190
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index 9fa55fb4c47c..a75af1aa8901 100644
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
@@ -73,7 +73,7 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext(
         default:
             break;
     }
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
 
     switch( mxMapper->getPropertySetMapper()
                     ->GetEntryContextId( rProp.mnIndex ) )
diff --git a/xmloff/source/style/SinglePropertySetInfoCache.cxx b/xmloff/source/style/SinglePropertySetInfoCache.cxx
index aff0fa11761c..e1ca7281ee29 100644
--- a/xmloff/source/style/SinglePropertySetInfoCache.cxx
+++ b/xmloff/source/style/SinglePropertySetInfoCache.cxx
@@ -41,7 +41,7 @@ bool SinglePropertySetInfoCache::hasProperty(
     // getPropertySetInfo returns a new object; Such property set infos must not
     // be cached:
     WeakReference < XPropertySetInfo > xWeakInfo( rPropSetInfo );
-    rPropSetInfo = 0;
+    rPropSetInfo = nullptr;
     rPropSetInfo = xWeakInfo;
     if( rPropSetInfo.is() )
     {
diff --git a/xmloff/source/style/StyleMap.cxx b/xmloff/source/style/StyleMap.cxx
index 339f8e8e20c2..73ee7980d015 100644
--- a/xmloff/source/style/StyleMap.cxx
+++ b/xmloff/source/style/StyleMap.cxx
@@ -58,7 +58,7 @@ StyleMap* StyleMap::getImplementation(Reference<XInterface> xInterface) throw()
         return reinterpret_cast<StyleMap*>(xUnoTunnel->getSomething(StyleMap::getUnoTunnelId()));
     }
 
-    return 0;
+    return nullptr;
 }
 
 // XUnoTunnel
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index a0ee84b2b7de..06c736422785 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -353,7 +353,7 @@ SvXMLImportContext *XMLBackgroundImageContext::CreateChildContext(
         sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLImportContext *pContext = NULL;
+    SvXMLImportContext *pContext = nullptr;
     if( (XML_NAMESPACE_OFFICE == nPrefix) &&
         xmloff::token::IsXMLToken( rLocalName,
                                         xmloff::token::XML_BINARY_DATA ) )
@@ -384,7 +384,7 @@ void XMLBackgroundImageContext::EndElement()
     else if( xBase64Stream.is() )
     {
         sURL = GetImport().ResolveGraphicObjectURLFromBase64( xBase64Stream );
-        xBase64Stream = 0;
+        xBase64Stream = nullptr;
     }
 
     if( sURL.isEmpty() )
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index a4ed61ae25ca..ebae761711e9 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -408,7 +408,7 @@ bool XMLFontStylesContext::FillProperties( const OUString& rName,
     if( pFontStyle )
         pFontStyle->FillProperties( rProps, nFamilyNameIdx, nStyleNameIdx,
                                     nFamilyIdx, nPitchIdx, nCharsetIdx );
-    return 0 != pFontStyle;
+    return nullptr != pFontStyle;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 7c83433b2b34..8e6fe7c35c13 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -175,7 +175,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam
 : maProperties( rProperties ),
   mnPos       ( rFamilyData.mnCount )
 {
-    static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != NULL);
+    static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != nullptr);
 
     if (bHack)
     {
@@ -279,7 +279,7 @@ XMLAutoStylePoolParent::~XMLAutoStylePoolParent()
 bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek )
 {
     bool bAdded = false;
-    XMLAutoStylePoolProperties *pProperties = 0;
+    XMLAutoStylePoolProperties *pProperties = nullptr;
     sal_Int32 nProperties = rProperties.size();
     size_t i = 0;
     for (size_t n = m_PropertiesList.size(); i < n; ++i)
@@ -594,7 +594,7 @@ struct AutoStylePoolExport
     const OUString* mpParent;
     XMLAutoStylePoolProperties* mpProperties;
 
-    AutoStylePoolExport() : mpParent(NULL), mpProperties(NULL) {}
+    AutoStylePoolExport() : mpParent(nullptr), mpProperties(nullptr) {}
 };
 
 struct StyleComparator
@@ -646,7 +646,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
         }
     }
 
-    static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != NULL);
+    static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != nullptr);
 
     if (bHack)
     {
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 546518a40da9..e6b025a984f4 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -44,7 +44,7 @@ using namespace xmloff::token;
 XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
             ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xTempNumberFormatsSupplier)
     : xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ()),
-    pExport(NULL),
+    pExport(nullptr),
     sStandardFormat(XML_STANDARDFORMAT),
     sType(XML_TYPE),
     msCurrencySymbol(XML_CURRENCYSYMBOL),
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index b60119da7164..888983c3aaf0 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -127,7 +127,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::GetPropertyHandler( sal_Int
 // Helper-methods to create and cache PropertyHandler
 const XMLPropertyHandler* XMLPropertyHandlerFactory::GetHdlCache( sal_Int32 nType ) const
 {
-    const XMLPropertyHandler* pRet = NULL;
+    const XMLPropertyHandler* pRet = nullptr;
 
     if( mpImpl->maHandlerCache.find( nType ) != mpImpl->maHandlerCache.end() )
         pRet = mpImpl->maHandlerCache.find( nType )->second;
@@ -157,7 +157,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::GetBasicHandler( sal_Int32
 
 const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_Int32 nType )
 {
-    XMLPropertyHandler* pPropHdl = NULL;
+    XMLPropertyHandler* pPropHdl = nullptr;
 
     switch( nType )
     {
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 45723a99d87e..123ef7efc8f7 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -163,7 +163,7 @@ SvXMLImportContext *XMLPropStyleContext::CreateChildContext(
         const OUString& rLocalName,
         const Reference< XAttributeList > & xAttrList )
 {
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
 
     sal_uInt32 nFamily = 0;
     if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
@@ -478,7 +478,7 @@ void XMLPropStyleContext::Finish( bool bOverwrite )
 
                 GetImport().SetError(
                     XMLERROR_FLAG_ERROR | XMLERROR_PARENT_STYLE_NOT_ALLOWED,
-                    aSequence, e.Message, NULL );
+                    aSequence, e.Message, nullptr );
             }
         }
 
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index bfcc89c38ec5..e03c6e400e31 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -199,7 +199,7 @@ public:
 FilterPropertiesInfo_Impl::FilterPropertiesInfo_Impl() :
     nCount(0),
     aPropInfos(),
-    pApiNames( 0 )
+    pApiNames( nullptr )
 {
     aLastItr = aPropInfos.begin();
 }
@@ -219,7 +219,7 @@ void FilterPropertiesInfo_Impl::AddProperty(
     if( pApiNames )
     {
         delete pApiNames;
-        pApiNames = NULL;
+        pApiNames = nullptr;
     }
 }
 
@@ -354,7 +354,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
     else
     {
         Sequence < PropertyState > aStates;
-        const PropertyState *pStates = 0;
+        const PropertyState *pStates = nullptr;
         Reference< XPropertyState > xPropState( rPropSet, UNO_QUERY );
         if( xPropState.is() )
         {
@@ -594,7 +594,7 @@ vector<XMLPropertyState> SvXMLExportPropertyMapper::_Filter(
 
     sal_Int32 nProps = mpImpl->mxPropMapper->GetEntryCount();
 
-    FilterPropertiesInfo_Impl *pFilterInfo = 0;
+    FilterPropertiesInfo_Impl *pFilterInfo = nullptr;
 
     Impl::CacheType::iterator aIter = mpImpl->maCache.find(xInfo);
     if (aIter != mpImpl->maCache.end())
@@ -903,7 +903,7 @@ void SvXMLExportPropertyMapper::_exportXML(
         uno::Reference< container::XNameContainer > xAttrContainer;
         if( (rProperty.maValue >>= xAttrContainer) && xAttrContainer.is() )
         {
-            SvXMLNamespaceMap *pNewNamespaceMap = 0;
+            SvXMLNamespaceMap *pNewNamespaceMap = nullptr;
             const SvXMLNamespaceMap *pNamespaceMap = &rNamespaceMap;
 
             uno::Sequence< OUString > aAttribNames( xAttrContainer->getElementNames() );
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index b85e0c7f7b71..5bb140a976bf 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -68,7 +68,7 @@ SvXMLImportPropertyMapper::SvXMLImportPropertyMapper(
 
 SvXMLImportPropertyMapper::~SvXMLImportPropertyMapper()
 {
-    mxNextMapper = 0;
+    mxNextMapper = nullptr;
 }
 
 void SvXMLImportPropertyMapper::ChainImportMapper(
@@ -386,7 +386,7 @@ void SvXMLImportPropertyMapper::CheckSpecialContext(
         const sal_Int32 nPropFlags = maPropMapper->GetEntryFlags( nIdx );
 
         // handle no-property and special items
-        if( ( pSpecialContextIds != NULL ) &&
+        if( ( pSpecialContextIds != nullptr ) &&
             ( ( 0 != ( nPropFlags & MID_FLAG_NO_PROPERTY_IMPORT ) ) ||
               ( 0 != ( nPropFlags & MID_FLAG_SPECIAL_ITEM_IMPORT ) )   ) )
         {
@@ -496,7 +496,7 @@ bool SvXMLImportPropertyMapper::_FillPropertySet(
                     aSeq[0] = rPropName;
                     rImport.SetError(
                         XMLERROR_STYLE_PROP_VALUE | XMLERROR_FLAG_ERROR,
-                        aSeq, e.Message, NULL );
+                        aSeq, e.Message, nullptr );
                 }
             }
             catch ( const UnknownPropertyException& e )
@@ -506,7 +506,7 @@ bool SvXMLImportPropertyMapper::_FillPropertySet(
                 aSeq[0] = rPropName;
                 rImport.SetError(
                     XMLERROR_STYLE_PROP_UNKNOWN | XMLERROR_FLAG_ERROR,
-                    aSeq, e.Message, NULL );
+                    aSeq, e.Message, nullptr );
             }
             catch ( const PropertyVetoException& e )
             {
@@ -515,7 +515,7 @@ bool SvXMLImportPropertyMapper::_FillPropertySet(
                 aSeq[0] = rPropName;
                 rImport.SetError(
                     XMLERROR_STYLE_PROP_OTHER | XMLERROR_FLAG_ERROR,
-                    aSeq, e.Message, NULL );
+                    aSeq, e.Message, nullptr );
             }
             catch ( const WrappedTargetException& e )
             {
@@ -524,12 +524,12 @@ bool SvXMLImportPropertyMapper::_FillPropertySet(
                 aSeq[0] = rPropName;
                 rImport.SetError(
                     XMLERROR_STYLE_PROP_OTHER | XMLERROR_FLAG_ERROR,
-                    aSeq, e.Message, NULL );
+                    aSeq, e.Message, nullptr );
             }
         }
 
         // handle no-property and special items
-        if( ( pSpecialContextIds != NULL ) &&
+        if( ( pSpecialContextIds != nullptr ) &&
             ( ( 0 != ( nPropFlags & MID_FLAG_NO_PROPERTY_IMPORT ) ) ||
               ( 0 != ( nPropFlags & MID_FLAG_SPECIAL_ITEM_IMPORT ) )   ) )
         {
@@ -605,7 +605,7 @@ void SvXMLImportPropertyMapper::_PrepareForMultiPropertySet(
         }
 
         // handle no-property and special items
-        if( ( pSpecialContextIds != NULL ) &&
+        if( ( pSpecialContextIds != nullptr ) &&
             ( ( 0 != ( nPropFlags & MID_FLAG_NO_PROPERTY_IMPORT ) ) ||
               ( 0 != ( nPropFlags & MID_FLAG_SPECIAL_ITEM_IMPORT ) )   ) )
         {
@@ -695,7 +695,7 @@ bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet(
     Sequence<OUString> aNames;
     Sequence<Any> aValues;
 
-    _PrepareForMultiPropertySet(rProperties, Reference<XPropertySetInfo>(NULL), rPropMapper, pSpecialContextIds,
+    _PrepareForMultiPropertySet(rProperties, Reference<XPropertySetInfo>(nullptr), rPropMapper, pSpecialContextIds,
         aNames, aValues);
 
     // and, finally, try to set the values
@@ -729,7 +729,7 @@ bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet(
                 };
                 rImport.SetError(
                     XMLERROR_STYLE_PROP_OTHER | XMLERROR_FLAG_ERROR,
-                    aSeq, sMessage, NULL );
+                    aSeq, sMessage, nullptr );
             }
         }
     }
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 6801d3c05fbf..136c3d24bf2e 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -229,9 +229,9 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
             const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) :
     rExport( rExp ),
     sPrefix( OUString("N") ),
-    pFormatter( NULL ),
-    pCharClass( NULL ),
-    pLocaleData( NULL )
+    pFormatter( nullptr ),
+    pCharClass( nullptr ),
+    pLocaleData( nullptr )
 {
     //  supplier must be SvNumberFormatsSupplierObj
     SvNumberFormatsSupplierObj* pObj =
@@ -264,9 +264,9 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
                        const OUString& rPrefix ) :
     rExport( rExp ),
     sPrefix( rPrefix ),
-    pFormatter( NULL ),
-    pCharClass( NULL ),
-    pLocaleData( NULL )
+    pFormatter( nullptr ),
+    pCharClass( nullptr ),
+    pLocaleData( nullptr )
 {
     //  supplier must be SvNumberFormatsSupplierObj
     SvNumberFormatsSupplierObj* pObj =
@@ -1743,7 +1743,7 @@ void SvXMLNumFmtExport::Export( bool bIsAutoStyle )
         return;                         // no formatter -> no entries
 
     sal_uInt32 nKey;
-    const SvNumberformat* pFormat = NULL;
+    const SvNumberformat* pFormat = nullptr;
     bool bNext(pUsedList->GetFirstUsed(nKey));
     while(bNext)
     {
@@ -1797,7 +1797,7 @@ OUString SvXMLNumFmtExport::GetStyleName( sal_uInt32 nKey )
 
 void SvXMLNumFmtExport::SetUsed( sal_uInt32 nKey )
 {
-    DBG_ASSERT( pFormatter != NULL, "missing formatter" );
+    DBG_ASSERT( pFormatter != nullptr, "missing formatter" );
     if( !pFormatter )
         return;
 
@@ -1823,7 +1823,7 @@ void SvXMLNumFmtExport::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed)
 static const SvNumberformat* lcl_GetFormat( SvNumberFormatter* pFormatter,
                            sal_uInt32 nKey )
 {
-    return ( pFormatter != NULL ) ? pFormatter->GetEntry( nKey ) : NULL;
+    return ( pFormatter != nullptr ) ? pFormatter->GetEntry( nKey ) : nullptr;
 }
 
 sal_uInt32 SvXMLNumFmtExport::ForceSystemLanguage( sal_uInt32 nKey )
@@ -1831,9 +1831,9 @@ sal_uInt32 SvXMLNumFmtExport::ForceSystemLanguage( sal_uInt32 nKey )
     sal_uInt32 nRet = nKey;
 
     const SvNumberformat* pFormat = lcl_GetFormat( pFormatter, nKey );
-    if( pFormat != NULL )
+    if( pFormat != nullptr )
     {
-        DBG_ASSERT( pFormatter != NULL, "format without formatter?" );
+        DBG_ASSERT( pFormatter != nullptr, "format without formatter?" );
 
         sal_Int32 nErrorPos;
         short nType = pFormat->GetType();
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index c375a78824ef..a6fdf38bbf0d 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -361,11 +361,11 @@ SvXMLNumImpData::SvXMLNumImpData(
     SvNumberFormatter* pFmt,
     const uno::Reference<uno::XComponentContext>& rxContext )
 :   pFormatter(pFmt),
-    pStylesElemTokenMap(NULL),
-    pStyleElemTokenMap(NULL),
-    pStyleAttrTokenMap(NULL),
-    pStyleElemAttrTokenMap(NULL),
-    pLocaleData(NULL),
+    pStylesElemTokenMap(nullptr),
+    pStyleElemTokenMap(nullptr),
+    pStyleAttrTokenMap(nullptr),
+    pStyleElemAttrTokenMap(nullptr),
+    pLocaleData(nullptr),
     m_xContext(rxContext)
 {
     DBG_ASSERT( rxContext.is(), "got no service manager" );
@@ -1429,7 +1429,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
                                     const sal_Int32 nTempKey,
                                     SvXMLStylesContext& rStyles ) :
     SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_DATA_STYLE ),
-    pData( NULL ),
+    pData( nullptr ),
     pStyles( &rStyles ),
     aMyConditions(),
     nType( 0 ),
@@ -1465,7 +1465,7 @@ SvXMLImportContext* SvXMLNumFormatContext::CreateChildContext(
                                     sal_uInt16 nPrfx, const OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
-    SvXMLImportContext* pContext = NULL;
+    SvXMLImportContext* pContext = nullptr;
 
     const SvXMLTokenMap& rTokenMap = pData->GetStyleElemTokenMap();
     sal_uInt16 nToken = rTokenMap.Get( nPrfx, rLName );
@@ -1556,7 +1556,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert( com::sun::star::uno::Reference
 {
     if (nKey <= -1)
     {
-        SvNumberFormatter* pFormatter = NULL;
+        SvNumberFormatter* pFormatter = nullptr;
         SvNumberFormatsSupplierObj* pObj =
                         SvNumberFormatsSupplierObj::getImplementation( xFormatsSupplier );
         if (pObj)
@@ -2200,7 +2200,7 @@ SvXMLNumFmtHelper::SvXMLNumFmtHelper(
 {
     DBG_ASSERT( rxContext.is(), "got no service manager" );
 
-    SvNumberFormatter* pFormatter = NULL;
+    SvNumberFormatter* pFormatter = nullptr;
     SvNumberFormatsSupplierObj* pObj =
                     SvNumberFormatsSupplierObj::getImplementation( rSupp );
     if (pObj)
@@ -2231,7 +2231,7 @@ SvXMLStyleContext*  SvXMLNumFmtHelper::CreateChildContext( SvXMLImport& rImport,
                 const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                 SvXMLStylesContext& rStyles )
 {
-    SvXMLStyleContext* pContext = NULL;
+    SvXMLStyleContext* pContext = nullptr;
 
     const SvXMLTokenMap& rTokenMap = pData->GetStylesElemTokenMap();
     sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 107fba272ec8..80d1419ca173 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -370,7 +370,7 @@ SvXMLImportContext *SvxXMLListLevelStyleContext_Impl::CreateChildContext(
         sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
     if( XML_NAMESPACE_STYLE == nPrefix &&
         ( IsXMLToken( rLocalName, XML_LIST_LEVEL_PROPERTIES ) ||
              IsXMLToken( rLocalName, XML_TEXT_PROPERTIES ) ) )
@@ -903,7 +903,7 @@ SvXMLImportContext* SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext(
         sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
     if ( XML_NAMESPACE_STYLE == nPrefix &&
          IsXMLToken( rLocalName, XML_LIST_LEVEL_LABEL_ALIGNMENT ) )
     {
@@ -1025,7 +1025,7 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
 ,   sIsPhysical( "IsPhysical"  )
 ,   sNumberingRules( "NumberingRules"  )
 ,   sIsContinuousNumbering( "IsContinuousNumbering"  )
-,   pLevelStyles( 0 )
+,   pLevelStyles( nullptr )
 ,   nLevels( 0 )
 ,   bConsecutive( false )
 ,   bOutline( bOutl )
@@ -1054,7 +1054,7 @@ SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
         const OUString& rLocalName,
         const Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
 
     if( XML_NAMESPACE_TEXT == nPrefix &&
         ( bOutline
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 2e2dcdbff01f..e7b17eca94bd 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -213,7 +213,7 @@ public:
     SvXMLStyleIndex_Impl( sal_uInt16 nFam, const OUString& rName ) :
         sName( rName ),
         nFamily( nFam ),
-        pStyle ( 0 )
+        pStyle ( nullptr )
     {
     }
 
@@ -259,7 +259,7 @@ class SvXMLStylesContext_Impl
     mutable sal_uInt32 m_nIndexCreated;
 #endif
 
-    void FlushIndex() { delete pIndices; pIndices = 0; }
+    void FlushIndex() { delete pIndices; pIndices = nullptr; }
 
 public:
     explicit SvXMLStylesContext_Impl( bool bAuto );
@@ -269,7 +269,7 @@ public:
 
     SvXMLStyleContext *GetStyle( size_t i )
     {
-        return i < aStyles.size() ? aStyles[ i ] : 0;
+        return i < aStyles.size() ? aStyles[ i ] : nullptr;
     }
 
     inline void AddStyle( SvXMLStyleContext *pStyle );
@@ -282,7 +282,7 @@ public:
 };
 
 SvXMLStylesContext_Impl::SvXMLStylesContext_Impl( bool bAuto ) :
-    pIndices( 0 ),
+    pIndices( nullptr ),
     bAutomaticStyle( bAuto )
 #if OSL_DEBUG_LEVEL > 0
     , m_nIndexCreated( 0 )
@@ -325,7 +325,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uIn
                                                                          const OUString& rName,
                                                                          bool bCreateIndex ) const
 {
-    const SvXMLStyleContext *pStyle = 0;
+    const SvXMLStyleContext *pStyle = nullptr;
 
     if( !pIndices && bCreateIndex && !aStyles.empty() )
     {
@@ -384,7 +384,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr
                                                                 const OUString& rLocalName,
                                                                 const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLStyleContext *pStyle = NULL;
+    SvXMLStyleContext *pStyle = nullptr;
 
     if(GetImport().GetDataStylesImport())
     {
@@ -502,7 +502,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleStyleChildContext(
         sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLStyleContext *pStyle = 0;
+    SvXMLStyleContext *pStyle = nullptr;
 
     switch( nFamily )
     {
@@ -536,7 +536,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateDefaultStyleStyleChildContext(
         sal_uInt16 /*nFamily*/, sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/,
         const uno::Reference< xml::sax::XAttributeList > & )
 {
-    return 0;
+    return nullptr;
 }
 
 bool SvXMLStylesContext::InsertStyleFamily( sal_uInt16 ) const
@@ -782,7 +782,7 @@ SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
     msParaStyleServiceName( "com.sun.star.style.ParagraphStyle" ),
     msTextStyleServiceName( "com.sun.star.style.CharacterStyle" ),
     mpImpl( new SvXMLStylesContext_Impl( bAuto ) ),
-    mpStyleStylesElemTokenMap( 0 )
+    mpStyleStylesElemTokenMap( nullptr )
 {
 }
 
@@ -796,7 +796,7 @@ SvXMLImportContext *SvXMLStylesContext::CreateChildContext( sal_uInt16 nPrefix,
                                                             const OUString& rLocalName,
                                                             const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
 
     SvXMLStyleContext *pStyle =
         CreateStyleChildContext( nPrefix, rLocalName, xAttrList );
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 529efd96c62c..75c6d8d22113 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -177,7 +177,7 @@ SvxXMLTabStopImportContext::SvxXMLTabStopImportContext(
                                 const XMLPropertyState& rProp,
                                  ::std::vector< XMLPropertyState > &rProps )
 : XMLElementPropertyContext( rImport, nPrfx, rLName, rProp, rProps ),
-  mpTabStops( NULL )
+  mpTabStops( nullptr )
 {
 }
 
@@ -201,7 +201,7 @@ SvXMLImportContext *SvxXMLTabStopImportContext::CreateChildContext(
                                    const OUString& rLocalName,
                                    const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLImportContext *pContext = 0;
+    SvXMLImportContext *pContext = nullptr;
 
     if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_TAB_STOP ) )
     {