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 xBuilder(Application::CreateBuilder(pWin, "modules/swriter/ui/queryredlinedialog.ui")); - std::unique_ptr 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 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 @@ - - - - - - False - AutoCorrect - False - True - dialog - True - question - AutoCorrect completed. - You can accept or reject all changes, -or accept or reject particular changes. - - - False - vertical - 12 - - - False - - - Reject All - True - True - True - - - Rejects all of the formatting changes. - - - - - True - True - 0 - - - - - Accept All - True - True - True - True - True - True - - - Applies all of the formatting changes. - - - - - True - True - 1 - - - - - Edit Changes - True - True - True - - - 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. - - - - - True - True - 2 - - - - - False - False - 0 - - - - - - cancel - ok - edit - - - - - -