summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2018-10-09 19:29:54 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2018-11-20 09:19:09 +0100
commit6cdfe5ebb4f6c06bfa8b0e67e778dd68131c14e3 (patch)
tree01380d838feb9158ef40302afc041cbaba5192e0 /framework
parenttdf#120551 DOCX import: fix position of group shape with absolute position (diff)
downloadcore-6cdfe5ebb4f6c06bfa8b0e67e778dd68131c14e3.tar.gz
core-6cdfe5ebb4f6c06bfa8b0e67e778dd68131c14e3.zip
Drop some headless mode variants
This fixes OSX "make debugrun" by dropping VCL_HIDE_WINDOWS handling and removing the internal GetPseudoHeadless() API. While at it moves the DialogCancelMode enum out of Application. Change-Id: I4876e752ddbfc39dd44faa673fb0e97810089a75 Reviewed-on: https://gerrit.libreoffice.org/61598 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/frame.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 8a718d787ecf..66fe3032356a 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2115,8 +2115,8 @@ void SAL_CALL Frame::disposing()
// notifications which we don't need here really.
// (b) Don't forget to save the old value of IsDialogCancelEnabled() to
// restore it afterwards (to not kill headless mode).
- Application::DialogCancelMode old = Application::GetDialogCancelMode();
- Application::SetDialogCancelMode( Application::DialogCancelMode::Silent );
+ DialogCancelMode old = Application::GetDialogCancelMode();
+ Application::SetDialogCancelMode( DialogCancelMode::Silent );
// We should be alone for ever and further dispose calls are rejected by lines before ...
// I hope it :-)