mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SvxBrushItem::TransparencyToPercent: add this to avoid copypaste

Browse Source 
Change-Id: I9b77c0a48b7de39eadae118c24c70ac415898293
This commit is contained in:
Miklos Vajna
2013-07-10 09:41:23 +02:00
parent 728f105768
commit 9487b71306
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editeng/source/items/frmitems.cxx
View File

@@ -3567,7 +3567,7 @@ static inline sal_Int8 lcl_PercentToTransparency(long nPercent)
//0xff must not be returned! //0xff must not be returned!
return sal_Int8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0); return sal_Int8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0);
} }
static inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans) sal_Int8 SvxBrushItem::TransparencyToPercent(sal_Int32 nTrans)
{ {
return (sal_Int8)((nTrans * 100 + 127) / 254); return (sal_Int8)((nTrans * 100 + 127) / 254);
} }
@@ -3584,7 +3584,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
rVal <<= (sal_Int32)( aColor.GetRGBColor() ); rVal <<= (sal_Int32)( aColor.GetRGBColor() );
break; break;
case MID_BACK_COLOR_TRANSPARENCY: case MID_BACK_COLOR_TRANSPARENCY:
rVal <<= lcl_TransparencyToPercent(aColor.GetTransparency()); rVal <<= SvxBrushItem::TransparencyToPercent(aColor.GetTransparency());
break; break;
case MID_GRAPHIC_POSITION: case MID_GRAPHIC_POSITION:
rVal <<= (style::GraphicLocation)(sal_Int16)eGraphicPos; rVal <<= (style::GraphicLocation)(sal_Int16)eGraphicPos;

1
include/editeng/brushitem.hxx
View File

@@ -122,6 +122,7 @@ public:
static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle ); static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle );
static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos ); static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos );
static sal_Int8 TransparencyToPercent(sal_Int32 nTrans);
}; };
#endif // #ifndef _SVX_BRSHITEM_HXX #endif // #ifndef _SVX_BRSHITEM_HXX

3
sw/source/filter/ww8/docxattributeoutput.cxx
View File

@@ -4864,8 +4864,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
if (nTransparency) if (nTransparency)
{ {
// Convert transparency to percent // Convert transparency to percent
// Consider editeng/source/items/frmitems.cxx : lcl_TransparencyToPercent() function. sal_Int8 nTransparencyPercent = SvxBrushItem::TransparencyToPercent(nTransparency);
sal_Int8 nTransparencyPercent = (sal_Int8)((nTransparency * 100 + 127) / 254);
// Calculate alpha value // Calculate alpha value
// Consider oox/source/drawingml/color.cxx : getTransparency() function. // Consider oox/source/drawingml/color.cxx : getTransparency() function.