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
|
--- branches/koffice/1.6/koffice/lib/kformula/textelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/textelement.h 2007/05/28 18:26:19 669186
@@ -75,7 +75,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
@@ -246,7 +246,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/symbolelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/symbolelement.h 2007/05/28 18:26:19 669186
@@ -67,7 +67,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/spaceelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/spaceelement.h 2007/05/28 18:26:19 669186
@@ -80,7 +80,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h 2007/05/28 18:26:19 669186
@@ -94,7 +94,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/rootelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/rootelement.h 2007/05/28 18:26:19 669186
@@ -68,7 +68,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
@@ -79,7 +79,7 @@
* We can use our parentPosition to get our own origin then.
*/
virtual void draw( QPainter& painter, const LuPixelRect& r,
- const ContextStyle& style,
+ const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style,
--- branches/koffice/1.6/koffice/lib/kformula/paddedelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/paddedelement.h 2007/05/28 18:26:19 669186
@@ -34,7 +34,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/matrixelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/matrixelement.h 2007/05/28 18:26:19 669186
@@ -82,7 +82,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
@@ -377,7 +377,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/indexelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/indexelement.h 2007/05/28 18:26:19 669186
@@ -79,7 +79,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/glyphelement.h 2007/05/28 18:20:51 669185
+++ branches/koffice/1.6/koffice/lib/kformula/glyphelement.h 2007/05/28 18:26:19 669186
@@ -33,7 +33,7 @@
* Calculates our width and height and
* our children's parentPosition.
*/
- virtual void calcSizes( const ContextStyle& style,
+ virtual void calcSizes( const ContextStyle& cstyle,
ContextStyle::TextStyle tstyle,
ContextStyle::IndexStyle istyle,
StyleAttributes& style );
|
GitWeb