[Libreoffice-commits] libcdr.git: src/lib

Fridrich Å trba fridrich.strba at bluewin.ch
Thu Apr 4 04:49:01 PDT 2013


 src/lib/CDRTypes.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 79bf900ad62492cf3467ea6ffde0d82a199ca4ab
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Apr 4 13:48:36 2013 +0200

    This is even better

diff --git a/src/lib/CDRTypes.h b/src/lib/CDRTypes.h
index ae5c1e9..aa5b946 100644
--- a/src/lib/CDRTypes.h
+++ b/src/lib/CDRTypes.h
@@ -167,9 +167,10 @@ struct CDRCharacterStyle
   void overrideCharacterStyle(const CDRCharacterStyle &override)
   {
     if (override.m_charSet || override.m_fontId)
+    {
       m_charSet = override.m_charSet;
-    if (override.m_fontId)
       m_fontId = override.m_fontId;
+    }
     if (override.m_fontSize > 0.0)
       m_fontSize = override.m_fontSize;
     if (override.m_align)


More information about the Libreoffice-commits mailing list