Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 21377 → Rev 21378

/trunk/Scribus/scribus/fonts/scface.h
131,7 → 131,7
gid_type maxGlyph;
 
ScFaceData();
virtual ~ScFaceData() { };
virtual ~ScFaceData() { }
protected:
 
friend class ScFace;
/trunk/Scribus/scribus/styles/charstyle.h
98,7 → 98,7
#include "charstyle.attrdefs.cxx"
#undef ATTRDEF
m_isDefaultStyle=false;
};
}
CharStyle(const ScFace& font, int size, StyleFlag style = ScStyle_Default) : Style() {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
110,7 → 110,7
setFont(font);
setFontSize(size);
setEffects(style);
};
}
CharStyle(const CharStyle & other);