diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:24:53 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:47 +0100 |
commit | bf057fab3c0d17bf2832c8d9fc6d34b1b859e660 (patch) | |
tree | 7792f30782655fa9f0830b7320f9ff988c598fb1 /svl/source/config | |
parent | 6f06230da10c6a51c5538f1b5515b341475ea043 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I0f2f81dae91f62639e79799b1bed1b2df1fd79ab
Diffstat (limited to 'svl/source/config')
-rw-r--r-- | svl/source/config/asiancfg.cxx | 4 | ||||
-rw-r--r-- | svl/source/config/cjkoptions.cxx | 2 | ||||
-rw-r--r-- | svl/source/config/ctloptions.cxx | 2 | ||||
-rw-r--r-- | svl/source/config/itemholder2.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx index a4af225c86ba..3386689987f7 100644 --- a/svl/source/config/asiancfg.cxx +++ b/svl/source/config/asiancfg.cxx @@ -135,12 +135,12 @@ void SvxAsianConfig::SetStartEndChars( css::lang::Locale const & locale, OUString const * startChars, OUString const * endChars) { - assert((startChars == 0) == (endChars == 0)); + assert((startChars == nullptr) == (endChars == nullptr)); css::uno::Reference< css::container::XNameContainer > set( officecfg::Office::Common::AsianLayout::StartEndCharacters::get( impl_->batch)); OUString name(toString(locale)); - if (startChars == 0) { + if (startChars == nullptr) { try { set->removeByName(name); } catch (css::container::NoSuchElementException &) {} diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 69d456b907bc..59b82ca49692 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -379,7 +379,7 @@ bool SvtCJKOptions_Impl::IsReadOnly(SvtCJKOptions::EOption eOption) const // global -static SvtCJKOptions_Impl* pCJKOptions = NULL; +static SvtCJKOptions_Impl* pCJKOptions = nullptr; static sal_Int32 nCJKRefCount = 0; namespace { struct theCJKOptionsMutex : public rtl::Static< ::osl::Mutex , theCJKOptionsMutex >{}; } diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 4e526404e864..cb9acf10cd16 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -376,7 +376,7 @@ void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumer } // global -static SvtCTLOptions_Impl* pCTLOptions = NULL; +static SvtCTLOptions_Impl* pCTLOptions = nullptr; static sal_Int32 nCTLRefCount = 0; namespace { struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; } diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 5e46847dc7b5..a3b58097a8c2 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -142,7 +142,7 @@ void ItemHolder2::impl_deleteItem(TItemInfo& rItem) if (rItem.pItem) { delete rItem.pItem; - rItem.pItem = 0; + rItem.pItem = nullptr; } } |