summaryrefslogtreecommitdiff
path: root/svx/source/unogallery
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/unogallery')
-rw-r--r--svx/source/unogallery/unogalitem.cxx18
-rw-r--r--svx/source/unogallery/unogaltheme.cxx16
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx2
3 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 76819413ca94..2cc2c892668b 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -73,7 +73,7 @@ GalleryItem::~GalleryItem()
bool GalleryItem::isValid() const
{
- return( mpTheme != NULL );
+ return( mpTheme != nullptr );
}
@@ -269,7 +269,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt
if( *pValues >>= aNewTitle )
{
- ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL );
+ ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr );
if( pGalTheme )
{
@@ -316,7 +316,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
case( UNOGALLERY_URL ):
{
- ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL );
+ ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr );
if( pGalTheme )
*pValue <<= OUString( implGetObject()->aURL.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -325,7 +325,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
case( UNOGALLERY_TITLE ):
{
- ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL );
+ ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr );
if( pGalTheme )
{
@@ -342,7 +342,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
case( UNOGALLERY_THUMBNAIL ):
{
- ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL );
+ ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr );
if( pGalTheme )
{
@@ -366,7 +366,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
case( UNOGALLERY_GRAPHIC ):
{
- ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL );
+ ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr );
Graphic aGraphic;
if( pGalTheme && pGalTheme->GetGraphic( pGalTheme->ImplGetGalleryObjectPos( implGetObject() ), aGraphic ) )
@@ -378,7 +378,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
{
if( gallery::GalleryItemType::DRAWING == getType() )
{
- ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL );
+ ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr );
FmFormModel* pModel = new FmFormModel;
pModel->GetItemPool().FreezeIdRanges();
@@ -411,8 +411,8 @@ void GalleryItem::implSetInvalid()
{
if( mpTheme )
{
- mpTheme = NULL;
- mpGalleryObject = NULL;
+ mpTheme = nullptr;
+ mpGalleryObject = nullptr;
}
}
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index e4e937ab1ed3..1fd2dfabcb04 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -45,7 +45,7 @@ namespace unogallery {
GalleryTheme::GalleryTheme( const OUString& rThemeName )
{
mpGallery = ::Gallery::GetGalleryInstance();
- mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : NULL );
+ mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : nullptr );
if( mpGallery )
StartListening( *mpGallery );
@@ -59,7 +59,7 @@ GalleryTheme::~GalleryTheme()
DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" );
- implReleaseItems( NULL );
+ implReleaseItems( nullptr );
if( mpGallery )
{
@@ -144,7 +144,7 @@ sal_Bool SAL_CALL GalleryTheme::hasElements()
{
const SolarMutexGuard aGuard;
- return( ( mpTheme != NULL ) && ( mpTheme->GetObjectCount() > 0 ) );
+ return( ( mpTheme != nullptr ) && ( mpTheme->GetObjectCount() > 0 ) );
}
@@ -302,9 +302,9 @@ void SAL_CALL GalleryTheme::update( )
uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSupplier( Drawing, uno::UNO_QUERY_THROW );
uno::Reference< drawing::XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
uno::Reference< drawing::XDrawPage > xPage( xDrawPages->getByIndex( 0 ), uno::UNO_QUERY_THROW );
- SvxDrawPage* pUnoPage = xPage.is() ? SvxDrawPage::getImplementation( xPage ) : NULL;
- SdrModel* pOrigModel = pUnoPage ? pUnoPage->GetSdrPage()->GetModel() : NULL;
- SdrPage* pOrigPage = pUnoPage ? pUnoPage->GetSdrPage() : NULL;
+ SvxDrawPage* pUnoPage = xPage.is() ? SvxDrawPage::getImplementation( xPage ) : nullptr;
+ SdrModel* pOrigModel = pUnoPage ? pUnoPage->GetSdrPage()->GetModel() : nullptr;
+ SdrPage* pOrigPage = pUnoPage ? pUnoPage->GetSdrPage() : nullptr;
if (pOrigPage && pOrigModel)
{
@@ -357,12 +357,12 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" );
- implReleaseItems( NULL );
+ implReleaseItems( nullptr );
if( mpGallery && mpTheme )
{
mpGallery->ReleaseTheme( mpTheme, *this );
- mpTheme = NULL;
+ mpTheme = nullptr;
}
}
break;
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index 09c17b92bdba..7dca671dd02d 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -123,7 +123,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements()
{
const SolarMutexGuard aGuard;
- return( ( mpGallery != NULL ) && ( mpGallery->GetThemeCount() > 0 ) );
+ return( ( mpGallery != nullptr ) && ( mpGallery->GetThemeCount() > 0 ) );
}