summaryrefslogtreecommitdiffstats
path: root/src/dom/cssreader.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
committerMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
commit8756c49b91fd4262b6770ac3b2f229209bdae96b (patch)
tree67ac89d7bc7c69e04e811324734dccafc07f33c9 /src/dom/cssreader.cpp
parentMerged from trunk (r12465). (diff)
parentMerge emf/wmf work (diff)
downloadinkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.tar.gz
inkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.zip
Merged from trunk (r12488).
(bzr r11608.1.120)
Diffstat (limited to 'src/dom/cssreader.cpp')
-rw-r--r--src/dom/cssreader.cpp7
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;