Kaydet (Commit) d7802365 authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) Andras Timar

Work around const-ness issues in the GooString API

cf. <https://gerrit.libreoffice.org/#/c/16357> "Revert the removal of cast to
build on old poppler"

Change-Id: I75184cec64b4f32e0cf9adedeb84c8591be4fc73
(cherry picked from commit b51ba9e3)
Reviewed-on: https://gerrit.libreoffice.org/16643Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 231f5f10
...@@ -103,13 +103,13 @@ namespace pdfi ...@@ -103,13 +103,13 @@ namespace pdfi
isUnderline(rSrc.isUnderline), isUnderline(rSrc.isUnderline),
size(rSrc.size) size(rSrc.size)
{ {
familyName.append(const_cast<GooString*>(&rSrc.familyName)); familyName.append(&rSrc.getFamilyName());
} }
FontAttributes& operator=( const FontAttributes& rSrc ) FontAttributes& operator=( const FontAttributes& rSrc )
{ {
familyName.clear(); familyName.clear();
familyName.append(const_cast<GooString*>(&rSrc.familyName)); familyName.append(&rSrc.getFamilyName());
isEmbedded = rSrc.isEmbedded; isEmbedded = rSrc.isEmbedded;
isBold = rSrc.isBold; isBold = rSrc.isBold;
...@@ -122,8 +122,7 @@ namespace pdfi ...@@ -122,8 +122,7 @@ namespace pdfi
bool operator==(const FontAttributes& rFont) const bool operator==(const FontAttributes& rFont) const
{ {
return familyName.cmp( return getFamilyName().cmp(&rFont.getFamilyName())==0 &&
const_cast<GooString*>(&rFont.familyName))==0 &&
isEmbedded == rFont.isEmbedded && isEmbedded == rFont.isEmbedded &&
isBold == rFont.isBold && isBold == rFont.isBold &&
isItalic == rFont.isItalic && isItalic == rFont.isItalic &&
...@@ -137,6 +136,11 @@ namespace pdfi ...@@ -137,6 +136,11 @@ namespace pdfi
bool isItalic; bool isItalic;
bool isUnderline; bool isUnderline;
double size; double size;
private:
// Work around const-ness issues in the GooString API:
GooString & getFamilyName() const
{ return const_cast<GooString &>(familyName); }
}; };
class PDFOutDev : public OutputDev class PDFOutDev : public OutputDev
......
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