Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25273 → Rev 25274

/branches/Version15x/Scribus/scribus/colorblind.cpp
6,6 → 6,7
*/
#include "colorblind.h"
 
#include <algorithm>
#include <cmath>
 
//#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
225,22 → 226,22
}
}
 
uint VisionDefectColor::getRed()
uint VisionDefectColor::getRed() const
{
return (uint)m_red;
}
 
uint VisionDefectColor::getGreen()
uint VisionDefectColor::getGreen() const
{
return (uint)m_green;
}
 
uint VisionDefectColor::getBlue()
uint VisionDefectColor::getBlue() const
{
return (uint)m_blue;
}
 
QColor VisionDefectColor::getColor()
QColor VisionDefectColor::getColor() const
{
return QColor(getRed(), getGreen(), getBlue());
}
247,7 → 248,6
 
double VisionDefectColor::clamp(double x, double low, double high)
{
double ret;
(x > high) ? ret = high : ((x < low) ? ret = low : ret = x);
double ret = std::max(low, std::min(x, high));
return ret;
}
/branches/Version15x/Scribus/scribus/colorblind.h
88,19 → 88,19
/*! \brief Return the color parts
\retval uint red part
*/
uint getRed();
uint getRed() const;
/*! \brief Return the color parts
\retval uint green part
*/
uint getGreen();
uint getGreen() const;
/*! \brief Return the color parts
\retval uint blue part
*/
uint getBlue();
uint getBlue() const;
/*! \brief Return QColor
\retval QColor new QColor
*/
QColor getColor();
QColor getColor() const;
 
private:
/*! \brief Convert matrix */
/branches/Version15x/Scribus/scribus/commonstrings.cpp
126,13 → 126,26
QString CommonStrings::trDefaultTableStyle ="";
QString CommonStrings::trDefaultCellStyle ="";
 
QString CommonStrings::monday = "";
QString CommonStrings::tuesday = "";
QString CommonStrings::wednesday = "";
QString CommonStrings::thursday = "";
QString CommonStrings::friday = "";
QString CommonStrings::saturday = "";
QString CommonStrings::sunday = "";
 
QString CommonStrings::monday="", CommonStrings::tuesday="", CommonStrings::wednesday="";
QString CommonStrings::thursday="", CommonStrings::friday="", CommonStrings::saturday="", CommonStrings::sunday="";
QString CommonStrings::january="", CommonStrings::february="", CommonStrings::march="";
QString CommonStrings::april="", CommonStrings::may="", CommonStrings::june="";
QString CommonStrings::july="", CommonStrings::august="", CommonStrings::september="";
QString CommonStrings::october="", CommonStrings::november="", CommonStrings::december="";
QString CommonStrings::january = "";
QString CommonStrings::february = "";
QString CommonStrings::march = "";
QString CommonStrings::april = "";
QString CommonStrings::may = "";
QString CommonStrings::june = "";
QString CommonStrings::july = "";
QString CommonStrings::august = "";
QString CommonStrings::september = "";
QString CommonStrings::october = "";
QString CommonStrings::november = "";
QString CommonStrings::december = "";
 
QString CommonStrings::trRGB = "";
QString CommonStrings::trCMYK = "";
/branches/Version15x/Scribus/scribus/documentinformation.cpp
40,164 → 40,163
m_type = "";*/
}
 
const QString& DocumentInformation::author()
const QString& DocumentInformation::author() const
{
return m_author;
}
 
const QString& DocumentInformation::comments()
const QString& DocumentInformation::comments() const
{
return m_comments;
}
 
const QString& DocumentInformation::contrib()
const QString& DocumentInformation::contrib() const
{
return m_contrib;
}
 
const QString& DocumentInformation::cover()
const QString& DocumentInformation::cover() const
{
return m_cover;
}
 
const QString& DocumentInformation::date()
const QString& DocumentInformation::date() const
{
return m_date;
}
 
const QString& DocumentInformation::format()
const QString& DocumentInformation::format() const
{
return m_format;
}
 
const QString& DocumentInformation::ident()
const QString& DocumentInformation::ident() const
{
return m_ident;
}
 
const QString& DocumentInformation::keywords()
const QString& DocumentInformation::keywords() const
{
return m_keywords;
}
 
const QString& DocumentInformation::langInfo()
const QString& DocumentInformation::langInfo() const
{
return m_langInfo;
}
 
