[Libreoffice-commits] core.git: 2 commits - extras/source svx/source svx/uiconfig
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 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 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 #include #include +#include #include +#include +#include + 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 mpEditPreUpload; VclPtr mpEditPostUpload; VclPtr mpFtBugReport; +VclPtr 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. 3 + + + Restart LibreOffice to enter Safe Mode + True + True + False + 0 + True + + + False + True + 3 + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 12 commits - extras/source
extras/source/templates/presnt/AbstractGreen.otp |binary extras/source/templates/presnt/AbstractRed.otp|binary extras/source/templates/presnt/AbstractYellow.otp |binary extras/source/templates/presnt/BrightBlue.otp |binary extras/source/templates/presnt/DNA.otp|binary extras/source/templates/presnt/Impress.otp|binary extras/source/templates/presnt/Inspiration.otp|binary extras/source/templates/presnt/LushGreen.otp |binary extras/source/templates/presnt/Metropolis.otp |binary extras/source/templates/presnt/Midnightblue.otp |binary extras/source/templates/presnt/Sunset.otp |binary extras/source/templates/presnt/Vintage.otp|binary 12 files changed New commits: commit 25767162edf38134c4412cce2a7d938f4657cc2d Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:15:40 2016 +0200 Improve 'Midnightblue' template Change-Id: I9d5acead074d745880d4c42e4ce9634c5b8cb5b3 diff --git a/extras/source/templates/presnt/Midnightblue.otp b/extras/source/templates/presnt/Midnightblue.otp index 96945ef..981704c 100644 Binary files a/extras/source/templates/presnt/Midnightblue.otp and b/extras/source/templates/presnt/Midnightblue.otp differ commit 73e5931cc72cb79747b6f3d1349009f33b7ea834 Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:15:27 2016 +0200 Improve 'Metropolis' template Change-Id: I968587a1cfdf2c55d299b1cd76996947c3244fae diff --git a/extras/source/templates/presnt/Metropolis.otp b/extras/source/templates/presnt/Metropolis.otp index 8669454..2af7d8a 100644 Binary files a/extras/source/templates/presnt/Metropolis.otp and b/extras/source/templates/presnt/Metropolis.otp differ commit a425610dab2b58524f5d335a16e9926008a7a0cd Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:15:10 2016 +0200 Improve 'LushGreen' template Change-Id: I43332495e9419eed2ac69c1d08b603e81fe7df6d diff --git a/extras/source/templates/presnt/LushGreen.otp b/extras/source/templates/presnt/LushGreen.otp index 936ae04..040e3bf 100644 Binary files a/extras/source/templates/presnt/LushGreen.otp and b/extras/source/templates/presnt/LushGreen.otp differ commit 776d1efc3e915be189250c8c2d9346e2990d5836 Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:14:54 2016 +0200 Improve 'Inspiration' template Change-Id: Ic5401e89bd8653e856e93034f0c25373305cc35a diff --git a/extras/source/templates/presnt/Inspiration.otp b/extras/source/templates/presnt/Inspiration.otp index 8fbe822..18a30cf 100644 Binary files a/extras/source/templates/presnt/Inspiration.otp and b/extras/source/templates/presnt/Inspiration.otp differ commit c555c06f8cccd2dc4dad8854696ff8a728c0ee88 Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:14:39 2016 +0200 Improve 'Sunset' template Change-Id: I7ab76407895073f2ecbfdfb5bf40235f24a48a34 diff --git a/extras/source/templates/presnt/Sunset.otp b/extras/source/templates/presnt/Sunset.otp index 183165b..ff9ac1b 100644 Binary files a/extras/source/templates/presnt/Sunset.otp and b/extras/source/templates/presnt/Sunset.otp differ commit 3c35e2cf3d0004bdad518b9729cd7bc876d46e51 Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:14:23 2016 +0200 Improve 'Vintage' template Change-Id: If6447b340faa61dec4e160078248207bd2c3f982 diff --git a/extras/source/templates/presnt/Vintage.otp b/extras/source/templates/presnt/Vintage.otp index 0ce4d52..d34f839 100644 Binary files a/extras/source/templates/presnt/Vintage.otp and b/extras/source/templates/presnt/Vintage.otp differ commit 1c3e9870ccc6f4a9054f2c961562336e7e13a03e Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:14:09 2016 +0200 Improve 'Impress' template Change-Id: I8e6d50c52514926175694cec697f6b2e45cc0088 diff --git a/extras/source/templates/presnt/Impress.otp b/extras/source/templates/presnt/Impress.otp index 04d21a5..ddf9a7e 100644 Binary files a/extras/source/templates/presnt/Impress.otp and b/extras/source/templates/presnt/Impress.otp differ commit 6220260ee1baa74953623416c97f7eb26ec37dfb Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:13:58 2016 +0200 Improve 'DNA' template Change-Id: Ib170f2f8540234a23484ce6386a00b8a4487a0fb diff --git a/extras/source/templates/presnt/DNA.otp b/extras/source/templates/presnt/DNA.otp index 9c07855..eb400b4 100644 Binary files a/extras/source/templates/presnt/DNA.otp and b/extras/source/templates/presnt/DNA.otp differ commit 7cc1fd1d102856a0acaaa736851c32759633bf29 Author: Francisco Adrián Sánchez Date: Mon Oct 10 11:13:43 2016 +0200 Improve 'Bright Blue' template Change-Id: I763707658a5fdb9a8ce7488f70eb1db9f2c01fae diff --git a/extras/source/templates/presnt/BrightBlue.otp b/extras/source/templates/presnt/BrightBlue.otp index fd223cf..542fb25 100644 Binary files a/extras/source/templates/presnt/BrightBlue.otp and b/extras/source/templates/presnt/BrightBlue.otp differ commit 7f1e35
[Libreoffice-commits] core.git: 7 commits - desktop/source extras/source svx/Library_svx.mk svx/qa svx/source svx/uiconfig svx/UIConfig_svx.mk svx/util
desktop/source/app/app.cxx | 21 +++ desktop/source/app/cmdlineargs.cxx |5 desktop/source/app/cmdlineargs.hxx |2 desktop/source/app/cmdlinehelp.cxx |2 extras/source/templates/presnt/Alizarin.otp |binary extras/source/templates/presnt/Focus.otp|binary extras/source/templates/presnt/Pencil.otp |binary extras/source/templates/presnt/Vivid.otp|binary svx/Library_svx.mk |2 svx/UIConfig_svx.mk |1 svx/qa/unit/data/svx-dialogs-test.txt |2 svx/source/dialog/SafeModeDialog.cxx| 65 svx/source/dialog/SafeModeDialog.hxx| 44 svx/source/dialog/SafeModeUI.cxx| 99 ++ svx/uiconfig/ui/safemodedialog.ui | 148 svx/util/svx.component |4 16 files changed, 394 insertions(+), 1 deletion(-) New commits: commit 842873d37c2716ced5674ebaadfb2fae9620632d Author: Francisco Adrián Sánchez Date: Fri Oct 7 18:51:41 2016 +0200 Improve 'Pencil' template Change-Id: Ic4590752354376e9dcd534560918b3463c156411 diff --git a/extras/source/templates/presnt/Pencil.otp b/extras/source/templates/presnt/Pencil.otp index 1ef4d13..549714b 100644 Binary files a/extras/source/templates/presnt/Pencil.otp and b/extras/source/templates/presnt/Pencil.otp differ commit 2d997a78fabcc45937e235a92394bca71cc53f90 Author: Francisco Adrián Sánchez Date: Fri Oct 7 18:51:26 2016 +0200 Improve 'Focus' template Change-Id: I00ded55d07dc1d0e4abf26a53ccc499cf4db6dac diff --git a/extras/source/templates/presnt/Focus.otp b/extras/source/templates/presnt/Focus.otp index 7d52177..18b3eca 100644 Binary files a/extras/source/templates/presnt/Focus.otp and b/extras/source/templates/presnt/Focus.otp differ commit ef92954906fe3d4658876fcccb4fd7e239b5185f Author: Francisco Adrián Sánchez Date: Fri Oct 7 18:51:00 2016 +0200 Improve 'Alizarin' template Change-Id: Ia19f8df552e737b936cbf234b8f91f2846486c1c diff --git a/extras/source/templates/presnt/Alizarin.otp b/extras/source/templates/presnt/Alizarin.otp index f47e4eb..dcd05bb 100644 Binary files a/extras/source/templates/presnt/Alizarin.otp and b/extras/source/templates/presnt/Alizarin.otp differ commit f9a427680f59be8591b5e5d750ce0189a6becd54 Author: Samuel Mehrbrodt Date: Fri Oct 7 18:19:25 2016 +0200 Show dialog when starting in safe mode Change-Id: Ie4b5f5b7309735dfa844bbaba9cb2763a3de3dc1 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 3456db2..bb836d2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1056,6 +1056,22 @@ void handleCrashReport() } #endif +void handleSafeMode() +{ +static const char SERVICENAME_SAFEMODE[] = "com.sun.star.comp.svx.SafeModeUI"; + +css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + +Reference< css::frame::XSynchronousDispatch > xSafeModeUI( + xContext->getServiceManager()->createInstanceWithContext(SERVICENAME_SAFEMODE, xContext), +css::uno::UNO_QUERY_THROW); + +css::util::URL aURL; +css::uno::Any aRet = xSafeModeUI->dispatchWithReturnValue(aURL, css::uno::Sequence< css::beans::PropertyValue >()); +bool bRet = false; +aRet >>= bRet; +} + /** @short check if recovery must be started or not. @param bCrashed [boolean ... out!] @@ -2029,6 +2045,11 @@ void Desktop::OpenClients() // need some time, where the user won't see any results and wait for finishing the office startup... bool bAllowRecoveryAndSessionManagement = ( !rArgs.IsNoRestore() ) && ( !rArgs.IsHeadless() ); +// Enter safe mode if requested +if (rArgs.IsSafeMode()) +handleSafeMode(); + + #if HAVE_FEATURE_BREAKPAD if (crashReportInfoExists()) handleCrashReport(); diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index e564af8..2c91b13 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -146,6 +146,8 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/rlrcitem \ svx/source/dialog/rubydialog \ svx/source/dialog/rulritem \ +svx/source/dialog/SafeModeDialog \ +svx/source/dialog/SafeModeUI \ svx/source/dialog/SpellDialogChildWindow \ svx/source/dialog/srchctrl \ svx/source/dialog/srchdlg \ diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index bd9c6d8..65b9bde 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -64,6 +64,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/redlinecontrol \ svx/uiconfig/ui/redlinefilterpage \ svx/uiconfig/ui/redlineviewpage \ + svx/uiconfig/ui/safemodedialog \ svx/uiconfig/ui/savemodifieddialog \ svx/uiconfig/ui/sidebararea \ svx/uiconfig/ui/sidebarshadow \ diff --git a/svx/sourc
Francisco Adrián Sánchez license statement
To the extent possible under law, I waive all copyright and related or neighboring rights to my past & future contributions to LibreOffice: http://creativecommons.org/publicdomain/zero/1.0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice