diff options
Diffstat (limited to 'sd/source/ui/view/viewshe3.cxx')
-rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 06892405f074..a10aae8cf344 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -199,9 +199,9 @@ SdPage* ViewShell::CreateOrDuplicatePage ( // size, master page, to the new page. This is usually the given page. // When the given page is NULL then use the first page of the document. SdPage* pTemplatePage = pPage; - if (pTemplatePage == NULL) + if (pTemplatePage == nullptr) pTemplatePage = pDocument->GetSdPage(0, ePageKind); - if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage()) + if (pTemplatePage != nullptr && pTemplatePage->TRG_HasMasterPage()) aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers(); else aVisibleLayers.SetAll(); @@ -221,14 +221,14 @@ SdPage* ViewShell::CreateOrDuplicatePage ( pDocument->StopWorkStartupDelay(); // Use the layouts of the previous page and notes page as template. - if (pTemplatePage != NULL) + if (pTemplatePage != nullptr) { eStandardLayout = pTemplatePage->GetAutoLayout(); if( eStandardLayout == AUTOLAYOUT_TITLE ) eStandardLayout = AUTOLAYOUT_ENUM; SdPage* pNotesTemplatePage = static_cast<SdPage*>(pDocument->GetPage(pTemplatePage->GetPageNum()+1)); - if (pNotesTemplatePage != NULL) + if (pNotesTemplatePage != nullptr) eNotesLayout = pNotesTemplatePage->GetAutoLayout(); } } @@ -284,7 +284,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif rRequest.Ignore (); - return NULL; + return nullptr; } } else @@ -297,7 +297,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif rRequest.Ignore (); - return NULL; + return nullptr; } // 2. Create a new page or duplicate an existing one. @@ -319,8 +319,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( // then to the head of the document. c) pPage is NULL and the // document is empty: We use CreateFirstPages to create the // first page of the document. - if (pPage == NULL) - if (pTemplatePage == NULL) + if (pPage == nullptr) + if (pTemplatePage == nullptr) { pDocument->CreateFirstPages(); nNewPageIndex = 0; @@ -367,7 +367,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( case SID_DUPLICATE_PAGE: // Duplication makes no sense when pPage is NULL. - if (pPage != NULL) + if (pPage != nullptr) nNewPageIndex = pDocument->DuplicatePage ( pPage, ePageKind, @@ -382,7 +382,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( SAL_INFO("sd", "wrong slot id given to CreateOrDuplicatePage"); // Try to handle another slot id gracefully. } - SdPage* pNewPage = 0; + SdPage* pNewPage = nullptr; if(nNewPageIndex != 0xffff) pNewPage = pDocument->GetSdPage(nNewPageIndex, PK_STANDARD); |