Merge lp:~marcelstimberg/ubuntu/precise/scribus/merge-1.4-from-debian into lp:ubuntu/precise/scribus

[Marcel Stimberg]

This merges the updated debian version that now ships the final 1.4 release instead of the release candidate.

[Felix Geyer (debfx)]

1.4.0.dfsg+r17300-1 has been merged already.

review: Disapprove

=== removed directory '.pc/0001-qreal-double-fixes.patch'
=== removed directory '.pc/0001-qreal-double-fixes.patch/scribus'
=== removed directory '.pc/0001-qreal-double-fixes.patch/scribus/fonts'
=== removed file '.pc/0001-qreal-double-fixes.patch/scribus/fonts/scfontmetrics.cpp'
--- .pc/0001-qreal-double-fixes.patch/scribus/fonts/scfontmetrics.cpp	2011-09-11 22:10:03 +0000
+++ .pc/0001-qreal-double-fixes.patch/scribus/fonts/scfontmetrics.cpp	1970-01-01 00:00:00 +0000
@@ -1,623 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-#include <QColor>
-#include <QDebug>
-#include <QMap>
-#include <QMatrix>
-#include <QPainter>
-#include <QPixmap>
-#include <QRegExp>
-#include <QStringList>
-
-#include "fpoint.h"
-#include "fpointarray.h"
-#include "page.h"
-#include "scfontmetrics.h"
-#include "scfonts.h"
-#include "scpainter.h"
-#include "scribusdoc.h"
-#include "style.h"
-#include "util_math.h"
-
-
-// this code contains a set of font related functions
-// that don't really fit within ScFonts.
-
-static FPoint firstP;
-static bool FirstM;
-static QMap<FT_ULong, QString> adobeGlyphNames;
-static const char* table[] = {
-//#include "glyphnames.txt.q"
-					NULL};
-
-// private functions
-static void readAdobeGlyphNames();
-static QString adobeGlyphName(FT_ULong charcode);
-static int traceMoveto( FT_Vector *to, FPointArray *composite );
-static int traceLineto( FT_Vector *to, FPointArray *composite );
-static int traceQuadraticBezier( FT_Vector *control, FT_Vector *to, FPointArray *composite );
-static int traceCubicBezier( FT_Vector *p, FT_Vector *q, FT_Vector *to, FPointArray *composite );
-
-FT_Outline_Funcs OutlineMethods =
-    {
-        (FT_Outline_MoveTo_Func) traceMoveto,
-        (FT_Outline_LineTo_Func) traceLineto,
-        (FT_Outline_ConicTo_Func) traceQuadraticBezier,
-        (FT_Outline_CubicTo_Func) traceCubicBezier,
-        0,
-        0
-    };
-
-
-const qreal FTSCALE = 64.0;
-
-
-int setBestEncoding(FT_Face face)
-{
-	FT_ULong  charcode;
-	FT_UInt   gindex;
-	bool foundEncoding = false;
-	int countUniCode = 0;
-	int chmapUniCode = -1;
-	int chmapCustom = -1;
-	int retVal = 0;
-	//FT_CharMap defaultEncoding = face->charmap;
-//	int defaultchmap=face->charmap ? FT_Get_Charmap_Index(face->charmap) : 0;
-// Since the above function is only available in FreeType 2.1.10 its replaced by
-// the following line, assuming that the default charmap has the index 0
-	int defaultchmap = 0;
-	for(int u = 0; u < face->num_charmaps; u++)
-	{
-		if (face->charmaps[u]->encoding == FT_ENCODING_UNICODE )
-		{
-			FT_Set_Charmap(face, face->charmaps[u]);
-			chmapUniCode = u;
-			gindex = 0;
-			charcode = FT_Get_First_Char( face, &gindex );
-			while ( gindex != 0 )
-			{
-				countUniCode++;
-				charcode = FT_Get_Next_Char( face, charcode, &gindex );
-			}
-//			qDebug() << "found Unicode enc for" << face->family_name << face->style_name  << "as map" << chmapUniCode << "with" << countUniCode << "glyphs";
-
-		}
-		if (face->charmaps[u]->encoding == FT_ENCODING_ADOBE_CUSTOM)
-		{
-			chmapCustom = u;
-			foundEncoding = true;
-			retVal = 1;
-//			qDebug() << "found Custom enc for" << face->family_name << face->style_name;
-			break;
-		}
-		else if (face->charmaps[u]->encoding == FT_ENCODING_MS_SYMBOL)
-		{
-//			qDebug() << "found Symbol enc for" << face->family_name << face->style_name;
-
-			chmapCustom = u;
-			foundEncoding = true;
-			retVal = 2;
-			break;
-		}
-	}
-	int mapToSet=defaultchmap;
-	if (chmapUniCode >= 0 && countUniCode >= face->num_glyphs-1)
-	{
-//		qDebug() << "using Unicode enc for" << face->family_name << face->style_name;
-
-		mapToSet=chmapUniCode;
-		//FT_Set_Charmap(face, face->charmaps[chmapUniCode]);
-		retVal = 0;
-	}
-	else
-	if (foundEncoding)
-	{
-//		qDebug() << "using special enc for" << face->family_name << face->style_name;
-		mapToSet=chmapCustom;
-		//FT_Set_Charmap(face, face->charmaps[chmapCustom]);
-	}
-	else
-	{
-//		qDebug() << "using default enc for" << face->family_name << face->style_name;
-		mapToSet=defaultchmap;
-		//FT_Set_Charmap(face, defaultEncoding);
-		retVal = 0;
-	}
-
-	//Fixes #2199, missing glyphs from 1.2.1->1.2.2
-	//If the currently wanted character map is not already Unicode...
-	//if (FT_Get_Charmap_Index(face->charmap)!=chmapUniCode)
-	if (mapToSet!=chmapUniCode)
-	{
-		//Change map so we can count the chars in it
-		FT_Set_Charmap(face, face->charmaps[mapToSet]);
-		//Count the characters in the current map
-		gindex = 0;
-		int countCurrMap=0;
-		charcode = FT_Get_First_Char( face, &gindex );
-		while ( gindex != 0 )
-		{
-			countCurrMap++;
-			charcode = FT_Get_Next_Char( face, charcode, &gindex );
-		}
-		//If the last Unicode map we found before has more characters,
-		//then set it to be the current map.
-		
-		if (countUniCode>countCurrMap)
-		{
-//			qDebug() << "override with Unicode enc for" << face->family_name << face->style_name << "map" << mapToSet << "has only" << countCurrMap << "glyphs";
-			mapToSet=chmapUniCode;
-			//FT_Set_Charmap(face, face->charmaps[chmapUniCode]);
-			retVal = 0;
-		}
-	}
-//	if (face->charmap == NULL || mapToSet!=FT_Get_Charmap_Index(face->charmap))
-		FT_Set_Charmap(face, face->charmaps[mapToSet]);
-//	qDebug() << "set map" << mapToSet << "for" << face->family_name << face->style_name;
-//	qDebug() << "glyphsForNumbers 0-9:" << FT_Get_Char_Index(face, QChar('0').unicode()) 
-//		<< FT_Get_Char_Index(face, QChar('1').unicode()) << FT_Get_Char_Index(face, QChar('2').unicode()) << FT_Get_Char_Index(face, QChar('3').unicode()) 
-//		<< FT_Get_Char_Index(face, QChar('4').unicode()) << FT_Get_Char_Index(face, QChar('5').unicode()) << FT_Get_Char_Index(face, QChar('6').unicode()) 
-//		<< FT_Get_Char_Index(face, QChar('7').unicode()) << FT_Get_Char_Index(face, QChar('8').unicode()) << FT_Get_Char_Index(face, QChar('9').unicode());
-	return retVal;
-}
-
-FPointArray traceGlyph(FT_Face face, FT_UInt glyphIndex, int chs, qreal *x, qreal *y, bool *err)
-{
-	bool error = false;
-	//AV: not threadsave, but tracechar is only used in ReadMetrics() and fontSample()
-	static FPointArray pts; 
-	FPointArray pts2;
-	pts.resize(0);
-	pts2.resize(0);
-	firstP = FPoint(0,0);
-	FirstM = true;
-	error = FT_Set_Char_Size( face, 0, chs*6400, 72, 72 );
-	if (error)
-	{
-		*err = error;
-		return pts2;
-	}
-	if (glyphIndex == 0)
-	{
-		*err = true;
-		return pts2;
-	}
-	error = FT_Load_Glyph( face, glyphIndex, FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP );
-	if (error)
-	{
-		*err = error;
-		return pts2;
-	}
-	error = FT_Outline_Decompose(&face->glyph->outline, &OutlineMethods, reinterpret_cast<void*>(&pts));
-	if (error)
-	{
-		*err = error;
-		return pts2;
-	}
-	*x = face->glyph->metrics.horiBearingX / 6400.0;
-	*y = face->glyph->metrics.horiBearingY / 6400.0;
-	QMatrix ma;
-	ma.scale(0.01, -0.01);
-	pts.map(ma);
-	pts.translate(0, chs);
-	pts2.putPoints(0, pts.size()-2, pts, 0);
-
-	return pts2;
-}
-
-
-FPointArray traceChar(FT_Face face, uint chr, int chs, qreal *x, qreal *y, bool *err)
-{
-	bool error = false;
-	FT_UInt glyphIndex;
-	error = FT_Set_Char_Size( face, 0, chs*64, 72, 72 );
-	if (error)
-	{
-		*err = error;
-		return FPointArray();
-	}
-	glyphIndex = FT_Get_Char_Index(face, chr);
-	return traceGlyph(face, glyphIndex, chs, x, y, err);
-}
-
-
-QPixmap FontSample(const ScFace& fnt, int s, QString ts, QColor back, bool force)
-{
-	FT_Face face;
-	FT_Library library;
-	qreal x, y, ymax;
-	bool error;
-	int  pen_x;
-	FPoint gp;
-	error = FT_Init_FreeType( &library );
-	error = FT_New_Face( library, QFile::encodeName(fnt.fontFilePath()), fnt.faceIndex(), &face );
-	int encode = setBestEncoding(face);
-	qreal uniEM = static_cast<qreal>(face->units_per_EM);
-
-	qreal m_descent = face->descender / uniEM;
-	qreal m_height = face->height / uniEM;
-	if (m_height == 0)
-		m_height = (face->bbox.yMax - face->bbox.yMin) / uniEM;
-
-	int h = qRound(m_height * s) + 1;
-	qreal a = m_descent * s + 1;
-	int w = qRound((face->bbox.xMax - face->bbox.xMin) / uniEM) * s * (ts.length()+1);
-	if (w < 1)
-		w = s * (ts.length()+1);
-	if (h < 1)
-		h = s;
-	QImage pm(w, h, QImage::Format_ARGB32);
-	pen_x = 0;
-	ymax = 0.0;
-	ScPainter *p = new ScPainter(&pm, pm.width(), pm.height());
-	p->clear(back);
-	p->setFillMode(1);
-	p->setLineWidth(0.0);
-//	p->setBrush(back);
-//	p->drawRect(0.0, 0.0, static_cast<qreal>(w), static_cast<qreal>(h));
-	p->setBrush(Qt::black);
-	FPointArray gly;
-	uint dv;
-	dv = ts[0].unicode();
-	error = false;
-	gly = traceChar(face, dv, s, &x, &y, &error);
-	if (((encode != 0) || (error)) && (!force))
-	{
-		error = false;
-		FT_ULong  charcode;
-		FT_UInt gindex;
-		gindex = 0;
-		charcode = FT_Get_First_Char(face, &gindex );
-		for (int n = 0; n < ts.length(); ++n)
-		{
-			gly = traceChar(face, charcode, s, &x, &y, &error);
-			if (error)
-				break;
-			if (gly.size() > 3)
-			{
-				gly.translate(static_cast<qreal>(pen_x) / 6400.0, a);
-				gp = getMaxClipF(&gly);
-				ymax = qMax(ymax, gp.y());
-				p->setupPolygon(&gly);
-				p->fillPath();
-			}
-			pen_x += face->glyph->advance.x;
-			charcode = FT_Get_Next_Char(face, charcode, &gindex );
-			if (gindex == 0)
-				break;
-		}
-	}
-	else
-	{
-		for (int n = 0; n < ts.length(); ++n)
-		{
-			dv = ts[n].unicode();
-			error = false;
-			gly = traceChar(face, dv, s, &x, &y, &error);
-			if (gly.size() > 3)
-			{
-				gly.translate(static_cast<qreal>(pen_x) / 6400.0, a);
-				gp = getMaxClipF(&gly);
-				ymax = qMax(ymax, gp.y());
-				p->setupPolygon(&gly);
-				p->fillPath();
-			}
-			pen_x += face->glyph->advance.x;
-		}
-	}
-	p->end();
-	QPixmap pmr;
-	pmr=QPixmap::fromImage(pm.copy(0, 0, qMin(qRound(gp.x()), w), qMin(qRound(ymax), h)));
-// this one below gives some funny results
-//	pmr.convertFromImage(pm.scaled(qMin(qRound(gp.x()), w), qMin(qRound(ymax), h), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-//	pmr.resize(qMin(qRound(gp.x()), w), qMin(qRound(ymax), h));
-	delete p;
-	FT_Done_FreeType( library );
-	return pmr;
-}
-
-/** Same as FontSample() with \n strings support added.
-09/26/2004 petr vanek
-
-QPixmap fontSamples(ScFace * fnt, int s, QString ts, QColor back)
-{
-	QStringList lines = QStringList::split("\n", ts);
-	QPixmap ret(640, 480);
-	QPixmap sample;
-	QPainter *painter = new QPainter(&ret);
-	int y = 0;
-	int x = 0;
-	ret.fill(back);
-	for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it )
-	{
-		sample = FontSample(fnt, s, *it, back);
-		if (!sample.isNull())
-			painter->drawPixmap(0, y, sample, 0, 0);
-		y = y + sample.height();
-		if (x < sample.width())
-			x = sample.width();
-	} // for
-	delete(painter);
-	QPixmap final(x, y);
-	if ((x != 0) && (y != 0))
-	{
-		QPainter *fpainter = new QPainter(&final);
-		fpainter->drawPixmap(0, 0, ret, 0, 0, x, y);
-		delete(fpainter);
-	}
-	return final;
-}
-*/
-
-bool GlyNames(FT_Face face, QMap<uint, std::pair<QChar, QString> >& GList)
-{
-	char buf[50];
-	FT_ULong  charcode;
-	FT_UInt gindex;
-	setBestEncoding(face);
-	gindex = 0;
-	charcode = FT_Get_First_Char(face, &gindex );
-	const bool hasPSNames = FT_HAS_GLYPH_NAMES(face);
-	if (adobeGlyphNames.empty())
-		readAdobeGlyphNames();
-//	qDebug() << "reading metrics for" << face->family_name << face->style_name;
-	while (gindex != 0)
-	{
-		bool notfound = true;
-		if (hasPSNames)
-			notfound = FT_Get_Glyph_Name(face, gindex, &buf, 50);
-
-		// just in case FT gives empty string or ".notdef"
-		// no valid glyphname except ".notdef" starts with '.'		
-//		qDebug() << "\t" << gindex << " '" << charcode << "' --> '" << (notfound? "notfound" : buf) << "'";
-		if (notfound || buf[0] == '\0' || buf[0] == '.')
-			GList.insert(gindex, std::make_pair(QChar(static_cast<uint>(charcode)),adobeGlyphName(charcode)));
-		else
-			GList.insert(gindex, std::make_pair(QChar(static_cast<uint>(charcode)),QString(reinterpret_cast<char*>(buf))));
-			
-		charcode = FT_Get_Next_Char(face, charcode, &gindex );
-	}
-	// Let's see if we can find some more...
-	int maxSlot1 = face->num_glyphs;
-	if (hasPSNames)
-		for (int gindex = 1; gindex < maxSlot1; ++gindex)
-		{
-			if (!GList.contains(gindex))
-			{
-				bool found = ! FT_Get_Glyph_Name(face, gindex, &buf, 50);
-				if (found)
-				{
-					QString glyphname(reinterpret_cast<char*>(buf));
-					charcode = 0;
-					QMap<uint,std::pair<QChar,QString> >::Iterator gli;
-					for (gli = GList.begin(); gli != GList.end(); ++gli)
-					{
-						if (glyphname == gli.value().second)
-						{
-							charcode = gli.value().first.unicode();
-							break;
-						}
-					}
-//					qDebug() << "\tmore: " << gindex << " '" << charcode << "' --> '" << buf << "'";
-					GList.insert(gindex, std::make_pair(QChar(static_cast<uint>(charcode)), glyphname));
-				}
-			}
-		}
-			
-	return true;
-}
-
-
-static int traceMoveto( FT_Vector *to, FPointArray *composite )
-{
-	qreal tox = ( to->x / FTSCALE );
-	qreal toy = ( to->y / FTSCALE );
-	if (!FirstM)
-	{
-		composite->addPoint(firstP);
-		composite->addPoint(firstP);
-		composite->setMarker();
-	}
-	else
-		FirstM = false;
-	composite->addPoint(tox, toy);
-	composite->addPoint(tox, toy);
-	firstP.setXY(tox, toy);
-	return 0;
-}
-
-static int traceLineto( FT_Vector *to, FPointArray *composite )
-{
-	qreal tox = ( to->x / FTSCALE );
-	qreal toy = ( to->y / FTSCALE );
-	if ( !composite->hasLastQuadPoint(tox, toy, tox, toy, tox, toy, tox, toy))
-		composite->addQuadPoint(tox, toy, tox, toy, tox, toy, tox, toy);
-	return 0;
-}
-
-static int traceQuadraticBezier( FT_Vector *control, FT_Vector *to, FPointArray *composite )
-{
-	qreal x1 = ( control->x / FTSCALE );
-	qreal y1 = ( control->y / FTSCALE );
-	qreal x2 = ( to->x / FTSCALE );
-	qreal y2 = ( to->y / FTSCALE );
-	if ( !composite->hasLastQuadPoint(x2, y2, x1, y1, x2, y2, x2, y2))
-		composite->addQuadPoint(x2, y2, x1, y1, x2, y2, x2, y2);
-	return 0;
-}
-
-static int traceCubicBezier( FT_Vector *p, FT_Vector *q, FT_Vector *to, FPointArray *composite )
-{
-	qreal x1 = ( p->x / FTSCALE );
-	qreal y1 = ( p->y / FTSCALE );
-	qreal x2 = ( q->x / FTSCALE );
-	qreal y2 = ( q->y / FTSCALE );
-	qreal x3 = ( to->x / FTSCALE );
-	qreal y3 = ( to->y / FTSCALE );
-	if ( !composite->hasLastQuadPoint(x3, y3, x2, y2, x3, y3, x3, y3) )
-	{
-		composite->setPoint(composite->size()-1, FPoint(x1, y1));
-		composite->addQuadPoint(x3, y3, x2, y2, x3, y3, x3, y3);
-	}
-	return 0;
-}
-
-/// init the Adobe Glyph List
-void readAdobeGlyphNames() 
-{
-	adobeGlyphNames.clear();
-	QRegExp pattern("(\\w*);([0-9A-Fa-f]{4})");
-	for (uint i=0; table[i]; ++i) {
-		if (pattern.indexIn(table[i]) >= 0) {
-			FT_ULong unicode = pattern.cap(2).toULong(0, 16);
-			qDebug() << QString("reading glyph name %1 for unicode %2(%3)").arg(pattern.cap(1)).arg(unicode).arg(pattern.cap(2));
-			adobeGlyphNames.insert(unicode, pattern.cap(1));
-		}
-	}
-}
-
-
-/// if in AGL, use that name, else use "uni1234" or "u12345"
-QString adobeGlyphName(FT_ULong charcode) 
-{
-	static const char HEX[] = "0123456789ABCDEF";
-	QString result;
-	if (adobeGlyphNames.contains(charcode))
-		return adobeGlyphNames[charcode];
-	else if (charcode < 0x10000) {
-		result = QString("uni") + HEX[charcode>>12 & 0xF] 
-		                        + HEX[charcode>> 8 & 0xF] 
-		                        + HEX[charcode>> 4 & 0xF] 
-		                        + HEX[charcode     & 0xF];
-	}
-	else  {
-		result = QString("u");
-		for (int i= 28; i >= 0; i-=4) {
-			if (charcode & (0xF << i))
-				result += HEX[charcode >> i & 0xF];
-		}
-	}
-	return result;
-}
-
-/*
-qreal Cwidth(ScribusDoc *, ScFace* scFace, QString ch, int Size, QString ch2)
-{
-	qreal width;
-	FT_Vector  delta;
-	FT_Face      face;
-	uint c1 = ch.at(0).unicode();
-	uint c2 = ch2.at(0).unicode();
-	qreal size10=Size/10.0;
-	if (scFace->canRender(ch[0]))
-	{
-		width = scFace->charWidth(ch[0])*size10;
-		face = scFace->ftFace();
-		/\****
-			Ok, this looks like a regression between Freetype 2.1.9 -> 2.1.10.
-			Ignoring the value of FT_HAS_KERNING for now -- AV
-		 ****\/
-		if (true || FT_HAS_KERNING(face) )
-		{
-			uint cl = FT_Get_Char_Index(face, c1);
-			uint cr = FT_Get_Char_Index(face, c2);
-			FT_Error error = FT_Get_Kerning(face, cl, cr, FT_KERNING_UNSCALED, &delta);
-			if (error) {
-				qDebug() << QString("Error %2 when accessing kerning pair for font %1").arg(scFace->scName()).arg(error);
-			}
-			else {
-				qreal uniEM = static_cast<qreal>(face->units_per_EM);
-				width += delta.x / uniEM * size10;
-			}
-		}
-		else {
-			qDebug() << QString("Font %1 has no kerning pairs (according to Freetype)").arg(scFace->scName());
-		}
-		return width;
-	}
-	else
-		return size10;
-}
-
-qreal RealCWidth(ScribusDoc *, ScFace* scFace, QString ch, int Size)
-{
-	qreal w, ww;
-	uint c1 = ch.at(0).unicode();
-	FT_Face      face;
-	if (scFace->canRender(ch.at(0)))
-	{
-		face = scFace->ftFace();
-		uint cl = FT_Get_Char_Index(face, c1);
-		int error = FT_Load_Glyph(face, cl, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP );
-		if (!error) {
-			qreal uniEM = static_cast<qreal>(face->units_per_EM);
-			w = (face->glyph->metrics.width + fabs((qreal)face->glyph->metrics.horiBearingX)) / uniEM * (Size / 10.0);
-			ww = face->glyph->metrics.horiAdvance / uniEM * (Size / 10.0);
-			return qMax(ww, w);
-		}
-		else
-			sDebug(QString("internal error: missing glyph: %1 (char %2) error=%3").arg(c1).arg(ch).arg(error));
-
-	}
-	return static_cast<qreal>(Size / 10.0);
-}
-
-qreal RealCHeight(ScribusDoc *, ScFace* scFace, QString ch, int Size)
-{
-	qreal w;
-	uint c1 = ch.at(0).unicode();
-	FT_Face      face;
-	if (scFace->canRender(ch.at(0)))
-	{
-		face = scFace->ftFace();
-		uint cl = FT_Get_Char_Index(face, c1);
-		int error = FT_Load_Glyph(face, cl, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP );
-		if (!error) {
-			qreal uniEM = static_cast<qreal>(face->units_per_EM);
-			w = face->glyph->metrics.height / uniEM * (Size / 10.0);
-		}
-		else {
-			sDebug(QString("internal error: missing glyph: %1 (char %2) error=%3").arg(c1).arg(ch).arg(error));
-			w = Size / 10.0;
-		}
-		return w;
-	}
-	else
-		return static_cast<qreal>(Size / 10.0);
-}
-
-qreal RealCAscent(ScribusDoc *, ScFace* scFace, QString ch, int Size)
-{
-	qreal w;
-	uint c1 = ch.at(0).unicode();
-	FT_Face      face;
-	if (scFace->canRender(ch.at(0)))
-	{
-		face = scFace->ftFace();
-		uint cl = FT_Get_Char_Index(face, c1);
-		int error = FT_Load_Glyph(face, cl, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP );
-		if (! error) {
-			qreal uniEM = static_cast<qreal>(face->units_per_EM);
-			w = face->glyph->metrics.horiBearingY / uniEM * (Size / 10.0);
-		}
-		else {
-			sDebug(QString("internal error: missing glyph: %1 (char %2) error=%3").arg(c1).arg(ch).arg(error));
-			w = Size / 10.0;
-		}
-		return w;
-	}
-	else
-		return static_cast<qreal>(Size / 10.0);
-}
-
-qreal RealFHeight(ScribusDoc *, ScFace* scFace, int Size)
-{
-	FT_Face face = scFace->ftFace();
-	qreal uniEM = static_cast<qreal>(face->units_per_EM);
-	return face->height / uniEM * (Size / 10.0);
-}
-*/

