diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-09 12:17:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-10 08:42:37 +0200 |
| commit | 5c9ae702b42745bf6963d1cbb4e779b66ade0825 (patch) | |
| tree | 323545cbc5386b483067030b66cf5ca07bc25e45 /include/editeng/outliner.hxx | |
| parent | c5f8a296fcfc08f8ac441cb8300a7565caa50b53 (diff) | |
store Color using boost::optional in EditCharAttribField
Change-Id: If4af5991be51cdb035c0bc0fb7668844df703073
Reviewed-on: https://gerrit.libreoffice.org/54022
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/editeng/outliner.hxx')
| -rw-r--r-- | include/editeng/outliner.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index a5f0d4b1b1e3..31ba68c2c5f9 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -900,7 +900,7 @@ public: bool UpdateFields(); void RemoveFields( const std::function<bool ( const SvxFieldData* )>& isFieldData = [] (const SvxFieldData* ){return true;} ); - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rTxtColor, boost::optional<Color>& rFldColor ); void SetSpeller( css::uno::Reference< css::linguistic2::XSpellChecker1 > const &xSpeller ); css::uno::Reference< css::linguistic2::XSpellChecker1 > const & |