r20561 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Thu Nov 19 12:38:59 UTC 2015


Author: jghali
Date: Thu Nov 19 12:38:59 2015
New Revision: 20561

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20561
Log:
remove unused function argument from ScribusDoc itemAdd() and itemArea()

Modified:
    trunk/Scribus/scribus/canvasmode_create.cpp
    trunk/Scribus/scribus/canvasmode_drawbezier.cpp
    trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
    trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
    trunk/Scribus/scribus/canvasmode_nodeedit.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
    trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
    trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
    trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
    trunk/Scribus/scribus/plugins/import/idml_old/importidmlimpl.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
    trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
    trunk/Scribus/scribus/plugins/import/ps/importps.cpp
    trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
    trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
    trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
    trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
    trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
    trunk/Scribus/scribus/util.cpp

Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp	Thu Nov 19 12:38:59 2015
@@ -646,23 +646,23 @@
 		{
 			case 0:
 				if (modifiers == Qt::ShiftModifier)
-					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor, true);
+					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor);
 				else
-					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor, true);
+					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor);
 				m_doc->Items->at(z)->FrameType = 0;
 				break;
 			case 1:
 				if (modifiers == Qt::ShiftModifier)
-					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor, true);
+					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor);
 				else
-					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor, true);
+					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor);
 				m_doc->Items->at(z)->FrameType = 1;
 				break;
 			default:
 				if (modifiers == Qt::ShiftModifier)
-					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor, true);
+					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor);
 				else
-					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor, true);
+					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor);
 				m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
 				m_doc->AdjustItemSize(m_doc->Items->at(z));
 				m_doc->setRedrawBounding(m_doc->Items->at(z));
@@ -679,46 +679,46 @@
 		if (rot < 0.0) 
 			rot += 360;
 		len = qMax(0.01, distance(Rxpd, Rypd));
-		z = m_doc->itemAdd(PageItem::Line, PageItem::Unspecified, Rxp, Ryp, len, 1, m_doc->itemToolPrefs().lineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor, true);
+		z = m_doc->itemAdd(PageItem::Line, PageItem::Unspecified, Rxp, Ryp, len, 1, m_doc->itemToolPrefs().lineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor);
 		m_doc->Items->at(z)->setRotation(rot);
 		m_doc->Items->at(z)->setRedrawBounding();
 		break;
 	case modeDrawLatex:
 		if (modifiers == Qt::ShiftModifier)
-			z = m_doc->itemAddArea(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor, true);
+			z = m_doc->itemAddArea(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor);
 		else
-			z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor, true);
+			z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor);
 		break;
 	case modeDrawImage:
 		if (modifiers == Qt::ShiftModifier)
-			z = m_doc->itemAddArea(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor, true);
+			z = m_doc->itemAddArea(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor);
 		else
-			z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor, true);
+			z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor);
 		break;
 	case modeDrawText:
 		if (modifiers == Qt::ShiftModifier)
-			z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().textFont, true);
+			z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().textFont);
 		else
-			z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().textFont, true);
+			z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().textFont);
 		break;
 	case modeDrawRegularPolygon:
 		if (modifiers == Qt::ShiftModifier)
-			z = m_doc->itemAddArea(PageItem::RegularPolygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().lineColor, true);
+			z = m_doc->itemAddArea(PageItem::RegularPolygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().lineColor);
 		else
-			z = m_doc->itemAdd(PageItem::RegularPolygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().lineColor, true);
+			z = m_doc->itemAdd(PageItem::RegularPolygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().lineColor);
 		break;
 	case modeDrawArc:
 		if (modifiers == Qt::ShiftModifier)
-			z = m_doc->itemAddArea(PageItem::Arc, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().lineColor, true);
+			z = m_doc->itemAddArea(PageItem::Arc, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().lineColor);
 		else
-			z = m_doc->itemAdd(PageItem::Arc, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().lineColor, true);
+			z = m_doc->itemAdd(PageItem::Arc, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().lineColor);
 		m_doc->setRedrawBounding(m_doc->Items->at(z));
 		break;
 	case modeDrawSpiral:
 		if (modifiers == Qt::ShiftModifier)
-			z = m_doc->itemAddArea(PageItem::Spiral, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor, true);
+			z = m_doc->itemAddArea(PageItem::Spiral, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor);
 		else
-			z = m_doc->itemAdd(PageItem::Spiral, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor, true);
+			z = m_doc->itemAdd(PageItem::Spiral, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor);
 		m_doc->AdjustItemSize(m_doc->Items->at(z));
 		m_doc->setRedrawBounding(m_doc->Items->at(z));
 		break;
@@ -730,7 +730,7 @@
 	case modeInsertPDFListbox:
 	case modeInsertPDFTextAnnotation:
 	case modeInsertPDFLinkAnnotation:
-		z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().textColor, true);
+		z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().textColor);
 		currItem = m_doc->Items->at(z);
 		currItem->setIsAnnotation(true);
 		currItem->AutoName = false;
@@ -811,10 +811,9 @@
 						   tableRect.y(),
 						   tableRect.width(),
 						   tableRect.height(),
-						   0,                   // Unused.
-						   CommonStrings::None, // Unused.
-						   CommonStrings::None, // Unused.
-						   true);
+						   0,                    // Unused.
+						   CommonStrings::None,  // Unused.
+						   CommonStrings::None); // Unused.
 			PageItem_Table *table = m_doc->Items->at(z)->asTable();
 			table->insertRows(0, numRows - 1);
 			table->insertColumns(0, numColumns - 1);
