Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 20630 → Rev 20629

/trunk/Scribus/scribus/collapsedtablepainterex.h
File deleted
/trunk/Scribus/scribus/collapsedtablepainterex.cpp
File deleted
/trunk/Scribus/scribus/pageitem_textframe.cpp
3226,11 → 3226,19
double desc, asce;
// tTabValues.clear();
p->save(); //SA1
// QRect e2;
if (isEmbedded)
{
// e2 = cullingArea;
}
else
{
// e2 = QRect(qRound(cullingArea.x() / sc + m_Doc->minCanvasCoordinate.x()), qRound(cullingArea.y() / sc + m_Doc->minCanvasCoordinate.y()),
// qRound(cullingArea.width() / sc), qRound(cullingArea.height() / sc));
pf2.translate(m_xPos, m_yPos);
}
 
if (!isEmbedded)
pf2.translate(m_xPos, m_yPos);
pf2.rotate(m_rotation);
 
if (!m_Doc->layerOutline(LayerID))
{
if ((fillColor() != CommonStrings::None) || (GrType != 0))
/trunk/Scribus/scribus/scpageoutput.cpp
12,7 → 12,6
#include <QStack>
 
#include "cmsettings.h"
#include "collapsedtablepainterex.h"
#include "commonstrings.h"
#include "pageitem.h"
#include "pageitem_arc.h"
24,7 → 23,6
#include "pageitem_polyline.h"
#include "pageitem_regularpolygon.h"
#include "pageitem_spiral.h"
#include "pageitem_table.h"
#include "pageitem_textframe.h"
#include "prefsmanager.h"
#include "scfonts.h"
107,7 → 105,7
drawMarks(page, painter, m_marksOptions);
}
 
void ScPageOutput::drawMasterItems(ScPainterExBase *painter, ScPage *page, ScLayer& layer, QRect clip)
void ScPageOutput::drawMasterItems(ScPainterExBase *painter, ScPage *page, ScLayer& layer, const QRect& clip)
{
PageItem* currItem;
if (page->MPageNam.isEmpty())
159,7 → 157,7
}
}
 
void ScPageOutput::drawPageItems(ScPainterExBase *painter, ScPage *page, ScLayer& layer, QRect clip)
void ScPageOutput::drawPageItems(ScPainterExBase *painter, ScPage *page, ScLayer& layer, const QRect& clip)
{
PageItem *currItem;
if (m_doc->Items->count() <= 0)
189,14 → 187,8
}
}
 
void ScPageOutput::drawItem( PageItem* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem( PageItem* item, ScPainterExBase* painter, const QRect& clip )
{
if (clip.isNull())
{
clip = QRectF(QPointF(m_doc->minCanvasCoordinate.x(), m_doc->minCanvasCoordinate.y()),
QPointF(m_doc->maxCanvasCoordinate.x(), m_doc->maxCanvasCoordinate.y())).toAlignedRect();
}
 
drawItem_Pre(item, painter);
PageItem::ItemType itemType = item->itemType();
if (itemType == PageItem::Arc)
217,8 → 209,6
drawItem_RegularPolygon( (PageItem_RegularPolygon*) item, painter, clip);
else if (itemType == PageItem::Spiral)
drawItem_Spiral( (PageItem_Spiral*) item, painter, clip);
else if (itemType == PageItem::Table)
drawItem_Table( (PageItem_Table*) item, painter, clip);
else if (itemType == PageItem::TextFrame)
drawItem_TextFrame( (PageItem_TextFrame*) item, painter, clip);
drawItem_Post(item, painter);
506,7 → 496,7
painter->restore();
}
 
void ScPageOutput::drawGlyphs(PageItem* item, ScPainterExBase *painter, const CharStyle& style, GlyphLayout& glyphs, QRect clip)
void ScPageOutput::drawGlyphs(PageItem* item, ScPainterExBase *painter, const CharStyle& style, GlyphLayout& glyphs, const QRect& clip)
{
uint glyph = glyphs.glyph;
if (glyph == (ScFace::CONTROL_GLYPHS + SpecialChars::NBSPACE.unicode())) // NBSPACE
659,7 → 649,7
}
}
 
