diff options
| author | Christian Lippka <cl@openoffice.org> | 2010-12-01 10:58:22 +0100 |
|---|---|---|
| committer | Christian Lippka <cl@openoffice.org> | 2010-12-01 10:58:22 +0100 |
| commit | 9439eba6db26f27bb713168440d27fe51fbfadb8 (patch) | |
| tree | e12be13a5610dada674d75b36822fe50047c1f95 /vcl/aqua/inc/salgdi.h | |
| parent | fa4b286294a272b085c2f74e12581edc2343fc18 (diff) | |
| parent | 69777a477e6084a9cd49c92b25fa4dc35b41e49d (diff) | |
impressdefaults1: merge
Diffstat (limited to 'vcl/aqua/inc/salgdi.h')
| -rw-r--r-- | vcl/aqua/inc/salgdi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h index a3d6c2793aae..17c4aa7acd44 100644 --- a/vcl/aqua/inc/salgdi.h +++ b/vcl/aqua/inc/salgdi.h @@ -59,7 +59,7 @@ public: virtual ImplFontEntry* CreateFontInstance( ImplFontSelectData& ) const; virtual sal_IntPtr GetFontId() const; - ImplFontCharMap* GetImplFontCharMap() const; + const ImplFontCharMap* GetImplFontCharMap() const; bool HasChar( sal_uInt32 cChar ) const; void ReadOs2Table() const; @@ -68,7 +68,7 @@ public: private: const ATSUFontID mnFontId; - mutable ImplFontCharMap* mpCharMap; + mutable const ImplFontCharMap* mpCharMap; mutable bool mbOs2Read; // true if OS2-table related info is valid mutable bool mbHasOs2Table; mutable bool mbCmapEncodingRead; // true if cmap encoding of Mac font is read @@ -281,7 +281,7 @@ public: // return only PairCount if (pKernPairs == NULL) virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); // get the repertoire of the current font - virtual ImplFontCharMap* GetImplFontCharMap() const; + virtual const ImplFontCharMap* GetImplFontCharMap() const; // graphics must fill supplied font list virtual void GetDevFontList( ImplDevFontList* ); // graphics should call ImplAddDevFontSubstitute on supplied |