@@ -827,11 +826,11 @@
 	case modeInsertPDF3DAnnotation:
 		if (modifiers == Qt::ShiftModifier)
 		{
-			z = m_doc->itemAddArea(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor, true);
+			z = m_doc->itemAddArea(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor);
 		}
 		else
 		{
-			z = m_doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor, true);
+			z = m_doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().imageFillColor, m_doc->itemToolPrefs().imageStrokeColor);
 		}
 		currItem = m_doc->Items->at(z);
 		currItem->setIsAnnotation(true);

Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp	Thu Nov 19 12:38:59 2015
@@ -312,7 +312,7 @@
 	{
 		selectPage(m);
 		undoManager->setUndoEnabled(false);
-		z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs().lineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor, true);
+		z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs().lineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor);
 		currItem = m_doc->Items->at(z);
 		m_doc->m_Selection->clear();
 		m_doc->m_Selection->addItem(currItem);

Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp	Thu Nov 19 12:38:59 2015
@@ -1,358 +1,358 @@
-/*
- 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.
- */
-/***************************************************************************
-*                                                                         *
-*   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 "canvasmode_drawcalligraphic.h"
-
-#include <QEvent>
-#include <QMouseEvent>
-#include <QPainterPath>
-#include <QPoint>
-#include <QRect>
-
-
-#include "KarbonCurveFit.h"
-#include "appmodes.h"
-#include "canvas.h"
-#include "canvasgesture_resize.h"
-#include "fpoint.h"
-#include "prefsmanager.h"
-#include "scraction.h"
-#include "scribus.h"
-#include "scribusXml.h"
-#include "scribusdoc.h"
-#include "scribusview.h"
-#include "selection.h"
-#include "ui/pageselector.h"
-#include "ui/scrspinbox.h"
-#include "undomanager.h"
-#include "util.h"
-#include "util_math.h"
-
-
-
-
-
-CalligraphicMode::CalligraphicMode(ScribusView* view) : CanvasMode(view) 
-{
-	Mxp = Myp = -1;
-	Dxp = Dyp = -1;
-	m_MouseButtonPressed = false;
-}
-
-
-void CalligraphicMode::drawControls(QPainter* p) 
-{
-	//
-}
-
-inline bool CalligraphicMode::GetItem(PageItem** pi)
-{ 
-	*pi = m_doc->m_Selection->itemAt(0); 
-	return (*pi) != NULL; 
-}
-
-void CalligraphicMode::enterEvent(QEvent *)
-{
-	if (!m_MouseButtonPressed)
-	{
-		setModeCursor();
-	}
-}
-
-
-void CalligraphicMode::leaveEvent(QEvent *e)
-{
-}
-
-
-void CalligraphicMode::activate(bool flag)
-{
-	Mxp = Myp = -1;
-	Dxp = Dyp = -1;
-	m_MouseButtonPressed = false;
-	setModeCursor();
-}
-
-void CalligraphicMode::deactivate(bool flag)
-{
-	m_view->setRedrawMarkerShown(false);
-}
-
-void CalligraphicMode::mouseDoubleClickEvent(QMouseEvent *m)
-{
-	m->accept();
-	m_MouseButtonPressed = false;
-	m_canvas->resetRenderMode();
-	mousePressEvent(m);
-}
-
-
-void CalligraphicMode::mouseMoveEvent(QMouseEvent *m)
-{
-	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
-	
-	double newX, newY;
-	PageItem *currItem;
-	QPoint np, np2, mop;
-	FPoint npf, npf2;
-	QRect tx;
-	m->accept();
-	m_canvas->displayCorrectedXYHUD(m->globalPos(), mousePointDoc.x(), mousePointDoc.y());
-
-	if (commonMouseMove(m))
-		return;
-	
-	if (m_MouseButtonPressed && (m_doc->appMode == modeDrawCalligraphicLine))
-	{
-		double newXF = mousePointDoc.x(); //m_view->translateToDoc(m->x(), m->y()).x();
-		double newYF = mousePointDoc.y(); //m_view->translateToDoc(m->x(), m->y()).y();
-		if (RecordP.size() > 0)
-		{
-			if (FPoint(newXF, newYF) != RecordP.point(RecordP.size()-1))
-				RecordP.addPoint(FPoint(newXF, newYF));
-		}
-		else
-			RecordP.addPoint(FPoint(newXF, newYF));
-		QPolygon& redrawPolygon(m_canvas->newRedrawPolygon());
-		double mx = sin(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
-		double my = cos(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
-		for (int px = 0; px < RecordP.size()-1; ++px)
-		{
-			FPoint clp = RecordP.point(px);
-			redrawPolygon.append(QPoint(qRound(clp.x() - mx), qRound(clp.y() - my)));
-			redrawPolygon.prepend(QPoint(qRound(clp.x() + mx), qRound(clp.y() + my)));
-		}
-		redrawPolygon.append(QPoint(qRound(RecordP.point(RecordP.size()-1).x() + mx), qRound(RecordP.point(RecordP.size()-1).y() + my)));
-//FIXME		
-		m_canvas->m_viewMode.operItemResizing = true;
-		QRect bRect = m_canvas->redrawPolygon().boundingRect();
-		m_view->updateCanvas(bRect);
-		return;
-	}
-	
-	if (GetItem(&currItem))
-	{
-		newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
-		newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
-		
-		if (m_doc->DragP)
-			return;
-				
-		if ((!m_MouseButtonPressed) && (m_doc->appMode != modeDrawBezierLine))
-		{
-			if (m_doc->m_Selection->isMultipleSelection())
-			{
-				setModeCursor();
-				return;
-			}
-			for (int a = 0; a < m_doc->m_Selection->count(); ++a)
-			{
-				currItem = m_doc->m_Selection->itemAt(a);
-				if (currItem->locked())
-					break;
-				setModeCursor();
-			}
-		}
-	}
-	else
-	{
-		if ((m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton))
-		{
-			newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
-			newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
-			SeRx = newX;
-			SeRy = newY;
-			QPoint startP = m_canvas->canvasToGlobal(m_doc->appMode == modeDrawTable2 ? QPointF(Dxp, Dyp) : QPointF(Mxp, Myp));
-			m_view->redrawMarker->setGeometry(QRect(m_view->mapFromGlobal(startP), m_view->mapFromGlobal(m->globalPos())).normalized());
-			m_view->setRedrawMarkerShown(true);
-			m_view->HaveSelRect = true;
-			return;
-		}
-	}
-}
-
-void CalligraphicMode::mousePressEvent(QMouseEvent *m)
-{
-	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
-	double Rxp = 0;
-	double Ryp = 0;
-	FPoint npf, npf2;
-	QRect tx;
-	QTransform pm;
-	m_MouseButtonPressed = true;
-	m_view->HaveSelRect = false;
-	m_doc->DragP = false;
-	m_doc->leaveDrag = false;
-	m->accept();
-	m_view->registerMousePress(m->globalPos());
-	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
-	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
-	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
-	Rxp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).x();
-	Mxp = qRound(Rxp);
-	Ryp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).y();
-	Myp = qRound(Ryp);
-	SeRx = Mxp;
-	SeRy = Myp;
-	if (m->button() == Qt::MidButton)
-	{
-		m_view->MidButt = true;
-		if (m->modifiers() & Qt::ControlModifier)
-			m_view->DrawNew();
-		return;
-	}
-	if (m->button() != Qt::LeftButton)
-	{
-		m_view->stopGesture();
-		return;
-	}
-	RecordP.resize(0);
-	m_view->Deselect(false);
-	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
-	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
-	SeRx = Mxp;
-	SeRy = Myp;
-	m_canvas->setRenderModeFillBuffer();
-	undoManager->setUndoEnabled(false);
-}
-
-
-
-void CalligraphicMode::mouseReleaseEvent(QMouseEvent *m)
-{
-	undoManager->setUndoEnabled(true);
-	PageItem *currItem;
-	m_MouseButtonPressed = false;
-	m_canvas->resetRenderMode();
-	m->accept();
-	
-	if (m_doc->appMode == modeDrawCalligraphicLine)
-	{
-		if (RecordP.size() > 1)
-		{
-			UndoTransaction createTransaction;
-			if (UndoManager::undoEnabled())
-				createTransaction = UndoManager::instance()->beginTransaction();
-			uint z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs().calligraphicPenLineWidth, m_doc->itemToolPrefs().calligraphicPenFillColor, m_doc->itemToolPrefs().calligraphicPenLineColor, true);
-			currItem = m_doc->Items->at(z);
-			currItem->PoLine.resize(0);
-			QList<QPointF> clipU;
-			QList<QPointF> clipL;
-			double mx = sin(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
-			double my = cos(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
-			for (int px = 0; px < RecordP.size()-1; ++px)
-			{
-				FPoint clp = RecordP.point(px);
-				clipU.append(QPointF(clp.x() - mx, clp.y() - my));
-				clipL.prepend(QPointF(clp.x() + mx, clp.y() + my));
-			}
-			QPainterPath ppU = bezierFit(clipU, 5.0);
-			QPainterPath ppL = bezierFit(clipL, 5.0);
-			QPainterPath pp;
-			pp.addPath(ppU);
-			pp.connectPath(ppL);
-			pp.closeSubpath();
-			currItem->PoLine.fromQPainterPath(pp);
-			FPoint tp2(getMinClipF(&currItem->PoLine));
-			currItem->setXYPos(tp2.x(), tp2.y(), true);
-			currItem->PoLine.translate(-tp2.x(), -tp2.y());
-			FPoint tp(getMaxClipF(&currItem->PoLine));
-			m_doc->SizeItem(tp.x(), tp.y(), currItem, false, false, false);
-			m_doc->AdjustItemSize(currItem);
-			m_doc->m_Selection->clear();
-			m_doc->m_Selection->addItem(currItem);
-			currItem->ClipEdited = true;
-			currItem->FrameType = 3;
-			currItem->OwnPage = m_doc->OnPage(currItem);
-			currItem->PLineArt = Qt::PenStyle(m_doc->itemToolPrefs().calligraphicPenStyle);
-			currItem->setFillShade(m_doc->itemToolPrefs().calligraphicPenFillColorShade);
-			currItem->setLineShade(m_doc->itemToolPrefs().calligraphicPenLineColorShade);
-			currItem->setFillEvenOdd(true);
-			m_view->resetMousePressed();
-			currItem->checkChanges();
-			QString targetName = Um::ScratchSpace;
-			if (currItem->OwnPage > -1)
-				targetName = m_doc->Pages->at(currItem->OwnPage)->getUName();
-			if (createTransaction)
-				createTransaction.commit(targetName, currItem->getUPixmap(), Um::Create + " " + currItem->getUName(),  "", Um::ICreate);
-			//FIXME	
-			m_canvas->m_viewMode.operItemResizing = false;
-			m_doc->changed();
-		}
-		if (!PrefsManager::instance()->appPrefs.uiPrefs.stickyTools)
-		{
-			m_view->requestMode(modeNormal);
-		}
-		else
-			m_view->requestMode(m_doc->appMode);
-		return;
-	}
-
-	m_canvas->setRenderModeUseBuffer(false);
-	
-	m_doc->DragP = false;
-	m_doc->leaveDrag = false;
-	m_view->MidButt = false;
-	if (m_view->groupTransactionStarted())
-	{
-		for (int i = 0; i < m_doc->m_Selection->count(); ++i)
-			m_doc->m_Selection->itemAt(i)->checkChanges(true);
-		m_view->endGroupTransaction();
-	}
-
-	for (int i = 0; i < m_doc->m_Selection->count(); ++i)
-		m_doc->m_Selection->itemAt(i)->checkChanges(true);
-
-	//Commit drag created items to undo manager.
-	if (m_doc->m_Selection->itemAt(0)!=NULL)
-	{
-		m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
-	}
-	//Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
-	m_view->m_ScMW->zoomSpinBox->clearFocus();
-	m_view->m_ScMW->pageSelector->clearFocus();
-	if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
-	{
-		currItem = m_doc->m_Selection->itemAt(0);
-		m_doc->nodeEdit.finishTransaction(currItem);
-	}
-}
-
-void CalligraphicMode::selectPage(QMouseEvent *m)
-{
-	m_MouseButtonPressed = true;
-	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
-	Mxp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
-	Myp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
-	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
-	m_doc->nodeEdit.deselect();
-	m_view->Deselect(false);
-	if (!m_doc->masterPageMode())
-	{
-		int i = m_doc->OnPage(Mxp, Myp);
-		if (i!=-1)
-		{
-			uint docCurrPageNo=m_doc->currentPageNumber();
-			uint j=static_cast<uint>(i);
-			if (docCurrPageNo != j)
-			{
-				m_doc->setCurrentPage(m_doc->Pages->at(j));
-				m_view->m_ScMW->slotSetCurrentPage(j);
-				m_view->DrawNew();
-			}
-		}
-	}
-}
+/*
+ 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.
+ */
+/***************************************************************************
+*                                                                         *
+*   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 "canvasmode_drawcalligraphic.h"
+
+#include <QEvent>
+#include <QMouseEvent>
+#include <QPainterPath>
+#include <QPoint>
+#include <QRect>
+
+
+#include "KarbonCurveFit.h"
+#include "appmodes.h"
+#include "canvas.h"
+#include "canvasgesture_resize.h"
+#include "fpoint.h"
+#include "prefsmanager.h"
+#include "scraction.h"
+#include "scribus.h"
+#include "scribusXml.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
+#include "selection.h"
+#include "ui/pageselector.h"
+#include "ui/scrspinbox.h"
+#include "undomanager.h"
+#include "util.h"
+#include "util_math.h"
+
+
+
+
+
+CalligraphicMode::CalligraphicMode(ScribusView* view) : CanvasMode(view) 
+{
+	Mxp = Myp = -1;
+	Dxp = Dyp = -1;
+	m_MouseButtonPressed = false;
+}
+
+
+void CalligraphicMode::drawControls(QPainter* p) 
+{
+	//
+}
+
+inline bool CalligraphicMode::GetItem(PageItem** pi)
+{ 
+	*pi = m_doc->m_Selection->itemAt(0); 
+	return (*pi) != NULL; 
+}
+
+void CalligraphicMode::enterEvent(QEvent *)
+{
+	if (!m_MouseButtonPressed)
+	{
+		setModeCursor();
+	}
+}
+
+
+void CalligraphicMode::leaveEvent(QEvent *e)
+{
+}
+
+
+void CalligraphicMode::activate(bool flag)
+{
+	Mxp = Myp = -1;
+	Dxp = Dyp = -1;
+	m_MouseButtonPressed = false;
+	setModeCursor();
+}
+
+void CalligraphicMode::deactivate(bool flag)
+{
+	m_view->setRedrawMarkerShown(false);
+}
+
+void CalligraphicMode::mouseDoubleClickEvent(QMouseEvent *m)
+{
+	m->accept();
+	m_MouseButtonPressed = false;
+	m_canvas->resetRenderMode();
+	mousePressEvent(m);
+}
+
+
+void CalligraphicMode::mouseMoveEvent(QMouseEvent *m)
+{
+	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
+	
+	double newX, newY;
+	PageItem *currItem;
+	QPoint np, np2, mop;
+	FPoint npf, npf2;
+	QRect tx;
+	m->accept();
+	m_canvas->displayCorrectedXYHUD(m->globalPos(), mousePointDoc.x(), mousePointDoc.y());
+
+	if (commonMouseMove(m))
+		return;
+	
+	if (m_MouseButtonPressed && (m_doc->appMode == modeDrawCalligraphicLine))
+	{
+		double newXF = mousePointDoc.x(); //m_view->translateToDoc(m->x(), m->y()).x();
+		double newYF = mousePointDoc.y(); //m_view->translateToDoc(m->x(), m->y()).y();
+		if (RecordP.size() > 0)
+		{
+			if (FPoint(newXF, newYF) != RecordP.point(RecordP.size()-1))
+				RecordP.addPoint(FPoint(newXF, newYF));
+		}
+		else
+			RecordP.addPoint(FPoint(newXF, newYF));
+		QPolygon& redrawPolygon(m_canvas->newRedrawPolygon());
+		double mx = sin(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
+		double my = cos(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
+		for (int px = 0; px < RecordP.size()-1; ++px)
+		{
+			FPoint clp = RecordP.point(px);
+			redrawPolygon.append(QPoint(qRound(clp.x() - mx), qRound(clp.y() - my)));
+			redrawPolygon.prepend(QPoint(qRound(clp.x() + mx), qRound(clp.y() + my)));
+		}
+		redrawPolygon.append(QPoint(qRound(RecordP.point(RecordP.size()-1).x() + mx), qRound(RecordP.point(RecordP.size()-1).y() + my)));
+//FIXME		
+		m_canvas->m_viewMode.operItemResizing = true;
+		QRect bRect = m_canvas->redrawPolygon().boundingRect();
+		m_view->updateCanvas(bRect);
+		return;
+	}
+	
+	if (GetItem(&currItem))
+	{
+		newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
+		newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
+		
+		if (m_doc->DragP)
+			return;
+				
+		if ((!m_MouseButtonPressed) && (m_doc->appMode != modeDrawBezierLine))
+		{
+			if (m_doc->m_Selection->isMultipleSelection())
+			{
+				setModeCursor();
+				return;
+			}
+			for (int a = 0; a < m_doc->m_Selection->count(); ++a)
+			{
+				currItem = m_doc->m_Selection->itemAt(a);
+				if (currItem->locked())
+					break;
+				setModeCursor();
+			}
+		}
+	}
+	else
+	{
+		if ((m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton))
+		{
+			newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
+			newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
+			SeRx = newX;
+			SeRy = newY;
+			QPoint startP = m_canvas->canvasToGlobal(m_doc->appMode == modeDrawTable2 ? QPointF(Dxp, Dyp) : QPointF(Mxp, Myp));
+			m_view->redrawMarker->setGeometry(QRect(m_view->mapFromGlobal(startP), m_view->mapFromGlobal(m->globalPos())).normalized());
+			m_view->setRedrawMarkerShown(true);
+			m_view->HaveSelRect = true;
+			return;
+		}
+	}
+}
+
+void CalligraphicMode::mousePressEvent(QMouseEvent *m)
+{
+	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
+	double Rxp = 0;
+	double Ryp = 0;
+	FPoint npf, npf2;
+	QRect tx;
+	QTransform pm;
+	m_MouseButtonPressed = true;
+	m_view->HaveSelRect = false;
+	m_doc->DragP = false;
+	m_doc->leaveDrag = false;
+	m->accept();
+	m_view->registerMousePress(m->globalPos());
+	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
+	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
+	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
+	Rxp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).x();
+	Mxp = qRound(Rxp);
+	Ryp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).y();
+	Myp = qRound(Ryp);
+	SeRx = Mxp;
+	SeRy = Myp;
+	if (m->button() == Qt::MidButton)
+	{
+		m_view->MidButt = true;
+		if (m->modifiers() & Qt::ControlModifier)
+			m_view->DrawNew();
+		return;
+	}
+	if (m->button() != Qt::LeftButton)
+	{
+		m_view->stopGesture();
+		return;
+	}
+	RecordP.resize(0);
+	m_view->Deselect(false);
+	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
+	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
+	SeRx = Mxp;
+	SeRy = Myp;
+	m_canvas->setRenderModeFillBuffer();
+	undoManager->setUndoEnabled(false);
+}
+
+
+
+void CalligraphicMode::mouseReleaseEvent(QMouseEvent *m)
+{
+	undoManager->setUndoEnabled(true);
+	PageItem *currItem;
+	m_MouseButtonPressed = false;
+	m_canvas->resetRenderMode();
+	m->accept();
+	
+	if (m_doc->appMode == modeDrawCalligraphicLine)
+	{
+		if (RecordP.size() > 1)
+		{
+			UndoTransaction createTransaction;
+			if (UndoManager::undoEnabled())
+				createTransaction = UndoManager::instance()->beginTransaction();
+			uint z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs().calligraphicPenLineWidth, m_doc->itemToolPrefs().calligraphicPenFillColor, m_doc->itemToolPrefs().calligraphicPenLineColor);
+			currItem = m_doc->Items->at(z);
+			currItem->PoLine.resize(0);
+			QList<QPointF> clipU;
+			QList<QPointF> clipL;
+			double mx = sin(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
+			double my = cos(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
+			for (int px = 0; px < RecordP.size()-1; ++px)
+			{
+				FPoint clp = RecordP.point(px);
+				clipU.append(QPointF(clp.x() - mx, clp.y() - my));
+				clipL.prepend(QPointF(clp.x() + mx, clp.y() + my));
+			}
+			QPainterPath ppU = bezierFit(clipU, 5.0);
+			QPainterPath ppL = bezierFit(clipL, 5.0);
+			QPainterPath pp;
+			pp.addPath(ppU);
+			pp.connectPath(ppL);
+			pp.closeSubpath();
+			currItem->PoLine.fromQPainterPath(pp);
+			FPoint tp2(getMinClipF(&currItem->PoLine));
+			currItem->setXYPos(tp2.x(), tp2.y(), true);
+			currItem->PoLine.translate(-tp2.x(), -tp2.y());
+			FPoint tp(getMaxClipF(&currItem->PoLine));
+			m_doc->SizeItem(tp.x(), tp.y(), currItem, false, false, false);
+			m_doc->AdjustItemSize(currItem);
+			m_doc->m_Selection->clear();
+			m_doc->m_Selection->addItem(currItem);
+			currItem->ClipEdited = true;
+			currItem->FrameType = 3;
+			currItem->OwnPage = m_doc->OnPage(currItem);
+			currItem->PLineArt = Qt::PenStyle(m_doc->itemToolPrefs().calligraphicPenStyle);
+			currItem->setFillShade(m_doc->itemToolPrefs().calligraphicPenFillColorShade);
+			currItem->setLineShade(m_doc->itemToolPrefs().calligraphicPenLineColorShade);
+			currItem->setFillEvenOdd(true);
+			m_view->resetMousePressed();
+			currItem->checkChanges();
+			QString targetName = Um::ScratchSpace;
+			if (currItem->OwnPage > -1)
+				targetName = m_doc->Pages->at(currItem->OwnPage)->getUName();
+			if (createTransaction)
+				createTransaction.commit(targetName, currItem->getUPixmap(), Um::Create + " " + currItem->getUName(),  "", Um::ICreate);
+			//FIXME	
+			m_canvas->m_viewMode.operItemResizing = false;
+			m_doc->changed();
+		}
+		if (!PrefsManager::instance()->appPrefs.uiPrefs.stickyTools)
+		{
+			m_view->requestMode(modeNormal);
+		}
+		else
+			m_view->requestMode(m_doc->appMode);
+		return;
+	}
+
+	m_canvas->setRenderModeUseBuffer(false);
+	
+	m_doc->DragP = false;
+	m_doc->leaveDrag = false;
+	m_view->MidButt = false;
+	if (m_view->groupTransactionStarted())
+	{
+		for (int i = 0; i < m_doc->m_Selection->count(); ++i)
+			m_doc->m_Selection->itemAt(i)->checkChanges(true);
+		m_view->endGroupTransaction();
+	}
+
+	for (int i = 0; i < m_doc->m_Selection->count(); ++i)
+		m_doc->m_Selection->itemAt(i)->checkChanges(true);
+
+	//Commit drag created items to undo manager.
+	if (m_doc->m_Selection->itemAt(0)!=NULL)
+	{
+		m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
+	}
+	//Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+	m_view->m_ScMW->zoomSpinBox->clearFocus();
+	m_view->m_ScMW->pageSelector->clearFocus();
+	if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
+	{
+		currItem = m_doc->m_Selection->itemAt(0);
+		m_doc->nodeEdit.finishTransaction(currItem);
+	}
+}
+
+void CalligraphicMode::selectPage(QMouseEvent *m)
+{
+	m_MouseButtonPressed = true;
+	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
+	Mxp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
+	Myp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
+	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
+	m_doc->nodeEdit.deselect();
+	m_view->Deselect(false);
+	if (!m_doc->masterPageMode())
+	{
+		int i = m_doc->OnPage(Mxp, Myp);
+		if (i!=-1)
+		{
+			uint docCurrPageNo=m_doc->currentPageNumber();
+			uint j=static_cast<uint>(i);
+			if (docCurrPageNo != j)
+			{
+				m_doc->setCurrentPage(m_doc->Pages->at(j));
+				m_view->m_ScMW->slotSetCurrentPage(j);
+				m_view->DrawNew();
+			}
+		}
+	}
+}

Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp	Thu Nov 19 12:38:59 2015
@@ -1,345 +1,345 @@
-/*
- 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.
- */
-/***************************************************************************
-*                                                                         *
-*   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 "canvasmode_drawfreehand.h"
-
-#include <QEvent>
-#include <QMouseEvent>
-#include <QPainterPath>
-#include <QPoint>
-#include <QRect>
-
-#include "KarbonCurveFit.h"
-#include "appmodes.h"
-#include "canvas.h"
-#include "fpoint.h"
-#include "prefsmanager.h"
-#include "scribus.h"
-#include "scribusXml.h"
-#include "scribusdoc.h"
-#include "scribusview.h"
-#include "selection.h"
-#include "ui/pageselector.h"
-#include "ui/scrspinbox.h"
-#include "undomanager.h"
-#include "util.h"
-#include "util_math.h"
-
-
-FreehandMode::FreehandMode(ScribusView* view) : CanvasMode(view) 
-{
-	Mxp = Myp = -1;
-	Dxp = Dyp = -1;
-	MoveGX = MoveGY = false;
-	m_MouseButtonPressed = false;
-}
-
-void FreehandMode::drawControls(QPainter* p) 
-{
-	//
-}
-
-inline bool FreehandMode::GetItem(PageItem** pi)
-{ 
-	*pi = m_doc->m_Selection->itemAt(0); 
-	return (*pi) != NULL; 
-}
-
-void FreehandMode::enterEvent(QEvent *)
-{
-	if (!m_MouseButtonPressed)
-	{
-		setModeCursor();
-	}
-}
-
-
-void FreehandMode::leaveEvent(QEvent *e)
-{
-}
-
-
-void FreehandMode::activate(bool flag)
-{
-	Mxp = Myp = -1;
-	Dxp = Dyp = -1;
-	MoveGX = MoveGY = false;
-	m_MouseButtonPressed = false;
-	setModeCursor();
-}
-
-void FreehandMode::deactivate(bool flag)
-{
-	m_view->setRedrawMarkerShown(false);
-}
-
-void FreehandMode::mouseDoubleClickEvent(QMouseEvent *m)
-{
-	m->accept();
-	m_MouseButtonPressed = false;
-	m_canvas->resetRenderMode();
-	mousePressEvent(m);
-}
-
-
-void FreehandMode::mouseMoveEvent(QMouseEvent *m)
-{
-	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
-	double newX, newY;
-	PageItem *currItem;
-	QPoint np, np2, mop;
-	FPoint npf, npf2;
-	QRect tx;
-	m->accept();
-	m_canvas->displayCorrectedXYHUD(m->globalPos(), mousePointDoc.x(), mousePointDoc.y());
-	if (commonMouseMove(m))
-		return;
-	if (m_MouseButtonPressed && (m_doc->appMode == modeDrawFreehandLine))
-	{
-		double newXF = mousePointDoc.x(); //m_view->translateToDoc(m->x(), m->y()).x();
-		double newYF = mousePointDoc.y(); //m_view->translateToDoc(m->x(), m->y()).y();
-		if (RecordP.size() > 0)
-		{
-			if (FPoint(newXF, newYF) != RecordP.point(RecordP.size()-1))
-				RecordP.addPoint(FPoint(newXF, newYF));
-		}
-		else
-			RecordP.addPoint(FPoint(newXF, newYF));
-		QPolygon& redrawPolygon(m_canvas->newRedrawPolygon());
-		for (int pp = 0; pp < RecordP.size(); pp++)
-		{
-			redrawPolygon << RecordP.pointQ(pp);
-		}
-		m_canvas->m_viewMode.operItemResizing = true;
-		QRect bRect = m_canvas->redrawPolygon().boundingRect();
-		m_view->updateCanvas(bRect);
-		return;
-	}
-	if (GetItem(&currItem))
-	{
-		newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
-		newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
-		
-		if (m_doc->DragP)
-			return;
-				
-		if ((!m_MouseButtonPressed) && (m_doc->appMode != modeDrawBezierLine))
-		{
-			if (m_doc->m_Selection->isMultipleSelection())
-			{
-				setModeCursor();
-				return;
-			}
-			for (int a = 0; a < m_doc->m_Selection->count(); ++a)
-			{
-				currItem = m_doc->m_Selection->itemAt(a);
-				if (currItem->locked())
-					break;
-				setModeCursor();
-			}
-		}
-	}
-	else
-	{
-		if ((m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton))
-		{
-			newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
-			newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
-			SeRx = newX;
-			SeRy = newY;
-			QPoint startP = m_canvas->canvasToGlobal(m_doc->appMode == modeDrawTable2 ? QPointF(Dxp, Dyp) : QPointF(Mxp, Myp));
-			m_view->redrawMarker->setGeometry(QRect(m_view->mapFromGlobal(startP), m_view->mapFromGlobal(m->globalPos())).normalized());
-			m_view->setRedrawMarkerShown(true);
-			m_view->HaveSelRect = true;
-			return;
-		}
-	}
-}
-
-void FreehandMode::mousePressEvent(QMouseEvent *m)
-{
-	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
-	double Rxp = 0;
-	double Ryp = 0;
-	FPoint npf, npf2;
-	QRect tx;
-	QTransform pm;
-	m_MouseButtonPressed = true;
-	m_view->HaveSelRect = false;
-	m_doc->DragP = false;
-	m_doc->leaveDrag = false;
-	MoveGX = MoveGY = false;
-	m->accept();
-	m_view->registerMousePress(m->globalPos());
-	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
-	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
-	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
-	Rxp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).x();
-	Mxp = qRound(Rxp);
-	Ryp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).y();
-	Myp = qRound(Ryp);
-	SeRx = Mxp;
-	SeRy = Myp;
-	if (m->button() == Qt::MidButton)
-	{
-		m_view->MidButt = true;
-		if (m->modifiers() & Qt::ControlModifier)
-			m_view->DrawNew();
-		return;
-	}
-	if (m->button() != Qt::LeftButton)
-	{
-		m_view->stopGesture();
-		return;
-	}
-	RecordP.resize(0);
-	m_view->Deselect(false);
-	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
-	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
-	SeRx = Mxp;
-	SeRy = Myp;
-	m_canvas->setRenderModeFillBuffer();
-	undoManager->setUndoEnabled(false);
-}
-
-
-
-void FreehandMode::mouseReleaseEvent(QMouseEvent *m)
-{
-	undoManager->setUndoEnabled(true);
-	PageItem *currItem;
-	m_MouseButtonPressed = false;
-	m_canvas->resetRenderMode();
-	m->accept();
-	if (m_doc->appMode == modeDrawFreehandLine)
-	{
-		if (RecordP.size() > 1)
-		{
-			UndoTransaction createTransaction(UndoManager::instance()->beginTransaction());
-			uint z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs().lineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor, true);
-			currItem = m_doc->Items->at(z);
-			currItem->PoLine.resize(0);
-			if (m->modifiers() & Qt::ControlModifier)
-			{
-				QList<QPointF> clip;
-				for (int px = 0; px < RecordP.size()-1; ++px)
-				{
-					FPoint clp = RecordP.point(px);
-					clip.append(QPointF(clp.x(), clp.y()));
-				}
-				QPainterPath pp = bezierFit(clip, 5.0);
-				currItem->PoLine.fromQPainterPath(pp);
-			}
-			else
-			{
-				currItem->PoLine.addPoint(RecordP.point(0));
-				currItem->PoLine.addPoint(RecordP.point(0));
-				for (int px = 1; px < RecordP.size()-1; ++px)
-				{
-					currItem->PoLine.addPoint(RecordP.point(px));
-					currItem->PoLine.addPoint(RecordP.point(px));
-					currItem->PoLine.addPoint(RecordP.point(px));
-					currItem->PoLine.addPoint(RecordP.point(px));
-				}
-				currItem->PoLine.addPoint(RecordP.point(RecordP.size()-1));
-				currItem->PoLine.addPoint(RecordP.point(RecordP.size()-1));
-			}
-			FPoint tp2(getMinClipF(&currItem->PoLine));
-			currItem->setXYPos(tp2.x(), tp2.y(), true);
-			currItem->PoLine.translate(-tp2.x(), -tp2.y());
-			FPoint tp(getMaxClipF(&currItem->PoLine));
-			m_doc->SizeItem(tp.x(), tp.y(), currItem, false, false, false);
-			m_doc->AdjustItemSize(currItem);
-			m_doc->m_Selection->clear();
-			m_doc->m_Selection->addItem(currItem);
-			currItem->ClipEdited = true;
-			currItem->FrameType = 3;
-			currItem->OwnPage = m_doc->OnPage(currItem);
-			m_view->resetMousePressed();
-			currItem->checkChanges();
-			QString targetName = Um::ScratchSpace;
-			if (currItem->OwnPage > -1)
-				targetName = m_doc->Pages->at(currItem->OwnPage)->getUName();
-			createTransaction.commit(targetName, currItem->getUPixmap(), Um::Create + " " + currItem->getUName(),  "", Um::ICreate);
-			//FIXME	
-			m_canvas->m_viewMode.operItemResizing = false;
-			m_doc->changed();
-		}
-		if (!PrefsManager::instance()->appPrefs.uiPrefs.stickyTools)
-		{
-			m_view->requestMode(modeNormal);
-		}
-		else
-			m_view->requestMode(m_doc->appMode);
-// itemAdd calls PageItem::update		emit DocChanged();
-		return;
-	}
-	
-	m_canvas->setRenderModeUseBuffer(false);
-	
-	m_doc->DragP = false;
-	m_doc->leaveDrag = false;
-	m_view->MidButt = false;
-	if (m_view->groupTransactionStarted())
-	{
-		for (int i = 0; i < m_doc->m_Selection->count(); ++i)
-			m_doc->m_Selection->itemAt(i)->checkChanges(true);
-		m_view->endGroupTransaction();
-	}
-
-	for (int i = 0; i < m_doc->m_Selection->count(); ++i)
-		m_doc->m_Selection->itemAt(i)->checkChanges(true);
-
-	//Commit drag created items to undo manager.
-	if (m_doc->m_Selection->itemAt(0)!=NULL)
-	{
-		m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
-	}
-	//Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
-	m_view->m_ScMW->zoomSpinBox->clearFocus();
-	m_view->m_ScMW->pageSelector->clearFocus();
-	if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
-	{
-		currItem = m_doc->m_Selection->itemAt(0);
-		m_doc->nodeEdit.finishTransaction(currItem);
-	}
-}
-
-void FreehandMode::selectPage(QMouseEvent *m)
-{
-	m_MouseButtonPressed = true;
-	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
-	Mxp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
-	Myp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
-	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
-	m_doc->nodeEdit.deselect();
-	m_view->Deselect(false);
-	if (!m_doc->masterPageMode())
-	{
-		int i = m_doc->OnPage(Mxp, Myp);
-		if (i!=-1)
-		{
-			uint docCurrPageNo=m_doc->currentPageNumber();
-			uint j=static_cast<uint>(i);
-			if (docCurrPageNo != j)
-			{
-				m_doc->setCurrentPage(m_doc->Pages->at(j));
-				m_view->m_ScMW->slotSetCurrentPage(j);
-				m_view->DrawNew();
-			}
-		}
-	}
-}
+/*
+ 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.
+ */
+/***************************************************************************
+*                                                                         *
+*   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 "canvasmode_drawfreehand.h"
+
+#include <QEvent>
+#include <QMouseEvent>
+#include <QPainterPath>
+#include <QPoint>
+#include <QRect>
+
+#include "KarbonCurveFit.h"
+#include "appmodes.h"
+#include "canvas.h"
+#include "fpoint.h"
+#include "prefsmanager.h"
+#include "scribus.h"
+#include "scribusXml.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
+#include "selection.h"
+#include "ui/pageselector.h"
+#include "ui/scrspinbox.h"
+#include "undomanager.h"
+#include "util.h"
+#include "util_math.h"
+
+
+FreehandMode::FreehandMode(ScribusView* view) : CanvasMode(view) 
+{
+	Mxp = Myp = -1;
+	Dxp = Dyp = -1;
+	MoveGX = MoveGY = false;
+	m_MouseButtonPressed = false;
+}
+
+void FreehandMode::drawControls(QPainter* p) 
+{
+	//
+}
+
+inline bool FreehandMode::GetItem(PageItem** pi)
+{ 
+	*pi = m_doc->m_Selection->itemAt(0); 
+	return (*pi) != NULL; 
+}
+
+void FreehandMode::enterEvent(QEvent *)
+{
+	if (!m_MouseButtonPressed)
+	{
+		setModeCursor();
+	}
+}
+
+
+void FreehandMode::leaveEvent(QEvent *e)
+{
+}
+
+
+void FreehandMode::activate(bool flag)
+{
+	Mxp = Myp = -1;
+	Dxp = Dyp = -1;
+	MoveGX = MoveGY = false;
+	m_MouseButtonPressed = false;
+	setModeCursor();
+}
+
+void FreehandMode::deactivate(bool flag)
+{
+	m_view->setRedrawMarkerShown(false);
+}
+
+void FreehandMode::mouseDoubleClickEvent(QMouseEvent *m)
+{
+	m->accept();
+	m_MouseButtonPressed = false;
+	m_canvas->resetRenderMode();
+	mousePressEvent(m);
+}
+
+
+void FreehandMode::mouseMoveEvent(QMouseEvent *m)
+{
+	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
+	double newX, newY;
+	PageItem *currItem;
+	QPoint np, np2, mop;
+	FPoint npf, npf2;
+	QRect tx;
+	m->accept();
+	m_canvas->displayCorrectedXYHUD(m->globalPos(), mousePointDoc.x(), mousePointDoc.y());
+	if (commonMouseMove(m))
+		return;
+	if (m_MouseButtonPressed && (m_doc->appMode == modeDrawFreehandLine))
+	{
+		double newXF = mousePointDoc.x(); //m_view->translateToDoc(m->x(), m->y()).x();
+		double newYF = mousePointDoc.y(); //m_view->translateToDoc(m->x(), m->y()).y();
+		if (RecordP.size() > 0)
+		{
+			if (FPoint(newXF, newYF) != RecordP.point(RecordP.size()-1))
+				RecordP.addPoint(FPoint(newXF, newYF));
+		}
+		else
+			RecordP.addPoint(FPoint(newXF, newYF));
+		QPolygon& redrawPolygon(m_canvas->newRedrawPolygon());
+		for (int pp = 0; pp < RecordP.size(); pp++)
+		{
+			redrawPolygon << RecordP.pointQ(pp);
+		}
+		m_canvas->m_viewMode.operItemResizing = true;
+		QRect bRect = m_canvas->redrawPolygon().boundingRect();
+		m_view->updateCanvas(bRect);
+		return;
+	}
+	if (GetItem(&currItem))
+	{
+		newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
+		newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
+		
+		if (m_doc->DragP)
+			return;
+				
+		if ((!m_MouseButtonPressed) && (m_doc->appMode != modeDrawBezierLine))
+		{
+			if (m_doc->m_Selection->isMultipleSelection())
+			{
+				setModeCursor();
+				return;
+			}
+			for (int a = 0; a < m_doc->m_Selection->count(); ++a)
+			{
+				currItem = m_doc->m_Selection->itemAt(a);
+				if (currItem->locked())
+					break;
+				setModeCursor();
+			}
+		}
+	}
+	else
+	{
+		if ((m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton))
+		{
+			newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
+			newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
+			SeRx = newX;
+			SeRy = newY;
+			QPoint startP = m_canvas->canvasToGlobal(m_doc->appMode == modeDrawTable2 ? QPointF(Dxp, Dyp) : QPointF(Mxp, Myp));
+			m_view->redrawMarker->setGeometry(QRect(m_view->mapFromGlobal(startP), m_view->mapFromGlobal(m->globalPos())).normalized());
+			m_view->setRedrawMarkerShown(true);
+			m_view->HaveSelRect = true;
+			return;
+		}
+	}
+}
+
+void FreehandMode::mousePressEvent(QMouseEvent *m)
+{
+	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
+	double Rxp = 0;
+	double Ryp = 0;
+	FPoint npf, npf2;
+	QRect tx;
+	QTransform pm;
+	m_MouseButtonPressed = true;
+	m_view->HaveSelRect = false;
+	m_doc->DragP = false;
+	m_doc->leaveDrag = false;
+	MoveGX = MoveGY = false;
+	m->accept();
+	m_view->registerMousePress(m->globalPos());
+	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
+	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
+	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
+	Rxp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).x();
+	Mxp = qRound(Rxp);
+	Ryp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).y();
+	Myp = qRound(Ryp);
+	SeRx = Mxp;
+	SeRy = Myp;
+	if (m->button() == Qt::MidButton)
+	{
+		m_view->MidButt = true;
+		if (m->modifiers() & Qt::ControlModifier)
+			m_view->DrawNew();
+		return;
+	}
+	if (m->button() != Qt::LeftButton)
+	{
+		m_view->stopGesture();
+		return;
+	}
+	RecordP.resize(0);
+	m_view->Deselect(false);
+	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
+	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
+	SeRx = Mxp;
+	SeRy = Myp;
+	m_canvas->setRenderModeFillBuffer();
+	undoManager->setUndoEnabled(false);
+}
+
+
+
+void FreehandMode::mouseReleaseEvent(QMouseEvent *m)
+{
+	undoManager->setUndoEnabled(true);
+	PageItem *currItem;
+	m_MouseButtonPressed = false;
+	m_canvas->resetRenderMode();
+	m->accept();
+	if (m_doc->appMode == modeDrawFreehandLine)
+	{
+		if (RecordP.size() > 1)
+		{
+			UndoTransaction createTransaction(UndoManager::instance()->beginTransaction());
+			uint z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs().lineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor);
+			currItem = m_doc->Items->at(z);
+			currItem->PoLine.resize(0);
+			if (m->modifiers() & Qt::ControlModifier)
+			{
+				QList<QPointF> clip;
+				for (int px = 0; px < RecordP.size()-1; ++px)
+				{
+					FPoint clp = RecordP.point(px);
+					clip.append(QPointF(clp.x(), clp.y()));
+				}
+				QPainterPath pp = bezierFit(clip, 5.0);
+				currItem->PoLine.fromQPainterPath(pp);
+			}
+			else
+			{
+				currItem->PoLine.addPoint(RecordP.point(0));
+				currItem->PoLine.addPoint(RecordP.point(0));
+				for (int px = 1; px < RecordP.size()-1; ++px)
+				{
+					currItem->PoLine.addPoint(RecordP.point(px));
+					currItem->PoLine.addPoint(RecordP.point(px));
+					currItem->PoLine.addPoint(RecordP.point(px));
+					currItem->PoLine.addPoint(RecordP.point(px));
+				}
+				currItem->PoLine.addPoint(RecordP.point(RecordP.size()-1));
+				currItem->PoLine.addPoint(RecordP.point(RecordP.size()-1));
+			}
+			FPoint tp2(getMinClipF(&currItem->PoLine));
+			currItem->setXYPos(tp2.x(), tp2.y(), true);
+			currItem->PoLine.translate(-tp2.x(), -tp2.y());
+			FPoint tp(getMaxClipF(&currItem->PoLine));
+			m_doc->SizeItem(tp.x(), tp.y(), currItem, false, false, false);
+			m_doc->AdjustItemSize(currItem);
+			m_doc->m_Selection->clear();
+			m_doc->m_Selection->addItem(currItem);
+			currItem->ClipEdited = true;
+			currItem->FrameType = 3;
+			currItem->OwnPage = m_doc->OnPage(currItem);
+			m_view->resetMousePressed();
+			currItem->checkChanges();
+			QString targetName = Um::ScratchSpace;
+			if (currItem->OwnPage > -1)
+				targetName = m_doc->Pages->at(currItem->OwnPage)->getUName();
+			createTransaction.commit(targetName, currItem->getUPixmap(), Um::Create + " " + currItem->getUName(),  "", Um::ICreate);
+			//FIXME	
+			m_canvas->m_viewMode.operItemResizing = false;
+			m_doc->changed();
+		}
+		if (!PrefsManager::instance()->appPrefs.uiPrefs.stickyTools)
+		{
+			m_view->requestMode(modeNormal);
+		}
+		else
+			m_view->requestMode(m_doc->appMode);
+// itemAdd calls PageItem::update		emit DocChanged();
+		return;
+	}
+	
+	m_canvas->setRenderModeUseBuffer(false);
+	
+	m_doc->DragP = false;
+	m_doc->leaveDrag = false;
+	m_view->MidButt = false;
+	if (m_view->groupTransactionStarted())
+	{
+		for (int i = 0; i < m_doc->m_Selection->count(); ++i)
+			m_doc->m_Selection->itemAt(i)->checkChanges(true);
+		m_view->endGroupTransaction();
+	}
+
+	for (int i = 0; i < m_doc->m_Selection->count(); ++i)
+		m_doc->m_Selection->itemAt(i)->checkChanges(true);
+
+	//Commit drag created items to undo manager.
+	if (m_doc->m_Selection->itemAt(0)!=NULL)
+	{
+		m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
+	}
+	//Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+	m_view->m_ScMW->zoomSpinBox->clearFocus();
+	m_view->m_ScMW->pageSelector->clearFocus();
+	if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
+	{
+		currItem = m_doc->m_Selection->itemAt(0);
+		m_doc->nodeEdit.finishTransaction(currItem);
+	}
+}
+
+void FreehandMode::selectPage(QMouseEvent *m)
+{
+	m_MouseButtonPressed = true;
+	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
+	Mxp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
+	Myp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
+	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
+	m_doc->nodeEdit.deselect();
+	m_view->Deselect(false);
+	if (!m_doc->masterPageMode())
+	{
+		int i = m_doc->OnPage(Mxp, Myp);
+		if (i!=-1)
+		{
+			uint docCurrPageNo=m_doc->currentPageNumber();
+			uint j=static_cast<uint>(i);
+			if (docCurrPageNo != j)
+			{
+				m_doc->setCurrentPage(m_doc->Pages->at(j));
+				m_view->m_ScMW->slotSetCurrentPage(j);
+				m_view->DrawNew();
+			}
+		}
+	}
+}

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp	Thu Nov 19 12:38:59 2015
@@ -703,7 +703,7 @@
 					else
 					{
 						cli.putPoints(0, EndInd-StartInd, Clip, StartInd);
-						int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->fillColor(), currItem->lineColor(), true);
+						int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->fillColor(), currItem->lineColor());
 						PageItem* bb = m_doc->Items->takeAt(z);
 						if (m_doc->nodeEdit.isContourLine())
 							bb->ContourLine.resize(0);
@@ -752,7 +752,7 @@
 				{
 					if ((m_doc->nodeEdit.clre() > 1) && (m_doc->nodeEdit.clre() < static_cast<int>(Clip.size()-2)))
 					{
-						int z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->fillColor(), currItem->lineColor(), true);
+						int z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->fillColor(), currItem->lineColor());
 						PageItem* bb = m_doc->Items->at(z);
 						if (m_doc->nodeEdit.isContourLine())
 							bb->ContourLine.putPoints(0, Clip.size()-(m_doc->nodeEdit.clre()+2), Clip, m_doc->nodeEdit.clre()+2);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Thu Nov 19 12:38:59 2015
@@ -203,11 +203,11 @@
 	{
 	// OBSOLETE CR 2005-02-06
 	case PageItem::ItemType1:
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2);
 		break;
 	//
 	case PageItem::ImageFrame:
-		z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x, y, w, h, 1, m_Doc->prefsData().itemToolPrefs.imageFillColor, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x, y, w, h, 1, m_Doc->prefsData().itemToolPrefs.imageFillColor, CommonStrings::None);
 //		undoManager->setUndoEnabled(false);
 		currItem = m_Doc->Items->at(z);
 		currItem->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
@@ -229,15 +229,15 @@
 		break;
 	// OBSOLETE CR 2005-02-06
 	case PageItem::ItemType3:
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2);
 		break;
 	//
 	case PageItem::PathText:
 	case PageItem::TextFrame:
 		if (Buffer->PType == PageItem::PathText)
-			z = m_Doc->itemAdd(PageItem::PathText, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Buffer->Pcolor, true);
+			z = m_Doc->itemAdd(PageItem::PathText, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Buffer->Pcolor);
 		else
-			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Buffer->Pcolor, true);
+			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Buffer->Pcolor);
 //		undoManager->setUndoEnabled(false);
 		currItem = m_Doc->Items->at(z);
 		if ((Buffer->m_isAnnotation) && (Buffer->m_annotation.UseIcons()))
@@ -361,20 +361,20 @@
 //		undoManager->setUndoEnabled(true);
 		break;
 	case PageItem::Line:
-		z = m_Doc->itemAdd(PageItem::Line, PageItem::Unspecified, x, y, w ,0, pw, CommonStrings::None, Buffer->Pcolor2, true);
+		z = m_Doc->itemAdd(PageItem::Line, PageItem::Unspecified, x, y, w ,0, pw, CommonStrings::None, Buffer->Pcolor2);
 		break;
 	case PageItem::Polygon:
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2);
 		break;
 	case PageItem::PolyLine:
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2);
 		break;
 	case PageItem::Symbol:
-		z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None);
 		m_Doc->Items->at(z)->setPattern(Buffer->pattern);
 		break;
 	case PageItem::Group:
-		z = m_Doc->itemAdd(PageItem::Group, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Group, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None);
 		m_Doc->Items->at(z)->groupWidth = Buffer->groupWidth;
 		m_Doc->Items->at(z)->groupHeight = Buffer->groupHeight;
 		break;
@@ -387,7 +387,7 @@
 		break;
 	case PageItem::LatexFrame:
 		{
-		z = m_Doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, x, y, w, h, 1, m_Doc->prefsData().itemToolPrefs.imageFillColor, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, x, y, w, h, 1, m_Doc->prefsData().itemToolPrefs.imageFillColor, CommonStrings::None);
 //		undoManager->setUndoEnabled(false);
 		currItem = m_Doc->Items->at(z);
 		currItem->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
@@ -412,7 +412,7 @@
 		}
 	case PageItem::OSGFrame:
 #ifdef HAVE_OSG
-		z = m_Doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, x, y, w, h, 1, m_Doc->prefsData().itemToolPrefs.imageFillColor, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, x, y, w, h, 1, m_Doc->prefsData().itemToolPrefs.imageFillColor, CommonStrings::None);
 //		undoManager->setUndoEnabled(false);
 		currItem = m_Doc->Items->at(z);
 		currItem->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Thu Nov 19 12:38:59 2015
@@ -2504,7 +2504,7 @@
 	{
 	// OBSOLETE CR 2005-02-06
 	case PageItem::ItemType1:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
@@ -2513,7 +2513,7 @@
 	case PageItem::ImageFrame:
 	case PageItem::OSGFrame:
 	case PageItem::LatexFrame: /*Everything that is valid for image frames is also valid for latex frames*/
-		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs().imageFillColor, CommonStrings::None, true);
+		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs().imageFillColor, CommonStrings::None);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
@@ -2587,44 +2587,44 @@
 		break;
 	// OBSOLETE CR 2005-02-06
 	case PageItem::ItemType3:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	//
 	case PageItem::PathText:
