Skip to content

C
core
Kaydet (Commit) a703b365 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl
Dosyalara gözat
Seçenekler

android: add destroy and exit as a separate JNI call 

Change-Id: Ia8516da556b3736f34b366e2eb89ad8bbd7bafc1
üst a8130447
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
android/Bootstrap/src/org/libreoffice/kit/Office.java
Dosyayı görüntüle @ a703b365
...@@ -31,4 +31,5 @@ public class Office { ...@@ -31,4 +31,5 @@ public class Office {
} }
public native void destroy(); public native void destroy();
public native void destroyAndExit();
} }
desktop/source/lib/lokandroid.cxx
Dosyayı görüntüle @ a703b365
...@@ -66,6 +66,12 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Office_initializ ...@@ -66,6 +66,12 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Office_initializ
} }
extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Office_destroy(JNIEnv* pEnv, jobject aObject) extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Office_destroy(JNIEnv* pEnv, jobject aObject)
{
LibreOfficeKit* pLibreOfficeKit = getHandle<LibreOfficeKit>(pEnv, aObject);
pLibreOfficeKit->pClass->destroy(pLibreOfficeKit);
}
extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Office_destroyAndExit(JNIEnv* pEnv, jobject aObject)
{ {
LibreOfficeKit* pLibreOfficeKit = getHandle<LibreOfficeKit>(pEnv, aObject); LibreOfficeKit* pLibreOfficeKit = getHandle<LibreOfficeKit>(pEnv, aObject);
pLibreOfficeKit->pClass->destroy(pLibreOfficeKit); pLibreOfficeKit->pClass->destroy(pLibreOfficeKit);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment