diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-12 18:38:18 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-13 08:38:00 +0900 |
| commit | 37b8f4e0a1a21d07fd949a92c5e9dc6911a8b8ad (patch) | |
| tree | f0445c899dca7708963b307228d321ba40fbf216 /include/svx | |
| parent | a7246759ccdc5c00b160515c4fe3334d093d8dd0 (diff) | |
refactor SvxFontPrevWindow to use RenderContext + clean-up
Change-Id: Ibbb23adff4c38b4c819894b6714de355f13219c3
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/fntctrl.hxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index f48ebcc6de39..d923c23c12a2 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -27,26 +27,25 @@ #include <rtl/ustring.hxx> -// forward --------------------------------------------------------------- - class SfxItemSet; class FontPrevWin_Impl; -// class SvxFontPrevWindow ----------------------------------------------- - class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontPrevWindow : public vcl::Window { using OutputDevice::SetFont; private: - FontPrevWin_Impl* pImpl; + std::unique_ptr<FontPrevWin_Impl> pImpl; + bool mbResetForeground : 1; + bool mbResetBackground : 1; - SVX_DLLPRIVATE void InitSettings( bool bForeground, bool bBackground ); + SVX_DLLPRIVATE void ResetSettings(bool bForeground, bool bBackground); + SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext); SVX_DLLPRIVATE void Init (); SVX_DLLPRIVATE void SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); public: - SvxFontPrevWindow( vcl::Window* pParent, const ResId& rId ); + SvxFontPrevWindow(vcl::Window* pParent, const ResId& rId); SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle); virtual ~SvxFontPrevWindow(); virtual void dispose() SAL_OVERRIDE; @@ -68,7 +67,7 @@ public: void UseResourceText( bool bUse = true ); void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; - bool IsTwoLines() const; + bool IsTwoLines() const; void SetTwoLines(bool bSet); void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd); |