desktop/source/app/officeipcthread.cxx | 2 +- desktop/source/deployment/misc/dp_misc.cxx | 2 +- sd/JunitTest_sd_unoapi.mk | 2 +- sd/Module_sd.mk | 6 ++++++ sd/qa/unoapi/Test.java | 3 ++- sd/source/ui/view/viewshe3.cxx | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit 1f6a8f68f2d926de2b350308f08fe130b3e19728 Author: Pedro Giffuni <p...@apache.org> Date: Sat Jan 21 22:02:10 2017 +0000 Yet another weirdness found with clang 4.0. diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 31c8d6a..871a9db 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -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 )); commit 152740fe1ca977d6717b4bf57c71b2d5dddb4e4a Author: Pedro Giffuni <p...@apache.org> Date: Sat Jan 21 03:15:46 2017 +0000 Replace nullptr with NULL. It appears that MSVC 2008 [1] doesn't support nullptr so we are tied to the older ages. Pre-existing code uses NULL. [1] https://en.wikipedia.org/wiki/Visual_C%2B%2B diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 9903eab..7c4dba0 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -103,7 +103,7 @@ const OUString OfficePipeId::operator () () } rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); - if (digest == nullptr) { + if (digest == NULL) { throw RuntimeException( OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 ); } diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index e196261..7fc85cd 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -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) != nullptr) + if (pDocument->GetSdPage(0, ePageKind) != NULL) pTemplatePage = pDocument->GetSdPage(0, ePageKind); if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage()) aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers(); commit 197db69bfe23baca1737841fd677b267783c8a81 Author: Damjan Jovanovic <dam...@apache.org> Date: Sat Jan 21 00:42:34 2017 +0000 Add a main/sd subsequent test that wasn't hooked into the build. Patch by: me diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk index 238ee97..aba1c07 100644 --- a/sd/JunitTest_sd_unoapi.mk +++ b/sd/JunitTest_sd_unoapi.mk @@ -21,7 +21,7 @@ -$(eval $(call gb_JunitTest_JunitTest,sd_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,sd_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,sd_unoapi,\ $$(DEFS) \ diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index c2d3aea..ffd0da4 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -33,3 +33,9 @@ $(eval $(call gb_Module_add_targets,sd,\ Package_uiconfig \ Package_xml \ )) + +ifneq ($(OOO_JUNIT_JAR),) +$(eval $(call gb_Module_add_subsequentcheck_targets,sd,\ + JunitTest_sd_unoapi \ +)) +endif diff --git a/sd/qa/unoapi/Test.java b/sd/qa/unoapi/Test.java index 0db6198..4cbe20f 100644 --- a/sd/qa/unoapi/Test.java +++ b/sd/qa/unoapi/Test.java @@ -24,6 +24,7 @@ package org.openoffice.sd.qa.unoapi; import org.openoffice.Runner; +import org.openoffice.test.Argument; import org.openoffice.test.OfficeConnection; import static org.junit.Assert.*; @@ -41,7 +42,7 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "sd.sce", "-xcl", "knownissues.xcl", "-cs", + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-cs", connection.getDescription())); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits