diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:53 +0100 |
commit | 01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch) | |
tree | b8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/source/filter/ascii | |
parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/filter/ascii')
-rw-r--r-- | sw/source/filter/ascii/ascatr.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ascii/parasc.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index 918051dad19a..8fa82a85d96f 100644 --- a/sw/source/filter/ascii/ascatr.cxx +++ b/sw/source/filter/ascii/ascatr.cxx @@ -232,8 +232,8 @@ static Writer& OutASC_SwTextNode( Writer& rWrt, SwContentNode& rNode ) SwNodeFnTab aASCNodeFnTab = { /* RES_TXTNODE */ OutASC_SwTextNode, -/* RES_GRFNODE */ 0, -/* RES_OLENODE */ 0 +/* RES_GRFNODE */ nullptr, +/* RES_OLENODE */ nullptr }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 98b78c36cbc3..db16166a2a02 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -143,7 +143,7 @@ sal_uLong SwASCIIParser::CallParser() ::StartProgress( STR_STATSTR_W4WREAD, 0, nFileSize, pDoc->GetDocShell() ); - SwPaM* pInsPam = 0; + SwPaM* pInsPam = nullptr; sal_Int32 nSttContent = 0; if (!bNewDoc) { @@ -152,7 +152,7 @@ sal_uLong SwASCIIParser::CallParser() nSttContent = pPam->GetPoint()->nContent.GetIndex(); } - SwTextFormatColl *pColl = 0; + SwTextFormatColl *pColl = nullptr; if (bNewDoc) { @@ -234,7 +234,7 @@ sal_uLong SwASCIIParser::CallParser() pDoc->getIDocumentContentOperations().InsertItemSet( *pInsPam, *pItemSet ); } } - delete pItemSet, pItemSet = 0; + delete pItemSet, pItemSet = nullptr; } delete pInsPam; @@ -245,7 +245,7 @@ sal_uLong SwASCIIParser::CallParser() sal_uLong SwASCIIParser::ReadChars() { - sal_Unicode *pStt = 0, *pEnd = 0, *pLastStt = 0; + sal_Unicode *pStt = nullptr, *pEnd = nullptr, *pLastStt = nullptr; long nReadCnt = 0, nLineLen = 0; sal_Unicode cLastCR = 0; bool bSwapUnicode = false; @@ -273,8 +273,8 @@ sal_uLong SwASCIIParser::ReadChars() pUseMe=&aEmpty; } - rtl_TextToUnicodeConverter hConverter=0; - rtl_TextToUnicodeContext hContext=0; + rtl_TextToUnicodeConverter hConverter=nullptr; + rtl_TextToUnicodeContext hContext=nullptr; rtl_TextEncoding currentCharSet = pUseMe->GetCharSet(); if (RTL_TEXTENCODING_UCS2 != currentCharSet) { |