Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25200 → Rev 25201

/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
134,7 → 134,7
{
char *layerName = nullptr;
TIFFGetField(tif, TIFFTAG_PAGENAME, &layerName);
QString name = QString(layerName);
QString name(layerName);
if (name.isEmpty())
lay.layerName = QString("Layer #%1").arg(layerNum);
else
1131,7 → 1131,7
{
uint count = 0;
uchar *ptr = tmpImg.scanLine(hh);
uchar *ptr2 = ptr+tmpImg.width() * tmpImg.channels();
uchar *ptr2 = ptr + tmpImg.width() * tmpImg.channels();
ptr += component;
while (count < pixel_count)
{
/trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
872,7 → 872,7
item->itemText.applyStyle(posC, tmpStyle);
item->itemText.applyCharStyle(posC, txt.length(), tmpCStyle);
posC = item->itemText.length();
txt = "";
txt.clear();
}
}
 
1263,29 → 1263,29
{
QColor c;
QString ret = CommonStrings::None;
if ((s == "") || s.isEmpty())
if (s.isEmpty())
return ret;
if (s.startsWith( "rgb(" ))
{
QString parse = s.trimmed();
QStringList colors = parse.split( ',', Qt::SkipEmptyParts );
QString r = colors[0].right( ( colors[0].length() - 4 ) );
QString r = colors[0].right(colors[0].length() - 4);
QString g = colors[1];
QString b = colors[2].left( ( colors[2].length() - 1 ) );
QString b = colors[2].left(colors[2].length() - 1);
if (r.contains( "%" ))
{
r.chop(1);
r = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(r) ) / 100.0 ) ) );
r = QString::number( static_cast<int>( ( 255.0 * ScCLocale::toDoubleC(r) ) / 100.0 ) );
}
if (g.contains( "%" ))
{
g.chop(1);
g = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(g) ) / 100.0 ) ) );
g = QString::number( static_cast<int>( ( 255.0 * ScCLocale::toDoubleC(g)) / 100.0 ) );
}
if (b.contains( "%" ))
{
b.chop(1);
b = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(b) ) / 100.0 ) ) );
b = QString::number( static_cast<int>( ( 255.0 * ScCLocale::toDoubleC(b)) / 100.0 ) );
}
c = QColor(r.toInt(), g.toInt(), b.toInt());
}
1343,7 → 1343,7
return fontName;
}
 
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
QApplication::changeOverrideCursor(QCursor(Qt::ArrowCursor));
QScopedPointer<MissingFont> dia(new MissingFont(nullptr, family, m_Doc));
if (dia->exec())
fontName = dia->getReplacementFont();
1350,7 → 1350,7
else
fontName = m_Doc->itemToolPrefs().textFont;
PrefsManager::instance().appPrefs.fontPrefs.GFontSub[family] = fontName;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QApplication::changeOverrideCursor(QCursor(Qt::WaitCursor));
 
return fontName;
}