diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-07 09:05:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-12 11:56:45 +0200 |
| commit | 869823461007c8711181470c11ca713dbbd82211 (patch) | |
| tree | c8ee768a1acb91330ecb997a3451bc2efea18e75 /vcl/inc | |
| parent | c7b5b5a85d1647709e2a85f33cfccfd4ae35745f (diff) | |
convert vcl/inc/outfont.hxx from String to OUString
Change-Id: I6b9b5f0cd51412ad14f1a07f2ad3a03bd17bb5d3
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/outfont.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index f48d68f7483d..0da8ca72ab34 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -95,7 +95,7 @@ private: class ImplDevFontAttributes : public ImplFontAttributes { public: // TODO: create matching interface class - const String& GetAliasNames() const { return maMapNames; } + const OUString& GetAliasNames() const { return maMapNames; } int GetQuality() const { return mnQuality; } bool IsRotatable() const { return mbOrientation; } bool IsDeviceFont() const { return mbDevice; } @@ -103,7 +103,7 @@ public: // TODO: create matching interface class bool IsSubsettable() const { return mbSubsettable; } public: // TODO: hide members behind accessor methods - String maMapNames; // List of family name aliass separated with ';' + OUString maMapNames; // List of family name aliass separated with ';' int mnQuality; // Quality (used when similar fonts compete) bool mbOrientation; // true: physical font can be rotated bool mbDevice; // true: built in font @@ -159,7 +159,7 @@ friend class ImplDevFontListData; class FontSelectPatternAttributes : public ImplFontAttributes { public: - FontSelectPatternAttributes( const Font&, const String& rSearchName, + FontSelectPatternAttributes( const Font&, const OUString& rSearchName, const Size&, float fExactHeight ); FontSelectPatternAttributes( const PhysicalFontFace&, const Size&, float fExactHeight, int nOrientation, bool bVertical ); @@ -189,7 +189,7 @@ public: class FontSelectPattern : public FontSelectPatternAttributes { public: - FontSelectPattern( const Font&, const String& rSearchName, + FontSelectPattern( const Font&, const OUString& rSearchName, const Size&, float fExactHeight ); #ifdef WNT // ifdeffed to prevent it going into unusedcode.easy @@ -216,7 +216,7 @@ private: mutable bool mbMatchData; // true if matching attributes are initialized bool mbMapNames; // true if MapNames are available - typedef boost::unordered_map<const String, ImplDevFontListData*,FontNameHash> DevFontList; + typedef boost::unordered_map<const OUString, ImplDevFontListData*,FontNameHash> DevFontList; DevFontList maDevFontList; ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution @@ -232,7 +232,7 @@ public: int Count() const { return maDevFontList.size(); } // find the device font - ImplDevFontListData* FindFontFamily( const String& rFontName ) const; + ImplDevFontListData* FindFontFamily( const OUString& rFontName ) const; ImplDevFontListData* ImplFindByFont( FontSelectPattern&, bool bPrinter, ImplDirectFontSubstitution* ) const; ImplDevFontListData* ImplFindBySearchName( const OUString& ) const; @@ -247,7 +247,7 @@ public: // misc utilities ImplDevFontList* Clone( bool bScalable, bool bEmbeddable ) const; ImplGetDevFontList* GetDevFontList() const; - ImplGetDevSizeList* GetDevSizeList( const String& rFontName ) const; + ImplGetDevSizeList* GetDevSizeList( const OUString& rFontName ) const; ImplDevFontListData* ImplFindByTokenNames(const OUString& rTokenStr) const; |