Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 23889 → Rev 23890

/trunk/Scribus/scribus/gtframestyle.h
41,6 → 41,9
QString target() const override;
 
gtParagraphStyle& asGtParagraphStyle() { return dynamic_cast<gtParagraphStyle&>(*this); }
const gtParagraphStyle& asGtParagraphStyle() const { return dynamic_cast<const gtParagraphStyle&>(*this); }
 
int getColumns() const;
void setColumns(int newColumns);
double getColumnsGap() const;
/trunk/Scribus/scribus/gtparagraphstyle.h
74,6 → 74,9
numWasSet = 8192
} wasSetFlags;
 
gtStyle& asGtStyle() { return dynamic_cast<gtStyle&>(*this); }
const gtStyle& asGtStyle() const { return dynamic_cast<const gtStyle&>(*this); }
 
QString target() const override;
 
int getFlags() const;
/trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp
52,7 → 52,7
 
void CsvIm::setupPStyles()
{
pstyleData = new gtParagraphStyle(*(writer->getDefaultStyle()));
pstyleData = new gtParagraphStyle(writer->getDefaultStyle()->asGtParagraphStyle());
pstyleData->setName(writer->getFrameName() + "-" + QObject::tr("CSV_data"));
if (!hasHeader)
return;
/trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
81,7 → 81,7
codec = QTextCodec::codecForName(encoding.toLocal8Bit());
data = codec->toUnicode(data.toLocal8Bit());
// Applying default style is of very limited use with 135svn style system
/*gtParagraphStyle *pstyle = new gtParagraphStyle(*(writer->getDefaultStyle()));
/*gtParagraphStyle *pstyle = new gtParagraphStyle(writer->getDefaultStyle()->asGtParagraphStyle());
pstyle->setName(writer->getFrameName() + "-" + QObject::tr("PDB_data", "PDB Importer"));
writer->append(data, pstyle);
delete pstyle;*/
/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
57,7 → 57,7
{
/*if (!defaultStyleCreated)
{
gtParagraphStyle* pstyle = new gtParagraphStyle(*(writer->getDefaultStyle()));
gtParagraphStyle* pstyle = new gtParagraphStyle(writer->getDefaultStyle()->asGtParagraphStyle());
pstyle->setDefaultStyle(true);
currentStyle = dynamic_cast<gtStyle*>(pstyle);
currentStyle->setName("default-style");
167,7 → 167,7
if (attrs.localName(i) == "style:family")
if (attrs.value(i) == "paragraph")
{
gtParagraphStyle* pstyle = new gtParagraphStyle(*(writer->getDefaultStyle()));
gtParagraphStyle* pstyle = new gtParagraphStyle(writer->getDefaultStyle()->asGtParagraphStyle());
pstyle->setDefaultStyle(true);
currentStyle = dynamic_cast<gtStyle*>(pstyle);
currentStyle->setName("default-style");
309,7 → 309,7
 
if (!defaultStyleCreated)
{
gtParagraphStyle* pstyle = new gtParagraphStyle(*(writer->getDefaultStyle()));
gtParagraphStyle* pstyle = new gtParagraphStyle(writer->getDefaultStyle()->asGtParagraphStyle());
pstyle->setDefaultStyle(true);
currentStyle = dynamic_cast<gtStyle*>(pstyle);
currentStyle->setName("default-style");
568,9 → 568,9
fstyleName = it.key();
}
}
gtFrameStyle* fstyle;
 
gtParagraphStyle* pstyle = dynamic_cast<gtParagraphStyle*>(attrsStyles[fstyleName]);
fstyle = new gtFrameStyle(*pstyle);
gtFrameStyle* fstyle = new gtFrameStyle(*pstyle);
 
if (!importTextOnly)
writer->setFrameStyle(fstyle);