=== removed file '.pc/0001-qreal-double-fixes.patch/scribus/pageitem.cpp'
--- .pc/0001-qreal-double-fixes.patch/scribus/pageitem.cpp	2011-09-11 22:10:03 +0000
+++ .pc/0001-qreal-double-fixes.patch/scribus/pageitem.cpp	1970-01-01 00:00:00 +0000
@@ -1,5999 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-/***************************************************************************
-                          pageitem.cpp  -  description
-                             -------------------
-    begin                : Sat Apr 7 2001
-    copyright            : (C) 2001 by Franz Schmid
-    email                : [e-mail]
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "pageitem.h"
-#include <QPainter>
-#include <QPen>
-#include <QFont>
-#include <QRegion>
-#include <QPoint>
-#include <QFileInfo>
-#include <qdrawutil.h>
-#include <QRegExp>
-#include <QMessageBox>
-#include <QPolygon>
-#include <cassert>
-#include <QDebug>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-#include "canvas.h"
-#include "cmsettings.h"
-#include "colorblind.h"
-#include "commonstrings.h"
-#include "cpalette.h"
-#include "guidemanager.h"
-#include "page.h"
-#include "pageitem_latexframe.h"
-#include "pageitem_textframe.h"
-#include "prefsmanager.h"
-#include "propertiespalette.h"
-#include "resourcecollection.h"
-#include "scclocale.h"
-#include "sccolorengine.h"
-#include "scconfig.h"
-#include "scpainter.h"
-#include "scpaths.h"
-#include "scpattern.h"
-#include "scribus.h"
-#include "scribusapp.h"
-#include "scribuscore.h"
-#include "scribusdoc.h"
-#include "scribusstructs.h"
-#include "scribuswin.h"
-#include "sctextstream.h"
-#include "serializer.h"
-#include "selection.h"
-#include "sclimits.h"
-#include "text/nlsconfig.h"
-#include "desaxe/saxXML.h"
-#include "undomanager.h"
-#include "undostate.h"
-#include "util.h"
-#include "util_formats.h"
-#include "util_math.h"
-#include "util_text.h"
-#include "util_file.h"
-#ifdef HAVE_CAIRO
-	#include <cairo.h>
-#endif
-
-using namespace std;
-
-PageItem::PageItem(const PageItem & other)
-	: QObject(other.parent()),
-	 UndoObject(other), SingleObservable<PageItem>(other.m_Doc->itemsChanged()),
-
-// 200 attributes! That is madness, or to quote some famous people from Kriquet:
-// "THAT ALL HAS TO GO!"
-	gXpos(other.gXpos),
-	gYpos(other.gYpos),
-	gWidth(other.gWidth),
-	gHeight(other.gHeight),
-	GrType(other.GrType),
-	GrStartX(other.GrStartX),
-	GrStartY(other.GrStartY),
-	GrEndX(other.GrEndX),
-	GrEndY(other.GrEndY),
-	Cols(other.Cols),
-	ColGap(other.ColGap),
-	PLineArt(other.PLineArt),
-	PLineEnd(other.PLineEnd),
-	PLineJoin(other.PLineJoin),
-	NamedLStyle(other.NamedLStyle),
-	Clip(other.Clip),
-	PoLine(other.PoLine),
-	ContourLine(other.ContourLine),
-	imageClip(other.imageClip),
-	Segments(other.Segments),
-	effectsInUse(other.effectsInUse),
-	PoShow(other.PoShow),
-	BaseOffs(other.BaseOffs),
-	textPathType(other.textPathType),
-	textPathFlipped(other.textPathFlipped),
-	ClipEdited(other.ClipEdited),
-	FrameType(other.FrameType),
-	ItemNr(other.ItemNr),
-	Frame(other.Frame),
-	OwnPage(other.OwnPage),
-	oldOwnPage(other.oldOwnPage),
-	pixm(other.pixm),
-	Pfile(other.Pfile),
-	Pfile2(other.Pfile2),
-	Pfile3(other.Pfile3),
-	IProfile(other.IProfile),
-	UseEmbedded(other.UseEmbedded),
-	EmProfile(other.EmProfile),
-	IRender(other.IRender),
-
-	PictureIsAvailable(other.PictureIsAvailable),
-	OrigW(other.OrigW),
-	OrigH(other.OrigH),
-	BBoxX(other.BBoxX),
-	BBoxH(other.BBoxH),
-	CurX(other.CurX),
-	CurY(other.CurY),
-	CPos(other.CPos),
-	itemText(other.itemText),
-	isBookmark(other.isBookmark),
-	HasSel(other.HasSel),
-//	Tinput(other.Tinput),
-	isAutoText(other.isAutoText),
-	BackBox(NULL),  // otherwise other.BackBox->NextBox would be inconsistent
-	NextBox(NULL),  // otherwise other.NextBox->BackBox would be inconsistent
-	firstChar(0),   // since this box is unlinked now
-	MaxChars(0),   // since the layout is invalid now
-	inPdfArticle(other.inPdfArticle),
-	isRaster(other.isRaster),
-	OldB(other.OldB),
-	OldH(other.OldH),
-	OldB2(other.OldB2),
-	OldH2(other.OldH2),
-	Sizing(other.Sizing),
-	toPixmap(other.toPixmap),
-	LayerNr(other.LayerNr),
-	ScaleType(other.ScaleType),
-	AspectRatio(other.AspectRatio),
-	Groups(other.Groups),
-	DashValues(other.DashValues),
-	DashOffset(other.DashOffset),
-	fill_gradient(other.fill_gradient),
-	fillRule(other.fillRule),
-	doOverprint(other.doOverprint),
-	LeftLink(other.LeftLink),
-	RightLink(other.RightLink),
-	TopLink(other.TopLink),
-	BottomLink(other.BottomLink),
-	LeftLinkID(other.LeftLinkID),
-	RightLinkID(other.RightLinkID),
-	TopLinkID(other.TopLinkID),
-	BottomLinkID(other.BottomLinkID),
-	LeftLine(other.LeftLine),
-	RightLine(other.RightLine),
-	TopLine(other.TopLine),
-	BottomLine(other.BottomLine),
-	isTableItem(other.isTableItem),
-	isSingleSel(other.isSingleSel),
-	isGroupControl(other.isGroupControl),
-	groupsLastItem(other.groupsLastItem),
-	BoundingX(other.BoundingX),
-	BoundingY(other.BoundingY),
-	BoundingW(other.BoundingW),
-	BoundingH(other.BoundingH),
-	ChangedMasterItem(other.ChangedMasterItem),
-	OnMasterPage(other.OnMasterPage),
-	isEmbedded(other.isEmbedded),
-
-	// protected
-	undoManager(other.undoManager),
-	m_ItemType(other.m_ItemType),
-	AnName(other.AnName),
-	patternVal(other.patternVal),
-	patternScaleX(other.patternScaleX),
-	patternScaleY(other.patternScaleY),
-	patternOffsetX(other.patternOffsetX),
-	patternOffsetY(other.patternOffsetY),
-	patternRotation(other.patternRotation),
-	fillColorVal(other.fillColorVal),
-	lineColorVal(other.lineColorVal),
-	lineShadeVal(other.lineShadeVal),
-	fillShadeVal(other.fillShadeVal),
-	fillTransparencyVal(other.fillTransparencyVal),
-	lineTransparencyVal(other.lineTransparencyVal),
-	fillBlendmodeVal(other.fillBlendmodeVal),
-	lineBlendmodeVal(other.lineBlendmodeVal),
-	m_ImageIsFlippedH(other.m_ImageIsFlippedH),
-	m_ImageIsFlippedV(other.m_ImageIsFlippedV),
-	m_Locked(other.m_Locked),
-	m_SizeLocked(other.m_SizeLocked),
-	textFlowModeVal(other.textFlowModeVal),
-	pageItemAttributes(other.pageItemAttributes),
-	m_PrintEnabled(other.m_PrintEnabled),
-	tagged(other.tagged),
-	fillQColor(other.fillQColor),
-	strokeQColor(other.strokeQColor),
-	Xpos(other.Xpos),
-	Ypos(other.Ypos),
-	Width(other.Width),
-	Height(other.Height),
-	Rot(other.Rot),
-	Select(other.Select),
-	LocalScX(other.LocalScX),
-	LocalScY(other.LocalScY),
-	LocalX(other.LocalX),
-	LocalY(other.LocalY),
-	Reverse(other.Reverse),
-	m_startArrowIndex(other.m_startArrowIndex),
-	m_endArrowIndex(other.m_endArrowIndex),
-	Extra(other.Extra),
-	TExtra(other.TExtra),
-	BExtra(other.BExtra),
-	RExtra(other.RExtra),
-	firstLineOffsetP(other.firstLineOffsetP),
-	RadRect(other.RadRect),
-	oldXpos(other.oldXpos),
-	oldYpos(other.oldYpos),
-	oldWidth(other.oldWidth),
-	oldHeight(other.oldHeight),
-	oldRot(other.oldRot),
-	oldLocalScX(other.oldLocalScX),
-	oldLocalScY(other.oldLocalScY),
-	oldLocalX(other.oldLocalX),
-	oldLocalY(other.oldLocalY),
-	m_Doc(other.m_Doc),
-	m_isAnnotation(other.m_isAnnotation),
-	m_annotation(other.m_annotation),
-	PicArt(other.PicArt),
-	m_lineWidth(other.m_lineWidth),
-	Oldm_lineWidth(other.Oldm_lineWidth)
-{
-	QString tmp;
-	m_Doc->TotalItems++;
-	AnName += tmp.setNum(m_Doc->TotalItems);
-	uniqueNr = m_Doc->TotalItems;
-	invalid = true;
-	if (other.isInlineImage)
-	{
-		QFileInfo inlFi(Pfile);
-		QString ext = inlFi.suffix();
-		tempImageFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_XXXXXX." + ext);
-		tempImageFile->open();
-		QString fileName = getLongPathName(tempImageFile->fileName());
-		tempImageFile->close();
-		copyFile(Pfile, fileName);
-		Pfile = fileName;
-		isInlineImage = true;
-	}
-	else
-	{
-		tempImageFile = NULL;
-		isInlineImage = false;
-	}
-}
-
-
-PageItem::PageItem(ScribusDoc *pa, ItemType newType, double x, double y, double w, double h, double w2, QString fill, QString outline)
-	// Initialize superclass(es)
-	: QObject(pa), SingleObservable<PageItem>(pa->itemsChanged()),
-	// Initialize member variables
-	itemText(pa),
-	undoManager(UndoManager::instance()),
-	lineShadeVal(100),
-	fillShadeVal(100),
-	fillTransparencyVal(0.0),
-	lineTransparencyVal(0.0),
-	fillBlendmodeVal(0),
-	lineBlendmodeVal(0),
-	m_ImageIsFlippedH(0),
-	m_ImageIsFlippedV(0),
-	m_Locked(false),
-	m_SizeLocked(false),
-	textFlowModeVal(TextFlowDisabled)
-{
-	m_Doc = pa;
-	QString tmp;
-	BackBox = 0;
-	NextBox = 0;
-	oldXpos = Xpos = x;
-	oldYpos = Ypos = y;
-	//CB Surely we can remove some of these?
-	OldB2 = OldB = oldWidth = Width = w;
-	OldH2 = OldH = oldHeight = Height = h;
-	BoundingX = x;
-	BoundingY = y;
-	BoundingW = w;
-	BoundingH = h;
-	m_ItemType = newType;
-	oldRot = Rot = 0;
-	fillColorVal = fill;
-	lineColorVal = m_ItemType == PageItem::TextFrame ? fill : outline;
-	gXpos = gYpos = 0;
-	gWidth = gHeight = 0;
-	GrType = 0;
-	GrStartX = 0;
-	GrStartY = 0;
-	GrEndX = w;
-	GrEndY = 0;
-	patternVal = "";
-	patternScaleX = 100;
-	patternScaleY = 100;
-	patternOffsetX = 0;
-	patternOffsetY = 0;
-	patternRotation = 0;
-	m_lineWidth = w2;
-	Oldm_lineWidth = w2;
-	PLineArt = Qt::PenStyle(m_Doc->toolSettings.dLineArt);
-	PLineEnd = Qt::FlatCap;
-	PLineJoin = Qt::MiterJoin;
-	Select = false;
-	ClipEdited = false;
-	FrameType = 0;
-	CurX = 0;
-	CurY = 0;
-	CPos = 0;
-	oldCPos = 0;
-	Extra = 0;
-	TExtra = 0;
-	BExtra = 0;
-	RExtra = 0;
-	firstChar = 0;
-	MaxChars = 0;
-	Pfile = "";
-	pixm = ScImage();
-	pixm.imgInfo.lowResType = m_Doc->toolSettings.lowResType;
-	Pfile2 = "";
-	Pfile3 = "";
-	oldLocalScX = LocalScX = 1;
-	oldLocalScY = LocalScY = 1;
-	OrigW = 0;
-	OrigH = 0;
-	oldLocalX = LocalX = 0;
-	oldLocalY = LocalY = 0;
-	BBoxX = 0;
-	BBoxH = 0;
-	RadRect = 0;
-	if ((m_ItemType == TextFrame) || (m_ItemType == ImageFrame) || (m_ItemType == PathText))
-		// TODO: Frame should become a read-only calculated property
-		Frame = true;
-	else
-		Frame = false;
-	switch (m_ItemType)
-	{
-		case Polygon:
-			Clip.setPoints(4, static_cast<int>(w/2), 0, static_cast<int>(w), static_cast<int>(h/2),
-								static_cast<int>(w/2), static_cast<int>(h), 0,static_cast<int>(h/2));
-			break;
-		default:
-			Clip.setPoints(4, 0,0, static_cast<int>(w),0, static_cast<int>(w), static_cast<int>(h), 0,static_cast<int>(h));
-			break;
-	}
-	PoLine.resize(0);
-	ContourLine.resize(0);
-	imageClip.resize(0);
-	Segments.clear();
-	PoShow = false;
-	BaseOffs = 0;
-	textPathType = 0;
-	textPathFlipped = false;
-	OwnPage = m_Doc->currentPage()->pageNr();
-	oldOwnPage = OwnPage;
-	savedOwnPage = OwnPage;
-	PicArt = true;
-	PictureIsAvailable = false;
-	m_PrintEnabled = true;
-	isBookmark = false;
-	m_isAnnotation = false;
-	
-	switch (m_ItemType)
-	{
-	case ImageFrame:
-	case LatexFrame:
-		//We can't determine if this is a latex frame here
-		// because c++'s typeinfos are still saying it's 
-		// a plain pageitem
-		// This is fixed in the PageItem_LatexFrame constructor
-		AnName = tr("Image");
-		setUPixmap(Um::IImageFrame);
-		break;
-	case TextFrame:
-		AnName = tr("Text");
-		setUPixmap(Um::ITextFrame);
-		break;
-	case Line:
-		AnName = tr("Line");
-		setUPixmap(Um::ILine);
-		break;
-	case Polygon:
-		AnName = tr("Polygon");
-		setUPixmap(Um::IPolygon);
-		break;
-	case PolyLine:
-		AnName = tr("Polyline");
-		setUPixmap(Um::IPolyline);
-		break;
-	case PathText:
-		AnName = tr("PathText");
-		setUPixmap(Um::IPathText);
-		break;
-	default:
-		AnName = "Item";
-		break;
-	}
-	m_Doc->TotalItems++;
-	AnName += tmp.setNum(m_Doc->TotalItems); // +" "+QDateTime::currentDateTime().toString();
-	uniqueNr = m_Doc->TotalItems;
-	AutoName = true;
-	setUName(AnName);
-	m_annotation.setBorderColor(outline);
-	HasSel = false;
-//	Tinput = false;
-	isAutoText = false;
-	inPdfArticle = false;
-	isRaster = false;
-	Sizing = false;
-	toPixmap = false;
-	UseEmbedded = true;
-	IRender = Intent_Relative_Colorimetric;
-	EmProfile = "";
-	Groups.clear();
-	LayerNr = m_Doc->activeLayer();
-	ScaleType = true;
-	AspectRatio = true;
-	Reverse = false;
-	NamedLStyle = "";
-	DashValues.clear();
-	DashOffset = 0;
-	fillRule = true;
-	doOverprint = false;
-	fill_gradient = VGradient(VGradient::linear);
-	fill_gradient.clearStops();
-	if (fillColorVal != CommonStrings::None)
-	{
-		const ScColor& col = m_Doc->PageColors[fillColorVal];
-		QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
-		fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, fillColorVal, 100);
-		fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, fillColorVal, 100);
-	}
-	else
-	{
-		if (m_Doc->toolSettings.dBrush != CommonStrings::None)
-		{
-			const ScColor& col = m_Doc->PageColors[m_Doc->toolSettings.dBrush];
-			QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
-			fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->toolSettings.dBrush, 100);
-			fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->toolSettings.dBrush, 100);
-		}
-		else
-		{
-			if (lineColorVal != CommonStrings::None)
-			{
-				const ScColor& col = m_Doc->PageColors[lineColorVal];
-				QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
-				fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, lineColorVal, 100);
-				fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, lineColorVal, 100);
-			}
-			else
-			{
-				if (m_Doc->toolSettings.dPen != CommonStrings::None)
-				{
-					const ScColor& col = m_Doc->PageColors[m_Doc->toolSettings.dPen];
-					QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
-					fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->toolSettings.dPen, 100);
-					fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->toolSettings.dPen, 100);
-				}
-				else if (m_Doc->PageColors.contains("Black"))
-				{
-					const ScColor& col = m_Doc->PageColors["Black"];
-					QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
-					fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, "Black", 100);
-					fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, "Black", 100);
-				}
-			}
-		}
-	}
-	firstLineOffsetP = FLOPRealGlyphHeight;
-	Cols = m_Doc->toolSettings.dCols;
-	ColGap = m_Doc->toolSettings.dGap;
-	LeftLink = 0;
-	RightLink = 0;
-	TopLink = 0;
-	BottomLink = 0;
-	LeftLinkID = 0;
-	RightLinkID = 0;
-	TopLinkID = 0;
-	BottomLinkID = 0;
-	LeftLine = 0;
-	RightLine = false;
-	TopLine = false;
-	BottomLine = false;
-	isTableItem = false;
-	isSingleSel = false;
-	Dirty = false;
-	invalid = true;
-	isGroupControl = false;
-	groupsLastItem = 0;
-	ChangedMasterItem = false;
-	isEmbedded = false;
-	OnMasterPage = m_Doc->currentPage()->pageName();
-	m_startArrowIndex = m_Doc->toolSettings.dStartArrow;
-	m_endArrowIndex = m_Doc->toolSettings.dEndArrow;
-	effectsInUse.clear();
-	//Page Item Attributes
-	pageItemAttributes.clear();
-	for(ObjAttrVector::Iterator objAttrIt = m_Doc->docItemAttributes.begin() ; objAttrIt != m_Doc->docItemAttributes.end(); ++objAttrIt )
-	{
-		if (((*objAttrIt).autoaddto=="textframes" && m_ItemType==TextFrame) ||
-			((*objAttrIt).autoaddto=="imageframes" && m_ItemType==ImageFrame)
-			)
-			pageItemAttributes.append(*objAttrIt);
-	}
-	tempImageFile = NULL;
-	isInlineImage = false;
-}
-
-void PageItem::setXPos(const double newXPos, bool drawingOnly)
-{
-	Xpos = newXPos;
-	if (drawingOnly || m_Doc->isLoading())
-		return;
-	checkChanges();
-	emit position(Xpos, Ypos);
-}
-
-void PageItem::setYPos(const double newYPos, bool drawingOnly)
-{
-	Ypos = newYPos;
-	if (drawingOnly || m_Doc->isLoading())
-		return;
-	checkChanges();
-	emit position(Xpos, Ypos);
-}
-
-void PageItem::setXYPos(const double newXPos, const double newYPos, bool drawingOnly)
-{
-	Xpos = newXPos;
-	Ypos = newYPos;
-	if (drawingOnly || m_Doc->isLoading())
-		return;
-	checkChanges();
-	emit position(Xpos, Ypos);
-}
-
-void PageItem::moveBy(const double dX, const double dY, bool drawingOnly)
-{
-	if (dX==0.0 && dY==0.0)
-		return;
-	invalid = true;
-	if (dX!=0.0)
-		Xpos+=dX;
-	if (dY!=0.0)
-		Ypos+=dY;
-	if (drawingOnly || m_Doc->isLoading())
-		return;
-	checkChanges();
-	emit position(Xpos, Ypos);
-}
-
-void PageItem::setWidth(const double newWidth)
-{
-	Width = newWidth;
-	updateConstants();
-	checkChanges();
-	emit widthAndHeight(Width, Height);
-}
-
-void PageItem::setHeight(const double newHeight)
-{
-	Height = newHeight;
-	updateConstants();
-	checkChanges();
-	emit widthAndHeight(Width, Height);
-}
-
-void PageItem::setWidthHeight(const double newWidth, const double newHeight, bool drawingOnly)
-{
-	Width = newWidth;
-	Height = newHeight;
-	updateConstants();
-	if (drawingOnly)
-		return;
-	checkChanges();
-	emit widthAndHeight(Width, Height);
-}
-
-void PageItem::setWidthHeight(const double newWidth, const double newHeight)
-{
-	Width = newWidth;
-	Height = newHeight;
-	updateConstants();
-	checkChanges();
-	emit widthAndHeight(Width, Height);
-}
-
-void PageItem::resizeBy(const double dH, const double dW)
-{
-	if (dH==0.0 && dW==0.0)
-		return;
-	if (dH!=0.0)
-		Width+=dH;
-	if (dW!=0.0)
-		Height+=dW;
-	updateConstants();
-	checkChanges();
-	emit widthAndHeight(Width, Height);
-}
-
-void PageItem::setRotation(const double newRotation, bool drawingOnly)
-{
-	Rot=newRotation;
-	checkChanges();
-	if (drawingOnly || m_Doc->isLoading())
-		return;
-	emit rotation(Rot);
-}
-
-void PageItem::rotateBy(const double dR)
-{
-	if (dR==0.0)
-		return;
-	Rot+=dR;
-	checkChanges();
-	emit rotation(Rot);
-}
-
-void PageItem::setSelected(const bool toSelect)
-{
-	Select=toSelect;
-}
-
-void PageItem::setImageXScale(const double newImageXScale)
-{
-	LocalScX=newImageXScale;
-	checkChanges();
-	emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
-}
-
-void PageItem::setImageYScale(const double newImageYScale)
-{
-	LocalScY=newImageYScale;
-	checkChanges();
-	emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
-}
-
-void PageItem::setImageXYScale(const double newImageXScale, const double newImageYScale)
-{
-	LocalScX=newImageXScale;
-	LocalScY=newImageYScale;
-	checkChanges();
-	emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
-}
-
-void PageItem::setImageXOffset(const double newImageXOffset)
-{
-	LocalX=newImageXOffset;
-	checkChanges();
-	emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
-}
-
-void PageItem::setImageYOffset(const double newImageYOffset)
-{
-	LocalY=newImageYOffset;
-	checkChanges();
-	emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
-}
-
-void PageItem::setImageXYOffset(const double newImageXOffset, const double newImageYOffset)
-{
-	LocalX=newImageXOffset;
-	LocalY=newImageYOffset;
-	checkChanges();
-	emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
-}
-
-void PageItem::moveImageXYOffsetBy(const double dX, const double dY)
-{
-	if (dX==0.0 && dY==0.0)
-		return;
-	if (dX!=0.0)
-		LocalX+=dX;
-	if (dY!=0.0)
-		LocalY+=dY;
-	checkChanges();
-	emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
-}
-
-void PageItem::setReversed(bool newReversed)
-{
-	Reverse=newReversed;
-}
-
-
-/// returns true if text overflows
-bool PageItem::frameOverflows() const
-{
-#ifndef NLS_PROTO
-	// Fix #6991 : "Text overflow" warning when there is a text underflow in fact
-	/*return NextBox == NULL && itemText.length() > static_cast<int>(MaxChars);*/
-	return ( NextBox == NULL )
-	       && ( static_cast<int> ( firstChar ) < itemText.length() )
-		   // Fix #7766 : scribus.textOverflows() returns 0 if there is no place for the overflow mark
-	       /*&& ( firstChar < MaxChars )*/
-		   && ( firstChar <= MaxChars )
-	       && ( itemText.length() > static_cast<int> ( MaxChars ) );
-#else
-	return false; // FIXME:NLS
-#endif
-}
-
-int PageItem::firstInFrame() const
-{
-	return firstChar;
-}
-int PageItem::lastInFrame() const
-{
-#ifndef NLS_PROTO
-	return qMin(signed(MaxChars), itemText.length()) - 1;
-#else
-	return itemText.length() - 1;
-#endif
-}
-
-
-void PageItem::link(PageItem* nxt)
-{
-	assert( !nextInChain() );
-	assert( !nxt->prevInChain() );
-	for (PageItem* ff=nxt; ff; ff=ff->nextInChain())
-	{
-		assert (ff != this);
-	}
-	// Append only if necessary to avoid the
-	// charstyle: access at end of text warning
-	if (nxt->itemText.length() > 0)
-		itemText.append(nxt->itemText);
-	NextBox = nxt;
-	nxt->BackBox = this;
-	// update AutoText
-	if (isAutoText)
-	{
-		PageItem* after = nxt;
-		while (after)
-		{
-			after->isAutoText = true;
-			m_Doc->LastAuto = after;
-			after = after->NextBox;
-		}
-	}
-	else if (nxt->isAutoText)
-	{
-		PageItem* before = this;
-		while (before)
-		{
-			before->isAutoText = true;
-			m_Doc->FirstAuto = before;
-			before = before->BackBox;
-		}
-	}
-	invalid = true;
-	while (nxt)
-	{
-		nxt->itemText = itemText;
-		nxt->invalid = true;
-		nxt->firstChar = 0;
-		nxt = nxt->NextBox;
-	}
-	if (UndoManager::undoEnabled())
-	{
-		ItemState<std::pair<PageItem*, PageItem*> > *is = new ItemState<std::pair<PageItem*, PageItem*> >(UndoManager::LinkTextFrame);
-		is->set("LINK_TEXT_FRAME", "linkTextFrame");
-		is->setItem(std::pair<PageItem*, PageItem*>(this, NextBox));
-		undoManager->action(this, is);
-	}
-}
-
-void PageItem::unlink()
-{
-	if( NextBox )
-	{
-		PageItem *undoNextBox=NextBox;
-		// make sure lastInFrame is valid
-		layout();
-		/*
-		//<< CB #6332: Stop the StoryText cut and break and act like other publishing apps
-		// move following text to new StoryText
-		itemText.select(lastInFrame()+1, itemText.length()-lastInFrame()-1);
-		*/
-		StoryText follow(m_Doc);
-		/*
-		follow.setDefaultStyle(itemText.defaultStyle());
-		follow.insert(0, itemText, true);
-		// remove following text from this chain
-		itemText.removeSelection();
-		//>> 
-		*/
-		// update auto pointers
-		if (isAutoText)
-		{
-			PageItem* before = this;
-			while (before) 
-			{
-				before->isAutoText = false;
-				before = before->BackBox;
-			}
-			m_Doc->FirstAuto = NextBox;
-		}
-		// link following frames to new text
-		NextBox->firstChar = 0;
-		NextBox->BackBox = NULL;
-		while (NextBox) {
-			NextBox->itemText = follow;
-			NextBox->invalid = true;
-			NextBox->firstChar = 0;
-			NextBox = NextBox->NextBox;
-		}
-		// NextBox == NULL now
-		NextBox = NULL;
-		if (UndoManager::undoEnabled())
-		{
-			ItemState<std::pair<PageItem*, PageItem*> > *is = new ItemState<std::pair<PageItem*, PageItem*> >(UndoManager::UnlinkTextFrame);
-			is->set("UNLINK_TEXT_FRAME", "unlinkTextFrame");
-			is->setItem(std::pair<PageItem*, PageItem*>(this, undoNextBox));
-			undoManager->action(this, is);
-		}
-	}
-}
-
-
-void PageItem::dropLinks()
-{
-	// update auto pointers
-	if (isAutoText && NextBox == 0)
-	{
-		m_Doc->LastAuto = BackBox;
-	}
-	if (isAutoText && BackBox == 0)
-	{
-		m_Doc->FirstAuto = NextBox;
-	}
-	isAutoText = false;
-
-	// leave text in remaining chain
-	PageItem* before = BackBox;
-	PageItem* after = NextBox;
-	if (after != 0 || before != 0)
-	{
-		itemText = StoryText(m_Doc);
-		if (before)
-			before->NextBox = after;
-		if (after) 
-		{
-			after->BackBox = before;
-			while (after)
-			{ 
-				after->invalid = true;
-				after->firstChar = 0;
-				after = after->NextBox;
-			}
-		}
-		// JG we should set BackBox and NextBox to NULL at a point
-		BackBox = NextBox = NULL;
-	}
-}
-
-/// tests if a character is displayed by this frame
-bool PageItem::frameDisplays(int textpos) const
-{
-#ifndef NLS_PROTO
-	return 0 <= textpos && textpos < signed(MaxChars) &&  textpos < itemText.length();
-#else
-	return true; // FIXME:NLS
-#endif
-}
-
-
-/// returns the style at the current charpos
-const ParagraphStyle& PageItem::currentStyle() const
-{
-	if (frameDisplays(CPos))
-		return itemText.paragraphStyle(CPos);
-	else
-		return itemText.defaultStyle();
-}
-
-/// returns the style at the current charpos for changing
-ParagraphStyle& PageItem::changeCurrentStyle()
-{
-	if (frameDisplays(CPos))
-		return const_cast<ParagraphStyle&>(itemText.paragraphStyle(CPos));
-	else
-		return const_cast<ParagraphStyle&>(itemText.defaultStyle());
-}
-
-/// returns the style at the current charpos
-const CharStyle& PageItem::currentCharStyle() const
-{
-	if (frameDisplays(CPos))
-		return itemText.charStyle(CPos);
-	else
-		return itemText.defaultStyle().charStyle();
-}
-
-void PageItem::setTextToFrameDistLeft(double newLeft)
-{
-	Extra=newLeft;
-	emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
-}
-
-void PageItem::setTextToFrameDistRight(double newRight)
-{
-	RExtra=newRight;
-	emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
-}
-
-void PageItem::setTextToFrameDistTop(double newTop)
-{
-	TExtra=newTop;
-	emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
-}
-
-void PageItem::setTextToFrameDistBottom(double newBottom)
-{
-	BExtra=newBottom;
-	emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
-}
-
-void PageItem::setTextToFrameDist(double newLeft, double newRight, double newTop, double newBottom)
-{
-	Extra=newLeft;
-	RExtra=newRight;
-	TExtra=newTop;
-	BExtra=newBottom;
-	emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
-}
-
-double PageItem::gridOffset() const { return m_Doc->typographicSettings.offsetBaseGrid; }
-double PageItem::gridDistance() const { return m_Doc->typographicSettings.valueBaseGrid; }
-
-void PageItem::setGridOffset(double) { } // FIXME
-void PageItem::setGridDistance(double) { } // FIXME
-void PageItem::setColumns(int n) 
-{
-	Cols = qMax(1, n); //FIXME: undo
-}
-void PageItem::setColumnGap(double gap)
-{
-	ColGap = gap; //FIXME: undo
-}
-
-void PageItem::setCornerRadius(double newRadius)
-{
-	RadRect=newRadius;
-	emit cornerRadius(RadRect);
-}
-
-
-
-
-
-
-
-
-
-/** Paints the item.
-    CHANGE: cullingArea is in doc coordinates!
- */
-void PageItem::DrawObj(ScPainter *p, QRectF cullingArea)
-{
-// 	qDebug << "PageItem::DrawObj";
-	double sc;
-	if (!m_Doc->DoDrawing)
-	{
-//		Tinput = false;
-		return;
-	}
-	if (cullingArea.isNull())
-	{
-		cullingArea = QRectF(QPointF(m_Doc->minCanvasCoordinate.x(), m_Doc->minCanvasCoordinate.y()), 
-							 QPointF(m_Doc->maxCanvasCoordinate.x(), m_Doc->maxCanvasCoordinate.y())).toAlignedRect();
-	}
-	
-	DrawObj_Pre(p, sc);
-	if (m_Doc->layerOutline(LayerNr))
-	{
-		if ((itemType()==TextFrame || itemType()==ImageFrame || itemType()==PathText || itemType()==Line || itemType()==PolyLine) && (!isGroupControl))
-			DrawObj_Item(p, cullingArea, sc);
-	}
-	else
-	{
-		if (!isGroupControl)
-			DrawObj_Item(p, cullingArea, sc);
-	}
-	DrawObj_Post(p);
-}
-
-void PageItem::DrawObj_Pre(ScPainter *p, double &sc)
-{
-	ScribusView* view = m_Doc->view();
-	sc = view->scale();
-	p->save();
-	if (!isEmbedded)
-		p->translate(Xpos, Ypos);
-	p->rotate(Rot);
-	if (m_Doc->layerOutline(LayerNr))
-	{
-		p->setPen(m_Doc->layerMarker(LayerNr), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-		p->setFillMode(ScPainter::None);
-		p->setBrushOpacity(1.0);
-		p->setPenOpacity(1.0);
-	}
-	else
-	{
-	if (!isGroupControl)
-	{
-		if (fillBlendmode() != 0)
-			p->beginLayer(1.0 - fillTransparency(), fillBlendmode());
-
-		p->setLineWidth(m_lineWidth);
-		if (GrType != 0)
-		{
-			if (GrType == 8)
-			{
-				if ((patternVal.isEmpty()) || (!m_Doc->docPatterns.contains(patternVal)))
-				{
-					p->fill_gradient = VGradient(VGradient::linear);
-					if (fillColor() != CommonStrings::None)
-					{
-						p->setBrush(fillQColor);
-						p->setFillMode(ScPainter::Solid);
-					}
-					else
-						p->setFillMode(ScPainter::None);
-					if ((!patternVal.isEmpty()) && (!m_Doc->docPatterns.contains(patternVal)))
-					{
-						GrType = 0;
-						patternVal = "";
-					}
-				}
-				else
-				{
-					p->setPattern(&m_Doc->docPatterns[patternVal], patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation);
-					p->setFillMode(ScPainter::Pattern);
-				}
-			}
-			else
-			{
-				if (fill_gradient.Stops() < 2) // fall back to solid filling if there are not enough colorstops in the gradient.
-				{
-					if (fillColor() != CommonStrings::None)
-					{
-						p->setBrush(fillQColor);
-						p->setFillMode(ScPainter::Solid);
-					}
-					else
-						p->setFillMode(ScPainter::None);
-				}
-				else
-				{
-					p->setFillMode(ScPainter::Gradient);
-					p->fill_gradient = fill_gradient;
-					QMatrix grm;
-					grm.rotate(Rot);
-					FPointArray gra;
-					switch (GrType)
-					{
-						case 1:
-						case 2:
-						case 3:
-						case 4:
-						case 6:
-							p->setGradient(VGradient::linear, FPoint(GrStartX, GrStartY), FPoint(GrEndX, GrEndY));
-							break;
-						case 5:
-						case 7:
-							gra.setPoints(2, GrStartX, GrStartY, GrEndX, GrEndY);
-							p->setGradient(VGradient::radial, gra.point(0), gra.point(1), gra.point(0));
-							break;
-					}
-				}
-			}
-		}
-		else
-		{
-			p->fill_gradient = VGradient(VGradient::linear);
-			if (fillColor() != CommonStrings::None)
-			{
-				p->setBrush(fillQColor);
-				p->setFillMode(ScPainter::Solid);
-			}
-			else
-				p->setFillMode(ScPainter::None);
-		}
-		if (lineColor() != CommonStrings::None)
-		{
-//			if ((m_lineWidth == 0) && ! asLine())
-//				p->setLineWidth(0);
-//			else
-//			{
-				p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
-				if (DashValues.count() != 0)
-					p->setDash(DashValues, DashOffset);
-//			}
-		}
-		else
-			p->setLineWidth(0);
-		if (fillBlendmode() == 0)
-			p->setBrushOpacity(1.0 - fillTransparency());
-		if (lineBlendmode() == 0)
-			p->setPenOpacity(1.0 - lineTransparency());
-		p->setFillRule(fillRule);
-		}
-	}
-}
-
-void PageItem::DrawObj_Post(ScPainter *p)
-{
-	bool doStroke=true;
-	ScribusView* view = m_Doc->view();
-	if (!isGroupControl)
-	{
-		if (m_Doc->layerOutline(LayerNr))
-		{
-			if (itemType()!=Line)
-			{
-				p->setPen(m_Doc->layerMarker(LayerNr), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-				p->setFillMode(ScPainter::None);
-				p->setBrushOpacity(1.0);
-				p->setPenOpacity(1.0);
-				if (itemType()==PolyLine)
-					p->setupPolygon(&PoLine, false);
-				else if (itemType() == PathText)
-				{
-					if (PoShow)
-						p->setupPolygon(&PoLine, false);
-					else
-						doStroke = false;
-				}
-				else
-					p->setupPolygon(&PoLine);
-				if (doStroke)
-					p->strokePath();
-				if (itemType()==ImageFrame)
-				{
-					if (imageClip.size() != 0)
-					{
-						p->setupPolygon(&imageClip);
-						p->strokePath();
-					}
-				}
-			}
-		}
-		else
-		{
-			if (fillBlendmode() != 0)
-				p->endLayer();
-			if (itemType()==PathText || itemType()==PolyLine || itemType()==Line)
-				doStroke=false;
-			if ((doStroke) && (!m_Doc->RePos))
-			{
-				if (lineBlendmode() != 0)
-					p->beginLayer(1.0 - lineTransparency(), lineBlendmode());
-//				if (lineColor() != CommonStrings::None)
-//				{
-//					p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
-//					if (DashValues.count() != 0)
-//						p->setDash(DashValues, DashOffset);
-//				}
-//				else
-//					p->setLineWidth(0);
-				if (!isTableItem)
-				{
-					if ((itemType() == LatexFrame) || (itemType() == ImageFrame))
-						p->setupPolygon(&PoLine);
-					if (NamedLStyle.isEmpty())
-					{
-						if (lineColor() != CommonStrings::None)
-						{
-							p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
-							if (DashValues.count() != 0)
-								p->setDash(DashValues, DashOffset);
-							p->strokePath();
-						}
-					}
-					else
-					{
-						multiLine ml = m_Doc->MLineStyles[NamedLStyle];
-						QColor tmp;
-						for (int it = ml.size()-1; it > -1; it--)
-						{
-							struct SingleLine& sl = ml[it];
-							// Qt4 if ((!sl.Color != CommonStrings::None) && (sl.Width != 0))
-							if (sl.Color != CommonStrings::None) // && (sl.Width != 0))
-							{
-								SetQColor(&tmp, sl.Color, sl.Shade);
-								p->setPen(tmp, sl.Width, static_cast<Qt::PenStyle>(sl.Dash), static_cast<Qt::PenCapStyle>(sl.LineEnd), static_cast<Qt::PenJoinStyle>(sl.LineJoin));
-								p->strokePath();
-							}
-						}
-					}
-				}
-				if (lineBlendmode() != 0)
-					p->endLayer();
-			}
-		}
-	}
-	if ((!isEmbedded) && (!m_Doc->RePos))
-	{
-		double aestheticFactor(5.0);
-		double scpInv = 1.0 / (qMax(view->scale(), 1.0) * aestheticFactor);
-		if (!isGroupControl)
-		{
-			if ((Frame) && (m_Doc->guidesSettings.framesShown) && ((itemType() == ImageFrame) || (itemType() == LatexFrame) || (itemType() == PathText)))
-			{
-				p->setPen(PrefsManager::instance()->appPrefs.DFrameNormColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-				if ((isBookmark) || (m_isAnnotation))
-					p->setPen(PrefsManager::instance()->appPrefs.DFrameAnnotationColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-				if ((BackBox != 0) || (NextBox != 0))
-					p->setPen(PrefsManager::instance()->appPrefs.DFrameLinkColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-				if (m_Locked)
-					p->setPen(PrefsManager::instance()->appPrefs.DFrameLockColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-				p->setFillMode(0);
-				if (itemType()==PathText)
-				{
-					if (Clip.count() != 0)
-					{
-						FPointArray tclip;
-						FPoint np = FPoint(Clip.point(0));
-						tclip.resize(2);
-						tclip.setPoint(0, np);
-						tclip.setPoint(1, np);
-						for (int a = 1; a < Clip.size(); ++a)
-						{
-							np = FPoint(Clip.point(a));
-							tclip.putPoints(tclip.size(), 4, np.x(), np.y(), np.x(), np.y(), np.x(), np.y(), np.x(), np.y());
-						}
-						np = FPoint(Clip.point(0));
-						tclip.putPoints(tclip.size(), 2, np.x(), np.y(), np.x(), np.y());
-						p->setupPolygon(&tclip);
-					}
-				}
-				else
-// Ugly Hack to fix rendering problems with cairo >=1.5.10 && <1.8.0 follows
-#ifdef HAVE_CAIRO
-	#if ((CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 5, 10)) && (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 8, 0)))
-					p->setupPolygon(&PoLine, false);
-	#else
-					p->setupPolygon(&PoLine);
-	#endif
-#else
-					p->setupPolygon(&PoLine);
-#endif
-				p->strokePath();
-			}
-		}
-		if ((m_Doc->guidesSettings.framesShown) && textFlowUsesContourLine() && (ContourLine.size() != 0))
-		{
-			p->setPen(Qt::darkGray, 1.0 / qMax(view->scale(), 1.0), Qt::DotLine, Qt::FlatCap, Qt::MiterJoin);
-// Ugly Hack to fix rendering problems with cairo >=1.5.10 && <1.8.0 follows
-#ifdef HAVE_CAIRO
-	#if ((CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 5, 10)) && (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 8, 0)))
-			p->setupPolygon(&ContourLine, false);
-	#else
-			p->setupPolygon(&ContourLine);
-	#endif
-#else
-			p->setupPolygon(&ContourLine);
-#endif
-			p->strokePath();
-		}
-		if ((m_Doc->guidesSettings.layerMarkersShown) && (m_Doc->layerCount() > 1) && (!m_Doc->layerOutline(LayerNr)) && ((isGroupControl) || (Groups.count() == 0)) && (!view->m_canvas->isPreviewMode()))
-		{
-			p->setPen(Qt::black, 0.5/ m_Doc->view()->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-			p->setPenOpacity(1.0);
-			p->setBrush(m_Doc->layerMarker(LayerNr));
-			p->setBrushOpacity(1.0);
-			p->setFillMode(ScPainter::Solid);
-			double ofwh = 10;
-			double ofx = Width - ofwh/2;
-			double ofy = Height - ofwh*3;
-			p->drawRect(ofx, ofy, ofwh, ofwh);
-		}
-		//CB disabled for now
-		//if (m_Doc->m_Selection->findItem(this)!=-1)
-		//	drawLockedMarker(p);
-	}
-//	Tinput = false;
-	FrameOnly = false;
-	p->restore();
-}
-
-void PageItem::DrawObj_Embedded(ScPainter *p, QRectF cullingArea, const CharStyle& style, PageItem* cembedded)
-{
-	if (!cembedded)
-		return;
-	if (!m_Doc->DoDrawing)
-		return;
-	QList<PageItem*> emG;
-	QStack<PageItem*> groupStack;
-	groupStack.clear();
-	emG.clear();
-	emG.append(cembedded);
-	if (cembedded->Groups.count() != 0)
-	{
-		for (int ga=0; ga<m_Doc->FrameItems.count(); ++ga)
-		{
-			if (m_Doc->FrameItems.at(ga)->Groups.count() != 0)
-			{
-				if (m_Doc->FrameItems.at(ga)->Groups.top() == cembedded->Groups.top())
-				{
-					if (m_Doc->FrameItems.at(ga)->ItemNr != cembedded->ItemNr)
-					{
-						if (!emG.contains(m_Doc->FrameItems.at(ga)))
-							emG.append(m_Doc->FrameItems.at(ga));
-					}
-				}
-			}
-		}
-	}
-	for (int em = 0; em < emG.count(); ++em)
-	{
-		PageItem* embedded = emG.at(em);
-		if (embedded->isGroupControl)
-		{
-			p->save();
-			FPointArray cl = embedded->PoLine.copy();
-			QMatrix mm;
-			mm.translate((embedded->gXpos * (style.scaleH() / 1000.0)), ( - (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos * (style.scaleV() / 1000.0)));
-			if (style.baselineOffset() != 0)
-				mm.translate(0, -embedded->gHeight * (style.baselineOffset() / 1000.0));
-			mm.scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-			mm.rotate(embedded->rotation());
-			cl.map( mm );
-			p->beginLayer(1.0 - embedded->fillTransparency(), embedded->fillBlendmode(), &cl);
-			groupStack.push(embedded->groupsLastItem);
-			continue;
-		}
-		p->save();
-		double x = embedded->xPos();
-		double y = embedded->yPos();
-		embedded->Xpos = embedded->gXpos;
-		embedded->Ypos = (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos;
-		p->translate((embedded->gXpos * (style.scaleH() / 1000.0)), ( - (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos * (style.scaleV() / 1000.0)));
-		if (style.baselineOffset() != 0)
-		{
-			p->translate(0, -embedded->gHeight * (style.baselineOffset() / 1000.0));
-			embedded->Ypos -= embedded->gHeight * (style.baselineOffset() / 1000.0);
-		}
-		p->scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-		embedded->Dirty = Dirty;
-		embedded->invalid = true;
-		double sc;
-		double pws = embedded->m_lineWidth;
-		embedded->DrawObj_Pre(p, sc);
-		switch(embedded->itemType())
-		{
-			case ImageFrame:
-			case TextFrame:
-			case LatexFrame:
-			case Polygon:
-			case PathText:
-				embedded->DrawObj_Item(p, cullingArea, sc);
-				break;
-			case Line:
-			case PolyLine:
-				embedded->m_lineWidth = pws * qMin(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-				embedded->DrawObj_Item(p, cullingArea, sc);
-				break;
-			default:
-				break;
-		}
-		embedded->m_lineWidth = pws * qMin(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-		embedded->DrawObj_Post(p);
-		embedded->Xpos = x;
-		embedded->Ypos = y;
-		p->restore();
-		if (groupStack.count() != 0)
-		{
-			while (embedded == groupStack.top())
-			{
-				p->endLayer();
-				p->restore();
-				groupStack.pop();
-				if (groupStack.count() == 0)
-					break;
-			}
-		}
-		embedded->m_lineWidth = pws;
-	}
-	for (int em = 0; em < emG.count(); ++em)
-	{
-		PageItem* embedded = emG.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		p->save();
-		double x = embedded->xPos();
-		double y = embedded->yPos();
-		embedded->Xpos = embedded->gXpos;
-		embedded->Ypos = (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos;
-		p->translate((embedded->gXpos * (style.scaleH() / 1000.0)), ( - (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos * (style.scaleV() / 1000.0)));
-		if (style.baselineOffset() != 0)
-		{
-			p->translate(0, -embedded->gHeight * (style.baselineOffset() / 1000.0));
-			embedded->Ypos -= embedded->gHeight * (style.baselineOffset() / 1000.0);
-		}
-		p->scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-		p->rotate(embedded->rotation());
-		double pws = embedded->m_lineWidth;
-		embedded->m_lineWidth = pws * qMin(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-		if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-		{
-			QColor tmp;
-			embedded->SetQColor(&tmp, embedded->lineColor(), embedded->lineShade());
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				p->setPen(tmp, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-				if (embedded->TopLine)
-					p->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-				if (embedded->RightLine)
-					p->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-				if (embedded->BottomLine)
-					p->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-				if (embedded->LeftLine)
-					p->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-			}
-		}
-		embedded->m_lineWidth = pws;
-		embedded->Xpos = x;
-		embedded->Ypos = y;
-		p->restore();
-	}
-}
-
-
-void PageItem::paintObj(QPainter *p)
-{
-	if ((!m_Doc->DoDrawing) || (m_Doc->RePos))
-	{
-		FrameOnly = false;
-		return;
-	}
-	double sc = m_Doc->view()->scale();
-	double handleSize = 6.0 / sc;
-	double halfSize = 3.0 / sc;
-	if ((!FrameOnly) && (!m_Doc->RePos))
-	{
-		if (!m_Doc->m_Selection->isEmpty())
-		{
-//				qDebug() << "Item: " << ItemNr << "W: " << Width << "H: " << Height;
-			if (Groups.count() == 0)
-			{
-				//Locked line colour selection
-				if (m_Locked)
-					p->setPen(QPen(PrefsManager::instance()->appPrefs.DFrameLockColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
-				else
-					p->setPen(QPen(PrefsManager::instance()->appPrefs.DFrameColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
-				p->setBrush(Qt::NoBrush);
-				double lw2 = 1.0 / sc;
-				double lw = 1.0 / sc;
-				Qt::PenCapStyle le = Qt::FlatCap;
-				if (NamedLStyle.isEmpty())
-				{
-					lw2 = (m_lineWidth / 2.0)  / sc;
-					lw = qMax(m_lineWidth, 1.0)  / sc;
-					le = PLineEnd;
-				}
-				else
-				{
-					multiLine ml = m_Doc->MLineStyles[NamedLStyle];
-					lw2 = (ml[ml.size()-1].Width / 2.0) / sc;
-					lw = qMax(ml[ml.size()-1].Width, 1.0) / sc;
-					le = static_cast<Qt::PenCapStyle>(ml[ml.size()-1].LineEnd);
-				}
-				//Draw our frame outline
-				if (asLine())
-				{
-					if (le != Qt::FlatCap)
-						p->drawRect(QRectF(-lw2, -lw2, Width+lw, lw));
-					else
-						p->drawRect(QRectF(-1 / sc, -lw2, Width, lw));
-				}
-				else
-					p->drawRect(QRectF(0, 0, Width, Height));
-//				p->setPen(QPen(PrefsManager::instance()->appPrefs.DFrameColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
-				p->setBrush(PrefsManager::instance()->appPrefs.DFrameColor);
-				p->setPen(Qt::NoPen);
-				if ((!m_Locked) && (!m_SizeLocked))
-				{
-					if (! asLine())
-					{
-						p->drawRect(QRectF(0.0, 0.0, handleSize, handleSize));
-						p->drawRect(QRectF(Width - handleSize, Height - handleSize, handleSize, handleSize));
-						p->drawRect(QRectF(Width - handleSize, 0.0, handleSize, handleSize));
-						p->drawRect(QRectF(0.0, Height - handleSize, handleSize, handleSize));
-						if (Width > 6)
-						{
-							p->drawRect(QRectF(Width / 2.0 - halfSize, Height - handleSize, handleSize, handleSize));
-							p->drawRect(QRectF(Width / 2.0 - halfSize, 0.0, handleSize, handleSize));
-						}
-						if (Height > 6)
-						{
-							p->drawRect(QRectF(Width - handleSize, Height / 2.0 - halfSize, handleSize, handleSize));
-							p->drawRect(QRectF(0.0, Height / 2.0 - halfSize, handleSize, handleSize));
-						}
-					}
-					else
-					{
-						p->drawRect(QRectF(-halfSize, -halfSize, handleSize, handleSize));
-						p->drawRect(QRectF(Width + halfSize, -halfSize, -handleSize, handleSize));
-					}
-				}
-			}
-			else
-			{
-				p->setPen(QPen(PrefsManager::instance()->appPrefs.DFrameGroupColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
-				p->setBrush(Qt::NoBrush);
-				p->drawRect(QRectF(0.0, 0.0, Width, Height));
-				if (m_Doc->m_Selection->count() == 1)
-				{
-					p->setPen(Qt::NoPen);
-//					p->setPen(QPen(PrefsManager::instance()->appPrefs.DFrameGroupColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
-					p->setBrush(PrefsManager::instance()->appPrefs.DFrameGroupColor);
-					p->drawRect(QRectF(0.0, 0.0, handleSize, handleSize));
-					p->drawRect(QRectF(Width - handleSize, Height - handleSize, handleSize, handleSize));
-					p->drawRect(QRectF(Width - handleSize, 0.0, handleSize, handleSize));
-					p->drawRect(QRectF(0.0, Height - handleSize, handleSize, handleSize));
-					if (Width > 6)
-					{
-						p->drawRect(QRectF(Width / 2.0 - halfSize, Height - handleSize, handleSize, handleSize));
-						p->drawRect(QRectF(Width / 2.0 - halfSize, 0.0, handleSize, handleSize));
-					}
-					if (Height > 6)
-					{
-						p->drawRect(QRectF(Width - handleSize, Height / 2.0 - halfSize, handleSize, handleSize));
-						p->drawRect(QRectF(0.0, Height / 2.0 - halfSize, handleSize, handleSize));
-					}
-				}
-			}
-		}
-	}
-	FrameOnly = false;
-}
-
-QImage PageItem::DrawObj_toImage()
-{
-	QList<PageItem*> emG;
-	emG.clear();
-	double minx =  std::numeric_limits<double>::max();
-	double miny =  std::numeric_limits<double>::max();
-	double maxx = -std::numeric_limits<double>::max();
-	double maxy = -std::numeric_limits<double>::max();
-	if (Groups.count() != 0)
-	{
-		for (int ga=0; ga<m_Doc->Items->count(); ++ga)
-		{
-			if (m_Doc->Items->at(ga)->Groups.count() != 0)
-			{
-				if (m_Doc->Items->at(ga)->Groups.top() == Groups.top())
-				{
-					if (!emG.contains(m_Doc->Items->at(ga)))
-					{
-						emG.append(m_Doc->Items->at(ga));
-						PageItem *currItem = m_Doc->Items->at(ga);
-						double x1, x2, y1, y2;
-						currItem->getVisualBoundingRect(&x1, &y1, &x2, &y2);
-						minx = qMin(minx, x1);
-						miny = qMin(miny, y1);
-						maxx = qMax(maxx, x2);
-						maxy = qMax(maxy, y2);
-					}
-				}
-			}
-		}
-		for (int em = 0; em < emG.count(); ++em)
-		{
-			PageItem* currItem = emG.at(em);
-			currItem->gXpos = currItem->xPos() - minx;
-			currItem->gYpos = currItem->yPos() - miny;
-			currItem->gWidth = maxx - minx;
-			currItem->gHeight = maxy - miny;
-		}
-	}
-	else
-	{
-		double x1, x2, y1, y2;
-		getVisualBoundingRect(&x1, &y1, &x2, &y2);
-		minx = qMin(minx, x1);
-		miny = qMin(miny, y1);
-		maxx = qMax(maxx, x2);
-		maxy = qMax(maxy, y2);
-		gXpos = xPos() - minx;
-		gYpos = yPos() - miny;
-		gWidth = maxx - minx;
-		gHeight = maxy - miny;
-		emG.append(this);
-	}
-	return DrawObj_toImage(emG);
-}
-
-QImage PageItem::DrawObj_toImage(QList<PageItem*> &emG)
-{
-	QImage retImg = QImage(qRound(gWidth), qRound(gHeight), QImage::Format_ARGB32);
-//	retImg.fill( qRgba(255, 255, 255, 0) );
-	retImg.fill( qRgba(0, 0, 0, 0) );
-	ScPainter *painter = new ScPainter(&retImg, retImg.width(), retImg.height(), 1, 0);
-//	painter->setZoomFactor(1.0);
-	painter->setZoomFactor(qMax(qRound(gWidth) / gWidth, qRound(gHeight) / gHeight));
-	QStack<PageItem*> groupStack;
-	for (int em = 0; em < emG.count(); ++em)
-	{
-		PageItem* embedded = emG.at(em);
-		if (embedded->isGroupControl)
-		{
-			painter->save();
-			FPointArray cl = embedded->PoLine.copy();
-			QMatrix mm;
-			mm.translate(embedded->gXpos, embedded->gYpos);
-			mm.rotate(embedded->rotation());
-			cl.map( mm );
-			painter->beginLayer(1.0 - embedded->fillTransparency(), embedded->fillBlendmode(), &cl);
-			groupStack.push(embedded->groupsLastItem);
-			continue;
-		}
-		painter->save();
-// 		qDebug()<<embedded<<embedded->xPos()<<embedded->yPos()<<embedded->gXpos<<embedded->gYpos;
-// 		double x = embedded->xPos();
-// 		double y = embedded->yPos();
-// 		embedded->Xpos = embedded->gXpos;
-// 		embedded->Ypos = embedded->gYpos;
-		// Seems to work without all this coordinates mess. To monitor tho
-		painter->translate(embedded->gXpos, embedded->gYpos);
-		embedded->isEmbedded = true;
-		embedded->invalid = true;
-		embedded->DrawObj(painter, QRectF());
-// 		embedded->Xpos = x;
-// 		embedded->Ypos = y;
-		embedded->isEmbedded = false;
-		painter->restore();
-		if (groupStack.count() != 0)
-		{
-			while (embedded == groupStack.top())
-			{
-				painter->endLayer();
-				painter->restore();
-				groupStack.pop();
-				if (groupStack.count() == 0)
-					break;
-			}
-		}
-	}
-	for (int em = 0; em < emG.count(); ++em)
-	{
-		PageItem* embedded = emG.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		painter->save();
-// 		double x = embedded->xPos();
-// 		double y = embedded->yPos();
-// 		embedded->Xpos = embedded->gXpos;
-// 		embedded->Ypos = embedded->gYpos;
-		painter->translate(embedded->gXpos, embedded->gYpos);
-		painter->rotate(embedded->rotation());
-		embedded->isEmbedded = true;
-		embedded->invalid = true;
-		if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-		{
-			QColor tmp;
-			embedded->SetQColor(&tmp, embedded->lineColor(), embedded->lineShade());
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				painter->setPen(tmp, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-				if (embedded->TopLine)
-					painter->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-				if (embedded->RightLine)
-					painter->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-				if (embedded->BottomLine)
-					painter->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-				if (embedded->LeftLine)
-					painter->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-			}
-		}
-		embedded->isEmbedded = false;
-// 		embedded->Xpos = x;
-// 		embedded->Ypos = y;
-		painter->restore();
-	}
-	painter->end();
-	delete painter;
-	return retImg;
-}
-
-QString PageItem::ExpandToken(uint base)
-{
-	uint zae = 0;
-	QChar ch = itemText.text(base);
-	QString chstr = ch;
-	if (ch == SpecialChars::PAGENUMBER)
-	{
-		// compatibility mode: ignore subsequent pagenumber chars
-		if (base > 0 && itemText.text(base-1) == SpecialChars::PAGENUMBER)
-			return "";
-		if ((!m_Doc->masterPageMode()) && (OwnPage != -1))
-		{
-			QString out("%1");
-			//CB Section numbering
-			chstr = out.arg(m_Doc->getSectionPageNumberForPageIndex(OwnPage), -(int)zae);
-		}
-		else
-			return "#";
-	}
-	else if (ch == SpecialChars::PAGECOUNT)
-	{
-		if (!m_Doc->masterPageMode())
-		{
-			QString out("%1");
-			int key = m_Doc->getSectionKeyForPageIndex(OwnPage);
-			if (key == -1)
-				return "%";
-			chstr = out.arg(getStringFromSequence(m_Doc->sections[key].type, m_Doc->sections[key].toindex - m_Doc->sections[key].fromindex + 1));
-		}
-		else
-			return "%";
-	}
-	return chstr;
-}
-
-void PageItem::SetQColor(QColor *tmp, QString farbe, double shad)
-{
-	const ScColor& col = m_Doc->PageColors[farbe];
-	*tmp = ScColorEngine::getShadeColorProof(col, m_Doc, shad);
-	if ((m_Doc->view()) && (m_Doc->view()->m_canvas->usePreviewVisual()))
-	{
-		VisionDefectColor defect;
-		*tmp = defect.convertDefect(*tmp, m_Doc->view()->m_canvas->previewVisual());
-	}
-}
-
-/**
-    layout glyphs translates the chars into a number of glyphs, applying the Charstyle
-    'style'. The following fields are set in layout: glyph, more, scaleH, scaleV, xoffset, yoffset, xadvance.
-    If the DropCap-bit in style.effects is set and yadvance is > 0, scaleH/V, x/yoffset and xadvance
-    are modified to scale the glyphs to this height.
-    Otherwise yadvance is set to the max ascender of all generated glyphs.
-    It scales according to smallcaps and
-    sets xadvance to the advance width without kerning. If more than one glyph
-    is generated, kerning is included in all but the last xadvance.
-*/
-double PageItem::layoutGlyphs(const CharStyle& style, const QString& chars, GlyphLayout& layout)
-{
-	double retval = 0.0;
-	double asce = style.font().ascent(style.fontSize() / 10.0);
-	int chst = style.effects() & 1919;
-/*	if (chars[0] == SpecialChars::ZWSPACE ||
-		chars[0] == SpecialChars::ZWNBSPACE ||
-		chars[0] == SpecialChars::NBSPACE ||
-		chars[0] == SpecialChars::NBHYPHEN ||
-		chars[0] == SpecialChars::SHYPHEN ||
-		chars[0] == SpecialChars::PARSEP ||
-		chars[0] == SpecialChars::COLBREAK ||
-		chars[0] == SpecialChars::LINEBREAK ||
-		chars[0] == SpecialChars::FRAMEBREAK ||
-		chars[0] == SpecialChars::TAB)
-	{
-		layout.glyph = ScFace::CONTROL_GLYPHS + chars[0].unicode();
-	}
-	else */
-	{
-		layout.glyph = style.font().char2CMap(chars[0].unicode());
-	}
-	
-	double tracking = 0.0;
-	if ( (style.effects() & ScStyle_StartOfLine) == 0)
-		tracking = style.fontSize() * style.tracking() / 10000.0;
-
-	layout.xoffset = tracking;
-	layout.yoffset = 0;
-	if (chst != ScStyle_Default)
-	{
-		if (chst & ScStyle_Superscript)
-		{
-			retval -= asce * m_Doc->typographicSettings.valueSuperScript / 100.0;
-			layout.yoffset -= asce * m_Doc->typographicSettings.valueSuperScript / 100.0;
-			layout.scaleV = layout.scaleH = qMax(m_Doc->typographicSettings.scalingSuperScript / 100.0, 10.0 / style.fontSize());
-		}
-		else if (chst & ScStyle_Subscript)
-		{
-			retval += asce * m_Doc->typographicSettings.valueSubScript / 100.0;
-			layout.yoffset += asce * m_Doc->typographicSettings.valueSubScript / 100.0;
-			layout.scaleV = layout.scaleH = qMax(m_Doc->typographicSettings.scalingSubScript / 100.0, 10.0 / style.fontSize());
-		}
-		else {
-			layout.scaleV = layout.scaleH = 1.0;
-		}
-		layout.scaleH *= style.scaleH() / 1000.0;
-		layout.scaleV *= style.scaleV() / 1000.0;
-		if (chst & ScStyle_AllCaps)
-		{
-			layout.glyph = style.font().char2CMap(chars[0].toUpper().unicode());
-		}
-		if (chst & ScStyle_SmallCaps)
-		{
-			double smallcapsScale = m_Doc->typographicSettings.valueSmallCaps / 100.0;
-			QChar uc = chars[0].toUpper();
-			if (uc != chars[0])
-			{
-				layout.glyph = style.font().char2CMap(chars[0].toUpper().unicode());
-				layout.scaleV *= smallcapsScale;
-				layout.scaleH *= smallcapsScale;
-			}
-		}
-	}
-	else {
-		layout.scaleH = style.scaleH() / 1000.0;
-		layout.scaleV = style.scaleV() / 1000.0;
-	}	
-	
-/*	if (layout.glyph == (ScFace::CONTROL_GLYPHS + SpecialChars::NBSPACE.unicode())) {
-		uint replGlyph = style.font().char2CMap(QChar(' '));
-		layout.xadvance = style.font().glyphWidth(replGlyph, style.fontSize() / 10) * layout.scaleH;
-		layout.yadvance = style.font().glyphBBox(replGlyph, style.fontSize() / 10).ascent * layout.scaleV;
-	}
-	else if (layout.glyph == (ScFace::CONTROL_GLYPHS + SpecialChars::NBHYPHEN.unicode())) {
-		uint replGlyph = style.font().char2CMap(QChar('-'));
-		layout.xadvance = style.font().glyphWidth(replGlyph, style.fontSize() / 10) * layout.scaleH;
-		layout.yadvance = style.font().glyphBBox(replGlyph, style.fontSize() / 10).ascent * layout.scaleV;
-	}
-	else if (layout.glyph >= ScFace::CONTROL_GLYPHS) {
-		layout.xadvance = 0;
-		layout.yadvance = 0;
-	}
-	else */
-	{
-		layout.xadvance = style.font().glyphWidth(layout.glyph, style.fontSize() / 10) * layout.scaleH;
-		layout.yadvance = style.font().glyphBBox(layout.glyph, style.fontSize() / 10).ascent * layout.scaleV;
-	}
-	if (layout.xadvance > 0)
-		layout.xadvance += tracking;
-
-	if (chars.length() > 1) {
-		layout.grow();
-		layoutGlyphs(style, chars.mid(1), *layout.more);
-		layout.xadvance += style.font().glyphKerning(layout.glyph, layout.more->glyph, style.fontSize() / 10) * layout.scaleH;
-		if (layout.more->yadvance > layout.yadvance)
-			layout.yadvance = layout.more->yadvance;
-	}
-	else {
-		layout.shrink();
-	}
-	return retval;
-}
-
-void PageItem::drawGlyphs(ScPainter *p, const CharStyle& style, GlyphLayout& glyphs)
-{
-	uint glyph = glyphs.glyph;
-	if ((m_Doc->guidesSettings.showControls) && 
-		(glyph == style.font().char2CMap(QChar(' ')) || glyph >=  ScFace::CONTROL_GLYPHS))
-	{
-		bool stroke = false;
-		if (glyph >=  ScFace::CONTROL_GLYPHS)
-			glyph -= ScFace::CONTROL_GLYPHS;
-		else
-			glyph = 32;
-		QMatrix chma, chma4, chma5;
-		FPointArray points;
-		if (glyph == SpecialChars::TAB.unicode())
-		{
-			points = m_Doc->symTab.copy();
-			chma4.translate(glyphs.xoffset + glyphs.xadvance - ((style.fontSize() / 10.0) * glyphs.scaleH * 0.7), glyphs.yoffset - ((style.fontSize() / 10.0) * glyphs.scaleV * 0.5));
-		}
-		else if (glyph == SpecialChars::COLBREAK.unicode())
-		{
-			points = m_Doc->symNewCol.copy();
-			chma4.translate(glyphs.xoffset, glyphs.yoffset-((style.fontSize() / 10.0) * glyphs.scaleV * 0.6));
-		}
-		else if (glyph == SpecialChars::FRAMEBREAK.unicode())
-		{
-			points = m_Doc->symNewFrame.copy();
-			chma4.translate(glyphs.xoffset, glyphs.yoffset-((style.fontSize() / 10.0) * glyphs.scaleV * 0.6));
-		}
-		else if (glyph == SpecialChars::PARSEP.unicode())
-		{
-			points = m_Doc->symReturn.copy();
-			chma4.translate(glyphs.xoffset, glyphs.yoffset-((style.fontSize() / 10.0) * glyphs.scaleV * 0.8));
-		}
-		else if (glyph == SpecialChars::LINEBREAK.unicode())
-		{
-			points = m_Doc->symNewLine.copy();
-			chma4.translate(glyphs.xoffset, glyphs.yoffset-((style.fontSize() / 10.0) * glyphs.scaleV * 0.4));
-		}
-		else if (glyph == SpecialChars::NBSPACE.unicode() ||
-				 glyph == 32)
-		{
-			stroke = (glyph == 32);
-			points = m_Doc->symNonBreak.copy();
-			chma4.translate(glyphs.xoffset, glyphs.yoffset-((style.fontSize() / 10.0) * glyphs.scaleV * 0.4));
-		}
-		else if (glyph == SpecialChars::NBHYPHEN.unicode())
-		{
-			points = style.font().glyphOutline(style.font().char2CMap(QChar('-')), style.fontSize() / 100);
-			chma4.translate(glyphs.xoffset, glyphs.yoffset-((style.fontSize() / 10.0) * glyphs.scaleV));
-		}
-		else if (glyph == SpecialChars::SHYPHEN.unicode())
-		{
-			points.resize(0);
-			points.addQuadPoint(0, -10, 0, -10, 0, -6, 0, -6);
-			stroke = true;
-		}
-		else // ???
-		{
-			points.resize(0);
-			points.addQuadPoint(0, -10, 0, -10, 0, -9, 0, -9);			
-			points.addQuadPoint(0, -9, 0, -9, 1, -9, 1, -9);			
-			points.addQuadPoint(1, -9, 1, -9, 1, -10, 1, -10);			
-			points.addQuadPoint(1, -10, 1, -10, 0, -10, 0, -10);			
-		}
-		chma.scale(glyphs.scaleH * style.fontSize() / 100.0, glyphs.scaleV * style.fontSize() / 100.0);
-		points.map(chma * chma4);
-		p->setupPolygon(&points, true);
-		QColor oldBrush = p->brush();
-		p->setBrush( (style.effects() & ScStyle_SuppressSpace) ? Qt::green
-					: PrefsManager::instance()->appPrefs.DControlCharColor);
-		if (stroke)
-		{
-			QColor tmp = p->pen();
-			p->setPen(p->brush(), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-			p->setLineWidth(style.fontSize() * glyphs.scaleV / 200.0);
-			p->strokePath();
-			p->setPen(tmp, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-		}
-		else
-		{
-			p->setFillMode(1);
-			p->fillPath();
-		}
-		p->setBrush(oldBrush);
-		if (glyphs.more)
-		{
-			p->translate(glyphs.xadvance, 0);
-			drawGlyphs(p, style, *glyphs.more);
-		}			
-		return;
-	}
-	else if (glyph == (ScFace::CONTROL_GLYPHS + SpecialChars::NBSPACE.unicode()) ||
-			 glyph == (ScFace::CONTROL_GLYPHS + 32)) 
-		glyph = style.font().char2CMap(QChar(' '));
-	else if (glyph == (ScFace::CONTROL_GLYPHS + SpecialChars::NBHYPHEN.unicode()))
-		glyph = style.font().char2CMap(QChar('-'));
-	
-	if (glyph >= ScFace::CONTROL_GLYPHS || (style.effects() & ScStyle_SuppressSpace)) {
-//		qDebug("drawGlyphs: skipping %d", glyph);
-		// all those are empty
-		if (glyphs.more)
-		{
-			p->translate(glyphs.xadvance, 0);
-			drawGlyphs(p, style, *glyphs.more);
-		}			
-		return;
-	}
-//	if (style.font().canRender(QChar(glyph)))
-	{
-		FPointArray gly = style.font().glyphOutline(glyph);
-		// Do underlining first so you can get typographically correct
-		// underlines when drawing a white outline
-		if (((style.effects() & ScStyle_Underline) || ((style.effects() & ScStyle_UnderlineWords) && glyph != style.font().char2CMap(QChar(' ')))) && (style.strokeColor() != CommonStrings::None))
-		{
-			double st, lw;
-			if ((style.underlineOffset() != -1) || (style.underlineWidth() != -1))
-			{
-				if (style.underlineOffset() != -1)
-					st = (style.underlineOffset() / 1000.0) * (style.font().descent(style.fontSize() / 10.0));
-				else
-					st = style.font().underlinePos(style.fontSize() / 10.0);
-				if (style.underlineWidth() != -1)
-					lw = (style.underlineWidth() / 1000.0) * (style.fontSize() / 10.0);
-				else
-					lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0);
-			}
-			else
-			{
-				st = style.font().underlinePos(style.fontSize() / 10.0);
-				lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0);
-			}
-			if (style.baselineOffset() != 0)
-				st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0);
-			QColor tmpC = p->pen();
-			p->setPen(p->brush());
-			p->setLineWidth(lw);
-			if (style.effects() & ScStyle_Subscript)
-				p->drawLine(FPoint(glyphs.xoffset, glyphs.yoffset - st), FPoint(glyphs.xoffset + glyphs.xadvance, glyphs.yoffset - st));
-			else
-				p->drawLine(FPoint(glyphs.xoffset, -st), FPoint(glyphs.xoffset + glyphs.xadvance, -st));
-			p->setPen(tmpC);
-		}
-		if (gly.size() > 3)
-		{
-			if (glyph == 0)
-			{
-//				qDebug() << QString("glyph 0: (%1,%2) * %3 %4 + %5").arg(glyphs.xoffset).arg(glyphs.yoffset).arg(glyphs.scaleH).arg(glyphs.scaleV).arg(glyphs.xadvance));
-			}
-			p->save();
-			p->translate(glyphs.xoffset, glyphs.yoffset - ((style.fontSize() / 10.0) * glyphs.scaleV));
-			if (Reverse)
-			{
-				p->scale(-1, 1);
-				p->translate(-glyphs.xadvance, 0);
-			}
-			if (style.baselineOffset() != 0)
-				p->translate(0, -(style.fontSize() / 10.0) * (style.baselineOffset() / 1000.0));
-			double glxSc = glyphs.scaleH * style.fontSize() / 100.00;
-			double glySc = glyphs.scaleV * style.fontSize() / 100.0;
-			p->scale(glxSc, glySc);
-//			p->setFillMode(1);
-			bool fr = p->fillRule();
-			p->setFillRule(false);
-//			double	a = gly.point(0).x();
-//			double	b = gly.point(0).y();
-//			double	c = gly.point(3).x();
-//			double	d = gly.point(3).y();
-//			qDebug() << QString("drawglyphs: %1 (%2,%3) (%4,%5) scaled %6,%7 trans %8,%9")
-//				   .arg(gly.size()).arg(a).arg(b).arg(c).arg(d)
-//				   .arg(p->worldMatrix().m11()).arg(p->worldMatrix().m22()).arg(p->worldMatrix().dx()).arg(p->worldMatrix().dy());
-			p->setupPolygon(&gly, true);
-			if (m_Doc->layerOutline(LayerNr))
-			{
-				p->save();
-				p->setPen(m_Doc->layerMarker(LayerNr), 0.5, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-				p->setFillMode(ScPainter::None);
-				p->setBrushOpacity(1.0);
-				p->setPenOpacity(1.0);
-				p->strokePath();
-				p->restore();
-				p->setFillRule(fr);
-				p->restore();
-				if (glyphs.more)
-				{
-					p->translate(glyphs.xadvance, 0);
-					drawGlyphs(p, style, *glyphs.more);
-				}
-				return;
-			}
-			if (glyph == 0)
-			{
-				p->setPen(PrefsManager::instance()->appPrefs.DControlCharColor, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-				p->setLineWidth(style.fontSize() * glyphs.scaleV * style.outlineWidth() * 2 / 10000.0);
-				p->strokePath();
-			}
-			else if ((style.font().isStroked()) && (style.strokeColor() != CommonStrings::None) && ((style.fontSize() * glyphs.scaleV * style.outlineWidth() / 10000.0) != 0))
-			{
-				QColor tmp = p->brush();
-				p->setPen(tmp, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-				p->setLineWidth(style.fontSize() * glyphs.scaleV * style.outlineWidth() / 10000.0);
-				p->strokePath();
-			}
-			else
-			{
-				if ((style.effects() & ScStyle_Shadowed) && (style.strokeColor() != CommonStrings::None))
-				{
-					p->save();
-					p->translate((style.fontSize() * glyphs.scaleH * style.shadowXOffset() / 10000.0) / glxSc, -(style.fontSize() * glyphs.scaleV * style.shadowYOffset() / 10000.0) / glySc);
-					QColor tmp = p->brush();
-					p->setBrush(p->pen());
-					p->setupPolygon(&gly, true);
-					p->fillPath();
-					p->setBrush(tmp);
-					p->restore();
-					p->setupPolygon(&gly, true);
-				}
-				if (style.fillColor() != CommonStrings::None)
-					p->fillPath();
-				if ((style.effects() & ScStyle_Outline) && (style.strokeColor() != CommonStrings::None) && ((style.fontSize() * glyphs.scaleV * style.outlineWidth() / 10000.0) != 0))
-				{
-					p->setLineWidth((style.fontSize() * glyphs.scaleV * style.outlineWidth() / 10000.0) / glySc);
-					p->strokePath();
-				}
-			}
-			p->setFillRule(fr);
-			p->restore();
-		}
-		else {
-//			qDebug() << "drawGlyphs: empty glyph" << glyph;
-		}
-		if ((style.effects() & ScStyle_Strikethrough) && (style.strokeColor() != CommonStrings::None))
-		{
-			double st, lw;
-			if ((style.strikethruOffset() != -1) || (style.strikethruWidth() != -1))
-			{
-				if (style.strikethruOffset() != -1)
-					st = (style.strikethruOffset() / 1000.0) * (style.font().ascent(style.fontSize() / 10.0));
-				else
-					st = style.font().strikeoutPos(style.fontSize() / 10.0);
-				if (style.strikethruWidth() != -1)
-					lw = (style.strikethruWidth() / 1000.0) * (style.fontSize() / 10.0);
-				else
-					lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0);
-			}
-			else
-			{
-				st = style.font().strikeoutPos(style.fontSize() / 10.0);
-				lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0);
-			}
-			if (style.baselineOffset() != 0)
-				st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0);
-			p->setPen(p->brush());
-			p->setLineWidth(lw);
-			p->drawLine(FPoint(glyphs.xoffset, glyphs.yoffset - st), FPoint(glyphs.xoffset + glyphs.xadvance, glyphs.yoffset - st));
-		}
-	}
-/*	else
-	{
-		p->setLineWidth(1);
-		p->setPen(red);
-		p->setBrush(red);
-		p->setFillMode(1);
-		p->drawRect(glyphs.xoffset, glyphs.yoffset - (style.fontSize() / 10.0) * glyphs.scaleV , (style.fontSize() / 10.0) * glyphs.scaleH, (style.fontSize() / 10.0) * glyphs.scaleV);
-	}
-	*/	
-	if (glyphs.more)
-	{
-		p->translate(glyphs.xadvance, 0);
-		drawGlyphs(p, style, *glyphs.more);
-	}
-}
-
-void PageItem::DrawPolyL(QPainter *p, QPolygon pts)
-{
-	if (Segments.count() != 0)
-	{
-		QList<uint>::Iterator it2end=Segments.end();
-		uint FirstVal = 0;
-		for (QList<uint>::Iterator it2 = Segments.begin(); it2 != it2end; ++it2)
-		{
-				p->drawPolygon(pts.constData() + FirstVal, (*it2)-FirstVal);
-			FirstVal = (*it2);
-		}
-		p->drawPolygon(pts.constData() + FirstVal, pts.size() - FirstVal);
-	}
-	else
-		p->drawPolygon(pts);
-/*
-	QColor tmp;
-	if (Segments.count() != 0)
-	{
-		QList<uint>::Iterator it2end=Segments.end();
-		uint FirstVal = 0;
-		for (QList<uint>::Iterator it2 = Segments.begin(); it2 != it2end; ++it2)
-		{
-			if (NamedLStyle.isEmpty())
-			{
-				if (lineColor() != CommonStrings::None)
-					p->setPen(QPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin));
-				p->drawPolygon(pts.constData() + FirstVal, (*it2)-FirstVal);
-			}
-			else
-			{
-				multiLine ml = m_Doc->MLineStyles[NamedLStyle];
-				for (int it = ml.size()-1; it > -1; it--)
-				{
-					SetQColor(&tmp, ml[it].Color, ml[it].Shade);
-					p->setPen(QPen(tmp,
-									 qMax(static_cast<int>(ml[it].Width), 1),
-									 static_cast<Qt::PenStyle>(ml[it].Dash),
-									 static_cast<Qt::PenCapStyle>(ml[it].LineEnd),
-									 static_cast<Qt::PenJoinStyle>(ml[it].LineJoin)));
-					p->drawPolygon(pts.constData() + FirstVal, (*it2)-FirstVal);
-				}
-			}
-			FirstVal = (*it2);
-		}
-		if (NamedLStyle.isEmpty())
-		{
-			if (lineColor() != CommonStrings::None)
-				p->setPen(QPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin));
-			p->drawPolygon(pts.constData() + FirstVal, pts.size() - FirstVal);
-		}
-		else
-		{
-			multiLine ml = m_Doc->MLineStyles[NamedLStyle];
-			for (int it = ml.size()-1; it > -1; it--)
-			{
-				SetQColor(&tmp, ml[it].Color, ml[it].Shade);
-				p->setPen(QPen(tmp,
-								 qMax(static_cast<int>(ml[it].Width), 1),
-								 static_cast<Qt::PenStyle>(ml[it].Dash),
-								 static_cast<Qt::PenCapStyle>(ml[it].LineEnd),
-								 static_cast<Qt::PenJoinStyle>(ml[it].LineJoin)));
-				p->drawPolygon(pts.constData() + FirstVal, pts.size() - FirstVal);
-			}
-		}
-	}
-	else
-	{
-		if (NamedLStyle.isEmpty())
-		{
-			if (lineColor() != CommonStrings::None)
-				p->setPen(QPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin));
-			p->drawPolygon(pts);
-		}
-		else
-		{
-			multiLine ml = m_Doc->MLineStyles[NamedLStyle];
-			for (int it = ml.size()-1; it > -1; it--)
-			{
-				SetQColor(&tmp, ml[it].Color, ml[it].Shade);
-				p->setPen(QPen(tmp,
-								 qMax(static_cast<int>(ml[it].Width), 1),
-								 static_cast<Qt::PenStyle>(ml[it].Dash),
-								 static_cast<Qt::PenCapStyle>(ml[it].LineEnd),
-								 static_cast<Qt::PenJoinStyle>(ml[it].LineJoin)));
-				p->drawPolygon(pts);
-			}
-		}
-	} */
-}
-
-void PageItem::setItemName(const QString& newName)
-{
-	if (AnName == newName)
-		return; // nothing to do -> return
-	if (newName.isEmpty())
-		return;
-	QString oldName = AnName;
-	AnName = generateUniqueCopyName(newName);
-	AutoName = false;
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::Rename, QString(Um::FromTo).arg(AnName).arg(newName));
-		ss->set("OLD_NAME", oldName);
-		ss->set("NEW_NAME", newName);
-		undoManager->action(this, ss);
-	}
-	setUName(AnName); // set the name for the UndoObject too
-}
-
-void PageItem::setPattern(const QString &newPattern)
-{
-	if (patternVal != newPattern)
-		patternVal = newPattern;
-}
-
-void PageItem::gradientVector(double& startX, double& startY, double& endX, double& endY) const
-{
-	startX = GrStartX;
-	startY = GrStartY;
-	endX   = GrEndX;
-	endY   = GrEndY;
-}
-
-void PageItem::setGradientVector(double startX, double startY, double endX, double endY)
-{
-	GrStartX = startX;
-	GrStartY = startY;
-	GrEndX   = endX;
-	GrEndY   = endY;
-}
-
-void PageItem::setPatternTransform(double scaleX, double scaleY, double offsetX, double offsetY, double rotation)
-{
-	patternScaleX = scaleX;
-	patternScaleY = scaleY;
-	patternOffsetX = offsetX;
-	patternOffsetY = offsetY;
-	patternRotation = rotation;
-}
-
-void  PageItem::patternTransform(double &scaleX, double &scaleY, double &offsetX, double &offsetY, double &rotation) const
-{
-	 scaleX = patternScaleX;
-	 scaleY = patternScaleY;
-	 offsetX = patternOffsetX;
-	 offsetY = patternOffsetY;
-	 rotation = patternRotation;
-}
-
-void PageItem::setFillColor(const QString &newColor)
-{
-	QString tmp = newColor;
-	if (tmp != CommonStrings::None)
-	{
-		if (!m_Doc->PageColors.contains(newColor))
-		{
-			switch(itemType())
-			{
-				case ImageFrame:
-				case LatexFrame:
-					tmp = m_Doc->toolSettings.dBrushPict;
-				case TextFrame:
-				case PathText:
-					tmp = m_Doc->toolSettings.dTextBackGround;
-					break;
-				case Line:
-				case PolyLine:
-				case Polygon:
-					tmp = m_Doc->toolSettings.dBrush;
-					break;
-				default:
-					break;
-			}
-		}
-	}
-	if (fillColorVal == tmp)
-	{
-		setFillQColor();
-		return;
-	}
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::SetFill,
-										  QString(Um::ColorFromTo).arg(fillColorVal).arg(tmp),
-                                          Um::IFill);
-		ss->set("FILL", "fill");
-		ss->set("OLD_FILL", fillColorVal);
-		ss->set("NEW_FILL", tmp);
-		undoManager->action(this, ss);
-	}
-	fillColorVal = tmp;
-	if (GrType == 0)
-	{
-		fill_gradient = VGradient(VGradient::linear);
-		fill_gradient.clearStops();
-		if (fillColorVal != CommonStrings::None)
-		{
-			const ScColor& col = m_Doc->PageColors[fillColorVal];
-			fill_gradient.addStop(ScColorEngine::getRGBColor(col, m_Doc), 0.0, 0.5, 1.0, fillColorVal, 100);
-			fill_gradient.addStop(ScColorEngine::getRGBColor(col, m_Doc), 1.0, 0.5, 1.0, fillColorVal, 100);
-		}
-	}
-	setFillQColor();
-//CB unused in 135	emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
-}
-
-void PageItem::setFillShade(double newShade)
-{
-	if (fillShadeVal == newShade)
-	{
-		setFillQColor();
-		return;
-	}
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::SetShade,
-										  QString(Um::FromTo).arg(fillShadeVal).arg(newShade),
-										  Um::IShade);
-		ss->set("SHADE", "shade");
-		ss->set("OLD_SHADE", fillShadeVal);
-		ss->set("NEW_SHADE", newShade);
-		undoManager->action(this, ss);
-	}
-	fillShadeVal = newShade;
-	setFillQColor();
-//CB unused in 135	emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
-}
-
-void PageItem::setFillTransparency(double newTransparency)
-{
-	if (fillTransparencyVal == newTransparency)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::Transparency,
-										  QString(Um::FromTo).arg(fillTransparencyVal).arg(newTransparency),
-										  Um::ITransparency);
-		ss->set("TRANSPARENCY", "transparency");
-		ss->set("OLD_TP", fillTransparencyVal);
-		ss->set("NEW_TP", newTransparency);
-		undoManager->action(this, ss);
-	}
-	fillTransparencyVal = newTransparency;
-}
-
-void PageItem::setFillBlendmode(int newBlendmode)
-{
-	if (fillBlendmodeVal == newBlendmode)
-		return; // nothing to do -> return
-	fillBlendmodeVal = newBlendmode;
-}
-
-void PageItem::setLineColor(const QString &newColor)
-{
-	QString tmp = newColor;
-	if (tmp != CommonStrings::None)
-	{
-		if (!m_Doc->PageColors.contains(newColor))
-		{
-			switch(itemType())
-			{
-				case TextFrame:
-				case PathText:
-					tmp = m_Doc->toolSettings.dTextLineColor;
-					break;
-				case Line:
-					tmp = m_Doc->toolSettings.dPenLine;
-					break;
-				case PolyLine:
-				case Polygon:
-				case ImageFrame:
-				case LatexFrame:
-					tmp = m_Doc->toolSettings.dPen;
-					break;
-				default:
-					break;
-			}
-		}
-	}
-	if (lineColorVal == tmp)
-	{
-		setLineQColor();
-		return;
-	}
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::SetLineColor,
-										  QString(Um::ColorFromTo).arg(lineColorVal).arg(tmp),
-										  Um::IFill);
-		ss->set("LINE_COLOR", "line_color");
-		ss->set("OLD_COLOR", lineColorVal);
-		ss->set("NEW_COLOR", tmp);
-		undoManager->action(this, ss);
-	}
-	lineColorVal = tmp;
-	setLineQColor();
-//CB unused in 135	emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
-}
-
-void PageItem::setLineShade(double newShade)
-{
-	if (lineShadeVal == newShade)
-	{
-		setLineQColor();
-		return;
-	}
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::SetLineShade,
-										  QString(Um::FromTo).arg(lineShadeVal).arg(newShade),
-										  Um::IShade);
-		ss->set("LINE_SHADE", "line_shade");
-		ss->set("OLD_SHADE", lineShadeVal);
-		ss->set("NEW_SHADE", newShade);
-		undoManager->action(this, ss);
-	}
-	lineShadeVal = newShade;
-	setLineQColor();
-//CB unused in 135	emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
-}
-
-void PageItem::setLineQColor()
-{
-	if (lineColorVal != CommonStrings::None)
-	{
-		if (!m_Doc->PageColors.contains(lineColorVal))
-		{
-			switch(itemType())
-			{
-				case TextFrame:
-				case PathText:
-					lineColorVal = m_Doc->toolSettings.dTextLineColor;
-					break;
-				case Line:
-					lineColorVal = m_Doc->toolSettings.dPenLine;
-					break;
-				case PolyLine:
-				case Polygon:
-				case ImageFrame:
-				case LatexFrame:
-					lineColorVal = m_Doc->toolSettings.dPen;
-					break;
-				default:
-					break;
-			}
-		}
-		if (!m_Doc->PageColors.contains(lineColorVal))
-			lineColorVal = m_Doc->toolSettings.dPen;
-		const ScColor& col = m_Doc->PageColors[lineColorVal];
-		strokeQColor = ScColorEngine::getShadeColorProof(col, m_Doc, lineShadeVal);
-	}
-	if ((m_Doc->view()) && (m_Doc->view()->m_canvas->usePreviewVisual()))
-	{
-		VisionDefectColor defect;
-		strokeQColor = defect.convertDefect(strokeQColor, m_Doc->view()->m_canvas->previewVisual());
-	}
-}
-
-void PageItem::setFillQColor()
-{
-	if (fillColorVal != CommonStrings::None)
-	{
-		if (!m_Doc->PageColors.contains(fillColorVal))
-		{
-			switch(itemType())
-			{
-				case ImageFrame:
-				case LatexFrame:
-					fillColorVal = m_Doc->toolSettings.dBrushPict;
-				case TextFrame:
-				case PathText:
-					fillColorVal = m_Doc->toolSettings.dTextBackGround;
-					break;
-				case Line:
-				case PolyLine:
-				case Polygon:
-					fillColorVal = m_Doc->toolSettings.dBrush;
-					break;
-				default:
-					break;
-			}
-		}
-		const ScColor& col = m_Doc->PageColors[fillColorVal];
-		fillQColor = ScColorEngine::getShadeColorProof(col, m_Doc, fillShadeVal);
-	}
-	if ((m_Doc->view()) && (m_Doc->view()->m_canvas->usePreviewVisual()))
-	{
-		VisionDefectColor defect;
-		fillQColor = defect.convertDefect(fillQColor, m_Doc->view()->m_canvas->previewVisual());
-	}
-}
-
-void PageItem::setLineTransparency(double newTransparency)
-{
-	if (lineTransparencyVal == newTransparency)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::LineTransparency,
-										  QString(Um::FromTo).arg(lineTransparencyVal).arg(newTransparency),
-										  Um::ITransparency);
-		ss->set("LINE_TRANSPARENCY", "transparency");
-		ss->set("OLD_TP", lineTransparencyVal);
-		ss->set("NEW_TP", newTransparency);
-		undoManager->action(this, ss);
-	}
-	lineTransparencyVal = newTransparency;
-}
-
-void PageItem::setLineBlendmode(int newBlendmode)
-{
-	if (lineBlendmodeVal == newBlendmode)
-		return; // nothing to do -> return
-	lineBlendmodeVal = newBlendmode;
-}
-
-void PageItem::setLineStyle(Qt::PenStyle newStyle)
-{
-	if (PLineArt == newStyle)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::LineStyle,"",Um::ILineStyle);
-		ss->set("LINE_STYLE", "line_style");
-		ss->set("OLD_STYLE", static_cast<int>(PLineArt));
-		ss->set("NEW_STYLE", static_cast<int>(newStyle));
-		undoManager->action(this, ss);
-	}
-	PLineArt = newStyle;
-}
-
-void PageItem::setLineWidth(double newWidth)
-{
-	if (m_lineWidth == newWidth)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::LineWidth,
-						QString(Um::FromTo).arg(m_lineWidth).arg(newWidth),Um::ILineStyle);
-		ss->set("LINE_WIDTH", "line_width");
-		ss->set("OLD_WIDTH", m_lineWidth);
-		ss->set("NEW_WIDTH", newWidth);
-		undoManager->action(this, ss);
-	}
-	Oldm_lineWidth=m_lineWidth;
-	m_lineWidth = newWidth;
-}
-
-void PageItem::setLineEnd(Qt::PenCapStyle newStyle)
-{
-	if (PLineEnd == newStyle)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::LineEnd,"",Um::ILineStyle);
-		ss->set("LINE_END", "line_end");
-		ss->set("OLD_STYLE", static_cast<int>(PLineEnd));
-		ss->set("NEW_STYLE", static_cast<int>(newStyle));
-		undoManager->action(this, ss);
-	}
-	PLineEnd = newStyle;
-}
-
-void PageItem::setLineJoin(Qt::PenJoinStyle newStyle)
-{
-	if (PLineJoin == newStyle)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::LineJoin,"",Um::ILineStyle);
-		ss->set("LINE_JOIN", "line_join");
-		ss->set("OLD_STYLE", static_cast<int>(PLineJoin));
-		ss->set("NEW_STYLE", static_cast<int>(newStyle));
-		undoManager->action(this, ss);
-	}
-	PLineJoin = newStyle;
-}
-
-void PageItem::setCustomLineStyle(const QString& newStyle)
-{
-	if (NamedLStyle == newStyle)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		QString oldStyle = NamedLStyle.isEmpty() ? Um::NoStyle : NamedLStyle;
-		QString nStyle   = newStyle.isEmpty() ? Um::NoStyle : newStyle;
-		QString action   = newStyle.isEmpty() ? Um::NoLineStyle : Um::CustomLineStyle;
-		SimpleState *ss = new SimpleState(action,
-				QString(Um::FromTo).arg(oldStyle).arg(nStyle),Um::ILineStyle);
-		ss->set("CUSTOM_LINE_STYLE", "customlinestyle");
-		ss->set("OLD_STYLE", NamedLStyle);
-		ss->set("NEW_STYLE", newStyle);
-		undoManager->action(this, ss);
-	}
-	NamedLStyle = newStyle;
-}
-
-void PageItem::setStartArrowIndex(int newIndex)
-{
-	if (m_startArrowIndex == newIndex)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::StartArrow,"",Um::IArrow);
-		ss->set("START_ARROW", "startarrow");
-		ss->set("OLD_INDEX", m_startArrowIndex);
-		ss->set("NEW_INDEX", newIndex);
-		undoManager->action(this, ss);
-	}
-	m_startArrowIndex = newIndex;
-}
-
-void PageItem::setEndArrowIndex(int newIndex)
-{
-	if (m_endArrowIndex == newIndex)
-		return; // nothing to do -> return
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::EndArrow,"",Um::IArrow);
-		ss->set("END_ARROW", "endarrow");
-		ss->set("OLD_INDEX", m_endArrowIndex);
-		ss->set("NEW_INDEX", newIndex);
-		undoManager->action(this, ss);
-	}
-	m_endArrowIndex = newIndex;
-}
-
-void PageItem::setImageFlippedH(bool flipped)
-{
-	if (flipped != m_ImageIsFlippedH)
-		flipImageH();
-}
-
-void PageItem::flipImageH()
-{
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::FlipH, 0, Um::IFlipH);
-		ss->set("IMAGEFLIPH", "imagefliph");
-		undoManager->action(this, ss);
-	}
-	m_ImageIsFlippedH = !m_ImageIsFlippedH;
-	emit frameFlippedH(m_ImageIsFlippedH);
-}
-
-void PageItem::setImageFlippedV(bool flipped)
-{
-	if (flipped != m_ImageIsFlippedV)
-		flipImageV();
-}
-
-void PageItem::flipImageV()
-{
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::FlipV, 0, Um::IFlipV);
-		ss->set("IMAGEFLIPV", "imageflipv");
-		undoManager->action(this, ss);
-	}
-	m_ImageIsFlippedV = !m_ImageIsFlippedV;
-	emit frameFlippedV(m_ImageIsFlippedV);
-}
-
-void PageItem::setImageScalingMode(bool freeScale, bool keepRatio)
-{
-	if (ScaleType == freeScale && AspectRatio == keepRatio)
-		return;
-	if (UndoManager::undoEnabled())
-	{
-		QString from = ScaleType ? Um::FreeScaling : Um::FrameSize;
-		from += ", ";
-		from += AspectRatio ? Um::KeepRatio : Um::BreakRatio;
-		QString to = freeScale ? Um::FreeScaling : Um::FrameSize;
-		to += ", ";
-		to += keepRatio ? Um::KeepRatio : Um::BreakRatio;
-		SimpleState *ss = new SimpleState(Um::ImageScaling, QString(Um::FromTo).arg(from).arg(to), Um::IImageScaling);
-		ss->set("SCALE_MODE", "scaling_mode");
-		if (freeScale != ScaleType)
-		{
-			ss->set("SCALE_TYPE", freeScale);
- 			if (!freeScale)
-			{
-				//if switching from free scaling to frame size
-				//in undo must be offset and scale saved
-				ss->set("OLD_IMAGEXOFFSET", LocalX);
-				ss->set("OLD_IMAGEYOFFSET", LocalY);
-				ss->set("OLD_IMAGEXSCALE", LocalScX);
-				ss->set("OLD_IMAGEYSCALE", LocalScY);
-			}
-		}
-		if (keepRatio != AspectRatio)
-			ss->set("ASPECT_RATIO", keepRatio);
-		undoManager->action(this, ss);
-	}
-	ScaleType = freeScale;
-	AspectRatio = keepRatio;
-	AdjustPictScale();
-	update();
-}
-
-void PageItem::toggleLock()
-{
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss;
-		if (m_Locked)
-			ss = new SimpleState(Um::UnLock, 0, Um::IUnLock);
-		else
-			ss = new SimpleState(Um::Lock, 0, Um::ILock);
-		ss->set("LOCK", "lock");
-		undoManager->action(this, ss);
-	}
-	m_Locked = !m_Locked;
-	emit frameLocked(m_Locked);
-}
-
-void PageItem::setLocked(bool isLocked)
-{
-	if (isLocked != m_Locked)
-		toggleLock();
-}
-
-void PageItem::setGroupsLastItem(PageItem* item)
-{
-	if (UndoManager::undoEnabled())
-	{
-		ItemState<std::pair<PageItem*, PageItem*> > *is = new ItemState<std::pair<PageItem*, PageItem*> >("GroupsLastItem");
-		is->set("GROUPS_LASTITEM", "groups_lastitem");
-		is->setItem(std::pair<PageItem*, PageItem*>(this->groupsLastItem, item));
-		undoManager->action(this, is);
-	}
-	groupsLastItem = item;
-}
-
-void PageItem::toggleSizeLock()
-{
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss;
-		if (m_SizeLocked)
-			ss = new SimpleState(Um::SizeUnLock, 0, Um::IUnLock);
-		else
-			ss = new SimpleState(Um::SizeLock, 0, Um::ILock);
-		ss->set("SIZE_LOCK", "size_lock");
-		undoManager->action(this, ss);
-	}
-	m_SizeLocked = !m_SizeLocked;
-	emit frameSizeLocked(m_SizeLocked);
-}
-
-void PageItem::setSizeLocked(bool isLocked)
-{
-	if (isLocked != m_SizeLocked)
-		toggleSizeLock();
-}
-
-
-void PageItem::setPrintEnabled(bool toPrint)
-{
-	if (toPrint != m_PrintEnabled)
-		togglePrintEnabled();
-}
-
-void PageItem::togglePrintEnabled()
-{
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss;
-		if (m_PrintEnabled)
-			ss = new SimpleState(Um::DisablePrint, 0, Um::IDisablePrint);
-		else
-			ss = new SimpleState(Um::EnablePrint, 0, Um::IEnablePrint);
-		ss->set("PRINT_ENABLED", "print_enabled");
-		undoManager->action(this, ss);
-	}
-	m_PrintEnabled=!m_PrintEnabled;
-	emit printEnabled(m_PrintEnabled);
-}
-
-void PageItem::setTextFlowMode(TextFlowMode mode)
-{
-	if (textFlowModeVal == mode)
-		return;
-	if (UndoManager::undoEnabled())
-	{
-		QString stateMessage;
-		if( mode == TextFlowUsesFrameShape )
-			stateMessage = Um::ObjectFrame;
-		else if( mode == TextFlowUsesBoundingBox )
-			stateMessage = Um::BoundingBox;
-		else if( mode == TextFlowUsesContourLine )
-			stateMessage = Um::ContourLine;
-		else if( mode == TextFlowUsesImageClipping )
-			stateMessage = Um::ImageClip;
-		else
-			stateMessage = Um::NoTextFlow;
-		SimpleState *ss = new SimpleState(stateMessage, "", Um::IFont);
-		ss->set("TEXTFLOW_OLDMODE", (int) textFlowModeVal);
-		ss->set("TEXTFLOW_NEWMODE", (int) mode);
-		undoManager->action(this, ss);
-	}
-	textFlowModeVal = mode;
-	
-	checkTextFlowInteractions();
-}
-
-void PageItem::checkTextFlowInteractions(bool allItems)
-{	
-	if(!m_Doc->isLoading())
-	{
-		QRectF baseRect(getBoundingRect());
-		QList<PageItem*>* items = OnMasterPage.isEmpty() ? &m_Doc->DocItems : &m_Doc->MasterItems;
-		for(int idx = (allItems ? items->count()-1 : ItemNr-1); idx >= 0 ; --idx)
-		{
-			if(idx != static_cast<int>(ItemNr)) // avoids itself
-			{
-				if(items->at(idx)->asTextFrame()) // do not bother with no text frames
-				{
-					QRectF uRect(items->at(idx)->getBoundingRect());
-					if(baseRect.intersects(uRect))
-					{
-						items->at(idx)->update();
-					}
-				}
-			}
-		}
-	}
-}
-
-void PageItem::convertTo(ItemType newType)
-{
-	if (m_ItemType == newType)
-		return; // nothing to do -> return
-	assert(newType != 1);	//DEBUG CR 2005-02-06
-	assert(newType != 3);	//DEBUG CR 2005-02-06
-	QString fromType = "", toType = "";
-	switch (m_ItemType)
-	{
-		case ImageFrame:
-			if (asLatexFrame()) {
-				fromType = Um::LatexFrame;
-			} else {
-				fromType = Um::ImageFrame;
-			}
-			break;
-		case TextFrame:
-			fromType = Um::TextFrame;
-			break;
-		case Polygon:
-			fromType = Um::Polygon;
-			break;
-		default:
-			fromType = "";
-			break;
-	}
-	switch (newType)
-	{
-		case ImageFrame:
-			toType = Um::ImageFrame;
-			setUPixmap(Um::IImageFrame);
-			break;
-		case LatexFrame:
-			toType = Um::LatexFrame;
-			setUPixmap(Um::ILatexFrame);
-			break;
-		case TextFrame:
-			toType = Um::TextFrame;
-			setUPixmap(Um::ITextFrame);
-			break;
-		case Polygon:
-			toType = Um::Polygon;
-			setUPixmap(Um::IPolygon);
-			break;
-		case PolyLine:
-			toType = Um::Polyline;
-			setUPixmap(Um::IPolyline);
-			break;
-		default:
-			toType = "";
-			setUPixmap(NULL);
-			break;
-	}
-	/*
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::ConvertTo + " " + toType,
-										  QString(Um::FromTo).arg(fromType).arg(toType));
-		ss->set("CONVERT", "convert");
-		ss->set("PAGEITEM", reinterpret_cast<int>(this));
-		ss->set("OLD_TYPE", m_ItemType);
-		ss->set("NEW_TYPE", newType);
-		undoManager->action(this, ss);
-	}
-	*/
-	m_ItemType = newType;
-	emit frameType(m_ItemType);
-}
-
-void PageItem::setLayer(int layerId)
-{
-	if (LayerNr == layerId)
-		return;
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::SendToLayer,
-										  QString(Um::FromTo).arg(LayerNr).arg(layerId),
-										  Um::ILayerAction);
-		ss->set("SEND_TO_LAYER", "send_to_layer");
-		ss->set("OLD_LAYER", LayerNr);
-		ss->set("NEW_LAYER", layerId);
-		undoManager->action(this, ss);
-	}
-	LayerNr = layerId;
-}
-
-void PageItem::checkChanges(bool force)
-{
-	bool spreadChanges(false);
-	// has the item been resized
-	if (force || ((oldWidth != Width || oldHeight != Height) && shouldCheck()))
-	{
-		resizeUndoAction();
-		spreadChanges = (textFlowMode() != TextFlowDisabled );
-	}
-	// has the item been rotated
-	if (force || ((oldRot != Rot) && (shouldCheck())))
-	{
-		rotateUndoAction();
-		spreadChanges = (textFlowMode() != TextFlowDisabled );
-	}
-	// has the item been moved
-	if (force || ((oldXpos != Xpos || oldYpos != Ypos) && shouldCheck()))
-	{
-		moveUndoAction();
-		spreadChanges = (textFlowMode() != TextFlowDisabled );
-	}
-	// has the item's image been moved
-	if (force || ((oldLocalX != LocalX || oldLocalY != LocalY) && shouldCheck()))
-		changeImageOffsetUndoAction();
-	// has the item's image been scaled
-	if (force || ((oldLocalScX != LocalScX || oldLocalScY != LocalScY) && shouldCheck()))
-		changeImageScaleUndoAction();
-	
-	if(spreadChanges)
-	{
-		checkTextFlowInteractions();
-	}
-}
-
-bool PageItem::shouldCheck()
-{
-	return ((!m_Doc->view()->mousePressed()) &&
-			(!ScCore->primaryMainWindow()->arrowKeyDown()) &&
-			(!ScCore->primaryMainWindow()->propertiesPalette->userActionOn()));
-}
-
-void PageItem::moveUndoAction()
-{
-	if (oldXpos == Xpos && oldYpos == Ypos)
-		return;
-	if (UndoManager::undoEnabled())
-	{
-		QString oldp;
-		QString newp;
-		if (oldOwnPage == -1)
-			oldp = Um::ScratchSpace;
-		else
-			oldp = QString(Um::PageNmbr).arg(m_Doc->FirstPnum + oldOwnPage);
-		if (OwnPage == -1)
-			newp = Um::ScratchSpace;
-		else
-			newp = QString(Um::PageNmbr).arg(m_Doc->FirstPnum + OwnPage);
-		SimpleState *ss = new SimpleState(Um::Move,
-                                          QString(Um::MoveFromTo).arg(oldXpos).arg(oldYpos).arg(oldp).
-                                                                  arg(Xpos).arg(Ypos).arg(newp), Um::IMove);
-		ss->set("OLD_XPOS", oldXpos);
-		ss->set("OLD_YPOS", oldYpos);
-		ss->set("NEW_XPOS", Xpos);
-		ss->set("NEW_YPOS", Ypos);
-		undoManager->action(this, ss);
-	}
-	oldXpos = Xpos;
-	oldYpos = Ypos;
-	oldOwnPage = OwnPage;
-}
-
-void PageItem::resizeUndoAction()
-{
-	if (oldHeight == Height && oldWidth == Width)
-		return;
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::Resize,
-                           QString(Um::ResizeFromTo).arg(oldWidth).arg(oldHeight).arg(Width).arg(Height),
-                                          Um::IResize);
-		ss->set("OLD_WIDTH", oldWidth);
-		ss->set("OLD_HEIGHT", oldHeight);
-		ss->set("NEW_WIDTH", Width);
-		ss->set("NEW_HEIGHT", Height);
-		ss->set("OLD_RXPOS", oldXpos);
-		ss->set("OLD_RYPOS", oldYpos);
-		ss->set("NEW_RXPOS", Xpos);
-		ss->set("NEW_RYPOS", Ypos);
-		ss->set("OLD_RROT", oldRot);
-		ss->set("NEW_RROT", Rot);
-		undoManager->action(this, ss);
-	}
-	oldXpos = Xpos;
-	oldYpos = Ypos;
-	oldHeight = Height;
-	oldWidth = Width;
-	oldOwnPage = OwnPage;
-	oldRot = Rot;
-}
-
-void PageItem::rotateUndoAction()
-{
-	if (oldRot == Rot)
-		return;
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::Rotate,
-                                          QString(Um::FromTo).arg(oldRot).arg(Rot),
-                                          Um::IRotate);
-		ss->set("OLD_ROT", oldRot);
-		ss->set("NEW_ROT", Rot);
-		ss->set("OLD_RXPOS", oldXpos);
-		ss->set("OLD_RYPOS", oldYpos);
-		ss->set("NEW_RXPOS", Xpos);
-		ss->set("NEW_RYPOS", Ypos);
-		ss->set("OLD_RWIDTH", oldWidth);
-		ss->set("OLD_RHEIGHT", oldHeight);
-		ss->set("NEW_RWIDTH", Width);
-		ss->set("NEW_RHEIGHT", Height);
-		undoManager->action(this, ss);
-	}
-	oldRot = Rot;
-	oldXpos = Xpos;
-	oldYpos = Ypos;
-	oldOwnPage = OwnPage;
-	oldWidth = Width;
-	oldHeight = Height;
-}
-
-void PageItem::changeImageOffsetUndoAction()
-{
-	if (oldLocalX == LocalX && oldLocalY == LocalY)
-		return;
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::ImageOffset,
-			QString(Um::ImageOffsetFromTo).arg(oldLocalX).arg(oldLocalY).arg(LocalX).arg(LocalY), Um::IMove);
-		ss->set("IMAGE_OFFSET", "image_offset");
-		ss->set("OLD_IMAGEXOFFSET", oldLocalX);
-		ss->set("OLD_IMAGEYOFFSET", oldLocalY);
-		ss->set("NEW_IMAGEXOFFSET", LocalX);
-		ss->set("NEW_IMAGEYOFFSET", LocalY);
-		undoManager->action(this, ss);
-	}
-	oldLocalX = LocalX;
-	oldLocalY = LocalY;
-}
-
-void PageItem::changeImageScaleUndoAction()
-{
-	//#9817: Hack for this rounding issue caused by conversion to text values. Undo needs fixing.
-	if ((ScCLocale::toDoubleC(ScCLocale::toQStringC(oldLocalScX)) ==
-		ScCLocale::toDoubleC(ScCLocale::toQStringC(LocalScX)))
-		&& (ScCLocale::toDoubleC(ScCLocale::toQStringC(oldLocalScY)) ==
-		ScCLocale::toDoubleC(ScCLocale::toQStringC(LocalScY))))
-		return;
-	if (UndoManager::undoEnabled())
-	{
-		SimpleState *ss = new SimpleState(Um::ImageScale,
-			QString(Um::ImageScaleFromTo).arg(oldLocalScX).arg(oldLocalScY).arg(LocalScX).arg(LocalScY), Um::IMove);
-		ss->set("IMAGE_SCALE", "image_scale");
-		ss->set("OLD_IMAGEXSCALE", oldLocalScX);
-		ss->set("OLD_IMAGEYSCALE", oldLocalScY);
-		ss->set("NEW_IMAGEXSCALE", LocalScX);
-		ss->set("NEW_IMAGEYSCALE", LocalScY);
-		undoManager->action(this, ss);
-	}
-	oldLocalScX = LocalScX;
-	oldLocalScY = LocalScY;
-}
-
-void PageItem::restore(UndoState *state, bool isUndo)
-{
-	bool useRasterBackup = m_Doc->useRaster;
-	bool SnapGuidesBackup = m_Doc->SnapGuides;
-	m_Doc->useRaster = false;
-	m_Doc->SnapGuides = false;
-	SimpleState *ss = dynamic_cast<SimpleState*>(state);
-	bool oldMPMode=m_Doc->masterPageMode();
-	m_Doc->setMasterPageMode(!OnMasterPage.isEmpty());
-	Page *oldCurrentPage = m_Doc->currentPage();
-	if (!OnMasterPage.isEmpty())
-	{
-		oldCurrentPage = m_Doc->currentPage();
-		m_Doc->setCurrentPage(m_Doc->MasterPages.at(m_Doc->MasterNames[OnMasterPage]));
-	}
-	if (ss)
-	{
-		if (ss->contains("OLD_XPOS"))
-			restoreMove(ss, isUndo);
-		else if (ss->contains("OLD_HEIGHT"))
-			restoreResize(ss, isUndo);
-		else if (ss->contains("OLD_ROT"))
-			restoreRotate(ss, isUndo);
-		else if (ss->contains("FILL"))
-			restoreFill(ss, isUndo);
-		else if (ss->contains("SHADE"))
-			restoreShade(ss, isUndo);
-		else if (ss->contains("LINE_COLOR"))
-			restoreLineColor(ss, isUndo);
-		else if (ss->contains("LINE_SHADE"))
-			restoreLineShade(ss, isUndo);
-		else if (ss->contains("IMAGEFLIPH"))
-		{
-			select();
-			m_Doc->itemSelection_FlipH();
-		}
-		else if (ss->contains("IMAGEFLIPV"))
-		{
-			select();
-			m_Doc->itemSelection_FlipV();
-		}
-		else if (ss->contains("LOCK"))
-		{
-			select();
-			m_Doc->itemSelection_ToggleLock();
-		}
-		else if (ss->contains("SIZE_LOCK"))
-		{
-			select();
-			m_Doc->itemSelection_ToggleSizeLock();
-		}
-		else if (ss->contains("PRINT_ENABLED"))
-		{
-			select();
-			m_Doc->itemSelection_TogglePrintEnabled();
-		}
-		else if (ss->contains("NEW_NAME"))
-			restoreName(ss, isUndo);
-		else if (ss->contains("TRANSPARENCY"))
-			restoreFillTP(ss, isUndo);
-		else if (ss->contains("LINE_TRANSPARENCY"))
-			restoreLineTP(ss, isUndo);
-		else if (ss->contains("LINE_STYLE"))
-			restoreLineStyle(ss, isUndo);
-		else if (ss->contains("LINE_END"))
-			restoreLineEnd(ss, isUndo);
-		else if (ss->contains("LINE_JOIN"))
-			restoreLineJoin(ss, isUndo);
-		else if (ss->contains("LINE_WIDTH"))
-			restoreLineWidth(ss, isUndo);
-		else if (ss->contains("CUSTOM_LINE_STYLE"))
-			restoreCustomLineStyle(ss, isUndo);
-		else if (ss->contains("START_ARROW"))
-			restoreArrow(ss, isUndo, true);
-		else if (ss->contains("END_ARROW"))
-			restoreArrow(ss, isUndo, false);
-		else if (ss->contains("PSTYLE"))
-			restorePStyle(ss, isUndo);
-		else if (ss->contains("CONVERT"))
-			restoreType(ss, isUndo);
-		else if (ss->contains("TEXTFLOW_OLDMODE"))
-			restoreTextFlowing(ss, isUndo);
-		else if (ss->contains("SCALE_MODE"))
-			restoreImageScaleMode(ss, isUndo);
-		else if (ss->contains("IMAGE_SCALE"))
-			restoreImageScaleChange(ss, isUndo);
-		else if (ss->contains("IMAGE_OFFSET"))
-			restoreImageOffsetChange(ss, isUndo);	
-		else if (ss->contains("EDIT_CONTOUR"))
-			restorePoly(ss, isUndo, true);
-		else if (ss->contains("EDIT_SHAPE"))
-			restorePoly(ss, isUndo, false);
-		else if (ss->contains("RESET_CONTOUR"))
-			restoreContourLine(ss, isUndo);
-		else if (ss->contains("CHANGE_SHAPE_TYPE"))
-			restoreShapeType(ss, isUndo);
-		else if (ss->contains("MIRROR_PATH_H"))
-		{
-			bool editContour = m_Doc->nodeEdit.isContourLine;
-			m_Doc->nodeEdit.isContourLine = ss->getBool("IS_CONTOUR");
-			select();
-			m_Doc->MirrorPolyH(m_Doc->m_Selection->itemAt(0));
-			m_Doc->nodeEdit.isContourLine = editContour;
-		}
-		else if (ss->contains("MIRROR_PATH_V"))
-		{
-			bool editContour = m_Doc->nodeEdit.isContourLine;
-			m_Doc->nodeEdit.isContourLine = ss->getBool("IS_CONTOUR");
-			select();
-			m_Doc->MirrorPolyV(m_Doc->m_Selection->itemAt(0));
-			m_Doc->nodeEdit.isContourLine = editContour;
-		}
-		else if (ss->contains("SEND_TO_LAYER"))
-			restoreLayer(ss, isUndo);
-		else if (ss->contains("GET_IMAGE"))
-			restoreGetImage(ss, isUndo);
-		else if (ss->contains("GROUPS_LASTITEM"))
-			restoreGroupsLastItem(ss, isUndo);
-		else if (ss->contains("EDIT_SHAPE_OR_CONTOUR"))
-			restoreShapeContour(ss, isUndo);
-		else if (ss->contains("APPLY_IMAGE_EFFECTS"))
-			restoreImageEffects(ss, isUndo);
-		else if (ss->contains("STEXT"))
-			restoreEditText(ss, isUndo);
-		else if (ss->contains("CLEAR_IMAGE"))
-			restoreClearImage(ss,isUndo);
-		else if (ss->contains("LINK_TEXT_FRAME"))
-			restoreLinkTextFrame(ss,isUndo);
-		else if (ss->contains("UNLINK_TEXT_FRAME"))
-			restoreUnlinkTextFrame(ss,isUndo);
-	}
-	if (!OnMasterPage.isEmpty())
-		m_Doc->setCurrentPage(oldCurrentPage);
-	m_Doc->setMasterPageMode(oldMPMode);
-	m_Doc->useRaster = useRasterBackup;
-	m_Doc->SnapGuides = SnapGuidesBackup;
-}
-
-void PageItem::restoreMove(SimpleState *state, bool isUndo)
-{
-	double ox = state->getDouble("OLD_XPOS");
-	double oy = state->getDouble("OLD_YPOS");
-	double  x = state->getDouble("NEW_XPOS");
-	double  y = state->getDouble("NEW_YPOS");
-	double mx = ox - x;
-	double my = oy - y;
-	if (!isUndo)
-	{
-		mx = -mx;
-		my = -my;
-	}
-	m_Doc->MoveItem(mx, my, this, false);
-	oldXpos = Xpos;
-	oldYpos = Ypos;
-	oldOwnPage = OwnPage;
-}
-
-void PageItem::restoreResize(SimpleState *state, bool isUndo)
-{
-	double  ow = state->getDouble("OLD_WIDTH");
-	double  oh = state->getDouble("OLD_HEIGHT");
-	double   w = state->getDouble("NEW_WIDTH");
-	double   h = state->getDouble("NEW_HEIGHT");
-	double  ox = state->getDouble("OLD_RXPOS");
-	double  oy = state->getDouble("OLD_RYPOS");
-	double   x = state->getDouble("NEW_RXPOS");
-	double   y = state->getDouble("NEW_RYPOS");
-	double ort = state->getDouble("OLD_RROT");
-	double  rt = state->getDouble("NEW_RROT");
-	double  mx = ox - x;
-	double  my = oy - y;
-	int  stateCode = state->transactionCode;
-	bool redraw = ((stateCode != 1) && (stateCode != 3));
-	if (isUndo)
-	{
-		m_Doc->SizeItem(ow, oh, this, false, true, redraw);
-		m_Doc->MoveItem(mx, my, this, false);
-		m_Doc->RotateItem(ort, this);
-	}
-	else
-	{
-		mx = -mx;
-		my = -my;
-		m_Doc->SizeItem(w, h, this, false, true, redraw);
-		m_Doc->MoveItem(mx, my, this, false);
-		m_Doc->RotateItem(rt, this);
-	}
-	oldWidth = Width;
-	oldHeight = Height;
-	oldXpos = Xpos;
-	oldYpos = Ypos;
-	oldOwnPage = OwnPage;
-	oldRot = Rot;
-}
-
-void PageItem::restoreRotate(SimpleState *state, bool isUndo)
-{
-	double ort = state->getDouble("OLD_ROT");
-	double  rt = state->getDouble("NEW_ROT");
-	double  ox = state->getDouble("OLD_RXPOS");
-	double  oy = state->getDouble("OLD_RYPOS");
-	double   x = state->getDouble("NEW_RXPOS");
-	double   y = state->getDouble("NEW_RYPOS");
-	double  ow = state->getDouble("OLD_RWIDTH");
-	double  oh = state->getDouble("OLD_RHEIGHT");
-	double   w = state->getDouble("NEW_RWIDTH");
-	double   h = state->getDouble("NEW_RHEIGHT");
-	int  stateCode = state->transactionCode;
-	bool redraw = ((stateCode != 1) && (stateCode != 3));;
-	//CB Commented out test code
-	//QRect oldR(getRedrawBounding(view->scale()));
-	//double mx = ox - x;
-	//double my = oy - y;
-	if (isUndo)
-	{
-		/*Rot=ort;
-		Xpos+=mx;
-		Ypos+=my;
-		Width=ow;
-		Height=oh;*/
-		m_Doc->RotateItem(ort, this);
-		m_Doc->MoveItem(ox - Xpos, oy - Ypos, this, false);
-		m_Doc->SizeItem(ow, oh, this, false, true, redraw);
-	}
-	else
-	{
-		/*mx = -mx;
-		my = -my;
-		Rot=rt;
-		Xpos-=mx;
-		Ypos-=my;
-		Width=w;
-		Height=h;
-		*/
-		m_Doc->RotateItem(rt, this);
-		m_Doc->MoveItem(x - Xpos, y - Ypos, this, false);
-		m_Doc->SizeItem(w, h, this, false, true, redraw);
-	}
-	/*
-	m_Doc->setRedrawBounding(this);
-	QRect newR(getRedrawBounding(view->scale()));
-	view->updateContents(newR.unite(oldR));
-	OwnPage = m_Doc->OnPage(this);
-	*/
-	oldRot = Rot;
-	oldXpos = Xpos;
-	oldYpos = Ypos;
-	oldOwnPage = OwnPage;
-	oldWidth = Width;
-	oldHeight = Height;
-}
-
-void PageItem::restoreFill(SimpleState *state, bool isUndo)
-{
-	QString fill = state->get("OLD_FILL");
-	if (!isUndo)
-		fill = state->get("NEW_FILL");
-	select();
-	m_Doc->itemSelection_SetItemBrush(fill);
-}
-
-void PageItem::restoreShade(SimpleState *state, bool isUndo)
-{
-	int shade = state->getInt("OLD_SHADE");
-	if (!isUndo)
-		shade = state->getInt("NEW_SHADE");
-	select();
-	m_Doc->itemSelection_SetItemBrushShade(shade);
-}
-
-void PageItem::restoreLineColor(SimpleState *state, bool isUndo)
-{
-	QString fill = state->get("OLD_COLOR");
-	if (!isUndo)
-		fill = state->get("NEW_COLOR");
-	select();
-	m_Doc->itemSelection_SetItemPen(fill);
-}
-
-void PageItem::restoreLineShade(SimpleState *state, bool isUndo)
-{
-	int shade = state->getInt("OLD_SHADE");
-	if (!isUndo)
-		shade = state->getInt("NEW_SHADE");
-	select();
-	m_Doc->itemSelection_SetItemPenShade(shade);
-}
-
-void PageItem::restoreFillTP(SimpleState *state, bool isUndo)
-{
-	double tp = state->getDouble("OLD_TP");
-	if (!isUndo)
-		tp = state->getDouble("NEW_TP");
-	select();
-	m_Doc->itemSelection_SetItemFillTransparency(tp);
-}
-
-void PageItem::restoreLineTP(SimpleState *state, bool isUndo)
-{
-	double tp = state->getDouble("OLD_TP");
-	if (!isUndo)
-		tp = state->getDouble("NEW_TP");
-	select();
-	m_Doc->itemSelection_SetItemLineTransparency(tp);
-}
-
-
-void PageItem::restoreLineStyle(SimpleState *state, bool isUndo)
-{
-	Qt::PenStyle ps = static_cast<Qt::PenStyle>(state->getInt("OLD_STYLE"));
-	if (!isUndo)
-		ps = static_cast<Qt::PenStyle>(state->getInt("NEW_STYLE"));
-	select();
-	m_Doc->itemSelection_SetLineArt(ps);
-}
-
-void PageItem::restoreLineEnd(SimpleState *state, bool isUndo)
-{
-	Qt::PenCapStyle pcs = static_cast<Qt::PenCapStyle>(state->getInt("OLD_STYLE"));
-	if (!isUndo)
-		pcs = static_cast<Qt::PenCapStyle>(state->getInt("NEW_STYLE"));
-	select();
-	m_Doc->itemSelection_SetLineEnd(pcs);
-}
-
-void PageItem::restoreLineJoin(SimpleState *state, bool isUndo)
-{
-	Qt::PenJoinStyle pjs = static_cast<Qt::PenJoinStyle>(state->getInt("OLD_STYLE"));
-	if (!isUndo)
-		pjs = static_cast<Qt::PenJoinStyle>(state->getInt("NEW_STYLE"));
-	select();
-	m_Doc->itemSelection_SetLineJoin(pjs);
-}
-
-void PageItem::restoreLineWidth(SimpleState *state, bool isUndo)
-{
-	double w = state->getDouble("OLD_WIDTH");
-	if (!isUndo)
-		w = state->getDouble("NEW_WIDTH");
-	select();
-	m_Doc->itemSelection_SetLineWidth(w);
-}
-
-void PageItem::restoreCustomLineStyle(SimpleState *state, bool isUndo)
-{
-	QString style = state->get("OLD_STYLE");
-	if (!isUndo)
-		style = state->get("NEW_STYLE");
-	setCustomLineStyle(style);
-}
-
-void PageItem::restoreName(SimpleState *state, bool isUndo)
-{
-	QString name = state->get("OLD_NAME");
-	if (!isUndo)
-		name = state->get("NEW_NAME");
-	setItemName(name);
-}
-
-void PageItem::restoreArrow(SimpleState *state, bool isUndo, bool isStart)
-{
-	int i = state->getInt("OLD_INDEX");
-	if (!isUndo)
-		i = state->getInt("NEW_INDEX");
-	if (isStart)
-		setStartArrowIndex(i);
-	else
-		setEndArrowIndex(i);
-}
-
-
-void PageItem::restorePStyle(SimpleState *state, bool isUndo)
-{
-	int styleid = state->getInt("OLD_STYLE");
-	if (!isUndo)
-		styleid = state->getInt("NEW_STYLE");
-	//will be done later with other text-undo:
-	//	m_Doc->chAbStyle(this, styleid);
-}
-
-
-// FIXME: This must go into class ScribusDoc!
-// For now we'll just make it independent of 'this' -- AV
-void PageItem::restoreType(SimpleState *state, bool isUndo)
-{
-	// well, probably not the best way to handle pointers...
-	PageItem * item = reinterpret_cast<PageItem *>(state->getInt("PAGEITEM"));
-	int type = state->getInt("OLD_TYPE");
-	if (!isUndo)
-		type = state->getInt("NEW_TYPE");
-	ScribusView* view = m_Doc->view();
-	view->Deselect(false);
-	view->SelectItem(item, false);
-	switch (type) {
-		case ImageFrame: view->ToPicFrame(); break;
-		case TextFrame: view->ToTextFrame(); break;
-		case Polygon: view->ToPolyFrame(); break;
-		case PolyLine: view->ToBezierFrame(); break;
-	}
-	view->requestMode(modeNormal);
-}
-
-void PageItem::restoreTextFlowing(SimpleState *state, bool isUndo)
-{
-	TextFlowMode oldMode = (TextFlowMode) state->getInt("TEXTFLOW_OLDMODE");
-	TextFlowMode newMode = (TextFlowMode) state->getInt("TEXTFLOW_NEWMODE");
-	if (isUndo)
-		textFlowModeVal = oldMode;
-	else
-		textFlowModeVal = newMode;
-	
-	QList<PageItem*> pList;
-	for(int idx = ItemNr-1; idx >= 0 ; --idx)
-	{
-		pList << m_Doc->Items->at(idx);
-	}
-		
-	QRectF baseRect(getBoundingRect());
-	for(int idx(0); idx < pList.count(); ++idx)
-	{
-		QRectF uRect(pList.at(idx)->getBoundingRect());
-		if(baseRect.intersects(uRect))
-			pList.at(idx)->update();
-	}
-}
-
-void PageItem::restoreImageScaleMode(SimpleState *state, bool isUndo)
-{
-	bool type=ScaleType;
-	if (state->contains("SCALE_TYPE"))
-	{
-		if (isUndo)
-			type = !state->getBool("SCALE_TYPE");
-		else
-			type = state->getBool("SCALE_TYPE");
-		//if restoring free scaling
-		//old offset and scale ratio must be restored
-		if (type)
-		{
-			double oscx = state->getDouble("OLD_IMAGEXSCALE");
-			double oscy = state->getDouble("OLD_IMAGEYSCALE");
-			double ox = state->getDouble("OLD_IMAGEXOFFSET");
-			double oy = state->getDouble("OLD_IMAGEYOFFSET");
-			Selection tempSelection(this, false);
-			tempSelection.addItem(this, true);
-			m_Doc->itemSelection_SetImageScale(oscx, oscy, &tempSelection);
-			m_Doc->itemSelection_SetImageOffset(ox, oy, &tempSelection);
-		}
-
-	}
-
-	bool ratio=AspectRatio;
-	if (state->contains("ASPECT_RATIO"))
-	{
-		if (isUndo)
-			ratio = !state->getBool("ASPECT_RATIO");
-		else
-			ratio = state->getBool("ASPECT_RATIO");
-	}
-
-	setImageScalingMode(type, ratio);
-}
-
-void PageItem::restoreImageScaleChange(SimpleState *state, bool isUndo)
-{
-	double oscx = state->getDouble("OLD_IMAGEXSCALE");
-	double oscy = state->getDouble("OLD_IMAGEYSCALE");
-	double  scx = state->getDouble("NEW_IMAGEXSCALE");
-	double  scy = state->getDouble("NEW_IMAGEYSCALE");
-	Selection tempSelection(this, false);
-	tempSelection.addItem(this, true);
-	if (!isUndo)
-		m_Doc->itemSelection_SetImageScale(scx, scy, &tempSelection);
-	else
-		m_Doc->itemSelection_SetImageScale(oscx, oscy, &tempSelection);
-}
-
-void PageItem::restoreImageOffsetChange(SimpleState *state, bool isUndo)
-{
-	double ox = state->getDouble("OLD_IMAGEXOFFSET");
-	double oy = state->getDouble("OLD_IMAGEYOFFSET");
-	double  x = state->getDouble("NEW_IMAGEXOFFSET");
-	double  y = state->getDouble("NEW_IMAGEYOFFSET");
-	Selection tempSelection(this, false);
-	tempSelection.addItem(this, true);
-	if (!isUndo)
-		m_Doc->itemSelection_SetImageOffset(x, y, &tempSelection);
-	else
-		m_Doc->itemSelection_SetImageOffset(ox, oy, &tempSelection);
-}
-
-void PageItem::restoreClearImage(UndoState *state, bool isUndo)
-{
-	if (!isImageFrame())
-		return;
-	if (isUndo)
-	{
-		ItemState<ScImageEffectList> *is = dynamic_cast<ItemState<ScImageEffectList>*>(state);
-		Pfile = is->get("CI_PFILE");
-		loadImage(Pfile, false);
-		effectsInUse = is->getItem();
-		setImageFlippedH(is->getBool("CI_FLIPPH"));
-		setImageFlippedV(is->getBool("CI_FLIPPV"));
-		setImageScalingMode(is->getBool("CI_SCALING"),is->getBool("CI_ASPECT"));
-		setImageXYOffset(is->getDouble("CI_XOFF"), is->getDouble("CI_YOFF"));
-		setImageXYScale(is->getDouble("CI_XSCALE"), is->getDouble("CI_YSCALE"));
-		setFillTransparency(is->getDouble("CI_FILLT"));
-		setLineTransparency(is->getDouble("CI_LINET"));
-		select();
-		m_Doc->updatePic();
-	}
-	else
-		asImageFrame()->clearContents();
-}
-
-void PageItem::restoreLinkTextFrame(UndoState *state, bool isUndo)
-{
-	if (!isTextFrame())
-		return;
-	if (isUndo)
-	{
-		unlink();
-	}
-	else
-	{
-		ItemState<std::pair<PageItem*, PageItem*> > *is = dynamic_cast<ItemState<std::pair<PageItem*, PageItem*> >*>(state);
-		asTextFrame()->link(is->getItem().second->asTextFrame());
-	}
-}
-
-void PageItem::restoreUnlinkTextFrame(UndoState *state, bool isUndo)
-{
-	if (!isTextFrame())
-		return;
-	if (isUndo)
-	{
-		ItemState<std::pair<PageItem*, PageItem*> > *is = dynamic_cast<ItemState<std::pair<PageItem*, PageItem*> >*>(state);
-		asTextFrame()->link(is->getItem().second->asTextFrame());
-	}
-	else
-	{
-		unlink();
-	}
-}
-
-
-void PageItem::restorePoly(SimpleState *state, bool isUndo, bool isContour)
-{
-	int mode    = state->getInt("MODE");
-	int rot     = state->getInt("ROT");
-	ScribusView* view = m_Doc->view();
-	double scaling = state->getDouble("SCALING");
-	bool editContour = m_Doc->nodeEdit.isContourLine;
-	m_Doc->nodeEdit.isContourLine = isContour;
-	select();
-	if (isUndo)
-	{
-		if (mode % 2 != 0 && mode != 0)
-			--mode;
-		else
-			++mode;
-		if (mode == 2)
-			scaling = (1.0 - (100.0 / (100.0 + scaling))) * 100.0;
-		else if (mode == 3)
-			scaling = ((100.0 / (100.0 - scaling)) - 1.0) * 100.0;
-	}
-	view->TransformPoly(mode, rot, scaling);
-	m_Doc->nodeEdit.isContourLine = editContour;
-}
-
-void PageItem::restoreContourLine(SimpleState *state, bool isUndo)
-{
-	ItemState<FPointArray> *is = dynamic_cast<ItemState<FPointArray>*>(state);
-	if (is)
-	{
-		if (isUndo)
-			ContourLine = is->getItem();
-		else
-			ContourLine = PoLine.copy();
-		ClipEdited = true;
-	}
-}
-
-void PageItem::restoreShapeType(SimpleState *state, bool isUndo)
-{
-	// Store shape info in this form:
-	// CHANGE_SHAPE_TYPE - ID of the undo operation
-	// OLD_FRAME_TYPE - original frame type
-	// NEW_FRAME_TYPE - change of frame type
-	// binary QPair<FPointArray, FPointArray> - .first original shape, .second new shape
-	ItemState<QPair<FPointArray,FPointArray> > *is = dynamic_cast<ItemState<QPair<FPointArray,FPointArray> >*>(state);
-	if (is)
-	{
-		if (isUndo)
-		{
-			this->FrameType = is->getInt("OLD_FRAME_TYPE");
-			this->PoLine = is->getItem().first;
-		}
-		else
-		{
-			this->FrameType = is->getInt("NEW_FRAME_TYPE");
-			this->PoLine = is->getItem().second;
-		}
-		ClipEdited = true;
-	}
-}
-
-void PageItem::restoreLayer(SimpleState *state, bool isUndo)
-{
-	ScribusView* view = m_Doc->view();
-	setLayer(isUndo ? state->getInt("OLD_LAYER") : state->getInt("NEW_LAYER"));
-	view->Deselect(true);
-	m_Doc->regionsChanged()->update(QRectF());
-}
-
-void PageItem::restoreGetImage(UndoState *state, bool isUndo)
-{
-	ItemState<ScImageEffectList> *is = dynamic_cast<ItemState<ScImageEffectList>*>(state);
-	QString fn = is->get("OLD_IMAGE_PATH");
-	if (!isUndo)
-		fn = is->get("NEW_IMAGE_PATH");
-	if (fn.isEmpty())
-	{
-		Selection tempSelection(this, false);
-		tempSelection.addItem(this, true);
-		m_Doc->itemSelection_ClearItem(&tempSelection);
-	}
-	else
-	{
-		loadImage(fn, false);
-		if (isUndo)
-		{
-			//restore old image settings
-			effectsInUse = is->getItem();
-			setImageFlippedH(is->getBool("FLIPPH"));
-			setImageFlippedV(is->getBool("FLIPPV"));
-			setImageScalingMode(is->getBool("SCALING"), is->getBool("ASPECT"));
-			setImageXYOffset(is->getDouble("XOFF"), is->getDouble("YOFF"));
-			setImageXYScale(is->getDouble("XSCALE"), is->getDouble("YSCALE"));
-			setFillTransparency(is->getDouble("FILLT"));
-			setLineTransparency(is->getDouble("LINET"));
-		}
-		select();
-		m_Doc->updatePic();
-	}
-}
-
-void PageItem::restoreGroupsLastItem(SimpleState *state, bool isUndo)
-{
-	ItemState<std::pair<PageItem*, PageItem*> > *is = dynamic_cast<ItemState<std::pair<PageItem*, PageItem*> > *>(state);
-	if (is)
-	{
-		if (isUndo)
-			this->groupsLastItem = is->getItem().first;
-		else
-			this->groupsLastItem = is->getItem().second;
-	}
-}
-
-void PageItem::restoreShapeContour(UndoState *state, bool isUndo)
-{
-	ItemState<QPair<FPointArray,FPointArray> > *istate =
-			dynamic_cast<ItemState<QPair<FPointArray,FPointArray> >*>(state);
-	if (istate)
-	{
-		FPointArray oldClip = istate->getItem().first;
-		FPointArray newClip = istate->getItem().second;
-		bool isContour = istate->getBool("IS_CONTOUR");
-		double oldX = istate->getDouble("OLD_X");
-		double oldY = istate->getDouble("OLD_Y");
-		double newX = istate->getDouble("NEW_X");
-		double newY = istate->getDouble("NEW_Y");
-		double mx = oldX - newX;
-		double my = oldY - newY;
-
-		if (isUndo)
-		{
-			if (isContour)
-				ContourLine = oldClip;
-			else
-				PoLine = oldClip;
-		}
-		else
-		{
-			mx = -mx;
-			my = -my;
-			if (isContour)
-				ContourLine = newClip;
-			else
-				PoLine = newClip;
-		}
-		m_Doc->AdjustItemSize(this);
-		m_Doc->MoveItem(mx, my, this, false);
-		m_Doc->regionsChanged()->update(QRectF());
-	}
-
-}
-
-void PageItem::restoreImageEffects(UndoState *state, bool isUndo)
-{
-	ItemState<QPair<ScImageEffectList, ScImageEffectList> > *istate =
-	dynamic_cast<ItemState<QPair<ScImageEffectList,ScImageEffectList> >*>(state);
-	if (istate)
-	{
-		if (isUndo)
-			effectsInUse = istate->getItem().first;
-		else
-			effectsInUse = istate->getItem().second;
-
-		select();
-		m_Doc->updatePic();
-	}
-}
-
-void PageItem::restoreEditText(SimpleState *state, bool isUndo)
-{
-	if (!isTextFrame())
-		return;
-	itemText.deselectAll();
-	HasSel = false;
-	EditAct action = (EditAct) state->getInt("STEXT");
-	if (action == PARAMFULL || action == PARAMSEL)
-	{
-		QString buffer;
-		if (isUndo)
-			buffer.append(state->get("STEXT_OLD"));
-		else
-			buffer.append(state->get("STEXT_NEW"));
-		if (!buffer.isEmpty())
-		{
-			Serializer dig(*m_Doc);
-			dig.store<ScribusDoc>("<scribusdoc>", m_Doc);
-			StoryText::desaxeRules("/", dig, "SCRIBUSTEXT");
-			dig.addRule("/SCRIBUSTEXT", desaxe::Result<StoryText>());
-			dig.parseMemory(buffer.toStdString().c_str(), buffer.length());
-			StoryText* story = dig.result<StoryText>();
-			if (action == PARAMFULL)
-			{
-				itemText.selectAll();
-				itemText.clear();
-				itemText.append(*story);
-			}
-			else if (action == PARAMSEL)
-			{
-				itemText.deselectAll();
-				int SelStart = state->getInt("STEXT_SELSTART");
-				itemText.select(SelStart,state->getInt("STEXT_SELLEN"));
-				asTextFrame()->deleteSelectedTextFromFrame();
-				int ItemLength = itemText.length();
-				itemText.insert(SelStart, *story);
-				// If we have inserted at end of text we have to restore trailing style
-				if (ItemLength == SelStart && story->length() > 0 && story->text(-1) != SpecialChars::PARSEP)
-				{
-					itemText.setStyle(-1, story->paragraphStyle(story->length()));
-				}
-				itemText.select(SelStart, story->length());
-				HasSel = true;
-			}
-			CPos = itemText.endOfSelection();
-			delete story;
-		}
-		else { qDebug() << "UNDO buffer EMPTY";}
-	}
-	else if (action == REPSAX)
-	{
-		QString buffout, buffin;  //buffout is deleted, buffin is inserted
-		int pos = state->getInt("STEXT_CPOS");
-		if (isUndo)
-		{
-			buffin.append(state->get("STEXT_OLD"));
-			buffout.append(state->get("STEXT_NEW"));
-		}
-		else
-		{
-			buffin.append(state->get("STEXT_NEW"));
-			buffout.append(state->get("STEXT_OLD"));
-		}
-
-		Serializer dig(*m_Doc);
-		dig.store<ScribusDoc>("<scribusdoc>", m_Doc);
-		StoryText::desaxeRules("/", dig, "SCRIBUSTEXT");
-		dig.addRule("/SCRIBUSTEXT", desaxe::Result<StoryText>());
-		dig.parseMemory(buffout.toStdString().c_str(), buffout.length());
-		StoryText* story = dig.result<StoryText>();
-		itemText.select(pos,story->length());
-		asTextFrame()->deleteSelectedTextFromFrame();
-
-		Serializer dig2(*m_Doc);
-		dig2.store<ScribusDoc>("<scribusdoc>", m_Doc);
-		StoryText::desaxeRules("/", dig2, "SCRIBUSTEXT");
-		dig2.addRule("/SCRIBUSTEXT", desaxe::Result<StoryText>());
-		dig2.parseMemory(buffin.toStdString().c_str(), buffin.length());
-		story = dig2.result<StoryText>();
-		itemText.insert(pos,*story);
-		itemText.select(pos, story->length());
-		HasSel = true;
-		CPos = pos + story->length();
-		delete story;
-	}
-	else if (action == INSSAX || action == DELSAX)
-	{
-		QString str = state->get("STEXT_STR");
-		if (str.isEmpty())
-			str = itemTextSaxed;
-		int pos = state->getInt("STEXT_CPOS");
-		Serializer dig(*m_Doc);
-		dig.store<ScribusDoc>("<scribusdoc>", m_Doc);
-		StoryText::desaxeRules("/", dig, "SCRIBUSTEXT");
-		dig.addRule("/SCRIBUSTEXT", desaxe::Result<StoryText>());
-		dig.parseMemory(str.toStdString().c_str(), str.length());
-		StoryText* story = dig.result<StoryText>();
-		if ((action == INSSAX && isUndo) || (action == DELSAX && !isUndo))
-		{
-			//undo for INSSAX, redo for DELSAX
-			itemText.select(pos, story->length());
-			asTextFrame()->deleteSelectedTextFromFrame();
-		}
-		else
-		{
-			//undo for DELSAX, redo for INSSAX
-			itemText.insert(pos, *story);
-			CPos = pos + story->length();
-		}
-		delete story;
-	}
-	else if (action == INS)
-	{
-		QString str = state->get("STEXT_STR");
-		int pos = state->getInt("STEXT_CPOS");
-		if (isUndo)
-		{
-			itemText.select(pos, str.length());
-			asTextFrame()->deleteSelectedTextFromFrame();
-		}
-		else
-		{
-			itemText.insertChars(pos, str, true);
-			CPos = pos + str.length();
-		}
-	}
-	// after Undo or Redo new actions should create new undoStates
-	asTextFrame()->lastUndoAction = NOACTION;
-
-	m_Doc->scMW()->setTBvals(this);
-	update();
-}
-
-QString PageItem::getItemTextSaxed(EditActPlace undoItem)
-{
-	if (!isTextFrame()) return "";
-	StoryText iT(m_Doc);
-	iT.setDefaultStyle(itemText.defaultStyle());
-	if (undoItem == FRAME)
-		iT.insert(0, itemText);
-	else
-	{
-		int StartOldSel = -1, LenOldSel = -1;
-		if (undoItem == PARAGRAPH)
-		{
-			LenOldSel = 0;
-			if (HasSel)
-			{
-				StartOldSel = itemText.startOfSelection();
-				LenOldSel = itemText.lengthOfSelection();
-			}
-			asTextFrame()->expandParaSelection(true);
-		}
-		else if (undoItem == CHAR || (undoItem == SELECTION && !HasSel))
-		{
-			LenOldSel = itemText.lengthOfSelection();
-			if (LenOldSel > 0)
-				StartOldSel = itemText.startOfSelection();
-			if (CPos >= itemText.length())
-				return  "";
-			itemText.select(CPos,1);
-			HasSel = true;
-		}
-		//is SELECTION
-		iT.insert(0, itemText, HasSel);
-		if (LenOldSel > 0) //restoring old selection if undoItem was PARAPGRAPH
-		{
-			itemText.select(StartOldSel, LenOldSel);
-			HasSel = true;
-		}
-		else if (LenOldSel == 0)
-		{
-			itemText.deselectAll();
-			HasSel = false;
-		}
-	}
-	//saxing text
-	std::ostringstream xmlString;
-	SaxXML xmlStream(xmlString);
-	xmlStream.beginDoc();
-	iT.saxx(xmlStream, "SCRIBUSTEXT");
-	xmlStream.endDoc();
-	std::string xml(xmlString.str());
-	return QString(xml.c_str());
-}
-
-QString PageItem::getItemTextSaxed(int selStart, int selLength)
-{
-	if (selStart < 0 || selLength < 0)
-		return QString();
-	
-	StoryText it(m_Doc);
-	it.setDefaultStyle(itemText.defaultStyle());
-
-	int oldSelStart = -1, oldSelLength = -1;
-	oldSelStart  = itemText.startOfSelection();
-	oldSelLength = itemText.lengthOfSelection();
-
-	itemText.select(selStart, selLength);
-	it.insert(0, itemText, (selLength > 0));
-	
-	if (oldSelLength > 0) //restoring old selection if undoItem was PARAPGRAPH
-	{
-		itemText.select(oldSelStart, oldSelLength);
-		HasSel = true;
-	}
-	else if (oldSelLength == 0)
-	{
-		itemText.deselectAll();
-		HasSel = false;
-	}
-
-	//saxing text
-	std::ostringstream xmlString;
-	SaxXML xmlStream(xmlString);
-	xmlStream.beginDoc();
-	it.saxx(xmlStream, "SCRIBUSTEXT");
-	xmlStream.endDoc();
-	std::string xml(xmlString.str());
-	return QString(xml.c_str());
-}
-
-QString PageItem::getTextSaxed(QString str)
-{
-	StoryText iT(m_Doc);
-	iT.setDefaultStyle(itemText.defaultStyle());
-	iT.insertChars(0,str,true);
-	std::ostringstream xmlString;
-	SaxXML xmlStream(xmlString);
-	xmlStream.beginDoc();
-	iT.saxx(xmlStream, "SCRIBUSTEXT");
-	xmlStream.endDoc();
-	std::string xml(xmlString.str());
-	return QString(xml.c_str());
-}
-
-void PageItem::select()
-{
-	if (m_Doc->m_Selection->count() == 1 && m_Doc->m_Selection->itemAt()->isTextFrame())
-		m_Doc->m_Selection->itemAt()->asTextFrame()->lastUndoAction = PageItem::NOACTION;
-	m_Doc->view()->Deselect(false);
-	//CB #2969 add this true parm to addItem so we dont connectToGUI, the rest of view->SelectItem isnt needed anyway
-	m_Doc->m_Selection->addItem(this, true);
-}
-
-ObjAttrVector* PageItem::getObjectAttributes()
-{
-	return &pageItemAttributes;
-}
-
-ObjectAttribute PageItem::getObjectAttribute(QString attributeName) const
-{
-	int countFound=0;
-	ObjAttrVector::const_iterator foundIt = pageItemAttributes.begin();
-	for(ObjAttrVector::const_iterator objAttrIt = pageItemAttributes.begin() ; objAttrIt != pageItemAttributes.end(); ++objAttrIt )
-	{
-		if ((*objAttrIt).name==attributeName)
-		{
-			++countFound;
-			foundIt=objAttrIt;
-		}
-	}
-	ObjectAttribute returnAttribute;
-	if(countFound==1)
-		returnAttribute=(*foundIt);
-	else
-		returnAttribute.name=QString::null;
-	return returnAttribute;
-}
-
-
-void PageItem::setObjectAttributes(ObjAttrVector* map)
-{
-	pageItemAttributes=*map;
-}
-
-QString PageItem::generateUniqueCopyName(const QString originalName) const
-{
-	if (!m_Doc->itemNameExists(originalName))
-		return originalName;
-
-	// Start embellishing the name until we get an acceptable unique name
-	// first we prefix `Copy of' if it's not already there
-	QString newname(originalName);
-	if (!originalName.startsWith( tr("Copy of")))
-		newname.prepend( tr("Copy of")+" ");
-
-	// See if the name prefixed by "Copy of " is free
-	if (m_Doc->itemNameExists(newname))
-	{
-		// Search the string for (number) at the end and capture
-		// both the number and the text leading up to it sans brackets.
-		//     Copy of fred (5)
-		//     ^^^^^^^^^^^^  ^   (where ^ means captured)
-		static QRegExp rx("^(.*)\\s+\\((\\d+)\\)$");
-		int numMatches = rx.lastIndexIn(newname);
-		// Add a (number) suffix to the end of the name. We start at the
-		// old suffix's value if there was one, or at 2 if there was not.
-		int suffixnum = 2;
-		QString prefix(newname);
-		if (numMatches != -1)
-		{
-			// Already had a suffix; use the name w/o suffix for prefix and
-			// grab the old suffix value as a starting point.
-			QStringList matches = rx.capturedTexts();
-			prefix = matches[1];
-			suffixnum = matches[2].toInt();
-		}
-		// Keep on incrementing the suffix 'till we find a free name
-		do
-		{
-			newname = prefix + " (" + QString::number(suffixnum) + ")";
-			suffixnum ++;
-		}
-		while (m_Doc->itemNameExists(newname));
-	}
-	// Unnecessary assert, previous code ensure condition is always true - JG
-	// assert(!m_Doc->itemNameExists(newname));
-	return newname;
-}
-
-void PageItem::setTagged(bool tag)
-{
-	tagged=tag;
-}
-
-void PageItem::replaceNamedResources(ResourceCollection& newNames) 
-{
-	QMap<QString,QString>::ConstIterator it;
-
-	it = newNames.colors().find(fillColor());
-	if (it != newNames.colors().end())
-		setFillColor(*it);
-
-	it = newNames.colors().find(lineColor());
-	if (it != newNames.colors().end())
-		setLineColor(*it);
-
-	QList<VColorStop*> cstops = fill_gradient.colorStops();
-	for (uint cst = 0; cst < fill_gradient.Stops(); ++cst)
-	{
-		it = newNames.colors().find(cstops.at(cst)->name);
-		if (it != newNames.colors().end())
-		{
-			if (*it != CommonStrings::None)
-				cstops.at(cst)->name = *it;
-		}
-	}
-	if (effectsInUse.count() != 0)
-	{
-		QString col1 = CommonStrings::None;
-		QString col2 = CommonStrings::None;
-		QString col3 = CommonStrings::None;
-		QString col4 = CommonStrings::None;
-		for (int a = 0; a < effectsInUse.count(); ++a)
-		{
-			QString tmpstr = effectsInUse.at(a).effectParameters;
-			QString tmpstr2 = "";
-			ScTextStream fp(&tmpstr, QIODevice::ReadOnly);
-			switch (effectsInUse.at(a).effectCode)
-			{
-				case ScImage::EF_QUADTONE:
-					col1 = fp.readLine();
-					col2 = fp.readLine();
-					col3 = fp.readLine();
-					col4 = fp.readLine();
-					it = newNames.colors().find(col1);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col1 + "\n";
-					}
-					else
-						tmpstr2 += col1 + "\n";
-					it = newNames.colors().find(col2);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col2 + "\n";
-					}
-					else
-						tmpstr2 += col2 + "\n";
-					it = newNames.colors().find(col3);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col3 + "\n";
-					}
-					else
-						tmpstr2 += col3 + "\n";
-					it = newNames.colors().find(col4);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col4 + "\n";
-					}
-					else
-						tmpstr2 += col4 + "\n";
-					tmpstr2 += fp.readAll();
-					break;
-				case ScImage::EF_TRITONE:
-					col1 = fp.readLine();
-					col2 = fp.readLine();
-					col3 = fp.readLine();
-					it = newNames.colors().find(col1);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col1 + "\n";
-					}
-					else
-						tmpstr2 += col1 + "\n";
-					it = newNames.colors().find(col2);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col2 + "\n";
-					}
-					else
-						tmpstr2 += col2 + "\n";
-					it = newNames.colors().find(col3);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col3 + "\n";
-					}
-					else
-						tmpstr2 += col3 + "\n";
-					tmpstr2 += fp.readAll();
-					break;
-				case ScImage::EF_DUOTONE:
-					col1 = fp.readLine();
-					col2 = fp.readLine();
-					it = newNames.colors().find(col1);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col1 + "\n";
-					}
-					else
-						tmpstr2 += col1 + "\n";
-					it = newNames.colors().find(col2);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n";
-						else
-							tmpstr2 += col2 + "\n";
-					}
-					else
-						tmpstr2 += col2 + "\n";
-					tmpstr2 += fp.readAll();
-					break;
-				case ScImage::EF_COLORIZE:
-					col1 = fp.readLine();
-					it = newNames.colors().find(col1);
-					if (it != newNames.colors().end())
-					{
-						if (*it != CommonStrings::None)
-							tmpstr2 += *it + "\n" + fp.readAll();
-						else
-							tmpstr2 += col1 + "\n" + fp.readAll();
-					}
-					else
-						tmpstr2 += col1 + "\n" + fp.readAll();
-					break;
-				default:
-					tmpstr2 = tmpstr;
-					break;
-			}
-			effectsInUse[a].effectParameters = tmpstr2;
-		}
-	}
-	
-	it = newNames.patterns().find(pattern());
-	if (it != newNames.patterns().end())
-		setPattern(*it);
-
-	it = newNames.lineStyles().find(customLineStyle());
-	if (it != newNames.lineStyles().end())
-		setCustomLineStyle(*it);
-
-	if (prevInChain() == NULL)
-		itemText.replaceNamedResources(newNames);
-}
-
-
-void PageItem::getNamedResources(ResourceCollection& lists) const
-{
-	lists.collectColor(lineColor());
-	if (GrType == 0)
-		lists.collectColor(fillColor());
-	else if (GrType < 8)
-	{
-		QList<VColorStop*> cstops = fill_gradient.colorStops();
-		for (uint cst = 0; cst < fill_gradient.Stops(); ++cst)
-		{
-			lists.collectColor(cstops.at(cst)->name);
-		}
-	}
-	if (effectsInUse.count() != 0)
-	{
-		for (int a = 0; a < effectsInUse.count(); ++a)
-		{
-			QString tmpstr = effectsInUse.at(a).effectParameters;
-			ScTextStream fp(&tmpstr, QIODevice::ReadOnly);
-			switch (effectsInUse.at(a).effectCode)