diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-05-22 13:53:19 -0400 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:37 +0200 |
| commit | d097bc8e156b50a4fd04dd82c42efa2921f0e886 (patch) | |
| tree | b565e8f581fa7856f816995781e204b0693b6981 /include | |
| parent | 285c6cd514eedb0718029906a6189bf39d8232e4 (diff) | |
HasBkg method to Font.HasBkg iff HasSingleUnderline.SetBkgColor in OutputDev
Change-Id: I10e6e1b916df0c78d26596a37944e8b57b2897e7
(cherry picked from commit 181266201b5e6aaad1dcd9cbc2dd4db44ecf3dc5)
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/font.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 5e0b13481005..7102ef9ed05a 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -60,6 +60,11 @@ public: void SetAlign( FontAlign ); FontAlign GetAlign() const; + // XXX: now font has background iff it is (single-y) underlined + bool HasBackgroundColor() const { + return GetUnderline() == UNDERLINE_SINGLE; + } + void SetName( const OUString& rFamilyName ); const OUString& GetName() const; void SetStyleName( const OUString& rStyleName ); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 199ca08392c1..85e307671079 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -340,6 +340,7 @@ private: mutable bool mbKerning : 1; mutable bool mbNewFont : 1; mutable bool mbTextLines : 1; + mutable bool mbTextBackground : 1; mutable bool mbTextSpecial : 1; mutable bool mbRefPoint : 1; mutable bool mbEnableRTL : 1; @@ -644,7 +645,7 @@ public: ///@} - /** @name Rectangle functions + /** @name Rectangle functionsf */ ///@{ @@ -1096,7 +1097,7 @@ private: SAL_DLLPRIVATE void ImplInitAboveTextLineSize(); - SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool bTextLines, sal_uInt32 flags = 0 ); + SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool bTextLines, bool bTextBkg = false, 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 ); |