diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 13:23:58 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 13:34:45 +1100 |
| commit | 528f5ec2a3ae3fff29943ce4762230a3e99a6151 (patch) | |
| tree | aefa2484bb3280b16846cb2e266c070bcc928ed9 /vcl/inc/fontinstance.hxx | |
| parent | d1a49df6833ff16f5cbaf98534eaae62693e520b (diff) | |
vcl: changes to included vcl headers
Changes made to allow for harmonization of vcl/inc/impfont.hxx and
vcl/inc/fontattributes:
- comment added showing the similarities between impfont.hxx and
fontattributes.hxx (made in fontattributes.hxx) - extra line
space added for my own convinience as I tend to switch between
tabs listing vcl/inc/impfont.hxx and vcl/inc/fontattributes.hxx
in OpenGrok because that's how I roll
- fontattributes.hxx doesn't need rtl/textenc.hxx, that's already
included in rtl/ustring.hxx, so swapped to use this instead
- fontattibutes.hxx now includes i18nlangtag/languagetag.hxx - this
will be needed when I add the LanguageTag properties that exist in
impfont.hxx
- unotools/fontdefs.hxx added to:
+ vcl/source/font/PhysicalFontCollection.cxx
+ vcl/source/font/PhysicalFontFamily.cxx
+ vcl/source/font/PhysicalFontFace.cxx
+ vcl/source/font/font.cxx
These are the only specific files that actually need this include.
Thus this has been removed as an included header from
fontattributes.hxx
- vcl/inc/fontinstance.hxx doesn't need the reference counter to be
a sal_uLong, a sal_uInt32 will suffice (if we need more references
than that then I suggest there is a problem somewhere in the code!)
- rearranged vcl/source/font/font.cxx's included headers
Change-Id: I8d61a5c05989356c056b962adc5aa670940addd2
Diffstat (limited to 'vcl/inc/fontinstance.hxx')
| -rw-r--r-- | vcl/inc/fontinstance.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx index 04bae109e6b1..db5c6c1211d5 100644 --- a/vcl/inc/fontinstance.hxx +++ b/vcl/inc/fontinstance.hxx @@ -43,7 +43,7 @@ public: // TODO: make data members private const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol long mnLineHeight; - sal_uLong mnRefCount; + sal_uInt32 mnRefCount; sal_uInt16 mnSetFontFlags; // Flags returned by SalGraphics::SetFont() short mnOwnOrientation; // text angle if lower layers don't rotate text themselves short mnOrientation; // text angle in 3600 system |