summaryrefslogtreecommitdiff
path: root/sd/source/ui/app/sdmod.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/app/sdmod.cxx')
-rw-r--r--sd/source/ui/app/sdmod.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 36d3aaa59855..82c23e11115a 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -70,13 +70,13 @@ void SdModule::InitInterface_Impl()
SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
: SfxModule( ResMgr::CreateResMgr("sd"), false,
pFact1, pFact2, NULL ),
- pTransferClip(NULL),
- pTransferDrag(NULL),
- pTransferSelection(NULL),
- pImpressOptions(NULL),
- pDrawOptions(NULL),
- pSearchItem(NULL),
- pNumberFormatter( NULL ),
+ pTransferClip(nullptr),
+ pTransferDrag(nullptr),
+ pTransferSelection(nullptr),
+ pImpressOptions(nullptr),
+ pDrawOptions(nullptr),
+ pSearchItem(nullptr),
+ pNumberFormatter( nullptr ),
bWaterCan(false),
mpResourceContainer(new ::sd::SdGlobalResourceContainer()),
mbEventListenerAdded(false)
@@ -114,8 +114,8 @@ SdModule::~SdModule()
// Mark the module in the global AppData structure as deleted.
SdModule** ppShellPointer = reinterpret_cast<SdModule**>(GetAppData(SHL_DRAW));
- if (ppShellPointer != NULL)
- (*ppShellPointer) = NULL;
+ if (ppShellPointer != nullptr)
+ (*ppShellPointer) = nullptr;
delete mpErrorHdl;
mpVirtualRefDevice.disposeAndClear();
@@ -127,15 +127,15 @@ void SdModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DEINITIALIZING )
{
- delete pImpressOptions, pImpressOptions = NULL;
- delete pDrawOptions, pDrawOptions = NULL;
+ delete pImpressOptions, pImpressOptions = nullptr;
+ delete pDrawOptions, pDrawOptions = nullptr;
}
}
/// Return options
SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
{
- SdOptions* pOptions = NULL;
+ SdOptions* pOptions = nullptr;
if (eDocType == DOCUMENT_TYPE_DRAW)
{
@@ -156,7 +156,7 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
sal_uInt16 nMetric = pOptions->GetMetric();
::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>( SfxObjectShell::Current() );
- SdDrawDocument* pDoc = NULL;
+ SdDrawDocument* pDoc = nullptr;
if (pDocSh)
pDoc = pDocSh->GetDoc();