[Libreoffice-commits] core.git: 2 commits - extras/source svx/source svx/uiconfig

[Francisco Adrián Sánchez]

 extras/source/templates/presnt/AbstractGreen.otp  |binary
 extras/source/templates/presnt/AbstractRed.otp    |binary
 extras/source/templates/presnt/AbstractYellow.otp |binary
 svx/source/dialog/crashreportdlg.cxx              |   15 +++++++++++++++
 svx/source/dialog/crashreportdlg.hxx              |    1 +
 svx/uiconfig/ui/crashreportdlg.ui                 |   15 +++++++++++++++
 6 files changed, 31 insertions(+)

New commits:
commit 74b8ae360a5bdc9d6a37bc80136ac4bc7ede7563
Author: Francisco Adrián Sánchez <franciscoadriansanchez at gmail.com>
Date:   Mon Oct 10 22:02:47 2016 +0200

    Fix language on Abstract* templates
    
    Changed the default language from German to English (US)
    Corrected also the area and line style of background objects
    
    Change-Id: I632b922c0e48ea578a5290015ddc499ba2af0781

diff --git a/extras/source/templates/presnt/AbstractGreen.otp b/extras/source/templates/presnt/AbstractGreen.otp
index d819926..0ac2540 100644
Binary files a/extras/source/templates/presnt/AbstractGreen.otp and b/extras/source/templates/presnt/AbstractGreen.otp differ
diff --git a/extras/source/templates/presnt/AbstractRed.otp b/extras/source/templates/presnt/AbstractRed.otp
index 52525f7..a43f80b 100644
Binary files a/extras/source/templates/presnt/AbstractRed.otp and b/extras/source/templates/presnt/AbstractRed.otp differ
diff --git a/extras/source/templates/presnt/AbstractYellow.otp b/extras/source/templates/presnt/AbstractYellow.otp
index 0b0894a..59829b4 100644
Binary files a/extras/source/templates/presnt/AbstractYellow.otp and b/extras/source/templates/presnt/AbstractYellow.otp differ
commit 5daafc88ca0d8fd06080a6fe2f7487188953ebe3
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Oct 10 21:55:10 2016 +0200

    Allow entering safemode after crash
    
    Change-Id: Id12d3c10714b7ce5722c2270e9e897db63bedcf2

diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index d31a863..bbac211 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -15,8 +15,12 @@
 #include <rtl/bootstrap.hxx>
 #include <desktop/crashreport.hxx>
 #include <desktop/minidump.hxx>
+#include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
 
+#include <com/sun/star/task/OfficeRestartManager.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+
 CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
     Dialog(pParent, "CrashReportDialog",
             "svx/ui/crashreportdlg.ui")
@@ -27,6 +31,7 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
     get(mpEditPreUpload, "ed_pre");
     get(mpEditPostUpload, "ed_post");
     get(mpFtBugReport, "ed_bugreport");
+    get(mpCBSafeMode, "check_safemode");
 
     maSuccessMsg = mpEditPostUpload->GetText();
 
@@ -49,6 +54,7 @@ void CrashReportDialog::dispose()
     mpEditPreUpload.clear();
     mpEditPostUpload.clear();
     mpFtBugReport.clear();
+    mpCBSafeMode.clear();
 
     Dialog::dispose();
 }
@@ -94,6 +100,15 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
     {
         Close();
     }
+
+    // Check whether to go to safe mode
+    if (mpCBSafeMode->IsChecked())
+    {
+        //TODO: Actually set the safe mode, currently it's only restarting
+        css::uno::Reference< css::uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
+        css::task::OfficeRestartManager::get(xContext)->requestRestart(
+            css::uno::Reference< css::task::XInteractionHandler >());
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx
index 602d706..ecdd445 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -34,6 +34,7 @@ private:
     VclPtr<FixedText> mpEditPreUpload;
     VclPtr<VclMultiLineEdit> mpEditPostUpload;
     VclPtr<VclMultiLineEdit> mpFtBugReport;
+    VclPtr<CheckBox> mpCBSafeMode;
 
     OUString maSuccessMsg;
 
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index 9dd35f6..4b8b229 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -111,6 +111,21 @@ Thank you for your help in improving %PRODUCTNAME.</property>
             <property name="position">3</property>
           </packing>
         </child>
+        <child>
+           <object class="GtkCheckButton" id="check_safemode">
+             <property name="label" translatable="yes">Restart LibreOffice to enter Safe Mode</property>
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="receives_default">False</property>
+             <property name="xalign">0</property>
+             <property name="draw_indicator">True</property>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+             <property name="fill">True</property>
+             <property name="position">3</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>