diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-21 09:34:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-22 07:22:13 +0100 |
| commit | 8e7226233940a201c76c6a43e0648603d17961f4 (patch) | |
| tree | 523aaab816b93c7c276def7d8462500cae0df957 /sc/inc | |
| parent | eb21db08b3aee4b9113d221ca47af73d2f9b82d7 (diff) | |
ColorData->Color in sc
and fix the sal_Int32() conversion operator in Color, which was
always returning 0
Change-Id: I0aefaedc34ee0a8bccd43238ccfe8196d2dd5c5c
Reviewed-on: https://gerrit.libreoffice.org/50051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/chgtrack.hxx | 4 | ||||
| -rw-r--r-- | sc/inc/detfunc.hxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index fa0da691da9e..fd465155e1ce 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -49,12 +49,12 @@ private: const std::set<OUString>& rUsers; OUString aLastUserName; sal_uInt16 nLastUserIndex; - ColorData nColor; + Color nColor; public: ScActionColorChanger( const ScChangeTrack& rTrack ); void Update( const ScChangeAction& rAction ); - ColorData GetColor() const { return nColor; } + Color GetColor() const { return nColor; } }; enum ScChangeActionType diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index 8ae90c217cf0..41a47effbb95 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -50,9 +50,9 @@ enum ScDetectiveObjType class SC_DLLPUBLIC ScDetectiveFunc { - static ColorData nArrowColor; - static ColorData nErrorColor; - static ColorData nCommentColor; + static Color nArrowColor; + static Color nErrorColor; + static Color nCommentColor; static bool bColorsInitialized; ScDocument* pDoc; @@ -144,9 +144,9 @@ public: void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition, const ScRange& rSource, bool bRedLine ); - static ColorData GetArrowColor(); - static ColorData GetErrorColor(); - static ColorData GetCommentColor(); + static Color GetArrowColor(); + static Color GetErrorColor(); + static Color GetCommentColor(); static void InitializeColors(); static bool IsColorsInitialized(); static void AppendChangTrackNoteSeparator(OUString &str); |