-		z = doc->itemAdd(PageItem::PathText, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor, true);
+		z = doc->itemAdd(PageItem::PathText, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::TextFrame:
-		z = doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor, true);
+		z = doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Line:
-		z = doc->itemAdd(PageItem::Line, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Line, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Polygon:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::PolyLine:
-		z = doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Group:
-		z = doc->itemAdd(PageItem::Group, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None, true);
+		z = doc->itemAdd(PageItem::Group, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	Thu Nov 19 12:38:59 2015
@@ -1508,14 +1508,14 @@
 	{
 	// OBSOLETE CR 2005-02-06
 	case PageItem::ItemType1:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	//
 	case PageItem::ImageFrame:
-		z = doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs().imageFillColor, CommonStrings::None, true);
+		z = doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs().imageFillColor, CommonStrings::None);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
@@ -1593,38 +1593,38 @@
 		break;
 	// OBSOLETE CR 2005-02-06
 	case PageItem::ItemType3:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	//
 	case PageItem::PathText:
-		z = doc->itemAdd(PageItem::PathText, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor, true);
+		z = doc->itemAdd(PageItem::PathText, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::TextFrame:
-		z = doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor, true);
+		z = doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Line:
-		z = doc->itemAdd(PageItem::Line, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Line, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Polygon:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::PolyLine:
-		z = doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Thu Nov 19 12:38:59 2015
@@ -4699,7 +4699,7 @@
 	{
 	// OBSOLETE CR 2005-02-06
 	case PageItem::ItemType1:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
@@ -4708,7 +4708,7 @@
 	case PageItem::ImageFrame:
 	case PageItem::OSGFrame:
 	case PageItem::LatexFrame: /*Everything that is valid for image frames is also valid for latex frames*/
-		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs().imageFillColor, doc->itemToolPrefs().imageStrokeColor, true);
+		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs().imageFillColor, doc->itemToolPrefs().imageStrokeColor);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
@@ -4788,52 +4788,52 @@
 		break;
 	// OBSOLETE CR 2005-02-06
 	case PageItem::ItemType3:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	//
 	case PageItem::PathText:
-		z = doc->itemAdd(PageItem::PathText, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor, true);
+		z = doc->itemAdd(PageItem::PathText, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::NoteFrame:
 	case PageItem::TextFrame:
-		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor, true);
+		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Line:
-		z = doc->itemAdd(PageItem::Line, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Line, PageItem::Unspecified, x, y, w, h, pw, CommonStrings::None, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Polygon:
-		z = doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::PolyLine:
-		z = doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Symbol:
-		z = doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None, true);
+		z = doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		currItem->setPattern( attrs.valueAsString("pattern", "") );
 		break;
 	case PageItem::Group:
-		z = doc->itemAdd(PageItem::Group, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None, true);
+		z = doc->itemAdd(PageItem::Group, PageItem::Unspecified, x, y, w, h, 0, CommonStrings::None, CommonStrings::None);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
@@ -4842,25 +4842,25 @@
 		doc->GroupCounter++;
 		break;
 	case PageItem::RegularPolygon:
-		z = doc->itemAdd(PageItem::RegularPolygon, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::RegularPolygon, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Arc:
-		z = doc->itemAdd(PageItem::Arc, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Arc, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Spiral:
-		z = doc->itemAdd(PageItem::Spiral, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2, true);
+		z = doc->itemAdd(PageItem::Spiral, PageItem::Unspecified, x, y, w, h, pw, Pcolor, Pcolor2);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		break;
 	case PageItem::Table:
-		z = doc->itemAdd(PageItem::Table, PageItem::Unspecified, x, y, w, h, 0.0, CommonStrings::None, CommonStrings::None, true);
+		z = doc->itemAdd(PageItem::Table, PageItem::Unspecified, x, y, w, h, 0.0, CommonStrings::None, CommonStrings::None);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2)
 			currItem->OwnPage = pagenr;

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp	Thu Nov 19 12:38:59 2015
@@ -1414,7 +1414,7 @@
 				FPoint wh = currentSpecialPath.WidthHeight();
 				if ((currentSpecialPath.size() > 3) && (wh.x() != 0.0) && (wh.y() != 0.0))
 				{
-					z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+					z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 					ite = m_Doc->Items->at(z);
 					ite->PoLine = currentSpecialPath.copy();
 					ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
@@ -1506,7 +1506,7 @@
 				double yp = pos1.y();
 			//	xp += m_Doc->currentPage()->xOffset();
 			//	yp += m_Doc->currentPage()->yOffset();
-				int z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, baseX + xp, baseY + yp, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+				int z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, baseX + xp, baseY + yp, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 				PageItem *b = m_Doc->Items->at(z);
 				b->LayerID = m_Doc->activeLayer();
 				ScPattern pat = m_Doc->docPatterns[currentSymbolName];
@@ -1597,20 +1597,20 @@
 					if ((command == "B") || (command == "F") || (command == "S"))
 					{
 						if (command == "F")
-							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CommonStrings::None, true);
+							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CommonStrings::None);
 						else if (command == "B")
-							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 						else
-							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 					}
 					else
 					{
 						if (command == "f")
-							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CommonStrings::None, true);
+							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CommonStrings::None);
 						else if (command == "b")
-							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 						else
-							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 					}
 					ite = m_Doc->Items->at(z);
 					ite->PoLine = Coords.copy();
@@ -2033,7 +2033,7 @@
 				meshMode = false;
 				if (meshGradientArray.count() != 0)
 				{
-					z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+					z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 					ite = m_Doc->Items->at(z);
 					for (int x = 0; x < meshGradientArray.count(); x++)
 					{
@@ -2541,7 +2541,7 @@
 					QPointF pos = QPointF(textMatrix.dx(), textMatrix.dy());
 					pos += QPointF(m_Doc->currentPage()->xOffset(), -m_Doc->currentPage()->yOffset());
 					pos += QPointF(0.0, textSize / 10.0 + 2.0);
-					z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, pos.x() - docX, docHeight - (pos.y() - docY), 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+					z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, pos.x() - docX, docHeight - (pos.y() - docY), 10, 10, 0, CommonStrings::None, CommonStrings::None);
 					ite = m_Doc->Items->at(z);
 					ite->setTextToFrameDist(0.0, 0.0, 0.0, 0.0);
 					ite->itemText.append(textData);
@@ -3014,7 +3014,7 @@
 	QPointF pos = QPointF(imgMatrix.dx(), imgMatrix.dy());
 	pos += QPointF(m_Doc->currentPage()->xOffset(), -m_Doc->currentPage()->yOffset());
 	pos += QPointF(baseX, -baseY);
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, pos.x() - docX, docHeight - (pos.y() - docY), 10, 10, 0, CurrColorFill, CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, pos.x() - docX, docHeight - (pos.y() - docY), 10, 10, 0, CurrColorFill, CurrColorStroke);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->setWidthHeight(fabs(w * m1), fabs(h * m4));
 	double rotation = getRotationFromMatrix(imgMatrix, 0.0);

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp	Thu Nov 19 12:38:59 2015
@@ -506,7 +506,7 @@
 				tmpSel->getVisualGroupRect(&gx, &gy, &gw, &gh);
 				tmpSel->clear();
 				tmpSel->delaySignalsOff();
-				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, backgroundColor, CommonStrings::None, true);
+				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, backgroundColor, CommonStrings::None);
 				PageItem *ite = m_Doc->Items->takeAt(z);
 				Elements.prepend(ite);
 				m_Doc->Items->insert(oldDocItemCount, ite);
@@ -1234,7 +1234,7 @@
 					else
 						figurePath.connectPath(Coords.toQPainterPath(false));
 				}
-				int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor, true);
+				int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor);
 				PageItem *ite = m_Doc->Items->at(z);
 				ite->PoLine = Coords.copy();
 				finishItem(ite);
@@ -1263,7 +1263,7 @@
 					else
 						figurePath.connectPath(Coords.toQPainterPath(false));
 				}
-				int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor, true);
+				int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor);
 				PageItem *ite = m_Doc->Items->at(z);
 				ite->PoLine = Coords.copy();
 				finishItem(ite);
@@ -1298,7 +1298,7 @@
 			if (recordFigure)
 				figurePath.addPath(ell);
 			Coords.fromQPainterPath(ell, true);
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, textColor, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, textColor, CommonStrings::None);
 			PageItem *ite = m_Doc->Items->at(z);
 			ite->PoLine = Coords.copy();
 			finishItem(ite, false);
@@ -1338,7 +1338,7 @@
 			if (recordFigure)
 				figurePath.addPath(ell);
 			Coords.fromQPainterPath(ell, true);
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, textColor, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, textColor, CommonStrings::None);
 			PageItem *ite = m_Doc->Items->at(z);
 			ite->PoLine = Coords.copy();
 			finishItem(ite, false);
@@ -1457,7 +1457,7 @@
 			flipY = true;
 			originY = q.y();
 		}
-		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + originX, baseY + originY, pr.length(), rq.length(), edgeWidth, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + originX, baseY + originY, pr.length(), rq.length(), edgeWidth, CommonStrings::None, CommonStrings::None);
 		PageItem *ite = m_Doc->Items->at(z);
 		ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
 		finishItem(ite, false);
@@ -1677,7 +1677,7 @@
 					else
 						figurePath.connectPath(Coords.toQPainterPath(false));
 				}
-				int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor, true);
+				int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor);
 				PageItem *ite = m_Doc->Items->at(z);
 				ite->PoLine = Coords.copy();
 				finishItem(ite);
@@ -1782,7 +1782,7 @@
 					figurePath.connectPath(ell);
 			}
 			Coords.fromQPainterPath(ell, false);
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor);
 			PageItem *ite = m_Doc->Items->at(z);
 			ite->PoLine = Coords.copy();
 			finishItem(ite);
@@ -1983,7 +1983,7 @@
 				else
 					figurePath.connectPath(ell);
 			}
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor);
 			PageItem *ite = m_Doc->Items->at(z);
 			ite->PoLine = Coords.copy();
 			finishItem(ite);
@@ -2143,7 +2143,7 @@
 					else
 						figurePath.connectPath(Coords.toQPainterPath(false));
 				}
-				int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor, true);
+				int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, lineColor);
 				PageItem *ite = m_Doc->Items->at(z);
 				ite->PoLine = Coords.copy();
 				finishItem(ite);
@@ -2399,7 +2399,7 @@
 				s++;
 			}
 		}
-		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, 0, 0, tmpImg.width(), tmpImg.height(), 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, 0, 0, tmpImg.width(), tmpImg.height(), 0, CommonStrings::None, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->SetRectFrame();
 		ite->setTextFlowMode(PageItem::TextFlowDisabled);
@@ -3394,12 +3394,12 @@
 	if (lineVisible)
 	{
 		if (fillType == 0)
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, CommonStrings::None, stroke, true);
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, CommonStrings::None, stroke);
 		else if ((fillType == 1) || (fillType == 3))
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, stroke, true);
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, stroke);
 		else if (fillType == 2)
 		{
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, stroke, true);
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, stroke);
 			if (patternTable.contains(patternIndex))
 			{
 				PageItem *ite = m_Doc->Items->at(z);
@@ -3416,19 +3416,19 @@
 			}
 		}
 		else if (fillType == 4)
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, CommonStrings::None, stroke, true);
-		else
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, stroke, true);
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, CommonStrings::None, stroke);
+		else
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, stroke);
 	}
 	else
 	{
 		if (fillType == 0)
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, CommonStrings::None, fill, true);
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, CommonStrings::None, fill);
 		else if ((fillType == 1) || (fillType == 3))
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, CommonStrings::None, true);
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, CommonStrings::None);
 		else if (fillType == 2)
 		{
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, CommonStrings::None, true);
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, fill, CommonStrings::None);
 			if (patternTable.contains(patternIndex))
 			{
 				PageItem *ite = m_Doc->Items->at(z);
@@ -3445,7 +3445,7 @@
 			}
 		}
 		else
-			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, CommonStrings::None, CommonStrings::None, true);
+			z = m_Doc->itemAdd(itemType, frameType, x, y, b, h, w, CommonStrings::None, CommonStrings::None);
 	}
 	return m_Doc->Items->at(z);
 }

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp	Thu Nov 19 12:38:59 2015
@@ -451,7 +451,7 @@
 	if (Coords.size() > 0)
 	{
 		Coords.svgClosePath();
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX + obX / 72.0, baseY + obY / 72.0 * scPg, 10, 10, lineWidth / 72.0, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX + obX / 72.0, baseY + obY / 72.0 * scPg, 10, 10, lineWidth / 72.0, CurrColorFill, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp	Thu Nov 19 12:38:59 2015
@@ -1318,7 +1318,7 @@
 			path.arcTo(bBoxO, rotS, rotE);
 			scaleX = 1;
 			scaleY = 1;
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			currentItem->PoLine.fromQPainterPath(path);
 			bBoxO = path.controlPointRect();
@@ -1338,7 +1338,7 @@
 			getCommonData(ds);
 			nrOfPoints = nPoints;
 			createObjCode = 1;
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			handleLineStyle(currentItem, flags, lineColor);
 			handleGradient(currentItem, patternIndex, fillColor, backColor, bBox);
@@ -1349,7 +1349,7 @@
 			ds >> dummy;
 			if (dummy > 0)
 			{
-				z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, posX, posY, bBox.width(), bBox.height(), 0, fillC, fillC, true);
+				z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, posX, posY, bBox.width(), bBox.height(), 0, fillC, fillC);
 				gList.groupItem = m_Doc->Items->at(z);
 				gList.groupX = groupX + bBox.x();
 				gList.groupY = groupY + bBox.y();
@@ -1388,7 +1388,7 @@
 			cornerRadius = getValue(ds);
 			ds >> appFlags;
 			getCommonData(ds);
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			finishItem(currentItem);
 			if (currentItem != NULL)
@@ -1405,7 +1405,7 @@
 			ds >> fontSize;
 			fontColor = lineColor;
 			createObjCode = 5;
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), 0, lineColor, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), 0, lineColor, CommonStrings::None);
 			currentItem = m_Doc->Items->at(z);
 			scaleX = 0;
 			break;
@@ -1421,7 +1421,7 @@
 			path = QPainterPath();
 			path.moveTo(posStart);
 			path.lineTo(posEnd);
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			currentItem->PoLine.fromQPainterPath(path);
 			bBoxO = path.boundingRect();
@@ -1441,7 +1441,7 @@
 			getCommonData(ds);
 			nrOfPoints = nPoints;
 			createObjCode = 3;
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			handleLineStyle(currentItem, flags, lineColor);
 			break;
@@ -1467,7 +1467,7 @@
 			bBoxO = QRectF(QPointF(boundingBoxXO, boundingBoxYO), QPointF(boundingBoxWO, boundingBoxHO));
 			ds >> appFlags;
 			getCommonData(ds);
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			handleLineStyle(currentItem, flags, lineColor);
 			finishItem(currentItem);
@@ -1492,7 +1492,7 @@
 			cornerRadius = getValue(ds);
 			ds >> appFlags;
 			getCommonData(ds);
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			handleLineStyle(currentItem, flags, lineColor);
 			finishItem(currentItem);
@@ -1527,7 +1527,7 @@
 			path.arcTo(bBoxO, rotS, -rotE);
 			scaleX = 1;
 			scaleY = 1;
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			currentItem->PoLine.fromQPainterPath(path);
 			bBoxO = path.controlPointRect();
@@ -1550,7 +1550,7 @@
 			path = QPainterPath();
 			path.moveTo(posStart);
 			path.cubicTo(posMid, posMid, posEnd);
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			currentItem->PoLine.fromQPainterPath(path);
 			bBoxO = path.controlPointRect();
@@ -1574,7 +1574,7 @@
 			getCommonData(ds);
 			nrOfPoints = nPoints;
 			createObjCode = 4;
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			handleLineStyle(currentItem, flags, lineColor);
 			handleGradient(currentItem, patternIndex, fillColor, backColor, bBox);
@@ -1633,7 +1633,7 @@
 			path = QPainterPath();
 			path.moveTo(posStart);
 			path.cubicTo(posMid, posMid, posEnd);
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			currentItem->PoLine.fromQPainterPath(path);
 			bBoxO = path.controlPointRect();
@@ -1653,7 +1653,7 @@
 			getCommonData(ds);
 			nrOfPoints = nPoints;
 			createObjCode = 4;
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			handleLineStyle(currentItem, flags, lineColor);
 			break;
@@ -1676,7 +1676,7 @@
 			getCommonData(ds);
 			if ((bitsPerPixel == 24) || (bitsPerPixel == 8))
 			{
-				z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, posX, posY, bBox.width(), bBox.height(), lineWidth, CommonStrings::None, CommonStrings::None, true);
+				z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, posX, posY, bBox.width(), bBox.height(), lineWidth, CommonStrings::None, CommonStrings::None);
 				currentItem = m_Doc->Items->at(z);
 				finishItem(currentItem);
 				scanLinesRead = 0;
@@ -1698,7 +1698,7 @@
 			getCommonData(ds);
 			nrOfPoints = nPoints;
 			createObjCode = 2;
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			handleLineStyle(currentItem, flags, lineColor);
 			break;
@@ -1714,7 +1714,7 @@
 			getCommonData(ds);
 			nrOfPoints = nPoints;
 			createObjCode = 2;
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, posX, posY, bBox.width(), bBox.height(), lineWidth, fillC, lineColor);
 			currentItem = m_Doc->Items->at(z);
 			handleLineStyle(currentItem, flags, lineColor);
 			handleGradient(currentItem, patternIndex, fillColor, backColor, bBox);
@@ -1724,7 +1724,7 @@
 			fontColor = lineColor;
 			getCommonData(ds);
 			createObjCode = 6;
-			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, posX, posY, bBox.width(), bBox.height(), 0, CommonStrings::None, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, posX, posY, bBox.width(), bBox.height(), 0, CommonStrings::None, CommonStrings::None);
 			currentItem = m_Doc->Items->at(z);
 			currentItem->setTextToFrameDist(0.0, 0.0, 0.0, 0.0);
 			finishItem(currentItem);

Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	Thu Nov 19 12:38:59 2015
@@ -1328,7 +1328,7 @@
 						break;
 					case U_EMR_FILLPATH:
 						{
-							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 							PageItem* ite = m_Doc->Items->at(z);
 							ite->PoLine = currentDC.Coords.copy();
 							finishItem(ite);
@@ -1336,7 +1336,7 @@
 						break;
 					case U_EMR_STROKEANDFILLPATH:
 						{
-							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 							PageItem* ite = m_Doc->Items->at(z);
 							ite->PoLine = currentDC.Coords.copy();
 							finishItem(ite);
@@ -1344,7 +1344,7 @@
 						break;
 					case U_EMR_STROKEPATH:
 						{
-							int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+							int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 							PageItem* ite = m_Doc->Items->at(z);
 							ite->PoLine = currentDC.Coords.copy();
 							finishItem(ite, false);
@@ -1825,7 +1825,7 @@
 				img.save(fileName, "PNG");
 				ScPattern pat = ScPattern();
 				pat.setDoc(m_Doc);
-				int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+				int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 				PageItem* newItem = m_Doc->Items->at(z);
 				m_Doc->loadPict(fileName, newItem);
 				m_Doc->Items->takeAt(z);
@@ -2346,7 +2346,7 @@
 {
 	if (currentDC.clipValid)
 	{
-		int z = m_Doc->itemAdd(PageItem::Group, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Group, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = currentDC.clipPath.copy();
 		ite->setFillEvenOdd(false);
@@ -2393,7 +2393,7 @@
 	}
 	else
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		QTransform mm(1.0, 0.0, 0.0, 1.0, BoxDev.x(), BoxDev.y());
 		ite->PoLine.map(mm);
@@ -2417,7 +2417,7 @@
 	}
 	else
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		QTransform mm(1.0, 0.0, 0.0, 1.0, BoxDev.x(), BoxDev.y());
 		ite->PoLine.map(mm);
@@ -2444,7 +2444,7 @@
 	}
 	else
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		QTransform mm(1.0, 0.0, 0.0, 1.0, BoxDev.x(), BoxDev.y());
 		ite->PoLine.map(mm);
@@ -2477,7 +2477,7 @@
 	{
 		if (currentDC.Coords.count() != 0)
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = currentDC.Coords.copy();
 			finishItem(ite, false);
@@ -2504,7 +2504,7 @@
 	{
 		if (currentDC.Coords.count() != 0)
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = currentDC.Coords.copy();
 			finishItem(ite, false);
@@ -2528,7 +2528,7 @@
 	{
 		if (currentDC.Coords.count() != 0)
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = currentDC.Coords.copy();
 			finishItem(ite, false);
@@ -2564,7 +2564,7 @@
 		}
 		else
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = pointArray.copy();
 			finishItem(ite, false);
@@ -2613,7 +2613,7 @@
 		pointArray.fromQPainterPath(painterPath);
 		if (pointArray.count() != 0)
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = pointArray.copy();
 			finishItem(ite, false);
@@ -2657,7 +2657,7 @@
 		}
 		else
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = pointArray.copy();
 			finishItem(ite);
@@ -2702,7 +2702,7 @@
 		}
 		else
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = pointArray.copy();
 			finishItem(ite);
@@ -2757,7 +2757,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorText, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorText, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath.copy();
 		finishItem(ite);
@@ -2888,7 +2888,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorText, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorText, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath.copy();
 		finishItem(ite);
@@ -2923,7 +2923,7 @@
 	QLineF hl = QLineF(0, 0, p2.y(), 0);
 	hl = bm.map(hl);
 	p2 = convertDevice2Pts(QPointF(wl.length(), hl.length()));
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + p.x(), baseY + p.y(), p2.x(), p2.y(), 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + p.x(), baseY + p.y(), p2.x(), p2.y(), 0, CommonStrings::None, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	finishItem(ite, false);
 	QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_emf_XXXXXX.png");
@@ -2980,7 +2980,7 @@
 		QLineF hl = QLineF(0, 0, p2.y(), 0);
 		hl = bm.map(hl);
 		p2 = convertDevice2Pts(QPointF(wl.length(), hl.length()));
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + p.x(), baseY + p.y(), p2.x(), p2.y(), 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + p.x(), baseY + p.y(), p2.x(), p2.y(), 0, CommonStrings::None, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		finishItem(ite);
 	}
@@ -3208,7 +3208,7 @@
 	}
 	if (!inPath)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointsPoly.copy();
 		finishItem(ite, false);
@@ -3233,9 +3233,9 @@
 		getPolyInfo(ds, BoxDev, countP);
 		FPointArray pointsPoly = getPolyPoints(ds, countP, size, fill);
 		if (fill)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 		else
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointsPoly.copy();
 		finishItem(ite, fill);
@@ -3286,9 +3286,9 @@
 				pointsPoly.setMarker();
 		}
 		if (fill)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 		else
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointsPoly.copy();
 		finishItem(ite, fill);
@@ -3376,7 +3376,7 @@
 			}
 			FPointArray polyline;
 			polyline.fromQPainterPath(pathN, true);
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = polyline.copy();
 			finishItem(ite);
@@ -3413,7 +3413,7 @@
 			}
 			FPointArray polyline;
 			polyline.fromQPainterPath(pathN, true);
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = polyline.copy();
 			finishItem(ite);
@@ -4409,7 +4409,7 @@
 	polyline.fromQPainterPath(path);
 	if (polyline.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite);
@@ -4426,7 +4426,7 @@
 	QPointF p = getEMFPPoint(ds, compressedRects);
 	double w = getEMFPDistance(ds, compressedRects);
 	double h = getEMFPDistance(ds, compressedRects);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, w, h, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, w, h, 0, currentDC.CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, p.x(), p.y());
 	ite->PoLine.map(mm);
@@ -4441,7 +4441,7 @@
 	getEMFPBrush(brushID, directBrush);
 	if (emfStyleMapEMP.contains(flagsH))
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = emfStyleMapEMP[flagsH].Coords.copy();
 		finishItem(ite);
@@ -4468,7 +4468,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if (pointArray.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray.copy();
 		finishItem(ite);
@@ -4502,7 +4502,7 @@
 		if (polyline.size() > 3)
 		{
 			polyline.svgClosePath();
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = polyline.copy();
 			finishItem(ite);
@@ -4527,7 +4527,7 @@
 		polyline.svgLineTo(rect[2].x(), rect[2].y());
 		polyline.svgLineTo(rect[3].x(), rect[3].y());
 		polyline.svgClosePath();
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite);
@@ -4542,7 +4542,7 @@
 	getEMFPBrush(brushID, directBrush);
 	if (emfStyleMapEMP.contains(flagsH))
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = emfStyleMapEMP[flagsH].Coords.copy();
 		finishItem(ite);
@@ -4563,7 +4563,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if (pointArray.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray.copy();
 		finishItem(ite, false);
@@ -4595,7 +4595,7 @@
 		{
 			if (closedPolyline)
 				polyline.svgClosePath();
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = polyline.copy();
 			finishItem(ite, false);
@@ -4617,7 +4617,7 @@
 	polyline.fromQPainterPath(path);
 	if (polyline.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite, false);
@@ -4638,7 +4638,7 @@
 	polyline.fromQPainterPath(path);
 	if (polyline.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite, false);
@@ -4652,7 +4652,7 @@
 	QPointF p = getEMFPPoint(ds, compressedRects);
 	double w = getEMFPDistance(ds, compressedRects);
 	double h = getEMFPDistance(ds, compressedRects);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, w, h, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, w, h, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, p.x(), p.y());
 	ite->PoLine.map(mm);
@@ -4727,7 +4727,7 @@
 		{
 			if (closedPolyline)
 				polyline.svgClosePath();
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = polyline.copy();
 			finishItem(ite, false);
@@ -4742,7 +4742,7 @@
 	getEMFPPen(penID);
 	if (emfStyleMapEMP.contains(flagsH))
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = emfStyleMapEMP[flagsH].Coords.copy();
 		finishItem(ite, false);
@@ -4766,7 +4766,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if (pointArray.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray.copy();
 		finishItem(ite, false);
@@ -4789,7 +4789,7 @@
 		polyline.svgLineTo(rect[2].x(), rect[2].y());
 		polyline.svgLineTo(rect[3].x(), rect[3].y());
 		polyline.svgClosePath();
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite, false);
@@ -4876,7 +4876,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath.copy();
 		finishItem(ite);
@@ -4971,7 +4971,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath.copy();
 		finishItem(ite);
@@ -5284,7 +5284,7 @@
 									img.save(fileName, "PNG");
 									ScPattern pat = ScPattern();
 									pat.setDoc(m_Doc);
-									int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+									int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 									PageItem* newItem = m_Doc->Items->at(z);
 									m_Doc->loadPict(fileName, newItem);
 									m_Doc->Items->takeAt(z);
@@ -5685,7 +5685,7 @@
 				{
 					tempFile->close();
 					img.save(fileName, "PNG");
-					int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + p1.x(), baseY + p1.y(), QLineF(p1, p2).length(), QLineF(p1, p3).length(), 0, CommonStrings::None, CommonStrings::None, true);
+					int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + p1.x(), baseY + p1.y(), QLineF(p1, p2).length(), QLineF(p1, p3).length(), 0, CommonStrings::None, CommonStrings::None);
 					PageItem* ite = m_Doc->Items->at(z);
 					finishItem(ite, false);
 					if (QLineF(p1, p2).angle() != 0)

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	Thu Nov 19 12:38:59 2015
@@ -2143,7 +2143,7 @@
 					fillColor = CommonStrings::None;
 				if (itElem.tagName() == "TextFrame")
 				{
-					z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+					z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor);
 					PageItem* item = m_Doc->Items->at(z);
 					QString story = itElem.attribute("ParentStory");
 					if (!storyMap.contains(story))
@@ -2163,7 +2163,7 @@
 				}
 				else if (isPathText)
 				{
-					z = m_Doc->itemAdd(PageItem::PathText, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, strokeColor, true);
+					z = m_Doc->itemAdd(PageItem::PathText, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, strokeColor);
 					if (!storyMap.contains(storyForPath))
 						storyMap.insert(storyForPath, m_Doc->Items->at(z));
 					PageItem* item = m_Doc->Items->at(z);
@@ -2172,14 +2172,14 @@
 				}
 				else if (isImage)
 				{
-					z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+					z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor);
 				}
 				else
 				{
 					if (isOpen)
-						z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+						z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor);
 					else
-						z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+						z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor);
 				}
 				PageItem* item = m_Doc->Items->at(z);
 				item->PoLine = GCoords.copy();
@@ -2325,7 +2325,7 @@
 				item->ContourLine = item->PoLine.copy();
 				GElements.prepend(m_Doc->Items->takeAt(z));
 			}
-			z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 			PageItem *itemg = m_Doc->Items->at(z);
 			double dx = 0;
 			double dy = 0;
