Attachment 179155 Details for Bug 216206 – WIP patch

[patch] WIP patch

patch-clang4 (text/plain), 1.41 KB, created by Pedro F. Giffuni on 2017-01-20 18:22:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2017-01-20 18:22:24 UTC

Size: 1.41 KB

patch

obsolete

>Index: desktop/source/deployment/misc/dp_misc.cxx
>===================================================================
>--- desktop/source/deployment/misc/dp_misc.cxx	(revision 1779662)
>+++ desktop/source/deployment/misc/dp_misc.cxx	(working copy)
>@@ -103,7 +103,7 @@
> 	}
>     
>     rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
>-    if (digest <= 0) {
>+    if (digest == nullptr) {
>         throw RuntimeException(
>             OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
>     }
>Index: sd/source/ui/view/viewshe3.cxx
>===================================================================
>--- sd/source/ui/view/viewshe3.cxx	(revision 1779662)
>+++ sd/source/ui/view/viewshe3.cxx	(working copy)
>@@ -225,10 +225,10 @@
>     // 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 (pDocument->GetSdPage(0, ePageKind) > 0)
>+    if (pTemplatePage == nullptr)
>+        if (pDocument->GetSdPage(0, ePageKind) != 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();

Actions: View | Diff

Attachments on bug 216206: 179155 | 179161 | 179172 | 179197