summaryrefslogtreecommitdiff
path: root/lingucomponent
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 16:19:25 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 16:20:36 +0100
commit2e8f27167df2c53344a1757b8d7d288b7cbe5ee0 (patch)
tree1e1cc1d6bf1e28804831fe1057e58010663d4c05 /lingucomponent
parent63aec6c7aaa4cf0bf4349dcb934a72219d9aaf03 (diff)
loplugin:nullptr (automatic rewrite; Mac-specific code)
Change-Id: I48e80668c76b7fb94dfa2876ae8ca5e895cea3be
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macreg.mm2
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macspellimp.mm26
2 files changed, 14 insertions, 14 deletions
diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.mm b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
index 648fc84526d0..cce38184c969 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macreg.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
@@ -35,7 +35,7 @@ extern "C"
SAL_DLLPUBLIC_EXPORT void * SAL_CALL MacOSXSpell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
- void * pRet = NULL;
+ void * pRet = nullptr;
pRet = MacSpellChecker_getFactory(
pImplName,
static_cast< XMultiServiceFactory * >( pServiceManager ),
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 20e9e52d3ec2..e23b752afc25 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -52,11 +52,11 @@ using ::rtl::OUStringToOString;
MacSpellChecker::MacSpellChecker() :
aEvtListeners( GetLinguMutex() )
{
- aDEncs = NULL;
- aDLocs = NULL;
- aDNames = NULL;
+ aDEncs = nullptr;
+ aDLocs = nullptr;
+ aDNames = nullptr;
bDisposing = false;
- pPropHelper = NULL;
+ pPropHelper = nullptr;
numdict = 0;
NSApplicationLoad();
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -70,11 +70,11 @@ MacSpellChecker::~MacSpellChecker()
{
numdict = 0;
if (aDEncs) delete[] aDEncs;
- aDEncs = NULL;
+ aDEncs = nullptr;
if (aDLocs) delete[] aDLocs;
- aDLocs = NULL;
+ aDLocs = nullptr;
if (aDNames) delete[] aDNames;
- aDNames = NULL;
+ aDNames = nullptr;
if (pPropHelper)
pPropHelper->RemoveAsPropListener();
}
@@ -176,9 +176,9 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
} else {
/* no dictionary.lst found so register no dictionaries */
numdict = 0;
- aDEncs = NULL;
- aDLocs = NULL;
- aDNames = NULL;
+ aDEncs = nullptr;
+ aDLocs = nullptr;
+ aDNames = nullptr;
aSuppLocales.realloc(0);
}
}
@@ -388,10 +388,10 @@ Reference< XSpellAlternatives > SAL_CALL
MutexGuard aGuard( GetLinguMutex() );
if (rLocale == Locale() || !rWord.getLength())
- return NULL;
+ return nullptr;
if (!hasLocale( rLocale ))
- return NULL;
+ return nullptr;
Reference< XSpellAlternatives > xAlt;
if (!isValid( rWord, rLocale, rProperties ))
@@ -556,7 +556,7 @@ Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static()
void * SAL_CALL MacSpellChecker_getFactory( const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager, void * )
{
- void * pRet = 0;
+ void * pRet = nullptr;
if ( MacSpellChecker::getImplementationName_Static().equalsAscii( pImplName ) )
{
Reference< XSingleServiceFactory > xFactory =