summaryrefslogtreecommitdiff
path: root/sd/source/ui/slidesorter/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-20 15:22:05 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-21 06:05:41 +0100
commit72593849bb644684a8c00f70a3f18bcfabca737f (patch)
tree6325d6a52bce0f0539dde6fee53aa7fd792e8eb2 /sd/source/ui/slidesorter/inc
parentbcb1e01c32e09d9abeb91b73303f2eb6b3b5abfe (diff)
ColorData->Color in sd..svx
Change-Id: I70de56b6bfb1ea4655ec03510fad92bf6645f64e Reviewed-on: https://gerrit.libreoffice.org/50046 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/slidesorter/inc')
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsTheme.hxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index e9d5d6b29b2c..1f4827c0c5a6 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -73,7 +73,7 @@ public:
Color_PageCountFontColor,
ColorType_Size_
};
- ColorData GetColor (const ColorType eType);
+ Color GetColor (const ColorType eType);
enum GradientColorType {
Gradient_NormalPage,
@@ -91,12 +91,12 @@ public:
Fill1,
Fill2
};
- ColorData GetGradientColor (
+ Color GetGradientColor (
const GradientColorType eType,
const GradientColorClass eClass);
void SetGradient (
const GradientColorType eType,
- const ColorData aBaseColor,
+ const Color aBaseColor,
const sal_Int32 nSaturationOverride,
const sal_Int32 nBrightnessOverride,
const sal_Int32 nFillStartOffset,
@@ -118,15 +118,15 @@ private:
class GradientDescriptor
{
public:
- ColorData maFillColor1;
- ColorData maFillColor2;
- ColorData maBorderColor1;
- ColorData maBorderColor2;
+ Color maFillColor1;
+ Color maFillColor2;
+ Color maBorderColor1;
+ Color maBorderColor2;
};
- ColorData maBackgroundColor;
+ Color maBackgroundColor;
::std::vector<GradientDescriptor> maGradients;
::std::vector<BitmapEx> maIcons;
- ::std::vector<ColorData> maColor;
+ ::std::vector<Color> maColor;
GradientDescriptor& GetGradient (const GradientColorType eType);
/** Guarded initialization of the specified icon in the maIcons