diff options
author | Henry Castro <hcastro@collabora.com> | 2016-05-24 17:24:16 -0400 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-06-12 23:33:17 +0200 |
commit | 178a3a7df15882bf21d9a676a8fecae0c068aebd (patch) | |
tree | 170a776effc3e051483ea75286239989df86d6cb /vcl | |
parent | 63582ab268fca7f2fb0f9d88d724f3da825d6dac (diff) |
lok: reset the font list when there are no items
In the pre-init stage the devices were initialized with no
font list, but later the font list is updated. So those devices
were not updated.
Change-Id: I157d4c7079f9b1252916eb92b512aadb8e77329f
(cherry picked from commit 260f3ff257d7839119c8221397d18a516afd8799)
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/outdev/font.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index f2885f0813e8..e15f2df55be4 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -93,9 +93,19 @@ int OutputDevice::GetDevFontCount() const if( !mpGetDevFontList ) { if (!mpFontCollection) + { return 0; + } mpGetDevFontList = mpFontCollection->GetDevFontList(); + + if (!mpGetDevFontList->Count()) + { + delete mpGetDevFontList; + mpGetDevFontList = nullptr; + + return 0; + } } return mpGetDevFontList->Count(); } |