diff options
-rw-r--r-- | scribus/canvasmode_edit.cpp | 4 | ||||
-rw-r--r-- | scribus/canvasmode_editgradient.cpp | 3 | ||||
-rw-r--r-- | scribus/canvasmode_nodeedit.cpp | 2 | ||||
-rw-r--r-- | scribus/pageitem_pathtext.cpp | 3 | ||||
-rw-r--r-- | scribus/plugins/fileloader/scribus134format/scribus134format.cpp | 14 | ||||
-rw-r--r-- | scribus/plugins/fileloader/scribus13format/scribus13format.cpp | 10 | ||||
-rw-r--r-- | scribus/scpageoutput.cpp | 12 | ||||
-rw-r--r-- | scribus/scpainterex_ps2.cpp | 17 |
8 files changed, 5 insertions, 60 deletions
diff --git a/scribus/canvasmode_edit.cpp b/scribus/canvasmode_edit.cpp index 213e305..72bbee3 100644 --- a/scribus/canvasmode_edit.cpp +++ b/scribus/canvasmode_edit.cpp @@ -594,8 +594,6 @@ void CanvasMode_Edit::mousePressEvent(QMouseEvent *m) const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos()); bool inText; - double Rxp = 0; - double Ryp = 0; PageItem *currItem; m_canvas->PaintSizeRect(QRect()); FPoint npf, npf2; @@ -609,8 +607,6 @@ void CanvasMode_Edit::mousePressEvent(QMouseEvent *m) m_view->registerMousePress(m->globalPos()); Mxp = mousePointDoc.x(); Myp = mousePointDoc.y(); - Ryp = Myp; - Rxp = Mxp; SeRx = Mxp; SeRy = Myp; if (m->button() == Qt::MidButton) diff --git a/scribus/canvasmode_editgradient.cpp b/scribus/canvasmode_editgradient.cpp index d7eb765..1ffe8b5 100644 --- a/scribus/canvasmode_editgradient.cpp +++ b/scribus/canvasmode_editgradient.cpp @@ -237,9 +237,8 @@ void CanvasMode_EditGradient::mousePressEvent(QMouseEvent *m) void CanvasMode_EditGradient::mouseReleaseEvent(QMouseEvent *m) { #ifdef GESTURE_FRAME_PREVIEW - clearPixmapCache(); + clearPixmapCache(); #endif // GESTURE_FRAME_PREVIEW - const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos()); m_canvas->m_viewMode.m_MouseButtonPressed = false; m_canvas->resetRenderMode(); m->accept(); diff --git a/scribus/canvasmode_nodeedit.cpp b/scribus/canvasmode_nodeedit.cpp index cbcec97..f2a80c3 100644 --- a/scribus/canvasmode_nodeedit.cpp +++ b/scribus/canvasmode_nodeedit.cpp @@ -1137,7 +1137,7 @@ bool CanvasMode_NodeEdit::handleNodeEditMove(QMouseEvent* m, QRect, PageItem* cu (m_doc->nodeEdit.submode == NodeEditContext::MOVE_POINT) || (m_doc->nodeEdit.submode == NodeEditContext::SPLIT_PATH && m_doc->nodeEdit.EdPoints)) { - FPoint mousePoint = m_canvas->globalToCanvas(m->globalPos()); + //FPoint mousePoint = m_canvas->globalToCanvas(m->globalPos()); for (uint poi=0; poi<Clip.size()-3; poi += 4) { // create bezier curve in canvas coords diff --git a/scribus/pageitem_pathtext.cpp b/scribus/pageitem_pathtext.cpp index 31b5dc2..524f8e7 100644 --- a/scribus/pageitem_pathtext.cpp +++ b/scribus/pageitem_pathtext.cpp @@ -77,13 +77,11 @@ void PageItem_PathText::DrawObj_Item(ScPainter *p, QRectF cullingArea, double sc firstChar = 0; MaxChars = 0; int a; - double chs; QString chstr; ScText *hl; double dx; FPoint point = FPoint(0, 0); FPoint tangent = FPoint(0, 0); - uint seg = 0; QColor tmp; CurX = Extra; QString cachedStroke = ""; @@ -176,7 +174,6 @@ void PageItem_PathText::DrawObj_Item(ScPainter *p, QRectF cullingArea, double sc if (chstr[0] == SpecialChars::PAGENUMBER || chstr[0] == SpecialChars::PARSEP || chstr[0] == SpecialChars::PAGECOUNT || chstr[0] == SpecialChars::TAB || chstr[0] == SpecialChars::LINEBREAK) continue; - chs = hl->fontSize(); if (a < itemText.length()-1) chstr += itemText.text(a+1, 1); hl->glyph.yadvance = 0; diff --git a/scribus/plugins/fileloader/scribus134format/scribus134format.cpp b/scribus/plugins/fileloader/scribus134format/scribus134format.cpp index ce76c8a..ce4a598 100644 --- a/scribus/plugins/fileloader/scribus134format/scribus134format.cpp +++ b/scribus/plugins/fileloader/scribus134format/scribus134format.cpp @@ -182,7 +182,6 @@ bool Scribus134Format::loadFile(const QString & fileName, const FileFormat & /* struct ScribusDoc::BookMa bok; int counter;//, Pgc; //bool AtFl; - bool newVersion = false; QString tmp, tmpf, PgNam, Defont; QMap<int,int> TableID; QList<PageItem*> TableItems; @@ -230,8 +229,6 @@ bool Scribus134Format::loadFile(const QString & fileName, const FileFormat & /* QDomElement elem=docu.documentElement(); if (elem.tagName() != "SCRIBUSUTF8NEW") return false; - if (elem.hasAttribute("Version")) - newVersion = true; QDomNode DOC=elem.firstChild(); if (m_mwProgressBar!=0) { @@ -2766,9 +2763,8 @@ bool Scribus134Format::loadPage(const QString & fileName, int pageNumber, bool M QMap<int,int> TableID; QList<PageItem*> TableItems; QMap<PageItem*, int> groupID; - int a, counter, baseobj; + int a, counter; double pageX = 0, pageY = 0; - bool newVersion = false; bool VorLFound = false; QMap<int,int> layerTrans; int maxLayer = 0; @@ -2806,11 +2802,8 @@ bool Scribus134Format::loadPage(const QString & fileName, int pageNumber, bool M QDomElement elem=docu.documentElement(); if (elem.tagName() != "SCRIBUSUTF8NEW") return false; - if (elem.hasAttribute("Version")) - newVersion = true; QDomNode DOC=elem.firstChild(); counter = m_Doc->Items->count(); - baseobj = counter; // PrefsManager* prefsManager=PrefsManager::instance(); while(!DOC.isNull()) { @@ -3713,8 +3706,3 @@ bool Scribus134Format::readPageCount(const QString& fileName, int *num1, int *nu *num2 = counter2; return true; } - - - - - diff --git a/scribus/plugins/fileloader/scribus13format/scribus13format.cpp b/scribus/plugins/fileloader/scribus13format/scribus13format.cpp index b1c8354..529053b 100644 --- a/scribus/plugins/fileloader/scribus13format/scribus13format.cpp +++ b/scribus/plugins/fileloader/scribus13format/scribus13format.cpp @@ -168,8 +168,6 @@ bool Scribus13Format::loadFile(const QString & fileName, const FileFormat & /* f ParagraphStyle vg; struct ScribusDoc::BookMa bok; int counter;//, Pgc; - //bool AtFl; - bool newVersion = false; QString tmp, tmpf, tmp2, tmp3, tmp4, PgNam, Defont, tmf; QFont fo; QMap<int,int> TableID; @@ -216,8 +214,6 @@ bool Scribus13Format::loadFile(const QString & fileName, const FileFormat & /* f QDomElement elem=docu.documentElement(); if (elem.tagName() != "SCRIBUSUTF8NEW") return false; - if (elem.hasAttribute("Version")) - newVersion = true; QDomNode DOC=elem.firstChild(); if (m_mwProgressBar!=0) { @@ -2022,9 +2018,8 @@ bool Scribus13Format::loadPage(const QString & fileName, int pageNumber, bool Mp newReplacement = false; QMap<int,int> TableID; QList<PageItem*> TableItems; - int a, counter, baseobj; + int a, counter; double pageX = 0, pageY = 0; - bool newVersion = false; bool VorLFound = false; QMap<int,int> layerTrans; int maxLayer = 0; @@ -2062,11 +2057,8 @@ bool Scribus13Format::loadPage(const QString & fileName, int pageNumber, bool Mp QDomElement elem=docu.documentElement(); if (elem.tagName() != "SCRIBUSUTF8NEW") return false; - if (elem.hasAttribute("Version")) - newVersion = true; QDomNode DOC=elem.firstChild(); counter = m_Doc->Items->count(); - baseobj = counter; while(!DOC.isNull()) { QDomElement dc=DOC.toElement(); diff --git a/scribus/scpageoutput.cpp b/scribus/scpageoutput.cpp index 985a5b9..fff3d7d 100644 --- a/scribus/scpageoutput.cpp +++ b/scribus/scpageoutput.cpp @@ -1020,10 +1020,8 @@ void ScPageOutput::drawItem_PathText( PageItem_PathText* item, ScPainterExBase* ScText *hl; FPoint point = FPoint(0, 0); FPoint tangent = FPoint(0, 0); - uint seg = 0; double dx; double CurX = item->textToFrameDistLeft(); // item->CurX = item->textToFrameDistLeft() - double CurY = 0; QString actFill, actStroke; double actFillShade, actStrokeShade; StoryText& itemText = item->itemText; @@ -1100,7 +1098,6 @@ void ScPageOutput::drawItem_PathText( PageItem_PathText* item, ScPainterExBase* int currPathIndex = 0; for (int a = item->firstInFrame(); a < itemText.length(); ++a) { - CurY = 0; hl = itemText.item(a); chstr = hl->ch; if (chstr[0] == SpecialChars::PAGENUMBER || chstr[0] == SpecialChars::PARSEP || chstr[0] == SpecialChars::PAGECOUNT @@ -1312,9 +1309,8 @@ void ScPageOutput::drawItem_TextFrame( PageItem_TextFrame* item, ScPainterExBase FPoint ColBound; QRegion cm; int a; - double lineCorr; ScText *hl; - double desc, asce, tabDist; + double desc, asce; QRect e2; painter->save(); @@ -1331,10 +1327,6 @@ void ScPageOutput::drawItem_TextFrame( PageItem_TextFrame* item, ScPainterExBase painter->setupPolygon(&item->PoLine); fillPath(item, painter, clip); } - if (item->lineColor() != CommonStrings::None) - lineCorr = item->lineWidth() / 2.0; - else - lineCorr = 0; if ((item->isAnnotation()) && (item->annotation().Type() == 2) && (!item->Pfile.isEmpty()) && (item->PictureIsAvailable) && (item->imageShown()) && (item->annotation().UseIcons())) { painter->save(); @@ -1362,7 +1354,6 @@ void ScPageOutput::drawItem_TextFrame( PageItem_TextFrame* item, ScPainterExBase for (uint ll=0; ll < item->itemText.lines(); ++ll) { LineSpec ls = item->itemText.line(ll); - tabDist = ls.x; double CurX = ls.x; for (a = ls.firstItem; a <= ls.lastItem; ++a) { @@ -1404,7 +1395,6 @@ void ScPageOutput::drawItem_TextFrame( PageItem_TextFrame* item, ScPainterExBase else CurX += hl->glyph.wide(); } - tabDist = CurX; } } } diff --git a/scribus/scpainterex_ps2.cpp b/scribus/scpainterex_ps2.cpp index fcbc278..96067d7 100644 --- a/scribus/scpainterex_ps2.cpp +++ b/scribus/scpainterex_ps2.cpp @@ -969,7 +969,6 @@ void ScPainterEx_Ps2::drawLinearGradient_RGB( VGradientEx& gradient, const QRect int r2, g2, b2;
double cosa, sina;
double ramp1, ramp2;
- double scale1, scale2;
double length, scale;
double x1, y1, x2, y2, dx, dy;
int clipBoxWidth, clipBoxHeight, maxDim;
@@ -988,9 +987,6 @@ void ScPainterEx_Ps2::drawLinearGradient_RGB( VGradientEx& gradient, const QRect maxDim = qRound(sqrt( (double) (clipBoxWidth * clipBoxWidth + clipBoxHeight * clipBoxHeight) )) * 2;
if ( maxDim <= 0 ) return;
- scale1 = sqrt( m_matrix.m11() * m_matrix.m11() + m_matrix.m12() * m_matrix.m12() );
- scale2 = sqrt( m_matrix.m21() * m_matrix.m21() + m_matrix.m22() * m_matrix.m22() );
-
x1 = m_matrix.dx() + gradient.origin().x() * m_matrix.m11();
y1 = m_matrix.dy() + gradient.origin().y() * m_matrix.m22();
x2 = m_matrix.dx() + gradient.vector().x() * m_matrix.m11();
@@ -1073,7 +1069,6 @@ void ScPainterEx_Ps2::drawLinearGradient_CMYK( VGradientEx& gradient, const QRec int c2, m2, j2, n2;
double cosa, sina;
double ramp1, ramp2;
- double scale1, scale2;
double length, scale;
double x1, y1, x2, y2, dx, dy;
int clipBoxWidth, clipBoxHeight, maxDim;
@@ -1092,9 +1087,6 @@ void ScPainterEx_Ps2::drawLinearGradient_CMYK( VGradientEx& gradient, const QRec maxDim = qRound(sqrt( (double) (clipBoxWidth * clipBoxWidth + clipBoxHeight * clipBoxHeight) )) * 2;
if ( maxDim <= 0 ) return;
- scale1 = sqrt( m_matrix.m11() * m_matrix.m11() + m_matrix.m12() * m_matrix.m12() );
- scale2 = sqrt( m_matrix.m21() * m_matrix.m21() + m_matrix.m22() * m_matrix.m22() );
-
x1 = m_matrix.dx() + gradient.origin().x() * m_matrix.m11();
y1 = m_matrix.dy() + gradient.origin().y() * m_matrix.m22();
x2 = m_matrix.dx() + gradient.vector().x() * m_matrix.m11();
@@ -1191,7 +1183,6 @@ void ScPainterEx_Ps2::drawCircularGradient_RGB( VGradientEx& gradient, const QRe int r1, g1, b1;
int r2, g2, b2;
double ramp1, ramp2;
- double scale1, scale2;
int clipBoxWidth, clipBoxHeight, maxDim;
QList<VColorStopEx*> colorStops = gradient.colorStops();
VColorStopEx stop1( *colorStops[gradient.Stops() - 1] );
@@ -1204,9 +1195,6 @@ void ScPainterEx_Ps2::drawCircularGradient_RGB( VGradientEx& gradient, const QRe maxDim = qRound(sqrt( (double) (clipBoxWidth * clipBoxWidth + clipBoxHeight * clipBoxHeight) )) * 2;
if ( maxDim <= 0 ) return;
- scale1 = sqrt( m_matrix.m11() * m_matrix.m11() + m_matrix.m21() * m_matrix.m21() );
- scale2 = sqrt( m_matrix.m12() * m_matrix.m12() + m_matrix.m22() * m_matrix.m22() );
-
FPoint pc( gradient.origin().x(), gradient.origin().y() );
FPoint pcz( gradient.origin().x(), gradient.origin().y() );
FPoint pf( gradient.focalPoint().x(), gradient.focalPoint().y() );
@@ -1278,7 +1266,6 @@ void ScPainterEx_Ps2::drawCircularGradient_CMYK( VGradientEx& gradient, const QR int c1, m1, y1, k1;
int c2, m2, y2, k2;
double ramp1, ramp2;
- double scale1, scale2;
int clipBoxWidth, clipBoxHeight, maxDim;
QList<VColorStopEx*> colorStops = gradient.colorStops();
VColorStopEx stop1( *colorStops[gradient.Stops() - 1] );
@@ -1291,9 +1278,6 @@ void ScPainterEx_Ps2::drawCircularGradient_CMYK( VGradientEx& gradient, const QR maxDim = qRound(sqrt( (double) (clipBoxWidth * clipBoxWidth + clipBoxHeight * clipBoxHeight) )) * 2;
if ( maxDim <= 0 ) return;
- scale1 = sqrt( m_matrix.m11() * m_matrix.m11() + m_matrix.m21() * m_matrix.m21() );
- scale2 = sqrt( m_matrix.m12() * m_matrix.m12() + m_matrix.m22() * m_matrix.m22() );
-
FPoint pc( gradient.origin().x(), gradient.origin().y() );
FPoint pcz( gradient.origin().x(), gradient.origin().y() );
FPoint pf( gradient.focalPoint().x(), gradient.focalPoint().y() );
@@ -1388,4 +1372,3 @@ void ScPainterEx_Ps2::getPathBoundingBox( FPointArray* points, QRect& r ) }
r.setCoords( qRound(left), qRound(bottom), qRound(right), qRound(top) );
}
-
|