diff options
| author | Radu Ioan <ioan.radu.g@gmail.com> | 2014-12-11 23:45:38 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-12 20:22:15 +0000 |
| commit | 3c77eba67b61b4f78f2c8ccec6c78622ee173b61 (patch) | |
| tree | 2d369a54b91d7a7fed0bf9d51dc3c29e55a21620 /svx/source/xoutdev | |
| parent | e570cd7a293ceee175949dcc9656cdf776ae3c37 (diff) | |
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XHatchStyle
Change-Id: I89e7edadc4f408e5a50840aaa1a13965b8503afb
Reviewed-on: https://gerrit.libreoffice.org/13442
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'svx/source/xoutdev')
| -rw-r--r-- | svx/source/xoutdev/xattr.cxx | 10 | ||||
| -rw-r--r-- | svx/source/xoutdev/xtabhtch.cxx | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 87356be82617..06e44c472bc6 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -2824,7 +2824,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM return NULL; } -XHatch::XHatch(const Color& rCol, XHatchStyle eTheStyle, long nTheDistance, +XHatch::XHatch(const Color& rCol, css::drawing::HatchStyle eTheStyle, long nTheDistance, long nTheAngle) : eStyle(eTheStyle), aColor(rCol), @@ -2868,7 +2868,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) : sal_Int16 nITemp; sal_Int32 nLTemp; - rIn.ReadInt16( nITemp ); aHatch.SetHatchStyle((XHatchStyle)nITemp); + rIn.ReadInt16( nITemp ); aHatch.SetHatchStyle((css::drawing::HatchStyle)nITemp); rIn.ReadUInt16( nRed ); rIn.ReadUInt16( nGreen ); rIn.ReadUInt16( nBlue ); @@ -3036,7 +3036,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 SetName( aName ); if ( bHatch ) { - aHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style ); + aHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style ); aHatch.SetColor( aUnoHatch.Color ); aHatch.SetDistance( aUnoHatch.Distance ); aHatch.SetAngle( aUnoHatch.Angle ); @@ -3054,7 +3054,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 if(!(rVal >>= aUnoHatch)) return false; - aHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style ); + aHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style ); aHatch.SetColor( aUnoHatch.Color ); aHatch.SetDistance( aUnoHatch.Distance ); aHatch.SetAngle( aUnoHatch.Angle ); @@ -3075,7 +3075,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 sal_Int16 nVal = sal_Int16(); if (!(rVal >>= nVal )) return false; - aHatch.SetHatchStyle( (XHatchStyle)nVal ); + aHatch.SetHatchStyle( (css::drawing::HatchStyle)nVal ); break; } diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 2f59801d37fd..ba73c5c7c8b4 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -71,11 +71,11 @@ bool XHatchList::Create() aStr.append(" 1"); sal_Int32 nLen = aStr.getLength() - 1; - Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLACK),XHATCH_SINGLE,100, 0),aStr.toString())); + Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLACK),css::drawing::HatchStyle_SINGLE,100, 0),aStr.toString())); aStr[nLen] = '2'; - Insert(new XHatchEntry(XHatch(RGB_Color(COL_RED ),XHATCH_DOUBLE, 80,450),aStr.toString())); + Insert(new XHatchEntry(XHatch(RGB_Color(COL_RED ),css::drawing::HatchStyle_DOUBLE, 80,450),aStr.toString())); aStr[nLen] = '3'; - Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120, 0),aStr.toString())); + Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),css::drawing::HatchStyle_TRIPLE,120, 0),aStr.toString())); return true; } @@ -100,19 +100,19 @@ Bitmap XHatchList::CreateBitmapForUI( long nIndex ) switch(rHatch.GetHatchStyle()) { - case XHATCH_SINGLE : + case css::drawing::HatchStyle_SINGLE : { aHatchStyle = drawinglayer::attribute::HATCHSTYLE_SINGLE; break; } - case XHATCH_DOUBLE : + case css::drawing::HatchStyle_DOUBLE : { aHatchStyle = drawinglayer::attribute::HATCHSTYLE_DOUBLE; break; } default : { - aHatchStyle = drawinglayer::attribute::HATCHSTYLE_TRIPLE; // XHATCH_TRIPLE + aHatchStyle = drawinglayer::attribute::HATCHSTYLE_TRIPLE; // css::drawing::HatchStyle_TRIPLE break; } } |