void ScPageOutput::drawItem_Embedded( PageItem* item, ScPainterExBase *p, QRect clip, const CharStyle& style, PageItem* cembedded)
void ScPageOutput::drawItem_Embedded( PageItem* item, ScPainterExBase *p, const QRect& clip, const CharStyle& style, PageItem* cembedded)
{
if (!cembedded)
return;
712,7 → 702,7
}
}
 
void ScPageOutput::drawPattern( PageItem* item, ScPainterExBase* painter, QRect clip)
void ScPageOutput::drawPattern( PageItem* item, ScPainterExBase* painter, const QRect& clip)
{
double x1, x2, y1, y2;
ScPattern& pattern = m_doc->docPatterns[item->pattern()];
808,13 → 798,13
 
}
 
void ScPageOutput::drawItem_Arc ( PageItem_Arc* item , ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_Arc ( PageItem_Arc* item , ScPainterExBase* painter, const QRect& clip )
{
painter->setupPolygon(&item->PoLine);
fillPath(item, painter, clip);
}
 
void ScPageOutput::drawItem_Group( PageItem_Group* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_Group( PageItem_Group* item, ScPainterExBase* painter, const QRect& clip )
{
if (item->groupItemList.isEmpty())
return;
886,7 → 876,7
painter->restore();
}
 
void ScPageOutput::drawItem_ImageFrame( PageItem_ImageFrame* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_ImageFrame( PageItem_ImageFrame* item, ScPainterExBase* painter, const QRect& clip )
{
ScPainterExBase::ImageMode mode = ScPainterExBase::rgbImages;
if ((item->fillColor() != CommonStrings::None) || (item->GrType != 0))
974,7 → 964,7
}
}
 
void ScPageOutput::drawItem_Line( PageItem_Line* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_Line( PageItem_Line* item, ScPainterExBase* painter, const QRect& clip )
{
if (item->PoLine.size() < 4)
return;
1075,7 → 1065,7
}
}
 
void ScPageOutput::drawItem_PathText( PageItem_PathText* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_PathText( PageItem_PathText* item, ScPainterExBase* painter, const QRect& clip )
{
QString chstr;
//ScText *hl;
1256,13 → 1246,13
}
}
 
void ScPageOutput::drawItem_Polygon ( PageItem_Polygon* item , ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_Polygon ( PageItem_Polygon* item , ScPainterExBase* painter, const QRect& clip )
{
painter->setupPolygon(&item->PoLine);
fillPath(item, painter, clip);
}
 
void ScPageOutput::drawItem_PolyLine( PageItem_PolyLine* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_PolyLine( PageItem_PolyLine* item, ScPainterExBase* painter, const QRect& clip )
{
if (item->PoLine.size() < 4)
return;
1422,13 → 1412,13
}
}
 
void ScPageOutput::drawItem_RegularPolygon( PageItem_RegularPolygon* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_RegularPolygon( PageItem_RegularPolygon* item, ScPainterExBase* painter, const QRect& clip )
{
painter->setupPolygon(&item->PoLine);
painter->fillPath();
}
 
void ScPageOutput::drawItem_Spiral( PageItem_Spiral* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_Spiral( PageItem_Spiral* item, ScPainterExBase* painter, const QRect& clip )
{
if (item->PoLine.size() < 4)
return;
1588,23 → 1578,8
}
}
 
void ScPageOutput::drawItem_Table( PageItem_Table* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::drawItem_TextFrame( PageItem_TextFrame* item, ScPainterExBase* painter, const QRect& clip )
{
painter->save();
 
// Set the clip path.
painter->setupPolygon(&item->PoLine);
painter->setClipPath();
 
// Paint the table.
CollapsedTablePainterEx tablePainter(this, item);
tablePainter.paintTable(painter);
 
painter->restore();
}
 
void ScPageOutput::drawItem_TextFrame( PageItem_TextFrame* item, ScPainterExBase* painter, QRect cullingArea )
{
QTransform wm;
QPoint pt1, pt2;
FPoint ColBound;
1612,15 → 1587,20
int a;
double desc, asce;
QRect e2;
painter->save();
if (!item->isEmbedded)
if (item->isEmbedded)
e2 = clip;
else
{
e2 = QRect(qRound(clip.x() + m_doc->minCanvasCoordinate.x()), qRound(clip.y() + m_doc->minCanvasCoordinate.y()), clip.width(), clip.height());
wm.translate(item->xPos(), item->yPos());
}
wm.rotate(item->rotation());
 
if ((item->fillColor() != CommonStrings::None) || (item->GrType != 0))
{
painter->setupPolygon(&item->PoLine);
fillPath(item, painter, cullingArea);
fillPath(item, painter, clip);
}
if ((item->isAnnotation()) && (item->annotation().Type() == Annotation::Button) && (!item->Pfile.isEmpty()) && (item->imageIsAvailable) && (item->imageVisible()) && (item->annotation().UseIcons()))
{
1639,15 → 1619,11
{
painter->translate(item->width(), 0);
painter->scale(-1, 1);
wm.translate(item->width(), 0);
wm.scale(-1, 1);
}
if (item->imageFlippedV())
{
painter->translate(0, item->height());
painter->scale(1, -1);
wm.translate(0, item->height());
wm.scale(1, -1);
}
 
for (uint ll=0; ll < item->textLayout.lines(); ++ll)
1656,23 → 1632,23
double CurX = ls.x;
for (a = ls.firstItem; a <= ls.lastItem; ++a)
{
GlyphLayout* glyphs = item->itemText.getGlyphs(a);
GlyphLayout* glyphs = item->itemText.getGlyphs(a);
const CharStyle& charStyle = item->itemText.charStyle(a);
 
if (charStyle.fillColor() != CommonStrings::None)
{
ScColorShade tmp(m_doc->PageColors[charStyle.fillColor()], (int) charStyle.fillShade());
ScColorShade tmp(m_doc->PageColors[charStyle.fillColor()], (int) charStyle.fillShade());
painter->setBrush(tmp);
}
if (charStyle.strokeColor() != CommonStrings::None)
{
ScColorShade tmp(m_doc->PageColors[charStyle.strokeColor()], (int) charStyle.strokeShade());
ScColorShade tmp(m_doc->PageColors[charStyle.strokeColor()], (int) charStyle.strokeShade());
painter->setPen(tmp, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
}
 
//if (!m_doc->RePos)
{
//double xcoZli = CurX + glyphs->xoffset;
//double xcoZli = CurX + glyphs->xoffset;
desc = - charStyle.font().descent(charStyle.fontSize() / 10.0);
asce = charStyle.font().ascent(charStyle.fontSize() / 10.0);
if (charStyle.strokeColor() != CommonStrings::None)
1680,14 → 1656,14
ScColorShade tmp(m_doc->PageColors[charStyle.strokeColor()], (int) charStyle.strokeShade());
painter->setPen(tmp, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
}
if (item->isEmbedded || cullingArea.intersects(wm.mapRect(QRect(qRound(CurX + glyphs->xoffset),qRound(ls.y + glyphs->yoffset-asce), qRound(glyphs->xadvance+1), qRound(asce+desc)))))
if (e2.intersects(wm.mapRect(QRect(qRound(CurX + glyphs->xoffset),qRound(ls.y + glyphs->yoffset-asce), qRound(glyphs->xadvance+1), qRound(asce+desc)))))
{
painter->save();
painter->translate(CurX, ls.y);
if (item->itemText.hasObject(a))
drawItem_Embedded(item, painter, cullingArea, charStyle, item->itemText.object(a));
if (item->itemText.hasObject(a))
drawItem_Embedded(item, painter, clip, charStyle, item->itemText.object(a));
else
drawGlyphs(item, painter, charStyle, *glyphs, cullingArea);
drawGlyphs(item, painter, charStyle, *glyphs, clip);
painter->restore();
}
// Unneeded now that glyph xadvance is set appropriately for inline objects by PageItem_TextFrame::layout() - JG
1694,7 → 1670,7
/*if (hl->hasObject())
CurX += (hl->embedded.getItem()->gWidth + hl->embedded.getItem()->lineWidth());
else*/
CurX += glyphs->wide();
CurX += glyphs->wide();
}
}
}
1952,7 → 1928,7
painter->restore();
}
 
void ScPageOutput::fillPath( PageItem* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::fillPath( PageItem* item, ScPainterExBase* painter, const QRect& clip )
{
if( painter->fillMode() == ScPainterExBase::Pattern && !painter->hasCapability(ScPainterExBase::patterns) )
drawPattern( item, painter, clip );
1960,7 → 1936,7
painter->fillPath();
}
 
void ScPageOutput::strokePath( PageItem* item, ScPainterExBase* painter, QRect clip )
void ScPageOutput::strokePath( PageItem* item, ScPainterExBase* painter, const QRect& clip )
{
painter->strokePath();
}
/trunk/Scribus/scribus/CMakeLists.txt
583,7 → 583,6
cmserrorhandling.cpp
cmsettings.cpp
collapsedtablepainter.cpp
collapsedtablepainterex.cpp
collect4output.cpp
colorblind.cpp
colorsetmanager.cpp
/trunk/Scribus/scribus/scpainterex_ps2.h
90,7 → 90,6
virtual void setWorldMatrix( const QTransform & );
virtual const QTransform worldMatrix();
virtual void translate( double, double );
virtual void translate( const QPointF& offset );
virtual void rotate( double );
virtual void scale( double, double );
 
133,7 → 132,6
virtual void drawPolygon();
virtual void drawPolyLine();
virtual void drawLine(FPoint start, FPoint end);
virtual void drawLine(const QPointF& start, const QPointF& end);
virtual void drawRect(double, double, double, double);
 
// pen + brush
/trunk/Scribus/scribus/scpainterex_cairo.cpp
120,11 → 120,6
cairo_translate(m_cr, x, y);
}
 
void ScPainterEx_Cairo::translate( const QPointF& offset )
{
cairo_translate(m_cr, offset.x(), offset.y());
}
 
void ScPainterEx_Cairo::rotate( double r )
{
cairo_rotate(m_cr, r * 3.1415927 / 180.0);
610,14 → 605,6
strokePath();
}
 
void ScPainterEx_Cairo::drawLine(const QPointF& start, const QPointF& end)
{
newPath();
moveTo(start.x(), start.y());
lineTo(end.x(), end.y());
strokePath();
}
 
void ScPainterEx_Cairo::drawRect(double x, double y, double w, double h)
{
newPath();
/trunk/Scribus/scribus/scpainterex_ps2.cpp
186,11 → 186,6
m_matrix.translate(x, y);
}
 
void ScPainterEx_Ps2::translate( const QPointF& offset )
{
m_matrix.translate(offset.x(), offset.y());
}
 
void ScPainterEx_Ps2::rotate( double r )
{
m_matrix.rotate(r);
939,14 → 934,6
strokePath();
}
 
void ScPainterEx_Ps2::drawLine(const QPointF& start, const QPointF& end)
{
newPath();
moveTo(start.x(), start.y());
lineTo(end.x(), end.y());
strokePath();
}
 
void ScPainterEx_Ps2::drawRect(double x, double y, double w, double h)
{
newPath();
/trunk/Scribus/scribus/scpainterexbase.h
34,7 → 34,6
#include <QList>
#include <QTransform>
#include <QPixmap>
#include <QPointF>
#include <QStack>
 
#include "scribusapi.h"
50,9 → 49,12
 
class SCRIBUS_API ScPainterExBase
{
protected:
int m_capabilities;
ScPainterExBase(void);
public:
 
virtual ~ScPainterExBase() {};
 
enum FillMode { None, Solid, Gradient, Pattern };
enum ColorMode { rgbMode = 1, cmykMode = 2 };
enum ImageMode { cmykImages, rgbImages, rawImages };
74,7 → 76,6
virtual void setWorldMatrix( const QTransform & ) = 0;
virtual const QTransform worldMatrix() = 0;
virtual void translate( double, double ) = 0;
virtual void translate( const QPointF& offset ) = 0;
virtual void rotate( double ) = 0;
virtual void scale( double, double ) = 0;
 
111,7 → 112,6
virtual void drawPolygon() = 0;
virtual void drawPolyLine() = 0;
virtual void drawLine(FPoint start, FPoint end) = 0;
virtual void drawLine(const QPointF& start, const QPointF& end) = 0;
virtual void drawRect(double, double, double, double) = 0;
 
// pen + brush
142,10 → 142,6
ScPattern* m_pattern;
ScPattern* m_maskPattern;
QTransform m_patternTransform;
 
protected:
int m_capabilities;
ScPainterExBase(void);
};
 
#endif
/trunk/Scribus/scribus/scpageoutput.h
28,7 → 28,6
class PageItem_PolyLine;
class PageItem_Spiral;
class PageItem_RegularPolygon;
class PageItem_Table;
class PageItem_TextFrame;
class ScLayer;
class ScribusDoc;
53,18 → 52,8
 
class SCRIBUS_API ScPageOutput
{
public:
ScPageOutput(ScribusDoc* doc, bool reloadImages = false, int resolution = 72, bool useProfiles = false);
virtual ~ScPageOutput() { }
protected:
 
virtual void begin(void) {};
virtual void drawPage( ScPage* page ) {};
virtual void drawPage( ScPage* page, ScPainterExBase* painter);
virtual void end(void) {};
 
void setMarksOptions(const MarksOptions& opt) { m_marksOptions = opt; }
 
protected:
ScribusDoc* m_doc;
 
bool m_reloadImages;
72,32 → 61,31
bool m_useProfiles;
MarksOptions m_marksOptions;
 
virtual void fillPath( PageItem* item, ScPainterExBase* painter, QRect clip );
virtual void strokePath( PageItem* item, ScPainterExBase* painter, QRect clip );
virtual void fillPath( PageItem* item, ScPainterExBase* painter, const QRect& clip );
virtual void strokePath( PageItem* item, ScPainterExBase* painter, const QRect& clip );
 
virtual void drawMasterItems( ScPainterExBase *painter, ScPage *page, ScLayer& layer, QRect clip);
virtual void drawPageItems( ScPainterExBase *painter, ScPage *page, ScLayer& layer, QRect clip);
virtual void drawMasterItems( ScPainterExBase *painter, ScPage *page, ScLayer& layer, const QRect& clip);
virtual void drawPageItems( ScPainterExBase *painter, ScPage *page, ScLayer& layer, const QRect& clip);
 
virtual void drawItem( PageItem* item, ScPainterExBase* painter, QRect clip );
virtual void drawItem( PageItem* item, ScPainterExBase* painter, const QRect& clip );
virtual void drawItem_Pre( PageItem* item, ScPainterExBase* painter );
virtual void drawItem_Post( PageItem* item, ScPainterExBase* painter );
 
virtual void drawGlyphs(PageItem* item, ScPainterExBase *painter, const CharStyle& style, GlyphLayout& glyphs, QRect clip);
virtual void drawItem_Embedded( PageItem* item, ScPainterExBase *p, QRect clip, const CharStyle& style, PageItem* cembedded);
virtual void drawPattern(PageItem* item, ScPainterExBase* painter, QRect clip);
virtual void drawGlyphs(PageItem* item, ScPainterExBase *painter, const CharStyle& style, GlyphLayout& glyphs, const QRect& clip);
virtual void drawItem_Embedded( PageItem* item, ScPainterExBase *p, const QRect& clip, const CharStyle& style, PageItem* cembedded);
virtual void drawPattern(PageItem* item, ScPainterExBase* painter, const QRect& clip);
virtual void drawStrokePattern(PageItem* item, ScPainterExBase* painter, const QPainterPath& path);
virtual void drawItem_Arc( PageItem_Arc* item, ScPainterExBase* painter, QRect clip );
virtual void drawItem_Group( PageItem_Group* item, ScPainterExBase* painter, QRect clip );
virtual void drawItem_ImageFrame( PageItem_ImageFrame* item, ScPainterExBase* painter, QRect clip );
virtual void drawItem_Line( PageItem_Line* item, ScPainterExBase* painter, QRect clip);
virtual void drawItem_PathText( PageItem_PathText* item, ScPainterExBase* painter, QRect clip );
virtual void drawItem_Polygon ( PageItem_Polygon* item , ScPainterExBase* painter, QRect clip );
virtual void drawItem_PolyLine( PageItem_PolyLine* item, ScPainterExBase* painte, QRect clip );
virtual void drawItem_RegularPolygon( PageItem_RegularPolygon* item, ScPainterExBase* painte, QRect clip );
virtual void drawItem_Spiral( PageItem_Spiral* item, ScPainterExBase* painter, QRect clip );
virtual void drawItem_Table( PageItem_Table* item, ScPainterExBase* painter, QRect clip );
virtual void drawItem_TextFrame( PageItem_TextFrame* item, ScPainterExBase* painter, QRect clip );
virtual void drawItem_Arc( PageItem_Arc* item, ScPainterExBase* painter, const QRect& clip );
virtual void drawItem_Group( PageItem_Group* item, ScPainterExBase* painter, const QRect& clip );
virtual void drawItem_ImageFrame( PageItem_ImageFrame* item, ScPainterExBase* painter, const QRect& clip );
virtual void drawItem_Line( PageItem_Line* item, ScPainterExBase* painter, const QRect& clip);
virtual void drawItem_PathText( PageItem_PathText* item, ScPainterExBase* painter, const QRect& clip );
virtual void drawItem_Polygon ( PageItem_Polygon* item , ScPainterExBase* painter, const QRect& clip );
virtual void drawItem_PolyLine( PageItem_PolyLine* item, ScPainterExBase* painte, const QRect& clip );
virtual void drawItem_RegularPolygon( PageItem_RegularPolygon* item, ScPainterExBase* painte, const QRect& clip );
virtual void drawItem_Spiral( PageItem_Spiral* item, ScPainterExBase* painter, const QRect& clip );
virtual void drawItem_TextFrame( PageItem_TextFrame* item, ScPainterExBase* painter, const QRect& clip );
 
virtual void drawArrow(ScPainterExBase* painter, PageItem* item, QTransform &arrowTrans, int arrowIndex);
virtual void drawMarks( ScPage* page, ScPainterExBase* painter, const MarksOptions& options );
106,7 → 94,17
 
ScImage::RequestType translateImageModeToRequest( ScPainterExBase::ImageMode mode);
 
friend class CollapsedTablePainterEx;
public:
virtual ~ScPageOutput() { }
 
ScPageOutput(ScribusDoc* doc, bool reloadImages = false, int resolution = 72, bool useProfiles = false);
 
virtual void begin(void) {};
virtual void drawPage( ScPage* page ) {};
virtual void drawPage( ScPage* page, ScPainterExBase* painter);
virtual void end(void) {};
 
void setMarksOptions(const MarksOptions& opt) { m_marksOptions = opt; }
};
 
#endif
/trunk/Scribus/scribus/scpainterex_cairo.h
34,7 → 34,6
virtual void setWorldMatrix( const QTransform & );
virtual const QTransform worldMatrix();
virtual void translate( double, double );
virtual void translate( const QPointF& offset );
virtual void rotate( double );
virtual void scale( double, double );
 
72,7 → 71,6
virtual void drawPolygon();
virtual void drawPolyLine();
virtual void drawLine(FPoint start, FPoint end);
virtual void drawLine(const QPointF& start, const QPointF& end);
virtual void drawRect(double, double, double, double);
 
// pen + brush
/trunk/Scribus/scribus/scpageoutput_ps2.h
21,7 → 21,19
 
class SCRIBUS_API ScPageOutput_Ps2 : public ScPageOutput
{
protected:
 
QRect m_clip;
QIODevice* m_device;
QTextStream m_stream;
ScPs2OutputParams m_options;
 
int m_pageIndex;
 
virtual void initStream(QIODevice* dev);
 
public:
 
ScPageOutput_Ps2(QIODevice* dev, ScribusDoc* doc, int pageIndex, ScPs2OutputParams& options);
virtual ~ScPageOutput_Ps2();
 
31,16 → 43,6
 
const QRect clip(void);
void setClip(const QRect& rect) { m_clip = rect; }
 
protected:
QRect m_clip;
QIODevice* m_device;
QTextStream m_stream;
ScPs2OutputParams m_options;
 
int m_pageIndex;
 
virtual void initStream(QIODevice* dev);
};
 
#endif
/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
1022,9 → 1022,6
<ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerlicensebase.h">
<Filter>Generated Form Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\scribus\collapsedtablepainterex.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
2557,9 → 2554,6
<ClCompile Include="..\..\..\scribus\marks.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\collapsedtablepainterex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Scribus.rc">
/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
237,7 → 237,6
<ItemGroup>
<moc Include="..\..\..\scribus\appmodehelper.h" />
<ClInclude Include="..\..\..\scribus\appmodes.h" />
<ClInclude Include="..\..\..\scribus\collapsedtablepainterex.h" />
<ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h" />
<ClInclude Include="..\..\..\scribus\desaxe\actions.h" />
<ClInclude Include="..\..\..\scribus\desaxe\automata.h" />
895,7 → 894,6
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\appmodehelper.cpp" />
<ClCompile Include="..\..\..\scribus\collapsedtablepainterex.cpp" />
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp" />
<ClCompile Include="..\..\..\scribus\desaxe\digester_parse.cpp" />
<ClCompile Include="..\..\..\scribus\desaxe\saxfilter.cpp" />