1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
--- misc/libvisio-0.0.9/src/lib/VSDXStyles.cpp 2011-10-22 15:25:55.000000000 +0200
+++ misc/build/libvisio-0.0.9/src/lib/VSDXStyles.cpp 2011-10-23 03:18:45.209282989 +0200
@@ -37,8 +37,151 @@
{
}
+libvisio::VSDXStyles::VSDXStyles(const libvisio::VSDXStyles &styles) :
+ m_lineStyles(), m_fillStyles(), m_textBlockStyles(), m_charStyles(), m_paraStyles(),
+ m_lineStyleMasters(styles.m_lineStyleMasters), m_fillStyleMasters(styles.m_fillStyleMasters),
+ m_textStyleMasters(styles.m_textStyleMasters)
+{
+ for (std::map<unsigned, VSDXFillStyle *>::const_iterator iterFillStyle = styles.m_fillStyles.begin();
+ iterFillStyle != styles.m_fillStyles.end(); iterFillStyle++)
+ {
+ if (iterFillStyle->second)
+ m_fillStyles[iterFillStyle->first] = new VSDXFillStyle(*(iterFillStyle->second));
+ }
+ for (std::map<unsigned, VSDXLineStyle *>::const_iterator iterLineStyle = styles.m_lineStyles.begin();
+ iterLineStyle != styles.m_lineStyles.end(); iterLineStyle++)
+ {
+ if (iterLineStyle->second)
+ m_lineStyles[iterLineStyle->first] = new VSDXLineStyle(*(iterLineStyle->second));
+ }
+ for (std::map<unsigned, VSDXTextBlockStyle *>::const_iterator iterTextBlockStyle = styles.m_textBlockStyles.begin();
+ iterTextBlockStyle != styles.m_textBlockStyles.end(); iterTextBlockStyle++)
+ {
+ if (iterTextBlockStyle->second)
+ m_textBlockStyles[iterTextBlockStyle->first] = new VSDXTextBlockStyle(*(iterTextBlockStyle->second));
+ }
+ for (std::map<unsigned, VSDXCharStyle *>::const_iterator iterCharStyle = styles.m_charStyles.begin();
+ iterCharStyle != styles.m_charStyles.end(); iterCharStyle++)
+ {
+ if (iterCharStyle->second)
+ m_charStyles[iterCharStyle->first] = new VSDXCharStyle(*(iterCharStyle->second));
+ }
+ for (std::map<unsigned, VSDXParaStyle *>::const_iterator iterParaStyle = styles.m_paraStyles.begin();
+ iterParaStyle != styles.m_paraStyles.end(); iterParaStyle++)
+ {
+ if (iterParaStyle->second)
+ m_paraStyles[iterParaStyle->first] = new VSDXParaStyle(*(iterParaStyle->second));
+ }
+}
+
libvisio::VSDXStyles::~VSDXStyles()
{
+ for (std::map<unsigned, VSDXFillStyle *>::iterator iterFillStyle = m_fillStyles.begin();
+ iterFillStyle != m_fillStyles.end(); iterFillStyle++)
+ {
+ if (iterFillStyle->second)
+ delete iterFillStyle->second;
+ }
+ for (std::map<unsigned, VSDXLineStyle *>::iterator iterLineStyle = m_lineStyles.begin();
+ iterLineStyle != m_lineStyles.end(); iterLineStyle++)
+ {
+ if (iterLineStyle->second)
+ delete iterLineStyle->second;
+ }
+ for (std::map<unsigned, VSDXTextBlockStyle *>::iterator iterTextBlockStyle = m_textBlockStyles.begin();
+ iterTextBlockStyle != m_textBlockStyles.end(); iterTextBlockStyle++)
+ {
+ if (iterTextBlockStyle->second)
+ delete (iterTextBlockStyle->second);
+ }
+ for (std::map<unsigned, VSDXCharStyle *>::iterator iterCharStyle = m_charStyles.begin();
+ iterCharStyle != m_charStyles.end(); iterCharStyle++)
+ {
+ if (iterCharStyle->second)
+ delete (iterCharStyle->second);
+ }
+ for (std::map<unsigned, VSDXParaStyle *>::iterator iterParaStyle = m_paraStyles.begin();
+ iterParaStyle != m_paraStyles.end(); iterParaStyle++)
+ {
+ if (iterParaStyle->second)
+ delete iterParaStyle->second;
+ }
+}
+
+libvisio::VSDXStyles & libvisio::VSDXStyles::operator=(const libvisio::VSDXStyles &styles)
+{
+ for (std::map<unsigned, VSDXFillStyle *>::iterator iterFillStyle = m_fillStyles.begin();
+ iterFillStyle != m_fillStyles.end(); iterFillStyle++)
+ {
+ if (iterFillStyle->second)
+ delete iterFillStyle->second;
+ }
+ m_fillStyles.clear();
+ for (std::map<unsigned, VSDXLineStyle *>::iterator iterLineStyle = m_lineStyles.begin();
+ iterLineStyle != m_lineStyles.end(); iterLineStyle++)
+ {
+ if (iterLineStyle->second)
+ delete iterLineStyle->second;
+ }
+ m_lineStyles.clear();
+ for (std::map<unsigned, VSDXTextBlockStyle *>::iterator iterTextBlockStyle = m_textBlockStyles.begin();
+ iterTextBlockStyle != m_textBlockStyles.end(); iterTextBlockStyle++)
+ {
+ if (iterTextBlockStyle->second)
+ delete (iterTextBlockStyle->second);
+ }
+ m_textBlockStyles.clear();
+ for (std::map<unsigned, VSDXCharStyle *>::iterator iterCharStyle = m_charStyles.begin();
+ iterCharStyle != m_charStyles.end(); iterCharStyle++)
+ {
+ if (iterCharStyle->second)
+ delete (iterCharStyle->second);
+ }
+ m_charStyles.clear();
+ for (std::map<unsigned, VSDXParaStyle *>::iterator iterParaStyle = m_paraStyles.begin();
+ iterParaStyle != m_paraStyles.end(); iterParaStyle++)
+ {
+ if (iterParaStyle->second)
+ delete iterParaStyle->second;
+ }
+ m_paraStyles.clear();
+
+ for (std::map<unsigned, VSDXFillStyle *>::const_iterator iterFillStyle = styles.m_fillStyles.begin();
+ iterFillStyle != styles.m_fillStyles.end(); iterFillStyle++)
+ {
+ if (iterFillStyle->second)
+ m_fillStyles[iterFillStyle->first] = new VSDXFillStyle(*(iterFillStyle->second));
+ }
+ for (std::map<unsigned, VSDXLineStyle *>::const_iterator iterLineStyle = styles.m_lineStyles.begin();
+ iterLineStyle != styles.m_lineStyles.end(); iterLineStyle++)
+ {
+ if (iterLineStyle->second)
+ m_lineStyles[iterLineStyle->first] = new VSDXLineStyle(*(iterLineStyle->second));
+ }
+ for (std::map<unsigned, VSDXTextBlockStyle *>::const_iterator iterTextBlockStyle = styles.m_textBlockStyles.begin();
+ iterTextBlockStyle != styles.m_textBlockStyles.end(); iterTextBlockStyle++)
+ {
+ if (iterTextBlockStyle->second)
+ m_textBlockStyles[iterTextBlockStyle->first] = new VSDXTextBlockStyle(*(iterTextBlockStyle->second));
+ }
+ for (std::map<unsigned, VSDXCharStyle *>::const_iterator iterCharStyle = styles.m_charStyles.begin();
+ iterCharStyle != styles.m_charStyles.end(); iterCharStyle++)
+ {
+ if (iterCharStyle->second)
+ m_charStyles[iterCharStyle->first] = new VSDXCharStyle(*(iterCharStyle->second));
+ }
+ for (std::map<unsigned, VSDXParaStyle *>::const_iterator iterParaStyle = styles.m_paraStyles.begin();
+ iterParaStyle != styles.m_paraStyles.end(); iterParaStyle++)
+ {
+ if (iterParaStyle->second)
+ m_paraStyles[iterParaStyle->first] = new VSDXParaStyle(*(iterParaStyle->second));
+ }
+
+ m_lineStyleMasters = styles.m_lineStyleMasters;
+ m_fillStyleMasters = styles.m_fillStyleMasters;
+ m_textStyleMasters = styles.m_textStyleMasters;
+
+ return *this;
}
void libvisio::VSDXStyles::addLineStyle(unsigned lineStyleIndex, VSDXLineStyle *lineStyle)
--- misc/libvisio-0.0.9/src/lib/VSDXStyles.h 2011-10-21 17:53:42.000000000 +0200
+++ misc/build/libvisio-0.0.9/src/lib/VSDXStyles.h 2011-10-23 03:18:45.209282989 +0200
@@ -119,6 +119,7 @@
superscript(super),
subscript(sub),
face(f) {}
+ ~VSDXCharStyle() {}
unsigned charCount;
unsigned short faceID;
Colour colour;
@@ -158,6 +159,7 @@
spBefore(sb),
spAfter(sa),
align(a) {}
+ ~VSDXParaStyle() {}
unsigned charCount;
double indFirst;
double indLeft;
@@ -190,6 +192,7 @@
textBkgndColour(bgClr),
defaultTabStop(defTab),
textDirection(td) {}
+ ~VSDXTextBlockStyle() {}
double leftMargin;
double rightMargin;
double topMargin;
@@ -205,7 +208,9 @@
{
public:
VSDXStyles();
+ VSDXStyles(const VSDXStyles &styles);
~VSDXStyles();
+ VSDXStyles &operator=(const VSDXStyles &styles);
void addLineStyle(unsigned lineStyleIndex, VSDXLineStyle *lineStyle);
void addFillStyle(unsigned fillStyleIndex, VSDXFillStyle *fillStyle);
void addTextBlockStyle(unsigned textStyleIndex, VSDXTextBlockStyle *textBlockStyle);
|
