diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/font.hxx | 2 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 7102ef9ed05a..1a728f34bba9 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -61,7 +61,9 @@ public: FontAlign GetAlign() const; // XXX: now font has background iff it is (single-y) underlined + // also forces non transparency bool HasBackgroundColor() const { + return GetUnderline() == UNDERLINE_SINGLE; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 85e307671079..a0edcc7554c4 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1040,7 +1040,7 @@ public: void SetTextFillColor(); void SetTextFillColor( const Color& rColor ); Color GetTextFillColor() const; - bool IsTextFillColor() const { return !maFont.IsTransparent(); } + bool IsTextFillColor() const { return maFont.GetUnderline() == UNDERLINE_SINGLE; /*return !maFont.IsTransparent();*/ } void SetTextLineColor(); void SetTextLineColor( const Color& rColor ); @@ -1097,7 +1097,7 @@ private: SAL_DLLPRIVATE void ImplInitAboveTextLineSize(); - SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool bTextLines, bool bTextBkg = false, sal_uInt32 flags = 0 ); + SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool bTextLines, sal_uInt32 flags = 0 ); SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& ); SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight ); |