summaryrefslogtreecommitdiff
path: root/svtools/source/config
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:25:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:48 +0100
commit28f4bee7bd7378141d8569186162e1a3166eb012 (patch)
tree97cb855eec76da937068cda5c5f0f7d5bcd61e47 /svtools/source/config
parentbf057fab3c0d17bf2832c8d9fc6d34b1b859e660 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I7fc4b4d5c895f241cfb052b009e943e073f3befe
Diffstat (limited to 'svtools/source/config')
-rw-r--r--svtools/source/config/accessibilityoptions.cxx2
-rw-r--r--svtools/source/config/colorcfg.cxx4
-rw-r--r--svtools/source/config/extcolorcfg.cxx6
-rw-r--r--svtools/source/config/fontsubstconfig.cxx2
-rw-r--r--svtools/source/config/helpopt.cxx4
-rw-r--r--svtools/source/config/itemholder2.cxx2
-rw-r--r--svtools/source/config/menuoptions.cxx12
-rw-r--r--svtools/source/config/miscopt.cxx6
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx6
-rw-r--r--svtools/source/config/printoptions.cxx28
-rw-r--r--svtools/source/config/slidesorterbaropt.cxx6
-rw-r--r--svtools/source/config/toolpanelopt.cxx6
12 files changed, 42 insertions, 42 deletions
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index b05c7a8640df..bead1d82d232 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -97,7 +97,7 @@ public:
// initialization of static members --------------------------------------
-SvtAccessibilityOptions_Impl* SvtAccessibilityOptions::sm_pSingleImplConfig =NULL;
+SvtAccessibilityOptions_Impl* SvtAccessibilityOptions::sm_pSingleImplConfig =nullptr;
sal_Int32 SvtAccessibilityOptions::sm_nAccessibilityRefCount(0);
namespace
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index ef3c698df375..f08cd6ffdf3a 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -60,7 +60,7 @@ namespace
: public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
}
-ColorConfig_Impl* ColorConfig::m_pImpl = NULL;
+ColorConfig_Impl* ColorConfig::m_pImpl = nullptr;
class ColorConfig_Impl : public utl::ConfigItem
{
@@ -409,7 +409,7 @@ ColorConfig::~ColorConfig()
if(!--nColorRefCount_Impl)
{
delete m_pImpl;
- m_pImpl = 0;
+ m_pImpl = nullptr;
}
}
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index a2fa5ec37eb6..9c1e0a66ed72 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -55,7 +55,7 @@ namespace
: public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
}
-ExtendedColorConfig_Impl* ExtendedColorConfig::m_pImpl = NULL;
+ExtendedColorConfig_Impl* ExtendedColorConfig::m_pImpl = nullptr;
class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
{
@@ -526,7 +526,7 @@ void ExtendedColorConfig_Impl::UnlockBroadcast()
{
if ( m_bBroadcastWhenUnlocked )
{
- m_bBroadcastWhenUnlocked = ExtendedColorConfig::m_pImpl != NULL;
+ m_bBroadcastWhenUnlocked = ExtendedColorConfig::m_pImpl != nullptr;
if ( m_bBroadcastWhenUnlocked )
{
if ( ExtendedColorConfig_Impl::IsEnableBroadcast() )
@@ -572,7 +572,7 @@ ExtendedColorConfig::~ExtendedColorConfig()
if(!--nExtendedColorRefCount_Impl)
{
delete m_pImpl;
- m_pImpl = 0;
+ m_pImpl = nullptr;
}
}
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 75863365c572..347df644fc58 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -155,7 +155,7 @@ const SubstitutionStruct* SvtFontSubstConfig::GetSubstitution(sal_Int32 nPos)
DBG_ASSERT(nPos >= 0 && nPos < nCount, "illegal array index");
if(nPos >= 0 && nPos < nCount)
return &pImpl->aSubstArr[nPos];
- return NULL;
+ return nullptr;
}
void SvtFontSubstConfig::AddSubstitution(const SubstitutionStruct& rToAdd)
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index ba494a5a2437..dc12c7603bb0 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star::uno;
using namespace com::sun::star;
-static SvtHelpOptions_Impl* pOptions = NULL;
+static SvtHelpOptions_Impl* pOptions = nullptr;
static sal_Int32 nRefCount = 0;
#define EXTENDEDHELP 0
@@ -105,7 +105,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
::osl::Mutex & SvtHelpOptions_Impl::getInitMutex()
{
- static ::osl::Mutex *pMutex = 0;
+ static ::osl::Mutex *pMutex = nullptr;
if( ! pMutex )
{
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index ea3b6c866c53..bf6c4d1cd284 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -182,7 +182,7 @@ void ItemHolder2::impl_deleteItem(TItemInfo& rItem)
if (rItem.pItem)
{
delete rItem.pItem;
- rItem.pItem = 0;
+ rItem.pItem = nullptr;
}
}
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 3444cbd4f472..1f27fc73c12d 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -362,7 +362,7 @@ void SvtMenuOptions_Impl::RemoveListenerLink( const Link<LinkParamNone*,void>& r
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtMenuOptions_Impl* SvtMenuOptions::m_pDataContainer = NULL ;
+SvtMenuOptions_Impl* SvtMenuOptions::m_pDataContainer = nullptr ;
sal_Int32 SvtMenuOptions::m_nRefCount = 0 ;
@@ -375,7 +375,7 @@ SvtMenuOptions::SvtMenuOptions()
// Increase our refcount ...
++m_nRefCount;
// ... and initialize our data container only if it not already!
- if( m_pDataContainer == NULL )
+ if( m_pDataContainer == nullptr )
{
m_pDataContainer = new SvtMenuOptions_Impl();
@@ -397,7 +397,7 @@ SvtMenuOptions::~SvtMenuOptions()
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
- m_pDataContainer = NULL;
+ m_pDataContainer = nullptr;
}
}
@@ -434,15 +434,15 @@ void SvtMenuOptions::SetMenuIconsState(TriState eState)
Mutex& SvtMenuOptions::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/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index de1593ad637a..5df1acf4a7a0 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -677,7 +677,7 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtMiscOptions_Impl* SvtMiscOptions::m_pDataContainer = NULL ;
+SvtMiscOptions_Impl* SvtMiscOptions::m_pDataContainer = nullptr ;
sal_Int32 SvtMiscOptions::m_nRefCount = 0 ;
@@ -693,7 +693,7 @@ SvtMiscOptions::SvtMiscOptions()
// 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 SvtMiscOptions_Impl;
svtools::ItemHolder2::holdConfigItem(E_MISCOPTIONS);
@@ -714,7 +714,7 @@ SvtMiscOptions::~SvtMiscOptions()
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
- m_pDataContainer = NULL;
+ m_pDataContainer = nullptr;
}
}
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index b7dbadf42b74..337f2b1f0d41 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -811,7 +811,7 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtOptionsDrawinglayer_Impl* SvtOptionsDrawinglayer::m_pDataContainer = NULL;
+SvtOptionsDrawinglayer_Impl* SvtOptionsDrawinglayer::m_pDataContainer = nullptr;
sal_Int32 SvtOptionsDrawinglayer::m_nRefCount = 0;
@@ -824,7 +824,7 @@ SvtOptionsDrawinglayer::SvtOptionsDrawinglayer()
// Increase our refcount ...
++m_nRefCount;
// ... and initialize our data container only if it not already!
- if( m_pDataContainer == NULL )
+ if( m_pDataContainer == nullptr )
{
m_pDataContainer = new SvtOptionsDrawinglayer_Impl();
}
@@ -846,7 +846,7 @@ SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
if (m_pDataContainer->IsModified())
m_pDataContainer->Commit();
delete m_pDataContainer;
- m_pDataContainer = NULL;
+ m_pDataContainer = nullptr;
}
}
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 1137e21a89cc..cb862f2ba8b2 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -60,13 +60,13 @@ using namespace ::utl;
using namespace ::osl;
using namespace ::com::sun::star::uno;
-static SvtPrintOptions_Impl* pPrinterOptionsDataContainer = NULL;
-static SvtPrintOptions_Impl* pPrintFileOptionsDataContainer = NULL;
+static SvtPrintOptions_Impl* pPrinterOptionsDataContainer = nullptr;
+static SvtPrintOptions_Impl* pPrintFileOptionsDataContainer = nullptr;
-SvtPrintOptions_Impl* SvtPrinterOptions::m_pStaticDataContainer = NULL;
+SvtPrintOptions_Impl* SvtPrinterOptions::m_pStaticDataContainer = nullptr;
sal_Int32 SvtPrinterOptions::m_nRefCount = 0;
-SvtPrintOptions_Impl* SvtPrintFileOptions::m_pStaticDataContainer = NULL;
+SvtPrintOptions_Impl* SvtPrintFileOptions::m_pStaticDataContainer = nullptr;
sal_Int32 SvtPrintFileOptions::m_nRefCount = 0;
class SvtPrintOptions_Impl
@@ -499,7 +499,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
}
SvtBasePrintOptions::SvtBasePrintOptions()
- : m_pDataContainer(NULL)
+ : m_pDataContainer(nullptr)
{
}
@@ -510,15 +510,15 @@ SvtBasePrintOptions::~SvtBasePrintOptions()
Mutex& SvtBasePrintOptions::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;
@@ -717,7 +717,7 @@ SvtPrinterOptions::SvtPrinterOptions()
// Increase our refcount ...
++m_nRefCount;
// ... and initialize our data container only if it not already!
- if( m_pStaticDataContainer == NULL )
+ if( m_pStaticDataContainer == nullptr )
{
OUString aRootPath( ROOTNODE_START );
m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += "/Printer" );
@@ -739,8 +739,8 @@ SvtPrinterOptions::~SvtPrinterOptions()
if( m_nRefCount <= 0 )
{
delete m_pStaticDataContainer;
- m_pStaticDataContainer = NULL;
- pPrinterOptionsDataContainer = NULL;
+ m_pStaticDataContainer = nullptr;
+ pPrinterOptionsDataContainer = nullptr;
}
}
@@ -751,7 +751,7 @@ SvtPrintFileOptions::SvtPrintFileOptions()
// Increase our refcount ...
++m_nRefCount;
// ... and initialize our data container only if it not already!
- if( m_pStaticDataContainer == NULL )
+ if( m_pStaticDataContainer == nullptr )
{
OUString aRootPath( ROOTNODE_START );
m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += "/File" );
@@ -774,8 +774,8 @@ SvtPrintFileOptions::~SvtPrintFileOptions()
if( m_nRefCount <= 0 )
{
delete m_pStaticDataContainer;
- m_pStaticDataContainer = NULL;
- pPrintFileOptionsDataContainer = NULL;
+ m_pStaticDataContainer = nullptr;
+ pPrintFileOptionsDataContainer = nullptr;
}
}
diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index b1d9886d55fe..49607c03e724 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -345,7 +345,7 @@ void SvtSlideSorterBarOptions_Impl::SetVisibleViewImpl( bool& bVisibleView, bool
// initialize static member, see definition for further information
// DON'T DO IT IN YOUR HEADER!
-SvtSlideSorterBarOptions_Impl* SvtSlideSorterBarOptions::m_pDataContainer = NULL ;
+SvtSlideSorterBarOptions_Impl* SvtSlideSorterBarOptions::m_pDataContainer = nullptr ;
sal_Int32 SvtSlideSorterBarOptions::m_nRefCount = 0 ;
SvtSlideSorterBarOptions::SvtSlideSorterBarOptions()
@@ -354,7 +354,7 @@ SvtSlideSorterBarOptions::SvtSlideSorterBarOptions()
MutexGuard aGuard( GetInitMutex() );
++m_nRefCount;
// ... and initialize our data container only if it not already exist!
- if( m_pDataContainer == NULL )
+ if( m_pDataContainer == nullptr )
{
m_pDataContainer = new SvtSlideSorterBarOptions_Impl;
}
@@ -371,7 +371,7 @@ SvtSlideSorterBarOptions::~SvtSlideSorterBarOptions()
if (m_pDataContainer->IsModified())
m_pDataContainer->Commit();
delete m_pDataContainer;
- m_pDataContainer = NULL;
+ m_pDataContainer = nullptr;
}
}
diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx
index 31d9a7560947..bddf81d75c82 100644
--- a/svtools/source/config/toolpanelopt.cxx
+++ b/svtools/source/config/toolpanelopt.cxx
@@ -299,7 +299,7 @@ Sequence< OUString > SvtToolPanelOptions_Impl::GetPropertyNames()
// initialize static member, see definition for further information
// DON'T DO IT IN YOUR HEADER!
-SvtToolPanelOptions_Impl* SvtToolPanelOptions::m_pDataContainer = NULL;
+SvtToolPanelOptions_Impl* SvtToolPanelOptions::m_pDataContainer = nullptr;
sal_Int32 SvtToolPanelOptions::m_nRefCount = 0;
SvtToolPanelOptions::SvtToolPanelOptions()
@@ -308,7 +308,7 @@ SvtToolPanelOptions::SvtToolPanelOptions()
MutexGuard aGuard( GetInitMutex() );
++m_nRefCount;
// ... and initialize our data container only if it not already exist!
- if( m_pDataContainer == NULL )
+ if( m_pDataContainer == nullptr )
{
m_pDataContainer = new SvtToolPanelOptions_Impl;
}
@@ -323,7 +323,7 @@ SvtToolPanelOptions::~SvtToolPanelOptions()
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
- m_pDataContainer = NULL;
+ m_pDataContainer = nullptr;
}
}