diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-07-03 18:50:05 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-07-04 16:18:37 +0000 |
| commit | ac7cc2b709469f1b88fe67dd8d069512ade6eb1c (patch) | |
| tree | a42d4e6467507307c70fa52d13559d06ee89677a /include | |
| parent | 3a19e79e8203de59d039da962aa07b0ac1bcab85 (diff) | |
tdf#92241 fix crashes and rendering of symbol set previews
Change-Id: I43397f2b0caa31c334f87acf11fc96df2e051ad8
Reviewed-on: https://gerrit.libreoffice.org/16744
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/charmap.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/ctrl.hxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index d50382ee8a0e..e56fe98a26d1 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -58,6 +58,7 @@ public: Link<> GetPreSelectHdl() const { return aHighHdl; } void SetPreSelectHdl( const Link<>& rHdl ) { aPreSelectHdl = rHdl; } static sal_uInt32& getSelectedChar(); + void SetFont( const vcl::Font& rFont ); svx::SvxShowCharSetItem* ImplGetItem( int _nPos ); int FirstInView() const; @@ -108,12 +109,14 @@ private: sal_Int32 nSelectedIndex; FontCharMapPtr mpFontCharMap; + Size maFontSize; VclPtr<ScrollBar> aVscrollSB; bool mbRecalculateFont : 1; bool mbUpdateForeground : 1; bool mbUpdateBackground : 1; + private: void DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, int n2); void InitSettings(vcl::RenderContext& rRenderContext); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 6741a229dd4d..69a3569a0b5e 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -41,6 +41,8 @@ protected: private: bool mbHasControlFocus; + bool mbFont; + bool mbForeground; Link<> maGetFocusHdl; Link<> maLoseFocusHdl; |