diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:18:25 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:18:25 +1000 |
commit | 3cf126d701484c8141f9c64e87127f3e858c2aef (patch) | |
tree | 5b7de1c2e7871a916450c94ff2bdfc76d8ece62c /jvmfwk/source | |
parent | 9ff87d13932ca68a775a439df378bed25f9f0e8f (diff) |
tdf#43157: convert jvmfwk from OSL_ASSERT to assert
Change-Id: Ie06633dd6a49ed9fc51dfb5e6066529020dcf268
Diffstat (limited to 'jvmfwk/source')
-rw-r--r-- | jvmfwk/source/elements.cxx | 6 | ||||
-rw-r--r-- | jvmfwk/source/framework.cxx | 6 | ||||
-rw-r--r-- | jvmfwk/source/fwkbase.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 353eab37ba6f..a57af9ad2374 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -51,7 +51,7 @@ OString getElement(OString const & docPath, xmlChar const * pathExpression, bool bThrowIfEmpty) { //Prepare the xml document and context - OSL_ASSERT(!docPath.isEmpty()); + assert(!docPath.isEmpty()); jfw::CXmlDocPtr doc(xmlParseFile(docPath.getStr())); if (doc == nullptr) throw FrameworkException( @@ -712,7 +712,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) OString sExcMsg("[Java framework] Error in function NodeJavaInfo::loadFromNode " "(elements.cxx)."); - OSL_ASSERT(pJavaInfo && pDoc); + assert(pJavaInfo && pDoc); if (pJavaInfo->children == nullptr) return; //Get the xsi:nil attribute; @@ -829,7 +829,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc, xmlNode* pJavaInfoNode) const { - OSL_ASSERT(pJavaInfoNode && pDoc); + assert(pJavaInfoNode && pDoc); //write the attribute vendorSettings //javaInfo@vendorUpdate diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index ddc5e6c19747..9dd836a5b806 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -239,7 +239,7 @@ javaFrameworkError jfw_startVM( "-Djava.class.path=" + jfw::BootParams::getClasspath(); } else - OSL_ASSERT(false); + assert(false); pInfo = aInfo.get(); } assert(pInfo != nullptr); @@ -299,7 +299,7 @@ javaFrameworkError jfw_startVM( g_pJavaVM = pVm; *ppVM = pVm; } - OSL_ASSERT(plerr != javaPluginError::WrongVendor); + assert(plerr != javaPluginError::WrongVendor); } catch (const jfw::FrameworkException& e) { @@ -667,7 +667,7 @@ javaFrameworkError jfw_getJavaInfoByPath(OUString const & pPath, std::unique_ptr {// plugin does not recognize this path as belonging to JRE continue; } - OSL_ASSERT(false); + assert(false); } if (!*ppInfo && errcode != JFW_E_FAILED_VERSION) errcode = JFW_E_NOT_RECOGNIZED; diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index dbab7d4a9e7a..226673356cd5 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -120,7 +120,7 @@ VendorSettings::VendorSettings(): VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) { - OSL_ASSERT(!sVendor.isEmpty()); + assert(!sVendor.isEmpty()); VersionInfo aVersionInfo; OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8); //Get minVersion @@ -436,7 +436,7 @@ JFW_MODE getMode() OUString getApplicationClassPath() { - OSL_ASSERT(getMode() == JFW_MODE_APPLICATION); + assert(getMode() == JFW_MODE_APPLICATION); OUString retVal; OUString sParams = BootParams::getClasspathUrls(); if (sParams.isEmpty()) @@ -453,7 +453,7 @@ OUString getApplicationClassPath() OUString systemPathElement; oslFileError rc = osl_getSystemPathFromFileURL( token.pData, &systemPathElement.pData ); - OSL_ASSERT( rc == osl_File_E_None ); + assert( rc == osl_File_E_None ); if (rc == osl_File_E_None && !systemPathElement.isEmpty()) { if (buf.getLength() > 0) |