diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-23 09:14:13 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:06:20 +0100 |
| commit | 0e491a7a2affbb08071e6378dacc1995cb301655 (patch) | |
| tree | c93205745e1fcd69ff508a3d04aa064bb90606ae /vcl | |
| parent | c612c3b0aed9ad7f7f42b4313f821b71995ead15 (diff) | |
vclptr: add isDisposed method - and assert for it here & there.
Change-Id: I2b154e0ed9eee0a45900ada7f805a1d444a31bc0
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/README.lifecycle | 4 | ||||
| -rw-r--r-- | vcl/source/outdev/font.cxx | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/vcl/README.lifecycle b/vcl/README.lifecycle index 1ee7eab7ea6b..0edd0c8b19eb 100644 --- a/vcl/README.lifecycle +++ b/vcl/README.lifecycle @@ -144,11 +144,13 @@ or: their constructors. * Pass 'const VclPtr<> &' instead of pointers everywhere + + add 'explicit' keywords to VclPtr constructors to + accelerate compilation etc. * Cleanup common existing methods such that they continue to work post-dispose. - * Dispose functions shoudl be audited to: + * Dispose functions should be audited to: + not leave dangling pointsr + shrink them - some work should incrementally migrate back to destructors. diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 1bf2df824ff6..27810d43ade9 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -91,7 +91,12 @@ vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const int OutputDevice::GetDevFontCount() const { if( !mpGetDevFontList ) + { + if (!mpFontCollection) + return 0; + mpGetDevFontList = mpFontCollection->GetDevFontList(); + } return mpGetDevFontList->Count(); } |