static/CustomTarget_emscripten_fs_image.mk | 1 sw/UIConfig_swriter.mk | 1 sw/source/uibase/shells/textsh1.cxx | 29 ------- sw/uiconfig/swriter/ui/queryredlinedialog.ui | 99 --------------------------- 4 files changed, 2 insertions(+), 128 deletions(-)
New commits: commit 3bf537244973a19c09dc6ef6430e25a05ba5027f Author: Aman Jha <[email protected]> AuthorDate: Wed Jul 6 14:03:27 2022 +0530 Commit: Hossein <[email protected]> CommitDate: Thu Jul 7 09:41:44 2022 +0200 tdf#139953 Apply and Edit Changes - drop first dialog go directly to Edit Change-Id: I613f78b8327aa62495ce2563944e3277895eac7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136103 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> Reviewed-by: Hossein <[email protected]> diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index a82d51d94db5..9df532cbff36 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -716,7 +716,6 @@ gb_emscripten_fs_image_files := \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/querycontinuebegindialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/querycontinueenddialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/querydefaultcompatdialog.ui \ - $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/queryredlinedialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/querysavelabeldialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/readonlymenu.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/renameautotextdialog.ui \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 37e0c66f1386..f4e003e37243 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -224,7 +224,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/querycontinuebegindialog \ sw/uiconfig/swriter/ui/querycontinueenddialog \ sw/uiconfig/swriter/ui/querydefaultcompatdialog \ - sw/uiconfig/swriter/ui/queryredlinedialog \ sw/uiconfig/swriter/ui/querysavelabeldialog \ sw/uiconfig/swriter/ui/mailmerge \ sw/uiconfig/swriter/ui/managechangessidebar \ diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 4531da1486f3..adbe49bb5585 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -253,12 +253,6 @@ static void sw_CharDialogResult(const SfxItemSet* pSet, SwWrtShell &rWrtSh, std: } -static short lcl_AskRedlineFlags(weld::Window *pWin) -{ - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pWin, "modules/swriter/ui/queryredlinedialog.ui")); - std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("QueryRedlineDialog")); - return xQBox->run(); -} static void sw_ParagraphDialogResult(SfxItemSet* pSet, SwWrtShell &rWrtSh, SfxRequest& rReq, SwPaM* pPaM) { @@ -756,27 +750,8 @@ void SwTextShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ScopedVclPtr<AbstractSwModalRedlineAcceptDlg> xDlg(pFact->CreateSwModalRedlineAcceptDlg(GetView().GetEditWin().GetFrameWeld())); - switch (lcl_AskRedlineFlags(GetView().GetFrameWeld())) - { - case RET_OK: - { - xDlg->AcceptAll(true); - SfxRequest aReq( pVFrame, FN_AUTOFORMAT_APPLY ); - aReq.Done(); - rReq.Ignore(); - break; - } - - case RET_CANCEL: - xDlg->AcceptAll(false); - rReq.Ignore(); - break; - - case 102: - xDlg->Execute(); - rReq.Done(); - break; - } + xDlg->Execute(); + rReq.Done(); } break; diff --git a/sw/uiconfig/swriter/ui/queryredlinedialog.ui b/sw/uiconfig/swriter/ui/queryredlinedialog.ui deleted file mode 100644 index 5271b4c514f1..000000000000 --- a/sw/uiconfig/swriter/ui/queryredlinedialog.ui +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> -<interface domain="sw"> - <requires lib="gtk+" version="3.20"/> - <object class="GtkMessageDialog" id="QueryRedlineDialog"> - <property name="can_focus">False</property> - <property name="title" translatable="yes" context="queryredlinedialog|QueryRedlineDialog">AutoCorrect</property> - <property name="resizable">False</property> - <property name="modal">True</property> - <property name="type_hint">dialog</property> - <property name="skip_taskbar_hint">True</property> - <property name="message_type">question</property> - <property name="text" translatable="yes" context="queryredlinedialog|QueryRedlineDialog">AutoCorrect completed.</property> - <property name="secondary_text" translatable="yes" context="queryredlinedialog|QueryRedlineDialog">You can accept or reject all changes, -or accept or reject particular changes.</property> - <child internal-child="vbox"> - <object class="GtkBox"> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child internal-child="action_area"> - <object class="GtkButtonBox"> - <property name="can_focus">False</property> - <child> - <object class="GtkButton" id="cancel"> - <property name="label" translatable="yes" context="queryredlinedialog|cancel">Reject All</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="cancel-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryredlinedialog|extended_tip|cancel">Rejects all of the formatting changes.</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok"> - <property name="label" translatable="yes" context="queryredlinedialog|ok">Accept All</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ok-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryredlinedialog|extended_tip|ok">Applies all of the formatting changes.</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="edit"> - <property name="label" translatable="yes" context="queryredlinedialog|edit">Edit Changes</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="edit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryredlinedialog|extended_tip|edit">Opens a dialog where you can accept or reject AutoCorrect changes. You can also view the changes made by a specific author or on a specific date.</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">cancel</action-widget> - <action-widget response="-5">ok</action-widget> - <action-widget response="102">edit</action-widget> - </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> - </object> -</interface>
