Author: pfg Date: Fri Jan 20 20:16:27 2017 New Revision: 1779672 URL: http://svn.apache.org/viewvc?rev=1779672&view=rev Log: 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 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=1779672&r1=1779671&r2=1779672&view=diff ============================================================================== --- openoffice/trunk/main/desktop/source/deployment/misc/dp_misc.cxx (original) +++ openoffice/trunk/main/desktop/source/deployment/misc/dp_misc.cxx Fri Jan 20 20:16:27 2017 @@ -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 ); } 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=1779672&r1=1779671&r2=1779672&view=diff ============================================================================== --- openoffice/trunk/main/sd/source/ui/view/viewshe3.cxx (original) +++ openoffice/trunk/main/sd/source/ui/view/viewshe3.cxx Fri Jan 20 20:16:27 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) > 0) + if (pDocument->GetSdPage(0, ePageKind) != nullptr) pTemplatePage = pDocument->GetSdPage(0, ePageKind); if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage()) aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers();