[Libreoffice-commits] core.git: forms/source sd/source

[Stephan Bergmann]

 forms/source/component/DatabaseForm.cxx |    4 ++--
 sd/source/ui/unoidl/unopage.cxx         |   10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit d8545e78e7d27bb704cef9befa3cc0ff65c68bb3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 30 18:30:40 2016 +0200

    Simplifiy unnecessary uses of int2enum
    
    Change-Id: Ic811eac425717f7eac018dfd90c46bd72267c697

diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 395b281..55b2353 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -3977,7 +3977,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
     if (nVersion > 1)
     {
         sal_Int32 nCycle = _rxInStream->readShort();
-        m_aCycle = ::cppu::int2enum(nCycle, cppu::UnoType<TabulatorCycle>::get());
+        m_aCycle <<= TabulatorCycle(nCycle);
         m_eNavigation = (NavigationBarMode)_rxInStream->readShort();
 
         _rxInStream >> sAggregateProp;
@@ -3995,7 +3995,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
         if (nAnyMask & CYCLE)
         {
             sal_Int32 nCycle = _rxInStream->readShort();
-            m_aCycle = ::cppu::int2enum(nCycle, cppu::UnoType<TabulatorCycle>::get());
+            m_aCycle <<= TabulatorCycle(nCycle);
         }
         else
             m_aCycle.clear();
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 4db7930..cd550d8 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<view::PaperOrientation>::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<presentation::FadeEffect>::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<presentation::AnimationSpeed>::get() );
+            aAny <<= presentation::AnimationSpeed(
+                fDuration < 2.0 ? 2 : fDuration > 2.0 ? 0 : 1);
         }
         break;
     case WID_PAGE_LAYOUT: