Author: craig
Date: Sun Aug 23 21:12:28 2020
New Revision: 23991
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23991
Log:
Some minor fixes to text import code
Modified:
trunk/Scribus/scribus/gtparagraphstyle.h
trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
trunk/Scribus/scribus/styles/charstyle.h
trunk/Scribus/scribus/ui/stylemanager.cpp
Modified: trunk/Scribus/scribus/gtparagraphstyle.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/gtparagraphstyle.h
==============================================================================
--- trunk/Scribus/scribus/gtparagraphstyle.h (original)
+++ trunk/Scribus/scribus/gtparagraphstyle.h Sun Aug 23 21:12:28 2020
@@ -111,7 +111,7 @@
void setBullet(bool newBullet, const QString& str);
QString getBullet() const;
bool hasNum() const;
- void setNum(bool newNum, int format=0, int level=0, int start = 1,
const QString& prefix = "", const QString& suffix = "");
+ void setNum(bool newNum, int format=0, int level=0, int start = 1,
const QString& prefix = QString(), const QString& suffix = QString());
int getNumLevel() const;
int getNumFormat() const;
int getNumStart() const;
Modified: trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp Sun Aug 23
21:12:28 2020
@@ -293,7 +293,7 @@
{
currentParagraphStyle =
defaultParagraphStyle;
bool hasStyle = false;
- QString currStyleName = "";
+ QString currStyleName;
for (QDomElement spr =
spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement())
{
if (spr.tagName() == "w:pPr")
Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp Sun Aug 23
21:12:28 2020
@@ -928,7 +928,7 @@
DRWParagraph para =
paragraphList.at(paragraphCounter);
paragraphCounter++;
ParagraphStyle newStyle;
-
newStyle.setLineSpacingMode(static_cast<ParagraphStyle::LineSpacingMode>(1));
+
newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
newStyle.setAlignment(static_cast<ParagraphStyle::AlignmentType>(para.paragraphAlignment));
newStyle.charStyle().setFontSize(fontSize * scaleFactor * 10.0 * 0.8);
QString
fontN(m_Doc->itemToolPrefs().textFont);
Modified: trunk/Scribus/scribus/styles/charstyle.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/styles/charstyle.h
==============================================================================
--- trunk/Scribus/scribus/styles/charstyle.h (original)
+++ trunk/Scribus/scribus/styles/charstyle.h Sun Aug 23 21:12:28 2020
@@ -110,7 +110,7 @@
#undef ATTRDEF
m_isDefaultStyle=false;
setFont(font);
- setFontSize(size);
+ setFontSize(size);
setEffects(style);
}
Modified: trunk/Scribus/scribus/ui/stylemanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/ui/stylemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/stylemanager.cpp Sun Aug 23 21:12:28 2020
@@ -1189,8 +1189,7 @@
else if (m_widget && !m_widget->isEnabled())
m_widget->setEnabled(true);
- disconnect(nameEdit, SIGNAL(textChanged(const QString&)),
- this, SLOT(slotNameChanged(const QString&)));
+ disconnect(nameEdit, SIGNAL(textChanged(const QString&)), this,
SLOT(slotNameChanged(const QString&)));
if (!typeName.isEmpty())
{
m_item->selected(selection.second);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
