summaryrefslogtreecommitdiff
path: root/shell/source/backends/localebe
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 16:19:53 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 16:20:38 +0100
commitb6f6cf85abaf93ac99683aefbc81e981c5b14e22 (patch)
treea3fc82563ad7178c91fcafc8912deba6dc1c108b /shell/source/backends/localebe
parentb6f1be102c18d75099b5fdd96f5a1a2b6a271142 (diff)
loplugin:nullptr (automatic rewrite; Mac-specific code)
Change-Id: Iaa14c583c55c3582e33a1d073ea92b388cd6f3a4
Diffstat (limited to 'shell/source/backends/localebe')
-rw-r--r--shell/source/backends/localebe/localebackend.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 66acbc3e7698..a9014050c5d0 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -97,14 +97,14 @@ namespace /* private */
CFStringRef ImplGetAppPreference(const char* pref)
{
- CFStringRef csPref = CFStringCreateWithCString(NULL, pref, kCFStringEncodingASCII);
+ CFStringRef csPref = CFStringCreateWithCString(nullptr, pref, kCFStringEncodingASCII);
CFStringGuard csRefGuard(csPref);
CFTypeRef ref = CFPreferencesCopyAppValue(csPref, kCFPreferencesCurrentApplication);
CFTypeRefGuard refGuard(ref);
- if (ref == NULL)
- return NULL;
+ if (ref == nullptr)
+ return nullptr;
CFStringRef sref = (CFGetTypeID(ref) == CFArrayGetTypeID()) ? static_cast<CFStringRef>(CFArrayGetValueAtIndex(static_cast<CFArrayRef>(ref), 0)) : static_cast<CFStringRef>(ref);
@@ -122,14 +122,14 @@ namespace /* private */
OUStringBuffer aLocaleBuffer;
aLocaleBuffer.append("en-US"); // initialize with fallback value
- if (sref != NULL)
+ if (sref != nullptr)
{
// split the string into substrings; the first two (if there are two) substrings
// are language and country
- CFArrayRef subs = CFStringCreateArrayBySeparatingStrings(NULL, sref, CFSTR("_"));
+ CFArrayRef subs = CFStringCreateArrayBySeparatingStrings(nullptr, sref, CFSTR("_"));
CFArrayGuard subsGuard(subs);
- if (subs != NULL)
+ if (subs != nullptr)
{
aLocaleBuffer.setLength(0); // clear buffer which still contains fallback value