summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:28:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:58 +0100
commitbf8b32113fb2d26ca37b71e1e2bfc6f8ee77d0ea (patch)
tree20e33ae90716a210b1b6b0382167c22f3ff176f4 /uui
parent6dea86213c495721790462a7037b0fafc6efa522 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: Ib928ecb14bbc119b58dbe7d07941c266329e57e3
Diffstat (limited to 'uui')
-rw-r--r--uui/source/fltdlg.cxx6
-rw-r--r--uui/source/iahndl-ssl.cxx4
-rw-r--r--uui/source/iahndl.cxx2
-rw-r--r--uui/source/requeststringresolver.cxx2
-rw-r--r--uui/source/secmacrowarnings.cxx2
-rw-r--r--uui/source/services.cxx4
6 files changed, 10 insertions, 10 deletions
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 08d4497af919..d898feb425bf 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -47,7 +47,7 @@ namespace uui
*//*-*************************************************************************************************************/
FilterDialog::FilterDialog( vcl::Window* pParentWindow )
: ModalDialog (pParentWindow, "FilterSelectDialog", "uui/ui/filterselect.ui" )
- , m_pFilterNames(NULL)
+ , m_pFilterNames(nullptr)
{
get(m_pFtURL, "url");
get(m_pLbFilters, "filters");
@@ -102,7 +102,7 @@ void FilterDialog::ChangeFilters( const FilterNameList* pFilterNames )
{
m_pFilterNames = pFilterNames;
m_pLbFilters->Clear();
- if( m_pFilterNames != NULL )
+ if( m_pFilterNames != nullptr )
{
for( FilterNameListPtr pItem = m_pFilterNames->begin();
pItem != m_pFilterNames->end() ;
@@ -135,7 +135,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem )
{
bool bSelected = false;
- if( m_pFilterNames != NULL )
+ if( m_pFilterNames != nullptr )
{
if( ModalDialog::Execute() == RET_OK )
{
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index cb25f7c7a095..b583b1bcc0ea 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -57,7 +57,7 @@ OUString
getContentPart( const OUString& _rRawString )
{
// 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;
int i = 0;
while ( aIDs[i] )
@@ -119,7 +119,7 @@ getLocalizedDatTimeStr(
LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType();
SvNumberFormatter *pNumberFormatter = new SvNumberFormatter( xContext, eUILang );
OUString aTmpStr;
- Color* pColor = NULL;
+ Color* pColor = nullptr;
Date* pNullDate = pNumberFormatter->GetNullDate();
sal_uInt32 nFormat
= pNumberFormatter->GetStandardFormat( css::util::NumberFormat::DATE, eUILang );
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 7e8ded7bd69a..3652d79f80cc 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -971,7 +971,7 @@ UUIInteractionHelper::getParentProperty()
if ( xWindow.is() )
return VCLUnoHelper::GetWindow(xWindow);
- return 0;
+ return nullptr;
}
uno::Reference< awt::XWindow>
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index 48f6d6506b87..d61b1f18d99a 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -96,7 +96,7 @@ UUIInteractionRequestStringResolver::createInstance(
}
catch (std::bad_alloc const &)
{
- throw uno::RuntimeException("out of memory", 0);
+ throw uno::RuntimeException("out of memory", nullptr);
}
}
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 39fbda6af57f..08bf026b8796 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -65,7 +65,7 @@ namespace
MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr& )
:ModalDialog ( _pParent, "MacroWarnMedium", "uui/ui/macrowarnmedium.ui" )
- ,mpInfos ( NULL )
+ ,mpInfos ( nullptr )
,mbSignedMode ( true )
,mbShowSignatures ( _bWithSignatures )
,mnActSecLevel ( 0 )
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 40e29545e639..162cedba1042 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -38,9 +38,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Cha
void *)
{
if (!pImplName)
- return 0;
+ return nullptr;
- void * pRet = 0;
+ void * pRet = nullptr;
Reference< XMultiServiceFactory > xSMgr(
static_cast< XMultiServiceFactory * >( pServiceManager ) );