diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 10:22:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 12:42:04 +0200 |
| commit | 344957aae65637c64b4f6d16f64c4488ddd2d085 (patch) | |
| tree | 66c93fa144bef00c794357b075e966a05e639f30 /framework/source/loadenv | |
| parent | 3910f943e9bf7e70589d9a7c42c05a43ac11856c (diff) | |
convert LoadEnv::EFeature to o3tl::typed_flags
Change-Id: I4c16b68c820783e9bd27fa273f2017b5088f4b85
Diffstat (limited to 'framework/source/loadenv')
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index c98fb8bcbba9..99dbb690afb6 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -123,7 +123,7 @@ class LoadEnvListener : public ::cppu::WeakImplHelper< css::frame::XLoadEventLis LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext(xContext) , m_nSearchFlags(0) - , m_eFeature(E_NO_FEATURE) + , m_eFeature(LoadEnvFeatures::NONE) , m_eContentType(E_UNSUPPORTED_CONTENT) , m_bCloseFrameOnError(false) , m_bReactivateControllerOnError(false) @@ -213,7 +213,7 @@ utl::MediaDescriptor addModelArgs(const uno::Sequence<beans::PropertyValue>& rDe void LoadEnv::initializeLoading(const OUString& sURL, const uno::Sequence<beans::PropertyValue>& lMediaDescriptor, const uno::Reference<frame::XFrame>& xBaseFrame, const OUString& sTarget, - sal_Int32 nSearchFlags, EFeature eFeature) + sal_Int32 nSearchFlags, LoadEnvFeatures eFeature) { osl::MutexGuard g(m_mutex); @@ -269,7 +269,7 @@ void LoadEnv::initializeLoading(const OUString& sURL, const uno::Sequence<beans: // UI mode const bool bUIMode = - ((m_eFeature & E_WORK_WITH_UI) == E_WORK_WITH_UI) && + (m_eFeature & LoadEnvFeatures::WorkWithUI) && !m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false) && !m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), false); @@ -359,7 +359,7 @@ void LoadEnv::startLoading() // Use another strategy here. Try it and let it run into the case "loading not possible". bool bStarted = false; if ( - ((m_eFeature & E_ALLOW_CONTENTHANDLER) == E_ALLOW_CONTENTHANDLER) && + (m_eFeature & LoadEnvFeatures::AllowContentHandler) && (m_eContentType != E_CAN_BE_SET ) /* Attention: special feature to set existing component on a frame must ignore type detection! */ ) { |