missed some

This commit is contained in:
Thomas Fussell 2016-08-18 22:11:59 -04:00
parent c1ac0c790a
commit 300f694f04
4 changed files with 33 additions and 33 deletions

View File

@ -40,48 +40,48 @@ class XLNT_CLASS base_format
{
public:
// Alignment
xlnt::alignment &alignment();
const xlnt::alignment &alignment() const;
class alignment &alignment();
const class alignment &alignment() const;
void alignment(const xlnt::alignment &new_alignment, bool applied);
bool alignment_applied() const;
// Border
xlnt::border &border();
const xlnt::border &border() const;
class border &border();
const class border &border() const;
void border(const xlnt::border &new_border, bool applied);
bool border_applied() const;
// Fill
xlnt::fill &fill();
const xlnt::fill &fill() const;
class fill &fill();
const class fill &fill() const;
void fill(const xlnt::fill &new_fill, bool applied);
bool fill_applied() const;
// Font
xlnt::font &font();
const xlnt::font &font() const;
class font &font();
const class font &font() const;
void font(const xlnt::font &new_font, bool applied);
bool font_applied() const;
// Number Format
virtual xlnt::number_format &number_format();
virtual const xlnt::number_format &number_format() const;
virtual class number_format &number_format();
virtual const class number_format &number_format() const;
virtual void number_format(const xlnt::number_format &new_number_format, bool applied);
bool number_format_applied() const;
// Protection
xlnt::protection &protection();
const xlnt::protection &protection() const;
class protection &protection();
const class protection &protection() const;
void protection(const xlnt::protection &new_protection, bool applied);
bool protection_applied() const;
protected:
xlnt::alignment alignment_;
xlnt::border border_;
xlnt::fill fill_;
xlnt::font font_;
xlnt::number_format number_format_;
xlnt::protection protection_;
class alignment alignment_;
class border border_;
class fill fill_;
class font font_;
class number_format number_format_;
class protection protection_;
bool apply_alignment_ = false;
bool apply_border_ = false;

View File

@ -53,10 +53,10 @@ public:
bool has_style() const;
void style(const std::string &name);
void style(const xlnt::style &new_style);
const xlnt::style &style() const;
const class style &style() const;
xlnt::number_format &number_format() override;
const xlnt::number_format &number_format() const override;
class number_format &number_format() override;
const class number_format &number_format() const override;
void number_format(const xlnt::number_format &new_number_format, bool applied) override;
format &alignment_id(std::size_t id);

View File

@ -29,12 +29,12 @@ struct format_impl
std::size_t id;
optional<std::size_t> alignment;
optional<std::size_t> border;
optional<std::size_t> fill;
optional<std::size_t> font;
optional<std::size_t> number_format;
optional<std::size_t> protection;
optional<std::size_t> alignment_id;
optional<std::size_t> border_id;
optional<std::size_t> fill_id;
optional<std::size_t> font_id;
optional<std::size_t> number_format_id;
optional<std::size_t> protection_id;
optional<std::string> style;
};

View File

@ -31,12 +31,12 @@ struct style_impl
optional<std::size_t> builtin_id;
optional<std::size_t> outline_style;
optional<alignment> alignment;
optional<border> border;
optional<fill> fill;
optional<font> font;
optional<number_format> number_format;
optional<protection> protection;
optional<class alignment> alignment;
optional<class border> border;
optional<class fill> fill;
optional<class font> font;
optional<class number_format> number_format;
optional<class protection> protection;
};
} // namespace detail