summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/PhysicalFontFace.hxx4
-rw-r--r--vcl/inc/generic/genpspgraphics.h4
-rw-r--r--vcl/inc/generic/glyphcache.hxx2
-rw-r--r--vcl/inc/outfont.hxx115
-rw-r--r--vcl/inc/quartz/salgdi.h4
-rw-r--r--vcl/inc/win/salgdi.h2
6 files changed, 66 insertions, 65 deletions
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index 7d0b43c0a43e..ce407125d979 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -63,7 +63,7 @@ public:
// Instead, the logical font names are mapped to physical fonts by
// the Java runtime environment.
-class VCL_PLUGIN_PUBLIC PhysicalFontFace : public ImplDevFontAttributes
+class VCL_PLUGIN_PUBLIC PhysicalFontFace : public ImplFontAttributes
{
public:
// by using an PhysicalFontFace object as a factory for its corresponding
@@ -85,7 +85,7 @@ public:
virtual PhysicalFontFace* Clone() const = 0;
protected:
- explicit PhysicalFontFace( const ImplDevFontAttributes&, int nMagic );
+ explicit PhysicalFontFace( const ImplFontAttributes&, int nMagic );
void SetBitmapSize( int nW, int nH ) { mnWidth=nW; mnHeight=nH; }
long mnWidth; // Width (in pixels)
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 4c01b88a128d..947f2cae1066 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -34,7 +34,7 @@ class PhysicalFontCollection;
namespace psp { struct JobData; class PrinterGfx; }
class ServerFont;
-class ImplDevFontAttributes;
+class ImplFontAttributes;
class SalInfoPrinter;
class GlyphCache;
@@ -69,7 +69,7 @@ public:
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
- static ImplDevFontAttributes Info2DevFontAttributes( const psp::FastPrintFontInfo& );
+ static ImplFontAttributes Info2FontAttributes( const psp::FastPrintFontInfo& );
static void AnnounceFonts( PhysicalFontCollection*,
const psp::FastPrintFontInfo& );
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index f1159545931c..9ebe7f7ccfe0 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -62,7 +62,7 @@ public:
void AddFontFile(
const OString& rNormalizedName,
int nFaceNum, sal_IntPtr nFontId,
- const ImplDevFontAttributes&);
+ const ImplFontAttributes&);
void AnnounceFonts( PhysicalFontCollection* ) const;
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 7c43986c62bd..70c285411ff6 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -44,81 +44,82 @@ class Size;
class ImplFontAttributes
{
public:
- const OUString& GetFamilyName() const { return maName; }
+ const OUString& GetFamilyName() const { return maFamilyName; }
+ FontFamily GetFamilyType() const { return meFamily; }
const OUString& GetStyleName() const { return maStyleName; }
+
FontWeight GetWeight() const { return meWeight; }
FontItalic GetSlant() const { return meItalic; }
- FontFamily GetFamilyType() const { return meFamily; }
FontPitch GetPitch() const { return mePitch; }
FontWidth GetWidthType() const { return meWidthType; }
+
bool IsSymbolFont() const { return mbSymbolFlag; }
- void SetFamilyName(const OUString& sFamilyName) { maName = sFamilyName; }
+
+ void SetFamilyName(const OUString& sFamilyName) { maFamilyName = sFamilyName; }
void SetStyleName( const OUString& sStyleName) { maStyleName = sStyleName; }
void SetFamilyType(const FontFamily eFontFamily) { meFamily = eFontFamily; }
+
void SetPitch(const FontPitch ePitch ) { mePitch = ePitch; }
void SetItalic(const FontItalic eItalic ) { meItalic = eItalic; }
void SetWeight(const FontWeight eWeight ) { meWeight = eWeight; }
void SetWidthType(const FontWidth eWidthType) { meWidthType = eWidthType; }
+
void SetSymbolFlag(const bool bSymbolFlag ) { mbSymbolFlag = bSymbolFlag; }
bool CompareDeviceIndependentFontAttributes(const ImplFontAttributes& rOther) const;
-private:
- OUString maName; // 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
- bool mbSymbolFlag;
-};
-
-// device dependent font properties
-
-class ImplDevFontAttributes : public ImplFontAttributes
-{
-public:
- int GetQuality() const { return mnQuality; }
- OUString GetMapNames() const { return maMapNames; }
-
- bool IsBuiltInFont() const { return mbDevice; }
- bool CanEmbed() const { return mbEmbeddable; }
- bool CanSubset() const { return mbSubsettable; }
- bool CanRotate() const { return mbOrientation; }
- bool HasMapNames() const { return (maMapNames.getLength() > 0); }
-
- void SetQuality( int nQuality ) { mnQuality = nQuality; }
- void IncreaseQualityBy( int nQualityAmount ) { mnQuality += nQualityAmount; }
- void DecreaseQualityBy( int nQualityAmount ) { mnQuality -= nQualityAmount; }
- void SetMapNames( OUString aMapNames ) { maMapNames = aMapNames; }
- void AddMapName( OUString aMapName )
- {
- if( maMapNames.getLength() > 0 )
- {
- maMapNames += ";";
- }
- else
- {
- SAL_WARN("vcl.fonts", "New map name is empty");
- return;
- }
-
- maMapNames += aMapName;
- }
-
- void SetBuiltInFontFlag( bool bIsBuiltInFont ) { mbDevice = bIsBuiltInFont; }
- void SetEmbeddableFlag ( bool bEmbeddable ) { mbEmbeddable = bEmbeddable; }
- void SetSubsettableFlag( bool bSubsettable ) { mbSubsettable = bSubsettable; }
- void SetOrientationFlag( bool bCanRotate ) { mbOrientation = bCanRotate; }
+ // Device dependent functions
+ int GetQuality() const { return mnQuality; }
+ OUString GetMapNames() const { return maMapNames; }
+
+ bool IsBuiltInFont() const { return mbDevice; }
+ bool CanEmbed() const { return mbEmbeddable; }
+ bool CanSubset() const { return mbSubsettable; }
+ bool CanRotate() const { return mbOrientation; }
+ bool HasMapNames() const { return (maMapNames.getLength() > 0); }
+
+ void SetQuality( int nQuality ) { mnQuality = nQuality; }
+ void IncreaseQualityBy( int nQualityAmount ) { mnQuality += nQualityAmount; }
+ void DecreaseQualityBy( int nQualityAmount ) { mnQuality -= nQualityAmount; }
+ void SetMapNames( OUString aMapNames ) { maMapNames = aMapNames; }
+ void AddMapName( OUString aMapName )
+ {
+ if( maMapNames.getLength() > 0 )
+ {
+ maMapNames += ";";
+ }
+ else
+ {
+ SAL_WARN("vcl.fonts", "New map name is empty");
+ return;
+ }
+
+ maMapNames += aMapName;
+ }
+
+ void SetBuiltInFontFlag( bool bIsBuiltInFont ) { mbDevice = bIsBuiltInFont; }
+ void SetEmbeddableFlag ( bool bEmbeddable ) { mbEmbeddable = bEmbeddable; }
+ void SetSubsettableFlag( bool bSubsettable ) { mbSubsettable = bSubsettable; }
+ void SetOrientationFlag( bool bCanRotate ) { mbOrientation = bCanRotate; }
private:
- OUString maMapNames; // List of family name aliases separated with ';'
- int mnQuality; // Quality (used when similar fonts compete)
- bool mbOrientation; // true: physical font can be rotated
- bool mbDevice; // true: built in font
- bool mbSubsettable; // true: a subset of the font can be created
- bool mbEmbeddable; // true: the font can be embedded
+ 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
+ bool mbSymbolFlag; // Is font a symbol?
+
+ // device dependent variables
+
+ OUString maMapNames; // List of family name aliases separated with ';'
+ int mnQuality; // Quality (used when similar fonts compete)
+ bool mbOrientation; // true: physical font can be rotated
+ bool mbDevice; // true: built in font
+ bool mbSubsettable; // true: a subset of the font can be created
+ bool mbEmbeddable; // true: the font can be embedded
};
class FontSelectPatternAttributes : public ImplFontAttributes
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 51fe8492a820..557e7d65c130 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -46,7 +46,7 @@
#include <unordered_map>
class AquaSalFrame;
-class ImplDevFontAttributes;
+class ImplFontAttributes;
class CoreTextStyle;
class XorEmulation;
@@ -57,7 +57,7 @@ typedef std::vector<unsigned char> ByteVector;
class CoreTextFontData : public PhysicalFontFace
{
public:
- CoreTextFontData( const ImplDevFontAttributes&, sal_IntPtr nFontID );
+ CoreTextFontData( const ImplFontAttributes&, sal_IntPtr nFontID );
virtual ~CoreTextFontData();
PhysicalFontFace* Clone() const override;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index e15d8aaef79e..7372c46c2f97 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -72,7 +72,7 @@ private:
class ImplWinFontData : public PhysicalFontFace
{
public:
- explicit ImplWinFontData( const ImplDevFontAttributes&,
+ explicit ImplWinFontData( const ImplFontAttributes&,
int nFontHeight, BYTE eWinCharSet,
BYTE nPitchAndFamily );
virtual ~ImplWinFontData();
generated by cgit (git 2.34.1) at 2024-08-06 04:11:33 +0000