From 5c9ae702b42745bf6963d1cbb4e779b66ade0825 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 9 May 2018 12:17:08 +0200 Subject: store Color using boost::optional in EditCharAttribField Change-Id: If4af5991be51cdb035c0bc0fb7668844df703073 Reviewed-on: https://gerrit.libreoffice.org/54022 Tested-by: Jenkins Reviewed-by: Noel Grandin --- starmath/source/accessibility.cxx | 2 +- starmath/source/accessibility.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'starmath') diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 9b2bf3a3b97b..988931c5a540 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -1023,7 +1023,7 @@ bool SmTextForwarder::IsValid() const return pEditEngine && pEditEngine->GetUpdateMode(); } -OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ) +OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional& rpTxtColor, boost::optional& rpFldColor ) { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor) : OUString(); diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 2dc092af1099..9c669e51f177 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -201,7 +201,7 @@ public: virtual SfxItemPool* GetPool() const override; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ) override; + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional& rpTxtColor, boost::optional& rpFldColor ) override; virtual void FieldClicked(const SvxFieldItem&, sal_Int32, sal_Int32) override; virtual bool IsValid() const override; -- cgit