summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdetc.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svdetc.cxx')
-rw-r--r--svx/source/svdraw/svdetc.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 3227bf331889..9efc087bfef5 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -69,11 +69,11 @@ using namespace ::com::sun::star;
// Global data of the DrawingEngine
SdrGlobalData::SdrGlobalData() :
- pSysLocale(NULL),
- pLocaleData(NULL),
- pOutliner(NULL),
- pDefaults(NULL),
- pResMgr(NULL),
+ pSysLocale(nullptr),
+ pLocaleData(nullptr),
+ pOutliner(nullptr),
+ pDefaults(nullptr),
+ pResMgr(nullptr),
nExchangeFormat(0)
{
if (!utl::ConfigManager::IsAvoidConfig())
@@ -409,7 +409,7 @@ SdrEngineDefaults::SdrEngineDefaults():
SdrEngineDefaults& SdrEngineDefaults::GetDefaults()
{
SdrGlobalData& rGlobalData=GetSdrGlobalData();
- if (rGlobalData.pDefaults==NULL) {
+ if (rGlobalData.pDefaults==nullptr) {
rGlobalData.pDefaults=new SdrEngineDefaults;
}
return *rGlobalData.pDefaults;
@@ -471,7 +471,7 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl
{
bool bHas=false;
bool bOnly=true;
- bool bLookOnly=pbOnlyEE!=NULL;
+ bool bLookOnly=pbOnlyEE!=nullptr;
SfxWhichIter aIter(rSet);
sal_uInt16 nWhich=aIter.FirstWhich();
while (((bLookOnly && bOnly) || !bHas) && nWhich!=0) {
@@ -486,7 +486,7 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl
nWhich=aIter.NextWhich();
}
if (!bHas) bOnly=false;
- if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly;
+ if (pbOnlyEE!=nullptr) *pbOnlyEE=bOnly;
return bHas;
}
@@ -584,7 +584,7 @@ bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions )
if(nCurAction > nActionCount)
nCurAction = nActionCount;
- return maLink.Call(NULL);
+ return maLink.Call(nullptr);
}
bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
@@ -592,13 +592,13 @@ bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
nSumCurAction += nAnzInserts;
nCurInsert += nAnzInserts;
- return maLink.Call(NULL);
+ return maLink.Call(nullptr);
}
bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales )
{
nSumCurAction += nAnzRescales;
- return maLink.Call(NULL);
+ return maLink.Call(nullptr);
}
void SvdProgressInfo::SetActionCount( sal_uIntPtr _nActionCount )