Kaydet (Commit) 51b1b469 authored tarafından Chris Sherlock's avatar Chris Sherlock

vcl: create a default FontAttributes constructor

Change-Id: If2f297c9c4ee1dd4aff5d24ddd55fa4bb33073e0
üst ed373ea7
......@@ -26,6 +26,8 @@
class FontAttributes
{
public:
explicit FontAttributes();
// device independent font functions
const OUString& GetFamilyName() const { return maFamilyName; }
FontFamily GetFamilyType() const { return meFamily; }
......@@ -91,10 +93,10 @@ private:
OUString maFamilyName; // Font Family Name
OUString maStyleName; // Font Style Name
FontWeight meWeight; // Weight Type
FontItalic meItalic; // Slant Type
FontFamily meFamily; // Family Type
FontPitch mePitch; // Pitch Type
FontWidth meWidthType; // Width Type
FontItalic meItalic; // Slant Type
bool mbSymbolFlag; // Is font a symbol?
// device dependent variables
......
......@@ -27,10 +27,6 @@ typedef boost::intrusive_ptr< ImplFontCharMap > ImplFontCharMapPtr;
class ImplFontMetric
{
friend class FontMetric;
friend void intrusive_ptr_add_ref(ImplFontMetric* pImplFontMetric);
friend void intrusive_ptr_release(ImplFontMetric* pImplFontMetric);
public:
explicit ImplFontMetric();
......@@ -61,6 +57,10 @@ public:
bool operator==( const ImplFontMetric& ) const;
private:
friend class FontMetric;
friend void intrusive_ptr_add_ref(ImplFontMetric* pImplFontMetric);
friend void intrusive_ptr_release(ImplFontMetric* pImplFontMetric);
long mnAscent; // Ascent
long mnDescent; // Descent
long mnIntLeading; // Internal Leading
......
......@@ -58,10 +58,19 @@
#include <memory>
#include <algorithm>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::rtl;
using namespace ::utl;
FontAttributes::FontAttributes()
: meWeight( WEIGHT_DONTKNOW ),
mePitch( PITCH_DONTKNOW ),
meWidthType ( WIDTH_DONTKNOW ),
meItalic ( ITALIC_NONE ),
mbSymbolFlag( false ),
mnQuality( 0 ),
mbOrientation( false ),
mbDevice( false ),
mbSubsettable( false ),
mbEmbeddable ( false )
{}
bool FontAttributes::CompareDeviceIndependentFontAttributes(const FontAttributes& rOther) const
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment