Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 16502 → Rev 16503

/trunk/Scribus/scribus/pageitem.cpp
22,6 → 22,7
***************************************************************************/
 
#include "pageitem.h"
 
#include <QPainter>
#include <QPen>
#include <QFont>
42,6 → 43,7
#include "ui/cpalette.h"
#include "ui/guidemanager.h"
#include "page.h"
#include "pageitem_textframe.h"
#include "pageitem_latexframe.h"
#include "prefsmanager.h"
#include "ui/propertiespalette.h"
6418,22 → 6420,6
}
}
 
void PageItem::restoreLinkTextFrame(UndoState *state, bool isUndo)
{
if (!isTextFrame())
return;
if (isUndo)
{
unlink();
}
else
{
ItemState<std::pair<PageItem*, PageItem*> > *is = dynamic_cast<ItemState<std::pair<PageItem*, PageItem*> >*>(state);
asTextFrame()->link(is->getItem().second->asTextFrame());
}
}
 
 
void PageItem::convertClip()
{
if (Clip.count() != 0)