View | Details | Raw Unified | Return to bug 216206 | Differences between
and this patch

Collapse All | Expand All

(-)desktop/source/deployment/misc/dp_misc.cxx (-1 / +1 lines)
Lines 103-109 Link Here
103 
	}
 103 
	}
104
104
105 
    rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
 105 
    rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
106 
    if (digest <= 0) {
 106 
    if (digest == nullptr) {
107 
        throw RuntimeException(
 107 
        throw RuntimeException(
108 
            OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
 108 
            OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
109 
    }
 109 
    }
(-)sd/source/ui/view/viewshe3.cxx (-3 / +3 lines)
Lines 225-234 Link Here
225 
    // size, master page, to the new page.  This is usually the given page.
 225 
    // size, master page, to the new page.  This is usually the given page.
226 
    // When the given page is NULL then use the first page of the document.
 226 
    // When the given page is NULL then use the first page of the document.
227 
    SdPage* pTemplatePage = pPage;
 227 
    SdPage* pTemplatePage = pPage;
228 
    if (pTemplatePage == NULL)
 228 
    if (pTemplatePage == nullptr)
229 
        if (pDocument->GetSdPage(0, ePageKind) > 0)
 229 
        if (pDocument->GetSdPage(0, ePageKind) != nullptr)
230 
            pTemplatePage = pDocument->GetSdPage(0, ePageKind);
230 
            pTemplatePage = pDocument->GetSdPage(0, ePageKind);
231 
    if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage())
 231 
    if (pTemplatePage != nullptr && pTemplatePage->TRG_HasMasterPage())
232 
        aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers();
 232 
        aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers();
233 
    else
 233 
    else
234 
        aVisibleLayers.SetAll();
 234 
        aVisibleLayers.SetAll();

Return to bug 216206