summaryrefslogtreecommitdiff
path: root/framework/source/fwe
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/fwe')
-rw-r--r--framework/source/fwe/classes/actiontriggercontainer.cxx6
-rw-r--r--framework/source/fwe/classes/actiontriggerpropertyset.cxx22
-rw-r--r--framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx18
-rw-r--r--framework/source/fwe/classes/addonmenu.cxx10
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx16
-rw-r--r--framework/source/fwe/classes/fwkresid.cxx2
-rw-r--r--framework/source/fwe/classes/menuextensionsupplier.cxx4
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx6
-rw-r--r--framework/source/fwe/classes/sfxhelperfunctions.cxx28
-rw-r--r--framework/source/fwe/helper/imageproducer.cxx2
-rw-r--r--framework/source/fwe/helper/undomanagerhelper.cxx2
-rw-r--r--framework/source/fwe/interaction/preventduplicateinteraction.cxx2
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx2
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx4
-rw-r--r--framework/source/fwe/xml/saxnamespacefilter.cxx2
15 files changed, 63 insertions, 63 deletions
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index e4b7b0139f53..48cda46538c4 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -129,15 +129,15 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static ::cppu::OTypeCollection* pTypeCollection = NULL;
+ static ::cppu::OTypeCollection* pTypeCollection = nullptr;
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Ready for multithreading; get global mutex for first call of this method only! see before
osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
// Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Create a static typecollection ...
static ::cppu::OTypeCollection aTypeCollection(
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index ae27ab137b95..acfe55be90e2 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -55,8 +55,8 @@ ActionTriggerPropertySet::ActionTriggerPropertySet()
: OBroadcastHelper ( m_aMutex )
, OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)))
, OWeakObject ()
- , m_xBitmap ( 0 )
- , m_xActionTriggerContainer( 0 )
+ , m_xBitmap ( nullptr )
+ , m_xActionTriggerContainer( nullptr )
{
}
@@ -123,15 +123,15 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static ::cppu::OTypeCollection* pTypeCollection = NULL;
+ static ::cppu::OTypeCollection* pTypeCollection = nullptr;
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Ready for multithreading; get global mutex for first call of this method only! see before
osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
// Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Create a static typecollection ...
static ::cppu::OTypeCollection aTypeCollection(
@@ -261,13 +261,13 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue(
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL!
- static OPropertyArrayHelper* pInfoHelper = NULL;
+ static OPropertyArrayHelper* pInfoHelper = nullptr;
- if( pInfoHelper == NULL )
+ if( pInfoHelper == nullptr )
{
SolarMutexGuard aGuard;
// Control this pointer again, another instance can be faster then these!
- if( pInfoHelper == NULL )
+ if( pInfoHelper == nullptr )
{
// Define static member to give structure of properties to baseclass "OPropertySetHelper".
// "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable.
@@ -286,13 +286,13 @@ throw ( RuntimeException, std::exception )
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pInfo is NULL - for the second call pInfo is different from NULL!
- static Reference< XPropertySetInfo >* pInfo = NULL;
+ static Reference< XPropertySetInfo >* pInfo = nullptr;
- if( pInfo == NULL )
+ if( pInfo == nullptr )
{
SolarMutexGuard aGuard;
// Control this pointer again, another instance can be faster then these!
- if( pInfo == NULL )
+ if( pInfo == nullptr )
{
// Create structure of propertysetinfo for baseclass "OPropertySetHelper".
// (Use method "getInfoHelper()".)
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index ae3726cd2402..be02ec2b1bc7 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -116,15 +116,15 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw (
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static ::cppu::OTypeCollection* pTypeCollection = NULL;
+ static ::cppu::OTypeCollection* pTypeCollection = nullptr;
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Ready for multithreading; get global mutex for first call of this method only! see before
osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
// Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Create a static typecollection ...
static ::cppu::OTypeCollection aTypeCollection(
@@ -206,13 +206,13 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue(
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL!
- static OPropertyArrayHelper* pInfoHelper = NULL;
+ static OPropertyArrayHelper* pInfoHelper = nullptr;
- if( pInfoHelper == NULL )
+ if( pInfoHelper == nullptr )
{
SolarMutexGuard aGuard;
// Control this pointer again, another instance can be faster then these!
- if( pInfoHelper == NULL )
+ if( pInfoHelper == nullptr )
{
// Define static member to give structure of properties to baseclass "OPropertySetHelper".
// "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable.
@@ -231,13 +231,13 @@ throw ( RuntimeException, std::exception )
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pInfo is NULL - for the second call pInfo is different from NULL!
- static Reference< XPropertySetInfo >* pInfo = NULL;
+ static Reference< XPropertySetInfo >* pInfo = nullptr;
- if( pInfo == NULL )
+ if( pInfo == nullptr )
{
SolarMutexGuard aGuard;
// Control this pointer again, another instance can be faster then these!
- if( pInfo == NULL )
+ if( pInfo == nullptr )
{
// Create structure of propertysetinfo for baseclass "OPropertySetHelper".
// (Use method "getInfoHelper()".)
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index f63e52ebc7e9..c65da97c56d1 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -109,7 +109,7 @@ PopupMenu* AddonMenuManager::CreatePopupMenuType( MenuType eMenuType, const Refe
else if ( eMenuType == ADDON_POPUPMENU )
return new AddonPopupMenu( rFrame );
else
- return NULL;
+ return nullptr;
}
// Create the Add-Ons menu
@@ -117,7 +117,7 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame,
const Reference< XComponentContext >& rContext )
{
AddonsOptions aOptions;
- AddonMenu* pAddonMenu = NULL;
+ AddonMenu* pAddonMenu = nullptr;
sal_uInt16 nUniqueMenuId = ADDONMENU_ITEMID_START;
const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aOptions.GetAddonsMenu();
@@ -131,7 +131,7 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame,
if ( pAddonMenu->GetItemCount() == 0 )
{
delete pAddonMenu;
- pAddonMenu = NULL;
+ pAddonMenu = nullptr;
}
}
@@ -297,7 +297,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent
bInsertSeparator = true;
else
{
- PopupMenu* pSubMenu = NULL;
+ PopupMenu* pSubMenu = nullptr;
if ( aAddonSubMenu.getLength() > 0 )
{
pSubMenu = AddonMenuManager::CreatePopupMenuType( nSubMenuType, rFrame );
@@ -307,7 +307,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent
if ( pSubMenu->GetItemCount() == 0 )
{
delete pSubMenu;
- pSubMenu = NULL;
+ pSubMenu = nullptr;
continue;
}
}
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 821f3f886a8d..b64cc898f984 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -411,7 +411,7 @@ void AddonsOptions_Impl::ReadConfigurationData()
void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ )
{
- Application::PostUserEvent( LINK( 0, AddonsOptions, Notify ) );
+ Application::PostUserEvent( LINK( nullptr, AddonsOptions, Notify ) );
}
// public method
@@ -1355,7 +1355,7 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin
Sequence< sal_Int8 > aImageDataSeq;
OUString aImageURL;
- ImageEntry* pEntry = NULL;
+ ImageEntry* pEntry = nullptr;
// It is possible to use both forms (embedded image data and URLs to external bitmap files) at the
// same time. Embedded image data has a higher priority.
@@ -1498,7 +1498,7 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString&
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL;
+AddonsOptions_Impl* AddonsOptions::m_pDataContainer = nullptr;
sal_Int32 AddonsOptions::m_nRefCount = 0;
// constructor
@@ -1510,7 +1510,7 @@ AddonsOptions::AddonsOptions()
// Increase our refcount ...
++m_nRefCount;
// ... and initialize our data container only if it not already exist!
- if( m_pDataContainer == NULL )
+ if( m_pDataContainer == nullptr )
{
m_pDataContainer = new AddonsOptions_Impl;
}
@@ -1529,7 +1529,7 @@ AddonsOptions::~AddonsOptions()
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
- m_pDataContainer = NULL;
+ m_pDataContainer = nullptr;
}
}
@@ -1632,15 +1632,15 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const
Mutex& AddonsOptions::GetOwnStaticMutex()
{
// Initialize static mutex only for one time!
- static Mutex* pMutex = NULL;
+ static Mutex* pMutex = nullptr;
// If these method first called (Mutex not already exist!) ...
- if( pMutex == NULL )
+ if( pMutex == nullptr )
{
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
// We must check our pointer again - because it can be that another instance of our class will be faster than these!
- if( pMutex == NULL )
+ if( pMutex == nullptr )
{
// Create the new mutex and set it for return on static variable.
static Mutex aMutex;
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index f90289227110..53a7fc7dfc6a 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -29,7 +29,7 @@ namespace framework
ResMgr* FwkResId::GetResManager()
{
- static ResMgr* pResMgr = NULL;
+ static ResMgr* pResMgr = nullptr;
if ( !pResMgr )
{
diff --git a/framework/source/fwe/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx
index b1dafcd0f58a..438696106e60 100644
--- a/framework/source/fwe/classes/menuextensionsupplier.cxx
+++ b/framework/source/fwe/classes/menuextensionsupplier.cxx
@@ -20,7 +20,7 @@
#include <framework/menuextensionsupplier.hxx>
#include <osl/mutex.hxx>
-static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = NULL;
+static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = nullptr;
namespace framework
{
@@ -29,7 +29,7 @@ MenuExtensionItem SAL_CALL GetMenuExtension()
{
MenuExtensionItem aItem;
- pfunc_setMenuExtensionSupplier pLocalMenuExtensionSupplierFunc( 0 );
+ pfunc_setMenuExtensionSupplier pLocalMenuExtensionSupplierFunc( nullptr );
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 1ca2215404c3..87fd71595ad1 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -250,15 +250,15 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static ::cppu::OTypeCollection* pTypeCollection = NULL;
+ static ::cppu::OTypeCollection* pTypeCollection = nullptr;
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Ready for multithreading; get global mutex for first call of this method only! see before
osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
// Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Create a static typecollection ...
static ::cppu::OTypeCollection aTypeCollection(
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index cc127bb3ca0a..6ec7463e8eff 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -23,12 +23,12 @@
#include <tools/diagnose_ex.h>
-static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = NULL;
-static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL;
-static pfunc_getRefreshToolbars pRefreshToolbars = NULL;
-static pfunc_createDockingWindow pCreateDockingWindow = NULL;
-static pfunc_isDockingWindowVisible pIsDockingWindowVisible = NULL;
-static pfunc_activateToolPanel pActivateToolPanel = NULL;
+static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = nullptr;
+static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = nullptr;
+static pfunc_getRefreshToolbars pRefreshToolbars = nullptr;
+static pfunc_createDockingWindow pCreateDockingWindow = nullptr;
+static pfunc_isDockingWindowVisible pIsDockingWindowVisible = nullptr;
+static pfunc_activateToolPanel pActivateToolPanel = nullptr;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -46,7 +46,7 @@ pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_se
svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL )
{
- pfunc_setToolBoxControllerCreator pFactory = NULL;
+ pfunc_setToolBoxControllerCreator pFactory = nullptr;
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pFactory = pToolBoxControllerCreator;
@@ -55,7 +55,7 @@ svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFram
if ( pFactory )
return (*pFactory)( rFrame, pToolbox, nID, aCommandURL );
else
- return NULL;
+ return nullptr;
}
pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator )
@@ -68,7 +68,7 @@ pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfun
svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL )
{
- pfunc_setStatusBarControllerCreator pFactory = NULL;
+ pfunc_setStatusBarControllerCreator pFactory = nullptr;
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pFactory = pStatusBarControllerCreator;
@@ -77,7 +77,7 @@ svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< X
if ( pFactory )
return (*pFactory)( rFrame, pStatusBar, nID, aCommandURL );
else
- return NULL;
+ return nullptr;
}
pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pNewRefreshToolbarsFunc )
@@ -91,7 +91,7 @@ pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars p
void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame >& rFrame )
{
- pfunc_getRefreshToolbars pCallback = NULL;
+ pfunc_getRefreshToolbars pCallback = nullptr;
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pCallback = pRefreshToolbars;
@@ -112,7 +112,7 @@ pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingW
void SAL_CALL CreateDockingWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL )
{
- pfunc_createDockingWindow pFactory = NULL;
+ pfunc_createDockingWindow pFactory = nullptr;
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pFactory = pCreateDockingWindow;
@@ -133,7 +133,7 @@ pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDocking
bool SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL )
{
- pfunc_isDockingWindowVisible pCall = NULL;
+ pfunc_isDockingWindowVisible pCall = nullptr;
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pCall = pIsDockingWindowVisible;
@@ -155,7 +155,7 @@ pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i
void SAL_CALL ActivateToolPanel( const css::uno::Reference< css::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL )
{
- pfunc_activateToolPanel pActivator = NULL;
+ pfunc_activateToolPanel pActivator = nullptr;
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pActivator = pActivateToolPanel;
diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index 197456a3acae..3c70b2256258 100644
--- a/framework/source/fwe/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
@@ -22,7 +22,7 @@
namespace framework
{
-static pfunc_getImage _pGetImageFunc = NULL;
+static pfunc_getImage _pGetImageFunc = nullptr;
pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
{
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 299aed4fd565..91a7e44ba4da 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -597,7 +597,7 @@ namespace framework
const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0 );
// prepare notification
- void ( SAL_CALL XUndoManagerListener::*notificationMethod )( const UndoManagerEvent& ) = NULL;
+ void ( SAL_CALL XUndoManagerListener::*notificationMethod )( const UndoManagerEvent& ) = nullptr;
UndoManagerEvent aContextEvent( buildEvent( OUString() ) );
const EventObject aClearedEvent( getXUndoManager() );
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index a2c079da6e0c..818fdfe2122a 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -53,7 +53,7 @@ void PreventDuplicateInteraction::useDefaultUUIHandler()
aLock.clear();
// <- SAFE
- css::uno::Reference< css::task::XInteractionHandler > xHandler( css::task::InteractionHandler::createWithParent( m_xContext, 0 ), css::uno::UNO_QUERY_THROW );
+ css::uno::Reference< css::task::XInteractionHandler > xHandler( css::task::InteractionHandler::createWithParent( m_xContext, nullptr ), css::uno::UNO_QUERY_THROW );
// SAFE ->
aLock.reset();
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 417bb05d077f..1cec54b2b557 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -109,7 +109,7 @@ PopupMenu* MenuConfiguration::CreateBookmarkMenu(css::uno::Reference<css::frame:
else if ( aURL == BOOKMARK_WIZARDMENU )
return new BmkMenu( rFrame, BmkMenu::BMK_WIZARDMENU );
else
- return NULL;
+ return nullptr;
}
void MenuConfiguration::StoreMenuBarConfigurationToXML(
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index fc27cf93632f..e5db95fd3611 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -148,8 +148,8 @@ static void ExtractMenuParameters( const Sequence< PropertyValue >& rProp,
// Base class implementation
ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() :
- m_xLocator( 0 ),
- m_xReader( 0 ),
+ m_xLocator( nullptr ),
+ m_xReader( nullptr ),
m_aType( ITEM_DESCRIPTOR_TYPE ),
m_aLabel( ITEM_DESCRIPTOR_LABEL ),
m_aContainer( ITEM_DESCRIPTOR_CONTAINER ),
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 759807707b2c..4971462efdb6 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
namespace framework{
SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >& rSax1DocumentHandler ) :
- m_xLocator( 0 ),
+ m_xLocator( nullptr ),
xDocumentHandler( rSax1DocumentHandler ),
m_nDepth( 0 ),
m_aXMLAttributeNamespace( "xmlns" ),