diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:16:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:28 +0100 |
| commit | 6a33fb16bdd91055c2e13b7b1823093b000ca60d (patch) | |
| tree | 31652a5f38c54f792699e2502b8574b5f7012a79 /i18npool/source/search | |
| parent | 25bb667cff3cdd5d2a446f5eea036f9084a3fa17 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I7af8d14bfe7337fea3f18dbbd41eb32e0f7ae331
Diffstat (limited to 'i18npool/source/search')
| -rw-r--r-- | i18npool/source/search/levdis.hxx | 2 | ||||
| -rw-r--r-- | i18npool/source/search/textsearch.cxx | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx index e7dcc085cdac..47d669bd571d 100644 --- a/i18npool/source/search/levdis.hxx +++ b/i18npool/source/search/levdis.hxx @@ -118,7 +118,7 @@ class WLevDisDistanceMem int* p; public: explicit WLevDisDistanceMem( size_t s ) - : p(0) + : p(nullptr) { NewMem(s); } diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 7c9645114416..b0fb546fa7d0 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -107,10 +107,10 @@ bool isSimpleRegexTrans( sal_Int32 n ) TextSearch::TextSearch(const Reference < XComponentContext > & rxContext) : m_xContext( rxContext ) - , pJumpTable( 0 ) - , pJumpTable2( 0 ) - , pRegexMatcher( NULL ) - , pWLD( 0 ) + , pJumpTable( nullptr ) + , pJumpTable2( nullptr ) + , pRegexMatcher( nullptr ) + , pWLD( nullptr ) { SearchOptions aOpt; aOpt.algorithmType = SearchAlgorithms_ABSOLUTE; @@ -131,10 +131,10 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep { aSrchPara = rOptions; - delete pRegexMatcher, pRegexMatcher = NULL; - delete pWLD, pWLD = 0; - delete pJumpTable, pJumpTable = 0; - delete pJumpTable2, pJumpTable2 = 0; + delete pRegexMatcher, pRegexMatcher = nullptr; + delete pWLD, pWLD = nullptr; + delete pJumpTable, pJumpTable = nullptr; + delete pJumpTable2, pJumpTable2 = nullptr; // Create Transliteration class if( isSimpleTrans( aSrchPara.transliterateFlags) ) @@ -146,7 +146,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep aSrchPara.Locale); } else if( xTranslit.is() ) - xTranslit = 0; + xTranslit = nullptr; // Create Transliteration for 2<->1, 2<->2 transliteration if ( isComplexTrans( aSrchPara.transliterateFlags) ) @@ -806,7 +806,7 @@ void TextSearch::RESrchPrepare( const css::util::SearchOptions& rOptions) { SAL_INFO( "i18npool", "TextSearch::RESrchPrepare UErrorCode " << nIcuErr); delete pRegexMatcher; - pRegexMatcher = NULL; + pRegexMatcher = nullptr; } else { @@ -1115,7 +1115,7 @@ i18nsearch_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, SAL_UNUSED_PARAMETER void* ) { - void* pRet = NULL; + void* pRet = nullptr; css::lang::XMultiServiceFactory* pServiceManager = static_cast< css::lang::XMultiServiceFactory* > |