From 9e786320a7d2609a9f997b32e31347f2eab0489e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 7 Apr 2023 13:24:11 +0100 Subject: move using the vcl file dialog in headless mode to the point of creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit instead of setting and unsetting the config option at start and exit because a document that crashes in headless mode leaves my config in an unwanted built-in file dialog state. Change-Id: Ib5fcc5994a08c78bffdf57cb5b252dc469167ba2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150126 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- postprocess/qa/services.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'postprocess') diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx index 94bd76031ff4..c332402e390d 100644 --- a/postprocess/qa/services.cxx +++ b/postprocess/qa/services.cxx @@ -365,14 +365,10 @@ void Test::createInstance( #endif } else if (name == "com.sun.star.ui.dialogs.FolderPicker") { // FolderPicker is a wrapper returning either a platform-specific or the - // generic OfficeFolderPicker: -#if defined(_WIN32) - expImpl = "com.sun.star.ui.dialogs.Win32FolderPicker"; - expServs = {"com.sun.star.ui.dialogs.SystemFolderPicker"}; -#else + // generic OfficeFolderPicker. In headless mode it is always the + // generic one. expImpl = "com.sun.star.svtools.OfficeFolderPicker"; expServs = {"com.sun.star.ui.dialogs.OfficeFolderPicker"}; -#endif } else if (expImpl == "com.sun.star.comp.Calc.SpreadsheetDocument") { expImpl = "ScModelObj"; } else if (expImpl == "com.sun.star.comp.Draw.DrawingDocument" -- cgit