@@ -2375,7 +2375,7 @@
 				fillColor = CommonStrings::None;
 			if (itElem.tagName() == "TextFrame")
 			{
-				z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+				z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor);
 				PageItem* item = m_Doc->Items->at(z);
 				QString story = itElem.attribute("ParentStory");
 				if (!storyMap.contains(story))
@@ -2395,7 +2395,7 @@
 			}
 			else if (isPathText)
 			{
-				z = m_Doc->itemAdd(PageItem::PathText, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, strokeColor, true);
+				z = m_Doc->itemAdd(PageItem::PathText, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, CommonStrings::None, strokeColor);
 				if (!storyMap.contains(storyForPath))
 					storyMap.insert(storyForPath, m_Doc->Items->at(z));
 				PageItem* item = m_Doc->Items->at(z);
@@ -2404,14 +2404,14 @@
 			}
 			else if (isImage)
 			{
-				z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+				z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor);
 			}
 			else
 			{
 				if (isOpen)
-					z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+					z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor);
 				else
-					z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+					z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, lineWidth, fillColor, strokeColor);
 			}
 			PageItem* item = m_Doc->Items->at(z);
 			double dx = 0;
@@ -2677,7 +2677,7 @@
 			double gy = miny;
 			double gw = maxx - minx;
 			double gh = maxy - miny;
-			int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 			PageItem *item = m_Doc->Items->at(z);
 			item->setTextFlowMode(textFlow);
 			m_Doc->AdjustItemSize(item);
@@ -2950,7 +2950,7 @@
 				}
 			}
 			m_Doc->dontResize = true;
-			int z = m_Doc->itemAdd(PageItem::Table, PageItem::Unspecified, 0, 0, qMin(item->width() - 2, twidth), qMin(item->height() - 2, theight), 0.0, CommonStrings::None, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Table, PageItem::Unspecified, 0, 0, qMin(item->width() - 2, twidth), qMin(item->height() - 2, theight), 0.0, CommonStrings::None, CommonStrings::None);
 			PageItem_Table* currItem = m_Doc->Items->takeAt(z)->asTable();
 			currItem->insertRows(0, rowHeights.count()-1);
 			m_Doc->dontResize = true;

Modified: trunk/Scribus/scribus/plugins/import/idml_old/importidmlimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/idml_old/importidmlimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml_old/importidmlimpl.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/idml_old/importidmlimpl.cpp	Thu Nov 19 12:38:59 2015
@@ -732,7 +732,7 @@
 	/** Now we have all the necessary things for defining a textitem in Scribus, here we go!
 	*/
 	
-	int z = doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, x, y, w, h,0 , FillColor, StrokeColor, true);
+	int z = doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, x, y, w, h,0 , FillColor, StrokeColor);
 	currItem = doc->Items->at(z);
 	currItem->setLocked(Locked);
 	currItem->setLayer(layerMap.value(ItemLayer));

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	Thu Nov 19 12:38:59 2015
@@ -480,7 +480,7 @@
 						{
 							ObjStyle tmpBStyle;
 							resovleStyle(tmpBStyle, backGroundStyle);
-							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, tmpOStyle.page_width, tmpOStyle.page_height, 0, tmpBStyle.CurrColorFill, CommonStrings::None, true);
+							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, tmpOStyle.page_width, tmpOStyle.page_height, 0, tmpBStyle.CurrColorFill, CommonStrings::None);
 							PageItem *retObj = m_Doc->Items->at(z);
 							finishItem(retObj, tmpBStyle);
 						}
@@ -606,7 +606,7 @@
 						{
 							ObjStyle tmpBStyle;
 							resovleStyle(tmpBStyle, currStyle.page_layout_name.value);
-							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, tmpOStyle.page_width, tmpOStyle.page_height, 0, tmpBStyle.CurrColorFill, CommonStrings::None, true);
+							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, tmpOStyle.page_width, tmpOStyle.page_height, 0, tmpBStyle.CurrColorFill, CommonStrings::None);
 							PageItem *retObj = m_Doc->Items->at(z);
 							finishItem(retObj, tmpBStyle);
 						}
@@ -767,7 +767,7 @@
 			double gy = miny;
 			double gw = maxx - minx;
 			double gh = maxy - miny;
-			int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 			retObj = m_Doc->Items->at(z);
 			retObj->ClipEdited = true;
 			retObj->FrameType = 3;
@@ -841,7 +841,7 @@
 		pArray.parseSVG(e.attribute("svg:d"));
 		if (pArray.size() > 3)
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke);
 			retObj = m_Doc->Items->at(z);
 			retObj->PoLine = pArray.copy();
 			QTransform mat;
@@ -1121,7 +1121,7 @@
 						QString strokeC = tmpOStyle.CurrColorStroke;
 						if (!stroked)
 							strokeC = CommonStrings::None;
-						int z = m_Doc->itemAdd(itype, PageItem::Unspecified, baseX + x, baseY + y, w, h, tmpOStyle.LineW, fillC, strokeC, true);
+						int z = m_Doc->itemAdd(itype, PageItem::Unspecified, baseX + x, baseY + y, w, h, tmpOStyle.LineW, fillC, strokeC);
 						retObj = m_Doc->Items->at(z);
 						retObj->PoLine = pArray.copy();
 						retObj->setFillEvenOdd(true);
@@ -1212,7 +1212,7 @@
 			tw = texAreaPoints[1].x() - texAreaPoints[0].x();
 			th = texAreaPoints[1].y() - texAreaPoints[0].y();
 		}
-		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX+tx, baseY+ty, tw, th, 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX+tx, baseY+ty, tw, th, 0, CommonStrings::None, CommonStrings::None);
 		retObj = m_Doc->Items->at(z);
 		retObj->setTextToFrameDist(0.0, 0.0, 0.0, 0.0);
 		retObj->setTextFlowMode(PageItem::TextFlowDisabled);
@@ -1256,7 +1256,7 @@
 	normRef.setLength(tmpOStyle.measureDist + tmpOStyle.fontSize * 1.2);
 	if (normRef.length() != 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke);
 		retObj = m_Doc->Items->at(z);
 		retObj->PoLine.resize(4);
 		retObj->PoLine.setPoint(0, FPoint(x1, y1));
@@ -1275,7 +1275,7 @@
 	normRef2.setLength(tmpOStyle.measureDist + tmpOStyle.fontSize / 2.0);
 	if (normRef2.length() != 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke);
 		retObj = m_Doc->Items->at(z);
 		retObj->PoLine.resize(4);
 		retObj->PoLine.setPoint(0, FPoint(x2, y2));
@@ -1292,7 +1292,7 @@
 	QLineF textLine = QLineF(normRef.p2(), normRef2.p2());
 	if (textLine.length() != 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX+normRef.p2().x(), baseY+normRef.p2().y(), textLine.length(), tmpOStyle.fontSize * 1.2, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX+normRef.p2().x(), baseY+normRef.p2().y(), textLine.length(), tmpOStyle.fontSize * 1.2, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
 		retObj = m_Doc->Items->at(z);
 		retObj->setFillColor(tmpOStyle.CurrColorFill);
 		retObj->setTextToFrameDist(0.0, 0.0, 0.0, 0.0);
@@ -1320,7 +1320,7 @@
 	resovleStyle(tmpOStyle, getStyleName(e));
 	if (tmpOStyle.stroke_type == 0)
 		return retObj;
-	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke);
 	retObj = m_Doc->Items->at(z);
 	retObj->PoLine.resize(4);
 	retObj->PoLine.setPoint(0, FPoint(x1, y1));
@@ -1359,7 +1359,7 @@
 	resovleStyle(tmpOStyle, getStyleName(e));
 	if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0))
 		return retObj;
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
 	retObj = m_Doc->Items->at(z);
 	if (e.hasAttribute("draw:transform"))
 		parseTransform(&retObj->PoLine, e.attribute("draw:transform"));
@@ -1381,7 +1381,7 @@
 	resovleStyle(tmpOStyle, getStyleName(e));
 	if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0))
 		return retObj;
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
 	retObj = m_Doc->Items->at(z);
 	if (corner != 0)
 	{
@@ -1404,7 +1404,7 @@
 	resovleStyle(tmpOStyle, getStyleName(e));
 	if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0))
 		return retObj;
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
 	retObj = m_Doc->Items->at(z);
 	retObj->PoLine.resize(0);
 	appendPoints(&retObj->PoLine, e, true);
@@ -1423,7 +1423,7 @@
 	resovleStyle(tmpOStyle, getStyleName(e));
 	if (tmpOStyle.stroke_type == 0)
 		return retObj;
-	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke);
 	retObj = m_Doc->Items->at(z);
 	retObj->PoLine.resize(0);
 	appendPoints(&retObj->PoLine, e, false);
@@ -1464,7 +1464,7 @@
 		double y = parseUnit(e.attribute("svg:y")) ;
 		double w = parseUnit(e.attribute("svg:width"));
 		double h = parseUnit(e.attribute("svg:height"));
-		int z = m_Doc->itemAdd(itype, PageItem::Unspecified, baseX + x, baseY + y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(itype, PageItem::Unspecified, baseX + x, baseY + y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
 		retObj = m_Doc->Items->at(z);
 		retObj->PoLine = pArray.copy();
 		QTransform mat;
@@ -1525,7 +1525,7 @@
 		{
 			if (n.text().isEmpty())
 				return retObj;
-			int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
 			retObj = m_Doc->Items->at(z);
 			retObj->setFillColor(tmpOStyle.CurrColorFill);
 			retObj->setTextToFrameDist(0.0, 0.0, 0.0, 0.0);
@@ -1550,7 +1550,7 @@
 				QStringList allFormatsV = LoadSavePlugin::getExtensionsForImport(FORMATID_FIRSTUSER);
 				if (formats.contains(ext.toUtf8()))
 				{
-					int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke, true);
+					int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
 					retObj = m_Doc->Items->at(z);
 					if (e.hasAttribute("draw:transform"))
 						retObj->setRotation(r, true);
@@ -1644,7 +1644,7 @@
 							}
 							else
 							{
-								int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke, true);
+								int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX+x, baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
 								retObj = m_Doc->Items->at(z);
 								if (e.hasAttribute("draw:transform"))
 									retObj->setRotation(r, true);
@@ -3193,7 +3193,7 @@
 	double gy = miny;
 	double gw = maxx - minx;
 	double gh = maxy - miny;
-	int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 	PageItem* retObj = m_Doc->Items->at(z);
 	retObj->ClipEdited = true;
 	retObj->FrameType = 3;
@@ -3409,7 +3409,7 @@
 					arrowTrans.translate(-m_Doc->currentPage()->xOffset(), -m_Doc->currentPage()->yOffset());
 					arrowTrans.translate(Start.x() + ite->xPos(), Start.y() + ite->yPos());
 					EndArrow.map(arrowTrans);
-					int zS = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, obState.CurrColorStroke, CommonStrings::None, true);
+					int zS = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, obState.CurrColorStroke, CommonStrings::None);
 					iteS = m_Doc->Items->at(zS);
 					iteS->PoLine = EndArrow.copy();
 					iteS->ClipEdited = true;
@@ -3476,7 +3476,7 @@
 					arrowTrans.translate(-m_Doc->currentPage()->xOffset(), -m_Doc->currentPage()->yOffset());
 					arrowTrans.translate(End.x() + ite->xPos(), End.y() + ite->yPos());
 					EndArrow.map(arrowTrans);
-					int zE = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, obState.CurrColorStroke, CommonStrings::None, true);
+					int zE = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, obState.CurrColorStroke, CommonStrings::None);
 					iteS = m_Doc->Items->at(zE);
 					iteS->PoLine = EndArrow.copy();
 					iteS->ClipEdited = true;
@@ -3862,7 +3862,7 @@
 							tempFile->close();
 							ScPattern pat = ScPattern();
 							pat.setDoc(m_Doc);
-							int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+							int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 							PageItem* newItem = m_Doc->Items->at(z);
 							m_Doc->loadPict(fileName, newItem);
 							m_Doc->Items->takeAt(z);
@@ -3958,7 +3958,7 @@
 							tempFile->close();
 							ScPattern pat = ScPattern();
 							pat.setDoc(m_Doc);
-							int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+							int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 							PageItem* newItem = m_Doc->Items->at(z);
 							m_Doc->loadPict(fileName, newItem);
 							m_Doc->Items->takeAt(z);

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	Thu Nov 19 12:38:59 2015
@@ -614,7 +614,7 @@
 	storeObjectStyles(e);
 	parseStyle(oostyle, e);
 	QString drawID = e.attribute("draw:name");
-//	int zn = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX, BaseY, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+//	int zn = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX, BaseY, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 //	PageItem *neu = m_Doc->Items->at(zn);
 	for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
 	{
@@ -693,7 +693,7 @@
 	double corner = parseUnit(e.attribute("draw:corner-radius"));
 	storeObjectStyles(e);
 	parseStyle(style, e);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX+x, BaseY+y, w, h, style.strokeWidth, style.fillColor, style.strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX+x, BaseY+y, w, h, style.strokeWidth, style.fillColor, style.strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	if (corner != 0)
 	{
@@ -718,7 +718,7 @@
 	double h = parseUnit(e.attribute("svg:height"));
 	storeObjectStyles(e);
 	parseStyle(style, e);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, BaseX+x, BaseY+y, w, h, style.strokeWidth, style.fillColor, style.strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, BaseX+x, BaseY+y, w, h, style.strokeWidth, style.fillColor, style.strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite = finishNodeParsing(e, ite, style);
 	elements.append(ite);
@@ -737,7 +737,7 @@
 	double y2 = e.attribute( "svg:y2" ).isEmpty() ? 0.0 : parseUnit( e.attribute( "svg:y2" ) );
 	storeObjectStyles(e);
 	parseStyle(style, e);
-	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, style.strokeWidth, CommonStrings::None, style.strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, style.strokeWidth, CommonStrings::None, style.strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->PoLine.resize(4);
 	ite->PoLine.setPoint(0, FPoint(x1, y1));
@@ -766,7 +766,7 @@
 	double BaseY = m_Doc->currentPage()->yOffset();
 	storeObjectStyles(e);
 	parseStyle(style, e);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, style.strokeWidth, style.fillColor, style.strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, style.strokeWidth, style.fillColor, style.strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->PoLine.resize(0);
 	appendPoints(&ite->PoLine, e, true);
@@ -792,7 +792,7 @@
 	double BaseY = m_Doc->currentPage()->yOffset();
 	storeObjectStyles(e);
 	parseStyle(style, e);
-	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, style.strokeWidth, CommonStrings::None, style.strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, style.strokeWidth, CommonStrings::None, style.strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->PoLine.resize(0);
 	appendPoints(&ite->PoLine, e, false);
@@ -820,7 +820,7 @@
 	storeObjectStyles(e);
 	parseStyle(style, e);
 	PageItem::ItemType itype = parseSVG(e.attribute("svg:d"), &pArray) ? PageItem::PolyLine : PageItem::Polygon;
-	int z = m_Doc->itemAdd(itype, PageItem::Unspecified, BaseX, BaseY, 10, 10, style.strokeWidth, style.fillColor, style.strokeColor, true);
+	int z = m_Doc->itemAdd(itype, PageItem::Unspecified, BaseX, BaseY, 10, 10, style.strokeWidth, style.fillColor, style.strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->PoLine.resize(0);
 	ite->PoLine = pArray;
@@ -875,7 +875,7 @@
 	double h = parseUnit(e.attribute("svg:height"));
 	storeObjectStyles(e);
 	parseStyle(style, e);
-	int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, BaseX+x, BaseY+y, w, h+(h*0.1), style.strokeWidth, CommonStrings::None, style.strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, BaseX+x, BaseY+y, w, h+(h*0.1), style.strokeWidth, CommonStrings::None, style.strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->setFillColor(style.fillColor);
 	ite->setLineColor(style.strokeColor);
@@ -901,7 +901,7 @@
 	QString STag2 = n.toElement().tagName();
 	if ( STag2 == "draw:text-box" )
 	{
-		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, BaseX+x, BaseY+y, w, h+(h*0.1), oostyle.strokeWidth, CommonStrings::None, oostyle.strokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, BaseX+x, BaseY+y, w, h+(h*0.1), oostyle.strokeWidth, CommonStrings::None, oostyle.strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->setTextToFrameDist(0.0, 0.0, 0.0, 0.0);
 		ite->setFillTransparency(oostyle.fillTrans);

Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	Thu Nov 19 12:38:59 2015
@@ -1614,7 +1614,7 @@
 			{
 				GElements.at(ep)->moveBy(po[0].x(), po[0].y(), true);
 			}
-			z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, 0, CommonStrings::None, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, 0, CommonStrings::None, CommonStrings::None);
 			retObj = m_Doc->Items->at(z);
 			retObj->ClipEdited = true;
 			retObj->FrameType = 3;
@@ -1830,7 +1830,7 @@
 			QRectF br = po.boundingRect();
 			po.translate(-br.x(), -br.y());
 			po.translate(obState.xPos, obState.yPos);
-			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke);
 			retObj = m_Doc->Items->at(z);
 			if (!obState.clipPath.isEmpty())
 			{
@@ -1896,11 +1896,11 @@
 			po.translate(-br.x(), -br.y());
 			po.translate(obState.xPos, obState.yPos);
 			if (itemText.length() > 0)
-				z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke, true);
+				z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke);
 			else if (obState.currentPathClosed)
-				z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke, true);
+				z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke);
 			else
-				z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke, true);
+				z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX + po[0].x(), baseY + po[0].y(), obState.width, obState.height, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke);
 			retObj = m_Doc->Items->at(z);
 			if (!obState.currentPath.isEmpty())
 			{
@@ -1929,7 +1929,7 @@
 {
 	if (!obState.clipPath.isEmpty())
 	{
-		int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 		PageItem *itemg = m_Doc->Items->at(z);
 		itemg->PoLine.fromQPainterPath(obState.clipPath);
 		FPoint wh = getMaxClipF(&itemg->PoLine);

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp	Thu Nov 19 12:38:59 2015
@@ -1011,7 +1011,7 @@
 						QImage image;
 						image.loadFromData(imageData);
 						image = image.convertToFormat(QImage::Format_ARGB32);
-						int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, image.width() * resX, image.height() * resY, 0, m_Doc->itemToolPrefs().imageFillColor, CommonStrings::None, true);
+						int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, image.width() * resX, image.height() * resY, 0, m_Doc->itemToolPrefs().imageFillColor, CommonStrings::None);
 						PageItem *ite = m_Doc->Items->at(z);
 						QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_pct_XXXXXX.png");
 						tempFile->setAutoRemove(false);
@@ -1224,13 +1224,13 @@
 	{
 		int z;
 		if (opCode == 0x0070)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 		else if (opCode == 0x0071)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorStroke, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorStroke, CommonStrings::None);
 //		else if (opCode == 0x0072)
-//			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CommonStrings::None, true);
+//			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CommonStrings::None);
 		else if (opCode == 0x0074)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorStroke, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorStroke, CommonStrings::None);
 		else
 		{
 //			qDebug() << QString("Not implemented OpCode: 0x%1").arg(opCode, 4, 16, QLatin1Char('0'));
@@ -1258,16 +1258,16 @@
 	double hv = (bounds.height() - 1) * resY;
 	PageItem *ite;
 	if (opCode == 0x0030)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, LineW, CommonStrings::None, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, LineW, CommonStrings::None, CurrColorStroke);
 	else if (opCode == 0x0031)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None);
 //	else if (opCode == 0x0032)
-//		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + bounds.x(), baseY + bounds.y(), bounds.width() - 1, bounds.height() - 1, 0, CurrColorFill, CommonStrings::None, true);
+//		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + bounds.x(), baseY + bounds.y(), bounds.width() - 1, bounds.height() - 1, 0, CurrColorFill, CommonStrings::None);
 	else if (opCode == 0x0034)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None);
 	else if (opCode == 0x0040)
 	{
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, LineW, CommonStrings::None, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, LineW, CommonStrings::None, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->setCornerRadius(qMax(ovalSize.x(), ovalSize.y()));
 		ite->SetFrameRound();
@@ -1275,7 +1275,7 @@
 	}
 	else if (opCode == 0x0041)
 	{
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None);
 		ite = m_Doc->Items->at(z);
 		ite->setCornerRadius(qMax(ovalSize.x(), ovalSize.y()));
 		ite->SetFrameRound();
@@ -1283,7 +1283,7 @@
 	}
 //	else if (opCode == 0x0042)
 //	{
-//		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + bounds.x(), baseY + bounds.y(), bounds.width() - 1, bounds.height() - 1, 0, CurrColorFill, CommonStrings::None, true);
+//		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + bounds.x(), baseY + bounds.y(), bounds.width() - 1, bounds.height() - 1, 0, CurrColorFill, CommonStrings::None);
 //		ite = m_Doc->Items->at(z);
 //		ite->setCornerRadius(qMax(ovalSize.x(), ovalSize.y()));
 //		ite->SetFrameRound();
@@ -1291,20 +1291,20 @@
 //	}
 	else if (opCode == 0x0044)
 	{
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None);
 		ite = m_Doc->Items->at(z);
 		ite->setCornerRadius(qMax(ovalSize.x(), ovalSize.y()));
 		ite->SetFrameRound();
 		m_Doc->setRedrawBounding(ite);
 	}
 	else if (opCode == 0x0050)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, xp, yp, wv, hv, LineW, CommonStrings::None, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, xp, yp, wv, hv, LineW, CommonStrings::None, CurrColorStroke);
 	else if (opCode == 0x0051)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None);
 //	else if (opCode == 0x0052)
-//		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + bounds.x(), baseY + bounds.y(), bounds.width() - 1, bounds.height() - 1, 0, CurrColorFill, CommonStrings::None, true);
+//		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + bounds.x(), baseY + bounds.y(), bounds.width() - 1, bounds.height() - 1, 0, CurrColorFill, CommonStrings::None);
 	else if (opCode == 0x0054)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, xp, yp, wv, hv, 0, CurrColorStroke, CommonStrings::None);
 	else
 	{
 //		qDebug() << QString("Not implemented OpCode: 0x%1").arg(opCode, 4, 16, QLatin1Char('0'));
@@ -1347,16 +1347,16 @@
 	else
 	{
 		if (opCode == 0x0038)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, LineW, CommonStrings::None, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, LineW, CommonStrings::None, CurrColorStroke);
 		else if (opCode == 0x0039)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None);
 //		else if (opCode == 0x003A)
-//			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorFill, CommonStrings::None, true);
+//			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorFill, CommonStrings::None);
 		else if (opCode == 0x003C)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None);
 		else if (opCode == 0x0048)
 		{
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CommonStrings::None, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CommonStrings::None, CurrColorStroke);
 			ite = m_Doc->Items->at(z);
 			ite->setCornerRadius(qMax(ovalSize.x(), ovalSize.y()));
 			ite->SetFrameRound();
@@ -1364,7 +1364,7 @@
 		}
 		else if (opCode == 0x0049)
 		{
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None);
 			ite = m_Doc->Items->at(z);
 			ite->setCornerRadius(qMax(ovalSize.x(), ovalSize.y()));
 			ite->SetFrameRound();
@@ -1372,7 +1372,7 @@
 		}
 //		else if (opCode == 0x004A)
 //		{
-//			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorFill, CommonStrings::None, true);
+//			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorFill, CommonStrings::None);
 //			ite = m_Doc->Items->at(z);
 //			ite->setCornerRadius(qMax(ovalSize.x(), ovalSize.y()));
 //			ite->SetFrameRound();
@@ -1380,20 +1380,20 @@
 //		}
 		else if (opCode == 0x004C)
 		{
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None);
 			ite = m_Doc->Items->at(z);
 			ite->setCornerRadius(qMax(ovalSize.x(), ovalSize.y()));
 			ite->SetFrameRound();
 			m_Doc->setRedrawBounding(ite);
 		}
 		else if (opCode == 0x0058)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, LineW, CommonStrings::None, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, LineW, CommonStrings::None, CurrColorStroke);
 		else if (opCode == 0x0059)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None);
 //		else if (opCode == 0x005A)
-//			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorFill, CommonStrings::None, true);
+//			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorFill, CommonStrings::None);
 		else if (opCode == 0x005C)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + currRect.x(), baseY + currRect.y(), currRect.width() - 1, currRect.height() - 1, 0, CurrColorStroke, CommonStrings::None);
 		else
 		{
 //			qDebug() << QString("Not implemented OpCode: 0x%1").arg(opCode, 4, 16, QLatin1Char('0'));
@@ -1569,7 +1569,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CurrColorStroke, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CurrColorStroke, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath;
 		ite->PoLine.translate(baseX, baseY);
@@ -1851,7 +1851,7 @@
 		image = image.convertToFormat(QImage::Format_ARGB32);
 		if (!isPixmap)
 			image.invertPixels();
-		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + dstRect.left() * resX, baseY + dstRect.top() * resY, imgCols * resY, imgRows * resY, 0, m_Doc->itemToolPrefs().imageFillColor, m_Doc->itemToolPrefs().imageStrokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + dstRect.left() * resX, baseY + dstRect.top() * resY, imgCols * resY, imgRows * resY, 0, m_Doc->itemToolPrefs().imageFillColor, m_Doc->itemToolPrefs().imageStrokeColor);
 		PageItem *ite = m_Doc->Items->at(z);
 		QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_pct_XXXXXX.png");
 		tempFile->setAutoRemove(false);
@@ -2239,7 +2239,7 @@
 {
 	if ((Coords.size() > 3) && lineMode)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 		PageItem *ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		ite->PoLine.translate(offsetX, offsetY);

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp	Thu Nov 19 12:38:59 2015
@@ -340,7 +340,7 @@
 bool SlaOutputDev::handleTextAnnot(Annot* annota, double xCoor, double yCoor, double width, double height)
 {
 	AnnotText *anl = (AnnotText*)annota;
-	int z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, xCoor, yCoor, width, height, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, xCoor, yCoor, width, height, 0, CommonStrings::None, CommonStrings::None);
 	PageItem *ite = m_doc->Items->at(z);
 	int flg = annota->getFlags();
 	if (!(flg & 16))
@@ -487,7 +487,7 @@
 	}
 	if (validLink)
 	{
-		int z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, xCoor, yCoor, width, height, 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, xCoor, yCoor, width, height, 0, CommonStrings::None, CommonStrings::None);
 		PageItem *ite = m_doc->Items->at(z);
 		int flg = annota->getFlags();
 		if (!(flg & 16))
@@ -652,7 +652,7 @@
 				delete gfx;
 				delete Adev;
 			}
-			int z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, xCoor, yCoor, width, height, 0, CurrColorFill, CommonStrings::None, true);
+			int z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, xCoor, yCoor, width, height, 0, CurrColorFill, CommonStrings::None);
 			PageItem *ite = m_doc->Items->at(z);
 			int flg = annota->getFlags();
 			if (!(flg & 16))
@@ -1559,9 +1559,9 @@
 			CurrColorStroke = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &CurrStrokeShade);
 			int z;
 			if (pathIsClosed)
-				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, state->getTransformedLineWidth(), CommonStrings::None, CurrColorStroke, true);
+				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, state->getTransformedLineWidth(), CommonStrings::None, CurrColorStroke);
 			else
-				z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, xCoor, yCoor, 10, 10, state->getTransformedLineWidth(), CommonStrings::None, CurrColorStroke, true);
+				z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, xCoor, yCoor, 10, 10, state->getTransformedLineWidth(), CommonStrings::None, CurrColorStroke);
 			PageItem* ite = m_doc->Items->at(z);
 			ite->PoLine = out.copy();
 			ite->ClipEdited = true;
@@ -1637,9 +1637,9 @@
 //		CurrColorFill = getColor(state->getFillColorSpace(), state->getFillColor(), &CurrFillShade);
 		int z;
 		if (pathIsClosed)
-			z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None, true);
+			z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None);
 		else
-			z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None, true);
+			z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_doc->Items->at(z);
 		ite->PoLine = out.copy();
 		ite->ClipEdited = true;
@@ -1682,9 +1682,9 @@
 //		CurrColorFill = getColor(state->getFillColorSpace(), state->getFillColor(), &CurrFillShade);
 		int z;
 		if (pathIsClosed)
-			z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None, true);
+			z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None);
 		else
-			z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None, true);
+			z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_doc->Items->at(z);
 		ite->PoLine = out.copy();
 		ite->ClipEdited = true;
@@ -1777,7 +1777,7 @@
 	output += QString("Z");
 	pathIsClosed = true;
 	Coords = output;
-	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_doc->Items->at(z);
 	if (checkClip())
 	{
@@ -1896,7 +1896,7 @@
 	output += QString("Z");
 	pathIsClosed = true;
 	Coords = output;
-	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_doc->Items->at(z);
 	if (checkClip())
 	{
@@ -1958,7 +1958,7 @@
 	double *ctm;
 	ctm = state->getCTM();
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
-	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_doc->Items->at(z);
 	ite->ClipEdited = true;
 	ite->FrameType = 3;
@@ -2039,7 +2039,7 @@
 	double *ctm;
 	ctm = state->getCTM();
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
-	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_doc->Items->at(z);
 	ite->ClipEdited = true;
 	ite->FrameType = 3;
@@ -2257,7 +2257,7 @@
 	output += QString("Z");
 	pathIsClosed = true;
 	Coords = output;
-	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None);
 	ite = m_doc->Items->at(z);
 	if (checkClip())
 	{
@@ -2398,7 +2398,7 @@
 		delete image;
 		return;
 	}
-	int z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, xCoor + trect.x(), yCoor + trect.y(), trect.width(), trect.height(), 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, xCoor + trect.x(), yCoor + trect.y(), trect.width(), trect.height(), 0, CommonStrings::None, CommonStrings::None);
 	PageItem* ite = m_doc->Items->at(z);
 	ite->ClipEdited = true;
 	ite->FrameType = 3;
@@ -2536,7 +2536,7 @@
 			res = res.transformed(mm);
 		}
 	}
-	int z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, xCoor + trect.x(), yCoor + trect.y(), trect.width(), trect.height(), 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, xCoor + trect.x(), yCoor + trect.y(), trect.width(), trect.height(), 0, CommonStrings::None, CommonStrings::None);
 	PageItem* ite = m_doc->Items->at(z);
 	ite->ClipEdited = true;
 	ite->FrameType = 3;
@@ -2683,7 +2683,7 @@
 			res = res.transformed(mm);
 		}
 	}
-	int z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, xCoor + trect.x(), yCoor + trect.y(), trect.width(), trect.height(), 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, xCoor + trect.x(), yCoor + trect.y(), trect.width(), trect.height(), 0, CommonStrings::None, CommonStrings::None);
 	PageItem* ite = m_doc->Items->at(z);
 	ite->ClipEdited = true;
 	ite->FrameType = 3;
@@ -2847,7 +2847,7 @@
 			img = image->transformed(mm);
 		}
 	}
-	int z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, xCoor + trect.x(), yCoor + trect.y(), trect.width(), trect.height(), 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, xCoor + trect.x(), yCoor + trect.y(), trect.width(), trect.height(), 0, CommonStrings::None, CommonStrings::None);
 	PageItem* ite = m_doc->Items->at(z);
 	ite->ClipEdited = true;
 	ite->FrameType = 3;
@@ -3597,7 +3597,7 @@
 			if ((textPath.size() > 3) && ((wh.x() != 0.0) || (wh.y() != 0.0)))
 			{
 				CurrColorFill = getColor(state->getFillColorSpace(), state->getFillColor(), &CurrFillShade);
-				int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None, true);
+				int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None);
 				PageItem* ite = m_doc->Items->at(z);
 				QTransform mm;
 				mm.scale(1, -1);

Modified: trunk/Scribus/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/ps/importps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/importps.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ps/importps.cpp	Thu Nov 19 12:38:59 2015
@@ -546,9 +546,9 @@
 					else
 					{
 						if (ClosedPath)
-							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColor, CommonStrings::None, true);
+							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColor, CommonStrings::None);
 						else
-							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColor, CommonStrings::None, true);
+							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColor, CommonStrings::None);
 						ite = m_Doc->Items->at(z);
 						ite->PoLine = Coords.copy();  //FIXME: try to avoid copy if FPointArray when properly shared
 						ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
@@ -590,9 +590,9 @@
 					else
 					{
 						if (ClosedPath)
-							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColor, true);
+							z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColor);
 						else
-							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColor, true);
+							z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColor);
 						ite = m_Doc->Items->at(z);
 						ite->PoLine = Coords.copy(); //FIXME: try to avoid copy when FPointArray is properly shared
 						ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
@@ -632,7 +632,7 @@
 					if ((tmpPath.boundingRect().width() != 0) && (tmpPath.boundingRect().height() != 0))
 					{
 						clipCoords.fromQPainterPath(tmpPath);
-						z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+						z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 						ite = m_Doc->Items->at(z);
 						ite->PoLine = clipCoords.copy();  //FIXME: try to avoid copy if FPointArray when properly shared
 						ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
@@ -846,7 +846,7 @@
 		}
 	}
 	QFile::remove(rawfile);
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset(), w, h, LineW, CommonStrings::None, CurrColor, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset(), w, h, LineW, CommonStrings::None, CurrColor);
 	PageItem * ite = m_Doc->Items->at(z);
 	ite->setXYPos(m_Doc->currentPage()->xOffset() + x, m_Doc->currentPage()->yOffset() + y);
 	ite->setWidthHeight(w, h);

Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	Thu Nov 19 12:38:59 2015
@@ -869,7 +869,7 @@
 		double y = valueAsPoint(propList["svg:y"]);
 		double w = valueAsPoint(propList["svg:width"]);
 		double h = valueAsPoint(propList["svg:height"]);
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke);
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyFill(ite);
@@ -890,7 +890,7 @@
 		double y = valueAsPoint(propList["svg:y"]);
 		double w = valueAsPoint(propList["svg:width"]);
 		double h = valueAsPoint(propList["svg:height"]);
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke);
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyFill(ite);
@@ -918,7 +918,7 @@
 	}
 	if (Coords.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		finishItem(ite);
@@ -966,7 +966,7 @@
 				  imgExt = "tif";
 			  if (!imgExt.isEmpty())
 			  {
-				  z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+				  z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 				  ite = m_Doc->Items->at(z);
 				  ite->PoLine = Coords.copy();
 				  finishItem(ite);
@@ -1051,7 +1051,7 @@
 		}
 		else
 		{
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 			ite = m_Doc->Items->at(z);
 			ite->PoLine = Coords.copy();
 			finishItem(ite);
@@ -1117,7 +1117,7 @@
 				  imgExt = "tif";
 			  if (!imgExt.isEmpty())
 			  {
-				  z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+				  z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 				  ite = m_Doc->Items->at(z);
 				  ite->PoLine = Coords.copy();
 				  finishItem(ite);
@@ -1202,7 +1202,7 @@
 		}
 		else
 		{
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 			ite = m_Doc->Items->at(z);
 			ite->PoLine = Coords.copy();
 			finishItem(ite);
@@ -1214,7 +1214,7 @@
 	}
 	else
 	{
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		finishItem(ite);
@@ -1254,7 +1254,7 @@
 			imgExt = "tif";
 		if (!imgExt.isEmpty())
 		{
-			int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CurrColorFill, CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CurrColorFill, CurrColorStroke);
 			ite = m_Doc->Items->at(z);
 			finishItem(ite);
 			insertImage(ite, imgExt, imageData);
@@ -1367,7 +1367,7 @@
 		double rot = 0;
 		if (propList["librevenge:rotate"])
 			rot = propList["librevenge:rotate"]->getDouble();
-		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + x, baseY + y, w, qMax(h, 2.0), 0, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + x, baseY + y, w, qMax(h, 2.0), 0, CurrColorFill, CurrColorStroke);
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyShadow(ite);
@@ -2088,7 +2088,7 @@
 				tempFile->close();
 				ScPattern pat = ScPattern();
 				pat.setDoc(m_Doc);
-				int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+				int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 				PageItem* newItem = m_Doc->Items->at(z);
 				if (m_style["draw:red"] && m_style["draw:green"] && m_style["draw:blue"])
 				{
@@ -2492,7 +2492,7 @@
 		double y = valueAsPoint(propList["svg:y"]);
 		double w = valueAsPoint(propList["svg:width"]);
 		double h = valueAsPoint(propList["svg:height"]);
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke);
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyFill(ite);
@@ -2513,7 +2513,7 @@
 		double y = valueAsPoint(propList["svg:y"]);
 		double w = valueAsPoint(propList["svg:width"]);
 		double h = valueAsPoint(propList["svg:height"]);
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke);
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyFill(ite);
@@ -2538,7 +2538,7 @@
 	}
 	if (Coords.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		finishItem(ite);
@@ -2583,7 +2583,7 @@
 			  imgExt = "tif";
 		  if (!imgExt.isEmpty())
 		  {
-			  z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			  z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 			  ite = m_Doc->Items->at(z);
 			  ite->PoLine = Coords.copy();
 			  finishItem(ite);
@@ -2668,7 +2668,7 @@
 	}
 	else
 	{
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		finishItem(ite);
@@ -2731,7 +2731,7 @@
 				  imgExt = "tif";
 			  if (!imgExt.isEmpty())
 			  {
-				  z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+				  z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 				  ite = m_Doc->Items->at(z);
 				  ite->PoLine = Coords.copy();
 				  finishItem(ite);
@@ -2816,7 +2816,7 @@
 		}
 		else
 		{
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 			ite = m_Doc->Items->at(z);
 			ite->PoLine = Coords.copy();
 			finishItem(ite);
@@ -2828,7 +2828,7 @@
 	}
 	else
 	{
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		finishItem(ite);
@@ -2865,7 +2865,7 @@
 			imgExt = "tif";
 		if (!imgExt.isEmpty())
 		{
-			int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CurrColorFill, CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CurrColorFill, CurrColorStroke);
 			ite = m_Doc->Items->at(z);
 			finishItem(ite);
 			insertImage(ite, imgExt, imageData);
@@ -2972,7 +2972,7 @@
 		double rot = 0;
 		if (propList["libwpg:rotate"])
 			rot = propList["libwpg:rotate"]->getDouble();
-		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CurrColorFill, CurrColorStroke);
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyShadow(ite);
@@ -3319,7 +3319,7 @@
 				tempFile->close();
 				ScPattern pat = ScPattern();
 				pat.setDoc(m_Doc);
-				int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+				int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 				PageItem* newItem = m_Doc->Items->at(z);
 				if (m_style["draw:red"] && m_style["draw:green"] && m_style["draw:blue"])
 				{
@@ -3677,7 +3677,7 @@
 					arrowTrans.translate(-m_Doc->currentPage()->xOffset(), -m_Doc->currentPage()->yOffset());
 					arrowTrans.translate(End.x() + ite->xPos(), End.y() + ite->yPos());
 					EndArrow.map(arrowTrans);
-					int zE = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CurrColorStroke, CommonStrings::None, true);
+					int zE = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CurrColorStroke, CommonStrings::None);
 					PageItem *iteE = m_Doc->Items->at(zE);
 					iteE->PoLine = EndArrow.copy();
 					finishItem(iteE);
@@ -3728,7 +3728,7 @@
 					arrowTrans.translate(-m_Doc->currentPage()->xOffset(), -m_Doc->currentPage()->yOffset());
 					arrowTrans.translate(Start.x() + ite->xPos(), Start.y() + ite->yPos());
 					EndArrow.map(arrowTrans);
-					int zS = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CurrColorStroke, CommonStrings::None, true);
+					int zS = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, CurrColorStroke, CommonStrings::None);
 					PageItem *iteS = m_Doc->Items->at(zS);
 					iteS->PoLine = EndArrow.copy();
 					finishItem(iteS);

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp	Thu Nov 19 12:38:59 2015
@@ -513,7 +513,7 @@
 			PoLine.addPoint(x1, y1);
 			PoLine.addPoint(x2, y2);
 			PoLine.addPoint(x2, y2);
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, strokewidth, CommonStrings::None, StrokeCol, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, strokewidth, CommonStrings::None, StrokeCol);
 			m_Doc->Items->at(z)->PoLine = PoLine.copy();
 			finishItem(m_Doc->Items->at(z));
 		}
@@ -523,7 +523,7 @@
 			y1 = ScCLocale::toDoubleC(pg.attribute("y")) * Conversion;
 			x2 = ScCLocale::toDoubleC(pg.attribute("width")) * Conversion;
 			y2 = ScCLocale::toDoubleC(pg.attribute("height")) * Conversion;
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x1, baseY + y1, x2, y2, strokewidth, FillCol, StrokeCol, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x1, baseY + y1, x2, y2, strokewidth, FillCol, StrokeCol);
 			m_Doc->Items->at(z)->setLineJoin(LineJoin);
 			m_Doc->Items->at(z)->setLineEnd(LineEnd);
 			finishItem(m_Doc->Items->at(z));
@@ -560,9 +560,9 @@
 			}
 			int z;
 			if (STag == "svg:polygon")
-				z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, strokewidth, FillCol, StrokeCol, true);
+				z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, strokewidth, FillCol, StrokeCol);
 			else
-				z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, strokewidth, CommonStrings::None, StrokeCol, true);
+				z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, strokewidth, CommonStrings::None, StrokeCol);
 			m_Doc->Items->at(z)->PoLine = PoLine.copy();
 			finishItem(m_Doc->Items->at(z));
 		}
@@ -574,7 +574,7 @@
 			y2 = ScCLocale::toDoubleC(pg.attribute("cy")) * Conversion - y1;
 			x1 *= 2.0;
 			y1 *= 2.0;
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x1, baseY + y1, x2, y2, strokewidth, FillCol, StrokeCol, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x1, baseY + y1, x2, y2, strokewidth, FillCol, StrokeCol);
 			m_Doc->Items->at(z)->setLineJoin(LineJoin);
 			m_Doc->Items->at(z)->setLineEnd(LineEnd);
 			finishItem(m_Doc->Items->at(z));
@@ -588,13 +588,13 @@
 				DOC = DOC.nextSibling();
 				continue;
 			}
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, strokewidth, FillCol, StrokeCol, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, strokewidth, FillCol, StrokeCol);
 			m_Doc->Items->at(z)->PoLine = PoLine.copy();
 			finishItem(m_Doc->Items->at(z));
 		}
 		else if (STag == "svg:g")
 		{
-			int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseX, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseX, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 			PageItem *neu = m_Doc->Items->at(z);
 			Elements.append(neu);
 			if (groupStack.count() > 0)

Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp	Thu Nov 19 12:38:59 2015
@@ -449,7 +449,7 @@
 		double y = ScCLocale::toDoubleC(elem.attribute("y"));
 		double w = ScCLocale::toDoubleC(elem.attribute("w"));
 		double h = ScCLocale::toDoubleC(elem.attribute("h"));
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke);
 		finishItem(elem, m_Doc->Items->at(z));
 	}
 	else if (typ == "RoundRectangle")
@@ -458,7 +458,7 @@
 		double y = ScCLocale::toDoubleC(elem.attribute("y"));
 		double w = ScCLocale::toDoubleC(elem.attribute("w"));
 		double h = ScCLocale::toDoubleC(elem.attribute("h"));
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke);
 		m_Doc->Items->at(z)->setCornerRadius(qMax(ScCLocale::toDoubleC(elem.attribute("r1")), ScCLocale::toDoubleC(elem.attribute("r2"))));
 		m_Doc->Items->at(z)->SetFrameRound();
 		finishItem(elem, m_Doc->Items->at(z));
@@ -469,7 +469,7 @@
 		double y = ScCLocale::toDoubleC(elem.attribute("y"));
 		double w = ScCLocale::toDoubleC(elem.attribute("w"));
 		double h = ScCLocale::toDoubleC(elem.attribute("h"));
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke);
 		finishItem(elem, m_Doc->Items->at(z));
 	}
 	else if ((typ == "Polygon") || (typ == "ClosedPath"))
@@ -478,15 +478,15 @@
 		FPoint s = Coords.point(0);
 		FPoint e = Coords.point(Coords.count() - 1);
 		if (s == e)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		else
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		m_Doc->Items->at(z)->PoLine = Coords.copy();
 		finishItem(elem, m_Doc->Items->at(z));
 	}
 	else if ((typ == "Bezier") || (typ == "OpenPath") || (typ == "LineArray") || (typ == "Polyline"))
 	{
-		int	z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		int	z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		m_Doc->Items->at(z)->PoLine = Coords.copy();
 		finishItem(elem, m_Doc->Items->at(z));
 	}
@@ -496,7 +496,7 @@
 		double y = ScCLocale::toDoubleC(elem.attribute("y"));
 		double w = ScCLocale::toDoubleC(elem.attribute("w"));
 		double h = ScCLocale::toDoubleC(elem.attribute("h"));
-		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CommonStrings::None, CommonStrings::None);
 		finishItem(elem, m_Doc->Items->at(z));
 	}
 	else if (typ == "Line")
@@ -509,7 +509,7 @@
 		Coords.addPoint(x, y);
 		Coords.addPoint(x1, y1);
 		Coords.addPoint(x1, y1);
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 		m_Doc->Items->at(z)->PoLine = Coords.copy();
 		finishItem(elem, m_Doc->Items->at(z));
 	}

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	Thu Nov 19 12:38:59 2015
@@ -859,7 +859,7 @@
 					arrowTrans.rotate(r);
 					arrowTrans.translate(-dX, -dY);
 					FPoint ba = FPoint(0.0, 0.0).transformPoint(arrowTrans, false);
-					int z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, ba.x(), ba.y(), dX * 2.0, dY * 2.0, 0, CommonStrings::None, CommonStrings::None, true);
+					int z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, ba.x(), ba.y(), dX * 2.0, dY * 2.0, 0, CommonStrings::None, CommonStrings::None);
 					PageItem* ite = m_Doc->Items->at(z);
 					ite->setPattern(importedPattTrans[gc->endMarker]);
 					ite->setRotation(r, true);
@@ -890,7 +890,7 @@
 					arrowTrans.rotate(r);
 					arrowTrans.translate(-dX, -dY);
 					FPoint ba = FPoint(0.0, 0.0).transformPoint(arrowTrans, false);
-					int z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, ba.x(), ba.y(), dX * 2.0, dY * 2.0, 0, CommonStrings::None, CommonStrings::None, true);
+					int z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, ba.x(), ba.y(), dX * 2.0, dY * 2.0, 0, CommonStrings::None, CommonStrings::None);
 					PageItem* ite = m_Doc->Items->at(z);
 					ite->setPattern(importedPattTrans[gc->startMarker]);
 					ite->setRotation(r, true);
@@ -1221,7 +1221,7 @@
 		setupNode(e);
 		parseClipPathAttr(e, clipPath);
 		m_gc.top()->forGroup = true;
-		int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, BaseX, BaseY, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, BaseX, BaseY, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 		PageItem *neu = m_Doc->Items->at(z);
 		for ( QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling() )
 		{
@@ -1504,7 +1504,7 @@
 	double y = parseUnit( e.attribute( "cy" ) ) - r;
 	setupNode(e);
 	SvgStyle *gc = m_gc.top();
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, BaseX, BaseY, r * 2.0, r * 2.0, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, BaseX, BaseY, r * 2.0, r * 2.0, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm = QTransform();
 	mm.translate(x, y);
@@ -1528,7 +1528,7 @@
 	double y = parseUnit( e.attribute( "cy" ) ) - ry;
 	setupNode(e);
 	SvgStyle *gc = m_gc.top();
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, BaseX, BaseY, rx * 2.0, ry * 2.0, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, BaseX, BaseY, rx * 2.0, ry * 2.0, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm = QTransform();
 	mm.translate(x, y);
@@ -1554,7 +1554,7 @@
 	double h = e.attribute( "height" ).isEmpty() ? 1.0 : parseUnit( e.attribute( "height" ) );
 	setupNode(e);
 	parseClipPathAttr(e, clipPath);
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x+BaseX, y+BaseY, w, h, 1, m_Doc->itemToolPrefs().imageFillColor, m_Doc->itemToolPrefs().imageStrokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x+BaseX, y+BaseY, w, h, 1, m_Doc->itemToolPrefs().imageFillColor, m_Doc->itemToolPrefs().imageStrokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	if (!fname.isEmpty())
 	{
@@ -1604,7 +1604,7 @@
 	double y2 = e.attribute( "y2" ).isEmpty() ? 0.0 : parseUnit( e.attribute( "y2" ) );
 	setupNode(e);
 	SvgStyle *gc = m_gc.top();
-	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->PoLine.resize(4);
 	ite->PoLine.setPoint(0, FPoint(x1, y1));
@@ -1626,7 +1626,7 @@
 	setupNode(e);
 	SvgStyle *gc = m_gc.top();
 	PageItem::ItemType itype = parseSVG(e.attribute("d"), &pArray) ? PageItem::PolyLine : PageItem::Polygon; 
-	int z = m_Doc->itemAdd(itype, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+	int z = m_Doc->itemAdd(itype, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->fillRule = (gc->fillRule != "nonzero");
 	ite->PoLine = pArray;
@@ -1662,9 +1662,9 @@
 		points = points.simplified().replace(',', " ");
 		QStringList pointList = points.split( ' ', QString::SkipEmptyParts );
 		if ((STag == "polygon" ) && (pointList.count() > 4))
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 		else
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->fillRule = (gc->fillRule != "nonzero"); 
 		ite->PoLine.resize(0);
@@ -1718,7 +1718,7 @@
 	double ry = e.attribute( "ry" ).isEmpty() ? 0.0 : parseUnit( e.attribute( "ry" ) );
 	setupNode(e);
 	SvgStyle *gc = m_gc.top();
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX, BaseY, width, height, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX, BaseY, width, height, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	PageItem* ite = m_Doc->Items->at(z);
 	if ((rx != 0) || (ry != 0))
 	{
@@ -1825,7 +1825,7 @@
 	if (textPath.size() > 0)
 	{
 //		double  lineWidth = 0.0;
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, textFillColor, textStrokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, gc->LWidth, textFillColor, textStrokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath;
 		finishNode(e, ite);

Modified: trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp	Thu Nov 19 12:38:59 2015
@@ -1550,7 +1550,7 @@
 	QPointF p1 = getPoint(ds);
 	QPointF p2 = getPoint(ds);
 	QRectF box = QRectF(p1, p2);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, box.width(), box.height(), 0, currentDC.CurrColorFill, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, box.width(), box.height(), 0, currentDC.CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, box.x(), box.y());
 	ite->PoLine.map(mm);
@@ -1562,7 +1562,7 @@
 	QPointF p1 = getPoint(ds);
 	QPointF p2 = getPoint(ds);
 	QRectF box = QRectF(p1, p2);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, box.width(), box.height(), 0, currentDC.CurrColorFill, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, box.width(), box.height(), 0, currentDC.CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, box.x(), box.y());
 	ite->PoLine.map(mm);
@@ -1577,7 +1577,7 @@
 	ds >> x1 >> y1;
 	QPointF p3 = convertLogical2Pts(QPointF(x1, y1));
 	QRectF BoxDev = QRectF(p1, p2);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, BoxDev.width(), BoxDev.height(), 0, currentDC.CurrColorFill, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, BoxDev.width(), BoxDev.height(), 0, currentDC.CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, BoxDev.x(), BoxDev.y());
 	ite->PoLine.map(mm);
@@ -1606,7 +1606,7 @@
 	currentDC.LineW = convertLogical2Pts(lineWidth);
 	if (poly.count() != 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = poly.copy();
 		finishItem(ite, false);
@@ -1630,7 +1630,7 @@
 	pointArray.svgInit();
 	pointArray.svgMoveTo(p1.x(), p1.y());
 	pointArray.svgLineTo(p2.x(), p2.y());
-	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 	PageItem* ite = m_Doc->Items->at(z);
 	ite->PoLine = pointArray.copy();
 	finishItem(ite);
@@ -1662,7 +1662,7 @@
 		}
 		else
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = pointArray.copy();
 			finishItem(ite, false);
@@ -1711,7 +1711,7 @@
 		pointArray.fromQPainterPath(painterPath);
 		if (pointArray.count() != 0)
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = pointArray.copy();
 			finishItem(ite, false);
@@ -1755,7 +1755,7 @@
 		}
 		else
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = pointArray.copy();
 			finishItem(ite);
@@ -1800,7 +1800,7 @@
 		}
 		else
 		{
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, BoxDev.width(), BoxDev.height(), currentDC.LineW, currentDC.CurrColorFill, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = pointArray.copy();
 			finishItem(ite);
@@ -1930,7 +1930,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorText, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorText, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath.copy();
 		finishItem(ite);
@@ -2026,7 +2026,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorText, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorText, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath.copy();
 		finishItem(ite);
@@ -2047,7 +2047,7 @@
 	ds >> w >> h;
 	double width = convertLogical2Pts(w);
 	double height = convertLogical2Pts(h);
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + p.x(), baseY + p.y(), width, height, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + p.x(), baseY + p.y(), width, height, 0, CommonStrings::None, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	finishItem(ite);
 	QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_svm_XXXXXX.png");
@@ -2103,7 +2103,7 @@
 	ds >> w >> h;
 	double width = convertLogical2Pts(w);
 	double height = convertLogical2Pts(h);
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + p.x(), baseY + p.y(), width, height, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + p.x(), baseY + p.y(), width, height, 0, CommonStrings::None, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	finishItem(ite);
 	QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_svm_XXXXXX.png");
@@ -2133,7 +2133,7 @@
 	FPointArray poly = getPolyPoints(ds, numPoints, false);
 	if (poly.count() != 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = poly.copy();
 		finishItem(ite, false);
@@ -2145,7 +2145,7 @@
 	FPointArray pointsPoly = getPolyPolygonPoints(ds, version);
 	if (pointsPoly.count() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointsPoly.copy();
 		finishItem(ite);
@@ -2159,7 +2159,7 @@
 	ds >> trans;
 	if (pointsPoly.count() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointsPoly.copy();
 		finishItem(ite);
@@ -2180,7 +2180,7 @@
 	QColor colS = QColor(colsR >> 8, colsG >> 8, colsB >> 8, 255);
 	if (pointsPoly.count() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointsPoly.copy();
 		finishItem(ite);
@@ -2195,7 +2195,7 @@
 	QPointF p1 = getPoint(ds);
 	QPointF p2 = getPoint(ds);
 	QRectF box = QRectF(p1, p2);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, box.width(), box.height(), 0, currentDC.CurrColorFill, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, box.width(), box.height(), 0, currentDC.CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, box.x(), box.y());
 	ite->PoLine.map(mm);
@@ -2208,7 +2208,7 @@
 	FPointArray pointsPoly = getPolyPolygonPoints(ds, version);
 	if (pointsPoly.count() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointsPoly.copy();
 		finishItem(ite);
@@ -3367,7 +3367,7 @@
 	polyline.fromQPainterPath(path);
 	if (polyline.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite);
@@ -3384,7 +3384,7 @@
 	QPointF p = getEMFPPoint(ds, compressedRects);
 	double w = getEMFPDistance(ds, compressedRects);
 	double h = getEMFPDistance(ds, compressedRects);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, w, h, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, w, h, 0, currentDC.CurrColorFill, CommonStrings::None);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, p.x(), p.y());
 	ite->PoLine.map(mm);
@@ -3399,7 +3399,7 @@
 	getEMFPBrush(brushID, directBrush);
 	if (emfStyleMapEMP.contains(flagsH))
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = emfStyleMapEMP[flagsH].Coords.copy();
 		finishItem(ite);
@@ -3426,7 +3426,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if (pointArray.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray.copy();
 		finishItem(ite);
@@ -3460,7 +3460,7 @@
 		if (polyline.size() > 3)
 		{
 			polyline.svgClosePath();
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = polyline.copy();
 			finishItem(ite);
@@ -3485,7 +3485,7 @@
 		polyline.svgLineTo(rect[2].x(), rect[2].y());
 		polyline.svgLineTo(rect[3].x(), rect[3].y());
 		polyline.svgClosePath();
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite);
@@ -3500,7 +3500,7 @@
 	getEMFPBrush(brushID, directBrush);
 	if (emfStyleMapEMP.contains(flagsH))
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = emfStyleMapEMP[flagsH].Coords.copy();
 		finishItem(ite);
@@ -3521,7 +3521,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if (pointArray.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray.copy();
 		finishItem(ite, false);
@@ -3553,7 +3553,7 @@
 		{
 			if (closedPolyline)
 				polyline.svgClosePath();
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = polyline.copy();
 			finishItem(ite, false);
@@ -3575,7 +3575,7 @@
 	polyline.fromQPainterPath(path);
 	if (polyline.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite, false);
@@ -3596,7 +3596,7 @@
 	polyline.fromQPainterPath(path);
 	if (polyline.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite, false);
@@ -3610,7 +3610,7 @@
 	QPointF p = getEMFPPoint(ds, compressedRects);
 	double w = getEMFPDistance(ds, compressedRects);
 	double h = getEMFPDistance(ds, compressedRects);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, w, h, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, w, h, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, p.x(), p.y());
 	ite->PoLine.map(mm);
@@ -3685,7 +3685,7 @@
 		{
 			if (closedPolyline)
 				polyline.svgClosePath();
-			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+			int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = polyline.copy();
 			finishItem(ite, false);
@@ -3700,7 +3700,7 @@
 	getEMFPPen(penID);
 	if (emfStyleMapEMP.contains(flagsH))
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = emfStyleMapEMP[flagsH].Coords.copy();
 		finishItem(ite, false);
@@ -3724,7 +3724,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if (pointArray.size() > 3)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray.copy();
 		finishItem(ite, false);
@@ -3747,7 +3747,7 @@
 		polyline.svgLineTo(rect[2].x(), rect[2].y());
 		polyline.svgLineTo(rect[3].x(), rect[3].y());
 		polyline.svgClosePath();
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, currentDC.LineW, CommonStrings::None, currentDC.CurrColorStroke);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = polyline.copy();
 		finishItem(ite, false);
@@ -3834,7 +3834,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath.copy();
 		finishItem(ite);
@@ -3929,7 +3929,7 @@
 	textPath.fromQPainterPath(painterPath);
 	if (textPath.size() > 0)
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, currentDC.CurrColorFill, CommonStrings::None);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = textPath.copy();
 		finishItem(ite);
@@ -4195,7 +4195,7 @@
 									img.save(fileName, "PNG");
 									ScPattern pat = ScPattern();
 									pat.setDoc(m_Doc);
-									int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+									int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 									PageItem* newItem = m_Doc->Items->at(z);
 									m_Doc->loadPict(fileName, newItem);
 									m_Doc->Items->takeAt(z);
@@ -4584,7 +4584,7 @@
 				{
 					tempFile->close();
 					img.save(fileName, "PNG");
-					int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + p1.x(), baseY + p1.y(), QLineF(p1, p2).length(), QLineF(p1, p3).length(), 0, CommonStrings::None, CommonStrings::None, true);
+					int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX + p1.x(), baseY + p1.y(), QLineF(p1, p2).length(), QLineF(p1, p3).length(), 0, CommonStrings::None, CommonStrings::None);
 					PageItem* ite = m_Doc->Items->at(z);
 					finishItem(ite, false);
 					if (QLineF(p1, p2).angle() != 0)

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	Thu Nov 19 12:38:59 2015
@@ -937,7 +937,7 @@
 				double gy = miny;
 				double gw = maxx - minx;
 				double gh = maxy - miny;
-				int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+				int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 				if (z >= 0)
 				{
 					retObj = m_Doc->Items->at(z);
@@ -1437,33 +1437,33 @@
 	if (baseType == 0)
 	{
 		if (ob_type == 0)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 		else if (ob_type == 1)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 		else if (ob_type == 2)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 		else if (ob_type == 3)
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 		else if (ob_type == 4)
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 	}
 	else if (baseType == 1)
 	{
 		if (ob_type == 0)
-			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 		else if (ob_type == 1)
-			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Ellipse, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Ellipse, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 		else if (ob_type == 2)
-			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 	}
 	else if (baseType == 2)
 	{
 		if (ob_type == 0)
-			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 		else if (ob_type == 1)
-			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Ellipse, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Ellipse, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 		else if (ob_type == 2)
-			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor, true);
+			z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX, baseY, ob_width, ob_height, lineWidth, fillColor, strokeColor);
 	}
 	if (z >= 0)
 	{

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp	Thu Nov 19 12:38:59 2015
@@ -810,7 +810,7 @@
 		double y2 = params[0];
 		double  lineWidth = m_context.pen().width();
 		QString lineColor = importColor(m_context.pen().color());
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, CommonStrings::None, lineColor, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, CommonStrings::None, lineColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine.resize(4);
 		ite->PoLine.setPoint(0, FPoint(x1, y1));
@@ -841,7 +841,7 @@
 	QString fillColor   = doFill ? importColor( m_context.brush().color() ) : CommonStrings::None;
 	QString strokeColor = doStroke ? importColor( m_context.pen().color() ) : CommonStrings::None;
 	double  lineWidth   = m_context.pen().width();
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, BaseX, BaseY, rx * 2.0, ry * 2.0, lineWidth, fillColor, strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, BaseX, BaseY, rx * 2.0, ry * 2.0, lineWidth, fillColor, strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, px, py);
 	ite->PoLine.map(mm);
@@ -865,7 +865,7 @@
 	FPointArray points      = pointsToPolyline( paramPoints, true );
 	if( paramPoints.size() > 0 )
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = points;
 		ite->fillRule = !m_context.windingFill();
@@ -905,7 +905,7 @@
 		lineWidth = 1.0;
 	if( pointsPoly.size() > 0 )
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointsPoly;
 		ite->fillRule = !m_context.windingFill();
@@ -929,7 +929,7 @@
 	FPointArray points      = pointsToPolyline( paramPoints, false );
 	if( paramPoints.size() > 0 )
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = points;
 		finishCmdParsing(ite);
@@ -953,7 +953,7 @@
 	double y = ((params[2] - params[0]) > 0) ? params[0] : params[2];
 	double width  = fabs((double) params[3] - params[1]);
 	double height = fabs((double) params[2] - params[0]);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX, BaseY, width, height, lineWidth, fillColor, strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX, BaseY, width, height, lineWidth, fillColor, strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	QTransform mm(1.0, 0.0, 0.0, 1.0, x, y);
 	ite->PoLine.map(mm);
@@ -979,7 +979,7 @@
 	double height = fabs((double) params[4] - params[2]);
 	double rx     = params[1] / 2.0;
 	double ry     = params[0] / 2.0;
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX, BaseY, width, height, lineWidth, fillColor, strokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, BaseX, BaseY, width, height, lineWidth, fillColor, strokeColor);
 	PageItem* ite = m_Doc->Items->at(z);
 	if ((rx != 0.0) || (ry != 0.0))
 	{
@@ -1018,7 +1018,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if( pointArray.size() > 0 )
 	{
-		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray;
 		finishCmdParsing(ite);
@@ -1055,7 +1055,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if( pointArray.size() > 0 )
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray;
 		finishCmdParsing(ite);
@@ -1093,7 +1093,7 @@
 	pointArray.fromQPainterPath(painterPath);
 	if( pointArray.size() > 0 )
 	{
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = pointArray;
 		finishCmdParsing(ite);
@@ -1255,7 +1255,7 @@
 			textPath.fromQPainterPath(painterPath);
 			if (textPath.size() > 0)
 			{
-				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, textColor, CommonStrings::None, true);
+				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, textColor, CommonStrings::None);
 				PageItem* ite = m_Doc->Items->at(z);
 				ite->PoLine = textPath;
 				finishCmdParsing(ite);
@@ -1273,7 +1273,7 @@
 		if (textPath.size() > 0)
 		{
 			double  lineWidth = 0.0;
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, textColor, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, textColor, CommonStrings::None);
 			PageItem* ite = m_Doc->Items->at(z);
 			ite->PoLine = textPath;
 			finishCmdParsing(ite);

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp	Thu Nov 19 12:38:59 2015
@@ -235,7 +235,7 @@
 
 void ScrPainter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ry)
 {
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, rect.width() * 72.0, rect.height() * 72.0, LineW, CurrColorFill, CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY, rect.width() * 72.0, rect.height() * 72.0, LineW, CurrColorFill, CurrColorStroke);
 	PageItem *ite = m_Doc->Items->at(z);
 	if ((rx > 0) && (ry > 0))
 	{
@@ -253,7 +253,7 @@
 
 void ScrPainter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
 {
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, rx * 144.0, ry * 144.0, LineW, CurrColorFill, CurrColorStroke, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX, baseY, rx * 144.0, ry * 144.0, LineW, CurrColorFill, CurrColorStroke);
 	PageItem *ite = m_Doc->Items->at(z);
 	QTransform mm = QTransform();
 	mm.translate(72*(center.x - rx), 72*(center.y - ry));
@@ -281,9 +281,9 @@
 	{
 		int z;
 		if (closed)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		else
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CommonStrings::None, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
@@ -332,10 +332,10 @@
 		if(path.closed)
 		{
 			Coords.svgClosePath();
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		}
 		else
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		ite = m_Doc->Items->at(z);
 		ite->PoLine = Coords.copy();
 		ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
@@ -396,7 +396,7 @@
 	}
 	double w = (bitmap.rect.x2 - bitmap.rect.x1) * 72.0;
 	double h = (bitmap.rect.y2 - bitmap.rect.y1) * 72.0;
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, bitmap.rect.x1 * 72 + baseX, bitmap.rect.y1 * 72 + baseY, w, h, 1, m_Doc->itemToolPrefs().imageFillColor, m_Doc->itemToolPrefs().imageStrokeColor, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, bitmap.rect.x1 * 72 + baseX, bitmap.rect.y1 * 72 + baseY, w, h, 1, m_Doc->itemToolPrefs().imageFillColor, m_Doc->itemToolPrefs().imageStrokeColor);
 	PageItem *ite = m_Doc->Items->at(z);
 	QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_wpg_XXXXXX.png");
 	tempFile->setAutoRemove(false);

Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	Thu Nov 19 12:38:59 2015
@@ -677,7 +677,7 @@
 		data.resize(dataLen);
 		ts.readRawData(data.data(), dataLen);
 		image.loadFromData(data);
-		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, image.width(), image.height(), 0, m_Doc->itemToolPrefs().imageFillColor, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, image.width(), image.height(), 0, m_Doc->itemToolPrefs().imageFillColor, CommonStrings::None);
 		PageItem *ite = m_Doc->Items->at(z);
 		ite->tempImageFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_xar_XXXXXX.png");
 		ite->tempImageFile->open();
@@ -1330,7 +1330,7 @@
 						Coords.translate(np.x(), np.y());
 						if (Coords.size() > 0)
 						{
-							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, txDat.FillCol, CommonStrings::None, true);
+							int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, txDat.FillCol, CommonStrings::None);
 							PageItem *item = m_Doc->Items->at(z);
 							item->PoLine = Coords.copy();
 							item->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
@@ -1437,7 +1437,7 @@
 				}
 				if (Coords.size() > 0)
 				{
-					int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, gc->FillCol, CommonStrings::None, true);
+					int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, 0, gc->FillCol, CommonStrings::None);
 					PageItem *item = m_Doc->Items->at(z);
 					item->PoLine = Coords.copy();
 					item->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
@@ -1687,7 +1687,7 @@
 //	qDebug() << "Flags" << flags;
 //	qDebug() << "Bytes read" << bytesRead << "of" << dataLen;
 	ts.skipRawData(dataLen - bytesRead);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	double w = distance(minorAxisX, minorAxisY);
 	double h = distance(majorAxisX, majorAxisY);
 	Coords.resize(0);
@@ -2804,7 +2804,7 @@
 	Coords.svgLineTo(tlx, docHeight - tly);
 	Coords.svgLineTo(trix, docHeight - triy);
 	Coords.svgClosePath();
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	finishItem(z);
 	PageItem *ite = m_Doc->Items->at(z);
 	if (patternRef.contains(bref))
@@ -2981,7 +2981,7 @@
 	double centerX, centerY, majorAxis, minorAxis;
 	readCoords(ts, centerX, centerY);
 	readCoords(ts, majorAxis, minorAxis);
-	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+	int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	Coords.resize(0);
 	Coords.svgInit();
 	QPainterPath path;
@@ -3015,11 +3015,11 @@
 		int z = -1;
 		PageItem* ite = pathMap[val];
 		if (ite->realItemType() == PageItem::ImageFrame)
-			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 		else if (ite->realItemType() == PageItem::Polygon)
-			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 		else
-			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+			z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 		if (z > -1)
 		{
 			newItem = m_Doc->Items->at(z);
@@ -3052,11 +3052,11 @@
 	int z = -1;
 	XarStyle *gc = m_gc.top();
 	if (type == 0)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, CommonStrings::None, gc->StrokeCol, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, CommonStrings::None, gc->StrokeCol);
 	else if (type == 1)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, CommonStrings::None);
 	else if (type == 2)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	else
 		return;
 	finishItem(z);
@@ -3067,11 +3067,11 @@
 	int z = -1;
 	XarStyle *gc = m_gc.top();
 	if (type == 0)
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, CommonStrings::None, gc->StrokeCol, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, CommonStrings::None, gc->StrokeCol);
 	else if (type == 1)
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, CommonStrings::None, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, CommonStrings::None);
 	else if (type == 2)
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol, gc->StrokeCol);
 	else
 		return;
 	finishItem(z);
@@ -3115,7 +3115,7 @@
 	gg.clipping = false;
 	gg.idNr = idNr;
 	gg.isBrush = true;
-	int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 	PageItem *neu = m_Doc->Items->at(z);
 	gg.groupItem = neu;
 	Elements.append(neu);
@@ -3132,7 +3132,7 @@
 	gg.clipping = false;
 	gg.idNr = 0;
 	gg.isBrush = false;
-	int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 	PageItem *neu = m_Doc->Items->at(z);
 	gg.groupItem = neu;
 	Elements.append(neu);
@@ -3149,7 +3149,7 @@
 	gg.clipping = true;
 	gg.idNr = 0;
 	gg.isBrush = false;
-	int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 	PageItem *neu = m_Doc->Items->at(z);
 	gg.groupItem = neu;
 	Elements.append(neu);

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp	Thu Nov 19 12:38:59 2015
@@ -689,7 +689,7 @@
 		}
 		else
 			iteType = PageItem::Polygon;
-		z = m_Doc->itemAdd(iteType, PageItem::Unspecified, ite->xPos(), ite->yPos(), 10, 10, arrow_thicknessAF, fillC, CurrColorStroke, true);
+		z = m_Doc->itemAdd(iteType, PageItem::Unspecified, ite->xPos(), ite->yPos(), 10, 10, arrow_thicknessAF, fillC, CurrColorStroke);
 		if (z >= 0)
 		{
 			PageItem *item = m_Doc->Items->at(z);
@@ -749,7 +749,7 @@
 		}
 		else
 			iteType = PageItem::Polygon;
-		z = m_Doc->itemAdd(iteType, PageItem::Unspecified, ite->xPos(), ite->yPos(), 10, 10, arrow_thicknessAB, fillC, CurrColorStroke, true);
+		z = m_Doc->itemAdd(iteType, PageItem::Unspecified, ite->xPos(), ite->yPos(), 10, 10, arrow_thicknessAB, fillC, CurrColorStroke);
 		if (z >= 0)
 		{
 			PageItem *item = m_Doc->Items->at(z);
@@ -841,15 +841,15 @@
 	int z = -1;
 	PageItem *ite;
 	if (subtype == 1)
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 	else if ((subtype == 2) || (subtype == 3) || (subtype == 4))
 	{
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		Coords.svgClosePath();
 	}
 	else if (subtype == 5)
 	{
-		z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		Coords.svgClosePath();
 	}
 	else
@@ -986,10 +986,10 @@
 	int z = -1;
 	PageItem *ite;
 	if ((subtype == 0) || (subtype == 2) || (subtype == 4))
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 	else if ((subtype == 1) || (subtype == 3) || (subtype == 5))
 	{
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 		Coords.svgClosePath();
 	}
 	if (z >= 0)
@@ -1061,9 +1061,9 @@
 	int z = -1;
 	PageItem *ite;
 	if (subtype == 1)
-		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 	else if (subtype == 2)
-		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke, true);
+		z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);
 	else
 		z = -1;
 	center_x = fig2Pts(center_x) - docX;
@@ -1188,7 +1188,7 @@
 	y += m_Doc->currentPage()->yOffset();
 	int z = -1;
 	PageItem *ite;
-	z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke, true);
+	z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX + x, baseY + y, w, h, LineW, CurrColorFill, CurrColorStroke);
 	if (z >= 0)
 	{
 		ite = m_Doc->Items->at(z);
@@ -1500,7 +1500,7 @@
 	useColor(color, 0, false);
 	int z = -1;
 	PageItem *ite;
-	z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX + x, baseY + y, w, h, 0, CurrColorStroke, CommonStrings::None, true);
+	z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX + x, baseY + y, w, h, 0, CurrColorStroke, CommonStrings::None);
 	if (z >= 0)
 	{
 		ite = m_Doc->Items->at(z);

Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	Thu Nov 19 12:38:59 2015
@@ -1216,7 +1216,7 @@
 			double gy = miny;
 			double gw = maxx - minx;
 			double gh = maxy - miny;
-			int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+			int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 			if (z >= 0)
 			{
 				retObj = m_Doc->Items->at(z);
@@ -1654,7 +1654,7 @@
 {
 	if (!obState.clipPath.isEmpty())
 	{
-		int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, baseY, 10, 10, 0, CommonStrings::None, CommonStrings::None);
 		PageItem *itemg = m_Doc->Items->at(z);
 		itemg->PoLine.fromQPainterPath(obState.clipPath);
 		FPoint wh = getMaxClipF(&itemg->PoLine);
@@ -1688,13 +1688,13 @@
 		if (obState.itemType == 0)
 		{
 			if (dpg.hasAttribute("FixedPage.NavigateUri"))
-				z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX, baseY, 10, 10, obState.LineW, obState.CurrColorFill, CommonStrings::None, true);
+				z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, baseX, baseY, 10, 10, obState.LineW, obState.CurrColorFill, CommonStrings::None);
 			else
 			{
 				if (!obState.currentPathClosed)
-					z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke, true);
+					z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke);
 				else
-					z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke, true);
+					z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke);
 			}
 			retObj = m_Doc->Items->at(z);
 			finishItem(retObj, obState);
@@ -1702,7 +1702,7 @@
 		}
 		else if (obState.itemType == 1)
 		{
-			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke, true);
+			z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, 10, 10, obState.LineW, obState.CurrColorFill, obState.CurrColorStroke);
 			retObj = m_Doc->Items->at(z);
 			finishItem(retObj, obState);
 			if (!obState.imagePath.isEmpty())

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	Thu Nov 19 12:38:59 2015
@@ -35,7 +35,7 @@
 								pageUnitXToDocX(x), pageUnitYToDocY(y),
 								ValueToPoint(w), ValueToPoint(h),
 								ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth,
-								ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor, true);
+								ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
 //	ScCore->primaryMainWindow()->doc->setRedrawBounding(ScCore->primaryMainWindow()->doc->Items->at(i));
 	if (Name != EMPTY_STRING)
 	{
@@ -62,8 +62,7 @@
 										ValueToPoint(h),
 										ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth,
 										ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor,
-										ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor,
-										true);
+										ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
 	if (Name != EMPTY_STRING)
 	{
 		QString objName = QString::fromUtf8(Name);
@@ -88,7 +87,7 @@
 									ValueToPoint(w),
 									ValueToPoint(h),
 									1, ScCore->primaryMainWindow()->doc->itemToolPrefs().imageFillColor,
-									ScCore->primaryMainWindow()->doc->itemToolPrefs().imageStrokeColor, true);
+									ScCore->primaryMainWindow()->doc->itemToolPrefs().imageStrokeColor);
 	if (Name != EMPTY_STRING)
 	{
 		QString objName = QString::fromUtf8(Name);
@@ -113,7 +112,7 @@
 								ValueToPoint(w),
 								ValueToPoint(h),
 								ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth, CommonStrings::None,
-								ScCore->primaryMainWindow()->doc->itemToolPrefs().textColor, true);
+								ScCore->primaryMainWindow()->doc->itemToolPrefs().textColor);
 	if (Name != EMPTY_STRING)
 	{
 		QString objName = QString::fromUtf8(Name);
@@ -144,8 +143,7 @@
 								ValueToPoint(h),
 								0,                    // Unused.
 								CommonStrings::None,  // Unused.
-								CommonStrings::None,  // Unused.
-								true);
+								CommonStrings::None); // Unused.
 	PageItem_Table *table = ScCore->primaryMainWindow()->doc->Items->at(i)->asTable();
 	table->insertRows(0, numRows - 1);
 	table->insertColumns(0, numColumns - 1);
@@ -183,7 +181,7 @@
 							   x, y, w, h,
 							   ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth,
 							   ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor,
-							   ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor, true);
+							   ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
 	PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(i);
 	it->setRotation(xy2Deg(w-x, h-y));
 	it->setWidthHeight(sqrt(pow(x-w, 2.0) + pow(y-h, 2.0)), 1.0);
@@ -252,7 +250,7 @@
 	i++;
 	y = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
 	i++;
-	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor, true);
+	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
 	PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
 	it->PoLine.resize(2);
 	it->PoLine.setPoint(0, 0, 0);
@@ -329,7 +327,7 @@
 	i++;
 	y = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
 	i++;
-	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor, true);
+	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
 	PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
 	it->PoLine.resize(2);
 	it->PoLine.setPoint(0, 0, 0);
@@ -419,7 +417,7 @@
 	ky2 = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
 	i++;
 	//int ic = ScCore->primaryMainWindow()->view->PaintPolyLine(x, y, 1, 1,	ScCore->primaryMainWindow()->doc->toolSettings.dWidth, ScCore->primaryMainWindow()->doc->toolSettings.dBrush, ScCore->primaryMainWindow()->doc->toolSettings.dPen);
-	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor, true);
+	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
 	PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
 	it->PoLine.resize(2);
 	it->PoLine.setPoint(0, 0, 0);

Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp	(original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp	Thu Nov 19 12:38:59 2015
@@ -215,7 +215,7 @@
 		m_Doc->setPage(w, h, 0, 0, 0, 0, 0, 0, false, false);
 		m_Doc->addPage(0);
 		m_Doc->setGUI(false, m_scMW, 0);
-		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset(), w, h, m_Doc->itemToolPrefs().shapeLineWidth, m_Doc->itemToolPrefs().shapeFillColor, m_Doc->itemToolPrefs().shapeLineColor, true);
+		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset(), w, h, m_Doc->itemToolPrefs().shapeLineWidth, m_Doc->itemToolPrefs().shapeFillColor, m_Doc->itemToolPrefs().shapeLineColor);
 		PageItem* ite = m_Doc->Items->at(z);
 		ite->PoLine = m_Shapes[key].path.copy();
 		FPoint wh = getMaxClipF(&ite->PoLine);

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Thu Nov 19 12:38:59 2015
@@ -3009,7 +3009,7 @@
 	}
 	else if (rasterFiles.contains(fi.suffix().toLower()))
 	{
-		int z = doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, doc->currentPage()->xOffset(), doc->currentPage()->yOffset(), 1, 1, doc->itemToolPrefs().shapeLineWidth, doc->itemToolPrefs().imageFillColor, doc->itemToolPrefs().imageStrokeColor, true);
+		int z = doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, doc->currentPage()->xOffset(), doc->currentPage()->yOffset(), 1, 1, doc->itemToolPrefs().shapeLineWidth, doc->itemToolPrefs().imageFillColor, doc->itemToolPrefs().imageStrokeColor);
 		PageItem *b = doc->Items->at(z);
 		b->LayerID = doc->activeLayer();
 		doc->loadPict(data, b);

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Thu Nov 19 12:38:59 2015
@@ -2989,7 +2989,7 @@
 						addToPage->Margins.left()+addToPage->xOffset(),
 						addToPage->Margins.top()+addToPage->yOffset(), docPrefsData.docSetupPrefs.pageWidth-addToPage->Margins.right()-addToPage->Margins.left(),
 						docPrefsData.docSetupPrefs.pageHeight-addToPage->Margins.bottom()-addToPage->Margins.top(),
-						1, CommonStrings::None, docPrefsData.itemToolPrefs.shapeLineColor, true);
+						1, CommonStrings::None, docPrefsData.itemToolPrefs.shapeLineColor);
 		Items->at(z)->isAutoText = true;
 		Items->at(z)->Cols = qRound(PageSp);
 		Items->at(z)->ColGap = PageSpa;
@@ -5572,10 +5572,8 @@
 	return newItem;
 }
 
-int ScribusDoc::itemAdd(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, const double x, const double y, const double b, const double h, const double w, const QString& fill, const QString& outline, const bool itemFinalised)
-{
-	assert(itemFinalised); // av: caller must wrap transaction around this if wanted
-	
+int ScribusDoc::itemAdd(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, const double x, const double y, const double b, const double h, const double w, const QString& fill, const QString& outline)
+{
 	UndoTransaction activeTransaction;
 	if (UndoManager::undoEnabled()) // && !m_itemCreationTransaction)
 	{
@@ -5618,14 +5616,14 @@
 }
 
 
-int ScribusDoc::itemAddArea(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, const double x, const double y, const double w, const QString& fill, const QString& outline, const bool itemFinalised)
+int ScribusDoc::itemAddArea(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, const double x, const double y, const double w, const QString& fill, const QString& outline)
 {
 	double xo = m_currentPage->xOffset();
 	double yo = m_currentPage->yOffset();
 	QPair<double, double> tl = m_currentPage->guides.topLeft(x - xo, y - yo);
 	QPair<double, double> tr = m_currentPage->guides.topRight(x - xo, y - yo);
 	QPair<double, double> bl = m_currentPage->guides.bottomLeft(x - xo, y - yo);
-	return itemAdd(itemType, frameType, tl.first + xo, tl.second + yo, tr.first - tl.first, bl.second - tl.second, w, fill, outline, itemFinalised);
+	return itemAdd(itemType, frameType, tl.first + xo, tl.second + yo, tr.first - tl.first, bl.second - tl.second, w, fill, outline);
 }
 
 
@@ -5704,7 +5702,7 @@
 			w1=iafData.width;
 			h1=iafData.height;
 		}
-		z=itemAdd(iafData.frameType, PageItem::Unspecified, x1, y1, w1, h1, docPrefsData.itemToolPrefs.shapeLineWidth, CommonStrings::None, docPrefsData.itemToolPrefs.textColor, true);
+		z=itemAdd(iafData.frameType, PageItem::Unspecified, x1, y1, w1, h1, docPrefsData.itemToolPrefs.shapeLineWidth, CommonStrings::None, docPrefsData.itemToolPrefs.textColor);
 		if (z!=-1)
 		{
 			PageItem* currItem=Items->at(z);
@@ -6586,7 +6584,7 @@
 			newItem->convertTo(PageItem::TextFrame);
 			if (oldItem->itemType()==PageItem::PathText)
 			{
-				uint newPolyItemNo = itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), CommonStrings::None, currItem->lineColor(), true);
+				uint newPolyItemNo = itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), CommonStrings::None, currItem->lineColor());
 				PageItem *polyLineItem = Items->at(newPolyItemNo);
 				polyLineItem->PoLine = currItem->PoLine.copy();
 				polyLineItem->ClipEdited = true;
