fdo#85486 - Clean up unnecessary enumerations from xenum.hxx

Removed XGradientStyle

Reviewed on:
https://gerrit.libreoffice.org/13320

Change-Id: Iff662c05105c3a939104f658f2d0be7d8cb57995

3 files changed, 31 insertions, 27 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 20d4ed284e78..09ff336dac9f 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -153,7 +153,7 @@ class SvxTransparenceTabPage : public SvxTabPage
 
     void ActivateLinear(bool bActivate);
     void ActivateGradient(bool bActivate);
-    void SetControlState_Impl(XGradientStyle eXGS);
+    void SetControlState_Impl(css::awt::GradientStyle eXGS);
 
     bool InitPreview ( const SfxItemSet& rSet );
     void InvalidatePreview (bool bEnable = true );
@@ -430,7 +430,7 @@ private:
     DECL_LINK( ClickSaveHdl_Impl, void * );
 
     long CheckChanges_Impl();
-    void SetControlState_Impl( XGradientStyle eXGS );
+    void SetControlState_Impl( css::awt::GradientStyle eXGS );
 
 public:
     SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs  );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 020c0b194821..f129b4aba31c 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -139,7 +139,7 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl)
 {
     if(pControl == m_pLbTrgrGradientType || pControl == this)
     {
-        XGradientStyle eXGS = (XGradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos();
+        css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos();
         SetControlState_Impl( eXGS );
     }
 
@@ -149,7 +149,7 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl)
     XGradient aTmpGradient(
                 Color(nStartCol, nStartCol, nStartCol),
                 Color(nEndCol, nEndCol, nEndCol),
-                (XGradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(),
+                (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(),
                 (sal_uInt16)m_pMtrTrgrAngle->GetValue() * 10,
                 (sal_uInt16)m_pMtrTrgrCenterX->GetValue(),
                 (sal_uInt16)m_pMtrTrgrCenterY->GetValue(),
@@ -170,7 +170,7 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate)
 
     if(bActivate)
     {
-        XGradientStyle eXGS = (XGradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos();
+        css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos();
         SetControlState_Impl( eXGS );
     }
 }
@@ -180,12 +180,12 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl)
     return( 0L );
 }
 
-void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
+void SvxTransparenceTabPage::SetControlState_Impl(css::awt::GradientStyle eXGS)
 {
     switch(eXGS)
     {
-        case XGRAD_LINEAR:
-        case XGRAD_AXIAL:
+        case css::awt::GradientStyle_LINEAR:
+        case css::awt::GradientStyle_AXIAL:
             m_pFtTrgrCenterX->Disable();
             m_pMtrTrgrCenterX->Disable();
             m_pFtTrgrCenterY->Disable();
@@ -194,7 +194,7 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
             m_pMtrTrgrAngle->Enable();
             break;
 
-        case XGRAD_RADIAL:
+        case css::awt::GradientStyle_RADIAL:
             m_pFtTrgrCenterX->Enable();
             m_pMtrTrgrCenterX->Enable();
             m_pFtTrgrCenterY->Enable();
@@ -203,7 +203,7 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
             m_pMtrTrgrAngle->Disable();
             break;
 
-        case XGRAD_ELLIPTICAL:
+        case css::awt::GradientStyle_ELLIPTICAL:
             m_pFtTrgrCenterX->Enable();
             m_pMtrTrgrCenterX->Enable();
             m_pFtTrgrCenterY->Enable();
@@ -212,8 +212,8 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
             m_pMtrTrgrAngle->Enable();
             break;
 
-        case XGRAD_SQUARE:
-        case XGRAD_RECT:
+        case css::awt::GradientStyle_SQUARE:
+        case css::awt::GradientStyle_RECT:
             m_pFtTrgrCenterX->Enable();
             m_pMtrTrgrCenterX->Enable();
             m_pFtTrgrCenterY->Enable();
@@ -221,6 +221,8 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
             m_pFtTrgrAngle->Enable();
             m_pMtrTrgrAngle->Enable();
             break;
+        default:
+            break;
     }
 }
 
@@ -351,7 +353,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
             XGradient aTmpGradient(
                         Color(nStartCol, nStartCol, nStartCol),
                         Color(nEndCol, nEndCol, nEndCol),
-                        (XGradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(),
+                        (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(),
                         (sal_uInt16)m_pMtrTrgrAngle->GetValue() * 10,
                         (sal_uInt16)m_pMtrTrgrCenterX->GetValue(),
                         (sal_uInt16)m_pMtrTrgrCenterY->GetValue(),
@@ -418,7 +420,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs)
 
     // transparence gradient
     const XGradient& rGradient = static_cast<const XFillFloatTransparenceItem*>(pGradientItem)->GetGradientValue();
-    XGradientStyle eXGS(rGradient.GetGradientStyle());
+    css::awt::GradientStyle eXGS(rGradient.GetGradientStyle());
     m_pLbTrgrGradientType->SelectEntryPos(sal::static_int_cast< sal_Int32 >(eXGS));
     m_pMtrTrgrAngle->SetValue(rGradient.GetAngle() / 10);
     m_pMtrTrgrBorder->SetValue(rGradient.GetBorder());
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 1b04ab7d72d8..f695653e2e41 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -246,7 +246,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
     // is used here in order to NOT lose changes
     XGradient aTmpGradient( m_pLbColorFrom->GetSelectEntryColor(),
                           m_pLbColorTo->GetSelectEntryColor(),
-                          (XGradientStyle) m_pLbGradientType->GetSelectEntryPos(),
+                          (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(),
                           static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource
                           (sal_uInt16) m_pMtrCenterX->GetValue(),
                           (sal_uInt16) m_pMtrCenterY->GetValue(),
@@ -327,7 +327,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
         {
             pXGradient.reset(new XGradient( m_pLbColorFrom->GetSelectEntryColor(),
                         m_pLbColorTo->GetSelectEntryColor(),
-                        (XGradientStyle) m_pLbGradientType->GetSelectEntryPos(),
+                        (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(),
                         static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource
                         (sal_uInt16) m_pMtrCenterX->GetValue(),
                         (sal_uInt16) m_pMtrCenterY->GetValue(),
@@ -376,7 +376,7 @@ SfxTabPage* SvxGradientTabPage::Create( vcl::Window* pWindow,
 
 IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
 {
-    XGradientStyle eXGS = (XGradientStyle) m_pLbGradientType->GetSelectEntryPos();
+    css::awt::GradientStyle eXGS = (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos();
 
     XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(),
                           m_pLbColorTo->GetSelectEntryColor(),
@@ -465,7 +465,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
     {
         XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(),
                               m_pLbColorTo->GetSelectEntryColor(),
-                              (XGradientStyle) m_pLbGradientType->GetSelectEntryPos(),
+                              (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(),
                               static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource
                               (sal_uInt16) m_pMtrCenterX->GetValue(),
                               (sal_uInt16) m_pMtrCenterY->GetValue(),
@@ -541,7 +541,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
                 bLoop = false;
                 XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(),
                                       m_pLbColorTo->GetSelectEntryColor(),
-                                      (XGradientStyle) m_pLbGradientType->GetSelectEntryPos(),
+                                      (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(),
                                       static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource
                                       (sal_uInt16) m_pMtrCenterX->GetValue(),
                                       (sal_uInt16) m_pMtrCenterY->GetValue(),
@@ -794,7 +794,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
 
     if( pGradient )
     {
-        XGradientStyle eXGS = pGradient->GetGradientStyle();
+        css::awt::GradientStyle eXGS = pGradient->GetGradientStyle();
 
         m_pLbGradientType->SelectEntryPos(
             sal::static_int_cast< sal_Int32 >( eXGS ) );
@@ -839,12 +839,12 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
 
 
 
-void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS )
+void SvxGradientTabPage::SetControlState_Impl( css::awt::GradientStyle eXGS )
 {
     switch( eXGS )
     {
-        case XGRAD_LINEAR:
-        case XGRAD_AXIAL:
+        case css::awt::GradientStyle_LINEAR:
+        case css::awt::GradientStyle_AXIAL:
             m_pFtCenterX->Disable();
             m_pMtrCenterX->Disable();
             m_pFtCenterY->Disable();
@@ -853,7 +853,7 @@ void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS )
             m_pMtrAngle->Enable();
             break;
 
-        case XGRAD_RADIAL:
+        case css::awt::GradientStyle_RADIAL:
             m_pFtCenterX->Enable();
             m_pMtrCenterX->Enable();
             m_pFtCenterY->Enable();
@@ -862,7 +862,7 @@ void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS )
             m_pMtrAngle->Disable();
             break;
 
-        case XGRAD_ELLIPTICAL:
+        case css::awt::GradientStyle_ELLIPTICAL:
             m_pFtCenterX->Enable();
             m_pMtrCenterX->Enable();
             m_pFtCenterY->Enable();
@@ -871,8 +871,8 @@ void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS )
             m_pMtrAngle->Enable();
             break;
 
-        case XGRAD_SQUARE:
-        case XGRAD_RECT:
+        case css::awt::GradientStyle_SQUARE:
+        case css::awt::GradientStyle_RECT:
             m_pFtCenterX->Enable();
             m_pMtrCenterX->Enable();
             m_pFtCenterY->Enable();
@@ -880,6 +880,8 @@ void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS )
             m_pFtAngle->Enable();
             m_pMtrAngle->Enable();
             break;
+        default:
+            break;
     }
 }