r17418 by fschmid - Since old style tables are no longer available, all code related to them is removed now.

scribus-commit scribus-commit at lists.scribus.net
Thu Apr 5 19:47:56 UTC 2012


Author: fschmid
Date: Thu Apr  5 19:47:56 2012
New Revision: 17418

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17418
Log:
Since old style tables are no longer available, all code related to them is removed now.

Modified:
    trunk/Scribus/scribus/canvas.cpp
    trunk/Scribus/scribus/canvasmode_copyproperties.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/pageitem_group.cpp
    trunk/Scribus/scribus/pageitem_imageframe.cpp
    trunk/Scribus/scribus/pageitem_symbol.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/pdflib_core.h
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/ui/contextmenu.cpp
    trunk/Scribus/scribus/ui/propertiespalette_line.cpp
    trunk/Scribus/scribus/ui/propertiespalette_line.h
    trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
    trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp

Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp (original)
+++ trunk/Scribus/scribus/canvas.cpp Thu Apr  5 19:47:56 2012
@@ -1434,62 +1434,6 @@
 			currItem->BoundingY = OldBY;
 		}
 	}
-	for (uint a = 0; a < pageFromMasterCount; ++a)
-	{
-		currItem = page->FromMaster.at(a);
-		if (currItem->LayerID != layer.ID)
-			continue;
-		if (!currItem->isTableItem)
-			continue;
-		if ((m_viewMode.previewMode) && (!currItem->printEnabled()))
-			continue;
-		if ((m_viewMode.viewAsPreview) && (!currItem->printEnabled()))
-			continue;
-		if ((currItem->OwnPage != -1) && (currItem->OwnPage != static_cast<int>(Mp->pageNr())))
-			continue;
-		double OldX = currItem->xPos();
-		double OldY = currItem->yPos();
-		double OldBX = currItem->BoundingX;
-		double OldBY = currItem->BoundingY;
-		if (!currItem->ChangedMasterItem)
-		{
-			//Hack to not check for undo changes, indicate drawing only
-			currItem->setXYPos(OldX - Mp->xOffset() + page->xOffset(), OldY - Mp->yOffset() + page->yOffset(), true);
-			currItem->BoundingX = OldBX - Mp->xOffset() + page->xOffset();
-			currItem->BoundingY = OldBY - Mp->yOffset() + page->yOffset();
-		}
-		if (cullingArea.intersects(currItem->getBoundingRect().adjusted(0.0, 0.0, 1.0, 1.0)))
-		{
-			painter->save();
-			painter->translate(currItem->xPos(), currItem->yPos());
-			painter->rotate(currItem->rotation());
-			if ((currItem->lineColor() != CommonStrings::None) && (currItem->lineWidth() != 0.0))
-			{
-				QColor tmp;
-				currItem->SetQColor(&tmp, currItem->lineColor(), currItem->lineShade());
-				if ((currItem->TopLine) || (currItem->RightLine) || (currItem->BottomLine) || (currItem->LeftLine))
-				{
-					painter->setPen(tmp, currItem->lineWidth(), currItem->PLineArt, Qt::SquareCap, currItem->PLineJoin);
-					if (currItem->TopLine)
-						painter->drawLine(FPoint(0.0, 0.0), FPoint(currItem->width(), 0.0));
-					if (currItem->RightLine)
-						painter->drawLine(FPoint(currItem->width(), 0.0), FPoint(currItem->width(), currItem->height()));
-					if (currItem->BottomLine)
-						painter->drawLine(FPoint(currItem->width(), currItem->height()), FPoint(0.0, currItem->height()));
-					if (currItem->LeftLine)
-						painter->drawLine(FPoint(0.0, currItem->height()), FPoint(0.0, 0.0));
-				}
-			}
-			painter->restore();
-		}
-		if (!currItem->ChangedMasterItem)
-		{
-			//Hack to not check for undo changes, indicate drawing only
-			currItem->setXYPos(OldX, OldY, true);
-			currItem->BoundingX = OldBX;
-			currItem->BoundingY = OldBY;
-		}
-	}
 	if ((layerCount > 1) && ((layer.blendMode != 0) || (layer.transparency != 1.0)) && (!layer.outlineMode))
 		painter->endLayer();
 }
@@ -1581,42 +1525,6 @@
 			
 				setupEditHRuler(currItem);
 			}
-		}
-	}
-	for (int it = 0; it < m_doc->Items->count(); ++it)
-	{
-		currItem = m_doc->Items->at(it);
-		if (currItem->LayerID != layer.ID)
-			continue;
-		if (!currItem->isTableItem)
-			continue;
-		if ((m_viewMode.previewMode) && (!currItem->printEnabled()))
-			continue;
-		if ((m_viewMode.viewAsPreview) && (!currItem->printEnabled()))
-			continue;
-		if (cullingArea.intersects(currItem->getBoundingRect().adjusted(0.0, 0.0, 1.0, 1.0)))
-		{
-			painter->save();
-			painter->translate(currItem->xPos(), currItem->yPos());
-			painter->rotate(currItem->rotation());
-			if ((currItem->lineColor() != CommonStrings::None) && (currItem->lineWidth() != 0.0))
-			{
-				QColor tmp;
-				currItem->SetQColor(&tmp, currItem->lineColor(), currItem->lineShade());
-				if ((currItem->TopLine) || (currItem->RightLine) || (currItem->BottomLine) || (currItem->LeftLine))
-				{
-					painter->setPen(tmp, currItem->lineWidth(), currItem->PLineArt, Qt::SquareCap, currItem->PLineJoin);
-					if (currItem->TopLine)
-						painter->drawLine(FPoint(0.0, 0.0), FPoint(currItem->width(), 0.0));
-					if (currItem->RightLine)
-						painter->drawLine(FPoint(currItem->width(), 0.0), FPoint(currItem->width(), currItem->height()));
-					if (currItem->BottomLine)
-						painter->drawLine(FPoint(currItem->width(), currItem->height()), FPoint(0.0, currItem->height()));
-					if (currItem->LeftLine)
-						painter->drawLine(FPoint(0.0, currItem->height()), FPoint(0.0, 0.0));
-				}
-			}
-			painter->restore();
 		}
 	}
 	if ((layerCount > 1) && ((layer.blendMode != 0) || (layer.transparency != 1.0)) && (!layer.outlineMode))

Modified: trunk/Scribus/scribus/canvasmode_copyproperties.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/canvasmode_copyproperties.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_copyproperties.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_copyproperties.cpp Thu Apr  5 19:47:56 2012
@@ -157,10 +157,6 @@
 		double sx, sy, ex, ey, r, skx, sky, fx, fy, ss, sk, sp;
 		currItem->ColGap = m_doc->ElemToLink->ColGap;
 		currItem->Cols = m_doc->ElemToLink->Cols;
-		currItem->BottomLine = m_doc->ElemToLink->BottomLine;
-		currItem->TopLine = m_doc->ElemToLink->TopLine;
-		currItem->LeftLine = m_doc->ElemToLink->LeftLine;
-		currItem->RightLine = m_doc->ElemToLink->RightLine;
 		currItem->setTextToFrameDist(m_doc->ElemToLink->textToFrameDistLeft(), m_doc->ElemToLink->textToFrameDistRight(), m_doc->ElemToLink->textToFrameDistTop(), m_doc->ElemToLink->textToFrameDistBottom());
 		// Stroke Properties
 		currItem->setLineStyle(m_doc->ElemToLink->lineStyle());

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Thu Apr  5 19:47:56 2012
@@ -458,46 +458,43 @@
 							dX+=qRound(dragConstrainInitPtX-currItem->xPos());
 							dY+=qRound(dragConstrainInitPtY-currItem->yPos());
 						}
-						if (!(currItem->isTableItem && currItem->isSingleSel))
+						double gx, gy, gh, gw;
+						m_objectDeltaPos.setXY(dX, dY);
+						m_doc->m_Selection->setGroupRect();
+						m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
+						if (m_doc->SnapGuides)
 						{
-							double gx, gy, gh, gw;
-							m_objectDeltaPos.setXY(dX, dY);
+							double nx = gx + m_objectDeltaPos.x();
+							double ny = gy + m_objectDeltaPos.y();
+							double nxo = nx, nyo = ny;
+							m_doc->ApplyGuides(&nx, &ny);
+							m_objectDeltaPos += FPoint(nx - nxo, ny - nyo);
+							nx = nxo = gx + gw + m_objectDeltaPos.x();
+							ny = nyo = gy + gh + m_objectDeltaPos.y();
+							m_doc->ApplyGuides(&nx, &ny);
+							m_objectDeltaPos += FPoint(nx-nxo, ny-nyo);
+						}
+						if (m_doc->useRaster)
+						{
 							m_doc->m_Selection->setGroupRect();
+							double gx, gy, gh, gw, gxo, gyo;
 							m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
-							if (m_doc->SnapGuides)
-							{
-								double nx = gx + m_objectDeltaPos.x();
-								double ny = gy + m_objectDeltaPos.y();
-								double nxo = nx, nyo = ny;
-								m_doc->ApplyGuides(&nx, &ny);
-								m_objectDeltaPos += FPoint(nx - nxo, ny - nyo);
-								nx = nxo = gx + gw + m_objectDeltaPos.x();
-								ny = nyo = gy + gh + m_objectDeltaPos.y();
-								m_doc->ApplyGuides(&nx, &ny);
-								m_objectDeltaPos += FPoint(nx-nxo, ny-nyo);
-							}
-							if (m_doc->useRaster)
-							{
-								m_doc->m_Selection->setGroupRect();
-								double gx, gy, gh, gw, gxo, gyo;
-								m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
-								gx += m_objectDeltaPos.x();
-								gy += m_objectDeltaPos.y();
-								gxo = gx;
-								gyo = gy;
-								FPoint npx = m_doc->ApplyGridF(FPoint(gx, gy));
-								FPoint npw = m_doc->ApplyGridF(FPoint(gx+gw, gy+gh));
-								if ((fabs(gx-npx.x())) > (fabs((gx+gw)-npw.x())))
-									gx = npw.x() - gw;
-								else
-									gx = npx.x();
-								if ((fabs(gy-npx.y())) > (fabs((gy+gh)-npw.y())))
-									gy = npw.y() - gh;
-								else
-									gy = npx.y();
-								if ((fabs(gx - gxo) < (m_doc->guidesPrefs().guideRad) / m_canvas->scale()) && (fabs(gy - gyo) < (m_doc->guidesPrefs().guideRad) / m_canvas->scale()))
-									m_objectDeltaPos += FPoint(gx-gxo, gy-gyo);
-							}
+							gx += m_objectDeltaPos.x();
+							gy += m_objectDeltaPos.y();
+							gxo = gx;
+							gyo = gy;
+							FPoint npx = m_doc->ApplyGridF(FPoint(gx, gy));
+							FPoint npw = m_doc->ApplyGridF(FPoint(gx+gw, gy+gh));
+							if ((fabs(gx-npx.x())) > (fabs((gx+gw)-npw.x())))
+								gx = npw.x() - gw;
+							else
+								gx = npx.x();
+							if ((fabs(gy-npx.y())) > (fabs((gy+gh)-npw.y())))
+								gy = npw.y() - gh;
+							else
+								gy = npx.y();
+							if ((fabs(gx - gxo) < (m_doc->guidesPrefs().guideRad) / m_canvas->scale()) && (fabs(gy - gyo) < (m_doc->guidesPrefs().guideRad) / m_canvas->scale()))
+								m_objectDeltaPos += FPoint(gx-gxo, gy-gyo);
 						}
 					}
 				}

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Thu Apr  5 19:47:56 2012
@@ -1686,13 +1686,13 @@
 				doStroke=false;
 			if ((doStroke) && (!m_Doc->RePos))
 			{
-	#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 4))
+#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 4))
 				p->setBlendModeStroke(lineBlendmode());
 				p->setPenOpacity(1.0 - lineTransparency());
-	#else
+#else
 				if (lineBlendmode() != 0)
 					p->beginLayer(1.0 - lineTransparency(), lineBlendmode());
-	#endif
+#endif
 				if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
 				{
 					p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
@@ -1701,91 +1701,88 @@
 				}
 				else
 					p->setLineWidth(0);
-				if (!isTableItem)
+				if ((itemType() == LatexFrame) || (itemType() == ImageFrame) || (itemType() == OSGFrame))
+					p->setupPolygon(&PoLine);
+				if (NamedLStyle.isEmpty())
 				{
-					if ((itemType() == LatexFrame) || (itemType() == ImageFrame) || (itemType() == OSGFrame))
-						p->setupPolygon(&PoLine);
-					if (NamedLStyle.isEmpty())
+					if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)))
 					{
-						if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)))
+						if (patternStrokePath)
 						{
-							if (patternStrokePath)
+							QPainterPath guidePath = PoLine.toQPainterPath(false);
+							DrawStrokePattern(p, guidePath);
+						}
+						else
+						{
+							p->setPattern(&m_Doc->docPatterns[patternStrokeVal], patternStrokeScaleX, patternStrokeScaleY, patternStrokeOffsetX, patternStrokeOffsetY, patternStrokeRotation, patternStrokeSkewX, patternStrokeSkewY, patternStrokeMirrorX, patternStrokeMirrorY);
+							p->setStrokeMode(ScPainter::Pattern);
+							p->strokePath();
+						}
+					}
+					else if (GrTypeStroke > 0)
+					{
+						if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
+							gradientStrokeVal = "";
+						if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
+							stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
+						if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+						{
+							if (lineColor() != CommonStrings::None)
 							{
-								QPainterPath guidePath = PoLine.toQPainterPath(false);
-								DrawStrokePattern(p, guidePath);
+								p->setBrush(strokeQColor);
+								p->setStrokeMode(ScPainter::Solid);
 							}
 							else
 							{
-								p->setPattern(&m_Doc->docPatterns[patternStrokeVal], patternStrokeScaleX, patternStrokeScaleY, patternStrokeOffsetX, patternStrokeOffsetY, patternStrokeRotation, patternStrokeSkewX, patternStrokeSkewY, patternStrokeMirrorX, patternStrokeMirrorY);
-								p->setStrokeMode(ScPainter::Pattern);
-								p->strokePath();
+								no_stroke = true;
+								p->setStrokeMode(ScPainter::None);
 							}
 						}
-						else if (GrTypeStroke > 0)
+						else
 						{
-							if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-								gradientStrokeVal = "";
-							if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
-								stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-							if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
-							{
-								if (lineColor() != CommonStrings::None)
-								{
-									p->setBrush(strokeQColor);
-									p->setStrokeMode(ScPainter::Solid);
-								}
-								else
-								{
-									no_stroke = true;
-									p->setStrokeMode(ScPainter::None);
-								}
-							}
+							p->setStrokeMode(ScPainter::Gradient);
+							p->stroke_gradient = stroke_gradient;
+							if (GrTypeStroke == 6)
+								p->setGradient(VGradient::linear, FPoint(GrStrokeStartX, GrStrokeStartY), FPoint(GrStrokeEndX, GrStrokeEndY), FPoint(GrStrokeStartX, GrStrokeStartY), GrStrokeScale, GrStrokeSkew);
 							else
-							{
-								p->setStrokeMode(ScPainter::Gradient);
-								p->stroke_gradient = stroke_gradient;
-								if (GrTypeStroke == 6)
-									p->setGradient(VGradient::linear, FPoint(GrStrokeStartX, GrStrokeStartY), FPoint(GrStrokeEndX, GrStrokeEndY), FPoint(GrStrokeStartX, GrStrokeStartY), GrStrokeScale, GrStrokeSkew);
-								else
-									p->setGradient(VGradient::radial, FPoint(GrStrokeStartX, GrStrokeStartY), FPoint(GrStrokeEndX, GrStrokeEndY), FPoint(GrStrokeFocalX, GrStrokeFocalY), GrStrokeScale, GrStrokeSkew);
-							}
-							p->strokePath();
+								p->setGradient(VGradient::radial, FPoint(GrStrokeStartX, GrStrokeStartY), FPoint(GrStrokeEndX, GrStrokeEndY), FPoint(GrStrokeFocalX, GrStrokeFocalY), GrStrokeScale, GrStrokeSkew);
 						}
-						else if (lineColor() != CommonStrings::None)
-						{
-							p->setStrokeMode(ScPainter::Solid);
-							p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
-							if (DashValues.count() != 0)
-								p->setDash(DashValues, DashOffset);
-							p->strokePath();
-						}
-						else
-							no_stroke = true;
+						p->strokePath();
+					}
+					else if (lineColor() != CommonStrings::None)
+					{
+						p->setStrokeMode(ScPainter::Solid);
+						p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
+						if (DashValues.count() != 0)
+							p->setDash(DashValues, DashOffset);
+						p->strokePath();
 					}
 					else
+						no_stroke = true;
+				}
+				else
+				{
+					p->setStrokeMode(ScPainter::Solid);
+					multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+					QColor tmp;
+					for (int it = ml.size()-1; it > -1; it--)
 					{
-						p->setStrokeMode(ScPainter::Solid);
-						multiLine ml = m_Doc->MLineStyles[NamedLStyle];
-						QColor tmp;
-						for (int it = ml.size()-1; it > -1; it--)
+						struct SingleLine& sl = ml[it];
+						// Qt4 if ((!sl.Color != CommonStrings::None) && (sl.Width != 0))
+						if (sl.Color != CommonStrings::None) // && (sl.Width != 0))
 						{
-							struct SingleLine& sl = ml[it];
-							// Qt4 if ((!sl.Color != CommonStrings::None) && (sl.Width != 0))
-							if (sl.Color != CommonStrings::None) // && (sl.Width != 0))
-							{
-								SetQColor(&tmp, sl.Color, sl.Shade);
-								p->setPen(tmp, sl.Width, static_cast<Qt::PenStyle>(sl.Dash), static_cast<Qt::PenCapStyle>(sl.LineEnd), static_cast<Qt::PenJoinStyle>(sl.LineJoin));
-								p->strokePath();
-							}
+							SetQColor(&tmp, sl.Color, sl.Shade);
+							p->setPen(tmp, sl.Width, static_cast<Qt::PenStyle>(sl.Dash), static_cast<Qt::PenCapStyle>(sl.LineEnd), static_cast<Qt::PenJoinStyle>(sl.LineJoin));
+							p->strokePath();
 						}
 					}
 				}
-	#if (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 9, 4))
+#if (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 9, 4))
 				if (lineBlendmode() != 0)
 					p->endLayer();
-	#else
+#else
 				p->setBlendModeStroke(0);
-	#endif
+#endif
 			}
 		}
 	}
@@ -1968,48 +1965,6 @@
 		p->restore();
 		embedded->m_lineWidth = pws;
 	}
-	for (int em = 0; em < emG.count(); ++em)
-	{
-		PageItem* embedded = emG.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		p->save();
-		double x = embedded->xPos();
-		double y = embedded->yPos();
-		embedded->Xpos = embedded->gXpos;
-		embedded->Ypos = (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos;
-		p->translate((embedded->gXpos * (style.scaleH() / 1000.0)), ( - (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos * (style.scaleV() / 1000.0)));
-		if (style.baselineOffset() != 0)
-		{
-			p->translate(0, -embedded->gHeight * (style.baselineOffset() / 1000.0));
-			embedded->Ypos -= embedded->gHeight * (style.baselineOffset() / 1000.0);
-		}
-		p->scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-		p->rotate(embedded->rotation());
-		double pws = embedded->m_lineWidth;
-		embedded->m_lineWidth = pws * qMin(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-		if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-		{
-			QColor tmp;
-			embedded->SetQColor(&tmp, embedded->lineColor(), embedded->lineShade());
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				p->setPen(tmp, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-				if (embedded->TopLine)
-					p->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-				if (embedded->RightLine)
-					p->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-				if (embedded->BottomLine)
-					p->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-				if (embedded->LeftLine)
-					p->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-			}
-		}
-		embedded->m_lineWidth = pws;
-		embedded->Xpos = x;
-		embedded->Ypos = y;
-		p->restore();
-	}
 }
 
 void PageItem::DrawStrokePattern(ScPainter *p, QPainterPath &path)
@@ -2059,36 +2014,6 @@
 			embedded->isEmbedded = true;
 			embedded->invalid = true;
 			embedded->DrawObj(p, QRectF());
-			embedded->isEmbedded = false;
-			p->restore();
-		}
-		for (int em = 0; em < pat.items.count(); ++em)
-		{
-			PageItem* embedded = pat.items.at(em);
-			if (!embedded->isTableItem)
-				continue;
-			p->save();
-			p->translate(embedded->gXpos, embedded->gYpos);
-			p->rotate(embedded->rotation());
-			embedded->isEmbedded = true;
-			embedded->invalid = true;
-			if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-			{
-				QColor tmp;
-				embedded->SetQColor(&tmp, embedded->lineColor(), embedded->lineShade());
-				if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-				{
-					p->setPen(tmp, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-					if (embedded->TopLine)
-						p->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-					if (embedded->RightLine)
-						p->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-					if (embedded->BottomLine)
-						p->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-					if (embedded->LeftLine)
-						p->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-				}
-			}
 			embedded->isEmbedded = false;
 			p->restore();
 		}
@@ -2130,33 +2055,6 @@
 	DrawObj(painter, QRectF());
 	isEmbedded = false;
 	painter->restore();
-	if (isTableItem)
-	{
-		painter->save();
-		painter->translate(igXpos, igYpos);
-		painter->rotate(rotation());
-		isEmbedded = true;
-		invalid = true;
-		if ((lineColor() != CommonStrings::None) && (lineWidth() != 0.0))
-		{
-			QColor tmp;
-			SetQColor(&tmp, lineColor(), lineShade());
-			if ((TopLine) || (RightLine) || (BottomLine) || (LeftLine))
-			{
-				painter->setPen(tmp, lineWidth(), PLineArt, Qt::SquareCap, PLineJoin);
-				if (TopLine)
-					painter->drawLine(FPoint(0.0, 0.0), FPoint(width(), 0.0));
-				if (RightLine)
-					painter->drawLine(FPoint(width(), 0.0), FPoint(width(), height()));
-				if (BottomLine)
-					painter->drawLine(FPoint(width(), height()), FPoint(0.0, height()));
-				if (LeftLine)
-					painter->drawLine(FPoint(0.0, height()), FPoint(0.0, 0.0));
-			}
-		}
-		isEmbedded = false;
-		painter->restore();
-	}
 	painter->end();
 	delete painter;
 	m_Doc->guidesPrefs().framesShown = savedFlag;
@@ -2181,36 +2079,6 @@
 		embedded->isEmbedded = true;
 		embedded->invalid = true;
 		embedded->DrawObj(painter, QRectF());
-		embedded->isEmbedded = false;
-		painter->restore();
-	}
-	for (int em = 0; em < emG.count(); ++em)
-	{
-		PageItem* embedded = emG.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		painter->save();
-		painter->translate(embedded->gXpos, embedded->gYpos);
-		painter->rotate(embedded->rotation());
-		embedded->isEmbedded = true;
-		embedded->invalid = true;
-		if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-		{
-			QColor tmp;
-			embedded->SetQColor(&tmp, embedded->lineColor(), embedded->lineShade());
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				painter->setPen(tmp, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-				if (embedded->TopLine)
-					painter->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-				if (embedded->RightLine)
-					painter->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-				if (embedded->BottomLine)
-					painter->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-				if (embedded->LeftLine)
-					painter->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-			}
-		}
 		embedded->isEmbedded = false;
 		painter->restore();
 	}

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Thu Apr  5 19:47:56 2012
@@ -576,7 +576,9 @@
 	VGradient fill_gradient;
 	bool fillRule;
 	bool doOverprint;
+
 /* Additions for Table Support */
+/* now deprecated with the new PageItem_Table */
 	PageItem* LeftLink;
 	PageItem* RightLink;
 	PageItem* TopLink;
@@ -590,15 +592,8 @@
 	bool TopLine;
 	bool BottomLine;
 	bool isTableItem;
-	void setIsTableItem(bool val) { isTableItem = val; }
-	void setHasLeftLine(bool val) { LeftLine = val; }
-	void setHasRightLine(bool val) { RightLine = val; }
-	void setHasTopLine(bool val) { TopLine = val; }
-	void setHasBottomLine(bool val) { BottomLine = val; }
-	void setLeftLink(PageItem* lnk) { LeftLink = lnk; }
-	void setRightLink(PageItem* lnk) { RightLink = lnk; }
-	void setTopLink(PageItem* lnk) { TopLink = lnk; }
-	void setBottomLink(PageItem* lnk) { BottomLink = lnk; }
+/* end deprecated vars */
+
 	bool isSingleSel;
 	QList<PageItem*> groupItemList;
 	virtual QList<PageItem*> getItemList();

Modified: trunk/Scribus/scribus/pageitem_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pageitem_group.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.cpp (original)
+++ trunk/Scribus/scribus/pageitem_group.cpp Thu Apr  5 19:47:56 2012
@@ -220,36 +220,6 @@
 			p->restore();
 		}
 	}
-	for (int em = 0; em < groupItemList.count(); ++em)
-	{
-		PageItem* embedded = groupItemList.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		p->save();
-		p->translate(embedded->gXpos, embedded->gYpos);
-		p->rotate(embedded->rotation());
-		embedded->isEmbedded = true;
-		embedded->invalidateLayout();
-		if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-		{
-			QColor tmp;
-			embedded->SetQColor(&tmp, embedded->lineColor(), embedded->lineShade());
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				p->setPen(tmp, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-				if (embedded->TopLine)
-					p->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-				if (embedded->RightLine)
-					p->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-				if (embedded->BottomLine)
-					p->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-				if (embedded->LeftLine)
-					p->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-			}
-		}
-		embedded->isEmbedded = false;
-		p->restore();
-	}
 	p->endLayer();
 	p->restore();
 }

Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp Thu Apr  5 19:47:56 2012
@@ -433,8 +433,7 @@
 
 	if (PictureIsAvailable)
 	{
-		if (!isTableItem)
-			actionList << "itemAdjustFrameToImage";
+		actionList << "itemAdjustFrameToImage";
 		actionList << "itemAdjustImageToFrame";
 		if (pixm.imgInfo.valid)
 			actionList << "itemExtendedImageProperties";
@@ -450,8 +449,7 @@
 			actionList << "editEditWithImageEditor";
 		}
 	}
-	if (!isTableItem)
-		actionList << "itemConvertToPolygon";
+	actionList << "itemConvertToPolygon";
 	if (doc()->scMW()->contentsBuffer.sourceType==PageItem::ImageFrame)
 	{
 		actionList << "editPasteContents";

Modified: trunk/Scribus/scribus/pageitem_symbol.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pageitem_symbol.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_symbol.cpp (original)
+++ trunk/Scribus/scribus/pageitem_symbol.cpp Thu Apr  5 19:47:56 2012
@@ -142,36 +142,6 @@
 		embedded->isEmbedded = false;
 		p->restore();
 	}
-	for (int em = 0; em < pat.items.count(); ++em)
-	{
-		PageItem* embedded = pat.items.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		p->save();
-		p->translate(embedded->gXpos, embedded->gYpos);
-		p->rotate(embedded->rotation());
-		embedded->isEmbedded = true;
-		embedded->invalid = true;
-		if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-		{
-			QColor tmp;
-			embedded->SetQColor(&tmp, embedded->lineColor(), embedded->lineShade());
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				p->setPen(tmp, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-				if (embedded->TopLine)
-					p->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-				if (embedded->RightLine)
-					p->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-				if (embedded->BottomLine)
-					p->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-				if (embedded->LeftLine)
-					p->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-			}
-		}
-		embedded->isEmbedded = false;
-		p->restore();
-	}
 	p->endLayer();
 	p->restore();
 	if (m_Doc->layerOutline(LayerID))

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Thu Apr  5 19:47:56 2012
@@ -3121,107 +3121,104 @@
 	}
 	else
 	{
-	#if (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 9, 4))
+#if (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 9, 4))
 		if (fillBlendmode() != 0)
 			p->endLayer();
-	#else
+#else
 		if (fillBlendmode() != 0)
 			p->setBlendModeFill(0);
-	#endif
+#endif
 		p->setMaskMode(0);
 		if (!m_Doc->RePos)
 		{
-	#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 4))
+#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 4))
 			p->setBlendModeStroke(lineBlendmode());
 			p->setPenOpacity(1.0 - lineTransparency());
-	#else
+#else
 			if (lineBlendmode() != 0)
 				p->beginLayer(1.0 - lineTransparency(), lineBlendmode());
-	#endif
-			if (!isTableItem)
-			{
-				p->setupPolygon(&PoLine);
-				if (NamedLStyle.isEmpty())
-				{
-					if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
-					{
-						p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
-						if (DashValues.count() != 0)
-							p->setDash(DashValues, DashOffset);
-					}
-					if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)))
-					{
-						if (patternStrokePath)
+#endif
+			p->setupPolygon(&PoLine);
+			if (NamedLStyle.isEmpty())
+			{
+				if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
+				{
+					p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
+					if (DashValues.count() != 0)
+						p->setDash(DashValues, DashOffset);
+				}
+				if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)))
+				{
+					if (patternStrokePath)
+					{
+						QPainterPath guidePath = PoLine.toQPainterPath(false);
+						DrawStrokePattern(p, guidePath);
+					}
+					else
+					{
+						p->setPattern(&m_Doc->docPatterns[patternStrokeVal], patternStrokeScaleX, patternStrokeScaleY, patternStrokeOffsetX, patternStrokeOffsetY, patternStrokeRotation, patternStrokeSkewX, patternStrokeSkewY, patternStrokeMirrorX, patternStrokeMirrorY);
+						p->setStrokeMode(ScPainter::Pattern);
+						p->strokePath();
+					}
+				}
+				else if (GrTypeStroke > 0)
+				{
+					if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
+						gradientStrokeVal = "";
+					if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
+						stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
+					if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+					{
+						if (lineColor() != CommonStrings::None)
 						{
-							QPainterPath guidePath = PoLine.toQPainterPath(false);
-							DrawStrokePattern(p, guidePath);
+							p->setBrush(strokeQColor);
+							p->setStrokeMode(ScPainter::Solid);
 						}
 						else
-						{
-							p->setPattern(&m_Doc->docPatterns[patternStrokeVal], patternStrokeScaleX, patternStrokeScaleY, patternStrokeOffsetX, patternStrokeOffsetY, patternStrokeRotation, patternStrokeSkewX, patternStrokeSkewY, patternStrokeMirrorX, patternStrokeMirrorY);
-							p->setStrokeMode(ScPainter::Pattern);
-							p->strokePath();
-						}
-					}
-					else if (GrTypeStroke > 0)
-					{
-						if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-							gradientStrokeVal = "";
-						if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
-							stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-						if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
-						{
-							if (lineColor() != CommonStrings::None)
-							{
-								p->setBrush(strokeQColor);
-								p->setStrokeMode(ScPainter::Solid);
-							}
-							else
-								p->setStrokeMode(ScPainter::None);
-						}
+							p->setStrokeMode(ScPainter::None);
+					}
+					else
+					{
+						p->setStrokeMode(ScPainter::Gradient);
+						p->stroke_gradient = stroke_gradient;
+						if (GrTypeStroke == 6)
+							p->setGradient(VGradient::linear, FPoint(GrStrokeStartX, GrStrokeStartY), FPoint(GrStrokeEndX, GrStrokeEndY), FPoint(GrStrokeStartX, GrStrokeStartY), GrStrokeScale, GrStrokeSkew);
 						else
-						{
-							p->setStrokeMode(ScPainter::Gradient);
-							p->stroke_gradient = stroke_gradient;
-							if (GrTypeStroke == 6)
-								p->setGradient(VGradient::linear, FPoint(GrStrokeStartX, GrStrokeStartY), FPoint(GrStrokeEndX, GrStrokeEndY), FPoint(GrStrokeStartX, GrStrokeStartY), GrStrokeScale, GrStrokeSkew);
-							else
-								p->setGradient(VGradient::radial, FPoint(GrStrokeStartX, GrStrokeStartY), FPoint(GrStrokeEndX, GrStrokeEndY), FPoint(GrStrokeFocalX, GrStrokeFocalY), GrStrokeScale, GrStrokeSkew);
-						}
-						p->strokePath();
-					}
-					else if (lineColor() != CommonStrings::None)
-					{
-						p->setStrokeMode(ScPainter::Solid);
-						p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
-						if (DashValues.count() != 0)
-							p->setDash(DashValues, DashOffset);
-						p->strokePath();
-					}
-				}
-				else
+							p->setGradient(VGradient::radial, FPoint(GrStrokeStartX, GrStrokeStartY), FPoint(GrStrokeEndX, GrStrokeEndY), FPoint(GrStrokeFocalX, GrStrokeFocalY), GrStrokeScale, GrStrokeSkew);
+					}
+					p->strokePath();
+				}
+				else if (lineColor() != CommonStrings::None)
 				{
 					p->setStrokeMode(ScPainter::Solid);
-					multiLine ml = m_Doc->MLineStyles[NamedLStyle];
-					QColor tmp;
-					for (int it = ml.size()-1; it > -1; it--)
-					{
-						SetQColor(&tmp, ml[it].Color, ml[it].Shade);
-						p->setPen(tmp, ml[it].Width,
-								static_cast<Qt::PenStyle>(ml[it].Dash),
-								static_cast<Qt::PenCapStyle>(ml[it].LineEnd),
-								static_cast<Qt::PenJoinStyle>(ml[it].LineJoin));
-						p->strokePath();
-					}
-				}
-			}
-	#if (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 9, 4))
+					p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
+					if (DashValues.count() != 0)
+						p->setDash(DashValues, DashOffset);
+					p->strokePath();
+				}
+			}
+			else
+			{
+				p->setStrokeMode(ScPainter::Solid);
+				multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+				QColor tmp;
+				for (int it = ml.size()-1; it > -1; it--)
+				{
+					SetQColor(&tmp, ml[it].Color, ml[it].Shade);
+					p->setPen(tmp, ml[it].Width,
+							  static_cast<Qt::PenStyle>(ml[it].Dash),
+							  static_cast<Qt::PenCapStyle>(ml[it].LineEnd),
+							  static_cast<Qt::PenJoinStyle>(ml[it].LineJoin));
+					p->strokePath();
+				}
+			}
+#if (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 9, 4))
 			if (lineBlendmode() != 0)
 				p->endLayer();
-	#else
+#else
 			if (lineBlendmode() != 0)
 				p->setBlendModeStroke(0);
-	#endif
+#endif
 		}
 	}
 	p->setFillMode(ScPainter::Solid);
@@ -4198,17 +4195,12 @@
 		else
 			actionList << "itemPDFFieldProps";
 	}
-	if (isTableItem)
+	if ((prevInChain() == 0) && (nextInChain() == 0))
+	{
 		actionList << "itemConvertToImageFrame";
-	else 
-	{
-		if ((prevInChain() == 0) && (nextInChain() == 0))
-		{
-			actionList << "itemConvertToImageFrame";
-			actionList << "itemConvertToPolygon";
-		}
-		actionList << "itemConvertToOutlines";
-	}
+		actionList << "itemConvertToPolygon";
+	}
+	actionList << "itemConvertToOutlines";
 	if (itemText.lines() != 0)
 		actionList << "editClearContents";
 }

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Thu Apr  5 19:47:56 2012
@@ -2164,7 +2164,7 @@
 						}
 						PutPage("Q\n");
 						PutPage("Q\n");
-						if (((ite->lineColor() != CommonStrings::None) || (!ite->NamedLStyle.isEmpty()) || (!ite->strokePattern().isEmpty()) || (ite->GrTypeStroke > 0)) && (!ite->isTableItem))
+						if (((ite->lineColor() != CommonStrings::None) || (!ite->NamedLStyle.isEmpty()) || (!ite->strokePattern().isEmpty()) || (ite->GrTypeStroke > 0)))
 						{
 							if (((ite->lineTransparency() != 0) || (ite->lineBlendmode() != 0)) && ((Options.Version >= PDFOptions::PDFVersion_14) || (Options.Version == PDFOptions::PDFVersion_X4)))
 								PutPage(PDF_TransparenzStroke(ite));
@@ -2532,18 +2532,6 @@
 								tmpD += output;
 								tmpD += "Q\n";
 							}
-							for (int em = 0; em < pat.items.count(); ++em)
-							{
-								PageItem* embedded = pat.items.at(em);
-								if (!embedded->isTableItem)
-									continue;
-								if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-									continue;
-								tmpD += "q\n";
-								tmpD +=  "1 0 0 1 "+FToStr(embedded->gXpos)+" "+FToStr(ite->height() - embedded->gYpos)+" cm\n";
-								tmpD += PDF_ProcessTableItem(embedded, pag);
-								tmpD += "Q\n";
-							}
 							if (Options.Version >= PDFOptions::PDFVersion_14 || Options.Version == PDFOptions::PDFVersion_X4)
 								PutPage(Write_TransparencyGroup(ite->fillTransparency(), ite->fillBlendmode(), tmpD, ite));
 							else
@@ -2576,18 +2564,6 @@
 								if (!PDF_ProcessItem(output, embedded, pag, pag->pageNr(), true))
 									return "";
 								tmpD += output;
-								tmpD += "Q\n";
-							}
-							for (int em = 0; em < ite->groupItemList.count(); ++em)
-							{
-								PageItem* embedded = ite->groupItemList.at(em);
-								if (!embedded->isTableItem)
-									continue;
-								if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-									continue;
-								tmpD += "q\n";
-								tmpD +=  "1 0 0 1 "+FToStr(embedded->gXpos)+" "+FToStr(ite->height() - embedded->gYpos)+" cm\n";
-								tmpD += PDF_ProcessTableItem(embedded, pag);
 								tmpD += "Q\n";
 							}
 							if (Options.Version >= PDFOptions::PDFVersion_14 || Options.Version == PDFOptions::PDFVersion_X4)
@@ -3248,28 +3224,6 @@
 				ite->BoundingY = OldBY;
 			}
 		}
-		for (int am = 0; am < pag->FromMaster.count(); ++am)
-		{
-			ite = pag->FromMaster.at(am);
-			if ((ite->LayerID != layer.ID) || (!ite->printEnabled()))
-				continue;
-			if (ite->ChangedMasterItem)
-				continue;
-			if ((!pag->pageName().isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
-				continue;
-			if (!ite->isTableItem)
-				continue;
-			double oldX = ite->xPos();
-			double oldY = ite->yPos();
-			double OldBX = ite->BoundingX;
-			double OldBY = ite->BoundingY;
-			ite->setXPos(ite->xPos() - mPage->xOffset() + pag->xOffset(), true);
-			ite->setYPos(ite->yPos() - mPage->yOffset() + pag->yOffset(), true);
-			PutPage(PDF_ProcessTableItem(ite, pag));
-			ite->setXYPos(oldX, oldY, true);
-			ite->BoundingX = OldBX;
-			ite->BoundingY = OldBY;
-		}
 		if (((Options.Version == PDFOptions::PDFVersion_15) || (Options.Version == PDFOptions::PDFVersion_X4)) && (Options.useLayers))
 			PutPage("EMC\n");
 	}
@@ -3305,42 +3259,6 @@
 				inh += output;
 			else
 				PutPage(output);
-		}
-		for (int a = 0; a < PItems.count() && !abortExport; ++a)
-		{
-			ite = PItems.at(a);
-			if (ite->LayerID != layer.ID)
-				continue;
-			if (usingGUI)
-			{
-				progressDialog->setProgress("ECPI", ++pc_exportpagesitems);
-				qApp->processEvents();
-			}
-			if (!ite->isTableItem)
-				continue;
-			double bLeft, bRight, bBottom, bTop;
-			getBleeds(ActPageP, bLeft, bRight, bBottom, bTop);
-			double x  = pag->xOffset() - bLeft;
-			double y  = pag->yOffset() - bTop;
-			double w  = pag->width()  + bLeft + bRight;
-			double h1 = pag->height() + bBottom + bTop;
-			double ilw= ite->lineWidth();
-			double x2 = ite->BoundingX - ilw / 2.0;
-			double y2 = ite->BoundingY - ilw / 2.0;
-			double w2 = qMax(ite->BoundingW + ilw, 1.0);
-			double h2 = qMax(ite->BoundingH + ilw, 1.0);
-			if (!( qMax( x, x2 ) <= qMin( x+w, x2+w2 ) && qMax( y, y2 ) <= qMin( y+h1, y2+h2 )))
-				continue;
-			if (ite->ChangedMasterItem)
-				continue;
-			if ((!pag->pageName().isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
-				continue;
-			if (!ite->printEnabled())
-				continue;
-			if (((layer.transparency != 1) || (layer.blendMode != 0)) && ((Options.Version >= PDFOptions::PDFVersion_14) || (Options.Version == PDFOptions::PDFVersion_X4)))
-				inh += PDF_ProcessTableItem(ite, pag);
-			else
-				PutPage(PDF_ProcessTableItem(ite, pag));
 		}
 		if (((layer.transparency != 1) || (layer.blendMode != 0)) && ((Options.Version >= PDFOptions::PDFVersion_14) ||(Options.Version == PDFOptions::PDFVersion_X4)))
 		{
@@ -3529,101 +3447,6 @@
 	return retString;
 }
 
-QString PDFLibCore::PDF_ProcessTableItem(PageItem* ite, const ScPage* pag)
-{
-	if ((ite->lineColor() == CommonStrings::None) || (ite->lineWidth() == 0.0))
-		return "";
-	QString tmp("");
-	tmp += "q\n";
-	if ((ite->doOverprint) && (!Options.UseRGB))
-	{
-		QString ShName = ResNam+QString::number(ResCount);
-		ResCount++;
-		Transpar[ShName] = writeGState("/OP true\n"
-									   "/op true\n"
-									   "/OPM 1\n");
-		tmp += "/"+ShName+" gs\n";
-	}
-//	if (((ite->fillTransparency() != 0) || (ite->lineTransparency() != 0)) && (Options.Version >= PDFOptions::PDFVersion_14))
-//		tmp += PDF_Transparenz(ite);
-//	if (ite->fillColor() != CommonStrings::None)
-//		tmp += putColor(ite->fillColor(), ite->fillShade(), true);
-	if (((ite->lineTransparency() != 0) || (ite->lineBlendmode() != 0)) && ((Options.Version >= PDFOptions::PDFVersion_14) || (Options.Version == PDFOptions::PDFVersion_X4)))
-		tmp += PDF_TransparenzStroke(ite);
-	if (ite->lineColor() != CommonStrings::None)
-		tmp += putColor(ite->lineColor(), ite->lineShade(), false);
-	tmp += FToStr(fabs(ite->lineWidth()))+" w\n";
-	if (ite->DashValues.count() != 0)
-	{
-		tmp += "[ ";
-		QVector<double>::iterator it;
-		for ( it = ite->DashValues.begin(); it != ite->DashValues.end(); ++it )
-		{
-			double da = *it;
-			// #8758: Custom dotted lines don't export properly to pdf
-			// Null values have to be exported if line end != flat
-			if ((da != 0) || (ite->lineEnd() != Qt::FlatCap))
-				tmp += QString::number(da)+" ";
-		}
-		tmp += "] "+QString::number(ite->DashOffset)+" d\n";
-	}
-	else
-		tmp += "["+getDashString(ite->PLineArt, ite->lineWidth())+"] 0 d\n";
-	tmp += "2 J\n";
-	switch (ite->PLineJoin)
-	{
-		case Qt::MiterJoin:
-			tmp += "0 j\n";
-			break;
-		case Qt::BevelJoin:
-			tmp += "2 j\n";
-			break;
-		case Qt::RoundJoin:
-			tmp += "1 j\n";
-			break;
-		default:
-			tmp += "0 j\n";
-			break;
-	}
-	tmp += "1 0 0 1 "+FToStr(ite->xPos() - pag->xOffset())+" "+FToStr(pag->height() - (ite->yPos()  - pag->yOffset()))+" cm\n";
-	if (ite->rotation() != 0)
-	{
-		double sr = sin(-ite->rotation()* M_PI / 180.0);
-		double cr = cos(-ite->rotation()* M_PI / 180.0);
-		if ((cr * cr) < 0.000001)
-			cr = 0;
-		if ((sr * sr) < 0.000001)
-			sr = 0;
-		tmp += FToStr(cr)+" "+FToStr(sr)+" "+FToStr(-sr)+" "+FToStr(cr)+ " 0 0 cm\n";
-	}
-	if ((ite->TopLine) || (ite->RightLine) || (ite->BottomLine) || (ite->LeftLine))
-	{
-		if (ite->TopLine)
-		{
-			tmp += "0 0 m\n";
-			tmp += FToStr(ite->width())+" 0 l\n";
-		}
-		if (ite->RightLine)
-		{
-			tmp += FToStr(ite->width())+" 0 m\n";
-			tmp += FToStr(ite->width())+" "+FToStr(-ite->height())+" l\n";
-		}
-		if (ite->BottomLine)
-		{
-			tmp += "0 "+FToStr(-ite->height())+" m\n";
-			tmp += FToStr(ite->width())+" "+FToStr(-ite->height())+" l\n";
-		}
-		if (ite->LeftLine)
-		{
-			tmp += "0 0 m\n";
-			tmp += "0 "+FToStr(-ite->height())+" l\n";
-		}
-		tmp += "S\n";
-	}
-	tmp += "Q\n";
-	return tmp;
-}
-
 bool PDFLibCore::PDF_ProcessItem(QString& output, PageItem* ite, const ScPage* pag, uint PNr, bool embedded, bool pattern)
 {
 	QString tmp(""), tmpOut;
@@ -3819,7 +3642,7 @@
 			}
 			tmp += "Q\n";
 			tmp += "Q\n";
-			if (((ite->lineColor() != CommonStrings::None) || (!ite->NamedLStyle.isEmpty()) || (!ite->strokePattern().isEmpty()) || (ite->GrTypeStroke > 0)) && (!ite->isTableItem))
+			if (((ite->lineColor() != CommonStrings::None) || (!ite->NamedLStyle.isEmpty()) || (!ite->strokePattern().isEmpty()) || (ite->GrTypeStroke > 0)))
 			{
 				if (((ite->lineTransparency() != 0) || (ite->lineBlendmode() != 0)) && ((Options.Version >= PDFOptions::PDFVersion_14) || (Options.Version == PDFOptions::PDFVersion_X4) ))
 					tmp += PDF_TransparenzStroke(ite);
@@ -3916,7 +3739,7 @@
 			tmp += setTextSt(ite, PNr, pag);
 			tmp += "Q\n";
 			tmp += "Q\n";
-			if (((ite->lineColor() != CommonStrings::None) || (!ite->NamedLStyle.isEmpty()) || (!ite->strokePattern().isEmpty()) || (ite->GrTypeStroke > 0)) && (!ite->isTableItem))
+			if (((ite->lineColor() != CommonStrings::None) || (!ite->NamedLStyle.isEmpty()) || (!ite->strokePattern().isEmpty()) || (ite->GrTypeStroke > 0)))
 			{
 				if (((ite->lineTransparency() != 0) || (ite->lineBlendmode() != 0)) && ((Options.Version >= PDFOptions::PDFVersion_14) || (Options.Version == PDFOptions::PDFVersion_X4) ))
 					tmp += PDF_TransparenzStroke(ite);
@@ -4354,18 +4177,6 @@
 					tmpD += output;
 					tmpD += "Q\n";
 				}
-				for (int em = 0; em < pat.items.count(); ++em)
-				{
-					PageItem* embedded = pat.items.at(em);
-					if (!embedded->isTableItem)
-						continue;
-					if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-						continue;
-					tmpD += "q\n";
-					tmpD +=  "1 0 0 1 "+FToStr(embedded->gXpos)+" "+FToStr(ite->height() - embedded->gYpos)+" cm\n";
-					tmpD += PDF_ProcessTableItem(embedded, pag);
-					tmpD += "Q\n";
-				}
 				if (Options.Version >= PDFOptions::PDFVersion_14 || Options.Version == PDFOptions::PDFVersion_X4)
 					tmp += Write_TransparencyGroup(ite->fillTransparency(), ite->fillBlendmode(), tmpD, ite);
 				else
@@ -4401,18 +4212,6 @@
 					if (!PDF_ProcessItem(output, embedded, pag, PNr, true))
 						return "";
 					tmpD += output;
-					tmpD += "Q\n";
-				}
-				for (int em = 0; em < ite->groupItemList.count(); ++em)
-				{
-					PageItem* embedded = ite->groupItemList.at(em);
-					if (!embedded->isTableItem)
-						continue;
-					if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-						continue;
-					tmpD += "q\n";
-					tmpD +=  "1 0 0 1 "+FToStr(embedded->gXpos)+" "+FToStr(ite->height() - embedded->gYpos)+" cm\n";
-					tmpD += PDF_ProcessTableItem(embedded, pag);
 					tmpD += "Q\n";
 				}
 				groupStackPos.pop();
@@ -4726,18 +4525,6 @@
 			tmp += output;
 			tmp += "Q\n";
 		}
-		for (int em = 0; em < pat.items.count(); ++em)
-		{
-			PageItem* embedded = pat.items.at(em);
-			if (!embedded->isTableItem)
-				continue;
-			if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-				continue;
-			tmp += "q\n";
-			tmp +=  "1 0 0 1 "+FToStr(embedded->gXpos)+" "+FToStr(embedded->gHeight - embedded->gYpos)+" cm\n";
-			tmp += PDF_ProcessTableItem(embedded, pag);
-			tmp += "Q\n";
-		}
 		tmp += "Q\n";
 		xpos += adv;
 	}
@@ -5381,91 +5168,6 @@
 			if (!PDF_ProcessItem(output, embedded, pag, PNr, true))
 				return false;
 			tmp2 +=output;
-			tmp2 += "Q\n";
-		}
-		for (int em = 0; em < emG.count(); ++em)
-		{
-			PageItem* embedded = emG.at(em);
-			if (!embedded->isTableItem)
-				continue;
-			if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-				continue;
-			tmp2 += "q\n";
-			if (ite->asPathText())
-				tmp2 +=  FToStr(style.scaleH() / 1000.0)+" 0 0 "+FToStr(style.scaleV() / 1000.0)+" "+FToStr(embedded->gXpos * (style.scaleH() / 1000.0))+" "+FToStr((embedded->gHeight * (style.scaleV() / 1000.0)) - embedded->gYpos * (style.scaleV() / 1000.0)+embedded->gHeight * (style.baselineOffset() / 1000.0))+" cm\n";
-			else
-				tmp2 +=  FToStr(style.scaleH() / 1000.0)+" 0 0 "+FToStr(style.scaleV() / 1000.0)+" "+FToStr(x+hl->glyph.xoffset + embedded->gXpos * (style.scaleH() / 1000.0))+" "+FToStr(-y-hl->glyph.yoffset + (embedded->gHeight * (style.scaleV() / 1000.0)) - embedded->gYpos * (style.scaleV() / 1000.0)+embedded->gHeight * (style.baselineOffset() / 1000.0))+" cm\n";
-
-			if ((embedded->doOverprint) && (!Options.UseRGB))
-			{
-				QString ShName = ResNam+QString::number(ResCount);
-				ResCount++;
-				Transpar[ShName] = writeGState("/OP true\n"
-											"/op true\n"
-											"/OPM 1\n");
-				tmp2 += "/"+ShName+" gs\n";
-			}
-			if (((embedded->lineTransparency() != 0) || (embedded->lineBlendmode() != 0)) && ((Options.Version >= PDFOptions::PDFVersion_14) || (Options.Version == PDFOptions::PDFVersion_X4)))
-				tmp2 += PDF_TransparenzStroke(embedded);
-			if (embedded->lineColor() != CommonStrings::None)
-				tmp2 += putColor(embedded->lineColor(), embedded->lineShade(), false);
-			tmp2 += FToStr(fabs(embedded->lineWidth()))+" w\n";
-			if (embedded->DashValues.count() != 0)
-			{
-				tmp2 += "[ ";
-				QVector<double>::iterator it;
-				for ( it = embedded->DashValues.begin(); it != embedded->DashValues.end(); ++it )
-				{
-					double da = *it;
-					// #8758: Custom dotted lines don't export properly to pdf
-					// Null values have to be exported if line end != flat
-					if ((da != 0) || (embedded->lineEnd() != Qt::FlatCap))
-						tmp2 += QString::number(da)+" ";
-				}
-				tmp2 += "] "+QString::number(embedded->DashOffset)+" d\n";
-			}
-			else
-				tmp2 += "["+getDashString(embedded->PLineArt, embedded->lineWidth())+"] 0 d\n";
-			tmp2 += "2 J\n";
-			switch (embedded->PLineJoin)
-			{
-				case Qt::MiterJoin:
-					tmp2 += "0 j\n";
-					break;
-				case Qt::BevelJoin:
-					tmp2 += "2 j\n";
-					break;
-				case Qt::RoundJoin:
-					tmp2 += "1 j\n";
-					break;
-				default:
-					tmp2 += "0 j\n";
-					break;
-			}
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				if (embedded->TopLine)
-				{
-					tmp2 += "0 0 m\n";
-					tmp2 += FToStr(embedded->width())+" 0 l\n";
-				}
-				if (embedded->RightLine)
-				{
-					tmp2 += FToStr(embedded->width())+" 0 m\n";
-					tmp2 += FToStr(embedded->width())+" "+FToStr(-embedded->height())+" l\n";
-				}
-				if (embedded->BottomLine)
-				{
-					tmp2 += "0 "+FToStr(-embedded->height())+" m\n";
-					tmp2 += FToStr(embedded->width())+" "+FToStr(-embedded->height())+" l\n";
-				}
-				if (embedded->LeftLine)
-				{
-					tmp2 += "0 0 m\n";
-					tmp2 += "0 "+FToStr(-embedded->height())+" l\n";
-				}
-				tmp2 += "S\n";
-			}
 			tmp2 += "Q\n";
 		}
 		tmp += tmp2+"\n";
@@ -6504,97 +6206,6 @@
 		tmp2 += tmpOut;
 		item->setXYPos(item->xPos() - ActPageP->xOffset(), item->yPos() - ActPageP->yOffset(), true);
 		inPattern--;
-		tmp2 += "Q\n";
-	}
-	for (int em = 0; em < pat->items.count(); ++em)
-	{
-		PageItem* item = pat->items.at(em);
-		if (!item->isTableItem)
-			continue;
-		if ((item->lineColor() == CommonStrings::None) || (item->lineWidth() == 0.0))
-			continue;
-		tmp2 += "q\n";
-		if ((item->doOverprint) && (!Options.UseRGB))
-		{
-			QString ShName = ResNam+QString::number(ResCount);
-			ResCount++;
-			Transpar[ShName] = writeGState("/OP true\n"
-										"/op true\n"
-										"/OPM 1\n");
-			tmp2 += "/"+ShName+" gs\n";
-		}
-		if (((item->lineTransparency() != 0) || (item->lineBlendmode() != 0)) && ((Options.Version >= PDFOptions::PDFVersion_14) || (Options.Version == PDFOptions::PDFVersion_X4)))
-			tmp2 += PDF_TransparenzStroke(item);
-		if (item->lineColor() != CommonStrings::None)
-			tmp2 += putColor(item->lineColor(), item->lineShade(), false);
-		tmp2 += FToStr(fabs(item->lineWidth()))+" w\n";
-		if (item->DashValues.count() != 0)
-		{
-			tmp2 += "[ ";
-			QVector<double>::iterator it;
-			for ( it = item->DashValues.begin(); it != item->DashValues.end(); ++it )
-			{
-				double da = *it;
-				// #8758: Custom dotted lines don't export properly to pdf
-				// Null values have to be exported if line end != flat
-				if ((da != 0) || (item->lineEnd() != Qt::FlatCap))
-					tmp2 += QString::number(da)+" ";
-			}
-			tmp2 += "] "+QString::number(item->DashOffset)+" d\n";
-		}
-		else
-			tmp2 += "["+getDashString(item->PLineArt, item->lineWidth())+"] 0 d\n";
-		tmp2 += "2 J\n";
-		switch (item->PLineJoin)
-		{
-			case Qt::MiterJoin:
-				tmp2 += "0 j\n";
-				break;
-			case Qt::BevelJoin:
-				tmp2 += "2 j\n";
-				break;
-			case Qt::RoundJoin:
-				tmp2 += "1 j\n";
-				break;
-			default:
-				tmp2 += "0 j\n";
-				break;
-		}
-		tmp2 +=  "1 0 0 1 "+FToStr(item->gXpos)+" "+FToStr(-(item->gYpos - pat->height))+" cm\n";
-		if (item->rotation() != 0)
-		{
-			double sr = sin(-item->rotation()* M_PI / 180.0);
-			double cr = cos(-item->rotation()* M_PI / 180.0);
-			if ((cr * cr) < 0.000001)
-				cr = 0;
-			if ((sr * sr) < 0.000001)
-				sr = 0;
-			tmp2 += FToStr(cr)+" "+FToStr(sr)+" "+FToStr(-sr)+" "+FToStr(cr)+ " 0 0 cm\n";
-		}
-		if ((item->TopLine) || (item->RightLine) || (item->BottomLine) || (item->LeftLine))
-		{
-			if (item->TopLine)
-			{
-				tmp2 += "0 0 m\n";
-				tmp2 += FToStr(item->width())+" 0 l\n";
-			}
-			if (item->RightLine)
-			{
-				tmp2 += FToStr(item->width())+" 0 m\n";
-				tmp2 += FToStr(item->width())+" "+FToStr(-item->height())+" l\n";
-			}
-			if (item->BottomLine)
-			{
-				tmp2 += "0 "+FToStr(-item->height())+" m\n";
-				tmp2 += FToStr(item->width())+" "+FToStr(-item->height())+" l\n";
-			}
-			if (item->LeftLine)
-			{
-				tmp2 += "0 0 m\n";
-				tmp2 += "0 "+FToStr(-item->height())+" l\n";
-			}
-			tmp2 += "S\n";
-		}
 		tmp2 += "Q\n";
 	}
 	if (Options.Compress)

Modified: trunk/Scribus/scribus/pdflib_core.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pdflib_core.h
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.h (original)
+++ trunk/Scribus/scribus/pdflib_core.h Thu Apr  5 19:47:56 2012
@@ -150,7 +150,6 @@
 	QByteArray ComputeRC4Key(int ObjNum);
 
 	bool    PDF_ProcessItem(QString& output, PageItem* ite, const ScPage* pag, uint PNr, bool embedded = false, bool pattern = false);
-	QString PDF_ProcessTableItem(PageItem* ite, const ScPage* pag);
 	QString paintBorder(const TableBorder& border, const QPointF& start, const QPointF& end, const QPointF& startOffsetFactors, const QPointF& endOffsetFactors);
 	QString HandleBrushPattern(PageItem* ite, QPainterPath &path, const ScPage* pag, uint PNr);
 	QString drawArrow(PageItem *ite, QTransform &arrowTrans, int arrowIndex);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Thu Apr  5 19:47:56 2012
@@ -2451,31 +2451,6 @@
 		docu.writeAttribute("TransBlend", item->fillBlendmode());
 	if (item->lineBlendmode() != 0)
 		docu.writeAttribute("TransBlendS", item->lineBlendmode());
-	if (item->isTableItem)
-	{
-		docu.writeAttribute("isTableItem", 1);
-		docu.writeAttribute("TopLine", static_cast<int>(item->TopLine));
-		docu.writeAttribute("LeftLine", static_cast<int>(item->LeftLine));
-		docu.writeAttribute("RightLine", static_cast<int>(item->RightLine));
-		docu.writeAttribute("BottomLine", static_cast<int>(item->BottomLine));
-		if (item->TopLink != 0)
-			docu.writeAttribute("TopLINK", qHash(item->TopLink));
-		else
-			docu.writeAttribute("TopLINK", -1);
-		if (item->LeftLink != 0)
-			docu.writeAttribute("LeftLINK", qHash(item->LeftLink));
-		else
-			docu.writeAttribute("LeftLINK", -1);
-		if (item->RightLink != 0)
-			docu.writeAttribute("RightLINK", qHash(item->RightLink));
-		else
-			docu.writeAttribute("RightLINK", -1);
-		if (item->BottomLink != 0)
-			docu.writeAttribute("BottomLINK", qHash(item->BottomLink));
-		else
-			docu.writeAttribute("BottomLINK", -1);
-		docu.writeAttribute("OwnLINK", qHash(item));
-	}
 
 	if (item->isTable())
 	{

Modified: trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp Thu Apr  5 19:47:56 2012
@@ -322,51 +322,6 @@
 			continue;
 		ProcessItemOnPage(Item->xPos()-page->xOffset(), Item->yPos()-page->yOffset(), Item, &layerGroup);
 	}
-	for(int j = 0; j < Items.count(); ++j)
-	{
-		Item = Items.at(j);
-		if (Item->LayerID != layer.ID)
-			continue;
-		if (!Item->printEnabled())
-			continue;
-		double x = page->xOffset();
-		double y = page->yOffset();
-		double w = page->width();
-		double h = page->height();
-		double x2 = Item->BoundingX;
-		double y2 = Item->BoundingY;
-		double w2 = Item->BoundingW;
-		double h2 = Item->BoundingH;
-		if (!( qMax( x, x2 ) <= qMin( x+w, x2+w2 ) && qMax( y, y2 ) <= qMin( y+h, y2+h2 )))
-			continue;
-		if ((!page->pageName().isEmpty()) && (Item->OwnPage != static_cast<int>(page->pageNr())) && (Item->OwnPage != -1))
-			continue;
-		if (!Item->isTableItem)
-			continue;
-		if ((Item->lineColor() == CommonStrings::None) || (Item->lineWidth() == 0.0))
-			continue;
-		if ((Item->TopLine) || (Item->RightLine) || (Item->BottomLine) || (Item->LeftLine))
-		{
-			QString trans = "translate("+FToStr(Item->xPos()-page->xOffset())+", "+FToStr(Item->yPos()-page->yOffset())+")";
-			if (Item->rotation() != 0)
-				trans += " rotate("+FToStr(Item->rotation())+")";
-			QString stroke = getStrokeStyle(Item);
-			QDomElement ob = docu.createElement("path");
-			ob.setAttribute("transform", trans);
-			ob.setAttribute("style", "fill:none; " + stroke);
-			QString pathAttr = "";
-			if (Item->TopLine)
-				pathAttr += "M 0 0 L "+FToStr(Item->width())+" 0";
-			if (Item->RightLine)
-				pathAttr += " M " + FToStr(Item->width()) + "0 L "+FToStr(Item->width())+" "+FToStr(Item->height());
-			if (Item->BottomLine)
-				pathAttr += " M 0 " + FToStr(Item->height()) + " L "+FToStr(Item->width())+" "+FToStr(Item->height());
-			if (Item->LeftLine)
-				pathAttr += " M 0 0 L 0 "+FToStr(Item->height());
-			ob.setAttribute("d", pathAttr);
-			layerGroup.appendChild(ob);
-		}
-	}
 	docElement.appendChild(layerGroup);
 
 	m_Doc->setCurrentPage(SavedAct);
@@ -380,8 +335,7 @@
 		trans += " rotate("+FToStr(Item->rotation())+")";
 	QString fill = getFillStyle(Item);
 	QString stroke = "stroke:none";
-	if (!Item->isTableItem)
-		stroke = getStrokeStyle(Item);
+	stroke = getStrokeStyle(Item);
 	switch (Item->itemType())
 	{
 		case PageItem::Arc:
@@ -1454,8 +1408,7 @@
 		QDomElement obE;
 		QString fill = getFillStyle(embedded);
 		QString stroke = "stroke:none";
-		if (!embedded->isTableItem)
-			stroke = getStrokeStyle(embedded);
+		stroke = getStrokeStyle(embedded);
 		switch (embedded->itemType())
 		{
 			case PageItem::Arc:
@@ -1500,41 +1453,6 @@
 		obE.setAttribute("transform", MatrixToStr(mm));
 		layerGroup.appendChild(obE);
 	}
-	for (int em = 0; em < emG.count(); ++em)
-	{
-		PageItem* embedded = emG.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-			continue;
-		if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-		{
-			QTransform mm;
-			mm.translate(xpos + embedded->gXpos * (charStyle.scaleH() / 1000.0), (ypos - (embedded->gHeight * (charStyle.scaleV() / 1000.0)) + embedded->gYpos * (charStyle.scaleV() / 1000.0)));
-			if (charStyle.baselineOffset() != 0)
-				mm.translate(0, embedded->gHeight * (charStyle.baselineOffset() / 1000.0));
-			if (charStyle.scaleH() != 1000)
-				mm.scale(charStyle.scaleH() / 1000.0, 1);
-			if (charStyle.scaleV() != 1000)
-				mm.scale(1, charStyle.scaleV() / 1000.0);
-			mm.rotate(embedded->rotation());
-			QString stroke = getStrokeStyle(embedded);
-			QDomElement obL = docu.createElement("path");
-			obL.setAttribute("transform", MatrixToStr(mm));
-			obL.setAttribute("style", "fill:none; " + stroke);
-			QString pathAttr = "";
-			if (embedded->TopLine)
-				pathAttr += "M 0 0 L "+FToStr(embedded->width())+" 0";
-			if (embedded->RightLine)
-				pathAttr += " M " + FToStr(embedded->width()) + "0 L "+FToStr(embedded->width())+" "+FToStr(embedded->height());
-			if (embedded->BottomLine)
-				pathAttr += " M 0 " + FToStr(embedded->height()) + " L "+FToStr(embedded->width())+" "+FToStr(embedded->height());
-			if (embedded->LeftLine)
-				pathAttr += " M 0 0 L 0 "+FToStr(embedded->height());
-			obL.setAttribute("d", pathAttr);
-			layerGroup.appendChild(obL);
-		}
-	}
 	return layerGroup;
 }
 
@@ -2167,35 +2085,6 @@
 			PageItem* Item = pa.items.at(em);
 			ProcessItemOnPage(Item->gXpos, Item->gYpos, Item, &patt);
 		}
-		for (int em = 0; em < pa.items.count(); ++em)
-		{
-			PageItem* embedded = pa.items.at(em);
-			QString trans = "translate("+FToStr(embedded->gXpos)+", "+FToStr(embedded->gYpos)+")";
-			if (embedded->rotation() != 0)
-				trans += " rotate("+FToStr(embedded->rotation())+")";
-			if (!embedded->isTableItem)
-				continue;
-			if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-				continue;
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				QString stroke = getStrokeStyle(embedded);
-				QDomElement obL = docu.createElement("path");
-				obL.setAttribute("transform", trans);
-				obL.setAttribute("style", "fill:none; " + stroke);
-				QString pathAttr = "";
-				if (embedded->TopLine)
-					pathAttr += "M 0 0 L "+FToStr(embedded->width())+" 0";
-				if (embedded->RightLine)
-					pathAttr += " M " + FToStr(embedded->width()) + "0 L "+FToStr(embedded->width())+" "+FToStr(embedded->height());
-				if (embedded->BottomLine)
-					pathAttr += " M 0 " + FToStr(embedded->height()) + " L "+FToStr(embedded->width())+" "+FToStr(embedded->height());
-				if (embedded->LeftLine)
-					pathAttr += " M 0 0 L 0 "+FToStr(embedded->height());
-				obL.setAttribute("d", pathAttr);
-				patt.appendChild(obL);
-			}
-		}
 		globalDefs.appendChild(patt);
 	}
 }
@@ -2213,35 +2102,6 @@
 		{
 			PageItem* Item = pa.items.at(em);
 			ProcessItemOnPage(Item->gXpos, Item->gYpos, Item, &patt);
-		}
-		for (int em = 0; em < pa.items.count(); ++em)
-		{
-			PageItem* embedded = pa.items.at(em);
-			QString trans = "translate("+FToStr(embedded->gXpos)+", "+FToStr(embedded->gYpos)+")";
-			if (embedded->rotation() != 0)
-				trans += " rotate("+FToStr(embedded->rotation())+")";
-			if (!embedded->isTableItem)
-				continue;
-			if ((embedded->lineColor() == CommonStrings::None) || (embedded->lineWidth() == 0.0))
-				continue;
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				QString stroke = getStrokeStyle(embedded);
-				QDomElement obL = docu.createElement("path");
-				obL.setAttribute("transform", trans);
-				obL.setAttribute("style", "fill:none; " + stroke);
-				QString pathAttr = "";
-				if (embedded->TopLine)
-					pathAttr += "M 0 0 L "+FToStr(embedded->width())+" 0";
-				if (embedded->RightLine)
-					pathAttr += " M " + FToStr(embedded->width()) + "0 L "+FToStr(embedded->width())+" "+FToStr(embedded->height());
-				if (embedded->BottomLine)
-					pathAttr += " M 0 " + FToStr(embedded->height()) + " L "+FToStr(embedded->width())+" "+FToStr(embedded->height());
-				if (embedded->LeftLine)
-					pathAttr += " M 0 0 L 0 "+FToStr(embedded->height());
-				obL.setAttribute("d", pathAttr);
-				patt.appendChild(obL);
-			}
 		}
 		globalDefs.appendChild(patt);
 	}

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Thu Apr  5 19:47:56 2012
@@ -501,53 +501,6 @@
 			PS_save();
 			PS_translate(item->gXpos, pa.height - item->gYpos);
 			ProcessItem(m_Doc, m_Doc->Pages->at(0), item, 0, sep, farb, ic, gcr, false, true, true);
-			PS_restore();
-			PutStream("} exec\n");
-		}
-		for (int em = 0; em < pa.items.count(); ++em)
-		{
-			int h, s, v, k;
-			PageItem* item = pa.items.at(em);
-			if (!item->isTableItem)
-				continue;
-			if ((item->lineColor() == CommonStrings::None) || (item->lineWidth() == 0.0))
-				continue;
-			PutStream("{\n");
-			PS_save();
-			PS_translate(item->gXpos, pa.height - item->gYpos);
-			PS_rotate(item->rotation());
-			if (item->lineColor() != CommonStrings::None)
-			{
-				SetColor(item->lineColor(), item->lineShade(), &h, &s, &v, &k, gcr);
-				PS_setcmykcolor_stroke(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
-			}
-			PS_setlinewidth(item->lineWidth());
-			PS_setcapjoin(Qt::SquareCap, item->PLineJoin);
-			PS_setdash(item->PLineArt, item->DashOffset, item->DashValues);
-			if ((item->TopLine) || (item->RightLine) || (item->BottomLine) || (item->LeftLine))
-			{
-				if (item->TopLine)
-				{
-					PS_moveto(0, 0);
-					PS_lineto(item->width(), 0);
-				}
-				if (item->RightLine)
-				{
-					PS_moveto(item->width(), 0);
-					PS_lineto(item->width(), -item->height());
-				}
-				if (item->BottomLine)
-				{
-					PS_moveto(0, -item->height());
-					PS_lineto(item->width(), -item->height());
-				}
-				if (item->LeftLine)
-				{
-					PS_moveto(0, 0);
-					PS_lineto(0, -item->height());
-				}
-				putColor(item->lineColor(), item->lineShade(), false);
-			}
 			PS_restore();
 			PutStream("} exec\n");
 		}
@@ -1799,7 +1752,7 @@
 				if (!imageOk) return false;
 			}
 			PS_restore();
-			if (((c->lineColor() != CommonStrings::None) || (!c->NamedLStyle.isEmpty()) || (!c->strokePattern().isEmpty()) || (c->GrTypeStroke > 0)) && (!c->isTableItem))
+			if (((c->lineColor() != CommonStrings::None) || (!c->NamedLStyle.isEmpty()) || (!c->strokePattern().isEmpty()) || (c->GrTypeStroke > 0)))
 			{
 				if (c->NamedLStyle.isEmpty()) // && (c->lineWidth() != 0.0))
 				{
@@ -1898,7 +1851,7 @@
 				PS_scale(1, -1);
 			}
 			setTextSt(Doc, c, gcr, PNr-1, a, sep, farb, ic, master);
-			if (((c->lineColor() != CommonStrings::None) || (!c->NamedLStyle.isEmpty()) || (!c->strokePattern().isEmpty()) || (c->GrTypeStroke > 0)) && (!c->isTableItem))
+			if (((c->lineColor() != CommonStrings::None) || (!c->NamedLStyle.isEmpty()) || (!c->strokePattern().isEmpty()) || (c->GrTypeStroke > 0)))
 			{
 				PS_setlinewidth(c->lineWidth());
 				PS_setcapjoin(c->PLineEnd, c->PLineJoin);
@@ -2944,86 +2897,6 @@
 				ProcessItem(Doc, a, c, PNr, sep, farb, ic, gcr, false);
 			}
 		}
-		for (b = 0; b < PItems.count() && !abortExport; ++b)
-		{
-			c = PItems.at(b);
-			if (usingGUI)
-				ScQApp->processEvents();
-			if (c->LayerID != ll.ID)
-				continue;
-			if ((!a->pageName().isEmpty()) && (c->asTextFrame()))
-				continue;
-			if ((!a->pageName().isEmpty()) && (c->asPathText()))
-				continue;
-			if ((!a->pageName().isEmpty()) && (c->asImageFrame()) && ((sep) || (!farb)))
-				continue;
-			double bLeft, bRight, bBottom, bTop;
-			GetBleeds(a, bLeft, bRight, bBottom, bTop);
-			double x = a->xOffset() - bLeft;
-			double y = a->yOffset() - bTop;
-			double w = a->width() + bLeft + bRight;
-			double h1 = a->height() + bBottom + bTop;
-			double ilw=c->lineWidth();
-			double x2 = c->BoundingX - ilw / 2.0;
-			double y2 = c->BoundingY - ilw / 2.0;
-			double w2 = qMax(c->BoundingW + ilw, 1.0);
-			double h2 = qMax(c->BoundingH + ilw, 1.0);
-			if (!( qMax( x, x2 ) <= qMin( x+w, x2+w2 ) && qMax( y, y2 ) <= qMin( y+h1, y2+h2 )))
-				continue;
-			if (c->ChangedMasterItem)
-				continue;
-			if (!c->isTableItem)
-				continue;
-			if (c->lineColor() == CommonStrings::None) //|| (c->lineWidth() == 0.0))
-				continue;
-			if ((!a->pageName().isEmpty()) && (c->OwnPage != static_cast<int>(a->pageNr())) && (c->OwnPage != -1))
-				continue;
-			if (c->printEnabled())
-			{
-				PS_save();
-				if (c->doOverprint)
-				{
-					PutStream("true setoverprint\n");
-					PutStream("true setoverprintmode\n");
-				}
-				if (c->lineColor() != CommonStrings::None)
-				{
-					SetColor(c->lineColor(), c->lineShade(), &h, &s, &v, &k, gcr);
-					PS_setcmykcolor_stroke(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
-				}
-				PS_setlinewidth(c->lineWidth());
-				PS_setcapjoin(c->PLineEnd, c->PLineJoin);
-				PS_setdash(c->PLineArt, c->DashOffset, c->DashValues);
-				PS_translate(c->xPos() - a->xOffset(), a->height() - (c->yPos() - a->yOffset()));
-				if (c->rotation() != 0)
-					PS_rotate(-c->rotation());
-				if ((c->TopLine) || (c->RightLine) || (c->BottomLine) || (c->LeftLine))
-				{
-					if (c->TopLine)
-					{
-						PS_moveto(0, 0);
-						PS_lineto(c->width(), 0);
-					}
-					if (c->RightLine)
-					{
-						PS_moveto(c->width(), 0);
-						PS_lineto(c->width(), -c->height());
-					}
-					if (c->BottomLine)
-					{
-						PS_moveto(0, -c->height());
-						PS_lineto(c->width(), -c->height());
-					}
-					if (c->LeftLine)
-					{
-						PS_moveto(0, 0);
-						PS_lineto(0, -c->height());
-					}
-					putColor(c->lineColor(), c->lineShade(), false);
-				}
-				PS_restore();
-			}
-		}
 		Lnr++;
 	}
 }
@@ -3292,7 +3165,7 @@
 					PS_scale(1, -1);
 				}
 				setTextSt(Doc, ite, gcr, PNr, mPage, sep, farb, ic, true);
-				if (((ite->lineColor() != CommonStrings::None) || (!ite->NamedLStyle.isEmpty()) || (!ite->strokePattern().isEmpty()) || (ite->GrTypeStroke > 0)) && (!ite->isTableItem))
+				if (((ite->lineColor() != CommonStrings::None) || (!ite->NamedLStyle.isEmpty()) || (!ite->strokePattern().isEmpty()) || (ite->GrTypeStroke > 0)))
 				{
 					if (ite->NamedLStyle.isEmpty()) // && (ite->lineWidth() != 0.0))
 					{
@@ -3785,59 +3658,6 @@
 				break;
 		}
 	}
-	for (int am = 0; am < page->FromMaster.count() && !abortExport; ++am)
-	{
-		PageItem *ite = page->FromMaster.at(am);
-		if (!ite->isTableItem)
-			continue;
-		if ((ite->lineColor() == CommonStrings::None) || (ite->lineWidth() == 0.0))
-			continue;
-		if (ite->printEnabled())
-		{
-			PS_save();
-			if (ite->doOverprint)
-			{
-				PutStream("true setoverprint\n");
-				PutStream("true setoverprintmode\n");
-			}
-			if (ite->lineColor() != CommonStrings::None)
-			{
-				SetColor(ite->lineColor(), ite->lineShade(), &h, &s, &v, &k, gcr);
-				PS_setcmykcolor_stroke(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
-			}
-			PS_setlinewidth(ite->lineWidth());
-			PS_setcapjoin(ite->PLineEnd, ite->PLineJoin);
-			PS_setdash(ite->PLineArt, ite->DashOffset, ite->DashValues);
-			PS_translate(ite->xPos() - mPage->xOffset(), mPage->height() - (ite->yPos() - mPage->yOffset()));
-			if (ite->rotation() != 0)
-				PS_rotate(-ite->rotation());
-			if ((ite->TopLine) || (ite->RightLine) || (ite->BottomLine) || (ite->LeftLine))
-			{
-				if (ite->TopLine)
-				{
-					PS_moveto(0, 0);
-					PS_lineto(ite->width(), 0);
-				}
-				if (ite->RightLine)
-				{
-					PS_moveto(ite->width(), 0);
-					PS_lineto(ite->width(), -ite->height());
-				}
-				if (ite->BottomLine)
-				{
-					PS_moveto(0, -ite->height());
-					PS_lineto(ite->width(), -ite->height());
-				}
-				if (ite->LeftLine)
-				{
-					PS_moveto(0, 0);
-					PS_lineto(0, -ite->height());
-				}
-				putColor(ite->lineColor(), ite->lineShade(), false);
-			}
-			PS_restore();
-		}
-	}
 	return success;
 }
 
@@ -3889,85 +3709,6 @@
 				break;
 		}
 	}
-	if (!success)
-		return false;
-	for (b = 0; b < items.count() && !abortExport; ++b)
-	{
-		PageItem* item = items.at(b);
-		if (usingGUI)
-			ScQApp->processEvents();
-		if (item->LayerID != layer.ID)
-			continue;
-		if ((!page->pageName().isEmpty()) && (item->asTextFrame()))
-			continue;
-		if ((!page->pageName().isEmpty()) && (item->asPathText()))
-			continue;
-		if ((!page->pageName().isEmpty()) && (item->asImageFrame()) && ((sep) || (!farb)))
-			continue;
-		double bLeft, bRight, bBottom, bTop;
-		GetBleeds(page, bLeft, bRight, bBottom, bTop);
-		double x  = page->xOffset() - bLeft;
-		double y  = page->yOffset() - bTop;
-		double w  = page->width() + bLeft + bRight;
-		double h1 = page->height() + bBottom + bTop;
-		double ilw= item->lineWidth();
-		double x2 = item->BoundingX - ilw / 2.0;
-		double y2 = item->BoundingY - ilw / 2.0;
-		double w2 = qMax(item->BoundingW + ilw, 1.0);
-		double h2 = qMax(item->BoundingH + ilw, 1.0);
-		if (!( qMax( x, x2 ) <= qMin( x+w, x2+w2 ) && qMax( y, y2 ) <= qMin( y+h1, y2+h2 )))
-			continue;
-		if (item->ChangedMasterItem)
-			continue;
-		if (!item->isTableItem || !item->printEnabled())
-			continue;
-		if (item->lineColor() == CommonStrings::None) //|| (item->lineWidth() == 0.0))
-			continue;
-		if ((!page->pageName().isEmpty()) && (item->OwnPage != static_cast<int>(page->pageNr())) && (item->OwnPage != -1))
-			continue;
-		PS_save();
-		if (item->doOverprint)
-		{
-			PutStream("true setoverprint\n");
-			PutStream("true setoverprintmode\n");
-		}
-		if (item->lineColor() != CommonStrings::None)
-		{
-			SetColor(item->lineColor(), item->lineShade(), &h, &s, &v, &k, gcr);
-			PS_setcmykcolor_stroke(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
-		}
-		PS_setlinewidth(item->lineWidth());
-		PS_setcapjoin(item->PLineEnd, item->PLineJoin);
-		PS_setdash(item->PLineArt, item->DashOffset, item->DashValues);
-		PS_translate(item->xPos() - page->xOffset(), page->height() - (item->yPos() - page->yOffset()));
-		if (item->rotation() != 0)
-			PS_rotate(-item->rotation());
-		if ((item->TopLine) || (item->RightLine) || (item->BottomLine) || (item->LeftLine))
-		{
-			if (item->TopLine)
-			{
-				PS_moveto(0, 0);
-				PS_lineto(item->width(), 0);
-			}
-			if (item->RightLine)
-			{
-				PS_moveto(item->width(), 0);
-				PS_lineto(item->width(), -item->height());
-			}
-			if (item->BottomLine)
-			{
-				PS_moveto(0, -item->height());
-				PS_lineto(item->width(), -item->height());
-			}
-			if (item->LeftLine)
-			{
-				PS_moveto(0, 0);
-				PS_lineto(0, -item->height());
-			}
-			putColor(item->lineColor(), item->lineShade(), false);
-		}
-		PS_restore();
-	}
 	return success;
 }
 
@@ -5405,56 +5146,6 @@
 			ProcessItem(Doc, pg, embedded, argh, sep, farb, ic, gcr, master, true);
 			PS_restore();
 		}
-		for (int em = 0; em < emG.count(); ++em)
-		{
-			int h, s, v, k;
-			PageItem* item = emG.at(em);
-			if (!item->isTableItem)
-				continue;
-			if ((item->lineColor() == CommonStrings::None) || (item->lineWidth() == 0.0))
-				continue;
-			PS_save();
-			PS_translate(x + hl->glyph.xoffset + item->gXpos * (cstyle.scaleH() / 1000.0), (y + hl->glyph.yoffset - (item->gHeight * (cstyle.scaleV() / 1000.0)) + item->gYpos * (cstyle.scaleV() / 1000.0)) * -1);
-			if (cstyle.baselineOffset() != 0)
-				PS_translate(0, -item->gHeight * (cstyle.baselineOffset() / 1000.0));
-			PS_scale(cstyle.scaleH() / 1000.0, cstyle.scaleV() / 1000.0);
-			PS_rotate(item->rotation());
-			double pws = item->m_lineWidth;
-			if (item->lineColor() != CommonStrings::None)
-			{
-				SetColor(item->lineColor(), item->lineShade(), &h, &s, &v, &k, gcr);
-				PS_setcmykcolor_stroke(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
-			}
-			PS_setlinewidth(item->lineWidth());
-			PS_setcapjoin(Qt::SquareCap, item->PLineJoin);
-			PS_setdash(item->PLineArt, item->DashOffset, item->DashValues);
-			if ((item->TopLine) || (item->RightLine) || (item->BottomLine) || (item->LeftLine))
-			{
-				if (item->TopLine)
-				{
-					PS_moveto(0, 0);
-					PS_lineto(item->width(), 0);
-				}
-				if (item->RightLine)
-				{
-					PS_moveto(item->width(), 0);
-					PS_lineto(item->width(), -item->height());
-				}
-				if (item->BottomLine)
-				{
-					PS_moveto(0, -item->height());
-					PS_lineto(item->width(), -item->height());
-				}
-				if (item->LeftLine)
-				{
-					PS_moveto(0, 0);
-					PS_lineto(0, -item->height());
-				}
-				putColor(item->lineColor(), item->lineShade(), false);
-			}
-			PS_restore();
-			item->m_lineWidth = pws;
-		}
 		return;
 	}
 

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput.cpp Thu Apr  5 19:47:56 2012
@@ -155,58 +155,6 @@
 			currItem->BoundingY = OldBY;
 		}
 	}
-	for (uint a = 0; a < pageFromMasterCount; ++a)
-	{
-		currItem = page->FromMaster.at(a);
-		if (currItem->LayerID != layer.ID)
-			continue;
-		if (!currItem->isTableItem)
-			continue;
-		if ((currItem->OwnPage != -1) && (currItem->OwnPage != static_cast<int>(Mp->pageNr())))
-			continue;
-		double OldX = currItem->xPos();
-		double OldY = currItem->yPos();
-		double OldBX = currItem->BoundingX;
-		double OldBY = currItem->BoundingY;
-		if (!currItem->ChangedMasterItem)
-		{
-			currItem->setXPos(OldX - Mp->xOffset() + page->xOffset(), true);
-			currItem->setYPos(OldY - Mp->yOffset() + page->yOffset(), true);
-			currItem->BoundingX = OldBX - Mp->xOffset() + page->xOffset();
-			currItem->BoundingY = OldBY - Mp->yOffset() + page->yOffset();
-		}
-		QRect oldR(currItem->getRedrawBounding(1.0));
-		if (clip.intersects(oldR))
-		{
-			painter->save();
-			painter->translate(currItem->xPos(), currItem->yPos());
-			painter->rotate(currItem->rotation());
-			if (currItem->lineColor() != CommonStrings::None)
-			{
-				ScColorShade tmp( m_doc->PageColors[currItem->lineColor()], (int) currItem->lineShade());
-				if ((currItem->TopLine) || (currItem->RightLine) || (currItem->BottomLine) || (currItem->LeftLine))
-				{
-					painter->setPen(tmp, currItem->lineWidth(), currItem->PLineArt, Qt::SquareCap, currItem->PLineJoin);
-					if (currItem->TopLine)
-						painter->drawLine(FPoint(0.0, 0.0), FPoint(currItem->width(), 0.0));
-					if (currItem->RightLine)
-						painter->drawLine(FPoint(currItem->width(), 0.0), FPoint(currItem->width(), currItem->height()));
-					if (currItem->BottomLine)
-						painter->drawLine(FPoint(currItem->width(), currItem->height()), FPoint(0.0, currItem->height()));
-					if (currItem->LeftLine)
-						painter->drawLine(FPoint(0.0, currItem->height()), FPoint(0.0, 0.0));
-				}
-			}
-			painter->restore();
-		}
-		if (!currItem->ChangedMasterItem)
-		{
-			currItem->setXPos(OldX, true);
-			currItem->setYPos(OldY, true);
-			currItem->BoundingX = OldBX;
-			currItem->BoundingY = OldBY;
-		}
-	}
 }
 
 void ScPageOutput::drawPageItems(ScPainterExBase *painter, ScPage *page, ScLayer& layer, const QRect& clip)
@@ -235,38 +183,6 @@
 		if (clip.intersects(oldR))
 		{
 			drawItem( currItem, painter, clip );
-		}
-	}
-	for (int it = 0; it < m_doc->Items->count(); ++it)
-	{
-		currItem = m_doc->Items->at(it);
-		if (currItem->LayerID != layer.ID)
-			continue;
-		if (!currItem->isTableItem)
-			continue;
-		QRect oldR(currItem->getRedrawBounding(1.0));
-		if (clip.intersects(oldR))
-		{
-			painter->save();
-			painter->translate(currItem->xPos(), currItem->yPos());
-			painter->rotate(currItem->rotation());
-			if (currItem->lineColor() != CommonStrings::None)
-			{
-				ScColorShade tmp( m_doc->PageColors[currItem->lineColor()], (int) currItem->lineShade() );
-				if ((currItem->TopLine) || (currItem->RightLine) || (currItem->BottomLine) || (currItem->LeftLine))
-				{
-					painter->setPen(tmp, currItem->lineWidth(), currItem->PLineArt, Qt::SquareCap, currItem->PLineJoin);
-					if (currItem->TopLine)
-						painter->drawLine(FPoint(0.0, 0.0), FPoint(currItem->width(), 0.0));
-					if (currItem->RightLine)
-						painter->drawLine(FPoint(currItem->width(), 0.0), FPoint(currItem->width(), currItem->height()));
-					if (currItem->BottomLine)
-						painter->drawLine(FPoint(currItem->width(), currItem->height()), FPoint(0.0, currItem->height()));
-					if (currItem->LeftLine)
-						painter->drawLine(FPoint(0.0, currItem->height()), FPoint(0.0, 0.0));
-				}
-			}
-			painter->restore();
 		}
 	}
 }
@@ -493,83 +409,80 @@
 			}
 			else
 				painter->setLineWidth(0);
-			if (!item->isTableItem)
-			{
-				if ((item->itemType() == PageItem::LatexFrame) || (item->itemType() == PageItem::ImageFrame) || (item->itemType() == PageItem::OSGFrame))
-					painter->setupPolygon(&item->PoLine);
-				if (item->NamedLStyle.isEmpty())
+			if ((item->itemType() == PageItem::LatexFrame) || (item->itemType() == PageItem::ImageFrame) || (item->itemType() == PageItem::OSGFrame))
+				painter->setupPolygon(&item->PoLine);
+			if (item->NamedLStyle.isEmpty())
+			{
+				QString patternStrokeVal = item->strokePattern();
+				if ((!patternStrokeVal.isEmpty()) && (m_doc->docPatterns.contains(patternStrokeVal)))
 				{
-					QString patternStrokeVal = item->strokePattern();
-					if ((!patternStrokeVal.isEmpty()) && (m_doc->docPatterns.contains(patternStrokeVal)))
+					if (item->patternStrokePath)
 					{
-						if (item->patternStrokePath)
-						{
-							QPainterPath guidePath = item->PoLine.toQPainterPath(false);
-							drawStrokePattern(item, painter, guidePath);
-						}
-						else
-						{
-							painter->setPattern(&m_doc->docPatterns[patternStrokeVal], item->patternStrokeScaleX, item->patternStrokeScaleY, item->patternStrokeOffsetX, item->patternStrokeOffsetY, item->patternStrokeRotation, item->patternStrokeSkewX, item->patternStrokeSkewY, item->patternStrokeMirrorX, item->patternStrokeMirrorY);
-							painter->setStrokeMode(ScPainterExBase::Pattern);
-							painter->strokePath();
-						}
+						QPainterPath guidePath = item->PoLine.toQPainterPath(false);
+						drawStrokePattern(item, painter, guidePath);
 					}
-					else if (item->strokeGradientType() > 0)
+					else
 					{
-						QString gradientStrokeVal = item->strokeGradient();
-						if ((!gradientStrokeVal.isEmpty()) && (!m_doc->docGradients.contains(gradientStrokeVal)))
-							gradientStrokeVal = "";
-						if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
-							painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
-						if (painter->m_strokeGradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
-						{
-							if (item->lineColor() != CommonStrings::None)
-							{
-								ScColorShade strokeColor(m_doc->PageColors[item->lineColor()], item->lineShade());
-								painter->setBrush(strokeColor);
-								painter->setStrokeMode(ScPainterExBase::Solid);
-							}
-							else
-								painter->setStrokeMode(ScPainterExBase::None);
-						}
-						else
-						{
-							FPoint fpStart(item->GrStrokeStartX, item->GrStrokeStartY);
-							FPoint fpEnd(item->GrStrokeEndX, item->GrStrokeEndY);
-							FPoint fpFocal(item->GrStrokeFocalX, item->GrStrokeFocalY);
-							painter->setStrokeMode(ScPainterExBase::Gradient);
-							painter->m_strokeGradient = VGradientEx(item->stroke_gradient, *m_doc);
-							if (item->GrTypeStroke == 6)
-								painter->setGradient(VGradientEx::linear, fpStart, fpEnd, fpStart, item->GrStrokeScale, item->GrStrokeSkew);
-							else
-								painter->setGradient(VGradientEx::radial, fpStart, fpEnd, fpFocal, item->GrStrokeScale, item->GrStrokeSkew);
-						}
-						painter->strokePath();
-					}
-					else if (item->lineColor() != CommonStrings::None)
-					{
-						ScColorShade scColor(m_doc->PageColors[item->lineColor()], item->lineShade());
-						painter->setStrokeMode(ScPainterExBase::Solid);
-						painter->setPen(scColor, item->lineWidth(), item->PLineArt, item->PLineEnd, item->PLineJoin);
-						if (item->DashValues.count() != 0)
-							painter->setDash(item->DashValues, item->DashOffset);
+						painter->setPattern(&m_doc->docPatterns[patternStrokeVal], item->patternStrokeScaleX, item->patternStrokeScaleY, item->patternStrokeOffsetX, item->patternStrokeOffsetY, item->patternStrokeRotation, item->patternStrokeSkewX, item->patternStrokeSkewY, item->patternStrokeMirrorX, item->patternStrokeMirrorY);
+						painter->setStrokeMode(ScPainterExBase::Pattern);
 						painter->strokePath();
 					}
 				}
-				else
+				else if (item->strokeGradientType() > 0)
 				{
-					multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
-					for (int it = ml.size()-1; it > -1; it--)
+					QString gradientStrokeVal = item->strokeGradient();
+					if ((!gradientStrokeVal.isEmpty()) && (!m_doc->docGradients.contains(gradientStrokeVal)))
+						gradientStrokeVal = "";
+					if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
+						painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
+					if (painter->m_strokeGradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 					{
-						const SingleLine& sl = ml[it];
-						if ((sl.Color != CommonStrings::None) && (sl.Width != 0))
+						if (item->lineColor() != CommonStrings::None)
 						{
-							ScColorShade tmp(m_doc->PageColors[sl.Color], sl.Shade);
-							painter->setPen(tmp, sl.Width, static_cast<Qt::PenStyle>(sl.Dash),
-									static_cast<Qt::PenCapStyle>(sl.LineEnd),
-									static_cast<Qt::PenJoinStyle>(sl.LineJoin));
-							painter->strokePath();
+							ScColorShade strokeColor(m_doc->PageColors[item->lineColor()], item->lineShade());
+							painter->setBrush(strokeColor);
+							painter->setStrokeMode(ScPainterExBase::Solid);
 						}
+						else
+							painter->setStrokeMode(ScPainterExBase::None);
+					}
+					else
+					{
+						FPoint fpStart(item->GrStrokeStartX, item->GrStrokeStartY);
+						FPoint fpEnd(item->GrStrokeEndX, item->GrStrokeEndY);
+						FPoint fpFocal(item->GrStrokeFocalX, item->GrStrokeFocalY);
+						painter->setStrokeMode(ScPainterExBase::Gradient);
+						painter->m_strokeGradient = VGradientEx(item->stroke_gradient, *m_doc);
+						if (item->GrTypeStroke == 6)
+							painter->setGradient(VGradientEx::linear, fpStart, fpEnd, fpStart, item->GrStrokeScale, item->GrStrokeSkew);
+						else
+							painter->setGradient(VGradientEx::radial, fpStart, fpEnd, fpFocal, item->GrStrokeScale, item->GrStrokeSkew);
+					}
+					painter->strokePath();
+				}
+				else if (item->lineColor() != CommonStrings::None)
+				{
+					ScColorShade scColor(m_doc->PageColors[item->lineColor()], item->lineShade());
+					painter->setStrokeMode(ScPainterExBase::Solid);
+					painter->setPen(scColor, item->lineWidth(), item->PLineArt, item->PLineEnd, item->PLineJoin);
+					if (item->DashValues.count() != 0)
+						painter->setDash(item->DashValues, item->DashOffset);
+					painter->strokePath();
+				}
+			}
+			else
+			{
+				multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+				for (int it = ml.size()-1; it > -1; it--)
+				{
+					const SingleLine& sl = ml[it];
+					if ((sl.Color != CommonStrings::None) && (sl.Width != 0))
+					{
+						ScColorShade tmp(m_doc->PageColors[sl.Color], sl.Shade);
+						painter->setPen(tmp, sl.Width, static_cast<Qt::PenStyle>(sl.Dash),
+										static_cast<Qt::PenCapStyle>(sl.LineEnd),
+										static_cast<Qt::PenJoinStyle>(sl.LineJoin));
+						painter->strokePath();
 					}
 				}
 			}
@@ -787,47 +700,6 @@
 		p->restore();
 		embedded->m_lineWidth = pws;
 	}
-	for (int em = 0; em < emG.count(); ++em)
-	{
-		PageItem* embedded = emG.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		p->save();
-		double x = embedded->xPos();
-		double y = embedded->yPos();
-		embedded->setXPos(embedded->gXpos, true);
-		embedded->setYPos ((embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos, true);
-		p->translate((embedded->gXpos * (style.scaleH() / 1000.0)), ( - (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos * (style.scaleV() / 1000.0)));
-		if (style.baselineOffset() != 0)
-		{
-			p->translate(0, -embedded->gHeight * (style.baselineOffset() / 1000.0));
-			embedded->setYPos(embedded->yPos() - embedded->gHeight * (style.baselineOffset() / 1000.0));
-		}
-		p->scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-		p->rotate(embedded->rotation());
-		double pws = embedded->m_lineWidth;
-		embedded->m_lineWidth = pws * qMin(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
-		if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-		{
-			ScColorShade colorShade(m_doc->PageColors[embedded->lineColor()], embedded->lineShade());
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				p->setPen(colorShade, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-				if (embedded->TopLine)
-					p->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-				if (embedded->RightLine)
-					p->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-				if (embedded->BottomLine)
-					p->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-				if (embedded->LeftLine)
-					p->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-			}
-		}
-		embedded->m_lineWidth = pws;
-		embedded->setXPos(x, true);
-		embedded->setYPos(y, true);
-		p->restore();
-	}
 }
 
 void ScPageOutput::drawPattern( PageItem* item, ScPainterExBase* painter, const QRect& clip)
@@ -997,35 +869,6 @@
 		embedded->isEmbedded = true;
 		embedded->invalidateLayout();
 		drawItem(embedded, painter, QRect());
-		embedded->isEmbedded = false;
-		painter->restore();
-	}
-	for (int em = 0; em < item->groupItemList.count(); ++em)
-	{
-		PageItem* embedded = item->groupItemList.at(em);
-		if (!embedded->isTableItem)
-			continue;
-		painter->save();
-		painter->translate(embedded->gXpos, embedded->gYpos);
-		painter->rotate(embedded->rotation());
-		embedded->isEmbedded = true;
-		embedded->invalidateLayout();
-		if ((embedded->lineColor() != CommonStrings::None) && (embedded->lineWidth() != 0.0))
-		{
-			if ((embedded->TopLine) || (embedded->RightLine) || (embedded->BottomLine) || (embedded->LeftLine))
-			{
-				ScColorShade colorShade(m_doc->PageColors[embedded->lineColor()], embedded->lineShade());
-				painter->setPen(colorShade, embedded->lineWidth(), embedded->PLineArt, Qt::SquareCap, embedded->PLineJoin);
-				if (embedded->TopLine)
-					painter->drawLine(FPoint(0.0, 0.0), FPoint(embedded->width(), 0.0));
-				if (embedded->RightLine)
-					painter->drawLine(FPoint(embedded->width(), 0.0), FPoint(embedded->width(), embedded->height()));
-				if (embedded->BottomLine)
-					painter->drawLine(FPoint(embedded->width(), embedded->height()), FPoint(0.0, embedded->height()));
-				if (embedded->LeftLine)
-					painter->drawLine(FPoint(0.0, embedded->height()), FPoint(0.0, 0.0));
-			}
-		}
 		embedded->isEmbedded = false;
 		painter->restore();
 	}

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Apr  5 19:47:56 2012
@@ -2642,7 +2642,7 @@
 	scrActions["itemDetachTextFromPath"]->setEnabled(false);
 	charPalette->setEnabled(false, 0);
 	scrActions["itemUpdateImage"]->setEnabled(SelectedType==PageItem::ImageFrame && (currItem->PictureIsAvailable || currItem->asLatexFrame()));
-	scrActions["itemAdjustFrameToImage"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable && !currItem->isTableItem);
+	scrActions["itemAdjustFrameToImage"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable);
 	scrActions["itemAdjustImageToFrame"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable);
 	scrActions["itemExtendedImageProperties"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable && currItem->pixm.imgInfo.valid);
 	scrActions["itemToggleInlineImage"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable);
@@ -2770,7 +2770,7 @@
 		scrActions["itemConvertToBezierCurve"]->setEnabled(false);
 		scrActions["itemConvertToImageFrame"]->setEnabled(false);
 		scrActions["itemConvertToOutlines"]->setEnabled(false);
-		scrActions["itemConvertToPolygon"]->setEnabled(!currItem->isTableItem && doc->appMode != modeEdit);
+		scrActions["itemConvertToPolygon"]->setEnabled(doc->appMode != modeEdit);
 		scrActions["itemConvertToTextFrame"]->setEnabled(doc->appMode != modeEdit);
 		scrActions["toolsUnlinkTextFrame"]->setEnabled(false);
 		scrActions["toolsLinkTextFrame"]->setEnabled(false);
@@ -2823,8 +2823,8 @@
 //		scrMenuMgr->setMenuEnabled("ItemConvertTo", true);
 		scrActions["itemConvertToBezierCurve"]->setEnabled(false);
 		scrActions["itemConvertToImageFrame"]->setEnabled(doc->appMode != modeEdit);
-		scrActions["itemConvertToOutlines"]->setEnabled(!currItem->isTableItem && doc->appMode != modeEdit);
-		scrActions["itemConvertToPolygon"]->setEnabled(!currItem->isTableItem && doc->appMode != modeEdit);
+		scrActions["itemConvertToOutlines"]->setEnabled(doc->appMode != modeEdit);
+		scrActions["itemConvertToPolygon"]->setEnabled(doc->appMode != modeEdit);
 		scrActions["itemConvertToTextFrame"]->setEnabled(false);
 
 		scrActions["toolsRotate"]->setEnabled(true);
@@ -3148,15 +3148,15 @@
 			scrActions["itemRaise"]->setEnabled(false);
 			scrActions["itemLower"]->setEnabled(false);
 //			scrActions["itemSendToScrapbook"]->setEnabled(!(currItem->isTableItem && currItem->isSingleSel));
-			scrMenuMgr->setMenuEnabled("itemSendToScrapbook", !(currItem->isTableItem && currItem->isSingleSel));
-			scrActions["itemSendToPattern"]->setEnabled(!(currItem->isTableItem && currItem->isSingleSel));
+			scrMenuMgr->setMenuEnabled("itemSendToScrapbook", true);
+			scrActions["itemSendToPattern"]->setEnabled(true);
 			scrActions["editCut"]->setEnabled(false);
 			scrActions["editClearContents"]->setEnabled(false);
 			scrActions["toolsRotate"]->setEnabled(false);
 		}
 		else
 		{
-			bool setter=!(currItem->isSingleSel && (currItem->isTableItem  || currItem->isGroup()));
+			bool setter = !currItem->isGroup();
 			scrMenuMgr->setMenuEnabled("ItemLevel", setter);
 			scrActions["itemDuplicate"]->setEnabled(setter);
 			scrActions["itemMulDuplicate"]->setEnabled(setter);
@@ -4965,7 +4965,7 @@
 		}
 		else
 		{
-			if (((currItem->isSingleSel) && (currItem->isGroup())) || ((currItem->isSingleSel) && (currItem->isTableItem)))
+			if ((currItem->isSingleSel) && (currItem->isGroup()))
 				return;
 			ScriXmlDoc ss;
 			QString BufferS = ss.WriteElem(doc, doc->m_Selection);
@@ -5034,7 +5034,7 @@
 		}
 		else
 		{
-			if (((currItem->isSingleSel) && (currItem->isGroup())) || ((currItem->isSingleSel) && (currItem->isTableItem)))
+			if ((currItem->isSingleSel) && (currItem->isGroup()))
 				return;
 			ScriXmlDoc ss;
 			QString BufferS = ss.WriteElem(doc, doc->m_Selection);
@@ -8979,11 +8979,7 @@
 	{
 		int itemNr = doc->getItemNrfromUniqueID(state->getUInt(QString("item%1").arg(i)));
 		if (doc->Items->at(itemNr)->uniqueNr == state->getUInt(QString("item%1").arg(i)))
-		{
-			if (isUndo)
-				doc->Items->at(itemNr)->isTableItem = static_cast<bool>(state->getInt(QString("tableitem%1").arg(i)));
 			view->SelectItemNr(itemNr);
-		}
 	}
 	if (isUndo)
 		GroupObj(false);

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Thu Apr  5 19:47:56 2012
@@ -195,6 +195,7 @@
 	automaticTextFrames(0),
 	m_masterPageMode(false),
 	m_symbolEditMode(false),
+	m_inlineEditMode(false),
 	m_ScMW(0),
 	m_View(0),
 	m_guardedObject(this),
@@ -287,6 +288,7 @@
 	automaticTextFrames(pagesSetup.autoTextFrames),
 	m_masterPageMode(false),
 	m_symbolEditMode(false),
+	m_inlineEditMode(false),
 	m_ScMW(0),
 	m_View(0),
 	m_guardedObject(this),
@@ -1828,8 +1830,6 @@
 		int itemNr = getItemNrfromUniqueID(state->getUInt(QString("item%1").arg(i)));
 		if (Items->at(itemNr)->uniqueNr == state->getUInt(QString("item%1").arg(i)))
 		{
-			if (isUndo)
-				Items->at(itemNr)->isTableItem = static_cast<bool>(state->getInt(QString("tableitem%1").arg(i)));
 			tmpSelection.addItem(Items->at(itemNr));
 		}
 	}
@@ -6933,8 +6933,6 @@
 		for (int c = 0; c < docSelectionCount; ++c)
 		{
 			currItem = m_Selection->itemAt(c);
-			if (currItem->isTableItem && currItem->isSingleSel)
-				return;
 			int id = itemList->indexOf(currItem);
 			low = qMin(id, low);
 			high = qMax(id, high);
@@ -7000,8 +6998,6 @@
 		for (int c = 0; c < docSelectionCount; ++c)
 		{
 			currItem = m_Selection->itemAt(c);
-			if (currItem->isTableItem && currItem->isSingleSel)
-				return;
 			int id = itemList->indexOf(currItem);
 			low = qMin(id, low);
 			high = qMax(id, high);
@@ -10350,7 +10346,7 @@
 	for (uint de = 0; de < selectedItemCount; ++de)
 	{
 		currItem = itemSelection->itemAt(offs);
-		if ((((currItem->isSingleSel) && (!Items->contains(currItem))) || ((currItem->isSingleSel) && (currItem->isTableItem))) || (currItem->locked()))
+		if (((currItem->isSingleSel) && (!Items->contains(currItem))) || (currItem->locked()))
 		{
 			if (currItem->locked())
 			{
@@ -13506,7 +13502,7 @@
 		{
 #ifndef NLS_PROTO
 //			bb->setFontSize(qMax(qRound(bb->fontSize()*((scx+scy)/2)), 1));
-			if ((bb->itemText.length() != 0) && (!bb->isTableItem))
+			if (bb->itemText.length() != 0)
 			{
 //				bb->setLineSpacing(((bb->fontSize() / 10.0) * static_cast<double>(Doc->typographicSettings.autoLineSpacing) / 100));
 				for (aa = 0; aa < bb->itemText.length(); ++aa)
@@ -14290,7 +14286,7 @@
 			PageItem *currItem = itemSelection->itemAt(i);
 			if (currItem!=NULL)
 			{
-				if (currItem->asImageFrame() && currItem->PictureIsAvailable && !currItem->isTableItem)
+				if (currItem->asImageFrame() && currItem->PictureIsAvailable)
 				{
 					if (!activeTransaction)
 						activeTransaction = new UndoTransaction(undoManager->beginTransaction(selectedItemCount == 1 ?
@@ -14340,7 +14336,7 @@
 			PageItem *currItem = itemSelection->itemAt(i);
 			if (currItem!=NULL)
 			{
-				if (currItem->asImageFrame() && currItem->PictureIsAvailable && !currItem->isTableItem)
+				if (currItem->asImageFrame() && currItem->PictureIsAvailable)
 					currItem->setImageScalingMode(false, true);
 			}
 		}

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Thu Apr  5 19:47:56 2012
@@ -3315,7 +3315,7 @@
 		{
 			PageItem *currItem = tmpSelection.itemAt(offset);
 			bool cont=false;
-			if ((!((currItem->asTextFrame()) || (currItem->asPathText()))) || (currItem->isTableItem && currItem->isSingleSel) || (currItem->locked()) || currItem->itemText.length() == 0)
+			if ((!((currItem->asTextFrame()) || (currItem->asPathText()))) || (currItem->locked()) || currItem->itemText.length() == 0)
 				cont=true;
 			if (currItem==m_ScMW->storyEditor->currentItem() && Doc==m_ScMW->storyEditor->currentDocument())
 			{

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Thu Apr  5 19:47:56 2012
@@ -255,8 +255,7 @@
 		{
 			if (currItem->PictureIsAvailable)
 			{
-				if (!currItem->isTableItem)
-					m_AP->scrActions["itemAdjustFrameToImage"]->setEnabled(true);
+				m_AP->scrActions["itemAdjustFrameToImage"]->setEnabled(true);
 				m_AP->scrActions["itemAdjustImageToFrame"]->setEnabled(true);
 				if (currItem->pixm.imgInfo.valid)
 					m_AP->scrActions["itemExtendedImageProperties"]->setEnabled(true);
@@ -357,17 +356,14 @@
 	//<-- Add Level Item
 	if (!currItem->locked())
 	{
-		if ((!currItem->isTableItem) && (!currItem->isSingleSel))
-		{
-			menuLevel->addAction(m_AP->scrActions["itemRaiseToTop"]);
-			menuLevel->addAction(m_AP->scrActions["itemRaise"]);
-			menuLevel->addAction(m_AP->scrActions["itemLower"]);
-			menuLevel->addAction(m_AP->scrActions["itemLowerToBottom"]);
-			if (menuLevel->actions().count()>0)
-			{
-				QAction *act = addMenu(menuLevel);
-				act->setText( ScribusView::tr("Le&vel"));
-			}
+		menuLevel->addAction(m_AP->scrActions["itemRaiseToTop"]);
+		menuLevel->addAction(m_AP->scrActions["itemRaise"]);
+		menuLevel->addAction(m_AP->scrActions["itemLower"]);
+		menuLevel->addAction(m_AP->scrActions["itemLowerToBottom"]);
+		if (menuLevel->actions().count()>0)
+		{
+			QAction *act = addMenu(menuLevel);
+			act->setText( ScribusView::tr("Le&vel"));
 		}
 	}
 	//-->

Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Thu Apr  5 19:47:56 2012
@@ -66,8 +66,6 @@
 	lineStyles->setItemDelegate(new LineFormatItemDelegate);
 	lineStyles->addItem( "No Style" );
 
-	tableLineLayout->setAlignment( Qt::AlignTop );
-
 	languageChange();
 
 	connect(lineWidth     , SIGNAL(valueChanged(double)), this, SLOT(handleLineWidth()));
@@ -76,17 +74,11 @@
 	connect(lineEndStyle , SIGNAL(activated(int))      , this, SLOT(handleLineEnd()));
 	connect(lineMode  , SIGNAL(activated(int))      , this, SLOT(handleLineMode()));
 	connect(dashEditor, SIGNAL(dashChanged())       , this, SLOT(handleDashChange()));
-	connect(topLine   , SIGNAL(clicked())           , this, SLOT(handleTLines()));
-	connect(leftLine  , SIGNAL(clicked())           , this, SLOT(handleTLines()));
-	connect(rightLine , SIGNAL(clicked())           , this, SLOT(handleTLines()));
-	connect(bottomLine, SIGNAL(clicked())           , this, SLOT(handleTLines()));
 	connect(startArrow, SIGNAL(activated(int))      , this, SLOT(handleStartArrow(int )));
 	connect(endArrow  , SIGNAL(activated(int))      , this, SLOT(handleEndArrow(int )));
 	connect(startArrowScale, SIGNAL(valueChanged(int)), this, SLOT(handleStartArrowScale(int )));
 	connect(endArrowScale  , SIGNAL(valueChanged(int)), this, SLOT(handleEndArrowScale(int )));
 	connect(lineStyles, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(handleLineStyle(QListWidgetItem*)));
-
-	stackedWidget->setCurrentIndex(0);
 }
 
 void PropertiesPalette_Line::changeEvent(QEvent *e)
@@ -330,20 +322,7 @@
 	endArrowScale->blockSignals(false);
 	lineMode->blockSignals(false);
 
-	if ((m_item->isTableItem) && (m_item->isSingleSel))
-	{
-		setter = true;
-		stackedWidget->setCurrentIndex(1);
-		topLine->setChecked(m_item->TopLine);
-		leftLine->setChecked(m_item->LeftLine);
-		rightLine->setChecked(m_item->RightLine);
-		bottomLine->setChecked(m_item->BottomLine);
-	}
-	else
-	{
-		setter = false;
-		stackedWidget->setCurrentIndex(0);
-	}
+	setter = false;
 
 	if ((m_item->isGroup()) && (!m_item->isSingleSel))
 	{
@@ -607,18 +586,6 @@
 	emit lineModeChanged(lineMode->currentIndex());
 }
 
-void PropertiesPalette_Line::handleTLines()
-{
-	if ((m_haveDoc) && (m_haveItem))
-	{
-		m_item->TopLine    = topLine->isChecked();
-		m_item->LeftLine   = leftLine->isChecked();
-		m_item->RightLine  = rightLine->isChecked();
-		m_item->BottomLine = bottomLine->isChecked();
-		m_item->update();
-	}
-}
-
 void PropertiesPalette_Line::handleStartArrow(int id)
 {
 	if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
@@ -719,12 +686,6 @@
 	lineEndStyle->setCurrentIndex(oldLEndStyle);
 	lineEndLabel->setText( tr("&Endings:"));
 
-	tableLineGroup->setTitle( tr("Cell Lines"));
-	topLine->setText( tr("Line at Top"));
-	leftLine->setText( tr("Line at the Left"));
-	rightLine->setText( tr("Line at the Right "));
-	bottomLine->setText( tr("Line at Bottom"));
-
 	QString pctSuffix = tr(" %");
 	startArrowScale->setSuffix(pctSuffix);
 	endArrowScale->setSuffix(pctSuffix);

Modified: trunk/Scribus/scribus/ui/propertiespalette_line.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/ui/propertiespalette_line.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.h Thu Apr  5 19:47:56 2012
@@ -76,7 +76,6 @@
 	void handleLineEnd();
 	void handleLineMode();
 	void handleDashChange();
-	void handleTLines();
 	void handleStartArrow(int id);
 	void handleEndArrow(int id);
 	void handleStartArrowScale(int sc);

Modified: trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_linebase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_linebase.ui Thu Apr  5 19:47:56 2012
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>300</width>
-    <height>400</height>
+    <width>252</width>
+    <height>421</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,6 +21,9 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="2" colspan="2">
+    <widget class="ScComboBox" name="lineMode"/>
+   </item>
    <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="lineTypeLabel">
      <property name="text">
@@ -28,15 +31,44 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="1" column="2" colspan="2">
+    <widget class="LineCombo" name="lineType"/>
+   </item>
+   <item row="2" column="0" colspan="4">
+    <widget class="DashEditor" name="dashEditor">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
     <widget class="QLabel" name="startArrowLabel">
      <property name="text">
       <string>Start Arrow:</string>
      </property>
     </widget>
    </item>
+   <item row="3" column="2">
+    <widget class="QLabel" name="endArrowLabel">
+     <property name="text">
+      <string>End Arrow:</string>
+     </property>
+    </widget>
+   </item>
    <item row="4" column="0" colspan="2">
     <widget class="ArrowChooser" name="startArrow"/>
+   </item>
+   <item row="4" column="2" colspan="2">
+    <widget class="ArrowChooser" name="endArrow"/>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="startArrowScaleLabel">
@@ -55,6 +87,13 @@
      </property>
     </widget>
    </item>
+   <item row="5" column="2">
+    <widget class="QLabel" name="endArrowScaleLabel">
+     <property name="text">
+      <string>Scaling:</string>
+     </property>
+    </widget>
+   </item>
    <item row="5" column="3">
     <widget class="QSpinBox" name="endArrowScale">
      <property name="minimum">
@@ -62,29 +101,6 @@
      </property>
      <property name="maximum">
       <number>300</number>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="2">
-    <widget class="QLabel" name="endArrowScaleLabel">
-     <property name="text">
-      <string>Scaling:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2" colspan="2">
-    <widget class="ArrowChooser" name="endArrow"/>
-   </item>
-   <item row="1" column="2" colspan="2">
-    <widget class="LineCombo" name="lineType"/>
-   </item>
-   <item row="0" column="2" colspan="2">
-    <widget class="ScComboBox" name="lineMode"/>
-   </item>
-   <item row="3" column="2" colspan="2">
-    <widget class="QLabel" name="endArrowLabel">
-     <property name="text">
-      <string>End Arrow:</string>
      </property>
     </widget>
    </item>
@@ -105,7 +121,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="7" column="0">
     <widget class="QLabel" name="lineJoinLabel">
      <property name="text">
       <string>Ed&ges:</string>
@@ -115,7 +131,7 @@
    <item row="7" column="2" colspan="2">
     <widget class="ScComboBox" name="lineJoinStyle"/>
    </item>
-   <item row="8" column="0" colspan="2">
+   <item row="8" column="0">
     <widget class="QLabel" name="lineEndLabel">
      <property name="text">
       <string>&Endings:</string>
@@ -126,106 +142,7 @@
     <widget class="ScComboBox" name="lineEndStyle"/>
    </item>
    <item row="9" column="0" colspan="4">
-    <widget class="QStackedWidget" name="stackedWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="page">
-      <layout class="QVBoxLayout" name="lineStyleLayout">
-       <property name="spacing">
-        <number>2</number>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QListWidget" name="lineStyles"/>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="page_2">
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <property name="spacing">
-        <number>2</number>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="tableLineGroup">
-         <property name="title">
-          <string>Cell Lines</string>
-         </property>
-         <layout class="QVBoxLayout" name="tableLineLayout">
-          <item>
-           <widget class="QCheckBox" name="leftLine">
-            <property name="text">
-             <string>Line at the Left</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="rightLine">
-            <property name="text">
-             <string>Line at the Right</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="bottomLine">
-            <property name="text">
-             <string>Line at the Bottom</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="topLine">
-            <property name="text">
-             <string>Line at the Top</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="verticalSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="4">
-    <widget class="DashEditor" name="dashEditor">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-    </widget>
+    <widget class="QListWidget" name="lineStyles"/>
    </item>
   </layout>
  </widget>

Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17418&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Thu Apr  5 19:47:56 2012
@@ -345,11 +345,6 @@
 	connect(rotationSpin, SIGNAL(valueChanged(double)), this, SLOT(handleRotation()));
 
 	bool setter = false;
-	if ((m_item->isTableItem) && (m_item->isSingleSel))
-	{
-		setter = true;
-		rotationSpin->setEnabled(false);
-	}
 	xposSpin->setEnabled(!setter);
 	yposSpin->setEnabled(!setter);
 	bool haveSameParent = m_doc->m_Selection->objectsHaveSameParent();
@@ -372,7 +367,7 @@
 		widthLabel->setText( tr( "&Width" ) );
 		yposLabel->setText( tr( "&Y-Pos:" ) );
 		heightLabel->setText( tr( "&Height:" ) );
-		rotationSpin->setEnabled(!((m_item->isTableItem) && (m_item->isSingleSel)));
+		rotationSpin->setEnabled(true);
 	}
 	m_haveItem = true;
 	if (m_item->asLine())
@@ -884,54 +879,13 @@
 		}
 		else
 		{
-			if (m_item->isTableItem)
-			{
-				int rmo = m_doc->RotMode();
-				m_doc->RotMode ( 0 );
-				double dist = w - m_item->width();
-				PageItem* bb2;
-				PageItem* bb = m_item;
-				while (bb->TopLink != 0)
-				{
-					bb = bb->TopLink;
-				}
-				while (bb->BottomLink != 0)
-				{
-					bb2 = bb;
-					while (bb2->RightLink != 0)
-					{
-						m_doc->MoveRotated(bb2->RightLink, FPoint(dist, 0), true);
-						bb2 = bb2->RightLink;
-					}
-					m_doc->MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb, true);
-					bb = bb->BottomLink;
-				}
-				bb2 = bb;
-				while (bb2->RightLink != 0)
-				{
-					m_doc->MoveRotated(bb2->RightLink, FPoint(dist, 0), true);
-					bb2 = bb2->RightLink;
-				}
-				m_doc->MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb, true);
-				m_doc->RotMode ( rmo );
-				if (keepFrameWHRatioButton->isChecked())
-				{
-					keepFrameWHRatioButton->setChecked(false);
-					displayWH(w, (w / oldW) * m_item->height());
-					handleNewH();
-					keepFrameWHRatioButton->setChecked(true);
-				}
+			if (keepFrameWHRatioButton->isChecked())
+			{
+				displayWH(w, (w / oldW) * m_item->height());
+				m_doc->SizeItem(w, (w / oldW) * m_item->height(), m_item, true, true, false);
 			}
 			else
-			{
-				if (keepFrameWHRatioButton->isChecked())
-				{
-					displayWH(w, (w / oldW) * m_item->height());
-					m_doc->SizeItem(w, (w / oldW) * m_item->height(), m_item, true, true, false);
-				}
-				else
-					m_doc->SizeItem(w, m_item->height(), m_item, true, true, false);
-			}
+				m_doc->SizeItem(w, m_item->height(), m_item, true, true, false);
 		}
 		if (m_item->isArc())
 		{
@@ -1010,54 +964,13 @@
 			}
 			else
 			{
-				if (m_item->isTableItem)
+				if (keepFrameWHRatioButton->isChecked())
 				{
-					int rmo = m_doc->RotMode();
-					m_doc->RotMode ( 0 );
-					double dist = h - m_item->height();
-					PageItem* bb2;
-					PageItem* bb = m_item;
-					while (bb->LeftLink != 0)
-					{
-						bb = bb->LeftLink;
-					}
-					while (bb->RightLink != 0)
-					{
-						bb2 = bb;
-						while (bb2->BottomLink != 0)
-						{
-							m_doc->MoveRotated(bb2->BottomLink, FPoint(0, dist), true);
-							bb2 = bb2->BottomLink;
-						}
-						m_doc->MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb, true);
-						bb = bb->RightLink;
-					}
-					bb2 = bb;
-					while (bb2->BottomLink != 0)
-					{
-						m_doc->MoveRotated(bb2->BottomLink, FPoint(0, dist), true);
-						bb2 = bb2->BottomLink;
-					}
-					m_doc->MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb, true);
-					m_doc->RotMode ( rmo );
-					if (keepFrameWHRatioButton->isChecked())
-					{
-						keepFrameWHRatioButton->setChecked(false);
-						displayWH((h / oldH) * m_item->width(), h);
-						handleNewW();
-						keepFrameWHRatioButton->setChecked(true);
-					}
+					displayWH((h / oldH) * m_item->width(), h);
+					m_doc->SizeItem((h / oldH) * m_item->width(), h, m_item, true, true, false);
 				}
 				else
-				{
-					if (keepFrameWHRatioButton->isChecked())
-					{
-						displayWH((h / oldH) * m_item->width(), h);
-						m_doc->SizeItem((h / oldH) * m_item->width(), h, m_item, true, true, false);
-					}
-					else
-						m_doc->SizeItem(m_item->width(), h, m_item, true, true, false);
-				}
+					m_doc->SizeItem(m_item->width(), h, m_item, true, true, false);
 			}
 			if (m_item->isArc())
 			{




More information about the scribus-commit mailing list