const QString& DocumentInformation::publisher()
const QString& DocumentInformation::publisher() const
{
return m_publisher;
}
 
const QString& DocumentInformation::relation()
const QString& DocumentInformation::relation() const
{
return m_relation;
}
 
const QString& DocumentInformation::rights()
const QString& DocumentInformation::rights() const
{
return m_rights;
}
 
const QString& DocumentInformation::source()
const QString& DocumentInformation::source() const
{
return m_source;
}
 
const QString& DocumentInformation::subject()
const QString& DocumentInformation::subject() const
{
return m_subject;
}
 
const QString& DocumentInformation::title()
const QString& DocumentInformation::title() const
{
return m_title;
}
 
const QString& DocumentInformation::type()
const QString& DocumentInformation::type() const
{
return m_type;
}
 
 
void DocumentInformation::setAuthor(const QString &_author)
void DocumentInformation::setAuthor(const QString &author)
{
m_author=_author;
m_author = author;
}
 
void DocumentInformation::setComments(const QString &_comments)
void DocumentInformation::setComments(const QString &comments)
{
m_comments=_comments;
m_comments = comments;
}
 
void DocumentInformation::setContrib(const QString &_contrib)
void DocumentInformation::setContrib(const QString &contrib)
{
m_contrib=_contrib;
m_contrib = contrib;
}
 
void DocumentInformation::setCover(const QString &_cover)
void DocumentInformation::setCover(const QString &cover)
{
m_cover=_cover;
m_cover = cover;
}
 
void DocumentInformation::setDate(const QString &_date)
void DocumentInformation::setDate(const QString &date)
{
m_date=_date;
m_date = date;
}
 
void DocumentInformation::setFormat(const QString &_format)
void DocumentInformation::setFormat(const QString &format)
{
m_format=_format;
m_format = format;
}
 
void DocumentInformation::setIdent(const QString &_ident)
void DocumentInformation::setIdent(const QString &ident)
{
m_ident=_ident;
m_ident = ident;
}
 
void DocumentInformation::setKeywords(const QString &_keywords)
void DocumentInformation::setKeywords(const QString &keywords)
{
m_keywords=_keywords;
m_keywords = keywords;
}
 
void DocumentInformation::setLangInfo(const QString &_langInfo)
void DocumentInformation::setLangInfo(const QString &langInfo)
{
m_langInfo=_langInfo;
m_langInfo = langInfo;
}
 
void DocumentInformation::setPublisher(const QString &_publisher)
void DocumentInformation::setPublisher(const QString &publisher)
{
m_publisher=_publisher;
m_publisher = publisher;
}
 
void DocumentInformation::setRelation(const QString &_relation)
void DocumentInformation::setRelation(const QString &relation)
{
m_relation=_relation;
m_relation = relation;
}
 
void DocumentInformation::setRights(const QString &_rights)
void DocumentInformation::setRights(const QString &rights)
{
m_rights=_rights;
m_rights = rights;
}
 
void DocumentInformation::setSource(const QString &_source)
void DocumentInformation::setSource(const QString &source)
{
m_source=_source;
m_source = source;
}
 
void DocumentInformation::setSubject(const QString & _subject)
void DocumentInformation::setSubject(const QString &subject)
{
m_subject = _subject;
m_subject = subject;
}
 
void DocumentInformation::setTitle(const QString &_title)
void DocumentInformation::setTitle(const QString &title)
{
m_title=_title;
m_title = title;
}
 
void DocumentInformation::setType(const QString &_type)
void DocumentInformation::setType(const QString &type)
{
m_type=_type;
m_type = type;
}
 
/branches/Version15x/Scribus/scribus/documentinformation.h
30,39 → 30,40
public:
DocumentInformation();
~DocumentInformation() = default;
const QString& author();
const QString& comments();
const QString& contrib();
const QString& cover();
const QString& date();
const QString& format();
const QString& ident();
const QString& keywords();
const QString& langInfo();
const QString& publisher();
const QString& relation();
const QString& rights();
const QString& source();
const QString& subject();
const QString& title();
const QString& type();
 
