From 6cdfe5ebb4f6c06bfa8b0e67e778dd68131c14e3 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Tue, 9 Oct 2018 19:29:54 +0200 Subject: 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 --- include/vcl/settings.hxx | 1 - include/vcl/svapp.hxx | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'include/vcl') diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index c70da34cb993..adadeb39662f 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -631,7 +631,6 @@ public: bool GetDisablePrinting() const; void SetEnableLocalizedDecimalSep( bool bEnable ); bool GetEnableLocalizedDecimalSep() const; - bool GetPseudoHeadless() const; bool operator ==( const MiscSettings& rSet ) const; bool operator !=( const MiscSettings& rSet ) const; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 7e7d4c205299..c66142b9035a 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -219,6 +219,12 @@ private: std::vector aData; }; +enum class DialogCancelMode { + Off, ///< do not automatically cancel dialogs + Silent, ///< silently cancel any dialogs + Fatal ///< cancel any dialogs by std::abort +}; + /** @brief Base class used mainly for the LibreOffice Desktop class. @@ -236,12 +242,6 @@ private: class VCL_DLLPUBLIC Application { public: - enum class DialogCancelMode { - Off, ///< do not automatically cancel dialogs - Silent, ///< silently cancel any dialogs - Fatal ///< cancel any dialogs by std::abort - }; - /** @name Initialization The following functions perform initialization and deinitialization of the application. -- cgit