diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-14 11:11:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-26 08:44:50 +0200 |
| commit | bea081b5099786e5fcadddd72c247b9a9488286a (patch) | |
| tree | dd165f81e850cb9bcfa23b713bd60e3fb26d21ee /vcl/osx | |
| parent | a488c7ad2763b944713997911c1ddb0315d8c93f (diff) | |
replace SalColor with Color
Change-Id: I615640a378a61cf6e44e84a647ce06bdd8a52807
Reviewed-on: https://gerrit.libreoffice.org/51239
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/a11ytextattributeswrapper.mm | 6 | ||||
| -rw-r--r-- | vcl/osx/salinst.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm index 1af27ad4f247..f57aaac2680a 100644 --- a/vcl/osx/a11ytextattributeswrapper.mm +++ b/vcl/osx/a11ytextattributeswrapper.mm @@ -167,10 +167,10 @@ using namespace ::com::sun::star::uno; return [ NSNumber numberWithShort: value ]; } -+(void)addColor:(SalColor)nSalColor forAttribute:(NSString *)attribute andRange:(NSRange)range toString:(NSMutableAttributedString *)string { - if( nSalColor == sal_uInt32(COL_TRANSPARENT) ) ++(void)addColor:(Color)nColor forAttribute:(NSString *)attribute andRange:(NSRange)range toString:(NSMutableAttributedString *)string { + if( nColor == COL_TRANSPARENT ) return; - const RGBAColor aRGBAColor( nSalColor); + const RGBAColor aRGBAColor( nColor); CGColorRef aColorRef = CGColorCreate ( CGColorSpaceCreateWithName ( kCGColorSpaceGenericRGB ), aRGBAColor.AsArray() ); [ string addAttribute: attribute value: reinterpret_cast<id>(aColorRef) range: range ]; CGColorRelease( aColorRef ); diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 891281614cb1..62a724a8bfae 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -1032,7 +1032,7 @@ CGImageRef CreateCGImage( const Image& rImage ) else if( aBmpEx.GetTransparentType() == TransparentType::Color ) { Color aTransColor( aBmpEx.GetTransparentColor() ); - SalColor nTransColor = MAKE_SALCOLOR( aTransColor.GetRed(), aTransColor.GetGreen(), aTransColor.GetBlue() ); + Color nTransColor( aTransColor.GetRed(), aTransColor.GetGreen(), aTransColor.GetBlue() ); xImage = pSalBmp->CreateColorMask( 0, 0, pSalBmp->mnWidth, pSalBmp->mnHeight, nTransColor ); } |