const QString& author() const;
const QString& comments() const;
const QString& contrib() const;
const QString& cover() const;
const QString& date() const;
const QString& format() const;
const QString& ident() const;
const QString& keywords() const;
const QString& langInfo() const;
const QString& publisher() const;
const QString& relation() const;
const QString& rights() const;
const QString& source() const;
const QString& subject() const;
const QString& title() const;
const QString& type() const;
void setAuthor(const QString &_author);
void setComments(const QString &_comments);
void setContrib(const QString &_contrib);
void setCover(const QString &_cover);
void setDate(const QString &_date);
void setFormat(const QString &_format);
void setIdent(const QString &_ident);
void setKeywords(const QString &_keywords);
void setLangInfo(const QString &_langInfo);
void setPublisher(const QString &_publisher);
void setRelation(const QString &_relation);
void setRights(const QString &_rights);
void setSource(const QString &_source);
void setSubject(const QString &_subject);
void setTitle(const QString &_title);
void setType(const QString &_type);
void setAuthor(const QString &author);
void setComments(const QString &comments);
void setContrib(const QString &contrib);
void setCover(const QString &cover);
void setDate(const QString &date);
void setFormat(const QString &format);
void setIdent(const QString &ident);
void setKeywords(const QString &keywords);
void setLangInfo(const QString &langInfo);
void setPublisher(const QString &publisher);
void setRelation(const QString &relation);
void setRights(const QString &rights);
void setSource(const QString &source);
void setSubject(const QString &subject);
void setTitle(const QString &title);
void setType(const QString &type);
protected:
QString m_author;
/branches/Version15x/Scribus/scribus/prefsmanager.cpp
92,9 → 92,9
return &appPrefs;
}
 
void PrefsManager::setNewPrefs(ApplicationPrefs& newPrefs)
void PrefsManager::setNewPrefs(const ApplicationPrefs& newPrefs)
{
appPrefs=newPrefs;
appPrefs = newPrefs;
}
 
PrefsFile* PrefsManager::applicationPrefsFile()
334,9 → 334,9
appPrefs.displayPrefs.displayScale = dpi / 72.0;
 
appPrefs.pathPrefs.documents = ScPaths::userDocumentDir();
appPrefs.pathPrefs.colorProfiles = "";
appPrefs.pathPrefs.scripts = "";
appPrefs.pathPrefs.documentTemplates = "";
appPrefs.pathPrefs.colorProfiles.clear();
appPrefs.pathPrefs.scripts.clear();
appPrefs.pathPrefs.documentTemplates.clear();
 
appPrefs.printPreviewPrefs.PrPr_Mode = false;
appPrefs.printPreviewPrefs.PrPr_AntiAliasing = true;
749,7 → 749,7
points.resize(0);
}
 
const QString PrefsManager::preferencesLocation()
const QString& PrefsManager::preferencesLocation() const
{
return m_prefsLocation;
}
756,7 → 756,7
 
void PrefsManager::setupPreferencesLocation()
{
m_prefsLocation=ScPaths::preferencesDir(true);
m_prefsLocation = ScPaths::preferencesDir(true);
}
 
void PrefsManager::copyOldAppConfigAndData()
1065,32 → 1065,32
 
void PrefsManager::setGhostscriptExecutable(const QString& executableName)
{
appPrefs.extToolPrefs.gs_exe=executableName;
appPrefs.extToolPrefs.gs_exe = executableName;
}
 
void PrefsManager::setImageEditorExecutable(const QString& executableName)
{
appPrefs.extToolPrefs.imageEditorExecutable=executableName;
appPrefs.extToolPrefs.imageEditorExecutable = executableName;
}
 
void PrefsManager::setExtBrowserExecutable(const QString& executableName)
{
appPrefs.extToolPrefs.extBrowserExecutable=executableName;
appPrefs.extToolPrefs.extBrowserExecutable = executableName;
}
 
void PrefsManager::setUniconvExecutable(const QString& executableName)
{
appPrefs.extToolPrefs.uniconvExecutable=executableName;
appPrefs.extToolPrefs.uniconvExecutable = executableName;
}
 
void PrefsManager::setLatexConfigs(const QStringList& configs)
{
appPrefs.extToolPrefs.latexConfigs=configs;
appPrefs.extToolPrefs.latexConfigs = configs;
}
 
void PrefsManager::setLatexCommands(const QMap<QString, QString>& commands)
{
appPrefs.extToolPrefs.latexCommands=commands;
appPrefs.extToolPrefs.latexCommands = commands;
}
 
bool PrefsManager::renderFrameConfigured()
1117,7 → 1117,7
appPrefs.extToolPrefs.latexEditorExecutable=executableName;
}
 
const QString PrefsManager::documentDir()
const QString& PrefsManager::documentDir() const
{
return appPrefs.pathPrefs.documents;
}
1459,7 → 1459,7
deGuides.setAttribute("MarginColor", appPrefs.guidesPrefs.marginColor.name());
deGuides.setAttribute("BaselineGridColor", appPrefs.guidesPrefs.baselineGridColor.name());
deGuides.setAttribute("ObjectToGuideSnapRadius", ScCLocale::toQStringC(appPrefs.guidesPrefs.guideRad));
QString renderStack = "";
QString renderStack;
int renderStackCount = appPrefs.guidesPrefs.renderStackOrder.count();
for (int r = 0; r < renderStackCount; r++)
{
1967,7 → 1967,7
QTextStream s(&f);
s.setCodec("UTF-8");
s<<docu.toString();
if (f.error()==QFile::NoError)
if (f.error() == QFile::NoError)
result = true;
else
m_lastError = tr("Writing to preferences file \"%1\" failed: QIODevice status code %2").arg(filePath, f.errorString());
1983,7 → 1983,7
QFile f(filePath);
if (!f.open(QIODevice::ReadOnly))
{
m_lastError = tr("Failed to open prefs file \"%1\": %2").arg(filePath, qApp->translate("QFile",f.errorString().toLatin1().constData()) );
m_lastError = tr("Failed to open prefs file \"%1\": %2").arg(filePath, QApplication::translate("QFile",f.errorString().toLatin1().constData()) );
return false;
}
QTextStream ts(&f);
2318,7 → 2318,7
// on Mac you're dead if the titlebar is not on screen
minY = 22;
#endif
if (QGuiApplication::screens().count()==1)
if (QGuiApplication::screens().count() == 1)
{
if (appPrefs.uiPrefs.mainWinSettings.xPosition < minX )
appPrefs.uiPrefs.mainWinSettings.xPosition = minX;
2327,7 → 2327,7
}
int minWidth = 0;
int minHeight = 0;
QScreen* s=QGuiApplication::screens().at(qMin(appPrefs.uiPrefs.mainWinSettings.screenNumber, QGuiApplication::screens().count()-1));
const QScreen* s = QGuiApplication::screens().at(qMin(appPrefs.uiPrefs.mainWinSettings.screenNumber, QGuiApplication::screens().count() - 1));
int maxWidth = s->availableSize().width();
int maxHeight = s->availableSize().height();
if (appPrefs.uiPrefs.mainWinSettings.width > maxWidth)
2784,13 → 2784,13
if (availableStyles.contains(appPrefs.uiPrefs.style))
qtStyle = QStyleFactory::create(appPrefs.uiPrefs.style);
if (qtStyle)
qApp->setStyle(qtStyle);
QApplication::setStyle(qtStyle);
else
appPrefs.uiPrefs.style.clear();
}
QFont apf = qApp->font();
QFont apf = QApplication::font();
apf.setPointSize(appPrefs.uiPrefs.applicationFontSize);
qApp->setFont(apf);
QApplication::setFont(apf);
return true;
}
 
/branches/Version15x/Scribus/scribus/prefsmanager.h
90,7 → 90,7
\brief Get the prefs location property
\retval QString Location of the user's preferences
*/
const QString preferencesLocation();
const QString& preferencesLocation() const;
 
/*! \brief Read the preferences.
\param fname optional filename with preferences. If is not given,
137,7 → 137,7
int latexResolution() const {return appPrefs.extToolPrefs.latexResolution;}
bool latexForceDpi() const {return appPrefs.extToolPrefs.latexForceDpi;}
//! \brief Get the users preferred document directory
const QString documentDir();
const QString& documentDir() const;
void setDocumentDir(const QString& dirname);
int mouseWheelJump() const;
//! \brief Get the user set display scale
185,7 → 185,7
bool GetAllFonts(bool showFontInfo);
 
ApplicationPrefs* applicationPrefs();
void setNewPrefs(ApplicationPrefs& newPrefs);
void setNewPrefs(const ApplicationPrefs& newPrefs);
PrefsFile* applicationPrefsFile();
 
//! \brief Return the last error reported by a PrefsManager method
/branches/Version15x/Scribus/scribus/tocgenerator.cpp
20,6 → 20,8
***************************************************************************/
#include "tocgenerator.h"
 
