tdf#43157: convert jvmfwk from OSL_ASSERT to assert

Change-Id: Ie06633dd6a49ed9fc51dfb5e6066529020dcf268

4 files changed, 14 insertions, 14 deletions

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 1750696ab018..8e8146628621 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -171,7 +171,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
         m_sJavaHome = "file:///usr/lib";
 
     // init m_sRuntimeLibrary
-    OSL_ASSERT(!m_sHome.isEmpty());
+    assert(!m_sHome.isEmpty());
     //call virtual function to get the possible paths to the runtime library.
 
     int size = 0;
@@ -256,7 +256,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
         return false;
 
     // init m_sLD_LIBRARY_PATH
-    OSL_ASSERT(!m_sHome.isEmpty());
+    assert(!m_sHome.isEmpty());
     size = 0;
     char const * const * arLDPaths = getLibraryPaths( & size);
     vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 0bd412408b3b..9071bc6fa3b5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -103,7 +103,7 @@ OString getPluginJarPath(
         SunVersion ver142("1.4.2-ea");
         SunVersion ver150("1.5.0-ea");
         SunVersion ver(sVersion);
-        OSL_ASSERT(ver142 && ver150 && ver);
+        assert(ver142 && ver150 && ver);
 
         OUString sName;
         if (ver < ver142)
@@ -139,7 +139,7 @@ OString getPluginJarPath(
                 sPath = sPath1 + OUString::createFromAscii(sep) + sPath2;
             }
         }
-        OSL_ASSERT(!sPath.isEmpty());
+        assert(!sPath.isEmpty());
     }
     ret = OUStringToOString(sPath, osl_getThreadTextEncoding());
 
@@ -301,7 +301,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
 {
     assert(parJavaInfo);
 
-    OSL_ASSERT(!sVendor.isEmpty());
+    assert(!sVendor.isEmpty());
     if (sVendor.isEmpty())
         return javaPluginError::InvalidArg;
 
@@ -349,11 +349,11 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     std::unique_ptr<JavaInfo> * ppInfo)
 {
     assert(ppInfo != nullptr);
-    OSL_ASSERT(!sPath.isEmpty());
+    assert(!sPath.isEmpty());
     if (sPath.isEmpty())
         return javaPluginError::InvalidArg;
 
-    OSL_ASSERT(!sVendor.isEmpty());
+    assert(!sVendor.isEmpty());
     if (sVendor.isEmpty())
         return javaPluginError::InvalidArg;
 
@@ -688,7 +688,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
         reinterpret_cast<JNI_CreateVM_Type *>(moduleRt.getFunctionSymbol(sSymbolCreateJava));
     if (!pCreateJavaVM)
     {
-        OSL_ASSERT(false);
+        assert(false);
         OString sLib = OUStringToOString(
             sRuntimeLib, osl_getThreadTextEncoding());
         OString sSymbol = OUStringToOString(
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 3c31e60c63e6..0b37c182f805 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -404,7 +404,7 @@ bool getJavaProps(const OUString & exePath,
 {
     bool ret = false;
 
-    OSL_ASSERT(!exePath.isEmpty());
+    assert(!exePath.isEmpty());
     OUString usStartDir;
     //We need to set the CLASSPATH in case the office is started from
     //a different directory. The JREProperties.class is expected to reside
@@ -515,7 +515,7 @@ bool getJavaProps(const OUString & exePath,
             continue;
         //The JREProperties class writes key value pairs, separated by '='
         sal_Int32 index = sLine.indexOf('=');
-        OSL_ASSERT(index != -1);
+        assert(index != -1);
         OUString sKey = sLine.copy(0, index);
         OUString sVal = sLine.copy(index + 1);
 
@@ -541,7 +541,7 @@ bool getJavaProps(const OUString & exePath,
 
     TimeValue waitMax= {5 ,0};
     procErr = osl_joinProcessWithTimeout(javaProcess, &waitMax);
-    OSL_ASSERT(procErr == osl_Process_E_None);
+    assert(procErr == osl_Process_E_None);
     osl_freeProcessHandle(javaProcess);
     return ret;
 }
@@ -552,7 +552,7 @@ bool getJavaProps(const OUString & exePath,
  */
 bool decodeOutput(const OString& s, OUString* out)
 {
-    OSL_ASSERT(out != nullptr);
+    assert(out != nullptr);
     OUStringBuffer buff(512);
     sal_Int32 nIndex = 0;
     do
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 1f7423045bc1..c84e668e8371 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -122,7 +122,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
         return false;
 
     // init m_sRuntimeLibrary
-    OSL_ASSERT(!m_sHome.isEmpty());
+    assert(!m_sHome.isEmpty());
     //call virtual function to get the possible paths to the runtime library.
 
     int size = 0;
@@ -148,7 +148,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
         return false;
 
     // init m_sLD_LIBRARY_PATH
-    OSL_ASSERT(!m_sHome.isEmpty());
+    assert(!m_sHome.isEmpty());
     size = 0;
     char const * const * arLDPaths = getLibraryPaths( & size);
     vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size);