From d8545e78e7d27bb704cef9befa3cc0ff65c68bb3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 30 May 2016 18:30:40 +0200 Subject: Simplifiy unnecessary uses of int2enum Change-Id: Ic811eac425717f7eac018dfd90c46bd72267c697 --- sd/source/ui/unoidl/unopage.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sd/source/ui/unoidl') diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 4db7930b7531..cd550d81b5d6 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1041,10 +1041,13 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) aAny <<= (sal_Int32)( GetPage()->GetSize().getHeight() ); break; case WID_PAGE_ORIENT: - aAny = ::cppu::int2enum( (sal_Int32)((GetPage()->GetOrientation() == ORIENTATION_PORTRAIT)? view::PaperOrientation_PORTRAIT: view::PaperOrientation_LANDSCAPE), ::cppu::UnoType::get() ); + aAny <<= view::PaperOrientation( + GetPage()->GetOrientation() == ORIENTATION_PORTRAIT + ? view::PaperOrientation_PORTRAIT + : view::PaperOrientation_LANDSCAPE); break; case WID_PAGE_EFFECT: - aAny = ::cppu::int2enum( (sal_Int32)GetPage()->GetFadeEffect(), ::cppu::UnoType::get() ); + aAny <<= presentation::FadeEffect(GetPage()->GetFadeEffect()); break; case WID_PAGE_CHANGE: aAny <<= (sal_Int32)( GetPage()->GetPresChange() ); @@ -1052,7 +1055,8 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) case WID_PAGE_SPEED: { const double fDuration = GetPage()->getTransitionDuration(); - aAny = ::cppu::int2enum( fDuration < 2.0 ? 2 : (fDuration > 2.0 ? 0 : 1), ::cppu::UnoType::get() ); + aAny <<= presentation::AnimationSpeed( + fDuration < 2.0 ? 2 : fDuration > 2.0 ? 0 : 1); } break; case WID_PAGE_LAYOUT: -- cgit ption value='distro/collabora/cd-5.3'>distro/collabora/cd-5.3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-11 17:48:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-11 20:44:26 +0000
commit94d935eecbba0161de2616c2234b4a5d9d3cad88 (patch)
treed078affcce3feae6f486fe87c132cc1f0b5cc19c /canvas/source
parentf88b5ab8692ee7ecf58b570e703d0e7f10cc2f0d (diff)
Resolves: fdo#87242 reuse vcl clip for cairo during animations