diff -r 39aa64b24375 -r d42881c25fb6 xml.cpp --- a/xml.cpp Mon Oct 30 12:39:37 2006 +0000 +++ b/xml.cpp Thu Nov 16 10:07:11 2006 +0000 @@ -74,7 +74,8 @@ mc->setVersion(atts.value( "version" )); } - if (loadMode==NewMap) + if (loadMode==NewMap || + (loadMode==ImportReplace && me->getSelection()==mc)) { if (!atts.value( "author").isEmpty() ) { @@ -92,37 +93,27 @@ if (!atts.value( "linkColorHint").isEmpty() ) { if (atts.value("linkColorHint")=="HeadingColor") - me->setLinkColorHint(HeadingColor); + me->setMapLinkColorHint(HeadingColor); else - me->setLinkColorHint(DefaultColor); + me->setMapLinkColorHint(DefaultColor); } if (!atts.value( "linkStyle").isEmpty() ) { - QString s=atts.value("linkStyle"); - if (s=="StyleLine") - me->setLinkStyle(StyleLine); - else - if (s=="StyleParabel") - me->setLinkStyle(StyleParabel); - else - if (s=="StylePolyLine") - me->setLinkStyle(StylePolyLine); - else - me->setLinkStyle(StylePolyParabel); + me->setMapLinkStyle(atts.value("linkStyle")); } if (!atts.value( "linkColor").isEmpty() ) { col.setNamedColor(atts.value("linkColor")); - me->setLinkColor(col); + me->setMapDefLinkColor(col); } if (!atts.value( "defXLinkColor").isEmpty() ) { col.setNamedColor(atts.value("defXLinkColor")); - me->setDefXLinkColor(col); + me->setMapDefXLinkColor(col); } if (!atts.value( "defXLinkWidth").isEmpty() ) { - me->setDefXLinkWidth(atts.value("defXLinkWidth").toInt ()); + me->setMapDefXLinkWidth(atts.value("defXLinkWidth").toInt ()); } } } else if ( eName == "select" && state == StateMap )