[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/calligra/2.6] plugins/textshape/dialogs: Do not display default paragraph style
From:       Pierre Stirnweiss <pstirnweiss () googlemail ! com>
Date:       2012-12-31 17:56:13
Message-ID: 20121231175613.420C8A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 3ae48184fff00bc386f2c180974f0d3656ef4463 by Pierre Stirnweiss.
Committed on 31/12/2012 at 18:51.
Pushed by pstirnweiss into branch 'calligra/2.6'.

Do not display default paragraph style

The default paragraph style was displayed as a blank item in the style
combo. This style is not supposed to be seen/used by the user.

REVIEW: 108051

M  +5    -3    plugins/textshape/dialogs/StylesModel.cpp

http://commits.kde.org/calligra/3ae48184fff00bc386f2c180974f0d3656ef4463

diff --git a/plugins/textshape/dialogs/StylesModel.cpp \
b/plugins/textshape/dialogs/StylesModel.cpp index f888e5e..91f87fc 100644
--- a/plugins/textshape/dialogs/StylesModel.cpp
+++ b/plugins/textshape/dialogs/StylesModel.cpp
@@ -315,9 +315,11 @@ void StylesModel::updateParagraphStyles()
     qSort(styles.begin(), styles.end(), sortParagraphStyleByName);
 
     foreach(KoParagraphStyle *style, styles) {
-        m_styleList.append(style->styleId());
-        m_styleMapper->setMapping(style, style->styleId());
-        connect(style, SIGNAL(nameChanged(const QString&)), m_styleMapper, \
SLOT(map())); +        if (style != m_styleManager->defaultParagraphStyle()) { //The \
default paragraph style is not user selectable. It only provides individual property \
defaults and is not a style per say. +            \
m_styleList.append(style->styleId()); +            m_styleMapper->setMapping(style, \
style->styleId()); +            connect(style, SIGNAL(nameChanged(const QString&)), \
m_styleMapper, SLOT(map())); +        }
     }
 
     endResetModel();


[prev in list] [next in list] [prev in thread] [next in thread]