diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:29:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:01 +0100 |
commit | 51b45df6bba163dec7ba91c700de695ad517e5dd (patch) | |
tree | 566633496f4048112c75edbbe250b0f01d86a8dd /xmloff/source/text/XMLTextMarkImportContext.cxx | |
parent | 87bae0e188aa3ce3c31d1aa91707c0fad6b81b65 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I8690de2cb68dcfedc9f2239ce66cea06fd94bc16
Diffstat (limited to 'xmloff/source/text/XMLTextMarkImportContext.cxx')
-rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index f0d34582f180..35e54fff774a 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -141,7 +141,7 @@ static const char *lcl_getFormFieldmarkName(OUString &name) name == "ecma.office-open-xml.field.FORMDROPDOWN") return sFormDropDown; else - return NULL; + return nullptr; } static OUString lcl_getFieldmarkName(OUString const& name) @@ -207,7 +207,7 @@ void XMLTextMarkImportContext::EndElement() case TypeBookmark: { const char *formFieldmarkName=lcl_getFormFieldmarkName(m_sFieldName); - bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && formFieldmarkName!=NULL); //@TODO handle abbreviation cases.. + bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && formFieldmarkName!=nullptr); //@TODO handle abbreviation cases.. // export point bookmark const Reference<XInterface> xContent( CreateAndInsertMark(GetImport(), @@ -382,7 +382,7 @@ Reference<XTextContent> XMLTextMarkImportContext::CreateAndInsertMark( if (!xIfc.is()) { OSL_FAIL("CreateAndInsertMark: cannot create service?"); - return 0; + return nullptr; } // set name (unless there is no name (text:meta)) @@ -396,7 +396,7 @@ Reference<XTextContent> XMLTextMarkImportContext::CreateAndInsertMark( if (!sMarkName.isEmpty()) { OSL_FAIL("name given, but XNamed not supported?"); - return 0; + return nullptr; } } @@ -419,11 +419,11 @@ Reference<XTextContent> XMLTextMarkImportContext::CreateAndInsertMark( catch (com::sun::star::lang::IllegalArgumentException &) { OSL_FAIL("CreateAndInsertMark: cannot insert?"); - return 0; + return nullptr; } } } - return 0; + return nullptr; } bool XMLTextMarkImportContext::FindName( |