Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 632 → Rev 633

/branches/Version13x/Scribus/scribus/serializer.cpp
98,7 → 98,7
hg->cshade = it->ShTxtFill;
hg->cstroke = it->TxtStroke;
hg->cshade2 = it->ShTxtStroke;
hg->csize = size * 10;
hg->csize = size;
hg->cstyle = it->TxTStyle;
}
hg->cscale = it->TxtScale;
/branches/Version13x/Scribus/scribus/scribusview.cpp
6893,6 → 6893,8
{
PageItem* b = Doc->Items.at(nr);
b->Select = true;
b->IFont = Doc->Dfont;
b->ISize = Doc->Dsize;
mCG = true;
HowTo = 1;
qApp->setOverrideCursor(QCursor(SizeFDiagCursor), true);
7216,7 → 7218,10
if (ss->Read(""))
{
int st = Doc->CurrentABStil;
ss->GetText(b, st, Doc->Vorlagen[st].Font, Doc->Vorlagen[st].FontSize);
if (st > 5)
ss->GetText(b, st, Doc->Vorlagen[st].Font, Doc->Vorlagen[st].FontSize);
else
ss->GetText(b, st, b->IFont, b->ISize);
}
delete ss;
if (Doc->Trenner->AutoCheck)
/branches/Version13x/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.cpp
580,7 → 580,7
ite->LineSp = FontSize + FontSize * 0.2;
Serializer *ss = new Serializer("");
ss->Objekt = QString::fromUtf8(e.text())+QChar(10);
ss->GetText(ite, AbsStyle, Doku->Dfont, FontSize, firstPa);
ss->GetText(ite, AbsStyle, Doku->Dfont, FontSize*10, firstPa);
delete ss;
firstPa = true;
if (ite->PType != 7)