Commit 0d2f12ac authored by Elvis Stansvik's avatar Elvis Stansvik

Fix z-index loading and removed unused addShapeZIndex()/shapeZIndices()

API from KoShapeLoadingContext.

svn path=/trunk/koffice/; revision=938101
parent 5a9daa0f
......@@ -853,9 +853,10 @@ bool KoShape::loadOdfAttributes(const KoXmlElement & element, KoShapeLoadingCont
if (attributes & OdfZIndex) {
if (element.hasAttributeNS(KoXmlNS::draw, "z-index")) {
context.addShapeZIndex(this, element.attributeNS(KoXmlNS::draw, "z-index").toInt());
setZIndex(element.attributeNS(KoXmlNS::draw, "z-index").toInt());
} else {
setZIndex(context.zIndex());
}
setZIndex(context.zIndex());
}
if (attributes & OdfName) {
......
......@@ -106,16 +106,6 @@ void KoShapeLoadingContext::setZIndex(int index)
d->zIndex = index;
}
void KoShapeLoadingContext::addShapeZIndex(KoShape * shape, int index)
{
d->zIndices.insert(shape, index);
}
const QMap<KoShape*, int> & KoShapeLoadingContext::shapeZIndices()
{
return d->zIndices;
}
void KoShapeLoadingContext::addSharedData(const QString & id, KoSharedLoadingData * data)
{
QMap<QString, KoSharedLoadingData*>::iterator it(d->sharedData.find(id));
......
......@@ -100,17 +100,6 @@ public:
/// Set z-index
void setZIndex(int index);
/**
* Add the z-index
*
* Used for document which use the z-index instead of the order of the shapes
* in the document.
*/
void addShapeZIndex(KoShape * shape, int index);
/// Get the save z-indices
const QMap<KoShape*, int> & shapeZIndices();
/**
* Add shared data
*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment