diff -r f58d6ec98e88 -r b700e12870ca aknlayoutcompiler/src/MLAttributesParse.cpp --- a/aknlayoutcompiler/src/MLAttributesParse.cpp Thu Dec 17 09:14:18 2009 +0200 +++ b/aknlayoutcompiler/src/MLAttributesParse.cpp Mon Jan 18 21:13:05 2010 +0200 @@ -25,7 +25,7 @@ #include "MLAttributesParse.h" #include "MLCompDataParse.h" // for converting zoom strings -#include // for logical font ids +#include // for logical font ids #include #include @@ -140,7 +140,7 @@ auto_ptr TMLAttributesParse::Parse(const string& aLayName) { auto_ptr layout(new TMLAttributesParse); - int pos=0; + string layName = aLayName; if (layName.size() >= 2 && layName.substr(0,2) == "-m") @@ -210,15 +210,15 @@ void TLayoutAttributesSaxParser::Parse(const std::string& aFileName) { - SAX::basic_InputSource is(aFileName); - SAX::XMLReader parser; + Arabica::SAX::InputSource is(aFileName); + Arabica::SAX::XMLReader parser; parser.setContentHandler(*this); parser.setErrorHandler(*this); parser.parse(is); } void TLayoutAttributesSaxParser::startElement(const std::string& /*namespaceURI*/, const std::string& localName, - const std::string& /*qName*/, const SAX::basic_Attributes& atts) + const std::string& /*qName*/, const Arabica::SAX::Attributes& atts) { MSaxLayoutAttributesHandler* handler = iStack.top(); if (!handler)