Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2248 → Rev 2253

/trunk/Scribus/scribus/pageitem.cpp
816,8 → 816,6
{
if (nb->Ptext.at(nb->Ptext.count()-1)->ch == QChar(13))
{
CurX += Doc->Vorlagen[absa].First;
CurX += Doc->Vorlagen[absa].Indent;
CurY += Doc->Vorlagen[absa].Avor;
if (chx != QChar(13))
DropCmode = Doc->Vorlagen[absa].Drop;
828,10 → 826,7
break;
}
else
{
CurX += Doc->Vorlagen[absa].Indent;
break;
}
}
nb = nb->BackBox;
}
1011,10 → 1006,21
}
if ((fBorder) && (!AbsHasDrop))
CurX += Extra;
if (((a > 0) && (Ptext.at(a-1)->ch == QChar(13))) || ((a == 0) && (BackBox == 0)))
if (a > 0)
{
CurX += Doc->Vorlagen[hl->cab].First;
if (Ptext.at(a-1)->ch == QChar(13))
CurX += Doc->Vorlagen[hl->cab].First;
}
else
{
if (BackBox == 0)
CurX += Doc->Vorlagen[hl->cab].First;
else
{
if (BackBox->Ptext.at(BackBox->Ptext.count()-1)->ch == QChar(13))
CurX += Doc->Vorlagen[hl->cab].First;
}
}
CurX += Doc->Vorlagen[hl->cab].Indent;
fBorder = false;
}
/trunk/Scribus/scribus/libabout/about.cpp
58,7 → 58,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("22").arg("May").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("24").arg("May").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else