diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:28 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:50 +0100 |
commit | 6cd7bf2043146a630925a2e49336f02c802f707a (patch) | |
tree | 786cecd8ab993e25cda497d45b68007050c30d61 /svx/source/accessibility/ShapeTypeHandler.cxx | |
parent | 28f4bee7bd7378141d8569186162e1a3166eb012 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'svx/source/accessibility/ShapeTypeHandler.cxx')
-rw-r--r-- | svx/source/accessibility/ShapeTypeHandler.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index bacd47c1ad9a..c6e27664044d 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { // Pointer to the shape type handler singleton. -ShapeTypeHandler* ShapeTypeHandler::instance = NULL; +ShapeTypeHandler* ShapeTypeHandler::instance = nullptr; // Create an empty reference to an accessible object. @@ -48,7 +48,7 @@ AccessibleShape* const AccessibleShapeTreeInfo& /*rShapeTreeInfo*/, ShapeTypeId /*nId*/) { - return NULL; + return nullptr; } @@ -58,10 +58,10 @@ ShapeTypeHandler& ShapeTypeHandler::Instance() { // Using double check pattern to make sure that exactly one instance of // the shape type handler is instantiated. - if (instance == NULL) + if (instance == nullptr) { SolarMutexGuard aGuard; - if (instance == NULL) + if (instance == nullptr) { // Create the single instance of the shape type handler. instance = new ShapeTypeHandler; @@ -154,7 +154,7 @@ ShapeTypeHandler::~ShapeTypeHandler() // we reset the static variable instance, so that further calls to // getInstance do not return an undefined object but create a new // singleton. - instance = NULL; + instance = nullptr; } |