Kaydet (Commit) bf8b3211 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:nullptr (automatic rewrite)

Change-Id: Ib928ecb14bbc119b58dbe7d07941c266329e57e3
üst 6dea8621
...@@ -47,7 +47,7 @@ namespace uui ...@@ -47,7 +47,7 @@ namespace uui
*//*-*************************************************************************************************************/ *//*-*************************************************************************************************************/
FilterDialog::FilterDialog( vcl::Window* pParentWindow ) FilterDialog::FilterDialog( vcl::Window* pParentWindow )
: ModalDialog (pParentWindow, "FilterSelectDialog", "uui/ui/filterselect.ui" ) : ModalDialog (pParentWindow, "FilterSelectDialog", "uui/ui/filterselect.ui" )
, m_pFilterNames(NULL) , m_pFilterNames(nullptr)
{ {
get(m_pFtURL, "url"); get(m_pFtURL, "url");
get(m_pLbFilters, "filters"); get(m_pLbFilters, "filters");
...@@ -102,7 +102,7 @@ void FilterDialog::ChangeFilters( const FilterNameList* pFilterNames ) ...@@ -102,7 +102,7 @@ void FilterDialog::ChangeFilters( const FilterNameList* pFilterNames )
{ {
m_pFilterNames = pFilterNames; m_pFilterNames = pFilterNames;
m_pLbFilters->Clear(); m_pLbFilters->Clear();
if( m_pFilterNames != NULL ) if( m_pFilterNames != nullptr )
{ {
for( FilterNameListPtr pItem = m_pFilterNames->begin(); for( FilterNameListPtr pItem = m_pFilterNames->begin();
pItem != m_pFilterNames->end() ; pItem != m_pFilterNames->end() ;
...@@ -135,7 +135,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem ) ...@@ -135,7 +135,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem )
{ {
bool bSelected = false; bool bSelected = false;
if( m_pFilterNames != NULL ) if( m_pFilterNames != nullptr )
{ {
if( ModalDialog::Execute() == RET_OK ) if( ModalDialog::Execute() == RET_OK )
{ {
......
...@@ -57,7 +57,7 @@ OUString ...@@ -57,7 +57,7 @@ OUString
getContentPart( const OUString& _rRawString ) getContentPart( const OUString& _rRawString )
{ {
// search over some parts to find a string // search over some parts to find a string
static char const * aIDs[] = { "CN=", "OU=", "O=", "E=", NULL }; static char const * aIDs[] = { "CN=", "OU=", "O=", "E=", nullptr };
OUString sPart; OUString sPart;
int i = 0; int i = 0;
while ( aIDs[i] ) while ( aIDs[i] )
...@@ -119,7 +119,7 @@ getLocalizedDatTimeStr( ...@@ -119,7 +119,7 @@ getLocalizedDatTimeStr(
LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType(); LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType();
SvNumberFormatter *pNumberFormatter = new SvNumberFormatter( xContext, eUILang ); SvNumberFormatter *pNumberFormatter = new SvNumberFormatter( xContext, eUILang );
OUString aTmpStr; OUString aTmpStr;
Color* pColor = NULL; Color* pColor = nullptr;
Date* pNullDate = pNumberFormatter->GetNullDate(); Date* pNullDate = pNumberFormatter->GetNullDate();
sal_uInt32 nFormat sal_uInt32 nFormat
= pNumberFormatter->GetStandardFormat( css::util::NumberFormat::DATE, eUILang ); = pNumberFormatter->GetStandardFormat( css::util::NumberFormat::DATE, eUILang );
......
...@@ -971,7 +971,7 @@ UUIInteractionHelper::getParentProperty() ...@@ -971,7 +971,7 @@ UUIInteractionHelper::getParentProperty()
if ( xWindow.is() ) if ( xWindow.is() )
return VCLUnoHelper::GetWindow(xWindow); return VCLUnoHelper::GetWindow(xWindow);
return 0; return nullptr;
} }
uno::Reference< awt::XWindow> uno::Reference< awt::XWindow>
......
...@@ -96,7 +96,7 @@ UUIInteractionRequestStringResolver::createInstance( ...@@ -96,7 +96,7 @@ UUIInteractionRequestStringResolver::createInstance(
} }
catch (std::bad_alloc const &) catch (std::bad_alloc const &)
{ {
throw uno::RuntimeException("out of memory", 0); throw uno::RuntimeException("out of memory", nullptr);
} }
} }
......
...@@ -65,7 +65,7 @@ namespace ...@@ -65,7 +65,7 @@ namespace
MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr& ) MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr& )
:ModalDialog ( _pParent, "MacroWarnMedium", "uui/ui/macrowarnmedium.ui" ) :ModalDialog ( _pParent, "MacroWarnMedium", "uui/ui/macrowarnmedium.ui" )
,mpInfos ( NULL ) ,mpInfos ( nullptr )
,mbSignedMode ( true ) ,mbSignedMode ( true )
,mbShowSignatures ( _bWithSignatures ) ,mbShowSignatures ( _bWithSignatures )
,mnActSecLevel ( 0 ) ,mnActSecLevel ( 0 )
......
...@@ -38,9 +38,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Cha ...@@ -38,9 +38,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Cha
void *) void *)
{ {
if (!pImplName) if (!pImplName)
return 0; return nullptr;
void * pRet = 0; void * pRet = nullptr;
Reference< XMultiServiceFactory > xSMgr( Reference< XMultiServiceFactory > xSMgr(
static_cast< XMultiServiceFactory * >( pServiceManager ) ); static_cast< XMultiServiceFactory * >( pServiceManager ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment