diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-02 11:43:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 07:35:01 +0100 |
| commit | 61d79dd740958186c4a4344e18eaeb5b2c139c91 (patch) | |
| tree | abea71a038352572871ea1fb2a9c40d2f196ddd6 /oox/inc | |
| parent | 04c9cb68dffa2af15661cc35bc61032b036ed2cd (diff) | |
use more Color in oox
Change-Id: I8fdc6742de5af9101e246411e7208650bae2c4c7
Reviewed-on: https://gerrit.libreoffice.org/50617
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/drawingml/fillproperties.hxx | 2 | ||||
| -rw-r--r-- | oox/inc/drawingml/lineproperties.hxx | 2 | ||||
| -rw-r--r-- | oox/inc/drawingml/shape3dproperties.hxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/oox/inc/drawingml/fillproperties.hxx b/oox/inc/drawingml/fillproperties.hxx index affd8e1602eb..7fe1a3f6033d 100644 --- a/oox/inc/drawingml/fillproperties.hxx +++ b/oox/inc/drawingml/fillproperties.hxx @@ -147,7 +147,7 @@ struct OOX_DLLPUBLIC FillProperties ShapePropertyMap& rPropMap, const GraphicHelper& rGraphicHelper, sal_Int32 nShapeRotation = 0, - sal_Int32 nPhClr = API_RGB_TRANSPARENT, + ::Color nPhClr = API_RGB_TRANSPARENT, bool bFlipH = false, bool bFlipV = false ) const; }; diff --git a/oox/inc/drawingml/lineproperties.hxx b/oox/inc/drawingml/lineproperties.hxx index 1c5320e25841..512c1aba5fe6 100644 --- a/oox/inc/drawingml/lineproperties.hxx +++ b/oox/inc/drawingml/lineproperties.hxx @@ -70,7 +70,7 @@ struct OOX_DLLPUBLIC LineProperties void pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper& rGraphicHelper, - sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const; + ::Color nPhClr = API_RGB_TRANSPARENT ) const; /** Calculates the line style attribute from the internal state of the object */ css::drawing::LineStyle getLineStyle() const; diff --git a/oox/inc/drawingml/shape3dproperties.hxx b/oox/inc/drawingml/shape3dproperties.hxx index e0fe9a9f0ac5..e44d0468eeca 100644 --- a/oox/inc/drawingml/shape3dproperties.hxx +++ b/oox/inc/drawingml/shape3dproperties.hxx @@ -78,10 +78,10 @@ struct Shape3DProperties css::uno::Sequence< css::beans::PropertyValue > getCameraAttributes(); css::uno::Sequence< css::beans::PropertyValue > getLightRigAttributes(); css::uno::Sequence< css::beans::PropertyValue > getShape3DAttributes( - const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr ); + const GraphicHelper& rGraphicHelper, ::Color rPhClr ); static css::uno::Sequence< css::beans::PropertyValue > getBevelAttributes( BevelProperties rProps ); static css::uno::Sequence< css::beans::PropertyValue > getColorAttributes( - const Color& rColor, const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr ); + const Color& rColor, const GraphicHelper& rGraphicHelper, ::Color rPhClr ); }; |