[Libreoffice-commits] core.git: vcl/android

Caolán McNamara caolanm at redhat.com
Fri Feb 23 12:38:04 UTC 2018


 vcl/android/androidinst.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 57464884619be641f5ebc8804593f668ec8e0981
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 23 12:35:50 2018 +0000

    blind android build fix
    
    Change-Id: I8e5722ee922c609fa71c766692f79f138217bf05

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index ae0399518c56..bdb01375a6f3 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -19,7 +19,9 @@
 #include <osl/detail/android-bootstrap.h>
 #include <rtl/strbuf.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
+#include <memory>
 
 #define LOGTAG "LibreOffice/androidinst"
 #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG, __VA_ARGS__))
@@ -222,10 +224,11 @@ int AndroidSalSystem::ShowNativeDialog( const OUString& rTitle,
         // it intended to be used from Java, so some verbose JNI
         // horror would be needed to use it directly here. Probably we
         // want some easier to use magic wrapper, hmm.
-
-        MessageDialog aVclErrBox(NULL, rMessage);
-        aVclErrBox.SetText(rTitle);
-        aVclErrBox.Execute();
+        std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(nullptr,
+                                                  VclMessageType::Warning, VclButtonsType::Ok,
+                                                  rMessage));
+        xBox->set_title(rTitle);
+        xBox->run();
     }
     else
         LOGE("VCL not initialized");


More information about the Libreoffice-commits mailing list