diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-01-22 08:35:12 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-01-22 08:35:12 +0000 |
| commit | 22a8fef070b004a82c5b17a7cc9a2c5348ee818a (patch) | |
| tree | 20f6ad71fa83a7b28f2825cb98e3798c36c36997 /editors/openoffice-devel/files | |
| parent | Update to version 4.9.3 (diff) | |
editors/openoffice-devel: unbreak with clang 4.0
main/desktop/source/app/officeipcthread.cxx:228:14: error: ordered comparison between pointer and zero ('rtlDigest' (aka 'void *') and 'int')
if ( handle > 0 )
~~~~~~ ^ ~
main/desktop/source/deployment/misc/dp_misc.cxx:106:16: error: ordered comparison between pointer and zero ('rtlDigest' (aka 'void *') and 'int')
if (digest <= 0) {
~~~~~~ ^ ~
main/sd/source/ui/view/viewshe3.cxx:229:48: error: ordered comparison between pointer and zero ('SdPage *' and 'int')
if (pDocument->GetSdPage(0, ePageKind) > 0)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
PR: 216206
Submitted by: pfg
Obtained from: upstream
Notes
Notes:
svn path=/head/; revision=432098
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-clang40 | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/editors/openoffice-devel/files/patch-clang40 b/editors/openoffice-devel/files/patch-clang40 new file mode 100644 index 000000000000..6b2d76f21966 --- /dev/null +++ b/editors/openoffice-devel/files/patch-clang40 @@ -0,0 +1,39 @@ +Index: desktop/source/app/officeipcthread.cxx +=================================================================== +--- desktop/source/app/officeipcthread.cxx (revision 1779757) ++++ desktop/source/app/officeipcthread.cxx (revision 1779758) +@@ -225,7 +225,7 @@ String CreateMD5FromString( const OUString& aMsg ) + // BACK: Str "ababab....0f" Hexcode String + + rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); +- if ( handle > 0 ) ++ if ( handle != NULL ) + { + const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr(); + sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode )); +Index: desktop/source/deployment/misc/dp_misc.cxx +=================================================================== +--- desktop/source/deployment/misc/dp_misc.cxx (revision 1779671) ++++ desktop/source/deployment/misc/dp_misc.cxx (revision 1779695) +@@ -103,7 +103,7 @@ const OUString OfficePipeId::operator () () + } + + rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); +- if (digest <= 0) { ++ if (digest == NULL) { + throw RuntimeException( + OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 ); + } +Index: sd/source/ui/view/viewshe3.cxx +=================================================================== +--- sd/source/ui/view/viewshe3.cxx (revision 1779671) ++++ sd/source/ui/view/viewshe3.cxx (revision 1779695) +@@ -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) != NULL) + pTemplatePage = pDocument->GetSdPage(0, ePageKind); + if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage()) + aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers(); |