#include <memory>
 
#include <QMap>
#include <QString>
 
32,9 → 34,10
#include "scpage.h"
#include "scribusdoc.h"
 
TOCGenerator::TOCGenerator(QObject *parent, ScribusDoc *doc) : QObject(parent)
TOCGenerator::TOCGenerator(QObject *parent, ScribusDoc *doc)
: QObject(parent), m_doc(doc)
{
m_doc = doc;
 
}
 
void TOCGenerator::setDoc(ScribusDoc *doc)
44,22 → 47,18
 
PageItem* TOCGenerator::findTargetFrame(const QString &targetFrameName)
{
PageItem* targetFrame=nullptr;
if (m_doc != nullptr)
if (!m_doc)
return nullptr;
 
for (int i = 0; i < m_doc->DocItems.count(); ++i)
{
for (int d = 0; d < m_doc->DocItems.count(); ++d)
{
if (m_doc->DocItems.at(d) != nullptr)
{
if (m_doc->DocItems.at(d)->itemType()==PageItem::TextFrame && m_doc->DocItems.at(d)->itemName()==targetFrameName)
{
targetFrame=m_doc->DocItems.at(d);
break;
}
}
}
PageItem* docItem = m_doc->DocItems.at(i);
if (docItem == nullptr)
continue;
if (docItem->itemType() == PageItem::TextFrame && docItem->itemName() == targetFrameName)
return docItem;
}
return targetFrame;
return nullptr;
}
 
void TOCGenerator::generateDefault()
75,16 → 74,15
if (tocFrame == nullptr)
continue;
 
PageItem *currentDocItem;
const PageItem *currentDocItem;
QMap<QString, QString> tocMap;
 
int *pageCounter = new int[m_doc->DocPages.count()];
if (pageCounter == nullptr)
return;
int pageNumberWidth = QString("%1").arg(m_doc->DocPages.count()).length();
std::unique_ptr<int[]> pageCounter(new int[m_doc->DocPages.count()]);
for (int i = 0; i < m_doc->DocPages.count(); ++i)
pageCounter[i] = 0;
 
int pageNumberWidth = QString("%1").arg(m_doc->DocPages.count()).length();
 
for (PageItemIterator itemIter(m_doc->DocItems); *itemIter; ++itemIter)
{
currentDocItem = itemIter.current();
125,13 → 123,13
gtWriter writer(false, tocFrame);
writer.setUpdateParagraphStyles(false);
writer.setOverridePStyleFont(false);
gtFrameStyle* fstyle = writer.getDefaultStyle();
const gtFrameStyle* fstyle = writer.getDefaultStyle();
gtParagraphStyle* pstyle = new gtParagraphStyle(*fstyle);
pstyle->setName(tocSetupIt->textStyle);
writer.setParagraphStyle(pstyle);
QString oldTocPage;
for (QMap<QString, QString>::Iterator tocIt=tocMap.begin(); tocIt != tocMap.end();++tocIt)
for (QMap<QString, QString>::Iterator tocIt = tocMap.begin(); tocIt != tocMap.end(); ++tocIt)
{
QString tocPage(tocIt.key().section( ',', 2, 2 ).trimmed());
QString tocLine;
150,7 → 148,5
tocLine += "\n";
writer.append(tocLine);
}
 
delete[] pageCounter;
}
}
/branches/Version15x/Scribus/scribus/ui/bookmwin.cpp
51,29 → 51,15
}
 
BookMItem::BookMItem(QTreeWidget* parent, QTreeWidgetItem* after, int nr, PageItem* PObject)
: QTreeWidgetItem(parent, after)
: QTreeWidgetItem(parent, after), PageObject(PObject), ItemNr(nr)
{
ItemNr = nr;
PageObject = PObject;
Action = "";
First = 0;
Last = 0;
Prev = 0;
Next = 0;
Pare = 0;
 
}
 
BookMItem::BookMItem(QTreeWidget* parent, int nr, PageItem* PObject)
: QTreeWidgetItem(parent)
: QTreeWidgetItem(parent), PageObject(PObject), ItemNr(nr)
{
ItemNr = nr;
PageObject = PObject;
Action = "";
First = 0;
Last = 0;
Prev = 0;
Next = 0;
Pare = 0;
 
}
 
