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

[Fridrich Å trba]

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

New commits:
commit 0e4bfab2ba604759db7933604bb5fbae5a41bc6e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Apr 3 15:55:09 2013 +0200

    Override the encoding if fontId or encoding is set

diff --git a/src/lib/CDRTypes.h b/src/lib/CDRTypes.h
index c8cb533..ae5c1e9 100644
--- a/src/lib/CDRTypes.h
+++ b/src/lib/CDRTypes.h
@@ -166,7 +166,7 @@ struct CDRCharacterStyle
       m_leftIndent(leftIndent), m_firstIndent(firstIndent), m_rightIndent(rightIndent) {}
   void overrideCharacterStyle(const CDRCharacterStyle &override)
   {
-    if (override.m_charSet)
+    if (override.m_charSet || override.m_fontId)
       m_charSet = override.m_charSet;
     if (override.m_fontId)
       m_fontId = override.m_fontId;