svn commit: r1779695 - in /openoffice/trunk/main: desktop/source/deployment/misc/dp_misc.cxx sd/source/ui/view/viewshe3.cxx

[pf...@apache.org]

Author: pfg
Date: Sat Jan 21 03:15:46 2017
New Revision: 1779695

URL: http://svn.apache.org/viewvc?rev=1779695&view=rev
Log:
Replace nullptr with NULL.

It appears [1] that MSVC 8 doesn't support nullptr so we are tied to 
the older ages. Pre-existing code does have NULL.

[1]
https://en.wikipedia.org/wiki/Visual_C%2B%2B

Modified:
    openoffice/trunk/main/desktop/source/deployment/misc/dp_misc.cxx
    openoffice/trunk/main/sd/source/ui/view/viewshe3.cxx

Modified: openoffice/trunk/main/desktop/source/deployment/misc/dp_misc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/deployment/misc/dp_misc.cxx?rev=1779695&r1=1779694&r2=1779695&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/deployment/misc/dp_misc.cxx (original)
+++ openoffice/trunk/main/desktop/source/deployment/misc/dp_misc.cxx Sat Jan 21 03:15:46 2017
@@ -103,7 +103,7 @@ const OUString OfficePipeId::operator ()
 	}
     
     rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
-    if (digest == nullptr) {
+    if (digest == NULL) {
         throw RuntimeException(
             OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
     }

Modified: openoffice/trunk/main/sd/source/ui/view/viewshe3.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/viewshe3.cxx?rev=1779695&r1=1779694&r2=1779695&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/viewshe3.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/viewshe3.cxx Sat Jan 21 03:15:46 2017
@@ -226,7 +226,7 @@ SdPage* ViewShell::CreateOrDuplicatePage
     // When the given page is NULL then use the first page of the document.
     SdPage* pTemplatePage = pPage;
     if (pTemplatePage == NULL)
-        if (pDocument->GetSdPage(0, ePageKind) != nullptr)
+        if (pDocument->GetSdPage(0, ePageKind) != NULL)
             pTemplatePage = pDocument->GetSdPage(0, ePageKind); 
     if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage())
         aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers();