Репозитории ALT
S: | 1.5.8-alt2 |
5.1: | 1.3.5.1-alt4.M50P.1 |
4.1: | 1.3.4-alt5 |
4.0: | 1.3.4-alt3.M40.1 |
3.0: | 1.2.2-alt1.cvs20050405 |
+backports: | 1.3.3.7-alt0.M30.1 |
Группа :: Издательство
Пакет: scribus
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: scribus-1.5.7-fix-undefined-mnone-color.patch
Скачать
Скачать
diff --git a/scribus/scribus/ui/colorlistmodel.cpp b/scribus/scribus/ui/colorlistmodel.cpp
index 857db1a3c..b087a7fa5 100644
--- a/scribus/scribus/ui/colorlistmodel.cpp
+++ b/scribus/scribus/ui/colorlistmodel.cpp
@@ -31,8 +31,6 @@ ColorPixmapValue::ColorPixmapValue(const ScColor& col, ScribusDoc* doc, const QS
m_name = colName;
}
-ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None);
-
ColorListModel::ColorListModel(QObject *parent)
: QAbstractItemModel(parent)
{
diff --git a/scribus/scribus/ui/colorlistmodel.h b/scribus/scribus/ui/colorlistmodel.h
index 9c6302f14..95f9b44c6 100644
--- a/scribus/scribus/ui/colorlistmodel.h
+++ b/scribus/scribus/ui/colorlistmodel.h
@@ -103,9 +103,6 @@ protected:
// SortRule m_sortRule
SortRule m_sortRule;
- //! Dummy object used to represent None Color
- static ColorPixmapValue m_NoneColor;
-
static bool compareColorNames(const ColorPixmapValue& v1, const ColorPixmapValue& v2);
static bool compareColorValues(const ColorPixmapValue& v1, const ColorPixmapValue& v2);
static bool compareColorTypes(const ColorPixmapValue& v1, const ColorPixmapValue& v2);