diff options
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 7ef4f8be8779..f8880b937456 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -615,7 +615,7 @@ boost::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const return mpFontOptions; } -const OString* ServerFont::GetFontFileName() const +const OString& ServerFont::GetFontFileName() const { return mpFontInfo->GetFontFileName(); } diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index 7babff34e085..b43d47b39397 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -41,7 +41,7 @@ public: const unsigned char* GetBuffer() const { return mpFileMap; } int GetFileSize() const { return mnFileSize; } - const OString* GetFileName() const { return &maNativeFileName; } + const OString& GetFileName() const { return maNativeFileName; } int GetLangBoost() const { return mnLangBoost; } private: @@ -71,7 +71,7 @@ public: #endif void ReleaseFaceFT(); - const OString* GetFontFileName() const { return mpFontFile->GetFileName(); } + const OString& GetFontFileName() const { return mpFontFile->GetFileName(); } int GetFaceNum() const { return mnFaceNum; } int GetSynthetic() const { return mnSynthetic; } sal_IntPtr GetFontId() const { return mnFontId; } |