diff options
| author | malex <malex@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-10 03:20:54 +0000 |
|---|---|---|
| committer | malex <malex@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-10 03:20:54 +0000 |
| commit | 0a3229cf1860de8f59f5f59a3d0b3c563ea13df8 (patch) | |
| tree | 738a12992d2ec9794035adab2195d4a9425aa27f /scribus/propertiespalette.cpp | |
| parent | cee06e59c897fd7b66365c838248b394e047098e (diff) | |
| download | scribus-0a3229cf1860de8f59f5f59a3d0b3c563ea13df8.tar.gz scribus-0a3229cf1860de8f59f5f59a3d0b3c563ea13df8.tar.xz scribus-0a3229cf1860de8f59f5f59a3d0b3c563ea13df8.zip | |
Ubuntu patch from 9850 for building on armel arch
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17287 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/propertiespalette.cpp')
| -rw-r--r-- | scribus/propertiespalette.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scribus/propertiespalette.cpp b/scribus/propertiespalette.cpp index 168da4f..8c53fe6 100644 --- a/scribus/propertiespalette.cpp +++ b/scribus/propertiespalette.cpp @@ -107,7 +107,7 @@ void LineFormatItemDelegate::redraw(const QVariant& data) const const ScColor& col = item.m_doc->PageColors[item.m_Line[its].Color]; tmpf = ScColorEngine::getDisplayColor(col, item.m_doc, item.m_Line[its].Shade); QPen pen; - QVector<double> m_array; + QVector<qreal> m_array; if (item.m_Line[its].Dash == 1) pen.setStyle(Qt::SolidLine); else @@ -4618,7 +4618,7 @@ void PropertiesPalette::MakeIrre(int f, int c, qreal *vals) doc->setRedrawBounding(CurItem); break; default: - CurItem->SetFrameShape(c, vals); + CurItem->SetFrameShape(c, (double*)vals); doc->setRedrawBounding(CurItem); CurItem->FrameType = f+2; break; |