[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters
From:       Lassi Taneli Nieminen <lassniem () gmail ! com>
Date:       2010-10-20 11:35:48
Message-ID: 20101020113548.0C9BBAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1187749 by lassin:

Made symbol bullets in ooxml to behave sanely in more cases.


 M  +1 -1      kword/docx/DocxXmlNumberingReader.cpp  
 M  +1 -1      libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h  


--- trunk/koffice/filters/kword/docx/DocxXmlNumberingReader.cpp #1187748:1187749
@@ -187,7 +187,7 @@
     // For some symbol bullets MS2007 sets the bullet char to wingdings/symbol  but \
                since
     // ODF does not support this, we replace those cases with default value '-'
     if (!pictureType && m_bulletStyle && !m_bulletCharacter.isEmpty()) {
-        if (m_bulletFont == "Wingdings" || m_bulletFont == "Symbol") {
+        if (m_bulletFont.startsWith("Wingdings") || \
m_bulletFont.startsWith("Symbol")) {  m_currentBulletProperties.setBulletChar("-");
         }
         else {
--- trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h \
#1187748:1187749 @@ -2155,7 +2155,7 @@
         }
     }
 
-    if (m_currentBulletProperties.bulletFont() == "Wingdings" && \
m_currentBulletProperties.bulletChar() != "") { +    if \
(m_currentBulletProperties.bulletFont().startsWith("Wingdings") && \
                m_currentBulletProperties.bulletChar() != "") {
         // Ooxml files have very often wingdings fonts, but usually they are not \
installed  // Making the bullet character look ugly, thus defaulting to "-"
         m_listStylePropertiesAltered = true;


[prev in list] [next in list] [prev in thread] [next in thread]