diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-11-23 08:21:15 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-12-05 14:38:22 +0100 |
| commit | 329db5d412cc0d5e0f97cb939b94259679396ead (patch) | |
| tree | 9792a66601ab6f9a02eb0f5808ce7664ec9d4ab1 /vcl | |
| parent | bcc28ff92493dbc9a51acb1cf693b9ce3162a110 (diff) | |
Make Application::SetDialogCancelMode "private"
Change callers to Application::EnableHeadlessMode instead except
for the Frame dispose sequence, which has to disable a fatal
mode temporary.
Since Frame is not a unique identifier, rename it to XFrameImpl,
otherwise we get a "non-unique" compile error for other files.
When we update our gcc baseline, we should be able to forward
declare and friend XFrameImpl and really make it private.
Change-Id: Ifcad0355adade8f6539ec092b174dd70af8352c2
Reviewed-on: https://gerrit.libreoffice.org/64050
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/workben/commonfuzzer.hxx | 2 | ||||
| -rw-r--r-- | vcl/workben/fftester.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx index f3e2208307a8..d6c8d5cae634 100644 --- a/vcl/workben/commonfuzzer.hxx +++ b/vcl/workben/commonfuzzer.hxx @@ -119,8 +119,8 @@ void CommonInitialize(int *argc, char ***argv) Application::Abort( "Failed to bootstrap" ); comphelper::setProcessServiceFactory( xServiceManager ); utl::ConfigManager::EnableFuzzing(); + Application::EnableHeadlessMode(false); InitVCL(); - Application::SetDialogCancelMode(DialogCancelMode::Silent); //we don't have a de-init, so inside this leak disabled region... //get the font info diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index beedf86fe7f0..9325cb5b6748 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -104,10 +104,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) createInstanceWithArguments("com.sun.star.ucb.FileContentProvider", aArgs), css::uno::UNO_QUERY_THROW); xUcb->registerContentProvider(xFileProvider, "file", true); + Application::EnableHeadlessMode(false); InitVCL(); - Application::SetDialogCancelMode(DialogCancelMode::Silent); - if (strcmp(argv[2], "wmf") == 0 || strcmp(argv[2], "emf") == 0) { GDIMetaFile aGDIMetaFile; |