summaryrefslogtreecommitdiff
path: root/vcl/source/helper
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/helper')
-rw-r--r--vcl/source/helper/canvasbitmap.cxx2
-rw-r--r--vcl/source/helper/canvastools.cxx6
-rw-r--r--vcl/source/helper/evntpost.cxx4
-rw-r--r--vcl/source/helper/lazydelete.cxx8
-rw-r--r--vcl/source/helper/strhelper.cxx4
-rw-r--r--vcl/source/helper/threadex.cxx2
-rw-r--r--vcl/source/helper/xconnection.cxx2
7 files changed, 14 insertions, 14 deletions
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 3efff8ca265d..bd09b4c41346 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -99,7 +99,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_aBitmap( rBitmap.GetBitmap() ),
m_aAlpha(),
m_pBmpAcc( m_aBitmap.AcquireReadAccess() ),
- m_pAlphaAcc( NULL ),
+ m_pAlphaAcc( nullptr ),
m_aComponentTags(),
m_aComponentBitCounts(),
m_aLayout(),
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index f632b16900b1..55a25df62cda 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -290,7 +290,7 @@ namespace vcl
::Bitmap aBitmap( aPixelSize,
sal::static_int_cast<sal_uInt16>(nDepth),
- aLayout.Palette.is() ? &aPalette : NULL );
+ aLayout.Palette.is() ? &aPalette : nullptr );
::Bitmap aAlpha;
if( nAlphaDepth )
aAlpha = ::Bitmap( aPixelSize,
@@ -300,10 +300,10 @@ namespace vcl
{ // limit scoped access
Bitmap::ScopedWriteAccess pWriteAccess( aBitmap );
- Bitmap::ScopedWriteAccess pAlphaWriteAccess( nAlphaDepth ? aAlpha.AcquireWriteAccess() : NULL,
+ Bitmap::ScopedWriteAccess pAlphaWriteAccess( nAlphaDepth ? aAlpha.AcquireWriteAccess() : nullptr,
aAlpha );
- ENSURE_OR_THROW(pWriteAccess.get() != NULL,
+ ENSURE_OR_THROW(pWriteAccess.get() != nullptr,
"Cannot get write access to bitmap");
const sal_Int32 nWidth(aPixelSize.Width());
diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx
index abc9bbb8f01b..cccb8443057a 100644
--- a/vcl/source/helper/evntpost.cxx
+++ b/vcl/source/helper/evntpost.cxx
@@ -29,7 +29,7 @@ namespace vcl
EventPoster::EventPoster( const Link<LinkParamNone*,void>& rLink )
: m_aLink(rLink)
{
- m_nId = 0;
+ m_nId = nullptr;
}
EventPoster::~EventPoster()
@@ -48,7 +48,7 @@ void EventPoster::Post()
IMPL_LINK_TYPED( EventPoster, DoEvent_Impl, void*, /*p*/, void )
{
DBG_TESTSOLARMUTEX();
- m_nId = 0;
+ m_nId = nullptr;
m_aLink.Call( nullptr );
}
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index 3b79b5f87565..6ca54bbeab99 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -33,7 +33,7 @@ LazyDeletorBase::~LazyDeletorBase()
}
// instantiate instance pointer for LazyDeletor<Window>
-LazyDeletor* LazyDeletor::s_pOneInstance = NULL;
+LazyDeletor* LazyDeletor::s_pOneInstance = nullptr;
// a list for all LazyeDeletor<T> singletons
static std::vector< LazyDeletorBase* > lcl_aDeletors;
@@ -62,7 +62,7 @@ bool LazyDeletor::is_less( vcl::Window* left, vcl::Window* right )
DeleteOnDeinitBase::~DeleteOnDeinitBase()
{
ImplSVData* pSVData = ImplGetSVData();
- if( pSVData && pSVData->mpDeinitDeleteList != NULL )
+ if( pSVData && pSVData->mpDeinitDeleteList != nullptr )
pSVData->mpDeinitDeleteList->remove( this );
}
@@ -74,7 +74,7 @@ void DeleteOnDeinitBase::addDeinitContainer( DeleteOnDeinitBase* i_pContainer )
if( pSVData->mbDeInit )
return;
- if( pSVData->mpDeinitDeleteList == NULL )
+ if( pSVData->mpDeinitDeleteList == nullptr )
pSVData->mpDeinitDeleteList = new std::list< DeleteOnDeinitBase* >();
pSVData->mpDeinitDeleteList->push_back( i_pContainer );
}
@@ -90,7 +90,7 @@ void DeleteOnDeinitBase::ImplDeleteOnDeInit()
(*it)->doCleanup();
}
delete pSVData->mpDeinitDeleteList;
- pSVData->mpDeinitDeleteList = NULL;
+ pSVData->mpDeinitDeleteList = nullptr;
}
}
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index ea08f22b8317..65271087f024 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -106,7 +106,7 @@ OUString GetCommandLineToken( int nToken, const OUString& rLine )
int nActualToken = 0;
sal_Unicode* pBuffer = static_cast<sal_Unicode*>(alloca( sizeof(sal_Unicode)*( nLen + 1 ) ));
const sal_Unicode* pRun = rLine.getStr();
- sal_Unicode* pLeap = NULL;
+ sal_Unicode* pLeap = nullptr;
while( *pRun && nActualToken <= nToken )
{
@@ -156,7 +156,7 @@ OString GetCommandLineToken(int nToken, const OString& rLine)
int nActualToken = 0;
char* pBuffer = static_cast<char*>(alloca( nLen + 1 ));
const char* pRun = rLine.getStr();
- char* pLeap = NULL;
+ char* pLeap = nullptr;
while( *pRun && nActualToken <= nToken )
{
diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx
index 5fe7376c6556..628a216c3a68 100644
--- a/vcl/source/helper/threadex.cxx
+++ b/vcl/source/helper/threadex.cxx
@@ -66,7 +66,7 @@ long SolarThreadExecutor::impl_execute( const TimeValue* _pTimeout )
Application::RemoveUserEvent( nEvent );
}
else
- osl_waitCondition( m_aFinish, NULL );
+ osl_waitCondition( m_aFinish, nullptr );
}
return m_nReturn;
}
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index 1d7741077445..ad420d303221 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -61,7 +61,7 @@ void DisplayConnection::terminate()
if( pSVData )
{
- pSVData->mpDefInst->SetEventCallback( NULL );
+ pSVData->mpDefInst->SetEventCallback( nullptr );
}
SolarMutexReleaser aRel;