Author: jghali
Date: Wed Jul 19 18:58:20 2017
New Revision: 22117
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22117
Log:
fix typo in function name
Modified:
trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h
Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22117&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp Wed Jul 19
18:58:20 2017
@@ -522,7 +522,7 @@
if (type == "styles")
{
ObjStyleODT tmpOStyle;
- resovleStyle(tmpOStyle,
spd.attribute("style:name"));
+ resolveStyle(tmpOStyle,
spd.attribute("style:name"));
if (spd.attribute("style:family") ==
"paragraph")
{
ParagraphStyle newStyle;
@@ -634,7 +634,7 @@
if (sp.tagName() == "office:text")
{
ObjStyleODT tmpOStyle;
- resovleStyle(tmpOStyle, "standard");
+ resolveStyle(tmpOStyle, "standard");
parseText(sp, m_item, tmpOStyle);
}
}
@@ -647,7 +647,7 @@
{
ObjStyleODT cStyle = tmpOStyle;
if (elem.hasAttribute("text:style-name"))
- resovleStyle(cStyle, elem.attribute("text:style-name"));
+ resolveStyle(cStyle, elem.attribute("text:style-name"));
applyCharacterStyle(tmpCStyle, cStyle);
if (!elem.hasChildNodes())
return;
@@ -696,7 +696,7 @@
if (elem.toElement().hasAttribute("text:style-name"))
{
QString pStyleName =
elem.toElement().attribute("text:style-name");
- resovleStyle(pStyle, pStyleName);
+ resolveStyle(pStyle, pStyleName);
if (m_Styles.contains(pStyleName))
{
DrawStyle currStyle = m_Styles[pStyleName];
@@ -946,7 +946,7 @@
tmpStyle.setTabValues(oStyle.tabStops);
}
-void ODTIm::resovleStyle(ObjStyleODT &tmpOStyle, QString pAttrs)
+void ODTIm::resolveStyle(ObjStyleODT &tmpOStyle, QString pAttrs)
{
if (m_Styles.contains(pAttrs))
{
Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22117&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h Wed Jul 19
18:58:20 2017
@@ -145,7 +145,7 @@
void insertChars(PageItem *item, QString &txt, ParagraphStyle
&tmpStyle, CharStyle &tmpCStyle, int &posC);
void applyCharacterStyle(CharStyle &tmpCStyle, ObjStyleODT
&oStyle);
void applyParagraphStyle(ParagraphStyle &tmpStyle, ObjStyleODT
&oStyle);
- void resovleStyle(ObjStyleODT &tmpOStyle, QString pAttrs);
+ void resolveStyle(ObjStyleODT &tmpOStyle, QString pAttrs);
double parseUnit(const QString &unit);
QColor parseColorN( const QString &rgbColor );
QString parseColor( const QString &s );
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