@@ -6813,7 +6811,7 @@
 			{
 				if ((!currItem->isGroup()) && (Items->count() > 1))
 				{
-					itemAdd(PageItem::Group, PageItem::Rectangle, addedPage->xOffset(), addedPage->yOffset(), 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+					itemAdd(PageItem::Group, PageItem::Rectangle, addedPage->xOffset(), addedPage->yOffset(), 10, 10, 0, CommonStrings::None, CommonStrings::None);
 					PageItem *groupItem = Items->takeLast();
 					groupItem->setLayer(firstLayerID());
 					Items->insert(0, groupItem);
@@ -6964,7 +6962,7 @@
 			{
 				if ((!currItem->isGroup()) && (Items->count() > 1))
 				{
-					itemAdd(PageItem::Group, PageItem::Rectangle, addedPage->xOffset(), addedPage->yOffset(), 10, 10, 0, CommonStrings::None, CommonStrings::None, true);
+					itemAdd(PageItem::Group, PageItem::Rectangle, addedPage->xOffset(), addedPage->yOffset(), 10, 10, 0, CommonStrings::None, CommonStrings::None);
 					PageItem *groupItem = Items->takeLast();
 					groupItem->setLayer(firstLayerID());
 					Items->insert(0, groupItem);
@@ -15146,7 +15144,7 @@
 	double gy = miny;
 	double gw = maxx - minx;
 	double gh = maxy - miny;
-	int z = itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 	PageItem *groupItem = Items->takeAt(z);
 	Items->insert(lowestItem, groupItem);
 	groupItem->setItemName( tr("Group%1").arg(GroupCounter));
@@ -15201,7 +15199,7 @@
 	double gy = miny;
 	double gw = maxx - minx;
 	double gh = maxy - miny;
-	int z = itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 	PageItem *groupItem = Items->takeAt(z);
 	Items->insert(lowestItem, groupItem);
 	groupItem->setItemName( tr("Group%1").arg(GroupCounter));
@@ -15336,7 +15334,7 @@
 	double gw = maxx - minx;
 	double gh = maxy - miny;
 	undoManager->setUndoEnabled(false);
-	int z = itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 	PageItem *groupItem = Items->takeAt(z);
 	Items->insert(lowestItem, groupItem);
 	groupItem->setItemName( tr("Group%1").arg(GroupCounter));
@@ -16011,7 +16009,7 @@
 	currItem->gXpos = currItem->xPos() - minx;
 	currItem->gYpos = currItem->yPos() - miny;
 	currItem->setXYPos(currItem->gXpos, currItem->gYpos, true);
-	int z = itemAdd(PageItem::Symbol, PageItem::Rectangle, sx, sy, maxx - minx, maxy - miny, 0, CommonStrings::None, CommonStrings::None, true);
+	int z = itemAdd(PageItem::Symbol, PageItem::Rectangle, sx, sy, maxx - minx, maxy - miny, 0, CommonStrings::None, CommonStrings::None);
 	PageItem* groupItem = Items->takeAt(z);
 	groupItem->setPattern(patternName);
 	groupItem->Parent = currItem->Parent;

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h	(original)
+++ trunk/Scribus/scribus/scribusdoc.h	Thu Nov 19 12:38:59 2015
@@ -784,10 +784,10 @@
 	\param outline outline color name
 	\param noteFrame optional (default false) indicates that noteframes should be created, not text frame
 	*/
-	int itemAdd(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, const double x, const double y, const double b, const double h, const double w, const QString& fill, const QString& outline, const bool itemFinalised);
+	int itemAdd(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, const double x, const double y, const double b, const double h, const double w, const QString& fill, const QString& outline);
 
 	/** Add an item to the page based on the x/y position. Item will be fitted to the closest guides/margins */
-	int itemAddArea(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, const double x, const double y, const double w, const QString& fill, const QString& outline, const bool itemFinalised);
+	int itemAddArea(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, const double x, const double y, const double w, const QString& fill, const QString& outline);
 	
 	/**
 	 * @brief Allow the user to create a frame easily with some simple placement and sizing options

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Thu Nov 19 12:38:59 2015
@@ -791,7 +791,7 @@
 		Doc->m_Selection->delaySignalsOff();
 		if (!selectedItemByDrag)
 		{
-			int z = Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, 0, CommonStrings::None, CommonStrings::None, true);
+			int z = Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, 0, CommonStrings::None, CommonStrings::None);
 			PageItem *b = Doc->Items->at(z);
 			b->LayerID = Doc->activeLayer();
 			ScPattern pat = Doc->docPatterns[patternVal];
@@ -919,7 +919,7 @@
 		//SeleItemPos is from 1.2.x. Needs reenabling for dragging *TO* a frame
 		if ((fi.exists()) && (img) && !selectedItemByDrag && !vectorFile)// && (!SeleItemPos(e->pos())))
 		{
-			int z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, Doc->itemToolPrefs().shapeLineWidth, Doc->itemToolPrefs().imageFillColor, Doc->itemToolPrefs().imageStrokeColor, true);
+			int z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, Doc->itemToolPrefs().shapeLineWidth, Doc->itemToolPrefs().imageFillColor, Doc->itemToolPrefs().imageStrokeColor);
 			PageItem *b = Doc->Items->at(z);
 			b->LayerID = Doc->activeLayer();
 			Doc->loadPict(url.toLocalFile(), b);
@@ -3170,7 +3170,7 @@
 						}
 						if (charStyle.baselineOffset() != 0)
 							Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0);
-						uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor(), true);
+						uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor());
 						bb = Doc->Items->at(z);
 						undoManager->setUndoEnabled(false);
 						bb->setTextFlowMode(currItem->textFlowMode());
@@ -3214,7 +3214,7 @@
 						{
 							double glxTr = charStyle.fontSize() * charStyle.shadowXOffset() / 10000.0;
 							double glyTr = -charStyle.fontSize() * charStyle.shadowYOffset() / 10000.0;
-							uint z = Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor(), true);
+							uint z = Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor());
 							bb = Doc->Items->at(z);
 							undoManager->setUndoEnabled(false);
 							bb->setTextFlowMode(currItem->textFlowMode());
@@ -3250,7 +3250,7 @@
 							newGroupedItems.append(Doc->Items->takeAt(z));
 						}
 						pts.map(finalMat);
-						uint z = Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor(), true);
+						uint z = Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor());
 						bb = Doc->Items->at(z);
 						//bb->setTextFlowsAroundFrame(currItem->textFlowsAroundFrame());
 						//bb->setTextFlowUsesBoundingBox(currItem->textFlowUsesBoundingBox());
@@ -3319,7 +3319,7 @@
 						}
 						if (charStyle.baselineOffset() != 0)
 							Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0);
-						uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor(), true);
+						uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor());
 						bb = Doc->Items->at(z);
 						undoManager->setUndoEnabled(false);
 						bb->setTextFlowMode(currItem->textFlowMode());
@@ -3445,7 +3445,7 @@
 								}
 								if (charStyle.baselineOffset() != 0)
 									st += (charStyle.fontSize() / 10.0) * glyphs->scaleV * (charStyle.baselineOffset() / 1000.0);
-								uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor(), true);
+								uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor());
 								bb = Doc->Items->at(z);
 								undoManager->setUndoEnabled(false);
 								bb->setTextFlowMode(currItem->textFlowMode());
@@ -3507,7 +3507,7 @@
 								{
 									double glxTr = charStyle.fontSize() * charStyle.shadowXOffset() / 10000.0;
 									double glyTr = -charStyle.fontSize() * charStyle.shadowYOffset() / 10000.0;
-									uint z = Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos() + glxTr, currItem->yPos() + glyTr, currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor(), true);
+									uint z = Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos() + glxTr, currItem->yPos() + glyTr, currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor());
 									bb = Doc->Items->at(z);
 									undoManager->setUndoEnabled(false);
 									bb->setTextFlowMode(currItem->textFlowMode());
@@ -3553,7 +3553,7 @@
 									undoManager->setUndoEnabled(true);
 									newGroupedItems.append(Doc->Items->takeAt(z));
 								}
-								uint z = Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor(), true);
+								uint z = Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor());
 								bb = Doc->Items->at(z);
 								//bb->setTextFlowsAroundFrame(currItem->textFlowsAroundFrame());
 								//bb->setTextFlowUsesBoundingBox(currItem->textFlowUsesBoundingBox());
@@ -3629,7 +3629,7 @@
 								}
 								if (charStyle.baselineOffset() != 0)
 									st += (charStyle.fontSize() / 10.0) * glyphs->scaleV * (charStyle.baselineOffset() / 1000.0);
-								uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor(), true);
+								uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), currItem->lineColor(), currItem->fillColor());
 								bb = Doc->Items->at(z);
 								undoManager->setUndoEnabled(false);
 								bb->setTextFlowMode(currItem->textFlowMode());
@@ -3677,7 +3677,7 @@
 			}
 			if ((currItem->asPathText()) && (currItem->PoShow))
 			{
-				uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), CommonStrings::None, currItem->lineColor(), true);
+				uint z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), CommonStrings::None, currItem->lineColor());
 				PageItem *bb = Doc->Items->at(z);
 				undoManager->setUndoEnabled(false);
 				bb->PoLine = currItem->PoLine.copy();
@@ -3732,7 +3732,7 @@
 			double gy = miny;
 			double gw = maxx - minx;
 			double gh = maxy - miny;
-			int z = Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None, true);
+			int z = Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
 			PageItem *gItem = Doc->Items->takeAt(z);
 			Doc->groupObjectsToItem(gItem, newGroupedItems);
 			gItem->Parent = currItem->Parent;

Modified: trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp	(original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp	Thu Nov 19 12:38:59 2015
@@ -1,765 +1,765 @@
-/*
-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.
-*/
-/***************************************************************************
-							 -------------------
-	begin                : Sat Okt 03 2015
-	copyright            : (C) 2015 by Franz Schmid
-	email                : Franz.Schmid at altmuehlnet.de
- ***************************************************************************/
-#include "sladocumentrtfoutput.h"
-
-#include <QApplication>
-#include <QColor>
-#include <QImage>
-#include <QString>
-#include <QTextImageFormat>
-#include "pageitem.h"
-#include "prefsmanager.h"
-#include "fileloader.h"
-#include "loadsaveplugin.h"
-#include "scribusdoc.h"
-#include "selection.h"
-#include "ui/missing.h"
-#include "util.h"
-#include <QDebug>
-
-namespace RtfReader
-{
-	SlaDocumentRtfOutput::SlaDocumentRtfOutput(PageItem *ite, ScribusDoc *doc) : AbstractRtfOutput()
-	{
-		m_item = ite;
-		m_Doc = doc;
-		QString pStyle = CommonStrings::DefaultParagraphStyle;
-		ParagraphStyle newStyle;
-		newStyle.setParent(pStyle);
-		newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
-		m_textStyle.push(newStyle);
-		m_textCharStyle.push(newStyle.charStyle());
-		m_textCharStyle.top().setFontSize(120.0);
-		QList<ParagraphStyle::TabRecord> tbs;
-		tbs.clear();
-		m_textStyle.top().setTabValues(tbs);
-		m_fontTable.clear();
-		m_fontTableReal.clear();
-		m_codecList = QTextCodec::availableCodecs();
-		if (m_codecList.contains("cp1252"))
-			m_codec = QTextCodec::codecForName("cp1252");		// Default ANSI codec
-		else
-			m_codec = QTextCodec::codecForLocale();
-		m_keepn = false;
-		m_isBold = false;
-		m_isItalic = false;
-	}
-
-	SlaDocumentRtfOutput::~SlaDocumentRtfOutput()
-	{
-	}
-
-	void SlaDocumentRtfOutput::setEncoding(const int enc)
-	{
-		QByteArray ba;
-		ba.setNum(enc);
-		QByteArray encTest = "cp" + ba;
-		if (m_codecList.contains(encTest))
-			m_codec = QTextCodec::codecForName(encTest);
-		else
-			m_codec = QTextCodec::codecForName("cp1252");
-	}
-
-	void SlaDocumentRtfOutput::startGroup()
-	{
-		m_textStyle.push(m_textStyle.top());
-		m_textCharStyle.push(m_textCharStyle.top());
-	}
-
-	void SlaDocumentRtfOutput::endGroup()
-	{
-		m_textCharStyle.pop();
-		m_textStyle.pop();
-	}
-
-	void SlaDocumentRtfOutput::appendText(const QByteArray &text)
-	{
-		int posC = m_item->itemText.length();
-		QString m_txt = m_codec->toUnicode(text);
-		if (text.count() > 0)
-		{
-			m_txt.replace(QChar(10), SpecialChars::LINEBREAK);
-			m_txt.replace(QChar(12), SpecialChars::FRAMEBREAK);
-			m_txt.replace(QChar(30), SpecialChars::NBHYPHEN);
-			m_txt.replace(QChar(160), SpecialChars::NBSPACE);
-			m_item->itemText.insertChars(posC, m_txt);
-			m_item->itemText.applyStyle(posC, m_textStyle.top());
-			m_item->itemText.applyCharStyle(posC, m_txt.length(), m_textCharStyle.top());
-		}
-	}
-
-	void SlaDocumentRtfOutput::appendUnicodeText(const QString &text)
-	{
-		int posC = m_item->itemText.length();
-		QString m_txt = text;
-		if (text.count() > 0)
-		{
-			m_txt.replace(QChar(10), SpecialChars::LINEBREAK);
-			m_txt.replace(QChar(12), SpecialChars::FRAMEBREAK);
-			m_txt.replace(QChar(30), SpecialChars::NBHYPHEN);
-			m_txt.replace(QChar(160), SpecialChars::NBSPACE);
-			m_item->itemText.insertChars(posC, m_txt);
-			m_item->itemText.applyStyle(posC, m_textStyle.top());
-			m_item->itemText.applyCharStyle(posC, m_txt.length(), m_textCharStyle.top());
-		}
-	}
-
-	void SlaDocumentRtfOutput::insertPar()
-	{
-		int posT = m_item->itemText.length();
-		if (posT > 0)
-		{
-			m_item->itemText.insertChars(posT, SpecialChars::PARSEP);
-			m_item->itemText.applyStyle(posT, m_textStyle.top());
-		}
-	}
-
-	void SlaDocumentRtfOutput::insertTab()
-	{
-		int posT = m_item->itemText.length();
-		m_item->itemText.insertChars(posT, SpecialChars::TAB);
-		m_item->itemText.applyStyle(posT, m_textStyle.top());
-	}
-
-	void SlaDocumentRtfOutput::insertLeftQuote()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x2018)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertRightQuote()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x2019)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertLeftDoubleQuote()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x201c)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertRightDoubleQuote()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x201d)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertEnDash()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x2013)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertEmDash()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x2014)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertEmSpace()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x2003)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertEnSpace()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x2002)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertBullet()
-	{
-		m_item->itemText.insertChars(QString(QChar(0x2022)), true);
-	}
-
-	void SlaDocumentRtfOutput::insertNewLine()
-	{
-		int posT = m_item->itemText.length();
-		if (posT > 0)
-		{
-			m_item->itemText.insertChars(posT, SpecialChars::LINEBREAK);
-			m_item->itemText.applyStyle(posT, m_textStyle.top());
-		}
-	}
-
-	void SlaDocumentRtfOutput::setFontItalic(const int value)
-	{
-		m_isItalic = (value != 0);
-		int posC = m_item->itemText.length();
-		m_item->itemText.insertChars(posC, "B");
-		m_item->itemText.applyStyle(posC, m_textStyle.top());
-		m_item->itemText.applyCharStyle(posC, 1, m_textCharStyle.top());
-		QString fam = m_item->itemText.charStyle(posC).font().family();
-		m_item->itemText.removeChars(posC, 1);
-		if (fam.isEmpty())
-			return;
-		QStringList slist = PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts.fontMap[fam];
-		if (m_isItalic)
-		{
-			if (m_isBold)
-			{
-				if (slist.contains("Bold Italic"))
-					m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Bold Italic"]);
-			}
-			else if (slist.contains("Italic"))
-				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Italic"]);
-		}
-		else
-		{
-			if (m_isBold)
-			{
-				if (slist.contains("Bold"))
-					m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Bold"]);
-			}
-			else if (slist.contains("Regular"))
-				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Regular"]);
-		}
-	}
-
-	void SlaDocumentRtfOutput::setFontBold(const int value)
-	{
-		m_isBold = (value != 0);
-		int posC = m_item->itemText.length();
-		m_item->itemText.insertChars(posC, "B");
-		m_item->itemText.applyStyle(posC, m_textStyle.top());
-		m_item->itemText.applyCharStyle(posC, 1, m_textCharStyle.top());
-		QString fam = m_item->itemText.charStyle(posC).font().family();
-		m_item->itemText.removeChars(posC, 1);
-		if (fam.isEmpty())
-			return;
-		QStringList slist = PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts.fontMap[fam];
-		if (m_isBold)
-		{
-			if (m_isItalic)
-			{
-				if (slist.contains("Bold Italic"))
-					m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Bold Italic"]);
-			}
-			else if (slist.contains("Bold"))
-				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Bold"]);
-		}
-		else
-		{
-			if (m_isItalic)
-			{
-				if (slist.contains("Italic"))
-					m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Italic"]);
-			}
-			else if (slist.contains("Regular"))
-				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Regular"]);
-		}
-	}
-
-	void SlaDocumentRtfOutput::setFontUnderline(const int value)
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		if (value != 0)
-			styleEffects |= ScStyle_Underline;
-		else
-			styleEffects &= ~ScStyle_Underline;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setFontWordUnderline(const int value)
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		if (value != 0)
-			styleEffects |= ScStyle_UnderlineWords;
-		else
-			styleEffects &= ~ScStyle_UnderlineWords;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setFontOutline(const int value)
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		if (value != 0)
-			styleEffects |= ScStyle_Outline;
-		else
-			styleEffects &= ~ScStyle_Outline;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setFontShadow(const int value)
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		if (value != 0)
-			styleEffects |= ScStyle_Shadowed;
-		else
-			styleEffects &= ~ScStyle_Shadowed;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setFontSmallCaps(const int value)
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		if (value != 0)
-			styleEffects |= ScStyle_SmallCaps;
-		else
-			styleEffects &= ~ScStyle_SmallCaps;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setFontCaps(const int value)
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		if (value != 0)
-			styleEffects |= ScStyle_AllCaps;
-		else
-			styleEffects &= ~ScStyle_AllCaps;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setFontStrikeOut(const int value)
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		if (value != 0)
-			styleEffects |= ScStyle_Strikethrough;
-		else
-			styleEffects &= ~ScStyle_Strikethrough;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setFontScaleH(const int value)
-	{
-		m_textCharStyle.top().setScaleH(value * 10.0);
-	}
-
-	void SlaDocumentRtfOutput::setFontOffset(const int value)
-	{
-		m_textCharStyle.top().setBaselineOffset((value * 10000 / 2) / m_textCharStyle.top().fontSize());
-	}
-
-	void SlaDocumentRtfOutput::setFontStretch(const int value)
-	{
-		m_textCharStyle.top().setTracking((value * 10000 / 4) / m_textCharStyle.top().fontSize());
-	}
-
-	void SlaDocumentRtfOutput::setFontStretchTw(const int value)
-	{
-		m_textCharStyle.top().setTracking((pixelsFromTwips(value) * 10000) / m_textCharStyle.top().fontSize());
-	}
-
-	void SlaDocumentRtfOutput::setFontPointSize(const int pointSize)
-	{
-		m_textCharStyle.top().setFontSize(pointSize * 10.0);
-		m_textStyle.top().setLineSpacing(pointSize);
-	}
-
-	void SlaDocumentRtfOutput::setFontLineSpacing(const int value)
-	{
-		if (value == 0)
-			m_textStyle.top().setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
-		else
-		{
-			m_textStyle.top().setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
-			m_textStyle.top().setLineSpacing(pixelsFromTwips(qAbs(value)));
-		}
-	}
-
-	void SlaDocumentRtfOutput::setForegroundColour(const int colourIndex)
-	{
-		if ((m_colourTable.count() != 0) && (colourIndex < m_colourTable.count()))
-			m_textCharStyle.top().setFillColor(m_colourTable.value(colourIndex));
-	}
-
-	void SlaDocumentRtfOutput::setHighlightColour(const int colourIndex)
-	{
-	//	qDebug() << "setHighlightColour";
-	}
-
-	void SlaDocumentRtfOutput::setParagraphPatternBackgroundColour(const int colourIndex)
-	{
-	//	qDebug() << "setParagraphPatternBackgroundColour";
-	}
-
-	void SlaDocumentRtfOutput::setFont(const int fontIndex)
-	{
-		if (m_fontTableReal.contains(fontIndex))
-		{
-			m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[m_fontTableReal[fontIndex].fontName()]);
-			if (m_fontTableReal[fontIndex].encoding() > 0)
-				setEncoding(m_fontTableReal[fontIndex].encoding());
-		}
-		else
-		{
-			if (m_fontTable.contains(fontIndex))
-			{
-				FontTableEntry fontTableEntry = m_fontTable[fontIndex];
-				QString fontName = getFontName(fontTableEntry.fontName());
-				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fontName]);
-				fontTableEntry.setFontName(fontName);
-				m_fontTableReal.insert(fontIndex, fontTableEntry);
-				if (fontTableEntry.encoding() > 0)
-					setEncoding(fontTableEntry.encoding());
-			}
-		}
-	}
-
-	void SlaDocumentRtfOutput::setDefaultFont(const int fontIndex)
-	{
-		setFont(fontIndex);
-	}
-
-	void SlaDocumentRtfOutput::appendToColourTable(const QColor &colour)
-	{
-		ScColor tmp;
-		tmp.fromQColor(colour);
-		tmp.setSpotColor(false);
-		tmp.setRegistrationColor(false);
-		QString fNam = m_Doc->PageColors.tryAddColor("FromRtf"+colour.name(), tmp);
-		m_colourTable.append(fNam);
-	}
-
-	void SlaDocumentRtfOutput::insertFontTableEntry(FontTableEntry fontTableEntry, quint32 fontTableIndex)
-	{
-		m_fontTable.insert(fontTableIndex, fontTableEntry);
-
-	}
-
-	void SlaDocumentRtfOutput::insertStyleSheetTableEntry(quint32 stylesheetTableIndex, ParagraphStyle stylesheetTableEntry)
-	{
-		QString newName = m_item->itemName() + "_" + stylesheetTableEntry.name();
-		stylesheetTableEntry.setName(newName);
-		if (stylesheetTableEntry.charStyle().fontVariant() != "")
-		{
-			int fontInd = stylesheetTableEntry.charStyle().fontVariant().toInt();
-			stylesheetTableEntry.charStyle().setFontVariant("");
-			if (m_fontTable.contains(fontInd))
-			{
-				FontTableEntry fontTableEntry = m_fontTable[fontInd];
-				QString fontName = getFontName(fontTableEntry.fontName());
-				stylesheetTableEntry.charStyle().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fontName]);
-				fontTableEntry.setFontName(fontName);
-				m_fontTableReal.insert(fontInd, fontTableEntry);
-			}
-		}
-		StyleSet<ParagraphStyle>tmp;
-		tmp.create(stylesheetTableEntry);
-		m_Doc->redefineStyles(tmp, false);
-		m_stylesTable.insert(stylesheetTableIndex, stylesheetTableEntry);
-	}
-
-	void SlaDocumentRtfOutput::resolveStyleSheetParents(QHash<quint32, int> &parentSet)
-	{
-		for (QHash<quint32, int>::iterator it = parentSet.begin(); it != parentSet.end(); ++it)
-		{
-			if (it.value() >= 0)
-			{
-				ParagraphStyle old = m_Doc->paragraphStyle(m_stylesTable[it.key()].name());
-				old.setParent(m_stylesTable[it.value()].name());
-				StyleSet<ParagraphStyle>tmp2;
-				tmp2.create(old);
-				m_Doc->redefineStyles(tmp2, false);
-				m_stylesTable.insert(it.key(), old);
-			}
-		}
-	}
-
-	void SlaDocumentRtfOutput::useStyleSheetTableEntry(const int styleIndex)
-	{
-		if (m_stylesTable.contains(styleIndex))
-		{
-			ParagraphStyle newStyle2;
-			newStyle2.setParent(m_stylesTable[styleIndex].name());
-			m_textStyle.pop();
-			m_textStyle.push(newStyle2);
-			m_textCharStyle.pop();
-			m_textCharStyle.push(newStyle2.charStyle());
-		}
-	}
-
-	void SlaDocumentRtfOutput::resetParagraphFormat()
-	{
-		QString pStyle = CommonStrings::DefaultParagraphStyle;
-		ParagraphStyle newStyle;
-		newStyle.setParent(pStyle);
-		newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
-		m_textStyle.pop();
-		m_textStyle.push(newStyle);
-		QList<ParagraphStyle::TabRecord> tbs;
-		tbs.clear();
-		m_textStyle.top().setTabValues(tbs);
-	}
-
-	void SlaDocumentRtfOutput::resetCharacterProperties()
-	{
-		QString pStyle = CommonStrings::DefaultParagraphStyle;
-		ParagraphStyle newStyle;
-		newStyle.setParent(pStyle);
-		newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
-		m_textCharStyle.pop();
-		m_textCharStyle.push(newStyle.charStyle());
-		m_textCharStyle.top().setFontSize(120.0);
-	}
-
-	void SlaDocumentRtfOutput::setParagraphAlignmentLeft()
-	{
-		m_textStyle.top().setAlignment(ParagraphStyle::Leftaligned);
-	}
-
-	void SlaDocumentRtfOutput::setParagraphAlignmentCentred()
-	{
-		m_textStyle.top().setAlignment(ParagraphStyle::Centered);
-	}
-
-	void SlaDocumentRtfOutput::setParagraphAlignmentJustified()
-	{
-		m_textStyle.top().setAlignment(ParagraphStyle::Justified);
-	}
-
-	void SlaDocumentRtfOutput::setParagraphAlignmentRight()
-	{
-		m_textStyle.top().setAlignment(ParagraphStyle::Rightaligned);
-	}
-
-	void SlaDocumentRtfOutput::setLeftIndent(const int twips)
-	{
-		m_textStyle.top().setLeftMargin(pixelsFromTwips(twips));
-	}
-
-	void SlaDocumentRtfOutput::setRightIndent(const int twips)
-	{
-		m_textStyle.top().setRightMargin(pixelsFromTwips(twips));
-	}
-
-	void SlaDocumentRtfOutput::setSpaceBefore(const int twips)
-	{
-		m_textStyle.top().setGapBefore(pixelsFromTwips(twips));
-	}
-
-	void SlaDocumentRtfOutput::setSpaceAfter(const int twips)
-	{
-		m_textStyle.top().setGapAfter(pixelsFromTwips(twips));
-	}
-
-	void SlaDocumentRtfOutput::keepWithNext()
-	{
-		m_keepn = true;
-	}
-
-	void SlaDocumentRtfOutput::setDropCapsLines(const int value)
-	{
-		m_textStyle.top().setDropCapLines(value);
-	}
-
-	void SlaDocumentRtfOutput::setDropCaps()
-	{
-		m_textStyle.top().setHasDropCap(true);
-	}
-
-	void SlaDocumentRtfOutput::addTabStop(const int value, const int type)
-	{
-		double tabVal = pixelsFromTwips(value);
-		ParagraphStyle::TabRecord tb;
-		tb.tabType = type;
-		tb.tabPosition = tabVal;
-		tb.tabFillChar = QChar();
-		QList<ParagraphStyle::TabRecord> tbs = m_textStyle.top().tabValues();
-		if (tbs.count() == 0)
-			tbs.append(tb);
-		else
-		{
-			bool ins = false;
-			for (int a = 0; a < tbs.count() - 1; a++)
-			{
-				if ((tb > tbs[a]) && (tb < tbs[a+1]))
-				{
-					tbs.insert(a, tb);
-					ins = true;
-					break;
-				}
-			}
-			if (!ins)
-				tbs.append(tb);
-		}
-		m_textStyle.top().setTabValues(tbs);
-	}
-
-	void SlaDocumentRtfOutput::setFirstLineIndent(const int twips)
-	{
-		m_textStyle.top().setFirstIndent(pixelsFromTwips(twips));
-	}
-
-	void SlaDocumentRtfOutput::setFontSuperscript()
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		styleEffects |= ScStyle_Superscript;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setFontSubscript()
-	{
-		StyleFlag styleEffects = m_textCharStyle.top().effects();
-		styleEffects |= ScStyle_Subscript;
-		m_textCharStyle.top().setFeatures(styleEffects.featureList());
-	}
-
-	void SlaDocumentRtfOutput::setTextDirectionLeftToRight()
-	{
-	//	qDebug() << "setTextDirectionLeftToRight";
-	}
-
-	void SlaDocumentRtfOutput::setTextDirectionRightToLeft()
-	{
-	//	qDebug() << "setTextDirectionRightToLeft";
-	}
-
-	void SlaDocumentRtfOutput::createImage(const QByteArray &image, int width, int height, int type)
-	{
-		QString imgExt = "";
-		double ww = pixelsFromTwips(width);
-		double hh = pixelsFromTwips(height);
-		if ((type == 0) || (type == 3) || (type == 4))
-		{
-			if (type == 0)
-				imgExt = "jpg";
-			else if (type == 3)
-				imgExt = "pict";
-			else if (type == 4)
-				imgExt = "pmg";
-			QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + QString("/scribus_temp_rtf_XXXXXX.") + imgExt);
-			tempFile->setAutoRemove(false);
-			if (tempFile->open())
-			{
-				tempFile->write(image);
-				QString fileName = getLongPathName(tempFile->fileName());
-				tempFile->close();
-				int posT = m_item->itemText.length();
-				int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, 0, 0, ww, hh, 0, CommonStrings::None, CommonStrings::None, true);
-				PageItem* item = m_Doc->Items->at(z);
-				item->OldB2 = item->width();
-				item->OldH2 = item->height();
-				item->updateClip();
-				item->isInlineImage = true;
-				item->isTempFile = true;
-				item->AspectRatio = true;
-				item->ScaleType   = false;
-				m_Doc->loadPict(fileName, item);
-				m_Doc->Items->takeAt(z);
-				item->isEmbedded = true;
-				item->gXpos = 0;
-				item->gYpos = 0;
-				item->gWidth = item->width();
-				item->gHeight = item->height();
-				int fIndex = m_Doc->addToInlineFrames(item);
-				m_item->itemText.insertObject(fIndex);
-				m_item->itemText.applyStyle(posT, m_textStyle.top());
-			}
-			delete tempFile;
-		}
-		else if ((type == 1) || (type == 2))
-		{
-			if (type == 1)
-				imgExt = "wmf";
-			else if (type == 2)
-				imgExt = "emf";
-			QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + QString("/scribus_temp_rtf_XXXXXX.") + imgExt);
-			tempFile->setAutoRemove(false);
-			if (tempFile->open())
-			{
-				tempFile->write(image);
-				QString fileName = getLongPathName(tempFile->fileName());
-				tempFile->close();
-				FileLoader *fileLoader = new FileLoader(fileName);
-				int testResult = fileLoader->testFile();
-				delete fileLoader;
-				if (testResult != -1)
-				{
-					const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-					if( fmt )
-					{
-						fmt->setupTargets(m_Doc, 0, 0, 0, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
-						fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
-						if (m_Doc->m_Selection->count() > 0)
-						{
-							int posT = m_item->itemText.length();
-							PageItem* item = m_Doc->groupObjectsSelection();
-							item->setWidthHeight(ww, hh, true);
-							item->OldB2 = item->width();
-							item->OldH2 = item->height();
-							item->updateClip();
-							m_Doc->Items->removeAll(item);
-							item->isEmbedded = true;
-							item->gXpos = 0;
-							item->gYpos = 0;
-							item->gWidth = item->width();
-							item->gHeight = item->height();
-							int fIndex = m_Doc->addToInlineFrames(item);
-							m_item->itemText.insertObject(fIndex);
-							m_item->itemText.applyStyle(posT, m_textStyle.top());
-						}
-					}
-				}
-			}
-			delete tempFile;
-		}
-	}
-
-	void SlaDocumentRtfOutput::setPageHeight(const int pageHeight)
-	{
-	}
-
-	void SlaDocumentRtfOutput::setPageWidth(const int pageWidth)
-	{
-	}
-
-	QString SlaDocumentRtfOutput::getFontName(QString name)
-	{
-		QString fontName = name;
-		bool found = false;
-		SCFontsIterator it(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts);
-		for ( ; it.hasNext(); it.next())
-		{
-			if (it.current().family().toLower() == fontName.toLower())
-			{
-				if (it.currentKey().toLower() == fontName.toLower()) // exact Match
-				{
-					return fontName;
-				}
-				else
-				{
-					QStringList slist = PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts.fontMap[it.current().family()];
-					slist.sort();
-					if (slist.count() > 0)
-					{
-						int reInd = slist.indexOf("Regular");
-						if (reInd < 0)
-							fontName = it.current().family() + " " + slist[0];
-						else
-							fontName = it.current().family() + " " + slist[reInd];
-						return fontName;
-					}
-				}
-			}
-		}
-		if (found)
-			return fontName;
-		else
-		{
-			if (!PrefsManager::instance()->appPrefs.fontPrefs.GFontSub.contains(fontName))
-			{
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-				MissingFont *dia = new MissingFont(0, fontName, m_Doc);
-				dia->exec();
-				QString fontNameR = dia->getReplacementFont();
-				delete dia;
-				qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
-				PrefsManager::instance()->appPrefs.fontPrefs.GFontSub[fontName] = fontNameR;
-				fontName = fontNameR;
-			}
-			else
-				fontName = PrefsManager::instance()->appPrefs.fontPrefs.GFontSub[fontName];
-		}
-		return fontName;
-	}
-
-	double SlaDocumentRtfOutput::pixelsFromTwips(const int twips)
-	{
-		return twips / 1440.0 * 72.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.
+*/
+/***************************************************************************
+							 -------------------
+	begin                : Sat Okt 03 2015
+	copyright            : (C) 2015 by Franz Schmid
+	email                : Franz.Schmid at altmuehlnet.de
+ ***************************************************************************/
+#include "sladocumentrtfoutput.h"
+
+#include <QApplication>
+#include <QColor>
+#include <QImage>
+#include <QString>
+#include <QTextImageFormat>
+#include "pageitem.h"
+#include "prefsmanager.h"
+#include "fileloader.h"
+#include "loadsaveplugin.h"
+#include "scribusdoc.h"
+#include "selection.h"
+#include "ui/missing.h"
+#include "util.h"
+#include <QDebug>
+
+namespace RtfReader
+{
+	SlaDocumentRtfOutput::SlaDocumentRtfOutput(PageItem *ite, ScribusDoc *doc) : AbstractRtfOutput()
+	{
+		m_item = ite;
+		m_Doc = doc;
+		QString pStyle = CommonStrings::DefaultParagraphStyle;
+		ParagraphStyle newStyle;
+		newStyle.setParent(pStyle);
+		newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
+		m_textStyle.push(newStyle);
+		m_textCharStyle.push(newStyle.charStyle());
+		m_textCharStyle.top().setFontSize(120.0);
+		QList<ParagraphStyle::TabRecord> tbs;
+		tbs.clear();
+		m_textStyle.top().setTabValues(tbs);
+		m_fontTable.clear();
+		m_fontTableReal.clear();
+		m_codecList = QTextCodec::availableCodecs();
+		if (m_codecList.contains("cp1252"))
+			m_codec = QTextCodec::codecForName("cp1252");		// Default ANSI codec
+		else
+			m_codec = QTextCodec::codecForLocale();
+		m_keepn = false;
+		m_isBold = false;
+		m_isItalic = false;
+	}
+
+	SlaDocumentRtfOutput::~SlaDocumentRtfOutput()
+	{
+	}
+
+	void SlaDocumentRtfOutput::setEncoding(const int enc)
+	{
+		QByteArray ba;
+		ba.setNum(enc);
+		QByteArray encTest = "cp" + ba;
+		if (m_codecList.contains(encTest))
+			m_codec = QTextCodec::codecForName(encTest);
+		else
+			m_codec = QTextCodec::codecForName("cp1252");
+	}
+
+	void SlaDocumentRtfOutput::startGroup()
+	{
+		m_textStyle.push(m_textStyle.top());
+		m_textCharStyle.push(m_textCharStyle.top());
+	}
+
+	void SlaDocumentRtfOutput::endGroup()
+	{
+		m_textCharStyle.pop();
+		m_textStyle.pop();
+	}
+
+	void SlaDocumentRtfOutput::appendText(const QByteArray &text)
+	{
+		int posC = m_item->itemText.length();
+		QString m_txt = m_codec->toUnicode(text);
+		if (text.count() > 0)
+		{
+			m_txt.replace(QChar(10), SpecialChars::LINEBREAK);
+			m_txt.replace(QChar(12), SpecialChars::FRAMEBREAK);
+			m_txt.replace(QChar(30), SpecialChars::NBHYPHEN);
+			m_txt.replace(QChar(160), SpecialChars::NBSPACE);
+			m_item->itemText.insertChars(posC, m_txt);
+			m_item->itemText.applyStyle(posC, m_textStyle.top());
+			m_item->itemText.applyCharStyle(posC, m_txt.length(), m_textCharStyle.top());
+		}
+	}
+
+	void SlaDocumentRtfOutput::appendUnicodeText(const QString &text)
+	{
+		int posC = m_item->itemText.length();
+		QString m_txt = text;
+		if (text.count() > 0)
+		{
+			m_txt.replace(QChar(10), SpecialChars::LINEBREAK);
+			m_txt.replace(QChar(12), SpecialChars::FRAMEBREAK);
+			m_txt.replace(QChar(30), SpecialChars::NBHYPHEN);
+			m_txt.replace(QChar(160), SpecialChars::NBSPACE);
+			m_item->itemText.insertChars(posC, m_txt);
+			m_item->itemText.applyStyle(posC, m_textStyle.top());
+			m_item->itemText.applyCharStyle(posC, m_txt.length(), m_textCharStyle.top());
+		}
+	}
+
+	void SlaDocumentRtfOutput::insertPar()
+	{
+		int posT = m_item->itemText.length();
+		if (posT > 0)
+		{
+			m_item->itemText.insertChars(posT, SpecialChars::PARSEP);
+			m_item->itemText.applyStyle(posT, m_textStyle.top());
+		}
+	}
+
+	void SlaDocumentRtfOutput::insertTab()
+	{
+		int posT = m_item->itemText.length();
+		m_item->itemText.insertChars(posT, SpecialChars::TAB);
+		m_item->itemText.applyStyle(posT, m_textStyle.top());
+	}
+
+	void SlaDocumentRtfOutput::insertLeftQuote()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x2018)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertRightQuote()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x2019)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertLeftDoubleQuote()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x201c)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertRightDoubleQuote()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x201d)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertEnDash()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x2013)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertEmDash()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x2014)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertEmSpace()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x2003)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertEnSpace()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x2002)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertBullet()
+	{
+		m_item->itemText.insertChars(QString(QChar(0x2022)), true);
+	}
+
+	void SlaDocumentRtfOutput::insertNewLine()
+	{
+		int posT = m_item->itemText.length();
+		if (posT > 0)
+		{
+			m_item->itemText.insertChars(posT, SpecialChars::LINEBREAK);
+			m_item->itemText.applyStyle(posT, m_textStyle.top());
+		}
+	}
+
+	void SlaDocumentRtfOutput::setFontItalic(const int value)
+	{
+		m_isItalic = (value != 0);
+		int posC = m_item->itemText.length();
+		m_item->itemText.insertChars(posC, "B");
+		m_item->itemText.applyStyle(posC, m_textStyle.top());
+		m_item->itemText.applyCharStyle(posC, 1, m_textCharStyle.top());
+		QString fam = m_item->itemText.charStyle(posC).font().family();
+		m_item->itemText.removeChars(posC, 1);
+		if (fam.isEmpty())
+			return;
+		QStringList slist = PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts.fontMap[fam];
+		if (m_isItalic)
+		{
+			if (m_isBold)
+			{
+				if (slist.contains("Bold Italic"))
+					m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Bold Italic"]);
+			}
+			else if (slist.contains("Italic"))
+				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Italic"]);
+		}
+		else
+		{
+			if (m_isBold)
+			{
+				if (slist.contains("Bold"))
+					m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Bold"]);
+			}
+			else if (slist.contains("Regular"))
+				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Regular"]);
+		}
+	}
+
+	void SlaDocumentRtfOutput::setFontBold(const int value)
+	{
+		m_isBold = (value != 0);
+		int posC = m_item->itemText.length();
+		m_item->itemText.insertChars(posC, "B");
+		m_item->itemText.applyStyle(posC, m_textStyle.top());
+		m_item->itemText.applyCharStyle(posC, 1, m_textCharStyle.top());
+		QString fam = m_item->itemText.charStyle(posC).font().family();
+		m_item->itemText.removeChars(posC, 1);
+		if (fam.isEmpty())
+			return;
+		QStringList slist = PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts.fontMap[fam];
+		if (m_isBold)
+		{
+			if (m_isItalic)
+			{
+				if (slist.contains("Bold Italic"))
+					m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Bold Italic"]);
+			}
+			else if (slist.contains("Bold"))
+				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Bold"]);
+		}
+		else
+		{
+			if (m_isItalic)
+			{
+				if (slist.contains("Italic"))
+					m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Italic"]);
+			}
+			else if (slist.contains("Regular"))
+				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fam + " Regular"]);
+		}
+	}
+
+	void SlaDocumentRtfOutput::setFontUnderline(const int value)
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		if (value != 0)
+			styleEffects |= ScStyle_Underline;
+		else
+			styleEffects &= ~ScStyle_Underline;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setFontWordUnderline(const int value)
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		if (value != 0)
+			styleEffects |= ScStyle_UnderlineWords;
+		else
+			styleEffects &= ~ScStyle_UnderlineWords;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setFontOutline(const int value)
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		if (value != 0)
+			styleEffects |= ScStyle_Outline;
+		else
+			styleEffects &= ~ScStyle_Outline;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setFontShadow(const int value)
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		if (value != 0)
+			styleEffects |= ScStyle_Shadowed;
+		else
+			styleEffects &= ~ScStyle_Shadowed;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setFontSmallCaps(const int value)
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		if (value != 0)
+			styleEffects |= ScStyle_SmallCaps;
+		else
+			styleEffects &= ~ScStyle_SmallCaps;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setFontCaps(const int value)
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		if (value != 0)
+			styleEffects |= ScStyle_AllCaps;
+		else
+			styleEffects &= ~ScStyle_AllCaps;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setFontStrikeOut(const int value)
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		if (value != 0)
+			styleEffects |= ScStyle_Strikethrough;
+		else
+			styleEffects &= ~ScStyle_Strikethrough;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setFontScaleH(const int value)
+	{
+		m_textCharStyle.top().setScaleH(value * 10.0);
+	}
+
+	void SlaDocumentRtfOutput::setFontOffset(const int value)
+	{
+		m_textCharStyle.top().setBaselineOffset((value * 10000 / 2) / m_textCharStyle.top().fontSize());
+	}
+
+	void SlaDocumentRtfOutput::setFontStretch(const int value)
+	{
+		m_textCharStyle.top().setTracking((value * 10000 / 4) / m_textCharStyle.top().fontSize());
+	}
+
+	void SlaDocumentRtfOutput::setFontStretchTw(const int value)
+	{
+		m_textCharStyle.top().setTracking((pixelsFromTwips(value) * 10000) / m_textCharStyle.top().fontSize());
+	}
+
+	void SlaDocumentRtfOutput::setFontPointSize(const int pointSize)
+	{
+		m_textCharStyle.top().setFontSize(pointSize * 10.0);
+		m_textStyle.top().setLineSpacing(pointSize);
+	}
+
+	void SlaDocumentRtfOutput::setFontLineSpacing(const int value)
+	{
+		if (value == 0)
+			m_textStyle.top().setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
+		else
+		{
+			m_textStyle.top().setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
+			m_textStyle.top().setLineSpacing(pixelsFromTwips(qAbs(value)));
+		}
+	}
+
+	void SlaDocumentRtfOutput::setForegroundColour(const int colourIndex)
+	{
+		if ((m_colourTable.count() != 0) && (colourIndex < m_colourTable.count()))
+			m_textCharStyle.top().setFillColor(m_colourTable.value(colourIndex));
+	}
+
+	void SlaDocumentRtfOutput::setHighlightColour(const int colourIndex)
+	{
+	//	qDebug() << "setHighlightColour";
+	}
+
+	void SlaDocumentRtfOutput::setParagraphPatternBackgroundColour(const int colourIndex)
+	{
+	//	qDebug() << "setParagraphPatternBackgroundColour";
+	}
+
+	void SlaDocumentRtfOutput::setFont(const int fontIndex)
+	{
+		if (m_fontTableReal.contains(fontIndex))
+		{
+			m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[m_fontTableReal[fontIndex].fontName()]);
+			if (m_fontTableReal[fontIndex].encoding() > 0)
+				setEncoding(m_fontTableReal[fontIndex].encoding());
+		}
+		else
+		{
+			if (m_fontTable.contains(fontIndex))
+			{
+				FontTableEntry fontTableEntry = m_fontTable[fontIndex];
+				QString fontName = getFontName(fontTableEntry.fontName());
+				m_textCharStyle.top().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fontName]);
+				fontTableEntry.setFontName(fontName);
+				m_fontTableReal.insert(fontIndex, fontTableEntry);
+				if (fontTableEntry.encoding() > 0)
+					setEncoding(fontTableEntry.encoding());
+			}
+		}
+	}
+
+	void SlaDocumentRtfOutput::setDefaultFont(const int fontIndex)
+	{
+		setFont(fontIndex);
+	}
+
+	void SlaDocumentRtfOutput::appendToColourTable(const QColor &colour)
+	{
+		ScColor tmp;
+		tmp.fromQColor(colour);
+		tmp.setSpotColor(false);
+		tmp.setRegistrationColor(false);
+		QString fNam = m_Doc->PageColors.tryAddColor("FromRtf"+colour.name(), tmp);
+		m_colourTable.append(fNam);
+	}
+
+	void SlaDocumentRtfOutput::insertFontTableEntry(FontTableEntry fontTableEntry, quint32 fontTableIndex)
+	{
+		m_fontTable.insert(fontTableIndex, fontTableEntry);
+
+	}
+
+	void SlaDocumentRtfOutput::insertStyleSheetTableEntry(quint32 stylesheetTableIndex, ParagraphStyle stylesheetTableEntry)
+	{
+		QString newName = m_item->itemName() + "_" + stylesheetTableEntry.name();
+		stylesheetTableEntry.setName(newName);
+		if (stylesheetTableEntry.charStyle().fontVariant() != "")
+		{
+			int fontInd = stylesheetTableEntry.charStyle().fontVariant().toInt();
+			stylesheetTableEntry.charStyle().setFontVariant("");
+			if (m_fontTable.contains(fontInd))
+			{
+				FontTableEntry fontTableEntry = m_fontTable[fontInd];
+				QString fontName = getFontName(fontTableEntry.fontName());
+				stylesheetTableEntry.charStyle().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[fontName]);
+				fontTableEntry.setFontName(fontName);
+				m_fontTableReal.insert(fontInd, fontTableEntry);
+			}
+		}
+		StyleSet<ParagraphStyle>tmp;
+		tmp.create(stylesheetTableEntry);
+		m_Doc->redefineStyles(tmp, false);
+		m_stylesTable.insert(stylesheetTableIndex, stylesheetTableEntry);
+	}
+
+	void SlaDocumentRtfOutput::resolveStyleSheetParents(QHash<quint32, int> &parentSet)
+	{
+		for (QHash<quint32, int>::iterator it = parentSet.begin(); it != parentSet.end(); ++it)
+		{
+			if (it.value() >= 0)
+			{
+				ParagraphStyle old = m_Doc->paragraphStyle(m_stylesTable[it.key()].name());
+				old.setParent(m_stylesTable[it.value()].name());
+				StyleSet<ParagraphStyle>tmp2;
+				tmp2.create(old);
+				m_Doc->redefineStyles(tmp2, false);
+				m_stylesTable.insert(it.key(), old);
+			}
+		}
+	}
+
+	void SlaDocumentRtfOutput::useStyleSheetTableEntry(const int styleIndex)
+	{
+		if (m_stylesTable.contains(styleIndex))
+		{
+			ParagraphStyle newStyle2;
+			newStyle2.setParent(m_stylesTable[styleIndex].name());
+			m_textStyle.pop();
+			m_textStyle.push(newStyle2);
+			m_textCharStyle.pop();
+			m_textCharStyle.push(newStyle2.charStyle());
+		}
+	}
+
+	void SlaDocumentRtfOutput::resetParagraphFormat()
+	{
+		QString pStyle = CommonStrings::DefaultParagraphStyle;
+		ParagraphStyle newStyle;
+		newStyle.setParent(pStyle);
+		newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
+		m_textStyle.pop();
+		m_textStyle.push(newStyle);
+		QList<ParagraphStyle::TabRecord> tbs;
+		tbs.clear();
+		m_textStyle.top().setTabValues(tbs);
+	}
+
+	void SlaDocumentRtfOutput::resetCharacterProperties()
+	{
+		QString pStyle = CommonStrings::DefaultParagraphStyle;
+		ParagraphStyle newStyle;
+		newStyle.setParent(pStyle);
+		newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
+		m_textCharStyle.pop();
+		m_textCharStyle.push(newStyle.charStyle());
+		m_textCharStyle.top().setFontSize(120.0);
+	}
+
+	void SlaDocumentRtfOutput::setParagraphAlignmentLeft()
+	{
+		m_textStyle.top().setAlignment(ParagraphStyle::Leftaligned);
+	}
+
+	void SlaDocumentRtfOutput::setParagraphAlignmentCentred()
+	{
+		m_textStyle.top().setAlignment(ParagraphStyle::Centered);
+	}
+
+	void SlaDocumentRtfOutput::setParagraphAlignmentJustified()
+	{
+		m_textStyle.top().setAlignment(ParagraphStyle::Justified);
+	}
+
+	void SlaDocumentRtfOutput::setParagraphAlignmentRight()
+	{
+		m_textStyle.top().setAlignment(ParagraphStyle::Rightaligned);
+	}
+
+	void SlaDocumentRtfOutput::setLeftIndent(const int twips)
+	{
+		m_textStyle.top().setLeftMargin(pixelsFromTwips(twips));
+	}
+
+	void SlaDocumentRtfOutput::setRightIndent(const int twips)
+	{
+		m_textStyle.top().setRightMargin(pixelsFromTwips(twips));
+	}
+
+	void SlaDocumentRtfOutput::setSpaceBefore(const int twips)
+	{
+		m_textStyle.top().setGapBefore(pixelsFromTwips(twips));
+	}
+
+	void SlaDocumentRtfOutput::setSpaceAfter(const int twips)
+	{
+		m_textStyle.top().setGapAfter(pixelsFromTwips(twips));
+	}
+
+	void SlaDocumentRtfOutput::keepWithNext()
+	{
+		m_keepn = true;
+	}
+
+	void SlaDocumentRtfOutput::setDropCapsLines(const int value)
+	{
+		m_textStyle.top().setDropCapLines(value);
+	}
+
+	void SlaDocumentRtfOutput::setDropCaps()
+	{
+		m_textStyle.top().setHasDropCap(true);
+	}
+
+	void SlaDocumentRtfOutput::addTabStop(const int value, const int type)
+	{
+		double tabVal = pixelsFromTwips(value);
+		ParagraphStyle::TabRecord tb;
+		tb.tabType = type;
+		tb.tabPosition = tabVal;
+		tb.tabFillChar = QChar();
+		QList<ParagraphStyle::TabRecord> tbs = m_textStyle.top().tabValues();
+		if (tbs.count() == 0)
+			tbs.append(tb);
+		else
+		{
+			bool ins = false;
+			for (int a = 0; a < tbs.count() - 1; a++)
+			{
+				if ((tb > tbs[a]) && (tb < tbs[a+1]))
+				{
+					tbs.insert(a, tb);
+					ins = true;
+					break;
+				}
+			}
+			if (!ins)
+				tbs.append(tb);
+		}
+		m_textStyle.top().setTabValues(tbs);
+	}
+
+	void SlaDocumentRtfOutput::setFirstLineIndent(const int twips)
+	{
+		m_textStyle.top().setFirstIndent(pixelsFromTwips(twips));
+	}
+
+	void SlaDocumentRtfOutput::setFontSuperscript()
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		styleEffects |= ScStyle_Superscript;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setFontSubscript()
+	{
+		StyleFlag styleEffects = m_textCharStyle.top().effects();
+		styleEffects |= ScStyle_Subscript;
+		m_textCharStyle.top().setFeatures(styleEffects.featureList());
+	}
+
+	void SlaDocumentRtfOutput::setTextDirectionLeftToRight()
+	{
+	//	qDebug() << "setTextDirectionLeftToRight";
+	}
+
+	void SlaDocumentRtfOutput::setTextDirectionRightToLeft()
+	{
+	//	qDebug() << "setTextDirectionRightToLeft";
+	}
+
+	void SlaDocumentRtfOutput::createImage(const QByteArray &image, int width, int height, int type)
+	{
+		QString imgExt = "";
+		double ww = pixelsFromTwips(width);
+		double hh = pixelsFromTwips(height);
+		if ((type == 0) || (type == 3) || (type == 4))
+		{
+			if (type == 0)
+				imgExt = "jpg";
+			else if (type == 3)
+				imgExt = "pict";
+			else if (type == 4)
+				imgExt = "pmg";
+			QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + QString("/scribus_temp_rtf_XXXXXX.") + imgExt);
+			tempFile->setAutoRemove(false);
+			if (tempFile->open())
+			{
+				tempFile->write(image);
+				QString fileName = getLongPathName(tempFile->fileName());
+				tempFile->close();
+				int posT = m_item->itemText.length();
+				int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Rectangle, 0, 0, ww, hh, 0, CommonStrings::None, CommonStrings::None);
+				PageItem* item = m_Doc->Items->at(z);
+				item->OldB2 = item->width();
+				item->OldH2 = item->height();
+				item->updateClip();
+				item->isInlineImage = true;
+				item->isTempFile = true;
+				item->AspectRatio = true;
+				item->ScaleType   = false;
+				m_Doc->loadPict(fileName, item);
+				m_Doc->Items->takeAt(z);
+				item->isEmbedded = true;
+				item->gXpos = 0;
+				item->gYpos = 0;
+				item->gWidth = item->width();
+				item->gHeight = item->height();
+				int fIndex = m_Doc->addToInlineFrames(item);
+				m_item->itemText.insertObject(fIndex);
+				m_item->itemText.applyStyle(posT, m_textStyle.top());
+			}
+			delete tempFile;
+		}
+		else if ((type == 1) || (type == 2))
+		{
+			if (type == 1)
+				imgExt = "wmf";
+			else if (type == 2)
+				imgExt = "emf";
+			QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + QString("/scribus_temp_rtf_XXXXXX.") + imgExt);
+			tempFile->setAutoRemove(false);
+			if (tempFile->open())
+			{
+				tempFile->write(image);
+				QString fileName = getLongPathName(tempFile->fileName());
+				tempFile->close();
+				FileLoader *fileLoader = new FileLoader(fileName);
+				int testResult = fileLoader->testFile();
+				delete fileLoader;
+				if (testResult != -1)
+				{
+					const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
+					if( fmt )
+					{
+						fmt->setupTargets(m_Doc, 0, 0, 0, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
+						fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
+						if (m_Doc->m_Selection->count() > 0)
+						{
+							int posT = m_item->itemText.length();
+							PageItem* item = m_Doc->groupObjectsSelection();
+							item->setWidthHeight(ww, hh, true);
+							item->OldB2 = item->width();
+							item->OldH2 = item->height();
+							item->updateClip();
+							m_Doc->Items->removeAll(item);
+							item->isEmbedded = true;
+							item->gXpos = 0;
+							item->gYpos = 0;
+							item->gWidth = item->width();
+							item->gHeight = item->height();
+							int fIndex = m_Doc->addToInlineFrames(item);
+							m_item->itemText.insertObject(fIndex);
+							m_item->itemText.applyStyle(posT, m_textStyle.top());
+						}
+					}
+				}
+			}
+			delete tempFile;
+		}
+	}
+
+	void SlaDocumentRtfOutput::setPageHeight(const int pageHeight)
+	{
+	}
+
+	void SlaDocumentRtfOutput::setPageWidth(const int pageWidth)
+	{
+	}
+
+	QString SlaDocumentRtfOutput::getFontName(QString name)
+	{
+		QString fontName = name;
+		bool found = false;
+		SCFontsIterator it(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts);
+		for ( ; it.hasNext(); it.next())
+		{
+			if (it.current().family().toLower() == fontName.toLower())
+			{
+				if (it.currentKey().toLower() == fontName.toLower()) // exact Match
+				{
+					return fontName;
+				}
+				else
+				{
+					QStringList slist = PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts.fontMap[it.current().family()];
+					slist.sort();
+					if (slist.count() > 0)
+					{
+						int reInd = slist.indexOf("Regular");
+						if (reInd < 0)
+							fontName = it.current().family() + " " + slist[0];
+						else
+							fontName = it.current().family() + " " + slist[reInd];
+						return fontName;
+					}
+				}
+			}
+		}
+		if (found)
+			return fontName;
+		else
+		{
+			if (!PrefsManager::instance()->appPrefs.fontPrefs.GFontSub.contains(fontName))
+			{
+				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+				MissingFont *dia = new MissingFont(0, fontName, m_Doc);
+				dia->exec();
+				QString fontNameR = dia->getReplacementFont();
+				delete dia;
+				qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+				PrefsManager::instance()->appPrefs.fontPrefs.GFontSub[fontName] = fontNameR;
+				fontName = fontNameR;
+			}
+			else
+				fontName = PrefsManager::instance()->appPrefs.fontPrefs.GFontSub[fontName];
+		}
+		return fontName;
+	}
+
+	double SlaDocumentRtfOutput::pixelsFromTwips(const int twips)
+	{
+		return twips / 1440.0 * 72.0;
+	}
+}

Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20561&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp	(original)
+++ trunk/Scribus/scribus/util.cpp	Thu Nov 19 12:38:59 2015
@@ -1011,7 +1011,7 @@
 		return false;
 
 	m_Doc->dontResize = true;
-	int z = m_Doc->itemAdd(PageItem::Table, PageItem::Unspecified, gItem->xPos(), gItem->yPos(), gItem->width(), gItem->height(), 0.0, CommonStrings::None, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::Table, PageItem::Unspecified, gItem->xPos(), gItem->yPos(), gItem->width(), gItem->height(), 0.0, CommonStrings::None, CommonStrings::None);
 	PageItem_Table* currItem = m_Doc->Items->takeAt(z)->asTable();
 
 	currItem->LayerID = gItem->LayerID;




More information about the scribus-commit mailing list