void BookMItem::setup(struct ScribusDoc::BookMa *Bm)
111,10 → 97,6
 
BookmarkView::BookmarkView(QWidget* parent) : QTreeWidget(parent)
{
NrItems = 0;
First = 1;
Last = 0;
 
setAcceptDrops(true);
setSelectionMode(QAbstractItemView::SingleSelection);
setDragEnabled(true);
128,13 → 110,14
 
void BookmarkView::addPageItem(PageItem* ite)
{
QString bm, bm2;
QString bm;
QString bm2;
getTextAndTitle(ite, bm, bm2);
addItem(bm, bm2, ite);
Last = NrItems;
}
 
void BookmarkView::getTextAndTitle(PageItem* item, QString& text, QString& title)
void BookmarkView::getTextAndTitle(PageItem* item, QString& text, QString& title) const
{
QChar ch;
QString str;
166,7 → 149,7
 
void BookmarkView::selectPageItem(QTreeWidgetItem * current, int /*column*/)
{
BookMItem * bookmark = dynamic_cast<BookMItem*>(current);
auto* bookmark = dynamic_cast<BookMItem*>(current);
// something weird here at 1st call...
if (bookmark)
emit selectElement(bookmark->PageObject, false);
246,7 → 229,7
 
void BookmarkView::addItem(const QString& text, const QString& Tit, PageItem *PageObject)
{
BookMItem * ite = new BookMItem(this, NrItems+1, PageObject);
BookMItem* ite = new BookMItem(this, NrItems + 1, PageObject);
ite->setText(0, text);
ite->Title = Tit;
rebuildTree();
255,7 → 238,7
void BookmarkView::deleteItem(PageItem *pObject)
{
QTreeWidgetItemIterator it(this);
BookMItem * item;
const BookMItem * item;
while (*it)
{
item = (BookMItem*)(*it);
288,7 → 271,8
void BookmarkView::changeText(PageItem *currItem)
{
BookMItem *ite;
QString bm, bm2;
QString bm;
QString bm2;
 
getTextAndTitle(currItem, bm, bm2);
 
/branches/Version15x/Scribus/scribus/ui/bookmwin.h
52,15 → 52,15
void setup(struct ScribusDoc::BookMa *Bm);
virtual QString key(int, bool) const;
 
PageItem *PageObject;
int ItemNr;
PageItem *PageObject { nullptr };
int ItemNr { 0 };
QString Action;
QString Title;
int First;
int Last;
int Prev;
int Next;
int Pare;
int First { 0 };
int Last { 0 };
int Prev { 0 };
int Next { 0 };
int Pare { 0 };
};
 
 
84,9 → 84,9
void deleteItem(PageItem *PageObject);
void setAction(PageItem *currItem, const QString& Act);
 
int NrItems;
int First;
int Last;
int NrItems { 0 };
int First { 1 };
int Last { 0 };
 
/*! \brief Build scribus bookmark structure from tree items.
It looks horrible as it performs full rescan of the tree, but
106,7 → 106,7
 
protected:
void dropEvent(QDropEvent *e);
void getTextAndTitle(PageItem* item, QString& text, QString& title);
void getTextAndTitle(PageItem* item, QString& text, QString& title) const;
 
private slots:
void selectPageItem(QTreeWidgetItem * current, int column);
/branches/Version15x/Scribus/scribus/ui/colorchart.cpp
36,7 → 36,7
#include "scribuscore.h"
#include "scribusdoc.h"
 
ColorChart::ColorChart(QWidget *parent) : QWidget(parent), m_doc(nullptr)
ColorChart::ColorChart(QWidget *parent) : QWidget(parent)
{
setAutoFillBackground(false);
drawPalette(m_currentValue);
/branches/Version15x/Scribus/scribus/ui/contentpalette.cpp
167,7 → 167,7
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
 
if ((m_haveDoc) && (m_haveItem))
if (m_haveDoc && m_haveItem)
{
if (m_item->isTable())
{
373,7 → 373,7
textPal->updateCharStyle(style);
}
 
void ContentPalette::update(PageItem_TextFrame* text)
void ContentPalette::update(PageItem_TextFrame* /*text*/)
{
}