diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2011-11-22 16:19:04 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2011-11-22 16:19:04 +0000 |
| commit | 4bff1c9162c4640f84bbb256802b01bb23b3da7b (patch) | |
| tree | 7981bb16846f7fc494fe847381f9dc94c78456a6 /src | |
| parent | Extensions. Fix for bug #887539 (Permissions and #! in extension scripts need... (diff) | |
| download | inkscape-4bff1c9162c4640f84bbb256802b01bb23b3da7b.tar.gz inkscape-4bff1c9162c4640f84bbb256802b01bb23b3da7b.zip | |
initialisation
(bzr r10748)
Diffstat (limited to 'src')
| -rw-r--r-- | src/dom/css.h | 19 | ||||
| -rw-r--r-- | src/dom/cssreader.h | 12 |
2 files changed, 22 insertions, 9 deletions
diff --git a/src/dom/css.h b/src/dom/css.h index 3f0af9ad0..d9c124447 100644 --- a/src/dom/css.h +++ b/src/dom/css.h @@ -1612,23 +1612,34 @@ public: /** * */ - CSSPrimitiveValue() : CSSValue() + CSSPrimitiveValue() : + CSSValue(), + primitiveType(0), + doubleValue(0), + stringValue() { } /** * */ - CSSPrimitiveValue(const CSSPrimitiveValue &other) : CSSValue(other) + CSSPrimitiveValue(const CSSPrimitiveValue &other) : + CSSValue() { + primitiveType = other.primitiveType; + doubleValue = other.doubleValue; + stringValue = other.stringValue; } /** * */ - CSSPrimitiveValue &operator=(const CSSPrimitiveValue &/*other*/) + CSSPrimitiveValue &operator=(const CSSPrimitiveValue &other) { - return *this; + primitiveType = other.primitiveType; + doubleValue = other.doubleValue; + stringValue = other.stringValue; + return *this; } /** diff --git a/src/dom/cssreader.h b/src/dom/cssreader.h index 0a9a7c031..8f795fc9c 100644 --- a/src/dom/cssreader.h +++ b/src/dom/cssreader.h @@ -53,7 +53,11 @@ public: /** * */ - CssReader() + CssReader() : + stylesheet(), + parsebuf(), + parselen(0), + lastPosition(0) {} /** @@ -75,9 +79,10 @@ public: private: + CSSStyleSheet stylesheet; DOMString parsebuf; long parselen; - CSSStyleSheet stylesheet; + int lastPosition; /** @@ -262,9 +267,6 @@ int getFunction(int p0); */ int getHexColor(int p0); - -int lastPosition; - /** * Get the column and row number of the given character position. * Also gets the last-occuring newline before the position |
