Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24742 → Rev 24741

/trunk/Scribus/scribus/ui/smpstylewidget.cpp
555,11 → 555,12
backShade_->setValue(qRound(d));
 
QString s;
QString emptyString;
for (int i = 0; i < cstyles.count(); ++i)
{
if (!s.isNull() && s != cstyles[i]->backgroundColor())
{
s.clear();
s = emptyString;
break;
}
s = cstyles[i]->backgroundColor();
/trunk/Scribus/scribus/ui/smcstylewidget.cpp
572,11 → 572,12
backShade_->setValue(qRound(d));
 
QString s;
QString emptyString;
for (int i = 0; i < cstyles.count(); ++i)
{
if (!s.isEmpty() && s != cstyles[i]->fillColor())
if (!s.isNull() && s != cstyles[i]->fillColor())
{
s.clear();
s = emptyString;
break;
}
s = cstyles[i]->fillColor();
590,12 → 591,12
else
fillColor_->setCurrentText(s);
 
s.clear();
s = emptyString;
for (int i = 0; i < cstyles.count(); ++i)
{
if (!s.isEmpty() && s != cstyles[i]->strokeColor())
if (!s.isNull() && s != cstyles[i]->strokeColor())
{
s.clear();
s = emptyString;
break;
}
s = cstyles[i]->strokeColor();
609,12 → 610,12
else
strokeColor_->setCurrentText(s);
 
s.clear();
s = emptyString;
for (int i = 0; i < cstyles.count(); ++i)
{
if (!s.isEmpty() && s != cstyles[i]->backColor())
if (!s.isNull() && s != cstyles[i]->backColor())
{
s.clear();
s = emptyString;
break;
}
s = cstyles[i]->backColor();
631,12 → 632,13
 
void SMCStyleWidget::showLanguage(const QList<CharStyle*> &cstyles, const QString &defLang)
{
QString emptyString;
QString s(cstyles[0]->language());
for (int i = 0; i < cstyles.count(); ++i)
{
if (s != cstyles[i]->language())
{
s.clear();
s = emptyString;
break;
}
s = cstyles[i]->language();
/trunk/Scribus/scribus/ui/smcellstylewidget.cpp
152,11 → 152,12
else
fillShade->setValue(qRound(d));
QString s;
QString emptyString;
for (int i = 0; i < cellStyles.count(); ++i)
{
if (!s.isEmpty() && s != cellStyles[i]->fillColor())
if (!s.isNull() && s != cellStyles[i]->fillColor())
{
s.clear();
s = emptyString;
break;
}
s = cellStyles[i]->fillColor();
/trunk/Scribus/scribus/ui/smtablestylewidget.cpp
139,11 → 139,12
else
fillShade->setValue(qRound(d));
QString s;
QString emptyString;
for (int i = 0; i < tableStyles.count(); ++i)
{
if (!s.isEmpty() && s != tableStyles[i]->fillColor())
if (!s.isNull() && s != tableStyles[i]->fillColor())
{
s.clear();
s = emptyString;
break;
}
s = tableStyles[i]->fillColor();