diff options
| -rw-r--r-- | sd/CppunitTest_sd_dialogs_test.mk | 2 | ||||
| -rw-r--r-- | sd/qa/unit/dialogs-test.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/sd/CppunitTest_sd_dialogs_test.mk b/sd/CppunitTest_sd_dialogs_test.mk index d6027e6ffb36..04571a2729e0 100644 --- a/sd/CppunitTest_sd_dialogs_test.mk +++ b/sd/CppunitTest_sd_dialogs_test.mk @@ -61,7 +61,7 @@ $(eval $(call gb_CppunitTest_use_external,sd_dialogs_test,boost_headers)) $(eval $(call gb_CppunitTest_use_sdk_api,sd_dialogs_test)) $(eval $(call gb_CppunitTest_use_ure,sd_dialogs_test)) -$(eval $(call gb_CppunitTest_use_vcl_non_headless,sd_dialogs_test)) +$(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,sd_dialogs_test)) $(eval $(call gb_CppunitTest_use_rdb,sd_dialogs_test,services)) diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index c5a6d4d30274..93d3cf020531 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -670,14 +670,6 @@ void SdDialogsTest::openAnyDialog() if (pDlg) { - if (false) - { - const Application::DialogCancelMode aOriginalDialogCancelMode(Application::GetDialogCancelMode()); - Application::SetDialogCancelMode(Application::DialogCancelMode::Off); - pDlg->Execute(); - Application::SetDialogCancelMode(aOriginalDialogCancelMode); - } - dumpDialogToPath(*pDlg, aTempTargetPath + OUString::number(a)); delete pDlg; } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 5b1bf9aee543..f684393a62bf 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2376,7 +2376,7 @@ ImplMiscData::ImplMiscData() // Should we display any windows? // need to hardly mask here for now, needs to be adapted of course... - mbPseudoHeadless = false; // getenv("VCL_HIDE_WINDOWS") || comphelper::LibreOfficeKit::isActive(); + mbPseudoHeadless = getenv("VCL_HIDE_WINDOWS") || comphelper::LibreOfficeKit::isActive(); } ImplMiscData::ImplMiscData( const ImplMiscData& rData ) |