Skip to content

Commit

Permalink
Fix mismatches found by Clang-4.0.
Browse files Browse the repository at this point in the history
Reported on FreeBSD's bugzilla [1].
Unfortunately it is likely more issues remain.

[1]
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216206


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1779672 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
pgiffuni committed Jan 20, 2017
1 parent 98e4ac8 commit eec91ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion main/desktop/source/deployment/misc/dp_misc.cxx
Expand Up @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion main/sd/source/ui/view/viewshe3.cxx
Expand Up @@ -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();
Expand Down

0 comments on commit eec91ef

Please sign in to comment.