mirror of
https://github.com/tfussell/xlnt.git
synced 2024-03-22 13:11:17 +08:00
specify enum class type differently for msvc build
This commit is contained in:
parent
c55aac9ecf
commit
eff00f9540
|
@ -169,7 +169,7 @@ private:
|
|||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
enum target_mode mode_;
|
||||
xlnt::target_mode mode_;
|
||||
};
|
||||
|
||||
} // namespace xlnt
|
||||
|
|
|
@ -50,7 +50,7 @@ public:
|
|||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
void page_break(enum page_break b);
|
||||
void page_break(xlnt::page_break b);
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
|
@ -60,7 +60,7 @@ public:
|
|||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
void sheet_state(enum sheet_state sheet_state);
|
||||
void sheet_state(xlnt::sheet_state sheet_state);
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
|
@ -70,7 +70,7 @@ public:
|
|||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
void paper_size(enum paper_size paper_size);
|
||||
void paper_size(xlnt::paper_size paper_size);
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
|
@ -80,7 +80,7 @@ public:
|
|||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
void orientation(enum orientation orientation);
|
||||
void orientation(xlnt::orientation orientation);
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
|
@ -146,22 +146,22 @@ private:
|
|||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
enum page_break break_;
|
||||
xlnt::page_break break_;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
enum sheet_state sheet_state_;
|
||||
xlnt::sheet_state sheet_state_;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
enum paper_size paper_size_;
|
||||
xlnt::paper_size paper_size_;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
enum orientation orientation_;
|
||||
xlnt::orientation orientation_;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
|
|
|
@ -625,7 +625,7 @@ public:
|
|||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
void sheet_state(enum sheet_state state);
|
||||
void sheet_state(xlnt::sheet_state state);
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
|
|
|
@ -30,7 +30,7 @@ relationship::relationship()
|
|||
{
|
||||
}
|
||||
|
||||
relationship::relationship(const std::string &id, relationship_type t, const uri &source, const uri &target, enum target_mode mode)
|
||||
relationship::relationship(const std::string &id, relationship_type t, const uri &source, const uri &target, xlnt::target_mode mode)
|
||||
: id_(id),
|
||||
type_(t),
|
||||
source_(source),
|
||||
|
|
|
@ -1012,8 +1012,11 @@ void swap(workbook &left, workbook &right)
|
|||
ws.parent(left);
|
||||
}
|
||||
|
||||
if (left.d_->stylesheet_.is_set())
|
||||
{
|
||||
left.d_->stylesheet_->parent = &left;
|
||||
}
|
||||
}
|
||||
|
||||
if (right.d_ != nullptr)
|
||||
{
|
||||
|
@ -1022,9 +1025,12 @@ void swap(workbook &left, workbook &right)
|
|||
ws.parent(right);
|
||||
}
|
||||
|
||||
if (left.d_->stylesheet_.is_set())
|
||||
{
|
||||
right.d_->stylesheet_->parent = &right;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
workbook &workbook::operator=(workbook other)
|
||||
{
|
||||
|
|
|
@ -44,7 +44,7 @@ page_break page_setup::page_break() const
|
|||
return break_;
|
||||
}
|
||||
|
||||
void page_setup::page_break(enum page_break b)
|
||||
void page_setup::page_break(xlnt::page_break b)
|
||||
{
|
||||
break_ = b;
|
||||
}
|
||||
|
@ -54,7 +54,7 @@ sheet_state page_setup::sheet_state() const
|
|||
return sheet_state_;
|
||||
}
|
||||
|
||||
void page_setup::sheet_state(enum sheet_state sheet_state)
|
||||
void page_setup::sheet_state(xlnt::sheet_state sheet_state)
|
||||
{
|
||||
sheet_state_ = sheet_state;
|
||||
}
|
||||
|
@ -64,7 +64,7 @@ paper_size page_setup::paper_size() const
|
|||
return paper_size_;
|
||||
}
|
||||
|
||||
void page_setup::paper_size(enum paper_size paper_size)
|
||||
void page_setup::paper_size(xlnt::paper_size paper_size)
|
||||
{
|
||||
paper_size_ = paper_size;
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ orientation page_setup::orientation() const
|
|||
return orientation_;
|
||||
}
|
||||
|
||||
void page_setup::orientation(enum orientation orientation)
|
||||
void page_setup::orientation(xlnt::orientation orientation)
|
||||
{
|
||||
orientation_ = orientation;
|
||||
}
|
||||
|
|
|
@ -926,7 +926,7 @@ cell_reference worksheet::point_pos(const std::pair<int, int> &point) const
|
|||
return point_pos(point.first, point.second);
|
||||
}
|
||||
|
||||
void worksheet::sheet_state(enum sheet_state state)
|
||||
void worksheet::sheet_state(xlnt::sheet_state state)
|
||||
{
|
||||
page_setup().sheet_state(state);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user