diff options
| author | Sebastian Wüst <sebi@timewaster.de> | 2013-10-20 15:32:08 +0000 |
|---|---|---|
| committer | Sebastian Wüst <sebi@timewaster.de> | 2013-10-20 15:32:08 +0000 |
| commit | 82908f949129e1fcbf62002799ee7b1b77986eed (patch) | |
| tree | c02098dd7720cdf424f2793ecd3ddac2ea86b969 /src/dom/cssreader.cpp | |
| parent | changed text (diff) | |
| parent | Fix build errors with clang 3.3 and c++11 enabled. (diff) | |
| download | inkscape-82908f949129e1fcbf62002799ee7b1b77986eed.tar.gz inkscape-82908f949129e1fcbf62002799ee7b1b77986eed.zip | |
merge from trunk
(bzr r12417.1.24)
Diffstat (limited to 'src/dom/cssreader.cpp')
| -rw-r--r-- | src/dom/cssreader.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/dom/cssreader.cpp b/src/dom/cssreader.cpp index db114ed8d..93473b229 100644 --- a/src/dom/cssreader.cpp +++ b/src/dom/cssreader.cpp @@ -393,7 +393,6 @@ int CssReader::getStyleSheet(int p0) { int p = p0; int p2 = p; - XMLCh ch; //# CHARSET 0 or 1 if (match(p, "@charset")) @@ -408,7 +407,7 @@ int CssReader::getStyleSheet(int p0) return -1; } p = skipwhite(p2); - ch = get(p); + XMLCh ch = get(p); if (ch !=';') { error("';' required after @charset declaration"); @@ -665,7 +664,7 @@ int CssReader::getPage(int p0) while (true) { p = skipwhite(p2); - ch = get(p); + XMLCh ch = get(p); if (ch != ';') break; p++; @@ -1249,7 +1248,7 @@ int CssReader::getTerm(int p0) { int p = p0; p = skipwhite(p); - int unitType = CSSPrimitiveValue::CSS_UNKNOWN; + int unitType = CSSPrimitiveValue::CSS_UNKNOWN; /// \fixme Why is this variable never used? //# Unary operator XMLCh ch = get(p); bool hasUnary = false; |