Commit 406c290b authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent 5ae4d7f8
...@@ -36,19 +36,21 @@ ...@@ -36,19 +36,21 @@
namespace XLS namespace XLS
{ {
struct _sxAddl
{
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {}
std::vector<_sxAddl>* prev = NULL;
int level = 0;
std::vector<BaseObjectPtr> elements;
std::vector<_sxAddl> levels;
};
class PIVOTADDL: public CompositeObject class PIVOTADDL: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTADDL) struct _sxAddl
{
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {}
std::vector<_sxAddl>* prev = NULL;
int level = 0;
std::vector<BaseObjectPtr> elements;
std::vector<_sxAddl> levels;
};
BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTADDL)
public: public:
PIVOTADDL(); PIVOTADDL();
~PIVOTADDL(); ~PIVOTADDL();
......
...@@ -35,20 +35,19 @@ ...@@ -35,20 +35,19 @@
namespace XLS namespace XLS
{ {
class SXADDLCACHE: public CompositeObject
struct _sxAddl
{ {
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {} struct _sxAddl
{
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {}
std::vector<_sxAddl>* prev = NULL; std::vector<_sxAddl>* prev = NULL;
int level = 0; int level = 0;
std::vector<BaseObjectPtr> elements; std::vector<BaseObjectPtr> elements;
std::vector<_sxAddl> levels; std::vector<_sxAddl> levels;
}; };
class SXADDLCACHE: public CompositeObject BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCACHE)
{
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCACHE)
public: public:
SXADDLCACHE(); SXADDLCACHE();
~SXADDLCACHE(); ~SXADDLCACHE();
......
...@@ -36,19 +36,19 @@ ...@@ -36,19 +36,19 @@
namespace XLS namespace XLS
{ {
struct _sxAddl class SXADDLQSI: public CompositeObject
{ {
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {} struct _sxAddl
{
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {}
std::vector<_sxAddl>* prev = NULL; std::vector<_sxAddl>* prev = NULL;
int level = 0; int level = 0;
std::vector<BaseObjectPtr> elements; std::vector<BaseObjectPtr> elements;
std::vector<_sxAddl> levels; std::vector<_sxAddl> levels;
}; };
class SXADDLQSI: public CompositeObject BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLQSI)
{
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLQSI)
public: public:
SXADDLQSI(); SXADDLQSI();
~SXADDLQSI(); ~SXADDLQSI();
......
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