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/editeng.hxx | |
| parent | tdf#117517: Fix OpenGL text rendering on Windows (diff) | |
| download | core-5c9ae702b42745bf6963d1cbb4e779b66ade0825.tar.gz core-5c9ae702b42745bf6963d1cbb4e779b66ade0825.zip | |
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/editeng.hxx')
| -rw-r--r-- | include/editeng/editeng.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 393e0068cb64..52a052570dd0 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -41,6 +41,7 @@ #include <o3tl/typed_flags_set.hxx> #include <svl/languageoptions.hxx> #include <vcl/errcode.hxx> +#include <boost/optional.hpp> #include <functional> namespace com { namespace sun { namespace star { @@ -508,7 +509,7 @@ public: virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const; virtual bool SpellNextDocument(); virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - 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 ); // override this if access to bullet information needs to be provided virtual const SvxNumberFormat * GetNumberFormat( sal_Int32 nPara ) const; |