[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source sd/source

[Pedro Giffuni]

 desktop/source/deployment/misc/dp_misc.cxx |    2 +-
 sd/source/ui/view/viewshe3.cxx             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 22bae4d4a630509ddbf026bf8a79d1c43af55442
Author: Pedro Giffuni <pfg at apache.org>
Date:   Fri Jan 20 20:16:27 2017 +0000

    Fix mismatches found by Clang-4.0.
    
    Reported on FreeBSD's bugzilla [1].
    Unfortunately it is likely more issues remain.
    
    [1]
    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216206

diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index b31c4f3..9903eab 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -103,7 +103,7 @@ const OUString OfficePipeId::operator () ()
     }
 
     rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
-    if (digest <= 0) {
+    if (digest == nullptr) {
         throw RuntimeException(
             OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
     }
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 0ae7145..e196261 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -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) > 0)
+        if (pDocument->GetSdPage(0, ePageKind) != nullptr)
             pTemplatePage = pDocument->GetSdPage(0, ePageKind);
     if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage())
         aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers();