From 3a631449ed88f654ab94a09dfc276f7ac7e7aca7 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:18:30 +0200
Subject: [PATCH] Make a few more simplifications

---
 novelwriter/core/toodt.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/novelwriter/core/toodt.py b/novelwriter/core/toodt.py
index 8a5b8193..2801fc5b 100644
--- a/novelwriter/core/toodt.py
+++ b/novelwriter/core/toodt.py
@@ -688,7 +688,7 @@ class ToOdt(Tokenizer):
 
     def _paraStyle(self, mainName: str, modStyle: ODTParagraphStyle) -> str:
         """Return a name for a style object."""
-        if not (refStyle := self._mainPara.get(mainName, None)):
+        if not (refStyle := self._mainPara.get(mainName)):
             logger.error("Unknown main paragraph style '%s'", mainName)
             return "Standard"
 
@@ -1267,14 +1267,14 @@ class ODTParagraphStyle:
             _mkTag("style", "family"): "paragraph",
         }
         attr.update(
-            {_mkTag(n, m): v for m, (n, v) in self._mAttr.items() if v is not None}
+            {_mkTag(n, m): v for m, (n, v) in self._mAttr.items() if v}
         )
         xEntry = ET.SubElement(xParent, _mkTag("style", "style"), attrib=attr)
 
-        if attr := {_mkTag(n, m): v for m, (n, v) in self._pAttr.items() if v is not None}:
+        if attr := {_mkTag(n, m): v for m, (n, v) in self._pAttr.items() if v}:
             ET.SubElement(xEntry, _mkTag("style", "paragraph-properties"), attrib=attr)
 
-        if attr := {_mkTag(n, m): v for m, (n, v) in self._tAttr.items() if v is not None}:
+        if attr := {_mkTag(n, m): v for m, (n, v) in self._tAttr.items() if v}:
             ET.SubElement(xEntry, _mkTag("style", "text-properties"), attrib=attr)
 
         return
@@ -1400,7 +1400,7 @@ class ODTTextStyle:
             _mkTag("style", "name"): self._name,
             _mkTag("style", "family"): "text",
         })
-        if attr := {_mkTag(n, m): v for m, (n, v) in self._tAttr.items() if v is not None}:
+        if attr := {_mkTag(n, m): v for m, (n, v) in self._tAttr.items() if v}:
             ET.SubElement(xEntry, _mkTag("style", "text-properties"), attrib=attr)
         return