diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-01-02 16:42:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-02 20:45:00 +0000 |
| commit | 7f3ac23fad1f2a10c033b59ac2f14934b528b2ea (patch) | |
| tree | 0b68e835555a0e117cfb91fb825b2e92caa44df5 /include/vcl | |
| parent | 01af057083321e00cd9a44e9b309099c3b55b276 (diff) | |
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 a3895516f02a80151caaac8b92fb50aa5f7ee93b)
Conflicts:
include/vcl/metric.hxx
vcl/aqua/source/gdi/salatsuifontutils.cxx
vcl/inc/impfont.hxx
vcl/source/gdi/metric.cxx
Change-Id: I6d5702d429673c83740cb72775014f8942e5f44d
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/metric.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index 9b6efe67c0c4..b557c2518929 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -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: |