diff options
author | Serge Krot <Serge.Krot@cib.de> | 2020-06-19 13:06:33 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-06-20 01:47:03 +0200 |
commit | 63d4e8aa10186b4ed0e3106c116ad25c5fb5ed6d (patch) | |
tree | 2e0b56c4ec81cecb5738bd499b036b884102e346 /sw | |
parent | 54a3daec02f2eeada04efcd7958da4152db4611a (diff) |
tdf#101830 sw: highlight empty 'invisible' input fields
Change-Id: Ibcf4f7ce88c7bf364510c522e224028aa4737790
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96717
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/text/portxt.cxx | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index ea16142b9f33..84bbee847d72 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -37,6 +37,7 @@ #include <pam.hxx> #include <doc.hxx> #include <xmloff/odffields.hxx> +#include <viewopt.hxx> using namespace ::sw::mark; using namespace ::com::sun::star; @@ -689,6 +690,28 @@ void SwTextInputFieldPortion::Paint( const SwTextPaintInfo &rInf ) const SwTextSlot aPaintText( &rInf, this, true, true, OUString() ); SwTextPortion::Paint( rInf ); } + else + { + // highlight empty input field, elsewhere they are completely invisible for the user + SwRect aIntersect; + rInf.CalcRect(*this, &aIntersect); + const sal_uInt16 aAreaWidth = rInf.GetTextSize(OUString(' ')).Width(); + aIntersect.Left(aIntersect.Left() - aAreaWidth/2); + aIntersect.Width(aAreaWidth); + + if (aIntersect.HasArea() + && rInf.OnWin() + && SwViewOption::IsFieldShadings() + && !rInf.GetOpt().IsPagePreview()) + { + OutputDevice* pOut = const_cast<OutputDevice*>(rInf.GetOut()); + pOut->Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR); + pOut->SetFillColor(SwViewOption::GetFieldShadingsColor()); + pOut->SetLineColor(); + pOut->DrawRect(aIntersect.SVRect()); + pOut->Pop(); + } + } } bool SwTextInputFieldPortion::GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const |