Kaydet (Commit) 7f3ac23f authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

Resolves: #i123895# split impfont.cxx source from metric.cxx

and move the helper function UpdateAttributesFromPSName() there to
make it available for all platforms, not only ATSUI-based ones.

(cherry picked from commit a3895516)

Conflicts:
	include/vcl/metric.hxx
	vcl/aqua/source/gdi/salatsuifontutils.cxx
	vcl/inc/impfont.hxx
	vcl/source/gdi/metric.cxx

Change-Id: I6d5702d429673c83740cb72775014f8942e5f44d
üst 01af0570
......@@ -89,18 +89,18 @@ public:
FontCharMap();
~FontCharMap();
sal_Bool IsDefaultMap() const;
sal_Bool HasChar( sal_uInt32 ) const;
int CountCharsInRange( sal_uInt32 cMin, sal_uInt32 cMax ) const;
int GetCharCount() const;
bool IsDefaultMap( void ) const;
bool HasChar( sal_UCS4 ) const;
int CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const;
int GetCharCount( void ) const;
sal_uInt32 GetFirstChar() const;
sal_UCS4 GetFirstChar() const;
sal_uInt32 GetNextChar( sal_uInt32 ) const;
sal_uInt32 GetPrevChar( sal_uInt32 ) const;
sal_UCS4 GetNextChar( sal_UCS4 ) const;
sal_UCS4 GetPrevChar( sal_UCS4 ) const;
int GetIndexFromChar( sal_uInt32 ) const;
sal_uInt32 GetCharFromIndex( int ) const;
int GetIndexFromChar( sal_UCS4 ) const;
sal_UCS4 GetCharFromIndex( int ) const;
private:
......
......@@ -216,6 +216,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/gdi/imagerepository \
vcl/source/gdi/impanmvw \
vcl/source/gdi/impbmp \
vcl/source/gdi/impfont \
vcl/source/gdi/impgraph \
vcl/source/gdi/impimage \
vcl/source/gdi/impimagetree \
......
This diff is collapsed.
This diff is collapsed.
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