r23126 by jghali - Rename ParagraphStyle::Leftaligned and ParagraphStyle::Rightaligned to LeftAligned and RightAligned respectively

scribus-commit scribus-commit at lists.scribus.net
Mon Aug 12 09:33:00 UTC 2019


Author: jghali
Date: Mon Aug 12 09:32:59 2019
New Revision: 23126

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23126
Log:
Rename ParagraphStyle::Leftaligned and ParagraphStyle::Rightaligned to LeftAligned and RightAligned respectively

Modified:
    trunk/Scribus/scribus/pageitem_pathtext.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
    trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
    trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h
    trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodg.h
    trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
    trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
    trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
    trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
    trunk/Scribus/scribus/sampleitem.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/styles/paragraphstyle.attrdefs.cxx
    trunk/Scribus/scribus/styles/paragraphstyle.h
    trunk/Scribus/scribus/third_party/rtf-qt/StyleSheetDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp

Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp	Mon Aug 12 09:32:59 2019
@@ -183,9 +183,9 @@
 	{
 		totalCurveLen += PoLine.lenPathSeg(segs);
 	}
-	if ((itemText.paragraphStyle(0).alignment() != ParagraphStyle::Leftaligned) && (totalCurveLen >= totalTextLen + m_textDistanceMargins.left()))
-	{
-		if (itemText.paragraphStyle(0).alignment() == ParagraphStyle::Rightaligned)
+	if ((itemText.paragraphStyle(0).alignment() != ParagraphStyle::LeftAligned) && (totalCurveLen >= totalTextLen + m_textDistanceMargins.left()))
+	{
+		if (itemText.paragraphStyle(0).alignment() == ParagraphStyle::RightAligned)
 		{
 			CurX = totalCurveLen - totalTextLen;
 			CurX -= m_textDistanceMargins.left();

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Mon Aug 12 09:32:59 2019
@@ -2486,7 +2486,7 @@
 							current.lineData.width += current.opticalRightMargin(itemText);
 
 						OFs = 0;
-						if (style.alignment() == ParagraphStyle::Rightaligned)
+						if (style.alignment() == ParagraphStyle::RightAligned)
 							OFs = current.lineData.width - current.lineData.naturalWidth;
 						if (style.alignment() == ParagraphStyle::Centered)
 							OFs = (current.lineData.width - current.lineData.naturalWidth) / 2;
@@ -2595,7 +2595,7 @@
 							current.line.naturalWidth += hyphWidth;*/
 
 						OFs = 0;
-						if (style.alignment() == ParagraphStyle::Rightaligned)
+						if (style.alignment() == ParagraphStyle::RightAligned)
 							OFs = current.lineData.width - current.lineData.naturalWidth;
 						if (style.alignment() == ParagraphStyle::Centered)
 							OFs = (current.lineData.width - current.lineData.naturalWidth) / 2;
@@ -2841,7 +2841,7 @@
 				current.lineData.width += current.opticalRightMargin(itemText);
 
 			OFs = 0;
-			if (style.alignment() == ParagraphStyle::Rightaligned)
+			if (style.alignment() == ParagraphStyle::RightAligned)
 				OFs = current.lineData.width - current.lineData.naturalWidth;
 			if (style.alignment() == ParagraphStyle::Centered)
 				OFs = (current.lineData.width - current.lineData.naturalWidth) / 2;

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Mon Aug 12 09:32:59 2019
@@ -9124,7 +9124,7 @@
 					PutDoc("/FT /Tx\n");
 					PutDoc("/V " + EncStringUTF16(bmUtf16, annotationObj) + "\n");
 					PutDoc("/DV " + EncStringUTF16(bmUtf16, annotationObj) + "\n");
-					PutDoc("/Q " + Pdf::toPdf(qMin(ite->itemText.defaultStyle().alignment(), ParagraphStyle::Rightaligned)) + "\n");
+					PutDoc("/Q " + Pdf::toPdf(qMin(ite->itemText.defaultStyle().alignment(), ParagraphStyle::RightAligned)) + "\n");
 					appearanceObj = writer.newObject();
 					PutDoc("/AP << /N "+Pdf::toPdf(appearanceObj)+" 0 R >>\n");
 					if (ite->annotation().MaxChar() != -1)

Modified: trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&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	Mon Aug 12 09:32:59 2019
@@ -378,11 +378,11 @@
 		{
 			QString align = spt.attribute("w:val");
 			if (align == "start")
-				pStyle.setAlignment(ParagraphStyle::Leftaligned);
+				pStyle.setAlignment(ParagraphStyle::LeftAligned);
 			else if (align == "center")
 				pStyle.setAlignment(ParagraphStyle::Centered);
 			else if (align == "end")
-				pStyle.setAlignment(ParagraphStyle::Rightaligned);
+				pStyle.setAlignment(ParagraphStyle::RightAligned);
 			else if (align == "both")
 				pStyle.setAlignment(ParagraphStyle::Justified);
 			else if (align == "distribute")

Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&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	Mon Aug 12 09:32:59 2019
@@ -1157,11 +1157,11 @@
 		{
 			QString attValue = actStyle.textAlign.value;
 			if ((attValue == "left") || (attValue == "start"))
-				tmpOStyle.textAlign = ParagraphStyle::Leftaligned;
+				tmpOStyle.textAlign = ParagraphStyle::LeftAligned;
 			else if (attValue == "center")
 				tmpOStyle.textAlign = ParagraphStyle::Centered;
 			else if ((attValue == "right") || (attValue == "end"))
-				tmpOStyle.textAlign = ParagraphStyle::Rightaligned;
+				tmpOStyle.textAlign = ParagraphStyle::RightAligned;
 			else if (attValue == "justify")
 				tmpOStyle.textAlign = ParagraphStyle::Justified;
 		}

Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&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	Mon Aug 12 09:32:59 2019
@@ -41,7 +41,7 @@
 	  fontWeight(""),
 	  fontSize(10.0),
 	  textIndent(0.0),
-	  textAlign(ParagraphStyle::Leftaligned),
+	  textAlign(ParagraphStyle::LeftAligned),
 	  textPos(""),
 	  textOutline(""),
 	  textUnderline(false),

Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp	Mon Aug 12 09:32:59 2019
@@ -637,7 +637,7 @@
 void XtgScanner::setAlignLeft()
 {
 	flushText();
-	m_currentParagraphStyle.setAlignment(ParagraphStyle::Leftaligned);
+	m_currentParagraphStyle.setAlignment(ParagraphStyle::LeftAligned);
 }
 
 void XtgScanner::setAlignCenter()
@@ -649,7 +649,7 @@
 void XtgScanner::setAlignRight()
 {
 	flushText();
-	m_currentParagraphStyle.setAlignment(ParagraphStyle::Rightaligned);
+	m_currentParagraphStyle.setAlignment(ParagraphStyle::RightAligned);
 }
 
 void XtgScanner::setAlignJustify()

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	Mon Aug 12 09:32:59 2019
@@ -3126,11 +3126,11 @@
 	{
 		QString align = styleElem.attribute("Justification", "LeftAlign");
 		if (align == "LeftAlign")
-			newStyle.setAlignment(ParagraphStyle::Leftaligned);
+			newStyle.setAlignment(ParagraphStyle::LeftAligned);
 		else if (align == "CenterAlign")
 			newStyle.setAlignment(ParagraphStyle::Centered);
 		else if (align == "RightAlign")
-			newStyle.setAlignment(ParagraphStyle::Rightaligned);
+			newStyle.setAlignment(ParagraphStyle::RightAligned);
 		else if ((align == "LeftJustified") || (align == "CenterJustified") || (align == "RightJustified"))
 			newStyle.setAlignment(ParagraphStyle::Justified);
 		else if (align == "FullyJustified")

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	Mon Aug 12 09:32:59 2019
@@ -2609,11 +2609,11 @@
 		{
 			QString attValue = actStyle.textAlign.value;
 			if (attValue == "left")
-				tmpOStyle.textAlign = ParagraphStyle::Leftaligned;
+				tmpOStyle.textAlign = ParagraphStyle::LeftAligned;
 			else if (attValue == "center")
 				tmpOStyle.textAlign = ParagraphStyle::Centered;
 			else if (attValue == "right")
-				tmpOStyle.textAlign = ParagraphStyle::Rightaligned;
+				tmpOStyle.textAlign = ParagraphStyle::RightAligned;
 			else if (attValue == "justify")
 				tmpOStyle.textAlign = ParagraphStyle::Justified;
 		}

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.h	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.h	Mon Aug 12 09:32:59 2019
@@ -64,7 +64,7 @@
 	  fontName(""),
 	  fontSize(10.0),
 	  textIndent(0.0),
-	  textAlign(ParagraphStyle::Leftaligned),
+	  textAlign(ParagraphStyle::LeftAligned),
 	  textPos(""),
 	  textOutline(""),
 	  textUnderline(false),

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	Mon Aug 12 09:32:59 2019
@@ -1053,11 +1053,11 @@
 	{
 		QString attValue = m_styleStack.attribute("fo:text-align");
 		if (attValue == "left")
-			style.setAlignment(ParagraphStyle::Leftaligned);
+			style.setAlignment(ParagraphStyle::LeftAligned);
 		if (attValue == "center")
 			style.setAlignment(ParagraphStyle::Centered);
 		if (attValue == "right")
-			style.setAlignment(ParagraphStyle::Rightaligned);
+			style.setAlignment(ParagraphStyle::RightAligned);
 	}
 	if (m_styleStack.hasAttribute("fo:font-size"))
 	{

Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	Mon Aug 12 09:32:59 2019
@@ -2016,9 +2016,9 @@
 		if (actStyle.justification.valid)
 		{
 			if (actStyle.justification.value == "0")
-				newStyle.setAlignment(ParagraphStyle::Leftaligned);
+				newStyle.setAlignment(ParagraphStyle::LeftAligned);
 			else if (actStyle.justification.value == "1")
-				newStyle.setAlignment(ParagraphStyle::Rightaligned);
+				newStyle.setAlignment(ParagraphStyle::RightAligned);
 			else if (actStyle.justification.value == "2")
 				newStyle.setAlignment(ParagraphStyle::Centered);
 			else if (actStyle.justification.value == "3")

Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	Mon Aug 12 09:32:59 2019
@@ -1563,11 +1563,11 @@
 	{
 		QString align = QString(propList["fo:text-align"]->getStr().cstr());
 		if (align == "left")
-			textStyle.setAlignment(ParagraphStyle::Leftaligned);
+			textStyle.setAlignment(ParagraphStyle::LeftAligned);
 		else if (align == "center")
 			textStyle.setAlignment(ParagraphStyle::Centered);
 		else if (align == "right")
-			textStyle.setAlignment(ParagraphStyle::Rightaligned);
+			textStyle.setAlignment(ParagraphStyle::RightAligned);
 		else if (align == "justify")
 			textStyle.setAlignment(ParagraphStyle::Justified);
 	}
@@ -3094,11 +3094,11 @@
 	{
 		QString align = QString(propList["fo:text-align"]->getStr().cstr());
 		if (align == "left")
-			textStyle.setAlignment(ParagraphStyle::Leftaligned);
+			textStyle.setAlignment(ParagraphStyle::LeftAligned);
 		else if (align == "center")
 			textStyle.setAlignment(ParagraphStyle::Centered);
 		else if (align == "right")
-			textStyle.setAlignment(ParagraphStyle::Rightaligned);
+			textStyle.setAlignment(ParagraphStyle::RightAligned);
 		else if (align == "justify")
 			textStyle.setAlignment(ParagraphStyle::Justified);
 	}

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	Mon Aug 12 09:32:59 2019
@@ -2122,9 +2122,9 @@
 	if (pAttrs.justification.valid)
 	{
 		if (pAttrs.justification.value == "left")
-			newStyle.setAlignment(ParagraphStyle::Leftaligned);
+			newStyle.setAlignment(ParagraphStyle::LeftAligned);
 		else if (pAttrs.justification.value == "right")
-			newStyle.setAlignment(ParagraphStyle::Rightaligned);
+			newStyle.setAlignment(ParagraphStyle::RightAligned);
 		else if (pAttrs.justification.value == "center")
 			newStyle.setAlignment(ParagraphStyle::Centered);
 		else if (pAttrs.justification.value == "justified")

Modified: trunk/Scribus/scribus/sampleitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/sampleitem.cpp
==============================================================================
--- trunk/Scribus/scribus/sampleitem.cpp	(original)
+++ trunk/Scribus/scribus/sampleitem.cpp	Mon Aug 12 09:32:59 2019
@@ -36,7 +36,7 @@
 	m_tmpStyle.setName("(preview temporary)");
 	m_tmpStyle.setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
 	m_tmpStyle.setLineSpacing((m_Doc->itemToolPrefs().textSize / 10.0) * (static_cast<double>(m_Doc->typographicPrefs().autoLineSpacing) / 100));
-	m_tmpStyle.setAlignment(ParagraphStyle::Leftaligned);
+	m_tmpStyle.setAlignment(ParagraphStyle::LeftAligned);
 	m_tmpStyle.setLeftMargin(0);
 	m_tmpStyle.setFirstIndent(0);
 	m_tmpStyle.setRightMargin(0);

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Mon Aug 12 09:32:59 2019
@@ -351,7 +351,7 @@
 	pstyle.setName(CommonStrings::DefaultParagraphStyle);
 	pstyle.setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
 	pstyle.setLineSpacing(15);
-	pstyle.setAlignment(ParagraphStyle::Leftaligned);
+	pstyle.setAlignment(ParagraphStyle::LeftAligned);
 	pstyle.setDirection(ParagraphStyle::LTR);
 	pstyle.setLeftMargin(0);
 	pstyle.setFirstIndent(0);

Modified: trunk/Scribus/scribus/styles/paragraphstyle.attrdefs.cxx
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/styles/paragraphstyle.attrdefs.cxx
==============================================================================
--- trunk/Scribus/scribus/styles/paragraphstyle.attrdefs.cxx	(original)
+++ trunk/Scribus/scribus/styles/paragraphstyle.attrdefs.cxx	Mon Aug 12 09:32:59 2019
@@ -18,7 +18,7 @@
 
 ATTRDEF(ParagraphStyle::LineSpacingMode, lineSpacingMode, LineSpacingMode, ParagraphStyle::FixedLineSpacing)
 ATTRDEF(double, lineSpacing, LineSpacing, 0.0)
-ATTRDEF(ParagraphStyle::AlignmentType, alignment, Alignment, Leftaligned)
+ATTRDEF(ParagraphStyle::AlignmentType, alignment, Alignment, LeftAligned)
 ATTRDEF(ParagraphStyle::DirectionType, direction, Direction, LTR)
 ATTRDEF(int, opticalMargins, OpticalMargins, 0)
 ATTRDEF(int, hyphenationMode, HyphenationMode, 0)

Modified: trunk/Scribus/scribus/styles/paragraphstyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/styles/paragraphstyle.h
==============================================================================
--- trunk/Scribus/scribus/styles/paragraphstyle.h	(original)
+++ trunk/Scribus/scribus/styles/paragraphstyle.h	Mon Aug 12 09:32:59 2019
@@ -33,9 +33,9 @@
 		BaselineGridLineSpacing = 2
 	};
 	enum AlignmentType {
-		Leftaligned  = 0,
+		LeftAligned  = 0,
 		Centered     = 1,
-		Rightaligned = 2,
+		RightAligned = 2,
 		Justified    = 3,
 		Extended     = 4
 	};

Modified: trunk/Scribus/scribus/third_party/rtf-qt/StyleSheetDestination.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/third_party/rtf-qt/StyleSheetDestination.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/StyleSheetDestination.cpp	(original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/StyleSheetDestination.cpp	Mon Aug 12 09:32:59 2019
@@ -46,13 +46,13 @@
 	void StyleSheetDestination::handleControlWord(const QString &controlWord, bool hasValue, const int value)
 	{
 		if (controlWord == "ql")
-			m_textStyle.setAlignment(ParagraphStyle::Leftaligned);
+			m_textStyle.setAlignment(ParagraphStyle::LeftAligned);
 		else if (controlWord == "qj")
 			m_textStyle.setAlignment(ParagraphStyle::Justified);
 		else if (controlWord == "qc")
 			m_textStyle.setAlignment(ParagraphStyle::Centered);
 		else if (controlWord == "qr")
-			m_textStyle.setAlignment(ParagraphStyle::Rightaligned);
+			m_textStyle.setAlignment(ParagraphStyle::RightAligned);
 		else if ((controlWord == "li") && hasValue)
 			m_textStyle.setLeftMargin(pixelsFromTwips(value));
 		else if ((controlWord == "ri") && hasValue)

Modified: trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp	(original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp	Mon Aug 12 09:32:59 2019
@@ -513,7 +513,7 @@
 
 	void SlaDocumentRtfOutput::setParagraphAlignmentLeft()
 	{
-		m_textStyle.top().setAlignment(ParagraphStyle::Leftaligned);
+		m_textStyle.top().setAlignment(ParagraphStyle::LeftAligned);
 	}
 
 	void SlaDocumentRtfOutput::setParagraphAlignmentCentred()
@@ -528,7 +528,7 @@
 
 	void SlaDocumentRtfOutput::setParagraphAlignmentRight()
 	{
-		m_textStyle.top().setAlignment(ParagraphStyle::Rightaligned);
+		m_textStyle.top().setAlignment(ParagraphStyle::RightAligned);
 	}
 
 	void SlaDocumentRtfOutput::setLeftIndent(const int twips)

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp	Mon Aug 12 09:32:59 2019
@@ -637,15 +637,15 @@
 	tempSelection.addItem(m_item, true);
 	m_doc->itemSelection_SetDirection(d, &tempSelection);
 	// If current text alignment is left or right, change it to match direction
-	if (d == ParagraphStyle::RTL && textAlignment->selectedId() == ParagraphStyle::Leftaligned)
-	{
-		m_doc->itemSelection_SetAlignment(ParagraphStyle::Rightaligned, &tempSelection);
-		textAlignment->setTypeStyle(ParagraphStyle::Rightaligned);
-	}
-	else if (d == ParagraphStyle::LTR && textAlignment->selectedId() == ParagraphStyle::Rightaligned)
-	{
-		m_doc->itemSelection_SetAlignment(ParagraphStyle::Leftaligned, &tempSelection);
-		textAlignment->setTypeStyle(ParagraphStyle::Leftaligned);
+	if (d == ParagraphStyle::RTL && textAlignment->selectedId() == ParagraphStyle::LeftAligned)
+	{
+		m_doc->itemSelection_SetAlignment(ParagraphStyle::RightAligned, &tempSelection);
+		textAlignment->setTypeStyle(ParagraphStyle::RightAligned);
+	}
+	else if (d == ParagraphStyle::LTR && textAlignment->selectedId() == ParagraphStyle::RightAligned)
+	{
+		m_doc->itemSelection_SetAlignment(ParagraphStyle::LeftAligned, &tempSelection);
+		textAlignment->setTypeStyle(ParagraphStyle::LeftAligned);
 	}
 }
 

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23126&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp	Mon Aug 12 09:32:59 2019
@@ -3061,10 +3061,10 @@
 void StoryEditor::newDirection(int dir)
 {
 	Editor->CurrDirection = dir;
-	if (dir == ParagraphStyle::LTR && Editor->CurrAlign == ParagraphStyle::Rightaligned)
-		Editor->CurrAlign = ParagraphStyle::Leftaligned;
-	else if (dir == ParagraphStyle::RTL && Editor->CurrAlign == ParagraphStyle::Leftaligned)
-		Editor->CurrAlign = ParagraphStyle::Rightaligned;
+	if (dir == ParagraphStyle::LTR && Editor->CurrAlign == ParagraphStyle::RightAligned)
+		Editor->CurrAlign = ParagraphStyle::LeftAligned;
+	else if (dir == ParagraphStyle::RTL && Editor->CurrAlign == ParagraphStyle::LeftAligned)
+		Editor->CurrAlign = ParagraphStyle::RightAligned;
 	changeDirection(dir);
 }
 




More information about the scribus-commit mailing list