[Libreoffice-commits] core.git: cui/source filter/source include/svx sd/source svx/source sw/source
Radu Ioan
ioan.radu.g at gmail.com
Thu Dec 11 09:31:31 PST 2014
cui/source/inc/cuitabarea.hxx | 4
cui/source/tabpages/tparea.cxx | 26 ++--
cui/source/tabpages/tpgradnt.cxx | 28 ++--
filter/source/msfilter/msdffimp.cxx | 8 -
include/svx/xenum.hxx | 2
include/svx/xgrad.hxx | 15 +-
sd/source/ui/view/drviews9.cxx | 6 -
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 14 +-
svx/source/sidebar/area/AreaPropertyPanel.cxx | 68 ++++++------
svx/source/sidebar/area/AreaPropertyPanel.hxx | 2
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 19 +--
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx | 3
svx/source/svdraw/gradtrns.cxx | 28 ++--
svx/source/svdraw/svdfmtf.cxx | 24 ++--
svx/source/unodraw/XPropertyTable.cxx | 2
svx/source/xoutdev/xattr.cxx | 12 +-
svx/source/xoutdev/xtabgrdt.cxx | 24 ++--
sw/source/filter/ww8/docxattributeoutput.cxx | 14 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 14 +-
19 files changed, 168 insertions(+), 145 deletions(-)
New commits:
commit c69f481d792c7b121479d024cf675f6ddb747422
Author: Radu Ioan <ioan.radu.g at gmail.com>
Date: Fri Dec 5 20:09:01 2014 +0200
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XGradientStyle
Reviewed on:
https://gerrit.libreoffice.org/13320
Change-Id: Iff662c05105c3a939104f658f2d0be7d8cb57995
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 20d4ed2..09ff336 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 020c0b1..f129b4a 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 1b04ab7..f695653 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;
}
}
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index f62cc97..b4fb2f1 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2798,7 +2798,7 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& aSet,MSO_FillType eMSO_
while ( nAngle >= 3600 ) nAngle -= 3600;
while ( nAngle < 0 ) nAngle += 3600;
- XGradientStyle eGrad = XGRAD_LINEAR;
+ css::awt::GradientStyle eGrad = css::awt::GradientStyle_LINEAR;
sal_Int32 nFocus = GetPropertyValue( DFF_Prop_fillFocus, 0 );
if ( !nFocus )
@@ -2811,7 +2811,7 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& aSet,MSO_FillType eMSO_
if( nFocus > 40 && nFocus < 60 )
{
- eGrad = XGRAD_AXIAL;//A axial gradient other than linear
+ eGrad = css::awt::GradientStyle_AXIAL;//A axial gradient other than linear
nChgColors ^= 1;
}
//if the type is linear or axial, just save focus to nFocusX and nFocusY for export
@@ -2823,14 +2823,14 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& aSet,MSO_FillType eMSO_
{
case mso_fillShadeShape :
{
- eGrad = XGRAD_RECT;
+ eGrad = css::awt::GradientStyle_RECT;
nFocusY = nFocusX = 50;
nChgColors ^= 1;
}
break;
case mso_fillShadeCenter :
{
- eGrad = XGRAD_RECT;
+ eGrad = css::awt::GradientStyle_RECT;
//A MS fillTo prop specifies the relative position of the left boundary
//of the center rectangle in a concentric shaded fill. Use 100 or 0 to keep fidelity
nFocusX=(GetPropertyValue( DFF_Prop_fillToRight, 0 )==0x10000) ? 100 : 0;
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index df659f9..52f7a4f 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -21,8 +21,6 @@
#define INCLUDED_SVX_XENUM_HXX
-enum XGradientStyle { XGRAD_LINEAR, XGRAD_AXIAL, XGRAD_RADIAL,
- XGRAD_ELLIPTICAL, XGRAD_SQUARE, XGRAD_RECT };
enum XHatchStyle { XHATCH_SINGLE, XHATCH_DOUBLE, XHATCH_TRIPLE };
enum XFormTextStyle { XFT_ROTATE, XFT_UPRIGHT, XFT_SLANTX, XFT_SLANTY,
XFT_NONE };
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index b97d0c0..9231f91 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -23,6 +23,7 @@
#include <svx/xenum.hxx>
#include <tools/color.hxx>
#include <svx/svxdllapi.h>
+#include <com/sun/star/awt/GradientStyle.hpp>
class Gradient;
@@ -33,10 +34,10 @@ class Gradient;
class SVX_DLLPUBLIC XGradient
{
protected:
- XGradientStyle eStyle;
- Color aStartColor;
- Color aEndColor;
- long nAngle;
+ css::awt::GradientStyle eStyle;
+ Color aStartColor;
+ Color aEndColor;
+ long nAngle;
sal_uInt16 nBorder;
sal_uInt16 nOfsX;
sal_uInt16 nOfsY;
@@ -47,14 +48,14 @@ protected:
public:
XGradient();
XGradient( const Color& rStart, const Color& rEnd,
- XGradientStyle eStyle = XGRAD_LINEAR, long nAngle = 0,
+ css::awt::GradientStyle eStyle = css::awt::GradientStyle_LINEAR, long nAngle = 0,
sal_uInt16 nXOfs = 50, sal_uInt16 nYOfs = 50, sal_uInt16 nBorder = 0,
sal_uInt16 nStartIntens = 100, sal_uInt16 nEndIntens = 100,
sal_uInt16 nSteps = 0 );
bool operator==(const XGradient& rGradient) const;
- void SetGradientStyle(XGradientStyle eNewStyle) { eStyle = eNewStyle; }
+ void SetGradientStyle(css::awt::GradientStyle eNewStyle) { eStyle = eNewStyle; }
void SetStartColor(const Color& rColor) { aStartColor = rColor; }
void SetEndColor(const Color& rColor) { aEndColor = rColor; }
void SetAngle(long nNewAngle) { nAngle = nNewAngle; }
@@ -65,7 +66,7 @@ public:
void SetEndIntens(sal_uInt16 nNewIntens) { nIntensEnd = nNewIntens; }
void SetSteps(sal_uInt16 nSteps) { nStepCount = nSteps; }
- XGradientStyle GetGradientStyle() const { return eStyle; }
+ css::awt::GradientStyle GetGradientStyle() const { return eStyle; }
Color GetStartColor() const { return aStartColor; }
Color GetEndColor() const { return aEndColor; }
long GetAngle() const { return nAngle; }
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 943448f..084f13c 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -494,7 +494,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
SFX_REQUEST_ARG (rReq, pStart, SfxUInt32Item, ID_VAL_STARTINTENS, false);
SFX_REQUEST_ARG (rReq, pEnd, SfxUInt32Item, ID_VAL_ENDINTENS, false);
- if (CHECK_RANGE (XGRAD_LINEAR, (sal_Int32)pStyle->GetValue (), XGRAD_RECT) &&
+ if (CHECK_RANGE (css::awt::GradientStyle_LINEAR, (sal_Int32)pStyle->GetValue (), css::awt::GradientStyle_RECT) &&
CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360) &&
CHECK_RANGE (0, (sal_Int32)pBorder->GetValue (), 100) &&
CHECK_RANGE (0, (sal_Int32)pCenterX->GetValue (), 100) &&
@@ -517,7 +517,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
{
XGradient aGradient(pEntry->GetGradient());
- aGradient.SetGradientStyle ((XGradientStyle) pStyle->GetValue ());
+ aGradient.SetGradientStyle ((css::awt::GradientStyle) pStyle->GetValue ());
aGradient.SetAngle (pAngle->GetValue () * 10);
aGradient.SetBorder ((short) pBorder->GetValue ());
aGradient.SetXOffset ((short) pCenterX->GetValue ());
@@ -534,7 +534,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (i >= nCounts)
{
Color aBlack (0, 0, 0);
- XGradient aGradient (aBlack, aBlack, (XGradientStyle) pStyle->GetValue (),
+ XGradient aGradient (aBlack, aBlack, (css::awt::GradientStyle) pStyle->GetValue (),
pAngle->GetValue () * 10, (short) pCenterX->GetValue (),
(short) pCenterY->GetValue (), (short) pBorder->GetValue (),
(short) pStart->GetValue (), (short) pEnd->GetValue ());
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 35fe335..94db008 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -82,33 +82,33 @@ namespace drawinglayer
{
namespace
{
- attribute::GradientStyle XGradientStyleToGradientStyle(XGradientStyle eStyle)
+ attribute::GradientStyle XGradientStyleToGradientStyle(css::awt::GradientStyle eStyle)
{
switch(eStyle)
{
- case XGRAD_LINEAR :
+ case css::awt::GradientStyle_LINEAR :
{
return attribute::GRADIENTSTYLE_LINEAR;
}
- case XGRAD_AXIAL :
+ case css::awt::GradientStyle_AXIAL :
{
return attribute::GRADIENTSTYLE_AXIAL;
}
- case XGRAD_RADIAL :
+ case css::awt::GradientStyle_RADIAL :
{
return attribute::GRADIENTSTYLE_RADIAL;
}
- case XGRAD_ELLIPTICAL :
+ case css::awt::GradientStyle_ELLIPTICAL :
{
return attribute::GRADIENTSTYLE_ELLIPTICAL;
}
- case XGRAD_SQUARE :
+ case css::awt::GradientStyle_SQUARE :
{
return attribute::GRADIENTSTYLE_SQUARE;
}
default :
{
- return attribute::GRADIENTSTYLE_RECT; // XGRAD_RECT
+ return attribute::GRADIENTSTYLE_RECT; // css::awt::GradientStyle_RECT
}
}
}
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 63467d2..d95eaee 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -128,22 +128,22 @@ void AreaPropertyPanel::Initialize()
maGradientLinear.SetStartColor(Color(DEFAULT_STARTVALUE));
maGradientLinear.SetEndColor(Color(DEFAULT_ENDVALUE));
maGradientLinear.SetBorder(DEFAULT_BORDER);
- maGradientLinear.SetGradientStyle(XGRAD_LINEAR);
+ maGradientLinear.SetGradientStyle(css::awt::GradientStyle_LINEAR);
maGradientAxial = maGradientLinear;
- maGradientAxial.SetGradientStyle(XGRAD_AXIAL);
+ maGradientAxial.SetGradientStyle(css::awt::GradientStyle_AXIAL);
maGradientRadial = maGradientLinear;
- maGradientRadial.SetGradientStyle(XGRAD_RADIAL);
+ maGradientRadial.SetGradientStyle(css::awt::GradientStyle_RADIAL);
maGradientElliptical = maGradientLinear;
- maGradientElliptical.SetGradientStyle(XGRAD_ELLIPTICAL);
+ maGradientElliptical.SetGradientStyle(css::awt::GradientStyle_ELLIPTICAL);
maGradientSquare = maGradientLinear;
- maGradientSquare.SetGradientStyle(XGRAD_SQUARE);
+ maGradientSquare.SetGradientStyle(css::awt::GradientStyle_SQUARE);
maGradientRect = maGradientLinear;
- maGradientRect.SetGradientStyle(XGRAD_RECT);
+ maGradientRect.SetGradientStyle(css::awt::GradientStyle_RECT);
mpLbFillType->SetAccessibleName(OUString( "Fill")); //wj acc
mpLbFillAttr->SetAccessibleName(OUString( "Fill")); //wj acc
@@ -581,42 +581,44 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
switch(rGradient.GetGradientStyle())
{
- case XGRAD_LINEAR:
+ case css::awt::GradientStyle_LINEAR:
{
nEntryPos = 2;
pImage = &maImgLinear;
break;
}
- case XGRAD_AXIAL:
+ case css::awt::GradientStyle_AXIAL:
{
nEntryPos = 3;
pImage = &maImgAxial;
break;
}
- case XGRAD_RADIAL:
+ case css::awt::GradientStyle_RADIAL:
{
nEntryPos = 4;
pImage = &maImgRadial;
break;
}
- case XGRAD_ELLIPTICAL:
+ case css::awt::GradientStyle_ELLIPTICAL:
{
nEntryPos = 5;
pImage = &maImgElli;
break;
}
- case XGRAD_SQUARE:
+ case css::awt::GradientStyle_SQUARE:
{
nEntryPos = 6;
pImage = &maImgQuad;
break;
}
- case XGRAD_RECT:
+ case css::awt::GradientStyle_RECT:
{
nEntryPos = 7;
pImage = &maImgSquare;
break;
}
+ default:
+ break;
}
const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
@@ -1155,24 +1157,26 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
switch(nSelectType)
{
- case XGRAD_LINEAR:
+ case css::awt::GradientStyle_LINEAR:
aTmpGradient = maGradientLinear;
break;
- case XGRAD_AXIAL:
+ case css::awt::GradientStyle_AXIAL:
aTmpGradient = maGradientAxial;
break;
- case XGRAD_RADIAL:
+ case css::awt::GradientStyle_RADIAL:
aTmpGradient = maGradientRadial;
break;
- case XGRAD_ELLIPTICAL:
+ case css::awt::GradientStyle_ELLIPTICAL:
aTmpGradient = maGradientElliptical;
break;
- case XGRAD_SQUARE:
+ case css::awt::GradientStyle_SQUARE:
aTmpGradient = maGradientSquare;
break;
- case XGRAD_RECT:
+ case css::awt::GradientStyle_RECT:
aTmpGradient = maGradientRect;
break;
+ default:
+ break;
}
SfxItemPool* pPool = 0;
@@ -1206,22 +1210,22 @@ IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG)
-XGradient AreaPropertyPanel::GetGradient (const XGradientStyle eStyle) const
+XGradient AreaPropertyPanel::GetGradient (const css::awt::GradientStyle eStyle) const
{
switch (eStyle)
{
default:
- case XGRAD_LINEAR:
+ case css::awt::GradientStyle_LINEAR:
return maGradientLinear;
- case XGRAD_AXIAL:
+ case css::awt::GradientStyle_AXIAL:
return maGradientAxial;
- case XGRAD_RADIAL:
+ case css::awt::GradientStyle_RADIAL:
return maGradientRadial;
- case XGRAD_ELLIPTICAL:
+ case css::awt::GradientStyle_ELLIPTICAL:
return maGradientElliptical;
- case XGRAD_SQUARE:
+ case css::awt::GradientStyle_SQUARE:
return maGradientSquare;
- case XGRAD_RECT:
+ case css::awt::GradientStyle_RECT:
return maGradientRect;
}
}
@@ -1233,24 +1237,26 @@ void AreaPropertyPanel::SetGradient (const XGradient& rGradient)
{
switch (rGradient.GetGradientStyle())
{
- case XGRAD_LINEAR:
+ case css::awt::GradientStyle_LINEAR:
maGradientLinear = rGradient;
break;
- case XGRAD_AXIAL:
+ case css::awt::GradientStyle_AXIAL:
maGradientAxial = rGradient;
break;
- case XGRAD_RADIAL:
+ case css::awt::GradientStyle_RADIAL:
maGradientRadial = rGradient;
break;
- case XGRAD_ELLIPTICAL:
+ case css::awt::GradientStyle_ELLIPTICAL:
maGradientElliptical = rGradient;
break;
- case XGRAD_SQUARE:
+ case css::awt::GradientStyle_SQUARE:
maGradientSquare = rGradient;
break;
- case XGRAD_RECT:
+ case css::awt::GradientStyle_RECT:
maGradientRect = rGradient;
break;
+ default:
+ break;
}
}
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index 3bc0353..a2a9f42 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -76,7 +76,7 @@ public:
const static sal_Int32 DEFAULT_ENDVALUE;
const static sal_Int32 DEFAULT_BORDER;
- XGradient GetGradient (const XGradientStyle eStyle) const;
+ XGradient GetGradient (const css::awt::GradientStyle eStyle) const;
void SetGradient (const XGradient& rGradient);
sal_Int32 GetSelectedTransparencyTypeIndex (void) const;
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 7c6a103..400b20d 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -116,7 +116,7 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
{
InitStatus(pGradientItem);
const XGradient& rGradient = pGradientItem->GetGradientValue();
- XGradientStyle eXGS(rGradient.GetGradientStyle());
+ css::awt::GradientStyle eXGS(rGradient.GetGradientStyle());
Size aSize(POP_WIDTH,POP_HEIGHT);
aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
Size aSize2(POP_WIDTH,POP_HEIGHT2);
@@ -128,8 +128,8 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
switch(eXGS)
{
- case XGRAD_LINEAR:
- case XGRAD_AXIAL:
+ case css::awt::GradientStyle_LINEAR:
+ case css::awt::GradientStyle_AXIAL:
maFtTrgrCenterX.Hide();
maMtrTrgrCenterX.Hide();
maFtTrgrCenterY.Hide();
@@ -157,7 +157,7 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
SetSizePixel(aSize2);
break;
- case XGRAD_RADIAL:
+ case css::awt::GradientStyle_RADIAL:
maFtTrgrCenterX.Show();
maFtTrgrCenterX.SetPosPixel(APOS1_1);
maMtrTrgrCenterX.Show();
@@ -182,9 +182,9 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
break;
- case XGRAD_ELLIPTICAL:
- case XGRAD_SQUARE:
- case XGRAD_RECT:
+ case css::awt::GradientStyle_ELLIPTICAL:
+ case css::awt::GradientStyle_SQUARE:
+ case css::awt::GradientStyle_RECT:
maFtTrgrCenterX.Show();
maFtTrgrCenterX.SetPosPixel(APOS1_1);
maMtrTrgrCenterX.Show();
@@ -217,6 +217,9 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
SetSizePixel(aSize);
break;
+
+ default:
+ break;
}
}
@@ -268,7 +271,7 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s
XGradient aTmpGradient(
Color(nStartCol, nStartCol, nStartCol),
Color(nEndCol, nEndCol, nEndCol),
- (XGradientStyle)(mrAreaPropertyPanel.GetSelectedTransparencyTypeIndex()-2),
+ (css::awt::GradientStyle)(mrAreaPropertyPanel.GetSelectedTransparencyTypeIndex()-2),
(sal_uInt16)maMtrTrgrAngle.GetValue() * 10,
(sal_uInt16)maMtrTrgrCenterX.GetValue(),
(sal_uInt16)maMtrTrgrCenterY.GetValue(),
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
index 1a8d31b..8a52617 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
@@ -26,6 +26,7 @@
#include <vcl/field.hxx>
#include <vcl/toolbox.hxx>
#include <svx/xenum.hxx>
+#include <com/sun/star/awt/GradientStyle.hpp>
class XFillFloatTransparenceItem;
class SfxBindings;
@@ -45,7 +46,7 @@ public:
void Rearrange(XFillFloatTransparenceItem* pGradientItem);
void InitStatus(XFillFloatTransparenceItem* pGradientItem);
void ExecuteValueModify( sal_uInt8 nStartCol, sal_uInt8 nEndCol );
- void SetControlState_Impl(XGradientStyle eXGS);
+ void SetControlState_Impl(css::awt::GradientStyle eXGS);
private:
FixedText maFtTrgrCenterX;
diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx
index d010eec..72981d0 100644
--- a/svx/source/svdraw/gradtrns.cxx
+++ b/svx/source/svdraw/gradtrns.cxx
@@ -53,7 +53,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
switch(rG.aGradient.GetGradientStyle())
{
- case XGRAD_LINEAR :
+ case css::awt::GradientStyle_LINEAR :
{
aStartPos = basegfx::B2DPoint(aCenter.getX(), aRange.getMinY());
aEndPos = basegfx::B2DPoint(aCenter.getX(), aRange.getMaximum().getY());
@@ -76,7 +76,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
}
break;
}
- case XGRAD_AXIAL :
+ case css::awt::GradientStyle_AXIAL :
{
aStartPos = aCenter;
aEndPos = basegfx::B2DPoint(aCenter.getX(), aRange.getMaximum().getY());
@@ -99,8 +99,8 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
}
break;
}
- case XGRAD_RADIAL :
- case XGRAD_SQUARE :
+ case css::awt::GradientStyle_RADIAL :
+ case css::awt::GradientStyle_SQUARE :
{
aStartPos = basegfx::B2DPoint(aRange.getMinX(), aRange.getMaximum().getY());
aEndPos = basegfx::B2DPoint(aRange.getMinX(), aRange.getMinY());
@@ -134,8 +134,8 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
break;
}
- case XGRAD_ELLIPTICAL :
- case XGRAD_RECT :
+ case css::awt::GradientStyle_ELLIPTICAL :
+ case css::awt::GradientStyle_RECT :
{
aStartPos = basegfx::B2DPoint(aRange.getMinX(), aCenter.getY());
aEndPos = basegfx::B2DPoint(aRange.getMinX(), aRange.getMinY());
@@ -169,6 +169,8 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
break;
}
+ default:
+ break;
}
// set values for vector positions now
@@ -205,7 +207,7 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
switch(rG.aGradient.GetGradientStyle())
{
- case XGRAD_LINEAR :
+ case css::awt::GradientStyle_LINEAR :
{
if(!bMoveSingle || (bMoveSingle && !bMoveFirst))
{
@@ -274,7 +276,7 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
break;
}
- case XGRAD_AXIAL :
+ case css::awt::GradientStyle_AXIAL :
{
if(!bMoveSingle || (bMoveSingle && !bMoveFirst))
{
@@ -330,8 +332,8 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
break;
}
- case XGRAD_RADIAL :
- case XGRAD_SQUARE :
+ case css::awt::GradientStyle_RADIAL :
+ case css::awt::GradientStyle_SQUARE :
{
if(!bMoveSingle || (bMoveSingle && !bMoveFirst))
{
@@ -426,8 +428,8 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
break;
}
- case XGRAD_ELLIPTICAL :
- case XGRAD_RECT :
+ case css::awt::GradientStyle_ELLIPTICAL :
+ case css::awt::GradientStyle_RECT :
{
if(!bMoveSingle || (bMoveSingle && !bMoveFirst))
{
@@ -522,6 +524,8 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
break;
}
+ default:
+ break;
}
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index f92df8c..391364b 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1233,7 +1233,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rM
SfxItemSet aGradAttr(mpModel->GetItemPool(), pPath->GetMergedItemSet().GetRanges());
XGradient aXGradient;
- aXGradient.SetGradientStyle((XGradientStyle)rGrad.GetStyle());
+ aXGradient.SetGradientStyle((css::awt::GradientStyle)rGrad.GetStyle());
aXGradient.SetStartColor(rGrad.GetStartColor());
aXGradient.SetEndColor(rGrad.GetEndColor());
aXGradient.SetAngle((sal_uInt16)rGrad.GetAngle());
@@ -1365,24 +1365,26 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScalePartAction& rAct)
namespace
{
- XGradientStyle getXGradientStyleFromGradientStyle(const GradientStyle& rGradientStyle)
+ css::awt::GradientStyle getXGradientStyleFromGradientStyle(const GradientStyle& rGradientStyle)
{
- XGradientStyle aXGradientStyle(XGRAD_LINEAR);
+ css::awt::GradientStyle aXGradientStyle(css::awt::GradientStyle_LINEAR);
switch(rGradientStyle)
{
- case GradientStyle_LINEAR: aXGradientStyle = XGRAD_LINEAR; break;
- case GradientStyle_AXIAL: aXGradientStyle = XGRAD_AXIAL; break;
- case GradientStyle_RADIAL: aXGradientStyle = XGRAD_RADIAL; break;
- case GradientStyle_ELLIPTICAL: aXGradientStyle = XGRAD_ELLIPTICAL; break;
- case GradientStyle_SQUARE: aXGradientStyle = XGRAD_SQUARE; break;
- case GradientStyle_RECT: aXGradientStyle = XGRAD_RECT; break;
+ case GradientStyle_LINEAR: aXGradientStyle = css::awt::GradientStyle_LINEAR; break;
+ case GradientStyle_AXIAL: aXGradientStyle = css::awt::GradientStyle_AXIAL; break;
+ case GradientStyle_RADIAL: aXGradientStyle = css::awt::GradientStyle_RADIAL; break;
+ case GradientStyle_ELLIPTICAL: aXGradientStyle = css::awt::GradientStyle_ELLIPTICAL; break;
+ case GradientStyle_SQUARE: aXGradientStyle = css::awt::GradientStyle_SQUARE; break;
+ case GradientStyle_RECT: aXGradientStyle = css::awt::GradientStyle_RECT; break;
// Needed due to GradientStyle_FORCE_EQUAL_SIZE; this again is needed
// to force the enum defines in VCL to a defined size for the compilers,
// so despite it is never used it cannot be removed (would break the
// API implementation probably).
case GradientStyle_FORCE_EQUAL_SIZE: break;
+ default:
+ break;
}
return aXGradientStyle;
@@ -1406,7 +1408,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction& rAct)
ceil(aRange.getMaxY())));
// #i125211# Use the ranges from the SdrObject to create a new empty SfxItemSet
SfxItemSet aGradientAttr(mpModel->GetItemPool(), pRect->GetMergedItemSet().GetRanges());
- const XGradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
+ const css::awt::GradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
const XFillGradientItem aXFillGradientItem(
XGradient(
rGradient.GetStartColor(),
@@ -1476,7 +1478,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientExAction& rAct)
SdrPathObj* pPath = new SdrPathObj(OBJ_POLY, aSource);
// #i125211# Use the ranges from the SdrObject to create a new empty SfxItemSet
SfxItemSet aGradientAttr(mpModel->GetItemPool(), pPath->GetMergedItemSet().GetRanges());
- const XGradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
+ const css::awt::GradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
const XFillGradientItem aXFillGradientItem(
XGradient(
rGradient.GetStartColor(),
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index b6df02f..60df2af 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -592,7 +592,7 @@ XPropertyEntry* SvxUnoXGradientTable::getEntry( const OUString& rName, const uno
XGradient aXGradient;
- aXGradient.SetGradientStyle( (XGradientStyle) aGradient.Style );
+ aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient.Style );
aXGradient.SetStartColor( aGradient.StartColor );
aXGradient.SetEndColor( aGradient.EndColor );
aXGradient.SetAngle( aGradient.Angle );
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 803178d..87356be 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2288,7 +2288,7 @@ bool XSecondaryFillColorItem::GetPresentation
}
XGradient::XGradient() :
- eStyle( XGRAD_LINEAR ),
+ eStyle( css::awt::GradientStyle_LINEAR ),
aStartColor( Color( COL_BLACK ) ),
aEndColor( Color( COL_WHITE ) ),
nAngle( 0 ),
@@ -2302,7 +2302,7 @@ XGradient::XGradient() :
}
XGradient::XGradient(const Color& rStart, const Color& rEnd,
- XGradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
+ css::awt::GradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
sal_uInt16 nYOfs, sal_uInt16 nTheBorder,
sal_uInt16 nStartIntens, sal_uInt16 nEndIntens,
sal_uInt16 nSteps) :
@@ -2368,7 +2368,7 @@ XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) :
sal_Int16 nITemp;
sal_Int32 nLTemp;
- rIn.ReadInt16( nITemp ); aGradient.SetGradientStyle((XGradientStyle)nITemp);
+ rIn.ReadInt16( nITemp ); aGradient.SetGradientStyle((css::awt::GradientStyle)nITemp);
rIn.ReadUInt16( nRed );
rIn.ReadUInt16( nGreen );
rIn.ReadUInt16( nBlue );
@@ -2583,7 +2583,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
{
XGradient aXGradient;
- aXGradient.SetGradientStyle( (XGradientStyle) aGradient2.Style );
+ aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient2.Style );
aXGradient.SetStartColor( aGradient2.StartColor );
aXGradient.SetEndColor( aGradient2.EndColor );
aXGradient.SetAngle( aGradient2.Angle );
@@ -2620,7 +2620,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
XGradient aXGradient;
- aXGradient.SetGradientStyle( (XGradientStyle) aGradient2.Style );
+ aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient2.Style );
aXGradient.SetStartColor( aGradient2.StartColor );
aXGradient.SetEndColor( aGradient2.EndColor );
aXGradient.SetAngle( aGradient2.Angle );
@@ -2670,7 +2670,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
switch ( nMemberId )
{
case MID_GRADIENT_STYLE:
- aXGradient.SetGradientStyle( (XGradientStyle)nVal ); break;
+ aXGradient.SetGradientStyle( (css::awt::GradientStyle)nVal ); break;
case MID_GRADIENT_ANGLE:
aXGradient.SetAngle( nVal ); break;
case MID_GRADIENT_BORDER:
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 6e88708..f25a215 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -72,17 +72,17 @@ bool XGradientList::Create()
rtl::OUStringBuffer aStr(SVX_RESSTR(RID_SVXSTR_GRADIENT));
aStr.append(" 1");
sal_Int32 nLen = aStr.getLength() - 1;
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLACK ),RGB_Color(COL_WHITE ),XGRAD_LINEAR , 0,10,10, 0,100,100),aStr.toString()));
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLACK ),RGB_Color(COL_WHITE ),css::awt::GradientStyle_LINEAR , 0,10,10, 0,100,100),aStr.toString()));
aStr[nLen] = '2';
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLUE ),RGB_Color(COL_RED ),XGRAD_AXIAL , 300,20,20,10,100,100),aStr.toString()));
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLUE ),RGB_Color(COL_RED ),css::awt::GradientStyle_AXIAL , 300,20,20,10,100,100),aStr.toString()));
aStr[nLen] = '3';
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_RED ),RGB_Color(COL_YELLOW ),XGRAD_RADIAL , 600,30,30,20,100,100),aStr.toString()));
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_RED ),RGB_Color(COL_YELLOW ),css::awt::GradientStyle_RADIAL , 600,30,30,20,100,100),aStr.toString()));
aStr[nLen] = '4';
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_YELLOW ),RGB_Color(COL_GREEN ),XGRAD_ELLIPTICAL, 900,40,40,30,100,100),aStr.toString()));
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_YELLOW ),RGB_Color(COL_GREEN ),css::awt::GradientStyle_ELLIPTICAL, 900,40,40,30,100,100),aStr.toString()));
aStr[nLen] = '5';
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_GREEN ),RGB_Color(COL_MAGENTA),XGRAD_SQUARE , 1200,50,50,40,100,100),aStr.toString()));
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_GREEN ),RGB_Color(COL_MAGENTA),css::awt::GradientStyle_SQUARE , 1200,50,50,40,100,100),aStr.toString()));
aStr[nLen] = '6';
- Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT , 1900,60,60,50,100,100),aStr.toString()));
+ Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),css::awt::GradientStyle_RECT , 1900,60,60,50,100,100),aStr.toString()));
return true;
}
@@ -126,34 +126,34 @@ Bitmap XGradientList::CreateBitmapForUI( long nIndex )
switch(rGradient.GetGradientStyle())
{
- case XGRAD_LINEAR :
+ case css::awt::GradientStyle_LINEAR :
{
aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_LINEAR;
break;
}
- case XGRAD_AXIAL :
+ case css::awt::GradientStyle_AXIAL :
{
aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_AXIAL;
break;
}
- case XGRAD_RADIAL :
+ case css::awt::GradientStyle_RADIAL :
{
aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RADIAL;
break;
}
- case XGRAD_ELLIPTICAL :
+ case css::awt::GradientStyle_ELLIPTICAL :
{
aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_ELLIPTICAL;
break;
}
- case XGRAD_SQUARE :
+ case css::awt::GradientStyle_SQUARE :
{
aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_SQUARE;
break;
}
default :
{
- aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RECT; // XGRAD_RECT
+ aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RECT; // css::awt::GradientStyle_RECT
break;
}
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index c8a80c5..a37b1a8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7602,18 +7602,20 @@ void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGrad
switch (rGradient.GetGradientStyle())
{
- case XGRAD_AXIAL:
+ case css::awt::GradientStyle_AXIAL:
AddToAttrList( m_rExport.SdrExporter().getFlyFillAttrList(), XML_focus, "50%" );
// If it is an 'axial' gradient - swap the colors
// (because in the import process they were imported swapped)
sColor1 = sEndColor;
sColor2 = sStartColor;
break;
- case XGRAD_LINEAR: break;
- case XGRAD_RADIAL: break;
- case XGRAD_ELLIPTICAL: break;
- case XGRAD_SQUARE: break;
- case XGRAD_RECT: break;
+ case css::awt::GradientStyle_LINEAR: break;
+ case css::awt::GradientStyle_RADIAL: break;
+ case css::awt::GradientStyle_ELLIPTICAL: break;
+ case css::awt::GradientStyle_SQUARE: break;
+ case css::awt::GradientStyle_RECT: break;
+ default:
+ break;
}
sColor1 = "#" + sColor1;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 80959d7..ea0bd99 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3096,18 +3096,20 @@ void RtfAttributeOutput::FormatFillGradient(const XFillGradientItem& rFillGradie
switch (rGradient.GetGradientStyle())
{
- case XGRAD_LINEAR:
+ case css::awt::GradientStyle_LINEAR:
break;
- case XGRAD_AXIAL:
+ case css::awt::GradientStyle_AXIAL:
m_aFlyProperties.push_back(std::make_pair<OString, OString>("fillFocus", OString::number(50)));
break;
- case XGRAD_RADIAL:
+ case css::awt::GradientStyle_RADIAL:
break;
- case XGRAD_ELLIPTICAL:
+ case css::awt::GradientStyle_ELLIPTICAL:
break;
- case XGRAD_SQUARE:
+ case css::awt::GradientStyle_SQUARE:
break;
- case XGRAD_RECT:
+ case css::awt::GradientStyle_RECT:
+ break;
+ default:
break;
}
}
More information about the Libreoffice-commits
mailing list