sal/osl/unx/thread.cxx | 4 ++-- scripting/source/dlgprov/dlgprov.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit c8ae1787c6315bd7a8513656626132f1140e77f9 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Oct 1 12:17:31 2014 +0200 Blind fix for Android Change-Id: If997720635f99726e14c00132308529f96e639c8 diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx index 739dd18..f23f55b 100644 --- a/sal/osl/unx/thread.cxx +++ b/sal/osl/unx/thread.cxx @@ -233,14 +233,14 @@ static void* osl_thread_start_Impl (void* pData) { #ifdef ANDROID JNIEnv* env = 0; - int res = (*lo_get_javavm())->AttachCurrentThread(lo_get_javavm(), &env, NULL); + int res = (*lo_get_javavm()).AttachCurrentThread(&env, NULL); __android_log_print(ANDROID_LOG_INFO, "LibreOffice", "New sal thread started and attached res=%d", res); #endif /* call worker function */ pImpl->m_WorkerFunction(pImpl->m_pData); #ifdef ANDROID - res = (*lo_get_javavm())->DetachCurrentThread(lo_get_javavm()); + res = (*lo_get_javavm()).DetachCurrentThread(); __android_log_print(ANDROID_LOG_INFO, "LibreOffice", "Detached finished sal thread res=%d", res); #endif } commit 609e22b0dcbadc0501847fd574f58085b0891d75 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Oct 1 11:50:04 2014 +0200 scripting: std::auto_ptr -> std::unique_ptr Change-Id: I91f4a037dfcfbea83cb1ea546ea73880f0480961 diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 3246070..2c690ad 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -78,7 +78,7 @@ namespace dlgprov ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxDlgLib; ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > mxBasicRTLListener; }; - std::auto_ptr< BasicRTLParams > m_BasicInfo; + std::unique_ptr< BasicRTLParams > m_BasicInfo; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits