Fix issue with global justify, and add indentation to DocX

novelwriter/formats/toodt.py

@@ -327,7 +327,7 @@ class ToOdt(Tokenizer):
         self._fLineHeight  = f"{round(100 * self._lineHeight):d}%"
         self._fBlockIndent = self._emToCm(self._blockIndent)
         self._fTextIndent  = self._emToCm(self._firstWidth)
-        self._textAlign    = "justify" if self._doJustify else "left"
+        self._textAlign    = "justify" if self._doJustify else self._defaultAlign
 
         # Clear Errors
         self._errData = []
@@ -457,6 +457,9 @@ class ToOdt(Tokenizer):
 
             # Process Text Types
             if tType == self.T_TEXT:
+                if self._doJustify and "\n" in tText:
+                    oStyle.overrideJustify(self._defaultAlign)
+
                 # Text indentation is processed here because there is a
                 # dedicated pre-defined style for it
                 if tStyle & self.A_IND_T:
@@ -1313,6 +1316,12 @@ class ODTParagraphStyle:
     #  Methods
     ##
 
+    def overrideJustify(self, default: str) -> None:
+        """Override inherited justify setting if None is set."""
+        if self._pAttr["text-align"][1] is None:
+            self.setTextAlign(default)
+        return
+
     def checkNew(self, style: ODTParagraphStyle) -> bool:
         """Check if there are new settings in style that differ from
         those in this object. Unset styles are ignored as they can be