diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-07-29 14:24:51 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-29 17:41:33 +0200 |
commit | b6f03ac06ba7eac8ca1e2ab1c3d885525cd7519c (patch) | |
tree | 9e05b92ff65eb29862f4403c670752852dacc6b0 /include/unotools | |
parent | f3c67b783a5dcdf874c6109d36fae8f411e885be (diff) |
replace and drop SvtExtendedSecurityOptions class
Change-Id: Ibe3443531c83eb44080217b61f5746be9cce9c49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99695
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/unotools')
-rw-r--r-- | include/unotools/extendedsecurityoptions.hxx | 67 | ||||
-rw-r--r-- | include/unotools/itemholderbase.hxx | 1 |
2 files changed, 9 insertions, 59 deletions
diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx index 533cc8894890..4a2b493e8d46 100644 --- a/include/unotools/extendedsecurityoptions.hxx +++ b/include/unotools/extendedsecurityoptions.hxx @@ -16,66 +16,17 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX -#define INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX -#include <unotools/unotoolsdllapi.h> -#include <sal/types.h> -#include <unotools/options.hxx> -#include <memory> +#pragma once -namespace osl { class Mutex; } - -/*-************************************************************************************************************ - @short forward declaration to our private date container implementation - @descr We use these class as internal member to support small memory requirements. - You can create the container if it is necessary. The class which use these mechanism - is faster and smaller then a complete implementation! -*//*-*************************************************************************************************************/ - -class SvtExtendedSecurityOptions_Impl; - -/*-************************************************************************************************************ - @short collect information about security features - @ATTENTION This class is partially threadsafe. - - @devstatus ready to use -*//*-*************************************************************************************************************/ - -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions final : public utl::detail::Options +namespace SvtExtendedSecurityOptions { - public: - // Must be zero based! - enum OpenHyperlinkMode - { - OPEN_NEVER = 0, - OPEN_WITHSECURITYCHECK, - }; - - SvtExtendedSecurityOptions(); - virtual ~SvtExtendedSecurityOptions() override; - - OpenHyperlinkMode GetOpenHyperlinkMode() const; - - private: - - /*-**************************************************************************************************** - @short return a reference to a static mutex - @descr These class is partially threadsafe (for de-/initialization only). - All access methods aren't safe! - We create a static mutex only for one ime and use at different times. - @return A reference to a static mutex member. - *//*-*****************************************************************************************************/ - - UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex(); - - // private member - - private: - std::shared_ptr<SvtExtendedSecurityOptions_Impl> m_pImpl; - -}; // class SvtExtendedSecurityOptions - -#endif // INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX + // Must be zero based! + enum OpenHyperlinkMode + { + OPEN_NEVER = 0, + OPEN_WITHSECURITYCHECK, + }; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx index 22bbc4efddd2..1c496667681e 100644 --- a/include/unotools/itemholderbase.hxx +++ b/include/unotools/itemholderbase.hxx @@ -43,7 +43,6 @@ enum class EItem DynamicMenuOptions , EventConfig , - ExtendedSecurityOptions , HelpOptions , // 2 HistoryOptions , |